head 1.7; access; symbols pkgsrc-2026Q1:1.7.0.122 pkgsrc-2026Q1-base:1.7 pkgsrc-2025Q4:1.7.0.120 pkgsrc-2025Q4-base:1.7 pkgsrc-2025Q3:1.7.0.118 pkgsrc-2025Q3-base:1.7 pkgsrc-2025Q2:1.7.0.116 pkgsrc-2025Q2-base:1.7 pkgsrc-2025Q1:1.7.0.114 pkgsrc-2025Q1-base:1.7 pkgsrc-2024Q4:1.7.0.112 pkgsrc-2024Q4-base:1.7 pkgsrc-2024Q3:1.7.0.110 pkgsrc-2024Q3-base:1.7 pkgsrc-2024Q2:1.7.0.108 pkgsrc-2024Q2-base:1.7 pkgsrc-2024Q1:1.7.0.106 pkgsrc-2024Q1-base:1.7 pkgsrc-2023Q4:1.7.0.104 pkgsrc-2023Q4-base:1.7 pkgsrc-2023Q3:1.7.0.102 pkgsrc-2023Q3-base:1.7 pkgsrc-2023Q2:1.7.0.100 pkgsrc-2023Q2-base:1.7 pkgsrc-2023Q1:1.7.0.98 pkgsrc-2023Q1-base:1.7 pkgsrc-2022Q4:1.7.0.96 pkgsrc-2022Q4-base:1.7 pkgsrc-2022Q3:1.7.0.94 pkgsrc-2022Q3-base:1.7 pkgsrc-2022Q2:1.7.0.92 pkgsrc-2022Q2-base:1.7 pkgsrc-2022Q1:1.7.0.90 pkgsrc-2022Q1-base:1.7 pkgsrc-2021Q4:1.7.0.88 pkgsrc-2021Q4-base:1.7 pkgsrc-2021Q3:1.7.0.86 pkgsrc-2021Q3-base:1.7 pkgsrc-2021Q2:1.7.0.84 pkgsrc-2021Q2-base:1.7 pkgsrc-2021Q1:1.7.0.82 pkgsrc-2021Q1-base:1.7 pkgsrc-2020Q4:1.7.0.80 pkgsrc-2020Q4-base:1.7 pkgsrc-2020Q3:1.7.0.78 pkgsrc-2020Q3-base:1.7 pkgsrc-2020Q2:1.7.0.74 pkgsrc-2020Q2-base:1.7 pkgsrc-2020Q1:1.7.0.54 pkgsrc-2020Q1-base:1.7 pkgsrc-2019Q4:1.7.0.76 pkgsrc-2019Q4-base:1.7 pkgsrc-2019Q3:1.7.0.72 pkgsrc-2019Q3-base:1.7 pkgsrc-2019Q2:1.7.0.70 pkgsrc-2019Q2-base:1.7 pkgsrc-2019Q1:1.7.0.68 pkgsrc-2019Q1-base:1.7 pkgsrc-2018Q4:1.7.0.66 pkgsrc-2018Q4-base:1.7 pkgsrc-2018Q3:1.7.0.64 pkgsrc-2018Q3-base:1.7 pkgsrc-2018Q2:1.7.0.62 pkgsrc-2018Q2-base:1.7 pkgsrc-2018Q1:1.7.0.60 pkgsrc-2018Q1-base:1.7 pkgsrc-2017Q4:1.7.0.58 pkgsrc-2017Q4-base:1.7 pkgsrc-2017Q3:1.7.0.56 pkgsrc-2017Q3-base:1.7 pkgsrc-2017Q2:1.7.0.52 pkgsrc-2017Q2-base:1.7 pkgsrc-2017Q1:1.7.0.50 pkgsrc-2017Q1-base:1.7 pkgsrc-2016Q4:1.7.0.48 pkgsrc-2016Q4-base:1.7 pkgsrc-2016Q3:1.7.0.46 pkgsrc-2016Q3-base:1.7 pkgsrc-2016Q2:1.7.0.44 pkgsrc-2016Q2-base:1.7 pkgsrc-2016Q1:1.7.0.42 pkgsrc-2016Q1-base:1.7 pkgsrc-2015Q4:1.7.0.40 pkgsrc-2015Q4-base:1.7 pkgsrc-2015Q3:1.7.0.38 pkgsrc-2015Q3-base:1.7 pkgsrc-2015Q2:1.7.0.36 pkgsrc-2015Q2-base:1.7 pkgsrc-2015Q1:1.7.0.34 pkgsrc-2015Q1-base:1.7 pkgsrc-2014Q4:1.7.0.32 pkgsrc-2014Q4-base:1.7 pkgsrc-2014Q3:1.7.0.30 pkgsrc-2014Q3-base:1.7 pkgsrc-2014Q2:1.7.0.28 pkgsrc-2014Q2-base:1.7 pkgsrc-2014Q1:1.7.0.26 pkgsrc-2014Q1-base:1.7 pkgsrc-2013Q4:1.7.0.24 pkgsrc-2013Q4-base:1.7 pkgsrc-2013Q3:1.7.0.22 pkgsrc-2013Q3-base:1.7 pkgsrc-2013Q2:1.7.0.20 pkgsrc-2013Q2-base:1.7 pkgsrc-2013Q1:1.7.0.18 pkgsrc-2013Q1-base:1.7 pkgsrc-2012Q4:1.7.0.16 pkgsrc-2012Q4-base:1.7 pkgsrc-2012Q3:1.7.0.14 pkgsrc-2012Q3-base:1.7 pkgsrc-2012Q2:1.7.0.12 pkgsrc-2012Q2-base:1.7 pkgsrc-2012Q1:1.7.0.10 pkgsrc-2012Q1-base:1.7 pkgsrc-2011Q4:1.7.0.8 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q3:1.7.0.6 pkgsrc-2011Q3-base:1.7 pkgsrc-2011Q2:1.7.0.4 pkgsrc-2011Q2-base:1.7 pkgsrc-2011Q1:1.7.0.2 pkgsrc-2011Q1-base:1.7 pkgsrc-2010Q4:1.6.0.52 pkgsrc-2010Q4-base:1.6 pkgsrc-2010Q3:1.6.0.50 pkgsrc-2010Q3-base:1.6 pkgsrc-2010Q2:1.6.0.48 pkgsrc-2010Q2-base:1.6 pkgsrc-2010Q1:1.6.0.46 pkgsrc-2010Q1-base:1.6 pkgsrc-2009Q4:1.6.0.44 pkgsrc-2009Q4-base:1.6 pkgsrc-2009Q3:1.6.0.42 pkgsrc-2009Q3-base:1.6 pkgsrc-2009Q2:1.6.0.40 pkgsrc-2009Q2-base:1.6 pkgsrc-2009Q1:1.6.0.38 pkgsrc-2009Q1-base:1.6 pkgsrc-2008Q4:1.6.0.36 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.34 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.32 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.30 pkgsrc-2008Q2-base:1.6 cwrapper:1.6.0.28 pkgsrc-2008Q1:1.6.0.26 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.24 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.22 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.6.0.20 pkgsrc-2007Q2-base:1.6 pkgsrc-2007Q1:1.6.0.18 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.6.0.16 pkgsrc-2006Q4-base:1.6 pkgsrc-2006Q3:1.6.0.14 pkgsrc-2006Q3-base:1.6 pkgsrc-2006Q2:1.6.0.12 pkgsrc-2006Q2-base:1.6 pkgsrc-2006Q1:1.6.0.10 pkgsrc-2006Q1-base:1.6 pkgsrc-2005Q4:1.6.0.8 pkgsrc-2005Q4-base:1.6 pkgsrc-2005Q3:1.6.0.6 pkgsrc-2005Q3-base:1.6 pkgsrc-2005Q2:1.6.0.4 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.6.0.2 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.5.0.18 pkgsrc-2004Q4-base:1.5 pkgsrc-2004Q3:1.5.0.16 pkgsrc-2004Q3-base:1.5 pkgsrc-2004Q2:1.5.0.14 pkgsrc-2004Q2-base:1.5 pkgsrc-2004Q1:1.5.0.12 pkgsrc-2004Q1-base:1.5 pkgsrc-2003Q4:1.5.0.10 pkgsrc-2003Q4-base:1.5 netbsd-1-6-1:1.5.0.6 netbsd-1-6-1-base:1.5 netbsd-1-6:1.5.0.8 netbsd-1-6-RELEASE-base:1.5 pkgviews:1.5.0.4 pkgviews-base:1.5 buildlink2:1.5.0.2 buildlink2-base:1.5 netbsd-1-5-PATCH003:1.5 netbsd-1-5-PATCH001:1.4 netbsd-1-5-RELEASE:1.3 netbsd-1-4-PATCH003:1.3 netbsd-1-4-PATCH002:1.2 comdex-fall-1999:1.2; locks; strict; comment @# @; 1.7 date 2011.03.02.05.42.41; author obache; state Exp; branches; next 1.6; 1.6 date 2005.03.12.12.53.56; author schwarz; state Exp; branches; next 1.5; 1.5 date 2001.11.29.18.00.32; author wiz; state Exp; branches; next 1.4; 1.4 date 2001.02.03.01.53.03; author dmcmahill; state Exp; branches; next 1.3; 1.3 date 2000.07.08.12.47.09; author tron; state Exp; branches; next 1.2; 1.2 date 99.10.01.07.49.21; author simonb; state Exp; branches; next 1.1; 1.1 date 99.10.01.05.09.15; author simonb; state Exp; branches; next ; desc @@ 1.7 log @* fixes to install libraries as BSD_INSTALL_LIB, not BSD_INSTALL_DATA (patch-ac) * nearly 10 years forgotten to replace @@x11prefix@@ with @@PREFIX@@ in patch-at. and no need to restrict to BSDs only in pkgsrc. * regen patches with recent mkpatches(1). * use SUBST to replace PREFIX. * add user-destdir installation. Bump PKGREVISION. @ text @$NetBSD: patch-at,v 1.6 2005/03/12 12:53:56 schwarz Exp $ --- x11.c.orig 1991-11-19 04:00:50.000000000 +0000 +++ x11.c @@@@ -18,10 +18,11 @@@@ #include #include -#if ( !defined(mips) && !defined(TOPIX) ) || defined(ultrix) +#include +#if ( !defined(mips) && !defined(TOPIX) ) || defined(ultrix) || (defined(BSD) && BSD >= 199306) || defined(__sgi) #include #include -#include +#include #else #ifdef SYSTYPE_BSD43 #include @@@@ -30,15 +31,16 @@@@ #ifndef TOPIX #include #include -#include #else #include #endif /*TOPIX*/ #endif /*SYSTYPE_BSD43*/ -#endif /*( !defined(mips) && !defined(TOPIX) ) || defined(ultrix)*/ +#endif /*( !defined(mips) && !defined(TOPIX) ) || defined(ultrix) || (defined(BSD) && BSD >= 199306) */ #include "faces.h" #include "extern.h" +#include + #ifdef HASPOLL #include #endif /*HASPOLL*/ @@@@ -58,7 +60,6 @@@@ #define F_ICON 0 /* Icon index to frame array. */ #define F_WINDOW 1 /* Window index to frame array. */ -#define FACES_BORDER_WIDTH 2 #define FRAME_MASK (ButtonPressMask | ExposureMask | \ ButtonMotionMask | KeyPressMask) #define ICON_MASK ExposureMask @@@@ -364,11 +365,13 @@@@ char *argv[] ; init_font() ; gc_mask = GCFont | GCForeground | GCBackground | GCGraphicsExposures ; gc_val.font = sfont->fid ; - gc_val.foreground = foregnd ; - gc_val.background = backgnd ; + gc_val.foreground = BlackPixel(dpy, screen) ; + gc_val.background = WhitePixel(dpy, screen) ; gc_val.graphics_exposures = False ; gc = XCreateGC(dpy, root, gc_mask, &gc_val) ; + gc_val.foreground = foregnd ; + gc_val.background = backgnd ; tilegc = XCreateGC(dpy, root, gc_mask, &gc_val) ; if (depth == 1) XSetFillStyle(dpy, tilegc, FillOpaqueStippled) ; else XSetFillStyle(dpy, tilegc, FillTiled) ; @@@@ -459,6 +462,7 @@@@ load_resources() home = getenv("HOME") ; XrmInitialize() ; + STRCPY(name, "@@PREFIX@@/lib/X11/app-defaults/Faces") ; STRCPY(name, "/usr/lib/X11/app-defaults/Faces") ; /* Get applications defaults file, if any. */ @@@@ -576,14 +580,14 @@@@ char *argv[] ; winattrs.event_mask = FRAME_MASK ; frame[F_WINDOW] = XCreateWindow(dpy, root, size.x, size.y, - size.width, size.height, FACES_BORDER_WIDTH, + size.width, size.height, border_width, CopyFromParent, InputOutput, CopyFromParent, CWBackPixel | CWBorderPixel | CWEventMask, &winattrs) ; winattrs.event_mask = ICON_MASK ; frame[F_ICON] = XCreateWindow(dpy, root, - ix, iy, imagewidth, imageheight, FACES_BORDER_WIDTH, + ix, iy, imagewidth, imageheight, border_width, CopyFromParent, InputOutput, CopyFromParent, CWBackPixel | CWBorderPixel | CWEventMask, &winattrs) ; @@@@ -856,6 +860,7 @@@@ char *str ; XFillRectangle(dpy, pr[(int) dtype], gc, x, y-9, (unsigned int) textwidth+2, 13) ; XSetFunction(dpy, gc, GXxor) ; + XSetForeground(dpy, gc, WhitePixel(dpy, screen)); XDrawImageString(dpy, pr[(int) dtype], gc, x, y, str, len) ; XSetFunction(dpy, gc, GXcopy) ; } @ 1.6 log @ added patches to support IRIX, closing PR#28315. @ text @d1 1 a1 1 $NetBSD: patch-at,v 1.5 2001/11/29 18:00:32 wiz Exp $ d3 4 a6 3 --- x11.c.orig Mon Nov 18 23:00:50 1991 +++ x11.c Fri Feb 2 20:01:06 2001 @@@@ -19,8 +19,9 @@@@ d18 3 a20 1 @@@@ -31,13 +32,14 @@@@ d37 3 a39 1 @@@@ -59,5 +61,4 @@@@ d45 3 a47 1 @@@@ -365,9 +366,11 @@@@ d61 3 a63 1 @@@@ -460,5 +463,9 @@@@ d66 1 a66 3 +#if (defined(BSD) && BSD >= 199306) + STRCPY(name, "@@x11prefix@@/lib/X11/app-defaults/Faces") ; +#else a67 1 +#endif d70 2 a71 1 @@@@ -577,5 +584,5 @@@@ d78 2 a79 1 @@@@ -584,5 +591,5 @@@@ d86 3 a88 1 @@@@ -857,4 +864,5 @@@@ d94 1 @ 1.5 log @Misc fixes: Remove a dead MASTER_SITE. Use PLIST_SUBST instead of local hack. Create app-defaults dir if missing (solves pkg/13179). Don't hardwire incorrect app-defaults path in patch-at. @ text @d1 1 a1 1 $NetBSD: patch-at,v 1.4 2001/02/03 01:53:03 dmcmahill Exp $ d10 1 a10 1 +#if ( !defined(mips) && !defined(TOPIX) ) || defined(ultrix) || (defined(BSD) && BSD >= 199306) @ 1.4 log @add some missing header files for alpha. @ text @d1 1 a1 1 $NetBSD$ d58 1 a58 1 + STRCPY(name, "/usr/X11R6/lib/X11/app-defaults/Faces") ; @ 1.3 log @Replace "/usr/local" by "${LOCALBASE}". Fixes PR pkg/10360, pkg/10465 and pkg/10529. @ text @d3 3 a5 4 --- x11.c.orig Tue Nov 19 05:00:50 1991 +++ x11.c Sat Jul 8 14:25:27 2000 @@@@ -18,10 +18,10 @@@@ d14 1 d17 1 a17 3 #include @@@@ -30,15 +30,16 @@@@ #ifndef TOPIX d34 1 a34 3 #endif /*HASPOLL*/ @@@@ -58,7 +59,6 @@@@ d40 1 a40 3 #define ICON_MASK ExposureMask @@@@ -364,11 +364,13 @@@@ init_font() ; d54 1 a54 3 else XSetFillStyle(dpy, tilegc, FillTiled) ; @@@@ -459,7 +461,11 @@@@ d64 1 a64 3 @@@@ -576,14 +582,14 @@@@ winattrs.event_mask = FRAME_MASK ; d71 1 a71 2 winattrs.event_mask = ICON_MASK ; d78 1 a78 3 @@@@ -856,6 +862,7 @@@@ XFillRectangle(dpy, pr[(int) dtype], gc, x, y-9, a83 1 } @ 1.2 log @Oops, forgot them RCS ids... @ text @d3 2 a4 3 diff -ur ../faces-DIST/x11.c ./x11.c --- ../faces-DIST/x11.c Tue Nov 19 15:00:50 1991 +++ ./x11.c Fri Oct 1 14:32:03 1999 @ 1.1 log @Spilt patches into one-file-per-patch-file, and make this work on the pmax (and other mips ports) - all the world is not IRIX... @ text @d1 2 @