diff options
-rw-r--r-- | finance/xinvest/Makefile | 8 | ||||
-rw-r--r-- | finance/xinvest/distinfo | 3 | ||||
-rw-r--r-- | finance/xinvest/patches/patch-ac | 13 | ||||
-rw-r--r-- | finance/xquote/Makefile | 8 | ||||
-rw-r--r-- | finance/xquote/distinfo | 3 | ||||
-rw-r--r-- | finance/xquote/patches/patch-af | 13 | ||||
-rw-r--r-- | graphics/pixmap/Makefile | 8 | ||||
-rw-r--r-- | graphics/pixmap/distinfo | 4 | ||||
-rw-r--r-- | graphics/pixmap/patches/patch-ac | 4 | ||||
-rw-r--r-- | misc/xrolodex/Makefile | 8 | ||||
-rw-r--r-- | time/catclock/Makefile | 11 |
11 files changed, 32 insertions, 51 deletions
diff --git a/finance/xinvest/Makefile b/finance/xinvest/Makefile index 204c0a03be7..cda5d186649 100644 --- a/finance/xinvest/Makefile +++ b/finance/xinvest/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/09/08 19:55:45 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2002/10/08 12:33:23 jlam Exp $ DISTNAME= xinvest-2.6 CATEGORIES= finance x11 @@ -9,12 +9,14 @@ MAINTAINER= root@garbled.net HOMEPAGE= http://sunsite.dk/xinvest/xinvest.html COMMENT= Personal finance tracking and performance tool +USE_BUILDLINK2= YES USE_IMAKE= YES NO_INSTALL_MANPAGES= YES post-patch: ${TOUCH} ${WRKSRC}/Xinvest.man -.include "../../graphics/xpm/buildlink.mk" -.include "../../mk/motif.buildlink.mk" +.include "../../graphics/xpm/buildlink2.mk" +.include "../../mk/motif.buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/finance/xinvest/distinfo b/finance/xinvest/distinfo index 1faae49af71..233fd38def7 100644 --- a/finance/xinvest/distinfo +++ b/finance/xinvest/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.3 2001/07/02 22:07:04 jlam Exp $ +$NetBSD: distinfo,v 1.4 2002/10/08 12:33:23 jlam Exp $ SHA1 (xinvest-2.6.tar.gz) = 6593e1ba8025f17032c8bf3227aad7588a364cd4 Size (xinvest-2.6.tar.gz) = 262494 bytes SHA1 (patch-aa) = c3a26cb5779886112af31661934698cd76979e79 SHA1 (patch-ab) = 7a1709d68a91e2983c73cd565b24467244e6c4ab -SHA1 (patch-ac) = f605cc559aecc41c71c1c4ee6f37f12e481fcee5 diff --git a/finance/xinvest/patches/patch-ac b/finance/xinvest/patches/patch-ac deleted file mode 100644 index 7e915956827..00000000000 --- a/finance/xinvest/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2001/07/02 22:07:05 jlam Exp $ - ---- Imakefile.orig Fri Feb 4 17:59:08 2000 -+++ Imakefile -@@ -10,7 +10,7 @@ - XCOMM 'SHAPE' for a transparent icon. - - DEFINES = -DSHAPE --INCLUDES = -I$(INCROOT)/X11 -+INCLUDES = -I$(BUILDLINK_DIR)/include/X11 - SYS_LIBRARIES = -lXm -lXpm $(XTOOLLIB) -lXext $(XLIB) -lm - DEPLIBS = - diff --git a/finance/xquote/Makefile b/finance/xquote/Makefile index 68c5bd448e0..3711c54a06e 100644 --- a/finance/xquote/Makefile +++ b/finance/xquote/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/09/08 19:55:45 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2002/10/08 12:35:15 jlam Exp $ DISTNAME= xquote-2.2 CATEGORIES= finance x11 @@ -9,12 +9,14 @@ MAINTAINER= root@garbled.net HOMEPAGE= http://sunsite.dk/xinvest/xquote.html COMMENT= WWW ticker symbol quote retrieval program +USE_BUILDLINK2= YES USE_IMAKE= YES NO_INSTALL_MANPAGES= YES post-patch: ${TOUCH} ${WRKSRC}/Xquote.man -.include "../../graphics/xpm/buildlink.mk" -.include "../../mk/motif.buildlink.mk" +.include "../../graphics/xpm/buildlink2.mk" +.include "../../mk/motif.buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/finance/xquote/distinfo b/finance/xquote/distinfo index 61881654976..fed059dcc03 100644 --- a/finance/xquote/distinfo +++ b/finance/xquote/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2001/07/02 22:08:36 jlam Exp $ +$NetBSD: distinfo,v 1.4 2002/10/08 12:35:16 jlam Exp $ SHA1 (xquote-2.2.tar.gz) = 2b32bfe25f826e9ae0bb28ee608ccbeae39350a6 Size (xquote-2.2.tar.gz) = 82814 bytes @@ -7,4 +7,3 @@ SHA1 (patch-ab) = 26c943dc5e22ea91641503cb7da35e6eeb47cec4 SHA1 (patch-ac) = 2d9b18f22724f2ba92931077cafca38115a10eb4 SHA1 (patch-ad) = 36f3d15cddd53b4cf0de17a96213a6fee84c38a2 SHA1 (patch-ae) = 4aeb6076e76b40bd07d29530a5d2ed029bff7a63 -SHA1 (patch-af) = 4e49b00531a22465470b0b2940678c55e9602d8c diff --git a/finance/xquote/patches/patch-af b/finance/xquote/patches/patch-af deleted file mode 100644 index 905a3170298..00000000000 --- a/finance/xquote/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.1 2001/07/02 22:08:37 jlam Exp $ - ---- Imakefile.orig Mon Nov 20 19:20:42 2000 -+++ Imakefile -@@ -12,7 +12,7 @@ - XCOMM price communication. - - DEFINES = -DSHAPE -DXQUOTE --INCLUDES = -I$(INCROOT)/X11 -+INCLUDES = -I$(BUILDLINK_DIR)/include/X11 - SYS_LIBRARIES = -lXm -lXpm $(XMULIB) $(XTOOLLIB) -lXext $(XLIB) -lm - DEPLIBS = - diff --git a/graphics/pixmap/Makefile b/graphics/pixmap/Makefile index 70b0825cf6b..cef9ac32364 100644 --- a/graphics/pixmap/Makefile +++ b/graphics/pixmap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2002/04/17 02:52:48 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2002/10/08 12:38:25 jlam Exp $ # FreeBSD: Makefile,v 1.8 1996/11/18 09:53:36 asami Exp # @@ -17,6 +17,7 @@ PATCHFILES= pixmap_2.6.patch1.gz \ MAINTAINER= packages@netbsd.org COMMENT= Pixmap editor based on XPM library +USE_BUILDLINK2= YES USE_IMAKE= YES WRKSRC= ${WRKDIR}/pixmap @@ -24,6 +25,7 @@ WRKSRC= ${WRKDIR}/pixmap MAKE_ENV+= LOCAL_LDFLAGS="${LDFLAGS}" MAKE_ENV+= MOTIFBASE="${MOTIFBASE}" -.include "../../graphics/xpm/buildlink.mk" -.include "../../mk/motif.buildlink.mk" +.include "../../graphics/xpm/buildlink2.mk" +.include "../../mk/motif.buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/graphics/pixmap/distinfo b/graphics/pixmap/distinfo index db20f5062a9..47cee8cefd2 100644 --- a/graphics/pixmap/distinfo +++ b/graphics/pixmap/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/06/28 08:55:16 agc Exp $ +$NetBSD: distinfo,v 1.5 2002/10/08 12:38:25 jlam Exp $ SHA1 (pixmap2.6.tar.gz) = f9b0c610ed73254fbde9a25346ed78d493d97752 Size (pixmap2.6.tar.gz) = 120340 bytes @@ -12,4 +12,4 @@ SHA1 (pixmap_2.6.patch4.gz) = 1a994cdbe837ac36d0cb4d5c2109f18b5732d7b6 Size (pixmap_2.6.patch4.gz) = 1269 bytes SHA1 (patch-aa) = 83e783b4308374e638a5b129f219a2b45d93126e SHA1 (patch-ab) = 67f64b30aa72d8a1fefe24d264c27d028cb8056b -SHA1 (patch-ac) = 99c0fd51d041397cac7ee7bccbf573b536741133 +SHA1 (patch-ac) = 501d8c73092abae755bdd33dba15dcec39784eb7 diff --git a/graphics/pixmap/patches/patch-ac b/graphics/pixmap/patches/patch-ac index 17c9c3308a9..d4fda76fa66 100644 --- a/graphics/pixmap/patches/patch-ac +++ b/graphics/pixmap/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.4 2002/06/28 08:55:18 agc Exp $ +$NetBSD: patch-ac,v 1.5 2002/10/08 12:38:26 jlam Exp $ --- Imakefile.orig Fri May 13 06:04:38 1994 +++ Imakefile @@ -27,7 +27,7 @@ $NetBSD: patch-ac,v 1.4 2002/06/28 08:55:18 agc Exp $ - XPM_INCLUDEDIR = /net/koala/include - XPM_LIBDIR = /net/koala/lib/sun4 - EXTRA_INCLUDES = $(R5EXT) -I. -I.. -I$(XPM_INCLUDEDIR) -I/usr/include/$(MOTIFVER) -+ XPM_INCLUDEDIR = $(BUILDLINK_DIR)/include ++ XPM_INCLUDEDIR = $(LOCALBASE)/include + XPM_LIBDIR = $(USRLIBDIR) + EXTRA_INCLUDES = $(R5EXT) -I. -I.. -I$(XPM_INCLUDEDIR) -I$(MOTIFBASE)/include diff --git a/misc/xrolodex/Makefile b/misc/xrolodex/Makefile index 3b4fa80d7e6..1715e40de2c 100644 --- a/misc/xrolodex/Makefile +++ b/misc/xrolodex/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/09/12 02:30:23 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2002/10/08 12:39:28 jlam Exp $ DISTNAME= xrolodex.1.5.motif PKGNAME= xrolodex-1.5 @@ -9,9 +9,11 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= root@garbled.net COMMENT= Motif/X11 rolodex application +USE_BUILDLINK2= # defined +USE_IMAKE= # defined + WRKSRC= ${WRKDIR}/xrolodex.15 MAKE_ENV+= XMLIB="${MOTIFLIB}" -USE_IMAKE= yes -.include "../../mk/motif.buildlink.mk" +.include "../../mk/motif.buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/catclock/Makefile b/time/catclock/Makefile index 73eba119094..327df2e66d0 100644 --- a/time/catclock/Makefile +++ b/time/catclock/Makefile @@ -1,18 +1,19 @@ -# $NetBSD: Makefile,v 1.6 2001/09/12 03:47:27 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2002/10/08 12:42:46 jlam Exp $ # DISTNAME= catclock PKGNAME= catclock-0.0 CATEGORIES= x11 time MASTER_SITES= http://www2.cenaath.cena.dgac.fr/ftp/decwindows/ \ - ftp://ftp2.cnam.fr/decwindows/ \ - ftp://ftp.wku.edu/vms/decwindows/ \ - ftp://sunsite.doc.ic.ac.uk/computing/graphics/systems/X11/contrib/vms/ + ftp://ftp2.cnam.fr/decwindows/ \ + ftp://ftp.wku.edu/vms/decwindows/ \ + ftp://sunsite.doc.ic.ac.uk/computing/graphics/systems/X11/contrib/vms/ EXTRACT_SUFX= .zip MAINTAINER= packages@netbsd.org COMMENT= Variant of the MIT xclock with a "cat" mode +USE_BUILDLINK2= yes USE_IMAKE= yes post-extract: @@ -20,5 +21,5 @@ post-extract: ${MV} ${WRKSRC}/xclock.man ${WRKSRC}/catclock.man ${SED} 's/^XClock/Catclock/g' <${WRKSRC}/xclock.ad >${WRKSRC}/Catclock.ad -.include "../../mk/motif.buildlink.mk" +.include "../../mk/motif.buildlink2.mk" .include "../../mk/bsd.pkg.mk" |