Tue Jan 15 16:21:37 2013 UTC ()
Clean up libXaw handling. [1/2]

- remove LIBXAW variable. It is handled by buildlink3.mk now
- simplify patches and Makefile in packages using libXaw
- in some cases force use of Xaw3d (won't build with Xaw)
- replace some directly included of x11/Xaw3d with mk/xaw.buildlink3.mk

In next part:
- replace more includes with mk/xaw.buildlink3.mk


(morr)
diff -r1.15 -r1.16 pkgsrc/cad/felt/distinfo
diff -r1.4 -r1.5 pkgsrc/cad/felt/patches/patch-ab
diff -r1.55 -r1.56 pkgsrc/editors/vim-xaw/Makefile
diff -r1.28 -r1.29 pkgsrc/games/xfrisk/Makefile
diff -r1.9 -r1.10 pkgsrc/games/xfrisk/distinfo
diff -r1.5 -r1.6 pkgsrc/games/xfrisk/patches/patch-aa
diff -r1.5 -r1.6 pkgsrc/mk/xaw.buildlink3.mk
diff -r1.25 -r1.26 pkgsrc/time/emiclock/Makefile
diff -r1.9 -r1.10 pkgsrc/time/emiclock/distinfo
diff -r1.6 -r1.7 pkgsrc/time/emiclock/patches/patch-ad
diff -r1.5 -r1.6 pkgsrc/time/xalarm/distinfo
diff -r1.3 -r1.4 pkgsrc/time/xalarm/patches/patch-aa
diff -r1.17 -r1.18 pkgsrc/x11/Xaw-Xpm/buildlink3.mk
diff -r1.13 -r1.14 pkgsrc/x11/Xaw3d/buildlink3.mk
diff -r1.58 -r1.59 pkgsrc/x11/kterm/Makefile
diff -r1.2 -r0 pkgsrc/x11/kterm/files/patch-xaw3d
diff -r1.15 -r1.16 pkgsrc/x11/neXtaw/buildlink3.mk
diff -r1.22 -r1.23 pkgsrc/x11/xcolorsel/Makefile
diff -r1.5 -r1.6 pkgsrc/x11/xcolorsel/distinfo
diff -r0 -r1.1 pkgsrc/x11/xcolorsel/patches/patch-Imakefile
diff -r0 -r1.1 pkgsrc/x11/xcolorsel/patches/patch-RgbText.c
diff -r0 -r1.1 pkgsrc/x11/xcolorsel/patches/patch-xcolorsel.c
diff -r1.4 -r0 pkgsrc/x11/xcolorsel/patches/patch-aa
diff -r1.3 -r0 pkgsrc/x11/xcolorsel/patches/patch-ab
diff -r1.3 -r0 pkgsrc/x11/xcolorsel/patches/patch-ai
diff -r1.2 -r0 pkgsrc/x11/xcolorsel/patches/patch-ac
diff -r1.2 -r0 pkgsrc/x11/xcolorsel/patches/patch-ad
diff -r1.2 -r0 pkgsrc/x11/xcolorsel/patches/patch-ae
diff -r1.2 -r0 pkgsrc/x11/xcolorsel/patches/patch-af
diff -r1.2 -r0 pkgsrc/x11/xcolorsel/patches/patch-ag
diff -r1.2 -r0 pkgsrc/x11/xcolorsel/patches/patch-ah
cvs diff -r1.15 -r1.16 pkgsrc/cad/felt/distinfo (expand / switch to unified diff)

--- pkgsrc/cad/felt/distinfo 2009/12/17 20:31:37 1.15
+++ pkgsrc/cad/felt/distinfo 2013/01/15 16:21:34 1.16
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1$NetBSD: distinfo,v 1.15 2009/12/17 20:31:37 abs Exp $ 1$NetBSD: distinfo,v 1.16 2013/01/15 16:21:34 morr Exp $
2 2
3SHA1 (felt-3.05.src.tar.gz) = da3e1ced626cc1c65a570d3e6e242252c039c28b 3SHA1 (felt-3.05.src.tar.gz) = da3e1ced626cc1c65a570d3e6e242252c039c28b
4RMD160 (felt-3.05.src.tar.gz) = 0d2a363a6ef09f3b3a0e2be186c4c051ac1ea19a 4RMD160 (felt-3.05.src.tar.gz) = 0d2a363a6ef09f3b3a0e2be186c4c051ac1ea19a
5Size (felt-3.05.src.tar.gz) = 956901 bytes 5Size (felt-3.05.src.tar.gz) = 956901 bytes
6SHA1 (felt-3.05.ps.gz) = 10fbac9927fe20cec3884d989204fe1a92d61784 6SHA1 (felt-3.05.ps.gz) = 10fbac9927fe20cec3884d989204fe1a92d61784
7RMD160 (felt-3.05.ps.gz) = b8bd2a4a83a951455403c2f2f17db6db697035a1 7RMD160 (felt-3.05.ps.gz) = b8bd2a4a83a951455403c2f2f17db6db697035a1
8Size (felt-3.05.ps.gz) = 626985 bytes 8Size (felt-3.05.ps.gz) = 626985 bytes
9SHA1 (patch-aa) = 040259f3b9835409f2d98f0cde12667142da2160 9SHA1 (patch-aa) = 040259f3b9835409f2d98f0cde12667142da2160
10SHA1 (patch-ab) = 0db67c162ea81b7b7650ae1d62f0e89235067b53 10SHA1 (patch-ab) = 0822f1bea2822ad692153311d159a257c0420484
11SHA1 (patch-ac) = 04b93dbb663ca5f04cb78956c3dbb77bc68a7b8f 11SHA1 (patch-ac) = 04b93dbb663ca5f04cb78956c3dbb77bc68a7b8f
12SHA1 (patch-ad) = c41c74393782fd65f871097e9fc51aae1dacf643 12SHA1 (patch-ad) = c41c74393782fd65f871097e9fc51aae1dacf643
13SHA1 (patch-ae) = 482fbf439ebc23b41294b7c903f921e6e285cd55 13SHA1 (patch-ae) = 482fbf439ebc23b41294b7c903f921e6e285cd55
14SHA1 (patch-af) = efe9378b488d1425ea284ec29c838359aa8f6a9b 14SHA1 (patch-af) = efe9378b488d1425ea284ec29c838359aa8f6a9b
15SHA1 (patch-ag) = 392eb3d708ab4b2004586d3203ec64a778dce886 15SHA1 (patch-ag) = 392eb3d708ab4b2004586d3203ec64a778dce886
16SHA1 (patch-ah) = d48f55d8cc9c3b6d1bc75b56e4f8023e42e6d37e 16SHA1 (patch-ah) = d48f55d8cc9c3b6d1bc75b56e4f8023e42e6d37e
17SHA1 (patch-ai) = 00d557b31d2b912de9f952a4f76f2742e98dca1a 17SHA1 (patch-ai) = 00d557b31d2b912de9f952a4f76f2742e98dca1a
18SHA1 (patch-aj) = 9104b418485bdd9f56c699ac4be9ed64422d19d2 18SHA1 (patch-aj) = 9104b418485bdd9f56c699ac4be9ed64422d19d2
19SHA1 (patch-ak) = 0ad726e6992a822ffcf32367f06305ac6ea818cc 19SHA1 (patch-ak) = 0ad726e6992a822ffcf32367f06305ac6ea818cc
20SHA1 (patch-al) = 3267802ff6467ffc37cb4de564b005bf1ceb91ac 20SHA1 (patch-al) = 3267802ff6467ffc37cb4de564b005bf1ceb91ac
21SHA1 (patch-am) = de488591d0d7abace294ccb9a9aa6914b2b9fd4d 21SHA1 (patch-am) = de488591d0d7abace294ccb9a9aa6914b2b9fd4d
22SHA1 (patch-an) = 70195df18c833e46d354e9f2a0212e2bf03e68d2 22SHA1 (patch-an) = 70195df18c833e46d354e9f2a0212e2bf03e68d2
23SHA1 (patch-ao) = 23106adc13a2ea06f94be807a188c8320f4fde8a 23SHA1 (patch-ao) = 23106adc13a2ea06f94be807a188c8320f4fde8a
cvs diff -r1.4 -r1.5 pkgsrc/cad/felt/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/cad/felt/patches/patch-ab 2009/12/17 20:31:37 1.4
+++ pkgsrc/cad/felt/patches/patch-ab 2013/01/15 16:21:34 1.5
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: patch-ab,v 1.4 2009/12/17 20:31:37 abs Exp $ 1$NetBSD: patch-ab,v 1.5 2013/01/15 16:21:34 morr Exp $
2 2
3--- src/Velvet/Makefile.orig 2000-02-21 22:44:51.000000000 +0000 3--- src/Velvet/Makefile.orig 2000-02-21 22:44:51.000000000 +0000
4+++ src/Velvet/Makefile 4+++ src/Velvet/Makefile
5@@ -18,7 +18,7 @@ 5@@ -18,7 +18,7 @@
6 CFLAGS = $(CCOPTS) -I$(X11INC) -I$(TOPDIR)/include 6 CFLAGS = $(CCOPTS) -I$(X11INC) -I$(TOPDIR)/include
7 LDFLAGS = $(LDOPTS) -L$(X11LIB) 7 LDFLAGS = $(LDOPTS) -L$(X11LIB)
8 LIBS = $(LIBWIDGETS) $(LIBGEN) $(LIBFELT) $(LIBELT) $(LIBMTX)\ 8 LIBS = $(LIBWIDGETS) $(LIBGEN) $(LIBFELT) $(LIBELT) $(LIBMTX)\
9- -lXaw3d -lXmu -lXt -lSM -lICE -lXext -lX11 -lm 9- -lXaw3d -lXmu -lXt -lSM -lICE -lXext -lX11 -lm
10+ ${LIBXAW} -lXmu -lXt -lSM -lICE -lXext -lX11 -lm 10+ -lXaw -lXmu -lXt -lSM -lICE -lXext -lX11 -lm
11 # /usr/X11R6/lib/libXaw3d.a /usr/X11R6/lib/libXmu.so.6.0 \ 11 # /usr/X11R6/lib/libXaw3d.a /usr/X11R6/lib/libXmu.so.6.0 \
12 # /usr/X11R6/lib/libXt.so.6.0 /usr/X11R6/lib/libSM.so.6.0 \ 12 # /usr/X11R6/lib/libXt.so.6.0 /usr/X11R6/lib/libSM.so.6.0 \
13 # /usr/X11R6/lib/libICE.so.6.0 /usr/X11R6/lib/libXext.so.6.0 \ 13 # /usr/X11R6/lib/libICE.so.6.0 /usr/X11R6/lib/libXext.so.6.0 \
14@@ -40,4 +40,4 @@ include $(TOPDIR)/etc/Makefile.bin 14@@ -40,4 +40,4 @@ include $(TOPDIR)/etc/Makefile.bin
15  15
16 velvet.o: velvet.ad.h interface.h 16 velvet.o: velvet.ad.h interface.h
17  17
18-install::; @$(INSTALL) -m 0644 Velvet.ad $(X11DEF) 2> /dev/null || true 18-install::; @$(INSTALL) -m 0644 Velvet.ad $(X11DEF) 2> /dev/null || true
19+install::; @$(INSTALL) -m 0644 Velvet.ad $(DESTDIR)$(X11DEF)/Velvet 2> /dev/null || true 19+install::; @$(INSTALL) -m 0644 Velvet.ad $(DESTDIR)$(X11DEF)/Velvet 2> /dev/null || true
cvs diff -r1.55 -r1.56 pkgsrc/editors/vim-xaw/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/vim-xaw/Makefile 2013/01/14 23:30:34 1.55
+++ pkgsrc/editors/vim-xaw/Makefile 2013/01/15 16:21:34 1.56
@@ -1,40 +1,35 @@ @@ -1,40 +1,35 @@
1# $NetBSD: Makefile,v 1.55 2013/01/14 23:30:34 morr Exp $ 1# $NetBSD: Makefile,v 1.56 2013/01/15 16:21:34 morr Exp $
2 2
3PKGNAME= vim-xaw-${VIM_VERSION}.${VIM_PATCHLEVEL} 3PKGNAME= vim-xaw-${VIM_VERSION}.${VIM_PATCHLEVEL}
4COMMENT= Vim editor (vi clone) with X11 Athena GUI 4COMMENT= Vim editor (vi clone) with X11 Athena GUI
5 5
6.include "../../editors/vim-share/Makefile.common" 6.include "../../editors/vim-share/Makefile.common"
7 7
8DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share 8DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share
9CONFLICTS+= vim-[0-9]* vim-gtk-[0-9]* vim-gtk2-[0-9]* 9CONFLICTS+= vim-[0-9]* vim-gtk-[0-9]* vim-gtk2-[0-9]*
10CONFLICTS+= vim-motif-[0-9]* vim-kde-[0-9]* 10CONFLICTS+= vim-motif-[0-9]* vim-kde-[0-9]*
11 11
12CONFIGURE_ARGS+= --enable-gui=athena 12CONFIGURE_ARGS+= --enable-gui=athena
13CONFIGURE_ARGS+= --with-tlib=${BUILDLINK_LIBNAME.termcap} 13CONFIGURE_ARGS+= --with-tlib=${BUILDLINK_LIBNAME.termcap}
14 14
15BUILD_TARGET= vim 15BUILD_TARGET= vim
16INSTALL_TARGET= installvimbin 16INSTALL_TARGET= installvimbin
17 17
18INSTALLATION_DIRS+= ${PKGMANDIR}/man1 18INSTALLATION_DIRS+= ${PKGMANDIR}/man1
19 19
20.include "../../mk/bsd.prefs.mk" 20.include "../../mk/bsd.prefs.mk"
21 21
22.if defined(XAW_TYPE) && (${XAW_TYPE} == "3d" || ${XAW_TYPE} == "xpm") 
23MAKE_ENV+= XAW_LIB="-lXaw3d" 
24.else 
25XAW_TYPE= standard 
26MAKE_ENV+= XAW_LIB="-lXaw" 22MAKE_ENV+= XAW_LIB="-lXaw"
27.endif 
28 23
29post-install: 24post-install:
30.for f in gvim.1 gview.1 rgvim.1 rgview.1 25.for f in gvim.1 gview.1 rgvim.1 rgview.1
31 ${RM} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${f} 26 ${RM} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${f}
32 ${LN} -s vim.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${f} 27 ${LN} -s vim.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${f}
33.endfor 28.endfor
34.for f in gvim gview rgvim rgview rvim rview 29.for f in gvim gview rgvim rgview rvim rview
35 ${RM} -f ${DESTDIR}${PREFIX}/bin/${f} 30 ${RM} -f ${DESTDIR}${PREFIX}/bin/${f}
36 ${LN} -s vim ${DESTDIR}${PREFIX}/bin/${f} 31 ${LN} -s vim ${DESTDIR}${PREFIX}/bin/${f}
37.endfor 32.endfor
38 33
39.include "../../converters/libiconv/buildlink3.mk" 34.include "../../converters/libiconv/buildlink3.mk"
40.include "../../devel/gettext-lib/buildlink3.mk" 35.include "../../devel/gettext-lib/buildlink3.mk"
cvs diff -r1.28 -r1.29 pkgsrc/games/xfrisk/Makefile (expand / switch to unified diff)

--- pkgsrc/games/xfrisk/Makefile 2012/10/06 11:55:00 1.28
+++ pkgsrc/games/xfrisk/Makefile 2013/01/15 16:21:34 1.29
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.28 2012/10/06 11:55:00 asau Exp $ 1# $NetBSD: Makefile,v 1.29 2013/01/15 16:21:34 morr Exp $
2# 2#
3 3
4DISTNAME= xfrisk-1.2 4DISTNAME= xfrisk-1.2
5PKGREVISION= 7 5PKGREVISION= 7
6CATEGORIES= games 6CATEGORIES= games
7MASTER_SITES= http://www.tuxick.net/xfrisk/files/ 7MASTER_SITES= http://www.tuxick.net/xfrisk/files/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.tuxick.net/xfrisk/ 10HOMEPAGE= http://www.tuxick.net/xfrisk/
11COMMENT= X11 version of the classic Risk board game 11COMMENT= X11 version of the classic Risk board game
12# LICENSE pending investigation; absence of LICENSE violates 12# LICENSE pending investigation; absence of LICENSE violates
13# "RESTRICTED implies LICENSE" pkgsrc rule. 13# "RESTRICTED implies LICENSE" pkgsrc rule.
14#LICENSE= gnu-gpl-v2 14#LICENSE= gnu-gpl-v2
@@ -19,21 +19,17 @@ USE_TOOLS+= gmake @@ -19,21 +19,17 @@ USE_TOOLS+= gmake
19 19
20RESTRICTED= Possible trademark infringement 20RESTRICTED= Possible trademark infringement
21NO_SRC_ON_FTP= ${RESTRICTED} 21NO_SRC_ON_FTP= ${RESTRICTED}
22NO_BIN_ON_FTP= ${RESTRICTED} 22NO_BIN_ON_FTP= ${RESTRICTED}
23NO_SRC_ON_CDROM=${RESTRICTED} 23NO_SRC_ON_CDROM=${RESTRICTED}
24NO_BIN_ON_CDROM=${RESTRICTED} 24NO_BIN_ON_CDROM=${RESTRICTED}
25 25
26.include "../../mk/bsd.prefs.mk" 26.include "../../mk/bsd.prefs.mk"
27 27
28LIBS.SunOS= -lsocket -lnsl 28LIBS.SunOS= -lsocket -lnsl
29MAKE_ENV+= LIBS=${LIBS:Q} 29MAKE_ENV+= LIBS=${LIBS:Q}
30 30
31# xfrisk doesn't work with standard Xaw. 31# xfrisk doesn't work with standard Xaw.
32XAW_TYPE?= 3d 32XAW_TYPE= 3d
33 
34.if ${XAW_TYPE} == standard 
35XAW_TYPE=3d 
36.endif 
37 33
38.include "../../mk/xaw.buildlink3.mk" 34.include "../../mk/xaw.buildlink3.mk"
39.include "../../mk/bsd.pkg.mk" 35.include "../../mk/bsd.pkg.mk"
cvs diff -r1.9 -r1.10 pkgsrc/games/xfrisk/distinfo (expand / switch to unified diff)

--- pkgsrc/games/xfrisk/distinfo 2012/02/05 00:02:47 1.9
+++ pkgsrc/games/xfrisk/distinfo 2013/01/15 16:21:34 1.10
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.9 2012/02/05 00:02:47 dholland Exp $ 1$NetBSD: distinfo,v 1.10 2013/01/15 16:21:34 morr Exp $
2 2
3SHA1 (xfrisk-1.2.tar.gz) = 2a82c4be95e151fd34f816aaa125f3eb237c28be 3SHA1 (xfrisk-1.2.tar.gz) = 2a82c4be95e151fd34f816aaa125f3eb237c28be
4RMD160 (xfrisk-1.2.tar.gz) = 7e55be2742bf9b2db40cc10156a6ff615bc37e7a 4RMD160 (xfrisk-1.2.tar.gz) = 7e55be2742bf9b2db40cc10156a6ff615bc37e7a
5Size (xfrisk-1.2.tar.gz) = 228943 bytes 5Size (xfrisk-1.2.tar.gz) = 228943 bytes
6SHA1 (patch-aa) = bfaca880c2d88125628d0b724638eb54e27bf96d 6SHA1 (patch-aa) = eb7ec1f41c10582ece9dc65d858e5e03b2856049
7SHA1 (patch-ab) = 8c458f0fa7db8e2a032f592b857f4024769cb4f1 7SHA1 (patch-ab) = 8c458f0fa7db8e2a032f592b857f4024769cb4f1
8SHA1 (patch-ac) = ed2194b764c3d78eedabceb9136814cffcb8f25f 8SHA1 (patch-ac) = ed2194b764c3d78eedabceb9136814cffcb8f25f
9SHA1 (patch-ad) = abd57e121edccbf1f3f78d8f124fbc198722dfcd 9SHA1 (patch-ad) = abd57e121edccbf1f3f78d8f124fbc198722dfcd
10SHA1 (patch-ae) = 173820eabda55fce02fedae4be2d853ba7d5b31f 10SHA1 (patch-ae) = 173820eabda55fce02fedae4be2d853ba7d5b31f
11SHA1 (patch-gui_c) = 7317a10b1883a5f230c5dd8e3be89d10598d4fb4 11SHA1 (patch-gui_c) = 7317a10b1883a5f230c5dd8e3be89d10598d4fb4
cvs diff -r1.5 -r1.6 pkgsrc/games/xfrisk/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/games/xfrisk/patches/patch-aa 2009/05/23 15:14:21 1.5
+++ pkgsrc/games/xfrisk/patches/patch-aa 2013/01/15 16:21:34 1.6
@@ -1,99 +1,97 @@ @@ -1,99 +1,97 @@
1$NetBSD: patch-aa,v 1.5 2009/05/23 15:14:21 dholland Exp $ 1$NetBSD: patch-aa,v 1.6 2013/01/15 16:21:34 morr Exp $
2 2
3- take build configuration from inherited pkgsrc variables 3- take build configuration from inherited pkgsrc variables
4- install under $(DESTDIR) 4- install under $(DESTDIR)
5 5
6--- Makefile.orig 2000-01-23 14:01:55.000000000 -0500 6--- Makefile.orig 2000-01-23 19:01:55.000000000 +0000
7+++ Makefile 2009-05-23 11:08:33.000000000 -0400 7+++ Makefile
8@@ -55,9 +55,9 @@ 8@@ -55,9 +55,9 @@ DROPALL=
9 #################### 9 ####################
10 # C compiler options 10 # C compiler options
11 # GNU gcc is recommended. 11 # GNU gcc is recommended.
12-CC=gcc 12-CC=gcc
13+#CC=gcc 13+#CC=gcc
14 # Use these with gcc 14 # Use these with gcc
15-CFLAGS=-g -Wall -W -fno-common -pedantic 15-CFLAGS=-g -Wall -W -fno-common -pedantic
16+#CFLAGS+= -Wall -W -fno-common -pedantic 16+#CFLAGS+= -Wall -W -fno-common -pedantic
17  17
18 # If you don't have gcc, don't use -Wall -W -fno-common 18 # If you don't have gcc, don't use -Wall -W -fno-common
19 #CFLAGS=-g 19 #CFLAGS=-g
20@@ -77,25 +77,25 @@ 20@@ -77,23 +77,23 @@ CFLAGS=-g -Wall -W -fno-common -pedantic
21 #CFLAGS+=-DTEST_GAME 21 #CFLAGS+=-DTEST_GAME
22  22
23 ## Initial linker options 23 ## Initial linker options
24-LDFLAGS= 24-LDFLAGS=
25+#LDFLAGS= 25+#LDFLAGS=
26  26
27 ## Installation prefix 27 ## Installation prefix
28 # Adjust to taste. Stuff gets installed here. 28 # Adjust to taste. Stuff gets installed here.
29-PREFIX=/usr/local 29-PREFIX=/usr/local
30+#PREFIX=/usr/local 30+#PREFIX=/usr/local
31 #PREFIX=/usr/local/X11 31 #PREFIX=/usr/local/X11
32  32
33 ## X11 location and options 33 ## X11 location and options
34 # for X11R6 34 # for X11R6
35 # Point this at your X tree. 35 # Point this at your X tree.
36-XDIR=/usr/X11R6 36-XDIR=/usr/X11R6
37+XDIR=${X11BASE} 37+XDIR=${X11BASE}
38 #XDIR=/usr/local/X11 38 #XDIR=/usr/local/X11
39 #XDIR=/usr/openwin 39 #XDIR=/usr/openwin
40  40
41 # try Xaw if you don't have Xaw3d 41 # try Xaw if you don't have Xaw3d
42 #XAW=Xaw 42-#XAW=Xaw
43-XAW=Xaw3d 43-XAW=Xaw3d
44+XAW=${LIBXAW} 44+XAW=Xaw
 45+#XAW=Xaw3d
45  46
46-XLIBS=-L$(XDIR)/lib -l$(XAW) -lXext -lXmu -lXt -lSM -lICE -lX11 47 XLIBS=-L$(XDIR)/lib -l$(XAW) -lXext -lXmu -lXt -lSM -lICE -lX11
47+XLIBS=-L$(XDIR)/lib $(XAW) -lXext -lXmu -lXt -lSM -lICE -lX11 
48  48
49 XINC=-I$(XDIR)/include 49@@ -106,7 +106,6 @@ CFLAGS+=$(XINC)
50 CFLAGS+=$(XINC) 
51@@ -106,7 +106,6 @@ 
52 # System V (Solaris, Irix, etc.) will probably want -lsocket -lnsl. 50 # System V (Solaris, Irix, etc.) will probably want -lsocket -lnsl.
53 #LIBS=-lsocket -lnsl 51 #LIBS=-lsocket -lnsl
54 # on other systems leave LIBS blank for now 52 # on other systems leave LIBS blank for now
55-LIBS= 53-LIBS=
56  54
57 # On some systems -DNARROWPROTO is needed for working Xaw scrollbars 55 # On some systems -DNARROWPROTO is needed for working Xaw scrollbars
58 # This includes FreeBSD 3.x and recent Linux 56 # This includes FreeBSD 3.x and recent Linux
59@@ -208,16 +207,16 @@ 57@@ -208,16 +207,16 @@ libfriskAI.a: network.o aiDice.o game.o
60 $(RANLIB) $@ 58 $(RANLIB) $@
61  59
62 install: all 60 install: all
63- -(umask 022; mkdir -p -m755 $(LIBDIR) $(BINDIR) $(APPLOADDIR)) 61- -(umask 022; mkdir -p -m755 $(LIBDIR) $(BINDIR) $(APPLOADDIR))
64- $(INSTALL_DATA) $(MAP) $(LIBDIR) 62- $(INSTALL_DATA) $(MAP) $(LIBDIR)
65- $(INSTALL_DATA) $(COUNTRY) $(LIBDIR) 63- $(INSTALL_DATA) $(COUNTRY) $(LIBDIR)
66- $(INSTALL_DATA) $(HELP) $(LIBDIR) 64- $(INSTALL_DATA) $(HELP) $(LIBDIR)
67- $(INSTALL_BIN) risk $(BINDIR) 65- $(INSTALL_BIN) risk $(BINDIR)
68- $(INSTALL_BIN) xfrisk $(BINDIR) 66- $(INSTALL_BIN) xfrisk $(BINDIR)
69- $(INSTALL_BIN) friskserver $(BINDIR) 67- $(INSTALL_BIN) friskserver $(BINDIR)
70- $(INSTALL_BIN) aiDummy $(BINDIR) 68- $(INSTALL_BIN) aiDummy $(BINDIR)
71- $(INSTALL_BIN) aiConway $(BINDIR) 69- $(INSTALL_BIN) aiConway $(BINDIR)
72- $(INSTALL_BIN) aiColson $(BINDIR) 70- $(INSTALL_BIN) aiColson $(BINDIR)
73+ -(umask 022; mkdir -p -m755 $(DESTDIR)$(LIBDIR) $(DESTDIR)$(BINDIR)) 71+ -(umask 022; mkdir -p -m755 $(DESTDIR)$(LIBDIR) $(DESTDIR)$(BINDIR))
74+ $(INSTALL_DATA) $(MAP) $(DESTDIR)$(LIBDIR) 72+ $(INSTALL_DATA) $(MAP) $(DESTDIR)$(LIBDIR)
75+ $(INSTALL_DATA) $(COUNTRY) $(DESTDIR)$(LIBDIR) 73+ $(INSTALL_DATA) $(COUNTRY) $(DESTDIR)$(LIBDIR)
76+ $(INSTALL_DATA) $(HELP) $(DESTDIR)$(LIBDIR) 74+ $(INSTALL_DATA) $(HELP) $(DESTDIR)$(LIBDIR)
77+ $(INSTALL_BIN) risk $(DESTDIR)$(BINDIR) 75+ $(INSTALL_BIN) risk $(DESTDIR)$(BINDIR)
78+ $(INSTALL_BIN) xfrisk $(DESTDIR)$(BINDIR) 76+ $(INSTALL_BIN) xfrisk $(DESTDIR)$(BINDIR)
79+ $(INSTALL_BIN) friskserver $(DESTDIR)$(BINDIR) 77+ $(INSTALL_BIN) friskserver $(DESTDIR)$(BINDIR)
80+ $(INSTALL_BIN) aiDummy $(DESTDIR)$(BINDIR) 78+ $(INSTALL_BIN) aiDummy $(DESTDIR)$(BINDIR)
81+ $(INSTALL_BIN) aiConway $(DESTDIR)$(BINDIR) 79+ $(INSTALL_BIN) aiConway $(DESTDIR)$(BINDIR)
82+ $(INSTALL_BIN) aiColson $(DESTDIR)$(BINDIR) 80+ $(INSTALL_BIN) aiColson $(DESTDIR)$(BINDIR)
83  81
84  82
85 # Other targets 83 # Other targets
86@@ -225,13 +224,13 @@ 84@@ -225,13 +224,13 @@ Countries.risk World.risk: World.ppm bui
87 ./buildmap World.ppm World.risk Countries.risk 85 ./buildmap World.ppm World.risk Countries.risk
88  86
89 uninstall: 87 uninstall:
90- rm -rf $(LIBDIR) 88- rm -rf $(LIBDIR)
91- rm -f $(BINDIR)/risk 89- rm -f $(BINDIR)/risk
92- rm -f $(BINDIR)/xfrisk 90- rm -f $(BINDIR)/xfrisk
93- rm -f $(BINDIR)/friskserver 91- rm -f $(BINDIR)/friskserver
94- rm -f $(BINDIR)/aiDummy 92- rm -f $(BINDIR)/aiDummy
95- rm -f $(BINDIR)/aiConway 93- rm -f $(BINDIR)/aiConway
96- rm -f $(BINDIR)/aiColson 94- rm -f $(BINDIR)/aiColson
97+ rm -rf $(DESTDIR)$(LIBDIR) 95+ rm -rf $(DESTDIR)$(LIBDIR)
98+ rm -f $(DESTDIR)$(BINDIR)/risk 96+ rm -f $(DESTDIR)$(BINDIR)/risk
99+ rm -f $(DESTDIR)$(BINDIR)/xfrisk 97+ rm -f $(DESTDIR)$(BINDIR)/xfrisk
cvs diff -r1.5 -r1.6 pkgsrc/mk/xaw.buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/mk/xaw.buildlink3.mk 2007/03/09 02:04:04 1.5
+++ pkgsrc/mk/xaw.buildlink3.mk 2013/01/15 16:21:34 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: xaw.buildlink3.mk,v 1.5 2007/03/09 02:04:04 rillig Exp $ 1# $NetBSD: xaw.buildlink3.mk,v 1.6 2013/01/15 16:21:34 morr Exp $
2# 2#
3# This file selects the X Athena Widgets (Xaw) implementation. 3# This file selects the X Athena Widgets (Xaw) implementation.
4# 4#
5# User-settable variables: 5# User-settable variables:
6# 6#
7# XAW_TYPE 7# XAW_TYPE
8# The Xaw type to be selected. 8# The Xaw type to be selected.
9# 9#
10# Possible: 3d neXtaw standard xpm 10# Possible: 3d neXtaw standard xpm
11# Default: standard 11# Default: standard
12# 12#
13 13
14.if !defined(XAW_BUILDLINK3_MK) 14.if !defined(XAW_BUILDLINK3_MK)
@@ -29,16 +29,14 @@ BUILDLINK_PREFIX.Xaw?= ${BUILDLINK_PREFI @@ -29,16 +29,14 @@ BUILDLINK_PREFIX.Xaw?= ${BUILDLINK_PREFI
29BUILDLINK_PREFIX.Xaw?= ${BUILDLINK_PREFIX.neXtaw} 29BUILDLINK_PREFIX.Xaw?= ${BUILDLINK_PREFIX.neXtaw}
30.elif ${XAW_TYPE} == "standard" 30.elif ${XAW_TYPE} == "standard"
31. if ${X11_TYPE} == "modular" 31. if ${X11_TYPE} == "modular"
32. include "../../x11/libXaw/buildlink3.mk" 32. include "../../x11/libXaw/buildlink3.mk"
33BUILDLINK_PREFIX.Xaw?= ${BUILDLINK_PREFIX.libXaw} 33BUILDLINK_PREFIX.Xaw?= ${BUILDLINK_PREFIX.libXaw}
34. else 34. else
35. include "../../mk/x11.buildlink3.mk" 35. include "../../mk/x11.buildlink3.mk"
36BUILDLINK_PREFIX.Xaw?= ${X11BASE} 36BUILDLINK_PREFIX.Xaw?= ${X11BASE}
37. endif 37. endif
38.else 38.else
39PKG_FAIL_REASON+= "[xaw.buildlink3.mk] Invalid value ${XAW_TYPE} for XAW_TYPE." 39PKG_FAIL_REASON+= "[xaw.buildlink3.mk] Invalid value ${XAW_TYPE} for XAW_TYPE."
40.endif 40.endif
41 41
42MAKE_ENV+= LIBXAW=${LIBXAW:Q} 
43 
44.endif # XAW_BUILDLINK3_MK 42.endif # XAW_BUILDLINK3_MK
cvs diff -r1.25 -r1.26 pkgsrc/time/emiclock/Makefile (expand / switch to unified diff)

--- pkgsrc/time/emiclock/Makefile 2012/10/08 13:04:17 1.25
+++ pkgsrc/time/emiclock/Makefile 2013/01/15 16:21:35 1.26
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.25 2012/10/08 13:04:17 asau Exp $ 1# $NetBSD: Makefile,v 1.26 2013/01/15 16:21:35 morr Exp $
2# 2#
3 3
4DISTNAME= emiclock-2.0.2 4DISTNAME= emiclock-2.0.2
5PKGREVISION= 6 5PKGREVISION= 6
6CATEGORIES= x11 time 6CATEGORIES= x11 time
7MASTER_SITES= ${MASTER_SITE_FREEBSD} 7MASTER_SITES= ${MASTER_SITE_FREEBSD}
8 8
9MAINTAINER= minoura@NetBSD.org 9MAINTAINER= minoura@NetBSD.org
10COMMENT= Analog clock with image in the middle 10COMMENT= Analog clock with image in the middle
11LICENSE= emiclock-license 11LICENSE= emiclock-license
12 12
13RESTRICTED= Do not distribute 13RESTRICTED= Do not distribute
14NO_SRC_ON_FTP=${RESTRICTED} 14NO_SRC_ON_FTP=${RESTRICTED}
@@ -24,15 +24,16 @@ USE_IMAKE= yes @@ -24,15 +24,16 @@ USE_IMAKE= yes
24post-patch: 24post-patch:
25 ${ECHO} "#define USE_XAW3D" > ${WRKSRC}/xawconfig.h 25 ${ECHO} "#define USE_XAW3D" > ${WRKSRC}/xawconfig.h
26.else 26.else
27post-patch: 27post-patch:
28 ${ECHO} "#undef USE_XAW3D" > ${WRKSRC}/xawconfig.h 28 ${ECHO} "#undef USE_XAW3D" > ${WRKSRC}/xawconfig.h
29.endif 29.endif
30 30
31INSTALLATION_DIRS= lib/X11/ja_JP.eucJP/app-defaults 31INSTALLATION_DIRS= lib/X11/ja_JP.eucJP/app-defaults
32 32
33post-install: 33post-install:
34 ${INSTALL_DATA} ${WRKSRC}/resources/R6/EUC/EmiClock.ad \ 34 ${INSTALL_DATA} ${WRKSRC}/resources/R6/EUC/EmiClock.ad \
35 ${DESTDIR}${PREFIX}/lib/X11/ja_JP.eucJP/app-defaults/EmiClock 35 ${DESTDIR}${PREFIX}/lib/X11/ja_JP.eucJP/app-defaults/EmiClock
36 36
 37.include "../../x11/libXpm/buildlink3.mk"
37.include "../../mk/xaw.buildlink3.mk" 38.include "../../mk/xaw.buildlink3.mk"
38.include "../../mk/bsd.pkg.mk" 39.include "../../mk/bsd.pkg.mk"
cvs diff -r1.9 -r1.10 pkgsrc/time/emiclock/distinfo (expand / switch to unified diff)

--- pkgsrc/time/emiclock/distinfo 2011/03/23 14:09:31 1.9
+++ pkgsrc/time/emiclock/distinfo 2013/01/15 16:21:35 1.10
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.9 2011/03/23 14:09:31 obache Exp $ 1$NetBSD: distinfo,v 1.10 2013/01/15 16:21:35 morr Exp $
2 2
3SHA1 (emiclock-2.0.2.tar.gz) = e1c042d600faf59ecdb11f1199f1793282db90c1 3SHA1 (emiclock-2.0.2.tar.gz) = e1c042d600faf59ecdb11f1199f1793282db90c1
4RMD160 (emiclock-2.0.2.tar.gz) = 25a753aaefbd9b8b57c16fbfe13678a002ab8179 4RMD160 (emiclock-2.0.2.tar.gz) = 25a753aaefbd9b8b57c16fbfe13678a002ab8179
5Size (emiclock-2.0.2.tar.gz) = 308682 bytes 5Size (emiclock-2.0.2.tar.gz) = 308682 bytes
6SHA1 (patch-aa) = a5eea083c1a05bacd2605ac8e0ecbef9310a8cfd 6SHA1 (patch-aa) = a5eea083c1a05bacd2605ac8e0ecbef9310a8cfd
7SHA1 (patch-ab) = 8c83e056bd03b0f493f91afd33ce572ed673511b 7SHA1 (patch-ab) = 8c83e056bd03b0f493f91afd33ce572ed673511b
8SHA1 (patch-ac) = 4b020ac03c958d1ca44968c17b7d657edda77690 8SHA1 (patch-ac) = 4b020ac03c958d1ca44968c17b7d657edda77690
9SHA1 (patch-ad) = e3f57f3b7d68efa401ae471e786476e68b2bd282 9SHA1 (patch-ad) = 3cde51980c8802a225a6a91291297176fc9dba69
10SHA1 (patch-ae) = ecbc4f169c0fd249ba1cc0c3031922c02f7a6bb2 10SHA1 (patch-ae) = ecbc4f169c0fd249ba1cc0c3031922c02f7a6bb2
11SHA1 (patch-af) = f5b6c40f42136ee8953bf259a78fa0d8be048503 11SHA1 (patch-af) = f5b6c40f42136ee8953bf259a78fa0d8be048503
12SHA1 (patch-ag) = 43c750de300cbda8cb89917894bbc73b18974c5d 12SHA1 (patch-ag) = 43c750de300cbda8cb89917894bbc73b18974c5d
13SHA1 (patch-ah) = 227494794d7c28620d11800fa6087ab765dd5562 13SHA1 (patch-ah) = 227494794d7c28620d11800fa6087ab765dd5562
cvs diff -r1.6 -r1.7 pkgsrc/time/emiclock/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/time/emiclock/patches/patch-ad 2011/03/23 14:09:31 1.6
+++ pkgsrc/time/emiclock/patches/patch-ad 2013/01/15 16:21:35 1.7
@@ -1,40 +1,40 @@ @@ -1,40 +1,40 @@
1$NetBSD: patch-ad,v 1.6 2011/03/23 14:09:31 obache Exp $ 1$NetBSD: patch-ad,v 1.7 2013/01/15 16:21:35 morr Exp $
2 2
3--- Imakefile.orig 1999-09-02 14:33:47.000000000 +0000 3--- Imakefile.orig 1999-09-02 14:33:47.000000000 +0000
4+++ Imakefile 4+++ Imakefile
5@@ -102,9 +102,14 @@ XCOMM 5@@ -102,9 +102,14 @@ XCOMM
6 #endif /* LinuxArchitecture */ 6 #endif /* LinuxArchitecture */
7  7
8 /* FreeBSD */ 8 /* FreeBSD */
9-#if defined(i386BsdArchitecture) && (defined(i386FreeBsd) || defined(FreeBSDArchitecture)) 9-#if defined(i386BsdArchitecture) && (defined(i386FreeBsd) || defined(FreeBSDArchitecture))
10+#if defined(i386BsdArchitecture) && defined(i386FreeBsd) || defined(FreeBSDArchitecture) 10+#if defined(i386BsdArchitecture) && defined(i386FreeBsd) || defined(FreeBSDArchitecture)
11 #define StartupSound myu.au 11 #define StartupSound myu.au
12-#endif /* i386BsdArchitecture && (i386FreeBsd || FreeBSDArchitecture) */ 12-#endif /* i386BsdArchitecture && (i386FreeBsd || FreeBSDArchitecture) */
13+#endif /* i386BsdArchitecture && i386FreeBsd || FreeBSDArchitecture */ 13+#endif /* i386BsdArchitecture && i386FreeBsd || FreeBSDArchitecture */
14+ 14+
15+/* NetBSD */ 15+/* NetBSD */
16+#if defined(NetBSDArchitecture) 16+#if defined(NetBSDArchitecture)
17+#define StartupSound myu.au 17+#define StartupSound myu.au
18+#endif /* NetBSDArchitecture */ 18+#endif /* NetBSDArchitecture */
19  19
20 #else /* USE_NETAUDIO */ 20 #else /* USE_NETAUDIO */
21  21
22@@ -143,7 +148,7 @@ XCOMM 22@@ -143,7 +148,7 @@ XCOMM
23 LOCAL_LIBRARIES = XawClientLibs 23 LOCAL_LIBRARIES = XawClientLibs
24 # ifdef USE_XAW3D 24 # ifdef USE_XAW3D
25 DEPXAWLIB = $(USRLIBDIR)/libXaw3d.a 25 DEPXAWLIB = $(USRLIBDIR)/libXaw3d.a
26- XAWLIB = -lXaw3d 26- XAWLIB = -lXaw3d
27+ XAWLIB = ${LIBXAW} 27+ XAWLIB = -lXaw
28 # endif /* USE_XAW3D */ 28 # endif /* USE_XAW3D */
29  29
30 SYS_LIBRARIES = SoundLibrary -lm 30 SYS_LIBRARIES = SoundLibrary -lm
31@@ -219,6 +224,8 @@ XCOMM 31@@ -219,6 +224,8 @@ XCOMM
32 #define ResourceDir resources/Xaw3d 32 #define ResourceDir resources/Xaw3d
33 #endif /* !USE_XAW3D */ 33 #endif /* !USE_XAW3D */
34  34
35+AllTarget(EmiClock.ad) 35+AllTarget(EmiClock.ad)
36+ 36+
37 EmiClock.ad:: ResourceDir/EmiClock.ad 37 EmiClock.ad:: ResourceDir/EmiClock.ad
38 $(CP) ResourceDir/EmiClock.ad . 38 $(CP) ResourceDir/EmiClock.ad .
39  39
40@@ -234,6 +241,6 @@ XCOMM 40@@ -234,6 +241,6 @@ XCOMM
cvs diff -r1.5 -r1.6 pkgsrc/time/xalarm/distinfo (expand / switch to unified diff)

--- pkgsrc/time/xalarm/distinfo 2006/04/16 01:00:06 1.5
+++ pkgsrc/time/xalarm/distinfo 2013/01/15 16:21:35 1.6
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.5 2006/04/16 01:00:06 perry Exp $ 1$NetBSD: distinfo,v 1.6 2013/01/15 16:21:35 morr Exp $
2 2
3SHA1 (xalarm-3.06.tar.gz) = a4365224c14491d1f089f4a30722d8e33ccccad5 3SHA1 (xalarm-3.06.tar.gz) = a4365224c14491d1f089f4a30722d8e33ccccad5
4RMD160 (xalarm-3.06.tar.gz) = 9a9a6fd67669e6464729bdba2210ef38265dd5ea 4RMD160 (xalarm-3.06.tar.gz) = 9a9a6fd67669e6464729bdba2210ef38265dd5ea
5Size (xalarm-3.06.tar.gz) = 55351 bytes 5Size (xalarm-3.06.tar.gz) = 55351 bytes
6SHA1 (patch-aa) = 9d6837ff4ba95d82b37df9144178581e39a48283 6SHA1 (patch-aa) = 0da8a64ac4cb0399f38ddfd8901b1455c351eeb2
7SHA1 (patch-ab) = f9890acefcef2111da7284f2c96f21875bf27d29 7SHA1 (patch-ab) = f9890acefcef2111da7284f2c96f21875bf27d29
8SHA1 (patch-ac) = c053df3ac2503a03233e076b590e6387b04f6faa 8SHA1 (patch-ac) = c053df3ac2503a03233e076b590e6387b04f6faa
cvs diff -r1.3 -r1.4 pkgsrc/time/xalarm/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/time/xalarm/patches/patch-aa 2006/04/16 01:00:06 1.3
+++ pkgsrc/time/xalarm/patches/patch-aa 2013/01/15 16:21:35 1.4
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-aa,v 1.3 2006/04/16 01:00:06 perry Exp $ 1$NetBSD: patch-aa,v 1.4 2013/01/15 16:21:35 morr Exp $
2 2
3--- Imakefile.orig 1995-07-21 10:32:07.000000000 -0400 3--- Imakefile.orig 1995-07-21 14:32:07.000000000 +0000
4+++ Imakefile 2006-04-15 20:52:05.000000000 -0400 4+++ Imakefile
5@@ -1,27 +1,27 @@ 5@@ -1,27 +1,27 @@
6-/**/# Based on an Imakefile from: 6-/**/# Based on an Imakefile from:
7-/**/# Andreas Stolcke 7-/**/# Andreas Stolcke
8-/**/# International Computer Science Institute, Berkeley. 8-/**/# International Computer Science Institute, Berkeley.
9-/**/# With help from: 9-/**/# With help from:
10-/**/# George Lindholm, Jonathan I. Kamens, Braham Levy. 10-/**/# George Lindholm, Jonathan I. Kamens, Braham Levy.
11- 11-
12- 12-
13-/**/# o Define FORKRETURNSSHORT/FORKRETURNSLONG/FORKRETURNSPID_T if your 13-/**/# o Define FORKRETURNSSHORT/FORKRETURNSLONG/FORKRETURNSPID_T if your
14-/**/# fork(2) returns short/long/pid_t not int. 14-/**/# fork(2) returns short/long/pid_t not int.
15-/**/# o Define USEFLOCK or USELOCKF to use flock(2) or lockf(3) to lock files, 15-/**/# o Define USEFLOCK or USELOCKF to use flock(2) or lockf(3) to lock files,
16-/**/# rather than fcntl(2). 16-/**/# rather than fcntl(2).
17-/**/# o Define USELSEEK to use lseek(2) to move to the end of the file, rather 17-/**/# o Define USELSEEK to use lseek(2) to move to the end of the file, rather
@@ -44,59 +44,58 @@ $NetBSD: patch-aa,v 1.3 2006/04/16 01:00 @@ -44,59 +44,58 @@ $NetBSD: patch-aa,v 1.3 2006/04/16 01:00
44+XCOMM # un/link(2)). 44+XCOMM # un/link(2)).
45+XCOMM # o Define USEGETHOSTNAME or USEUNAME (or neither if you don't have 45+XCOMM # o Define USEGETHOSTNAME or USEUNAME (or neither if you don't have
46+XCOMM # gethostname(2) or uname(2)) to get the name of your system. 46+XCOMM # gethostname(2) or uname(2)) to get the name of your system.
47+XCOMM # o Define USEGETPWUID to use getpwuid(3) and getuid(2) to get the user 47+XCOMM # o Define USEGETPWUID to use getpwuid(3) and getuid(2) to get the user
48+XCOMM # name and home directory on your system. Note that if you want to use 48+XCOMM # name and home directory on your system. Note that if you want to use
49+XCOMM # this method to get the user's home directory, but another method to get 49+XCOMM # this method to get the user's home directory, but another method to get
50+XCOMM # the user name, this symbol must still be defined. 50+XCOMM # the user name, this symbol must still be defined.
51+XCOMM # o Define USEGETLOGIN to use getlogin(3) to get the user name (note that 51+XCOMM # o Define USEGETLOGIN to use getlogin(3) to get the user name (note that
52+XCOMM # this may not work if xalarm is invoked from a pseudo terminal). 52+XCOMM # this may not work if xalarm is invoked from a pseudo terminal).
53+XCOMM # o Define USECUSERID to use cuserid(3) to get the user name. 53+XCOMM # o Define USECUSERID to use cuserid(3) to get the user name.
54  54
55 DEFINES = $(SIGNAL_DEFINES) -DUSERENAME -DUSEGETHOSTNAME -DUSEGETPWUID 55 DEFINES = $(SIGNAL_DEFINES) -DUSERENAME -DUSEGETHOSTNAME -DUSEGETPWUID
56  56
57@@ -29,29 +29,16 @@ 57@@ -29,29 +29,14 @@ DEFINES = $(SIGNAL_DEFINES) -DUSERENAME
58 OBJS = alarm.o when.o warnings.o times.o dates.o file.o fns.o xalarm.o 58 OBJS = alarm.o when.o warnings.o times.o dates.o file.o fns.o xalarm.o
59 SRCS = alarm.c when.c warnings.c times.c dates.c file.c fns.c xalarm.c 59 SRCS = alarm.c when.c warnings.c times.c dates.c file.c fns.c xalarm.c
60  60
61-# How we find commands. Use WHICH, LOCATE or FIND. 61-# How we find commands. Use WHICH, LOCATE or FIND.
62-WHICH= WHICH 62-WHICH= WHICH
63-MADE = test -f 63-MADE = test -f
64+XAWLIB = ${LIBXAW} 64-
65  
66 LOCAL_LIBRARIES = XawClientLibs 65 LOCAL_LIBRARIES = XawClientLibs
67  66
68-AllTarget (.config) 67-AllTarget (.config)
69 ComplexProgramTarget (xalarm) 68 ComplexProgramTarget (xalarm)
70  69
71 InstallAppDefaults (XAlarm) 70 InstallAppDefaults (XAlarm)
72 InstallAppDefaults (XAlarm-color) 71 InstallAppDefaults (XAlarm-color)
73 InstallMultipleFlags (xmemo xfortune xyow,$(BINDIR),$(INSTBINFLAGS)) 72 InstallMultipleFlags (xmemo xfortune xyow,$(BINDIR),$(INSTBINFLAGS))
74-InstallManPage (xmemo,$(MANDIR)) 73-InstallManPage (xmemo,$(MANDIR))
75-InstallManPage (xfortune,$(MANDIR)) 74-InstallManPage (xfortune,$(MANDIR))
76-InstallManPage (xyow,$(MANDIR)) 75-InstallManPage (xyow,$(MANDIR))
77- 76-
78-includes:: fns.h 77-includes:: fns.h
79- 78-
80-fns.h: 79-fns.h:
81- @./config.1st -quick $(WHICH) fortune yow 80- @./config.1st -quick $(WHICH) fortune yow
82- 81-
83-xmemo.man xyow.man xfortune.man: 82-xmemo.man xyow.man xfortune.man:
84- echo ".so man"`echo ManSuffix`"/xalarm."`echo ManSuffix` > $@ 83- echo ".so man"`echo ManSuffix`"/xalarm."`echo ManSuffix` > $@
85+InstallManPageAliases(xalarm,$(MANDIR),xmemo xfortune xyow) 84+InstallManPageAliases(xalarm,$(MANDIR),xmemo xfortune xyow)
86  85
87 xfortune:: 86 xfortune::
88  87
89@@ -60,14 +47,6 @@ 88@@ -60,14 +45,6 @@ xyow::
90 clean:: 89 clean::
91 $(RM) xfortune xyow xmemo.man xyow.man xfortune.man fns.h .config 90 $(RM) xfortune xyow xmemo.man xyow.man xfortune.man fns.h .config
92  91
93-config:: 92-config::
94- @./config.1st -quick $(WHICH) fortune yow 93- @./config.1st -quick $(WHICH) fortune yow
95- @xrdb -merge XAlarm.ad 94- @xrdb -merge XAlarm.ad
96- @xrdb -merge XAlarm.ad+ 95- @xrdb -merge XAlarm.ad+
97- 96-
98-.config:: 97-.config::
99- @-$(MADE) .config || make config 98- @-$(MADE) .config || make config
100- 99-
101 alarm.o: xalarm.h patchlevel.h 100 alarm.o: xalarm.h patchlevel.h
102 when.o: xalarm.h patchlevel.h dates.h 101 when.o: xalarm.h patchlevel.h dates.h
cvs diff -r1.17 -r1.18 pkgsrc/x11/Xaw-Xpm/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/Xaw-Xpm/buildlink3.mk 2012/06/15 23:06:02 1.17
+++ pkgsrc/x11/Xaw-Xpm/buildlink3.mk 2013/01/15 16:21:35 1.18
@@ -1,33 +1,29 @@ @@ -1,33 +1,29 @@
1# $NetBSD: buildlink3.mk,v 1.17 2012/06/15 23:06:02 dholland Exp $ 1# $NetBSD: buildlink3.mk,v 1.18 2013/01/15 16:21:35 morr Exp $
2 2
3BUILDLINK_TREE+= Xaw-Xpm 3BUILDLINK_TREE+= Xaw-Xpm
4 4
5.if !defined(XAW_XPM_BUILDLINK3_MK) 5.if !defined(XAW_XPM_BUILDLINK3_MK)
6XAW_XPM_BUILDLINK3_MK:= 6XAW_XPM_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.Xaw-Xpm+= Xaw-Xpm>=1.1 8BUILDLINK_API_DEPENDS.Xaw-Xpm+= Xaw-Xpm>=1.1
9BUILDLINK_ABI_DEPENDS.Xaw-Xpm+= Xaw-Xpm>=1.1nb2 9BUILDLINK_ABI_DEPENDS.Xaw-Xpm+= Xaw-Xpm>=1.1nb2
10BUILDLINK_PKGSRCDIR.Xaw-Xpm?= ../../x11/Xaw-Xpm 10BUILDLINK_PKGSRCDIR.Xaw-Xpm?= ../../x11/Xaw-Xpm
11 11
 12BUILDLINK_TRANSFORM+= l:Xaw:Xaw3d
 13
12.include "../../mk/bsd.fast.prefs.mk" 14.include "../../mk/bsd.fast.prefs.mk"
13 15
14.if ${X11_TYPE} == "modular" 16.if ${X11_TYPE} == "modular"
15buildlink-Xaw-Xpm-cookie: .PHONY buildlink-Xaw-Xpm-inc-hack 17buildlink-Xaw-Xpm-cookie: .PHONY buildlink-Xaw-Xpm-inc-hack
16 18
17buildlink-Xaw-Xpm-inc-hack: .PHONY buildlink-directories 19buildlink-Xaw-Xpm-inc-hack: .PHONY buildlink-directories
18 [ ! -h ${BUILDLINK_DIR}/include/X11/Xaw ] && \ 20 [ ! -h ${BUILDLINK_DIR}/include/X11/Xaw ] && \
19 ${MKDIR} ${BUILDLINK_DIR}/include/X11 && \ 21 ${MKDIR} ${BUILDLINK_DIR}/include/X11 && \
20 ${LN} -s Xaw3d ${BUILDLINK_DIR}/include/X11/Xaw 22 ${LN} -s Xaw3d ${BUILDLINK_DIR}/include/X11/Xaw
21.endif 23.endif
22 24
23LIBXAW?= -L${BUILDLINK_PREFIX.Xaw-Xpm}/lib \ 
24 ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.Xaw-Xpm}/lib \ 
25 -L${BUILDLINK_PREFIX.libXpm}/lib \ 
26 ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libXpm}/lib \ 
27 -lXaw3d -lXpm 
28 
29.include "../../x11/libXmu/buildlink3.mk" 25.include "../../x11/libXmu/buildlink3.mk"
30.include "../../x11/libXpm/buildlink3.mk" 26.include "../../x11/libXpm/buildlink3.mk"
31.endif # XAW_XPM_BUILDLINK3_MK 27.endif # XAW_XPM_BUILDLINK3_MK
32 28
33BUILDLINK_TREE+= -Xaw-Xpm 29BUILDLINK_TREE+= -Xaw-Xpm
cvs diff -r1.13 -r1.14 pkgsrc/x11/Xaw3d/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/Xaw3d/Attic/buildlink3.mk 2012/05/07 01:54:06 1.13
+++ pkgsrc/x11/Xaw3d/Attic/buildlink3.mk 2013/01/15 16:21:35 1.14
@@ -1,33 +1,30 @@ @@ -1,33 +1,30 @@
1# $NetBSD: buildlink3.mk,v 1.13 2012/05/07 01:54:06 dholland Exp $ 1# $NetBSD: buildlink3.mk,v 1.14 2013/01/15 16:21:35 morr Exp $
2 2
3BUILDLINK_TREE+= Xaw3d 3BUILDLINK_TREE+= Xaw3d
4 4
5.if !defined(XAW3D_BUILDLINK3_MK) 5.if !defined(XAW3D_BUILDLINK3_MK)
6XAW3D_BUILDLINK3_MK:= 6XAW3D_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.Xaw3d+= Xaw3d>=1.5 8BUILDLINK_API_DEPENDS.Xaw3d+= Xaw3d>=1.5
9BUILDLINK_ABI_DEPENDS.Xaw3d+= Xaw3d>=1.5Enb1 9BUILDLINK_ABI_DEPENDS.Xaw3d+= Xaw3d>=1.5Enb1
10BUILDLINK_PKGSRCDIR.Xaw3d?= ../../x11/Xaw3d 10BUILDLINK_PKGSRCDIR.Xaw3d?= ../../x11/Xaw3d
11 11
12BUILDLINK_TRANSFORM+= l:Xaw:Xaw3d 12BUILDLINK_TRANSFORM+= l:Xaw:Xaw3d
13 13
14.include "../../mk/bsd.fast.prefs.mk" 14.include "../../mk/bsd.fast.prefs.mk"
15 15
16.if ${X11_TYPE} == "modular" 16.if ${X11_TYPE} == "modular"
17.PHONY: buildlink-Xaw3d-inc-hack 17.PHONY: buildlink-Xaw3d-inc-hack
18buildlink-Xaw3d-cookie: buildlink-Xaw3d-inc-hack 18buildlink-Xaw3d-cookie: buildlink-Xaw3d-inc-hack
19 19
20buildlink-Xaw3d-inc-hack: buildlink-directories 20buildlink-Xaw3d-inc-hack: buildlink-directories
21 [ ! -h ${BUILDLINK_DIR}/include/X11/Xaw ] && \ 21 [ ! -h ${BUILDLINK_DIR}/include/X11/Xaw ] && \
22 ${MKDIR} ${BUILDLINK_DIR}/include/X11 && \ 22 ${MKDIR} ${BUILDLINK_DIR}/include/X11 && \
23 ${LN} -s Xaw3d ${BUILDLINK_DIR}/include/X11/Xaw 23 ${LN} -s Xaw3d ${BUILDLINK_DIR}/include/X11/Xaw
24.endif 24.endif
25 25
26.include "../../x11/libXmu/buildlink3.mk" 26.include "../../x11/libXmu/buildlink3.mk"
27 27
28LIBXAW?= -L${BUILDLINK_PREFIX.Xaw3d}/lib \ 
29 ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.Xaw3d}/lib \ 
30 -lXaw3d 
31.endif # XAW3D_BUILDLINK3_MK 28.endif # XAW3D_BUILDLINK3_MK
32 29
33BUILDLINK_TREE+= -Xaw3d 30BUILDLINK_TREE+= -Xaw3d
cvs diff -r1.58 -r1.59 pkgsrc/x11/kterm/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/kterm/Makefile 2012/10/29 05:06:32 1.58
+++ pkgsrc/x11/kterm/Makefile 2013/01/15 16:21:35 1.59
@@ -1,33 +1,28 @@ @@ -1,33 +1,28 @@
1# $NetBSD: Makefile,v 1.58 2012/10/29 05:06:32 asau Exp $ 1# $NetBSD: Makefile,v 1.59 2013/01/15 16:21:35 morr Exp $
2 2
3DISTNAME= kterm-6.2.0 3DISTNAME= kterm-6.2.0
4PKGREVISION= 23 4PKGREVISION= 23
5CATEGORIES= x11 5CATEGORIES= x11
6MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/} 6MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/}
7 7
8# the following patch includes NFS xauth patch, and kamo's wd0.2 patch. 8# the following patch includes NFS xauth patch, and kamo's wd0.2 patch.
9PATCH_SITES= ${MASTER_SITE_LOCAL} 9PATCH_SITES= ${MASTER_SITE_LOCAL}
10PATCHFILES= kterm-6.2.0-termios-wd0.2.patch2 \ 10PATCHFILES= kterm-6.2.0-termios-wd0.2.patch2 \
11 kterm-6.2.0-scroll-wd0.2.patch \ 11 kterm-6.2.0-scroll-wd0.2.patch \
12 kterm-6.2.0.NFS-xauth.patch \ 12 kterm-6.2.0.NFS-xauth.patch \
13 kterm-6.2.0.ext06.patch.gz 13 kterm-6.2.0.ext06.patch.gz
14PATCH_DIST_STRIP= -p1 14PATCH_DIST_STRIP= -p1
15 15
16MAINTAINER= pkgsrc-users@NetBSD.org 16MAINTAINER= pkgsrc-users@NetBSD.org
17HOMEPAGE= # none 17HOMEPAGE= # none
18COMMENT= Multi-lingual terminal emulator for X 18COMMENT= Multi-lingual terminal emulator for X
19 19
20USE_IMAKE= YES 20USE_IMAKE= YES
21 21
22SPECIAL_PERMS= ${PREFIX:Q}/bin/kterm ${SETUID_ROOT_PERMS} 22SPECIAL_PERMS= ${PREFIX:Q}/bin/kterm ${SETUID_ROOT_PERMS}
23 23
24.include "../../mk/bsd.prefs.mk" 24.include "../../mk/bsd.prefs.mk"
25 25
26.if defined(XAW_TYPE) && (${XAW_TYPE} == "3d" || ${XAW_TYPE} == "xpm" || ${XAW_TYPE} == "neXtaw") 26.include "../../x11/libXpm/buildlink3.mk"
27post-patch: 
28 @${ECHO_MSG} "===> Applying Xaw scrollbar patch" 
29 @${PATCH} ${PATCH_ARGS} < ${FILESDIR:Q}/patch-xaw3d 
30.endif 
31 
32.include "../../mk/xaw.buildlink3.mk" 27.include "../../mk/xaw.buildlink3.mk"
33.include "../../mk/bsd.pkg.mk" 28.include "../../mk/bsd.pkg.mk"
File Deleted: pkgsrc/x11/kterm/files/Attic/patch-xaw3d
cvs diff -r1.15 -r1.16 pkgsrc/x11/neXtaw/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/neXtaw/buildlink3.mk 2012/06/15 23:06:03 1.15
+++ pkgsrc/x11/neXtaw/buildlink3.mk 2013/01/15 16:21:36 1.16
@@ -1,33 +1,31 @@ @@ -1,33 +1,31 @@
1# $NetBSD: buildlink3.mk,v 1.15 2012/06/15 23:06:03 dholland Exp $ 1# $NetBSD: buildlink3.mk,v 1.16 2013/01/15 16:21:36 morr Exp $
2 2
3BUILDLINK_TREE+= neXtaw 3BUILDLINK_TREE+= neXtaw
4 4
5.if !defined(NEXTAW_BUILDLINK3_MK) 5.if !defined(NEXTAW_BUILDLINK3_MK)
6NEXTAW_BUILDLINK3_MK:= 6NEXTAW_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.neXtaw+= neXtaw>=0.15.1 8BUILDLINK_API_DEPENDS.neXtaw+= neXtaw>=0.15.1
9BUILDLINK_ABI_DEPENDS.neXtaw+= neXtaw>=0.15.1nb2 9BUILDLINK_ABI_DEPENDS.neXtaw+= neXtaw>=0.15.1nb2
10BUILDLINK_PKGSRCDIR.neXtaw?= ../../x11/neXtaw 10BUILDLINK_PKGSRCDIR.neXtaw?= ../../x11/neXtaw
11 11
 12BUILDLINK_TRANSFORM+= l:Xaw:neXtaw
 13
12.include "../../mk/bsd.fast.prefs.mk" 14.include "../../mk/bsd.fast.prefs.mk"
13 15
14.if ${X11_TYPE} == "modular" 16.if ${X11_TYPE} == "modular"
15.PHONY: buildlink-neXtaw-inc-hack 17.PHONY: buildlink-neXtaw-inc-hack
16buildlink-neXtaw-cookie: buildlink-neXtaw-inc-hack 18buildlink-neXtaw-cookie: buildlink-neXtaw-inc-hack
17 19
18buildlink-neXtaw-inc-hack: buildlink-directories 20buildlink-neXtaw-inc-hack: buildlink-directories
19 [ ! -h ${BUILDLINK_DIR}/include/X11/Xaw ] && \ 21 [ ! -h ${BUILDLINK_DIR}/include/X11/Xaw ] && \
20 ${MKDIR} ${BUILDLINK_DIR}/include/X11 && \ 22 ${MKDIR} ${BUILDLINK_DIR}/include/X11 && \
21 ${LN} -s neXtaw ${BUILDLINK_DIR}/include/X11/Xaw 23 ${LN} -s neXtaw ${BUILDLINK_DIR}/include/X11/Xaw
22.endif 24.endif
23 25
24LIBXAW?= -L${BUILDLINK_PREFIX.neXtaw}/lib \ 
25 ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.neXtaw}/lib \ 
26 -lneXtaw 
27 
28.include "../../x11/libXext/buildlink3.mk" 26.include "../../x11/libXext/buildlink3.mk"
29.include "../../x11/libXmu/buildlink3.mk" 27.include "../../x11/libXmu/buildlink3.mk"
30.include "../../x11/libXt/buildlink3.mk" 28.include "../../x11/libXt/buildlink3.mk"
31.endif # NEXTAW_BUILDLINK3_MK 29.endif # NEXTAW_BUILDLINK3_MK
32 30
33BUILDLINK_TREE+= -neXtaw 31BUILDLINK_TREE+= -neXtaw
cvs diff -r1.22 -r1.23 pkgsrc/x11/xcolorsel/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/xcolorsel/Makefile 2012/10/29 05:07:00 1.22
+++ pkgsrc/x11/xcolorsel/Makefile 2013/01/15 16:21:36 1.23
@@ -1,18 +1,26 @@ @@ -1,18 +1,26 @@
1# $NetBSD: Makefile,v 1.22 2012/10/29 05:07:00 asau Exp $ 1# $NetBSD: Makefile,v 1.23 2013/01/15 16:21:36 morr Exp $
2# 2#
3 3
4DISTNAME= xcolorsel-1.1a-src 4DISTNAME= xcolorsel-1.1a-src
5PKGNAME= xcolorsel-1.1a 5PKGNAME= xcolorsel-1.1a
6PKGREVISION= 3 6PKGREVISION= 3
7CATEGORIES= x11 7CATEGORIES= x11
8MASTER_SITES= ${MASTER_SITE_XCONTRIB:=utilities/} 8MASTER_SITES= ${MASTER_SITE_XCONTRIB:=utilities/}
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11COMMENT= Browse and select named X colors from rgb.txt 11COMMENT= Browse and select named X colors from rgb.txt
12 12
13WRKSRC= ${WRKDIR}/xcolorsel 13WRKSRC= ${WRKDIR}/xcolorsel
14MAKE_ENV+= LIBXAW=${LIBXAW:Q} 
15USE_IMAKE= yes 14USE_IMAKE= yes
16 15
17.include "../../x11/Xaw3d/buildlink3.mk" 16SUBST_CLASSES+= xcolorsel
 17SUBST_STAGE.xcolorsel= pre-configure
 18SUBST_MESSAGE.xcolorsel= Fixing hard-coded paths.
 19SUBST_FILES.xcolorsel= RgbText.c
 20SUBST_SED.xcolorsel+= -e "s,@X11BASE@,${X11BASE},g"
 21
 22#this requires Xaw3d
 23XAW_TYPE= 3d
 24
 25.include "../../mk/xaw.buildlink3.mk"
18.include "../../mk/bsd.pkg.mk" 26.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/x11/xcolorsel/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/xcolorsel/distinfo 2007/07/31 09:57:04 1.5
+++ pkgsrc/x11/xcolorsel/distinfo 2013/01/15 16:21:36 1.6
@@ -1,14 +1,8 @@ @@ -1,14 +1,8 @@
1$NetBSD: distinfo,v 1.5 2007/07/31 09:57:04 joerg Exp $ 1$NetBSD: distinfo,v 1.6 2013/01/15 16:21:36 morr Exp $
2 2
3SHA1 (xcolorsel-1.1a-src.tar.gz) = 398df69d3c5ac99ee21b1e19100b98f385a1666c 3SHA1 (xcolorsel-1.1a-src.tar.gz) = 398df69d3c5ac99ee21b1e19100b98f385a1666c
4RMD160 (xcolorsel-1.1a-src.tar.gz) = 5ae81689bcdc23828778eb5d46f08b7c30b1566c 4RMD160 (xcolorsel-1.1a-src.tar.gz) = 5ae81689bcdc23828778eb5d46f08b7c30b1566c
5Size (xcolorsel-1.1a-src.tar.gz) = 67359 bytes 5Size (xcolorsel-1.1a-src.tar.gz) = 67359 bytes
6SHA1 (patch-aa) = 6a0e20fd50b058e9302fe0c938ff5c7951e34566 6SHA1 (patch-Imakefile) = 39e087e56f752930a96bd8ae4e9a39bf4a0b0806
7SHA1 (patch-ab) = f5dd98f791ee88db88e8c28d1cbb09dcc595968d 7SHA1 (patch-RgbText.c) = ea09371fd88c4a1068f069926097743fd25cfbdc
8SHA1 (patch-ac) = 8bbdcba8de4d69450459512b1527c729a24760a1 8SHA1 (patch-xcolorsel.c) = a6667fff4372d242cc13c44d2a2fdf53ad5b065d
9SHA1 (patch-ad) = 79eeb35b8103b42be889ac8cf8979a1fdbfbb252 
10SHA1 (patch-ae) = c1503c6912f8f8c5e7bc59251f829d056022c745 
11SHA1 (patch-af) = 3284e0fcf69c8a26bc0be74300ac5cd6bf9deb00 
12SHA1 (patch-ag) = ff36d06ad032024e1488435f2c6ce6a768b2b7a0 
13SHA1 (patch-ah) = 17ec04769fb7f95327a0bca4227e520d816f317f 
14SHA1 (patch-ai) = 8ca07a15ba5ab62a4b4cb5d5b6f7c1aab82fe7ce 
File Added: pkgsrc/x11/xcolorsel/patches/patch-Imakefile
$NetBSD: patch-Imakefile,v 1.1 2013/01/15 16:21:36 morr Exp $

--- Imakefile.orig	1994-12-13 20:31:19.000000000 +0000
+++ Imakefile
@@ -71,7 +71,7 @@ depend:: appdef-c.h appdef.h
 all:: Xcolorsel.help
 install:: Xcolorsel.help
 
-NormalProgramTarget(xcolorsel,$(OBJS),,XawClientLibs,)
+NormalProgramTarget(xcolorsel,$(OBJS),,-lXaw $(XMULIB) $(XTOOLLIB) $(XLIB),)
 
 InstallProgram(xcolorsel,$(BINDIR))
 InstallManPage(xcolorsel,$(MANDIR))
File Added: pkgsrc/x11/xcolorsel/patches/patch-RgbText.c
$NetBSD: patch-RgbText.c,v 1.1 2013/01/15 16:21:36 morr Exp $

--- RgbText.c.orig	1994-12-13 22:13:27.000000000 +0000
+++ RgbText.c
@@ -78,7 +78,6 @@
 #include <stdlib.h>
 /* And here we have a special gift for all SUN's outside >;-> */
 #include <unistd.h>
-#include <malloc.h>
 #include <ctype.h>
 #include <errno.h>
 #include <X11/IntrinsicP.h>
@@ -146,7 +145,7 @@ static XtResource resources[] = {
 { XtNcolumns, XtCColumns, XtRDimension, sizeof(Dimension), offset(columns),
 		XtRString, (XtPointer) "30" },
 { XtNfile, XtCFile, XtRString, sizeof(String), offset(file),
-		XtRString, (XtPointer) "/usr/lib/X11/rgb.txt" },
+		XtRString, (XtPointer) "@X11BASE@/X11/rgb.txt" },
 { XtNtileWidth, XtCTileWidth, XtRDimension, sizeof(Dimension), offset(tile_width),
 		XtRString, (XtPointer) "3" },
 { XtNmaxRed, XtCMaxRed, XtRShort, sizeof(unsigned short), offset(max_red),
File Added: pkgsrc/x11/xcolorsel/patches/patch-xcolorsel.c
$NetBSD: patch-xcolorsel.c,v 1.1 2013/01/15 16:21:36 morr Exp $

--- xcolorsel.c.orig	1994-11-13 22:16:59.000000000 +0000
+++ xcolorsel.c
@@ -53,7 +53,6 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
-#include <malloc.h>
 #include <fcntl.h>
 
 #include <X11/Xlib.h>
File Deleted: pkgsrc/x11/xcolorsel/patches/Attic/patch-aa
File Deleted: pkgsrc/x11/xcolorsel/patches/Attic/patch-ab
File Deleted: pkgsrc/x11/xcolorsel/patches/Attic/patch-ai
File Deleted: pkgsrc/x11/xcolorsel/patches/Attic/patch-ac
File Deleted: pkgsrc/x11/xcolorsel/patches/Attic/patch-ad
File Deleted: pkgsrc/x11/xcolorsel/patches/Attic/patch-ae
File Deleted: pkgsrc/x11/xcolorsel/patches/Attic/patch-af
File Deleted: pkgsrc/x11/xcolorsel/patches/Attic/patch-ag
File Deleted: pkgsrc/x11/xcolorsel/patches/Attic/patch-ah