diff options
30 files changed, 88 insertions, 247 deletions
diff --git a/cad/felt/distinfo b/cad/felt/distinfo index ea2e34d3ee2..c6560adb554 100644 --- a/cad/felt/distinfo +++ b/cad/felt/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2009/12/17 20:31:37 abs Exp $ +$NetBSD: distinfo,v 1.16 2013/01/15 16:21:34 morr Exp $ SHA1 (felt-3.05.src.tar.gz) = da3e1ced626cc1c65a570d3e6e242252c039c28b RMD160 (felt-3.05.src.tar.gz) = 0d2a363a6ef09f3b3a0e2be186c4c051ac1ea19a @@ -7,7 +7,7 @@ SHA1 (felt-3.05.ps.gz) = 10fbac9927fe20cec3884d989204fe1a92d61784 RMD160 (felt-3.05.ps.gz) = b8bd2a4a83a951455403c2f2f17db6db697035a1 Size (felt-3.05.ps.gz) = 626985 bytes SHA1 (patch-aa) = 040259f3b9835409f2d98f0cde12667142da2160 -SHA1 (patch-ab) = 0db67c162ea81b7b7650ae1d62f0e89235067b53 +SHA1 (patch-ab) = 0822f1bea2822ad692153311d159a257c0420484 SHA1 (patch-ac) = 04b93dbb663ca5f04cb78956c3dbb77bc68a7b8f SHA1 (patch-ad) = c41c74393782fd65f871097e9fc51aae1dacf643 SHA1 (patch-ae) = 482fbf439ebc23b41294b7c903f921e6e285cd55 diff --git a/cad/felt/patches/patch-ab b/cad/felt/patches/patch-ab index b8ae319b215..c401c47e9b0 100644 --- a/cad/felt/patches/patch-ab +++ b/cad/felt/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.4 2009/12/17 20:31:37 abs Exp $ +$NetBSD: patch-ab,v 1.5 2013/01/15 16:21:34 morr Exp $ --- src/Velvet/Makefile.orig 2000-02-21 22:44:51.000000000 +0000 +++ src/Velvet/Makefile @@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.4 2009/12/17 20:31:37 abs Exp $ LDFLAGS = $(LDOPTS) -L$(X11LIB) LIBS = $(LIBWIDGETS) $(LIBGEN) $(LIBFELT) $(LIBELT) $(LIBMTX)\ - -lXaw3d -lXmu -lXt -lSM -lICE -lXext -lX11 -lm -+ ${LIBXAW} -lXmu -lXt -lSM -lICE -lXext -lX11 -lm ++ -lXaw -lXmu -lXt -lSM -lICE -lXext -lX11 -lm # /usr/X11R6/lib/libXaw3d.a /usr/X11R6/lib/libXmu.so.6.0 \ # /usr/X11R6/lib/libXt.so.6.0 /usr/X11R6/lib/libSM.so.6.0 \ # /usr/X11R6/lib/libICE.so.6.0 /usr/X11R6/lib/libXext.so.6.0 \ diff --git a/editors/vim-xaw/Makefile b/editors/vim-xaw/Makefile index 2f134acbce4..7bad3a8c493 100644 --- a/editors/vim-xaw/Makefile +++ b/editors/vim-xaw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2013/01/14 23:30:34 morr Exp $ +# $NetBSD: Makefile,v 1.56 2013/01/15 16:21:34 morr Exp $ PKGNAME= vim-xaw-${VIM_VERSION}.${VIM_PATCHLEVEL} COMMENT= Vim editor (vi clone) with X11 Athena GUI @@ -19,12 +19,7 @@ INSTALLATION_DIRS+= ${PKGMANDIR}/man1 .include "../../mk/bsd.prefs.mk" -.if defined(XAW_TYPE) && (${XAW_TYPE} == "3d" || ${XAW_TYPE} == "xpm") -MAKE_ENV+= XAW_LIB="-lXaw3d" -.else -XAW_TYPE= standard MAKE_ENV+= XAW_LIB="-lXaw" -.endif post-install: .for f in gvim.1 gview.1 rgvim.1 rgview.1 diff --git a/games/xfrisk/Makefile b/games/xfrisk/Makefile index 1556fe9d7d4..7a8db5e4b47 100644 --- a/games/xfrisk/Makefile +++ b/games/xfrisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2012/10/06 11:55:00 asau Exp $ +# $NetBSD: Makefile,v 1.29 2013/01/15 16:21:34 morr Exp $ # DISTNAME= xfrisk-1.2 @@ -29,11 +29,7 @@ LIBS.SunOS= -lsocket -lnsl MAKE_ENV+= LIBS=${LIBS:Q} # xfrisk doesn't work with standard Xaw. -XAW_TYPE?= 3d - -.if ${XAW_TYPE} == standard -XAW_TYPE=3d -.endif +XAW_TYPE= 3d .include "../../mk/xaw.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xfrisk/distinfo b/games/xfrisk/distinfo index 92886fa2201..56cf5fe9ae4 100644 --- a/games/xfrisk/distinfo +++ b/games/xfrisk/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.9 2012/02/05 00:02:47 dholland Exp $ +$NetBSD: distinfo,v 1.10 2013/01/15 16:21:34 morr Exp $ SHA1 (xfrisk-1.2.tar.gz) = 2a82c4be95e151fd34f816aaa125f3eb237c28be RMD160 (xfrisk-1.2.tar.gz) = 7e55be2742bf9b2db40cc10156a6ff615bc37e7a Size (xfrisk-1.2.tar.gz) = 228943 bytes -SHA1 (patch-aa) = bfaca880c2d88125628d0b724638eb54e27bf96d +SHA1 (patch-aa) = eb7ec1f41c10582ece9dc65d858e5e03b2856049 SHA1 (patch-ab) = 8c458f0fa7db8e2a032f592b857f4024769cb4f1 SHA1 (patch-ac) = ed2194b764c3d78eedabceb9136814cffcb8f25f SHA1 (patch-ad) = abd57e121edccbf1f3f78d8f124fbc198722dfcd diff --git a/games/xfrisk/patches/patch-aa b/games/xfrisk/patches/patch-aa index 50f4271d90b..518392a3c03 100644 --- a/games/xfrisk/patches/patch-aa +++ b/games/xfrisk/patches/patch-aa @@ -1,11 +1,11 @@ -$NetBSD: patch-aa,v 1.5 2009/05/23 15:14:21 dholland Exp $ +$NetBSD: patch-aa,v 1.6 2013/01/15 16:21:34 morr Exp $ - take build configuration from inherited pkgsrc variables - install under $(DESTDIR) ---- Makefile.orig 2000-01-23 14:01:55.000000000 -0500 -+++ Makefile 2009-05-23 11:08:33.000000000 -0400 -@@ -55,9 +55,9 @@ +--- Makefile.orig 2000-01-23 19:01:55.000000000 +0000 ++++ Makefile +@@ -55,9 +55,9 @@ DROPALL= #################### # C compiler options # GNU gcc is recommended. @@ -17,7 +17,7 @@ $NetBSD: patch-aa,v 1.5 2009/05/23 15:14:21 dholland Exp $ # If you don't have gcc, don't use -Wall -W -fno-common #CFLAGS=-g -@@ -77,25 +77,25 @@ +@@ -77,23 +77,23 @@ CFLAGS=-g -Wall -W -fno-common -pedantic #CFLAGS+=-DTEST_GAME ## Initial linker options @@ -39,16 +39,14 @@ $NetBSD: patch-aa,v 1.5 2009/05/23 15:14:21 dholland Exp $ #XDIR=/usr/openwin # try Xaw if you don't have Xaw3d - #XAW=Xaw +-#XAW=Xaw -XAW=Xaw3d -+XAW=${LIBXAW} ++XAW=Xaw ++#XAW=Xaw3d --XLIBS=-L$(XDIR)/lib -l$(XAW) -lXext -lXmu -lXt -lSM -lICE -lX11 -+XLIBS=-L$(XDIR)/lib $(XAW) -lXext -lXmu -lXt -lSM -lICE -lX11 + XLIBS=-L$(XDIR)/lib -l$(XAW) -lXext -lXmu -lXt -lSM -lICE -lX11 - XINC=-I$(XDIR)/include - CFLAGS+=$(XINC) -@@ -106,7 +106,6 @@ +@@ -106,7 +106,6 @@ CFLAGS+=$(XINC) # System V (Solaris, Irix, etc.) will probably want -lsocket -lnsl. #LIBS=-lsocket -lnsl # on other systems leave LIBS blank for now @@ -56,7 +54,7 @@ $NetBSD: patch-aa,v 1.5 2009/05/23 15:14:21 dholland Exp $ # On some systems -DNARROWPROTO is needed for working Xaw scrollbars # This includes FreeBSD 3.x and recent Linux -@@ -208,16 +207,16 @@ +@@ -208,16 +207,16 @@ libfriskAI.a: network.o aiDice.o game.o $(RANLIB) $@ install: all @@ -83,7 +81,7 @@ $NetBSD: patch-aa,v 1.5 2009/05/23 15:14:21 dholland Exp $ # Other targets -@@ -225,13 +224,13 @@ +@@ -225,13 +224,13 @@ Countries.risk World.risk: World.ppm bui ./buildmap World.ppm World.risk Countries.risk uninstall: diff --git a/mk/xaw.buildlink3.mk b/mk/xaw.buildlink3.mk index a90464d0c18..193fdf522de 100644 --- a/mk/xaw.buildlink3.mk +++ b/mk/xaw.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: xaw.buildlink3.mk,v 1.5 2007/03/09 02:04:04 rillig Exp $ +# $NetBSD: xaw.buildlink3.mk,v 1.6 2013/01/15 16:21:34 morr Exp $ # # This file selects the X Athena Widgets (Xaw) implementation. # @@ -39,6 +39,4 @@ BUILDLINK_PREFIX.Xaw?= ${X11BASE} PKG_FAIL_REASON+= "[xaw.buildlink3.mk] Invalid value ${XAW_TYPE} for XAW_TYPE." .endif -MAKE_ENV+= LIBXAW=${LIBXAW:Q} - .endif # XAW_BUILDLINK3_MK diff --git a/time/emiclock/Makefile b/time/emiclock/Makefile index 8d437d10ed2..38c3e3fa42d 100644 --- a/time/emiclock/Makefile +++ b/time/emiclock/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2012/10/08 13:04:17 asau Exp $ +# $NetBSD: Makefile,v 1.26 2013/01/15 16:21:35 morr Exp $ # DISTNAME= emiclock-2.0.2 @@ -34,5 +34,6 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/resources/R6/EUC/EmiClock.ad \ ${DESTDIR}${PREFIX}/lib/X11/ja_JP.eucJP/app-defaults/EmiClock +.include "../../x11/libXpm/buildlink3.mk" .include "../../mk/xaw.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/emiclock/distinfo b/time/emiclock/distinfo index f13bffd6791..6a8996be248 100644 --- a/time/emiclock/distinfo +++ b/time/emiclock/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2011/03/23 14:09:31 obache Exp $ +$NetBSD: distinfo,v 1.10 2013/01/15 16:21:35 morr Exp $ SHA1 (emiclock-2.0.2.tar.gz) = e1c042d600faf59ecdb11f1199f1793282db90c1 RMD160 (emiclock-2.0.2.tar.gz) = 25a753aaefbd9b8b57c16fbfe13678a002ab8179 @@ -6,7 +6,7 @@ Size (emiclock-2.0.2.tar.gz) = 308682 bytes SHA1 (patch-aa) = a5eea083c1a05bacd2605ac8e0ecbef9310a8cfd SHA1 (patch-ab) = 8c83e056bd03b0f493f91afd33ce572ed673511b SHA1 (patch-ac) = 4b020ac03c958d1ca44968c17b7d657edda77690 -SHA1 (patch-ad) = e3f57f3b7d68efa401ae471e786476e68b2bd282 +SHA1 (patch-ad) = 3cde51980c8802a225a6a91291297176fc9dba69 SHA1 (patch-ae) = ecbc4f169c0fd249ba1cc0c3031922c02f7a6bb2 SHA1 (patch-af) = f5b6c40f42136ee8953bf259a78fa0d8be048503 SHA1 (patch-ag) = 43c750de300cbda8cb89917894bbc73b18974c5d diff --git a/time/emiclock/patches/patch-ad b/time/emiclock/patches/patch-ad index 38385e3d7b1..71496257e21 100644 --- a/time/emiclock/patches/patch-ad +++ b/time/emiclock/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.6 2011/03/23 14:09:31 obache Exp $ +$NetBSD: patch-ad,v 1.7 2013/01/15 16:21:35 morr Exp $ --- Imakefile.orig 1999-09-02 14:33:47.000000000 +0000 +++ Imakefile @@ -24,7 +24,7 @@ $NetBSD: patch-ad,v 1.6 2011/03/23 14:09:31 obache Exp $ # ifdef USE_XAW3D DEPXAWLIB = $(USRLIBDIR)/libXaw3d.a - XAWLIB = -lXaw3d -+ XAWLIB = ${LIBXAW} ++ XAWLIB = -lXaw # endif /* USE_XAW3D */ SYS_LIBRARIES = SoundLibrary -lm diff --git a/time/xalarm/distinfo b/time/xalarm/distinfo index f637372e2c6..437f8b776ed 100644 --- a/time/xalarm/distinfo +++ b/time/xalarm/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.5 2006/04/16 01:00:06 perry Exp $ +$NetBSD: distinfo,v 1.6 2013/01/15 16:21:35 morr Exp $ SHA1 (xalarm-3.06.tar.gz) = a4365224c14491d1f089f4a30722d8e33ccccad5 RMD160 (xalarm-3.06.tar.gz) = 9a9a6fd67669e6464729bdba2210ef38265dd5ea Size (xalarm-3.06.tar.gz) = 55351 bytes -SHA1 (patch-aa) = 9d6837ff4ba95d82b37df9144178581e39a48283 +SHA1 (patch-aa) = 0da8a64ac4cb0399f38ddfd8901b1455c351eeb2 SHA1 (patch-ab) = f9890acefcef2111da7284f2c96f21875bf27d29 SHA1 (patch-ac) = c053df3ac2503a03233e076b590e6387b04f6faa diff --git a/time/xalarm/patches/patch-aa b/time/xalarm/patches/patch-aa index 2ba2d94df43..aff896e9fe1 100644 --- a/time/xalarm/patches/patch-aa +++ b/time/xalarm/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.3 2006/04/16 01:00:06 perry Exp $ +$NetBSD: patch-aa,v 1.4 2013/01/15 16:21:35 morr Exp $ ---- Imakefile.orig 1995-07-21 10:32:07.000000000 -0400 -+++ Imakefile 2006-04-15 20:52:05.000000000 -0400 +--- Imakefile.orig 1995-07-21 14:32:07.000000000 +0000 ++++ Imakefile @@ -1,27 +1,27 @@ -/**/# Based on an Imakefile from: -/**/# Andreas Stolcke @@ -54,15 +54,14 @@ $NetBSD: patch-aa,v 1.3 2006/04/16 01:00:06 perry Exp $ DEFINES = $(SIGNAL_DEFINES) -DUSERENAME -DUSEGETHOSTNAME -DUSEGETPWUID -@@ -29,29 +29,16 @@ +@@ -29,29 +29,14 @@ DEFINES = $(SIGNAL_DEFINES) -DUSERENAME OBJS = alarm.o when.o warnings.o times.o dates.o file.o fns.o xalarm.o SRCS = alarm.c when.c warnings.c times.c dates.c file.c fns.c xalarm.c -# How we find commands. Use WHICH, LOCATE or FIND. -WHICH= WHICH -MADE = test -f -+XAWLIB = ${LIBXAW} - +- LOCAL_LIBRARIES = XawClientLibs -AllTarget (.config) @@ -86,7 +85,7 @@ $NetBSD: patch-aa,v 1.3 2006/04/16 01:00:06 perry Exp $ xfortune:: -@@ -60,14 +47,6 @@ +@@ -60,14 +45,6 @@ xyow:: clean:: $(RM) xfortune xyow xmemo.man xyow.man xfortune.man fns.h .config diff --git a/x11/Xaw-Xpm/buildlink3.mk b/x11/Xaw-Xpm/buildlink3.mk index 3e58ba2863f..d29c7c74341 100644 --- a/x11/Xaw-Xpm/buildlink3.mk +++ b/x11/Xaw-Xpm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2012/06/15 23:06:02 dholland Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2013/01/15 16:21:35 morr Exp $ BUILDLINK_TREE+= Xaw-Xpm @@ -9,6 +9,8 @@ BUILDLINK_API_DEPENDS.Xaw-Xpm+= Xaw-Xpm>=1.1 BUILDLINK_ABI_DEPENDS.Xaw-Xpm+= Xaw-Xpm>=1.1nb2 BUILDLINK_PKGSRCDIR.Xaw-Xpm?= ../../x11/Xaw-Xpm +BUILDLINK_TRANSFORM+= l:Xaw:Xaw3d + .include "../../mk/bsd.fast.prefs.mk" .if ${X11_TYPE} == "modular" @@ -20,12 +22,6 @@ buildlink-Xaw-Xpm-inc-hack: .PHONY buildlink-directories ${LN} -s Xaw3d ${BUILDLINK_DIR}/include/X11/Xaw .endif -LIBXAW?= -L${BUILDLINK_PREFIX.Xaw-Xpm}/lib \ - ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.Xaw-Xpm}/lib \ - -L${BUILDLINK_PREFIX.libXpm}/lib \ - ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libXpm}/lib \ - -lXaw3d -lXpm - .include "../../x11/libXmu/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" .endif # XAW_XPM_BUILDLINK3_MK diff --git a/x11/Xaw3d/buildlink3.mk b/x11/Xaw3d/buildlink3.mk index c6428fb18c7..e89455f8ae1 100644 --- a/x11/Xaw3d/buildlink3.mk +++ b/x11/Xaw3d/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2012/05/07 01:54:06 dholland Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2013/01/15 16:21:35 morr Exp $ BUILDLINK_TREE+= Xaw3d @@ -25,9 +25,6 @@ buildlink-Xaw3d-inc-hack: buildlink-directories .include "../../x11/libXmu/buildlink3.mk" -LIBXAW?= -L${BUILDLINK_PREFIX.Xaw3d}/lib \ - ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.Xaw3d}/lib \ - -lXaw3d .endif # XAW3D_BUILDLINK3_MK BUILDLINK_TREE+= -Xaw3d diff --git a/x11/kterm/Makefile b/x11/kterm/Makefile index 28637e430b7..b6610452e96 100644 --- a/x11/kterm/Makefile +++ b/x11/kterm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2012/10/29 05:06:32 asau Exp $ +# $NetBSD: Makefile,v 1.59 2013/01/15 16:21:35 morr Exp $ DISTNAME= kterm-6.2.0 PKGREVISION= 23 @@ -23,11 +23,6 @@ SPECIAL_PERMS= ${PREFIX:Q}/bin/kterm ${SETUID_ROOT_PERMS} .include "../../mk/bsd.prefs.mk" -.if defined(XAW_TYPE) && (${XAW_TYPE} == "3d" || ${XAW_TYPE} == "xpm" || ${XAW_TYPE} == "neXtaw") -post-patch: - @${ECHO_MSG} "===> Applying Xaw scrollbar patch" - @${PATCH} ${PATCH_ARGS} < ${FILESDIR:Q}/patch-xaw3d -.endif - +.include "../../x11/libXpm/buildlink3.mk" .include "../../mk/xaw.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/kterm/files/patch-xaw3d b/x11/kterm/files/patch-xaw3d deleted file mode 100644 index df98138591e..00000000000 --- a/x11/kterm/files/patch-xaw3d +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-xaw3d,v 1.2 2001/08/23 04:26:55 jlam Exp $ - ---- kterm.h.orig Fri Jul 12 14:01:37 1996 -+++ kterm.h Wed Jun 9 10:07:50 1999 -@@ -36,6 +36,6 @@ - #define KTERM_KINPUT2 /* Kinput2 protocol */ - #define KTERM_COLOR /* color sequence */ - #define KTERM_NOTEK /* disables Tektronix emulation */ --#undef KTERM_XAW3D /* Xaw3d -DARROW_SCROLLBAR support */ -+#define KTERM_XAW3D /* Xaw3d -DARROW_SCROLLBAR support */ - - #endif /* !_KTERM_H_ */ ---- Imakefile.orig Fri Jul 12 14:01:04 1996 -+++ Imakefile Wed Jun 9 10:24:30 1999 -@@ -46,6 +46,9 @@ - TEKSRCS = TekPrsTbl.c Tekproc.c - TEKOBJS = TekPrsTbl.o Tekproc.o - #endif -+#ifdef KTERM_XAW3D -+ XAWLIB = ${LIBXAW} -+#endif - SRCS1 = button.c charproc.c cursor.c data.c input.c \ - main.c menu.c misc.c screen.c scrollbar.c tabs.c \ - util.c VTPrsTbl.c \ diff --git a/x11/neXtaw/buildlink3.mk b/x11/neXtaw/buildlink3.mk index 3b7563b5af1..dacebc49388 100644 --- a/x11/neXtaw/buildlink3.mk +++ b/x11/neXtaw/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.15 2012/06/15 23:06:03 dholland Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2013/01/15 16:21:36 morr Exp $ BUILDLINK_TREE+= neXtaw @@ -9,6 +9,8 @@ BUILDLINK_API_DEPENDS.neXtaw+= neXtaw>=0.15.1 BUILDLINK_ABI_DEPENDS.neXtaw+= neXtaw>=0.15.1nb2 BUILDLINK_PKGSRCDIR.neXtaw?= ../../x11/neXtaw +BUILDLINK_TRANSFORM+= l:Xaw:neXtaw + .include "../../mk/bsd.fast.prefs.mk" .if ${X11_TYPE} == "modular" @@ -21,10 +23,6 @@ buildlink-neXtaw-inc-hack: buildlink-directories ${LN} -s neXtaw ${BUILDLINK_DIR}/include/X11/Xaw .endif -LIBXAW?= -L${BUILDLINK_PREFIX.neXtaw}/lib \ - ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.neXtaw}/lib \ - -lneXtaw - .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXmu/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" diff --git a/x11/xcolorsel/Makefile b/x11/xcolorsel/Makefile index 7931e316dfc..99145f4fe6d 100644 --- a/x11/xcolorsel/Makefile +++ b/x11/xcolorsel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2012/10/29 05:07:00 asau Exp $ +# $NetBSD: Makefile,v 1.23 2013/01/15 16:21:36 morr Exp $ # DISTNAME= xcolorsel-1.1a-src @@ -11,8 +11,16 @@ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Browse and select named X colors from rgb.txt WRKSRC= ${WRKDIR}/xcolorsel -MAKE_ENV+= LIBXAW=${LIBXAW:Q} USE_IMAKE= yes -.include "../../x11/Xaw3d/buildlink3.mk" +SUBST_CLASSES+= xcolorsel +SUBST_STAGE.xcolorsel= pre-configure +SUBST_MESSAGE.xcolorsel= Fixing hard-coded paths. +SUBST_FILES.xcolorsel= RgbText.c +SUBST_SED.xcolorsel+= -e "s,@X11BASE@,${X11BASE},g" + +#this requires Xaw3d +XAW_TYPE= 3d + +.include "../../mk/xaw.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xcolorsel/distinfo b/x11/xcolorsel/distinfo index 253bc33e0d9..d84cc95d323 100644 --- a/x11/xcolorsel/distinfo +++ b/x11/xcolorsel/distinfo @@ -1,14 +1,8 @@ -$NetBSD: distinfo,v 1.5 2007/07/31 09:57:04 joerg Exp $ +$NetBSD: distinfo,v 1.6 2013/01/15 16:21:36 morr Exp $ SHA1 (xcolorsel-1.1a-src.tar.gz) = 398df69d3c5ac99ee21b1e19100b98f385a1666c RMD160 (xcolorsel-1.1a-src.tar.gz) = 5ae81689bcdc23828778eb5d46f08b7c30b1566c Size (xcolorsel-1.1a-src.tar.gz) = 67359 bytes -SHA1 (patch-aa) = 6a0e20fd50b058e9302fe0c938ff5c7951e34566 -SHA1 (patch-ab) = f5dd98f791ee88db88e8c28d1cbb09dcc595968d -SHA1 (patch-ac) = 8bbdcba8de4d69450459512b1527c729a24760a1 -SHA1 (patch-ad) = 79eeb35b8103b42be889ac8cf8979a1fdbfbb252 -SHA1 (patch-ae) = c1503c6912f8f8c5e7bc59251f829d056022c745 -SHA1 (patch-af) = 3284e0fcf69c8a26bc0be74300ac5cd6bf9deb00 -SHA1 (patch-ag) = ff36d06ad032024e1488435f2c6ce6a768b2b7a0 -SHA1 (patch-ah) = 17ec04769fb7f95327a0bca4227e520d816f317f -SHA1 (patch-ai) = 8ca07a15ba5ab62a4b4cb5d5b6f7c1aab82fe7ce +SHA1 (patch-Imakefile) = 39e087e56f752930a96bd8ae4e9a39bf4a0b0806 +SHA1 (patch-RgbText.c) = ea09371fd88c4a1068f069926097743fd25cfbdc +SHA1 (patch-xcolorsel.c) = a6667fff4372d242cc13c44d2a2fdf53ad5b065d diff --git a/x11/xcolorsel/patches/patch-Imakefile b/x11/xcolorsel/patches/patch-Imakefile new file mode 100644 index 00000000000..22b33c90788 --- /dev/null +++ b/x11/xcolorsel/patches/patch-Imakefile @@ -0,0 +1,13 @@ +$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)) diff --git a/x11/xcolorsel/patches/patch-ab b/x11/xcolorsel/patches/patch-RgbText.c index bc0dff6e3e2..4f040f1e7ee 100644 --- a/x11/xcolorsel/patches/patch-ab +++ b/x11/xcolorsel/patches/patch-RgbText.c @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.3 2007/07/31 09:57:04 joerg Exp $ +$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,12 +78,11 @@ +@@ -78,7 +78,6 @@ #include <stdlib.h> /* And here we have a special gift for all SUN's outside >;-> */ #include <unistd.h> @@ -10,18 +10,12 @@ $NetBSD: patch-ab,v 1.3 2007/07/31 09:57:04 joerg Exp $ #include <ctype.h> #include <errno.h> #include <X11/IntrinsicP.h> - #include <X11/StringDefs.h> --#include <X11/Xaw/Paned.h> -+#include <X11/Xaw3d/Paned.h> - #include "RgbTextP.h" - #include "RgbSinkP.h" - #include "RgbSrc.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) "/usr/X11R6/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), diff --git a/x11/xcolorsel/patches/patch-aa b/x11/xcolorsel/patches/patch-aa deleted file mode 100644 index 84a00dd1160..00000000000 --- a/x11/xcolorsel/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2001/08/23 04:26:55 jlam Exp $ - ---- Imakefile.orig Tue Dec 13 21:31:19 1994 -+++ Imakefile Wed Jul 15 09:56:07 1998 -@@ -71,7 +71,7 @@ - all:: Xcolorsel.help - install:: Xcolorsel.help - --NormalProgramTarget(xcolorsel,$(OBJS),,XawClientLibs,) -+NormalProgramTarget(xcolorsel,$(OBJS),,${LIBXAW} $(XMULIB) $(XTOOLLIB) $(XLIB),) - - InstallProgram(xcolorsel,$(BINDIR)) - InstallManPage(xcolorsel,$(MANDIR)) diff --git a/x11/xcolorsel/patches/patch-ac b/x11/xcolorsel/patches/patch-ac deleted file mode 100644 index dd8fb2e0439..00000000000 --- a/x11/xcolorsel/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.2 1998/08/07 11:18:21 agc Exp $ - ---- RgbSink.h.orig Sun Nov 13 23:14:23 1994 -+++ RgbSink.h Wed Jul 15 09:56:56 1998 -@@ -85,7 +85,7 @@ - /*The Parent:*/ - #include "RgbText.h" - /* The superclass: */ --#include <X11/Xaw/AsciiSink.h> -+#include <X11/Xaw3d/AsciiSink.h> - - /**************************************************************** - * diff --git a/x11/xcolorsel/patches/patch-ad b/x11/xcolorsel/patches/patch-ad deleted file mode 100644 index 6fb17029f2c..00000000000 --- a/x11/xcolorsel/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.2 1998/08/07 11:18:22 agc Exp $ - ---- RgbSinkP.h.orig Sun Nov 13 23:14:27 1994 -+++ RgbSinkP.h Wed Jul 15 09:57:46 1998 -@@ -85,7 +85,7 @@ - #include "RgbSink.h" - #include "config.h" - /* include superclass private header file */ --#include <X11/Xaw/AsciiSinkP.h> -+#include <X11/Xaw3d/AsciiSinkP.h> - /* This is closely related to and uses parts of: */ - #include "RgbTextP.h" - diff --git a/x11/xcolorsel/patches/patch-ae b/x11/xcolorsel/patches/patch-ae deleted file mode 100644 index 9bb10aa6f86..00000000000 --- a/x11/xcolorsel/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.2 1998/08/07 11:18:22 agc Exp $ - ---- RgbSrc.h.orig Sun Nov 13 23:14:35 1994 -+++ RgbSrc.h Wed Jul 15 09:58:37 1998 -@@ -84,7 +84,7 @@ - /*The Parent:*/ - #include "RgbText.h" - /* The superclass: */ --#include <X11/Xaw/AsciiSrc.h> -+#include <X11/Xaw3d/AsciiSrc.h> - - /**************************************************************** - * diff --git a/x11/xcolorsel/patches/patch-af b/x11/xcolorsel/patches/patch-af deleted file mode 100644 index f0efc5fecbd..00000000000 --- a/x11/xcolorsel/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.2 1998/08/07 11:18:22 agc Exp $ - ---- RgbSrcP.h.orig Sun Nov 13 23:14:42 1994 -+++ RgbSrcP.h Wed Jul 15 09:59:08 1998 -@@ -85,7 +85,7 @@ - #include "config.h" - - /* include superclass private header file */ --#include <X11/Xaw/AsciiSrcP.h> -+#include <X11/Xaw3d/AsciiSrcP.h> - /* This is closely related to and uses parts of: */ - #include "RgbTextP.h" - diff --git a/x11/xcolorsel/patches/patch-ag b/x11/xcolorsel/patches/patch-ag deleted file mode 100644 index bfb027ace08..00000000000 --- a/x11/xcolorsel/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.2 1998/08/07 11:18:22 agc Exp $ - ---- RgbText.h.orig Sun Nov 13 23:14:49 1994 -+++ RgbText.h Wed Jul 15 09:59:51 1998 -@@ -133,7 +133,7 @@ - #ifndef _RgbText_h - #define _RgbText_h - --#include <X11/Xaw/AsciiText.h> -+#include <X11/Xaw3d/AsciiText.h> - - #define XtNmaxRows "maxRows" - #define XtNrows "rows" diff --git a/x11/xcolorsel/patches/patch-ah b/x11/xcolorsel/patches/patch-ah deleted file mode 100644 index 29844cf2ba5..00000000000 --- a/x11/xcolorsel/patches/patch-ah +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ah,v 1.2 1998/08/07 11:18:22 agc Exp $ - ---- RgbTextP.h.orig Wed Nov 16 21:27:10 1994 -+++ RgbTextP.h Wed Jul 15 10:00:34 1998 -@@ -78,7 +78,7 @@ - #include "RgbText.h" - #include "config.h" - --#include <X11/Xaw/TextP.h> -+#include <X11/Xaw3d/TextP.h> - #include <X11/Xcms.h> - - typedef struct _colordef { unsigned short red, green, blue; /*Theoretic RGB*/ diff --git a/x11/xcolorsel/patches/patch-ai b/x11/xcolorsel/patches/patch-ai deleted file mode 100644 index b7ee8543e9c..00000000000 --- a/x11/xcolorsel/patches/patch-ai +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-ai,v 1.3 2007/07/31 09:57:04 joerg Exp $ - ---- xcolorsel.c.orig 1994-11-13 22:16:59.000000000 +0000 -+++ xcolorsel.c -@@ -53,23 +53,22 @@ - #include <unistd.h> - #include <string.h> - #include <errno.h> --#include <malloc.h> - #include <fcntl.h> - - #include <X11/Xlib.h> - #include <X11/Intrinsic.h> - #include <X11/Shell.h> - #include <X11/StringDefs.h> --#include <X11/Xaw/Box.h> --#include <X11/Xaw/Paned.h> --#include <X11/Xaw/Form.h> --#include <X11/Xaw/Label.h> --#include <X11/Xaw/Command.h> --#include <X11/Xaw/MenuButton.h> --#include <X11/Xaw/Toggle.h> --#include <X11/Xaw/SimpleMenu.h> --#include <X11/Xaw/SmeBSB.h> --#include <X11/Xaw/AsciiText.h> -+#include <X11/Xaw3d/Box.h> -+#include <X11/Xaw3d/Paned.h> -+#include <X11/Xaw3d/Form.h> -+#include <X11/Xaw3d/Label.h> -+#include <X11/Xaw3d/Command.h> -+#include <X11/Xaw3d/MenuButton.h> -+#include <X11/Xaw3d/Toggle.h> -+#include <X11/Xaw3d/SimpleMenu.h> -+#include <X11/Xaw3d/SmeBSB.h> -+#include <X11/Xaw3d/AsciiText.h> - - #include "config.h" - #include "RgbText.h" diff --git a/x11/xcolorsel/patches/patch-xcolorsel.c b/x11/xcolorsel/patches/patch-xcolorsel.c new file mode 100644 index 00000000000..9ec1691ce8a --- /dev/null +++ b/x11/xcolorsel/patches/patch-xcolorsel.c @@ -0,0 +1,12 @@ +$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> |