head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.132 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.130 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.128 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.126 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.124 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.122 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.120 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.118 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.116 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.114 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.112 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.110 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.108 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.106 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.104 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.102 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.100 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.98 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.96 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.94 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.92 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.90 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.88 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.84 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.64 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.86 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.82 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.80 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.78 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.76 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.74 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.72 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.70 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.68 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.66 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.62 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.60 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.58 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.56 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.54 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.52 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.50 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.48 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.46 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.44 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.42 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.40 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.38 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.36 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.34 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.32 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.30 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.28 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.26 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.24 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.22 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.20 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.18 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.16 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.14 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.12 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.10 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.8 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.6 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.4 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.2 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.2.0.60 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.58 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.56 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.54 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.52 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.50 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.48 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.46 pkgsrc-2008Q1:1.2.0.44 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.42 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.40 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.38 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.36 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.34 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.32 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.30 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.28 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.26 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.24 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.22 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.20 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.18 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.16 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.14 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.12 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.10 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.2.0.6 netbsd-1-6-1-base:1.2 netbsd-1-6:1.2.0.8 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.2.0.4 pkgviews-base:1.2 buildlink2:1.2.0.2 buildlink2-base:1.2 netbsd-1-5-PATCH003:1.2 netbsd-1-5-PATCH001:1.1 netbsd-1-5-RELEASE:1.1 netbsd-1-4-PATCH003:1.1 netbsd-1-4-PATCH002:1.1; locks; strict; comment @# @; 1.3 date 2009.12.10.20.35.56; author abs; state Exp; branches; next 1.2; 1.2 date 2001.12.20.09.19.55; author tron; state Exp; branches; next 1.1; 1.1 date 99.12.15.23.51.04; author dmcmahill; state Exp; branches; next ; desc @@ 1.3 log @- Add PKG_DESTDIR_SUPPORT - Depend on the latest version of xview-config - Mark as LICENSE sun-openlook-license - Bump pkgrevision @ text @$NetBSD: patch-al,v 1.2 2001/12/20 09:19:55 tron Exp $ --- lib/libxview/font/font_get.c.orig 1993-06-29 05:15:00.000000000 +0000 +++ lib/libxview/font/font_get.c @@@@ -43,7 +43,6 @@@@ font_get_attr(font_public, status, attr, XFontStruct *x_font_info = (XFontStruct *)font->x_font_info; Xv_opaque v; int attr_is_char_width = 0; - Attr_avlist avlist = (Attr_avlist) args; #ifdef OW_I18N if (font->type == FONT_TYPE_TEXT) { @@@@ -138,8 +137,8 @@@@ font_get_attr(font_public, status, attr, } case FONT_STRING_DIMS:{ - char *string = (char *) avlist[0]; - Font_string_dims *size = (Font_string_dims *) avlist[1]; + char *string = (char *)va_arg(args, Attr_attribute); + Font_string_dims *size = (Font_string_dims *)va_arg(args, Attr_attribute); struct pr_size my_pf_size; if (string) { my_pf_size = xv_pf_textwidth(strlen(string), font_public, string); @@@@ -264,8 +263,8 @@@@ font_get_attr(font_public, status, attr, #ifdef OW_I18N case FONT_STRING_DIMS_WC:{ - wchar_t *ws = (wchar_t *) avlist[0]; - Font_string_dims *size = (Font_string_dims *) avlist[1]; + wchar_t *ws = (wchar_t *) va_arg(args, Attr_attribute); + Font_string_dims *size = (Font_string_dims *) va_arg(args, Attr_attribute); struct pr_size my_pf_size; if (ws) { @ 1.2 log @Cleanup patch files: - unified format - only one patch per file - no files gets patched twice @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- lib/libxview/font/font_get.c.orig Tue Jun 29 07:15:00 1993 +++ lib/libxview/font/font_get.c Thu Dec 20 10:10:24 2001 @@@@ -43,7 +43,6 @@@@ d13 1 a13 1 @@@@ -138,8 +137,8 @@@@ d24 1 a24 1 @@@@ -264,8 +263,8 @@@@ @ 1.1 log @- Break out patches to ./lib/libxview/misc/expandname.c and ./lib/libxview/textsw/txt_filter.c from patch-ad into patch-al and patch-ao. - Fix several compilation bugs on the sparc. The code had #ifdef(sparc) checks when it was really wanting to make an operating system choice, not a processor choice. Thanks to Ethan Bakshy, ethan@@mail.enteract.com for pointing out the problem (on port-sparc). @ text @d3 7 a9 4 --- ./lib/libxview/misc/expandname.c.orig Tue Jun 29 01:16:30 1993 +++ ./lib/libxview/misc/expandname.c Sun Dec 12 21:41:40 1999 @@@@ -24,4 +24,7 @@@@ #include d11 4 a14 9 +#if defined(BSD) && (BSD >= 199306) +#include +#else #ifdef sparc #ifdef SVR4 @@@@ -31,4 +34,5 @@@@ #endif SVR4 #endif +#endif d16 19 a34 9 #ifdef SVR4 @@@@ -121,5 +125,7 @@@@ (void) close(pivec[0]); #ifndef SVR4 +#if !(defined(BSD) && (BSD >= 199103)) while (wait((union wait *) & status) != pid); +#endif #else SVR4 while (wait( & status) != pid); @