diff options
| author | jlam <jlam> | 2002-08-25 21:50:52 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-08-25 21:50:52 +0000 |
| commit | 4bfcc34161358d51d868f816c923eb93f927a412 (patch) | |
| tree | f54fdc39f5381d6b58a06e7e3ed458f63f0e9df2 /x11 | |
| parent | 8820d0b0e1e20d3278c7c39632417b4d9ca31899 (diff) | |
| download | pkgsrc-4bfcc34161358d51d868f816c923eb93f927a412.tar.gz | |
Merge packages from the buildlink2 branch back into the main trunk that
have been converted to USE_BUILDLINK2.
Diffstat (limited to 'x11')
70 files changed, 233 insertions, 344 deletions
diff --git a/x11/9term/Makefile b/x11/9term/Makefile index 3cac4fac123..90d27937868 100644 --- a/x11/9term/Makefile +++ b/x11/9term/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/12/15 20:37:53 agc Exp $ +# $NetBSD: Makefile,v 1.10 2002/08/25 21:52:26 jlam Exp $ # FreeBSD Id: Makefile,v 1.5 1996/12/07 23:43:56 asami Exp # @@ -11,16 +11,16 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.psrg.cs.usyd.edu.au/~matty/9term/index.html COMMENT= X11 program which emulates a plan9 window -DEPENDS+= sam-4.3nb1:../../editors/sam +BUILDLINK_DEPMETHOD.sam= full NOT_FOR_PLATFORM= *-*-alpha #LP64 Problems -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes +USE_X11= yes MANCOMPRESSED= yes WRKSRC= ${WRKDIR} -EVAL_PREFIX+= SAM_DIR=qt1 -MAKE_ENV+= SAM_DIR=${SAM_DIR} +MAKE_ENV+= SAM_DIR=${BUILDLINK_PREFIX.sam} -.include "../../mk/x11.buildlink.mk" +.include "../../editors/sam/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/XaoS/Makefile b/x11/XaoS/Makefile index c66d48f9f78..88882942c22 100644 --- a/x11/XaoS/Makefile +++ b/x11/XaoS/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/05/12 10:16:51 abs Exp $ +# $NetBSD: Makefile,v 1.3 2002/08/25 21:52:26 jlam Exp $ # DISTNAME= XaoS-3.0 @@ -9,10 +9,10 @@ MAINTAINER= atatat@netbsd.org HOMEPAGE= http://xaos.theory.org/ COMMENT= Zoomable fractal rendering doodad -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES +USE_X11= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-curses-driver=no -.include "../../graphics/png/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/png/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/Xbae/Makefile b/x11/Xbae/Makefile index d9c51cc3abb..cf0fef1f801 100644 --- a/x11/Xbae/Makefile +++ b/x11/Xbae/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2002/08/25 18:40:27 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2002/08/25 21:52:27 jlam Exp $ # DISTNAME= Xbae-4.9.1 diff --git a/x11/Xbae/buildlink2.mk b/x11/Xbae/buildlink2.mk index 9a795ad90b0..49f125acfd1 100644 --- a/x11/Xbae/buildlink2.mk +++ b/x11/Xbae/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:28 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.3 2002/08/25 21:52:27 jlam Exp $ .if !defined(XBAE_BUILDLINK2_MK) XBAE_BUILDLINK2_MK= # defined diff --git a/x11/XmHTML/Makefile b/x11/XmHTML/Makefile index da1824db190..d7284f65891 100644 --- a/x11/XmHTML/Makefile +++ b/x11/XmHTML/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2002/04/17 03:04:18 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2002/08/25 21:52:28 jlam Exp $ # DISTNAME= XmHTML-1.1.7 @@ -10,12 +10,10 @@ MAINTAINER= mellon@isc.org HOMEPAGE= http://www.xs4all.nl/~ripley/XmHTML/ COMMENT= Motif Widget capable of displaying HTML 3.2 conforming text -USE_X11BASE= YES -USE_GMAKE= YES -USE_LIBTOOL= YES -USE_BUILDLINK_ONLY= YES - -MAKE_ENV+= CC="${CC}" +USE_X11BASE= YES +USE_GMAKE= YES +USE_LIBTOOL= YES +USE_BUILDLINK2= YES do-install: ${LIBTOOL} ${LIBTOOL_FLAGS} ${INSTALL_DATA} \ @@ -23,9 +21,9 @@ do-install: ${INSTALL_DATA_DIR} ${PREFIX}/include/XmHTML ${INSTALL_DATA} ${WRKSRC}/include/XmHTML/*.h ${PREFIX}/include/XmHTML -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/png/buildlink.mk" -.include "../../graphics/xpm/buildlink.mk" -.include "../../mk/motif.buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../graphics/xpm/buildlink2.mk" +.include "../../mk/motif.buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/x11/XmHTML/distinfo b/x11/XmHTML/distinfo index c84bb47ca84..0acfcf413ca 100644 --- a/x11/XmHTML/distinfo +++ b/x11/XmHTML/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.3 2001/09/12 04:05:03 jlam Exp $ +$NetBSD: distinfo,v 1.4 2002/08/25 21:52:28 jlam Exp $ SHA1 (XmHTML-1.1.7.tar.gz) = 4d8c82f88cf0700f6fc8898323d865b83d2a1ff1 Size (XmHTML-1.1.7.tar.gz) = 1289780 bytes -SHA1 (patch-aa) = 5ca0d5976c61e488207c731a80f7094fb5270850 +SHA1 (patch-aa) = 6008cf68c80010399071ddaed56c00dac2ce060c SHA1 (patch-ab) = 2f9e88b74913c735caf139646c2637a77a1232cd SHA1 (patch-ac) = cf48e4eb9887df7bd5d82615aa505939ba97bee8 SHA1 (patch-ad) = d96f518c05f27fd7e7b4fc756467c6dca4a570ef diff --git a/x11/XmHTML/patches/patch-aa b/x11/XmHTML/patches/patch-aa index 88c49b9d660..fb02e9ff4f2 100644 --- a/x11/XmHTML/patches/patch-aa +++ b/x11/XmHTML/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.5 2001/09/12 04:05:04 jlam Exp $ +$NetBSD: patch-aa,v 1.6 2002/08/25 21:52:29 jlam Exp $ --- Makefile.orig Thu Feb 4 00:43:27 1999 +++ Makefile @@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.5 2001/09/12 04:05:04 jlam Exp $ -ZLIBINC = -IMAGEINCLUDES = $(ZLIBINC) +ZLIBINC = -+IMAGEINCLUDES = -I${BUILDLINK_DIR}/include $(ZLIBINC) ++IMAGEINCLUDES = -I${LOCALBASE}/include $(ZLIBINC) # Image libraries # No need to add -lXpm if you need to include it with LIBS below @@ -40,7 +40,7 @@ $NetBSD: patch-aa,v 1.5 2001/09/12 04:05:04 jlam Exp $ # Platform specific includes ifeq ($(PLATFORM),Motif) -PLATFORMINC=-I../../include/XmHTML -I/usr/X11R6/include -+PLATFORMINC=-I../../include/XmHTML -I${BUILDLINK_X11_DIR}/include ++PLATFORMINC=-I../../include/XmHTML -I${X11BASE}/include else ifeq ($(PLATFORM),gtk) PLATFORMINC=-I../../include/gtk-xmhtml -I/usr/local/include @@ -49,7 +49,7 @@ $NetBSD: patch-aa,v 1.5 2001/09/12 04:05:04 jlam Exp $ ifeq ($(PLATFORM),Motif) -LIBDIR = -L/usr/X11R6/lib -+LIBDIR = -L${BUILDLINK_X11_DIR}/lib ++LIBDIR = -L${X11BASE}/lib # This is what is required under Linux (Motif 2.0.1). # Your mileage may vary. -LIBS = -lXm -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE @@ -61,7 +61,7 @@ $NetBSD: patch-aa,v 1.5 2001/09/12 04:05:04 jlam Exp $ ifeq($(PLATFORM),gtk) -LIBDIR = -L/usr/local/lib -+LIBDIR = -L${BUILDLINK_X11_DIR}/lib ++LIBDIR = -L${X11BASE}/lib LIBS = -lgdk -lgtk -lX11 # endif gtk diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile index edf76658970..d045f2876cf 100644 --- a/x11/aterm/Makefile +++ b/x11/aterm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2002/08/03 13:00:28 hubertf Exp $ +# $NetBSD: Makefile,v 1.9 2002/08/25 21:52:30 jlam Exp $ # DISTNAME= aterm-0.4.2 @@ -10,7 +10,8 @@ MAINTAINER= hubertf@netbsd.org HOMEPAGE= http://aterm.sourceforge.net/ COMMENT= aterm (Afterstep XVT) - a VT102 emulator for the X window system -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES +USE_X11= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+=--enable-background-image \ --enable-transparency \ @@ -21,18 +22,19 @@ CONFIGURE_ARGS+=--enable-background-image \ --enable-big5 \ --enable-greek \ --with-xpm \ - --with-xpm-includes=${BUILDLINK_DIR}/include \ - --with-xpm-library=${BUILDLINK_DIR}/lib \ + --with-xpm-includes=${BUILDLINK_PREFIX.xpm}/include \ + --with-xpm-library=${BUILDLINK_PREFIX.xpm}/lib \ --with-jpeg \ - --with-jpeg-includes=${BUILDLINK_DIR}/include \ - --with-jpeg-library=${BUILDLINK_DIR}/lib \ + --with-jpeg-includes=${BUILDLINK_PREFIX.jpeg}/include \ + --with-jpeg-library=${BUILDLINK_PREFIX.jpeg}/lib \ --with-png \ - --with-png-library=${BUILDLINK_DIR}/lib \ - --with-png-includes=${BUILDLINK_DIR}/include \ + --with-png-library=${BUILDLINK_PREFIX.png}/lib \ + --with-png-includes=${BUILDLINK_PREFIX.png}/include \ --enable-utmp \ --enable-wtmp -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/png/buildlink.mk" -.include "../../graphics/xpm/buildlink.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../graphics/xpm/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/x11/aterm/distinfo b/x11/aterm/distinfo index b791bc81a6c..2611c020359 100644 --- a/x11/aterm/distinfo +++ b/x11/aterm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2002/08/03 13:00:29 hubertf Exp $ +$NetBSD: distinfo,v 1.6 2002/08/25 21:52:30 jlam Exp $ SHA1 (aterm-0.4.2.tar.gz) = 8ce3f1fcdc12805068ff5acde6f130a22e1f5b9b Size (aterm-0.4.2.tar.gz) = 312730 bytes diff --git a/x11/aterm/patches/patch-ac b/x11/aterm/patches/patch-ac index 37433df93ac..56d9b1d1dfb 100644 --- a/x11/aterm/patches/patch-ac +++ b/x11/aterm/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1 2002/05/12 21:21:32 wiz Exp $ +$NetBSD: patch-ac,v 1.2 2002/08/25 21:52:30 jlam Exp $ --- src/utmp.c.orig Sat May 4 08:40:45 2002 +++ src/utmp.c diff --git a/x11/aterm/patches/patch-ad b/x11/aterm/patches/patch-ad index 67addf493fa..a67602d4fc6 100644 --- a/x11/aterm/patches/patch-ad +++ b/x11/aterm/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.1 2002/05/12 21:21:32 wiz Exp $ +$NetBSD: patch-ad,v 1.2 2002/08/25 21:52:31 jlam Exp $ --- src/rxvt.h.orig Sat May 4 08:47:56 2002 +++ src/rxvt.h diff --git a/x11/aterm/patches/patch-ae b/x11/aterm/patches/patch-ae index 7ba1b0bf572..f4d91f2708e 100644 --- a/x11/aterm/patches/patch-ae +++ b/x11/aterm/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.1 2002/08/03 13:00:30 hubertf Exp $ +$NetBSD: patch-ae,v 1.2 2002/08/25 21:52:31 jlam Exp $ --- src/command.c.orig Thu Sep 6 18:38:07 2001 +++ src/command.c diff --git a/x11/dfm/Makefile.common b/x11/dfm/Makefile.common index 9621643c0a8..38ceb908585 100644 --- a/x11/dfm/Makefile.common +++ b/x11/dfm/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2002/03/13 17:37:54 fredb Exp $ +# $NetBSD: Makefile.common,v 1.4 2002/08/25 21:52:32 jlam Exp $ # DISTNAME= dfm-0.99.9 @@ -6,13 +6,14 @@ PKGREVISION= 1 MASTER_SITES= http://www.kaisersite.de/dfm/ WRKSRC= ${WRKDIR}/dfm +USE_BUILDLINK2= yes +USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-imlib-icons -USE_BUILDLINK_ONLY= yes -.include "../../x11/gtk/buildlink.mk" -.include "../../graphics/xpm/buildlink.mk" -.include "../../graphics/imlib/buildlink.mk" -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../graphics/imlib/buildlink2.mk" +.include "../../graphics/xpm/buildlink2.mk" +.include "../../x11/gtk/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/x11/dfm/distinfo b/x11/dfm/distinfo index 23e18247703..8a501fecbad 100644 --- a/x11/dfm/distinfo +++ b/x11/dfm/distinfo @@ -1,5 +1,4 @@ -$NetBSD: distinfo,v 1.2 2001/10/21 10:50:00 wiz Exp $ +$NetBSD: distinfo,v 1.3 2002/08/25 21:52:32 jlam Exp $ SHA1 (dfm-0.99.9.tar.gz) = 491f7ed1f8f82a0272143fa79b1b7ca705d34664 Size (dfm-0.99.9.tar.gz) = 389444 bytes -SHA1 (patch-aa) = e30096229341008235a70d84620b877dac8d461e diff --git a/x11/dfm/patches/patch-aa b/x11/dfm/patches/patch-aa deleted file mode 100644 index 32c955f9754..00000000000 --- a/x11/dfm/patches/patch-aa +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2001/10/21 10:50:00 wiz Exp $ - ---- configure.orig Tue May 1 22:58:11 2001 -+++ configure -@@ -2064,8 +2064,8 @@ - fi - - --CPPFLAGS="$CPPFLAGS $X_CFLAGS -I/usr/local/include" --LIBS="$LIBS $X_LIBS -L/usr/local/lib" -+CPPFLAGS="$CPPFLAGS $X_CFLAGS" -+LIBS="$LIBS $X_LIBS" - - ALL_LINGUAS="de da ru" - # Extract the first word of "ranlib", so it can be a program name with args. diff --git a/x11/ebuilder/Makefile b/x11/ebuilder/Makefile index 65db4701e62..5b83c468056 100644 --- a/x11/ebuilder/Makefile +++ b/x11/ebuilder/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2002/03/17 15:36:35 fredb Exp $ +# $NetBSD: Makefile,v 1.17 2002/08/25 21:52:34 jlam Exp $ # DISTNAME= ebuilder-0.56d @@ -11,15 +11,15 @@ MAINTAINER= drochner@netbsd.org HOMEPAGE= http://web.inter.nl.net/users/eavdmeer/index.html COMMENT= GUI builder for the Qt library -USE_BUILDLINK_ONLY= yes -USE_GMAKE= yes -MAKEFILE= GNUmakefile +USE_BUILDLINK2= yes +USE_X11= yes +USE_GMAKE= yes +MAKEFILE= GNUmakefile -MAKE_ENV+= CXXFLAGS="${CXXFLAGS}" +MAKE_ENV+= CXXFLAGS="${CXXFLAGS}" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/ebuilder ${PREFIX}/bin -.include "../../x11/qt2-libs/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../x11/qt2-libs/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/ebuilder/distinfo b/x11/ebuilder/distinfo index 01949730a8c..a160b7bbd8d 100644 --- a/x11/ebuilder/distinfo +++ b/x11/ebuilder/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.4 2001/08/29 22:41:27 jlam Exp $ +$NetBSD: distinfo,v 1.5 2002/08/25 21:52:34 jlam Exp $ SHA1 (ebuilder-0.56d.tar.gz) = fb0c7d56a7c55580082a832be975d188fe0e5e5d Size (ebuilder-0.56d.tar.gz) = 84717 bytes -SHA1 (patch-aa) = e3c24bd15a8942b2ce3573ecb5560ecfe5e39174 +SHA1 (patch-aa) = 906ee4003691e821b386cdcd6ccdd56777f7872d SHA1 (patch-ab) = a50121d2072e2c756432c4e0bfd44c6a2683498a diff --git a/x11/ebuilder/patches/patch-aa b/x11/ebuilder/patches/patch-aa index 39217df8e4a..842a39d81e3 100644 --- a/x11/ebuilder/patches/patch-aa +++ b/x11/ebuilder/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.4 2001/08/29 22:41:27 jlam Exp $ +$NetBSD: patch-aa,v 1.5 2002/08/25 21:52:35 jlam Exp $ --- config.mk.orig Sat Mar 25 08:31:45 2000 +++ config.mk @@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.4 2001/08/29 22:41:27 jlam Exp $ QTINCL = -I$(QTDIR)/include QTCC = $(QTDIR)/bin/moc -QTLIBS = -L$(QTDIR)/lib -lqt -+QTLIBS = ${LDFLAGS} -L$(QTDIR)/lib -lqt -L$(BUILDLINK_X11_DIR)/lib -lX11 -lXext -lSM -lpng -lz ++QTLIBS = ${LDFLAGS} -L$(QTDIR)/lib -lqt -L$(X11BASE)/lib -lX11 -lXext -lSM -lpng -lz # Implicit rules needed to build .o files and Metaobject stuff (_m.o) .SUFFIXES: .cc .o .h _m.o diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile index 7450c371967..5526e7854f3 100644 --- a/x11/eterm/Makefile +++ b/x11/eterm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2002/03/13 17:37:54 fredb Exp $ +# $NetBSD: Makefile,v 1.16 2002/08/25 21:52:35 jlam Exp $ DISTNAME= Eterm-0.8.10 PKGNAME= eterm-0.8.10 @@ -18,7 +18,7 @@ ETERM_SRCS= ${DISTNAME}${EXTRACT_SUFX} PIXMAP_FILES= Eterm-bg-scale-1.tar.gz Eterm-bg-scale-2.tar.gz \ Eterm-bg-tile.tar.gz -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= yes USE_X11BASE= yes USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig @@ -41,6 +41,5 @@ post-install: ${CHMOD} 4711 ${PREFIX}/bin/Eterm .endif -.include "../../graphics/imlib/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/imlib/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/eterm/distinfo b/x11/eterm/distinfo index fd2e930bf23..1ea848c340d 100644 --- a/x11/eterm/distinfo +++ b/x11/eterm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2002/06/17 22:13:43 agc Exp $ +$NetBSD: distinfo,v 1.6 2002/08/25 21:52:36 jlam Exp $ SHA1 (Eterm-0.8.10.tar.gz) = 0cafeec2c9d79c874c6b312dcb105b912168ad0d Size (Eterm-0.8.10.tar.gz) = 593026 bytes @@ -12,7 +12,4 @@ SHA1 (patch-aa) = 056585ad4c39b60a3dbf41d8c7e65d31ba5f7fcd SHA1 (patch-ab) = cdea7fe7a3c546e9f89a7eb86ec079f34572e984 SHA1 (patch-ac) = 26b0f5c13f2b621db1c5edf84c5123b315225d8d SHA1 (patch-ad) = a750146fe3a0b0b2796997cf2e20e38f14be86bf -SHA1 (patch-ae) = 7464d0b7b4b8d5b4c825d7fdcfa464b5e3d18a6c -SHA1 (patch-af) = 8f21b197a56ddc0d66f29dcf9d5dcbe7922a28ae -SHA1 (patch-ag) = 5359f122eb6fe605202288de59d71d07be4d2556 SHA1 (patch-ah) = ebf2fa3ae2d272795f0a292b201586cc2158c973 diff --git a/x11/eterm/patches/patch-ae b/x11/eterm/patches/patch-ae deleted file mode 100644 index 792bb622c18..00000000000 --- a/x11/eterm/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.3 2001/08/29 22:41:28 jlam Exp $ - ---- libmej/Makefile.in.orig Fri Nov 5 11:03:53 1999 -+++ libmej/Makefile.in -@@ -105,7 +105,7 @@ - - libmej_la_SOURCES = debug.c mem.c strings.c snprintf.c - --INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src -I.. -I$(includedir) -I$(prefix)/include $(X_CFLAGS) -+INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src -I.. $(X_CFLAGS) - - libmej_la_LDFLAGS = -release $(VERSION) - diff --git a/x11/eterm/patches/patch-af b/x11/eterm/patches/patch-af deleted file mode 100644 index 782a96609b5..00000000000 --- a/x11/eterm/patches/patch-af +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-af,v 1.1 2001/08/29 22:41:28 jlam Exp $ - ---- src/Makefile.in.orig Fri Nov 5 14:03:54 1999 -+++ src/Makefile.in -@@ -113,8 +113,8 @@ - Eterm_DEPENDENCIES = libEterm.la - Eterm_LDFLAGS = -rpath $(libdir):$(pkglibdir) libEterm.la - --INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/libmej -I.. -I$(includedir) -I$(prefix)/include $(X_CFLAGS) --LDADD = $(DIST_ROOT)/libmej/libmej.la -L$(libdir) -L$(prefix)/lib $(LIBS) $(GRLIBS) $(X_LIBS) -+INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/libmej -I.. $(X_CFLAGS) -+LDADD = $(DIST_ROOT)/libmej/libmej.la $(LIBS) $(GRLIBS) $(X_LIBS) - - EXTRA_DIST = activeconfig.h activeeterm.h activetags.h command.h debug.h eterm_imlib.h eterm_utmp.h feature.h.in graphics.h grkelot.h grx.h main.h menubar.h misc.h options.h pixmap.h profile.h screen.h scrollbar.h system.h threads.h graphics/Makefile.am graphics/Makefile.in graphics/README graphics/data graphics/grxlib.c graphics/grxlib.h graphics/qplot.c Eterm.xpm - diff --git a/x11/eterm/patches/patch-ag b/x11/eterm/patches/patch-ag deleted file mode 100644 index 0a5e32b2a7b..00000000000 --- a/x11/eterm/patches/patch-ag +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2001/08/29 22:41:28 jlam Exp $ - ---- utils/Makefile.in.orig Fri Nov 5 14:03:55 1999 -+++ utils/Makefile.in -@@ -101,14 +101,14 @@ - THREADLIBS = @THREADLIBS@ - VERSION = @VERSION@ - --INCLUDES = -I. -I../libmej -I.. -I$(includedir) -I$(prefix)/include $(X_CFLAGS) -+INCLUDES = -I. -I../libmej -I.. $(X_CFLAGS) - - bin_PROGRAMS = Esetroot Etbg - bin_SCRIPTS = Etcolors.sh Etmenu.sh - - Esetroot_SOURCES = Esetroot.c - Esetroot_LDFLAGS = -rpath $(libdir):$(pkglibdir) --Esetroot_LDADD = -L$(DIST_ROOT)/libmej -L$(libdir) -L$(prefix)/lib $(LIBS) $(GRLIBS) $(X_LIBS) -+Esetroot_LDADD = -L$(DIST_ROOT)/libmej $(LIBS) $(GRLIBS) $(X_LIBS) - - Etbg_SOURCES = Etbg.c - diff --git a/x11/eterm/patches/patch-ah b/x11/eterm/patches/patch-ah index 75e18862915..9e55f00b586 100644 --- a/x11/eterm/patches/patch-ah +++ b/x11/eterm/patches/patch-ah @@ -1,4 +1,4 @@ -$NetBSD: patch-ah,v 1.1 2002/06/17 22:13:45 agc Exp $ +$NetBSD: patch-ah,v 1.2 2002/08/25 21:52:39 jlam Exp $ --- src/utmp.c 2002/06/17 21:59:32 1.1 +++ src/utmp.c 2002/06/17 22:03:43 diff --git a/x11/imwheel/Makefile b/x11/imwheel/Makefile index 1295ea3eeca..a995935820c 100644 --- a/x11/imwheel/Makefile +++ b/x11/imwheel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/08/29 22:41:29 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2002/08/25 21:52:39 jlam Exp $ # DISTNAME= imwheel-0.9.9 @@ -9,11 +9,10 @@ MAINTAINER= zuntum@netbsd.org HOMEPAGE= http://jcatki.dhs.org/imwheel/ COMMENT= tool which helps to use mousewheels -USE_BUILDLINK_ONLY= YES -GNU_CONFIGURE= YES +USE_BUILDLINK2= YES USE_X11BASE= YES +GNU_CONFIGURE= YES CONFIGURE_ARGS+= --disable-gpm -.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile index dbae647ff3a..466c77a7003 100644 --- a/x11/mlterm/Makefile +++ b/x11/mlterm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2002/06/19 13:51:16 uebayasi Exp $ +# $NetBSD: Makefile,v 1.7 2002/08/25 21:52:40 jlam Exp $ DISTNAME= mlterm-2.5.0 CATEGORIES= x11 @@ -11,17 +11,17 @@ COMMENT= Multingual terminal emulator # CODESET is only supported on NetBSD in 1.5T and later - see <langinfo.h> ONLY_FOR_PLATFORM= NetBSD-1.5[T-Z]-* NetBSD-1.5Z[A-Z]-* NetBSD-1.[6-9]* -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes +USE_X11= yes -GNU_CONFIGURE= yes - -USE_LIBTOOL= yes +USE_LIBTOOL= yes LIBTOOL_OVERRIDE+= ${WRKSRC}/mkf/autoconf/libtool LIBTOOL_OVERRIDE+= ${WRKSRC}/autoconf/libtool LIBTOOL_OVERRIDE+= ${WRKSRC}/kiklib/autoconf/libtool -CONFIGURE_ARGS+=--enable-imlib -CONFIGURE_ARGS+=--enable-anti-alias +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --enable-imlib +CONFIGURE_ARGS+= --enable-anti-alias post-patch: @${FIND} ${WRKSRC} -name Makefile.in | \ @@ -34,8 +34,8 @@ post-patch: $${f}.orig > $$f; \ done -.include "../../devel/glib/buildlink.mk" -.include "../../graphics/imlib/buildlink.mk" -.include "../../x11/gtk/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../devel/glib/buildlink2.mk" +.include "../../graphics/imlib/buildlink2.mk" +.include "../../x11/gtk/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/x11/mlterm/PLIST b/x11/mlterm/PLIST index c9d798712d4..827b694f0f3 100644 --- a/x11/mlterm/PLIST +++ b/x11/mlterm/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2002/06/20 03:08:15 uebayasi Exp $ +@comment $NetBSD: PLIST,v 1.7 2002/08/25 21:52:40 jlam Exp $ bin/mlclient bin/mlterm etc/mlterm/aafont diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo index b3a34ee1553..dbe6bc04cda 100644 --- a/x11/mlterm/distinfo +++ b/x11/mlterm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2002/06/19 13:51:17 uebayasi Exp $ +$NetBSD: distinfo,v 1.6 2002/08/25 21:52:41 jlam Exp $ SHA1 (mlterm-2.5.0.tar.gz) = c57b5788c0152f068a89fc8c8dd07c291e1254a9 Size (mlterm-2.5.0.tar.gz) = 1621454 bytes diff --git a/x11/qt2-docs/Makefile b/x11/qt2-docs/Makefile index fbe6cfd64b9..89ae9b19d4e 100644 --- a/x11/qt2-docs/Makefile +++ b/x11/qt2-docs/Makefile @@ -1,15 +1,15 @@ -# $NetBSD: Makefile,v 1.12 2002/03/13 17:38:01 fredb Exp $ +# $NetBSD: Makefile,v 1.13 2002/08/25 21:52:41 jlam Exp $ # PKGNAME= qt2-docs-${QTVERSION} PKGREVISION= 2 COMMENT= Documentation for the QT C++ X GUI toolkit -.include "../qt2-libs/Makefile.common" - -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes BUILDLINK_DEPENDS.qt2-libs= qt2-libs>=${QTVERSION}nb2 +.include "../qt2-libs/Makefile.common" + NO_PATCH= yes NO_CONFIGURE= yes NO_BUILD= yes @@ -45,4 +45,5 @@ do-install: done) .include "../../x11/qt2-libs/buildlink.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/x11/qt2-examples/Makefile b/x11/qt2-examples/Makefile index 0e13d59c9e8..118d7ac08e2 100644 --- a/x11/qt2-examples/Makefile +++ b/x11/qt2-examples/Makefile @@ -1,15 +1,15 @@ -# $NetBSD: Makefile,v 1.7 2002/03/13 17:38:02 fredb Exp $ +# $NetBSD: Makefile,v 1.8 2002/08/25 21:52:42 jlam Exp $ # PKGNAME= qt2-examples-${QTVERSION} PKGREVISION= 2 COMMENT= QT2 Tutorial, example code and HTML documentation -.include "../qt2-libs/Makefile.common" - -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes BUILDLINK_DEPENDS.qt2-libs= qt2-libs>=${QTVERSION}nb2 +.include "../qt2-libs/Makefile.common" + CONFIGURE_ENV+= QTDIR=${QTPREFIX} do-build: @@ -38,4 +38,5 @@ do-install: done) .include "../../x11/qt2-libs/buildlink.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/x11/qwt/Makefile b/x11/qwt/Makefile index 257bbbb1933..f33beae8c6d 100644 --- a/x11/qwt/Makefile +++ b/x11/qwt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2002/03/13 17:38:03 fredb Exp $ +# $NetBSD: Makefile,v 1.15 2002/08/25 21:52:43 jlam Exp $ DISTNAME= qwt-0.3.0 PKGREVISION= 1 @@ -10,13 +10,12 @@ HOMEPAGE= http://sourceforge.net/projects/qwt COMMENT= Qt widget library for technical purposes BUILDLINK_DEPENDS.qt2-libs= qt2-libs>=2.3.1nb2 -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes USE_X11BASE= yes USE_GMAKE= yes USE_LIBTOOL= yes -MAKE_ENV+= CXX="${CXX}" MAKE_ENV+= CXXFLAGS="${CXXFLAGS}" CONFLICTS= qwtlib-[0-9]* @@ -31,6 +30,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qwt ${INSTALL_DATA} ${WRKSRC}/doc/man/man3/* ${PREFIX}/man/man3 -.include "../../x11/qt2-libs/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../x11/qt2-libs/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/qwt/distinfo b/x11/qwt/distinfo index 2b8a6c39b3d..50ed84a922b 100644 --- a/x11/qwt/distinfo +++ b/x11/qwt/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.5 2001/08/29 22:41:30 jlam Exp $ +$NetBSD: distinfo,v 1.6 2002/08/25 21:52:43 jlam Exp $ SHA1 (qwt-0.3.0.tar.gz) = 504940fbf25b058d258bba3589a22752a624847b Size (qwt-0.3.0.tar.gz) = 484675 bytes -SHA1 (patch-aa) = 37b74054101d51f1e60acd6afad1a128eb6b867d +SHA1 (patch-aa) = e57c888c1c6ea486dfa24e84e7aaba72f406fa7e diff --git a/x11/qwt/patches/patch-aa b/x11/qwt/patches/patch-aa index a5c62893227..00c730e7863 100644 --- a/x11/qwt/patches/patch-aa +++ b/x11/qwt/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2001/08/29 22:41:30 jlam Exp $ +$NetBSD: patch-aa,v 1.4 2002/08/25 21:52:44 jlam Exp $ --- makefiles/netbsd-g++.orig Wed Dec 13 23:23:09 2000 +++ makefiles/netbsd-g++ @@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.3 2001/08/29 22:41:30 jlam Exp $ -LIBS = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt -lXext -lX11 -lm +#LINK = g++ +#LFLAGS = -Bshareable -+LIBS = ${LDFLAGS} $(SUBLIBS) -L$(QTDIR)/lib -L${BUILDLINK_X11_DIR}/lib -lqt -lXext -lX11 -lm ++LIBS = ${LDFLAGS} $(SUBLIBS) -L$(QTDIR)/lib -L${X11BASE}/lib -lqt -lXext -lX11 -lm AR = ar cqs RANLIB = MOC = $(QTDIR)/bin/moc diff --git a/x11/rxvt/MESSAGE b/x11/rxvt/MESSAGE index f901a7f1b45..0c81d861e81 100644 --- a/x11/rxvt/MESSAGE +++ b/x11/rxvt/MESSAGE @@ -1,5 +1,5 @@ ====================================================================== -$NetBSD: MESSAGE,v 1.1 2001/10/31 22:11:37 zuntum Exp $ +$NetBSD: MESSAGE,v 1.2 2002/08/25 21:52:44 jlam Exp $ The rxvt binary is able to use greek keyboard extensions and multibyte character encodings. Due to errors in the current @@ -9,5 +9,5 @@ for users in other locales). The multibyte character encoding support is compiled in, but by default disabled. To enable it, please edit the file -${X11BASE}/lib/X11/app-defaults/Rxvt. +${PREFIX}/lib/X11/app-defaults/Rxvt. ====================================================================== diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile index 92ee22d6540..29c79624715 100644 --- a/x11/rxvt/Makefile +++ b/x11/rxvt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2001/10/24 22:11:15 jlam Exp $ +# $NetBSD: Makefile,v 1.31 2002/08/25 21:52:45 jlam Exp $ # FreeBSD Id: Makefile,v 1.13 1997/03/07 12:29:49 obrien Exp # @@ -13,10 +13,9 @@ MAINTAINER= gcw@rxvt.org HOMEPAGE= http://www.rxvt.org/ COMMENT= Low memory usage xterm replacement that supports color -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES USE_X11BASE= YES GNU_CONFIGURE= YES -MESSAGE_SUBST+= X11BASE="${X11PREFIX}" CONFIGURE_ARGS+= --enable-utmp \ --enable-wtmp \ @@ -40,8 +39,8 @@ CONFIGURE_ARGS+= --enable-utmp \ # enabling it, please fix pkg/MESSAGE as well. # --enable-greek -CONFIGURE_ARGS+= --with-xpm-includes=${BUILDLINK_DIR}/include/X11 -CONFIGURE_ARGS+= --with-xpm-library=${BUILDLINK_DIR}/lib +CONFIGURE_ARGS+= --with-xpm-includes=${BUILDLINK_PREFIX.xpm}/include/X11 +CONFIGURE_ARGS+= --with-xpm-library=${BUILDLINK_PREFIX.xpm}/lib post-patch: ${MV} ${WRKSRC}/src/feature.h ${WRKSRC}/src/feature.h.orig @@ -53,6 +52,5 @@ pre-install: ${INSTALL_DATA} ${FILESDIR}/Rxvt ${X11PREFIX}/lib/X11/app-defaults; \ fi -.include "../../graphics/xpm/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/xpm/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/rxvt/PLIST b/x11/rxvt/PLIST index 9a315823c7c..cb71a886549 100644 --- a/x11/rxvt/PLIST +++ b/x11/rxvt/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/05/11 18:07:13 wiz Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/08/25 21:52:45 jlam Exp $ bin/rxvt man/man1/rxvt.1 lib/X11/app-defaults/Rxvt diff --git a/x11/tk-Tix/Makefile b/x11/tk-Tix/Makefile index 42e6ac09389..d0a2692db43 100644 --- a/x11/tk-Tix/Makefile +++ b/x11/tk-Tix/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2002/04/16 14:06:53 seb Exp $ +# $NetBSD: Makefile,v 1.3 2002/08/25 21:52:46 jlam Exp $ # DISTNAME= tix8.2.0b1 PKGNAME= tk-Tix-8.2.0b1 +WRKSRC= ${WRKDIR}/tix8.2.0/unix CATEGORIES= x11 tcl tk MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tixlibrary/} @@ -10,17 +11,17 @@ MAINTAINER= he@netbsd.org HOMEPAGE= http://tixlibrary.sourceforge.net/ COMMENT= Powerful widget library for Tcl/Tk +USE_BUILDLINK2= yes +USE_X11= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --enable-shared --with-tcl=${BUILDLINK_DIR}/lib \ - --with-tk=${BUILDLINK_DIR}/lib \ +CONFIGURE_ARGS+= --enable-shared --with-tcl=${BUILDLINK_PREFIX.tcl}/lib \ + --with-tk=${BUILDLINK_PREFIX.tk}/lib \ --disable-stubs -USE_BUILDLINK_ONLY= YES - -WRKSRC= ${WRKDIR}/tix8.2.0/unix +MAKE_ENV+= TCL_DIR=${BUILDLINK_PREFIX.tcl} +MAKE_ENV+= TK_DIR=${BUILDLINK_PREFIX.tk} test: - @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} test) + @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} test -.include "../../mk/x11.buildlink.mk" -.include "../../x11/tk/buildlink.mk" +.include "../../x11/tk/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/tk-Tix/distinfo b/x11/tk-Tix/distinfo index 73556615dcb..9e22882c684 100644 --- a/x11/tk-Tix/distinfo +++ b/x11/tk-Tix/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/04/15 08:19:02 he Exp $ +$NetBSD: distinfo,v 1.2 2002/08/25 21:52:47 jlam Exp $ SHA1 (tix8.2.0b1.tar.gz) = c9114e56c41fc492532639127439d6f267c51402 Size (tix8.2.0b1.tar.gz) = 1374621 bytes -SHA1 (patch-aa) = c77a20a692b3ef79e9092c15e506d5af7961919e +SHA1 (patch-aa) = b9c15d3435d289a3469e4c1bc261df99e1a2bf2e SHA1 (patch-ab) = 2a46093df4d19c481d58b2a9b8945430d547a12c SHA1 (patch-ac) = 9702cf3635c04ce066f5d910d5a5b6ad1d87d96b diff --git a/x11/tk-Tix/patches/patch-aa b/x11/tk-Tix/patches/patch-aa index 8dcd5201186..0f4f452dd6b 100644 --- a/x11/tk-Tix/patches/patch-aa +++ b/x11/tk-Tix/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/04/15 08:19:02 he Exp $ +$NetBSD: patch-aa,v 1.2 2002/08/25 21:52:47 jlam Exp $ ---- Makefile.in.orig Thu Jan 11 08:43:46 2001 +--- Makefile.in.orig Thu Jan 11 02:43:46 2001 +++ Makefile.in @@ -217,6 +217,7 @@ STLIB_LD = @STLIB_LD@ @@ -24,10 +24,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/04/15 08:19:02 he Exp $ - -I$(TCL_SRC_DIR)/unix \ - -I$(TK_SRC_DIR)/generic \ - -I$(TK_SRC_DIR)/unix \ -+INCLUDES = -I$(BUILDLINK_DIR)/include/tcl/generic \ -+ -I$(BUILDLINK_DIR)/include/tcl/unix \ -+ -I$(BUILDLINK_DIR)/include/tk/generic \ -+ -I$(BUILDLINK_DIR)/include/tk/unix \ ++INCLUDES = -I$(TCL_DIR)/include/tcl/generic \ ++ -I$(TCL_DIR)/include/tcl/unix \ ++ -I$(TK_DIR)/include/tk/generic \ ++ -I$(TK_DIR)/include/tk/unix \ -I$(GENERIC_DIR) \ -I$(UNIX_DIR) \ - -I$(WIN_DIR) diff --git a/x11/wmessage/Makefile b/x11/wmessage/Makefile index 0b1856d566c..726d68cc56f 100644 --- a/x11/wmessage/Makefile +++ b/x11/wmessage/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2002/03/13 17:38:04 fredb Exp $ +# $NetBSD: Makefile,v 1.17 2002/08/25 21:52:47 jlam Exp $ DISTNAME= wmessage-0.10 PKGREVISION= 1 @@ -9,9 +9,8 @@ MAINTAINER= jlam@netbsd.org HOMEPAGE= http://www.ozemail.com.au/~crn/wmessage/ COMMENT= WINGs based message viewer similar to xmessage -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= # defined +USE_X11= # defined -.include "../../devel/libproplist/buildlink.mk" -.include "../../wm/windowmaker/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../wm/windowmaker/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/wmessage/distinfo b/x11/wmessage/distinfo index 02f9e3e8122..d482e136197 100644 --- a/x11/wmessage/distinfo +++ b/x11/wmessage/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.4 2001/08/23 18:01:10 jlam Exp $ +$NetBSD: distinfo,v 1.5 2002/08/25 21:52:48 jlam Exp $ SHA1 (wmessage-0.10.tar.gz) = f50b768f2e8d3c5a4503cbeb3188bde7fa79044f Size (wmessage-0.10.tar.gz) = 15844 bytes -SHA1 (patch-aa) = 7538168179d4c3d44a0b7d199c81a03291937527 +SHA1 (patch-aa) = 29cc5550a62c2ec2e3184db69d4c21d96e4ac2be SHA1 (patch-ab) = f0638e8f1d76a27f86502228c9b5fbc5ed4bc477 SHA1 (patch-ac) = d4b77334fc83954091ad0acb18e216dead7b6e20 SHA1 (patch-ad) = e21e043041005fdfa728038960f15449a2a43c7f diff --git a/x11/wmessage/patches/patch-aa b/x11/wmessage/patches/patch-aa index cd4ffff71d4..f731a71a2b7 100644 --- a/x11/wmessage/patches/patch-aa +++ b/x11/wmessage/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.4 2001/08/23 18:01:11 jlam Exp $ +$NetBSD: patch-aa,v 1.5 2002/08/25 21:52:49 jlam Exp $ --- Makefile.orig Sun Aug 29 20:38:35 1999 +++ Makefile @@ -10,17 +10,18 @@ $NetBSD: patch-aa,v 1.4 2001/08/23 18:01:11 jlam Exp $ -LDFLAGS = `get-wraster-flags --ldflags` -LIBS = `get-wraster-flags --libs` -CC = gcc -+CFLAGS = `${GET_WRASTER_FLAGS} --cflags` -Wall -+LDFLAGS += `${GET_WRASTER_FLAGS} --ldflags` -+LIBS = `${GET_WRASTER_FLAGS} --libs` ++CFLAGS += `get-wraster-flags --cflags` -Wall ++LDFLAGS += `get-wraster-flags --ldflags` ++LIBS += `get-wraster-flags --libs` +#CC = gcc all: wmessage wmessage: wmessage.o panel.o $(CC) -o wmessage wmessage.o panel.o \ - $(CFLAGS) $(LDFLAGS) $(LIBS) -lWMaker -lWINGs -lPropList +- $(CFLAGS) $(LDFLAGS) $(LIBS) -lWMaker -lWINGs -lPropList - strip wmessage ++ $(CFLAGS) $(LDFLAGS) $(LIBS) -lWMaker -lWINGs install: wmessage - install -c wmessage $(PREFIX)/bin/wmessage diff --git a/x11/wmfire/Makefile b/x11/wmfire/Makefile index 0bdce6d7336..0acecae4ee8 100644 --- a/x11/wmfire/Makefile +++ b/x11/wmfire/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2002/05/02 15:34:41 jschauma Exp $ +# $NetBSD: Makefile,v 1.12 2002/08/25 21:52:49 jlam Exp $ # DISTNAME= wmfire-0.0.3.9pre4 @@ -9,8 +9,9 @@ MASTER_SITES= http://staff.xmms.org/zinx/misc/ MAINTAINER= hubertf@netbsd.org COMMENT= Displays generated fire according to system load -USE_BUILDLINK_ONLY= YES -GNU_CONFIGURE= YES +USE_BUILDLINK2= YES +USE_X11= YES +GNU_CONFIGURE= YES post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/wmfire @@ -20,6 +21,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/CREDITS ${PREFIX}/share/doc/wmfire ${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/wmfire -.include "../../graphics/xpm/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/xpm/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/wmweather/Makefile b/x11/wmweather/Makefile index 9f83c4824a2..4f1f4def02d 100644 --- a/x11/wmweather/Makefile +++ b/x11/wmweather/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2002/01/19 15:31:43 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2002/08/25 21:52:50 jlam Exp $ # DISTNAME= wmWeather-1.31 @@ -10,11 +10,11 @@ MAINTAINER= rh@netbsd.org HOMEPAGE= http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml COMMENT= WindowMaker DockApp showing local weather conditions -USE_BUILDLINK_ONLY= # defined -USE_X11BASE= # defined -REPLACE_PERL= GrabWeather +USE_BUILDLINK2= # defined +USE_X11BASE= # defined +REPLACE_PERL= GrabWeather + +.include "../../graphics/xpm/buildlink2.mk" +.include "../../lang/perl5/buildlink2.mk" -.include "../../graphics/xpm/buildlink.mk" -.include "../../lang/perl5/buildlink.mk" -.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/wterm/Makefile b/x11/wterm/Makefile index 9f8cb07ef0d..7ca3ebc02bf 100644 --- a/x11/wterm/Makefile +++ b/x11/wterm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2002/03/13 17:38:04 fredb Exp $ +# $NetBSD: Makefile,v 1.20 2002/08/25 21:52:50 jlam Exp $ DISTNAME= wterm-6.2.9 PKGREVISION= 1 @@ -10,17 +10,14 @@ MAINTAINER= rh@netbsd.org HOMEPAGE= http://largo.windowmaker.org/files.php\#wterm COMMENT= NeXTStep(tm) style X11 terminal emulator for WindowMaker -GNU_CONFIGURE= YES -USE_X11BASE= YES -# some /usr/X11R6/lib references sneak in -# USE_BUILDLINK_ONLY= YES +GNU_CONFIGURE= YES +USE_X11BASE= YES +USE_BUILDLINK2= YES CONFIGURE_ARGS+= --enable-utmp --enable-wtmp --enable-xpm-background CONFIGURE_ARGS+= --enable-menubar --enable-graphics --enable-next-scroll CONFIGURE_ARGS+= --enable-half-shadow -CONFIGURE_ARGS+= --with-xpm-library=${XPMDIR} - -EVAL_PREFIX+= XPMDIR=xpm +CONFIGURE_ARGS+= --with-xpm-library=${BUILDLINK_PREFIX.xpm} post-install: ${CHMOD} 4755 ${PREFIX}/bin/wterm @@ -29,6 +26,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/wtermthai.tiff \ ${PREFIX}/share/WindowMaker/Icons -.include "../../wm/windowmaker/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../wm/windowmaker/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xpenguins/Makefile b/x11/xpenguins/Makefile index e365b8d51b4..7be170b0994 100644 --- a/x11/xpenguins/Makefile +++ b/x11/xpenguins/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/10/24 22:11:16 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2002/08/25 21:52:51 jlam Exp $ # DISTNAME= xpenguins-2.1 @@ -9,9 +9,9 @@ MAINTAINER= hubertf@netbsd.org HOMEPAGE= http://xpenguins.seul.org/ COMMENT= Little penguins walking along the tops of your windows -USE_BUILDLINK_ONLY= YES -GNU_CONFIGURE= YES +USE_BUILDLINK2= YES +USE_X11= YES +GNU_CONFIGURE= YES -.include "../../graphics/xpm/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/xpm/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xpmroot/Makefile b/x11/xpmroot/Makefile index f75979600e2..67486f82b6f 100644 --- a/x11/xpmroot/Makefile +++ b/x11/xpmroot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2002/08/22 10:55:27 martti Exp $ +# $NetBSD: Makefile,v 1.29 2002/08/25 21:52:52 jlam Exp $ # DISTNAME= fvwm-${PKG_VERSION} @@ -12,7 +12,7 @@ HOMEPAGE= http://www.fvwm.org/generated/manpages/xpmroot.html COMMENT= Sets the root window to an Xpm pixmap PKG_VERSION= 2.4.9 -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES USE_X11BASE= YES GNU_CONFIGURE= YES @@ -31,6 +31,5 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/utils/xpmroot ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/utils/xpmroot.1 ${PREFIX}/man/man1 -.include "../../graphics/xpm/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/xpm/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xpmroot/distinfo b/x11/xpmroot/distinfo index 81642d9694c..918187e429f 100644 --- a/x11/xpmroot/distinfo +++ b/x11/xpmroot/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2002/08/22 10:55:27 martti Exp $ +$NetBSD: distinfo,v 1.12 2002/08/25 21:52:52 jlam Exp $ SHA1 (fvwm-2.4.9.tar.gz) = 67da9f8ba8aae0315b18074d1e0ec0e57668e786 Size (fvwm-2.4.9.tar.gz) = 1721388 bytes diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile index f6cc2480548..acd22f8a3a3 100644 --- a/x11/xscreensaver/Makefile +++ b/x11/xscreensaver/Makefile @@ -1,16 +1,15 @@ -# $NetBSD: Makefile,v 1.48 2002/04/09 22:50:02 jlam Exp $ +# $NetBSD: Makefile,v 1.49 2002/08/25 21:52:53 jlam Exp $ # COMMENT= Screen saver and locker for the X window system CONFLICTS+= xscreensaver-gnome-[0-9]* -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes .include "../../x11/xscreensaver/Makefile.common" CONFIGURE_ARGS+= --without-gnome CONFIGURE_ARGS+= --with-configdir=${PREFIX}/libexec/xscreensaver/config -.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common index 292c60b3c52..0add1320539 100644 --- a/x11/xscreensaver/Makefile.common +++ b/x11/xscreensaver/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.32 2002/06/01 22:02:47 wiz Exp $ +# $NetBSD: Makefile.common,v 1.33 2002/08/25 21:52:54 jlam Exp $ # DISTNAME= xscreensaver-4.02 @@ -15,10 +15,10 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-hackdir=${PREFIX}/libexec/xscreensaver CONFIGURE_ARGS+= --with-gl CONFIGURE_ARGS+= --with-gle -CONFIGURE_ARGS+= --with-gtk=${BUILDLINK_DIR} -CONFIGURE_ARGS+= --with-jpeg=${BUILDLINK_DIR} -CONFIGURE_ARGS+= --with-gdk-pixbuf=${BUILDLINK_DIR} -CONFIGURE_ARGS+= --with-xml=${BUILDLINK_DIR} +CONFIGURE_ARGS+= --with-gtk=${BUILDLINK_PREFIX.gtk} +CONFIGURE_ARGS+= --with-jpeg=${BUILDLINK_PREFIX.jpeg} +CONFIGURE_ARGS+= --with-gdk-pixbuf=${BUILDLINK_PREFIX.gdk-pixbuf} +CONFIGURE_ARGS+= --with-xml=${BUILDLINK_PREFIX.libxml} CONFIGURE_ARGS+= --with-zippy=/usr/games/fortune CONFIGURE_ARGS+= --without-motif @@ -59,7 +59,7 @@ post-patch: [ -f $$f.BAK ] || ${MV} $$f $$f.BAK ; \ ${SED} -e 's|@PREFIX@|${PREFIX}|g' < $$f.BAK > $$f -.include "../../graphics/gdk-pixbuf/buildlink.mk" -.include "../../graphics/gle/buildlink.mk" -.include "../../textproc/libxml/buildlink.mk" -.include "../../x11/gtk/buildlink.mk" +.include "../../graphics/gdk-pixbuf/buildlink2.mk" +.include "../../graphics/gle/buildlink2.mk" +.include "../../textproc/libxml/buildlink2.mk" +.include "../../x11/gtk/buildlink2.mk" diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo index e4db028b99e..f74f639d212 100644 --- a/x11/xscreensaver/distinfo +++ b/x11/xscreensaver/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.19 2002/06/01 22:02:47 wiz Exp $ +$NetBSD: distinfo,v 1.20 2002/08/25 21:52:54 jlam Exp $ SHA1 (xscreensaver-4.02.tar.gz) = b32cf3ed37680669a4a7ea2b945fadb5841fc6b3 Size (xscreensaver-4.02.tar.gz) = 2201442 bytes -SHA1 (patch-aa) = 4e1c13fdc4019bb190981618f6c3a6583e27b95c +SHA1 (patch-aa) = 8ca99f66fab3e4eae5830c87f2931cefba6e4b36 SHA1 (patch-ab) = 3f60a99f7d45f38b6c4afe2fcc6eafc9456acb30 SHA1 (patch-ac) = 4f201f01b65935c57efa7bfec8291f29a7ff1280 SHA1 (patch-ae) = 9209256c4dcc7bde3dd812bb8fcbad1f8b4f0f08 -SHA1 (patch-af) = f8b0d2b06d08cdbc128dec8f6342a6489c7824e6 +SHA1 (patch-af) = 506ce93155589766c5f09f726237b7145fd37f3b diff --git a/x11/xscreensaver/patches/patch-aa b/x11/xscreensaver/patches/patch-aa index 497ea96b734..67a2fd60c62 100644 --- a/x11/xscreensaver/patches/patch-aa +++ b/x11/xscreensaver/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.21 2002/06/01 22:02:48 wiz Exp $ +$NetBSD: patch-aa,v 1.22 2002/08/25 21:52:55 jlam Exp $ --- configure.orig Mon Mar 18 18:42:35 2002 +++ configure @@ -20,23 +20,7 @@ $NetBSD: patch-aa,v 1.21 2002/06/01 22:02:48 wiz Exp $ if test -d $d; then X_CFLAGS="-I$d $X_CFLAGS" echo "$ac_t""$d" 1>&6 -@@ -10635,15 +10635,6 @@ - DEPEND_DEFINES= - - --if test \! -z "$includedir" ; then -- INCLUDES="$INCLUDES -I$includedir" --fi -- --if test \! -z "$libdir" ; then -- LDFLAGS="$LDFLAGS -L$libdir" --fi -- -- - PREFERRED_DEMO_PROGRAM=xscreensaver-demo-Xm - ALL_DEMO_PROGRAMS= - if test "$have_motif" = yes; then -@@ -10745,7 +10736,7 @@ +@@ -10745,7 +10745,7 @@ GTK_ICONDIR='$(GNOME_DATADIR)/pixmaps' elif test "$have_gtk" = yes; then # should this be "$(prefix)/share/pixmaps"? But /usr/X11R6/share/ is wrong... diff --git a/x11/xscreensaver/patches/patch-af b/x11/xscreensaver/patches/patch-af index 9e68d7bc9cf..2896e33bdde 100644 --- a/x11/xscreensaver/patches/patch-af +++ b/x11/xscreensaver/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.8 2002/04/09 22:50:02 jlam Exp $ +$NetBSD: patch-af,v 1.9 2002/08/25 21:52:55 jlam Exp $ --- configure.in.orig Mon Mar 18 18:01:26 2002 +++ configure.in @@ -11,23 +11,7 @@ $NetBSD: patch-af,v 1.8 2002/04/09 22:50:02 jlam Exp $ elif test "$have_kerberos" = yes ; then # from Tim Showalter <tjs@psaux.com> for FreeBSD 4.2 PASSWD_LIBS="$PASSWD_LIBS -lkrb -ldes -lcom_err" -@@ -2878,15 +2878,6 @@ - DEPEND_DEFINES= - - --if test \! -z "$includedir" ; then -- INCLUDES="$INCLUDES -I$includedir" --fi -- --if test \! -z "$libdir" ; then -- LDFLAGS="$LDFLAGS -L$libdir" --fi -- -- - PREFERRED_DEMO_PROGRAM=xscreensaver-demo-Xm - ALL_DEMO_PROGRAMS= - if test "$have_motif" = yes; then -@@ -2988,7 +2979,7 @@ +@@ -2988,7 +2988,7 @@ GTK_ICONDIR='$(GNOME_DATADIR)/pixmaps' elif test "$have_gtk" = yes; then # should this be "$(prefix)/share/pixmaps"? But /usr/X11R6/share/ is wrong... diff --git a/x11/xscript/Makefile b/x11/xscript/Makefile index 676e634b20a..a5ee1737ea3 100644 --- a/x11/xscript/Makefile +++ b/x11/xscript/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/17 17:07:25 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2002/08/25 21:52:56 jlam Exp $ # DISTNAME= xscript.tar @@ -16,6 +16,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.ee.ryerson.ca/~elf/xapps/Q-XVIII.html COMMENT= X Window system script recording and playback +USE_BUILDLINK2= YES USE_X11BASE= YES USE_IMAKE= YES diff --git a/x11/xsnow/Makefile b/x11/xsnow/Makefile index 0c0d31da1e6..6bda0458dcf 100644 --- a/x11/xsnow/Makefile +++ b/x11/xsnow/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/12/19 07:02:31 martti Exp $ +# $NetBSD: Makefile,v 1.12 2002/08/25 21:52:56 jlam Exp $ # FreeBSD Id: Makefile,v 1.7 1996/11/18 09:56:45 asami Exp # @@ -10,7 +10,8 @@ MAINTAINER= is@netbsd.org HOMEPAGE= http://www.euronet.nl/~rja/Xsnow/ COMMENT= Create a snowy and Santa-y desktop +USE_BUILDLINK2= yes USE_IMAKE= yes -USE_XPM= yes +.include "../../graphics/xpm/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xteddy/Makefile b/x11/xteddy/Makefile index 4a383276cde..10aed358f6a 100644 --- a/x11/xteddy/Makefile +++ b/x11/xteddy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/10/24 22:11:17 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2002/08/25 21:52:57 jlam Exp $ DISTNAME= xteddy-1.1 CATEGORIES= x11 games @@ -8,13 +8,14 @@ MAINTAINER= johnam@mail.kemper.org HOMEPAGE= http://www.ITN.LiU.SE/~stegu/xteddy COMMENT= Xteddy is a cuddly teddy bear for your X Windows desktop -USE_BUILDLINK_ONLY= YES -GNU_CONFIGURE= YES +USE_BUILDLINK2= YES +USE_X11= YES +GNU_CONFIGURE= YES pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/xteddy ${INSTALL_DATA_DIR} ${PREFIX}/share/xteddy/pixmaps -.include "../../graphics/xpm/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/xpm/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/x11/xteddy/distinfo b/x11/xteddy/distinfo index 6c29fe8263c..625448aa464 100644 --- a/x11/xteddy/distinfo +++ b/x11/xteddy/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2001/08/29 22:41:32 jlam Exp $ +$NetBSD: distinfo,v 1.4 2002/08/25 21:52:57 jlam Exp $ SHA1 (xteddy-1.1.tar.gz) = a681923333a4e2b2112290d601c167fd7e8e1302 Size (xteddy-1.1.tar.gz) = 117141 bytes -SHA1 (patch-aa) = d90f5121cfdbb28f8a1eb960c405c460de163430 +SHA1 (patch-aa) = b77f0b43a999f54b28602ab1fb66ed320a5632c1 SHA1 (patch-ab) = 260f836f4aab651c72caebac821e497b54d72cbd diff --git a/x11/xteddy/patches/patch-aa b/x11/xteddy/patches/patch-aa index ae1789c3dc7..fcaac15e8c1 100644 --- a/x11/xteddy/patches/patch-aa +++ b/x11/xteddy/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2001/08/29 22:41:32 jlam Exp $ +$NetBSD: patch-aa,v 1.3 2002/08/25 21:52:58 jlam Exp $ --- Makefile.in.orig Thu Oct 29 03:01:17 1998 +++ Makefile.in @@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.2 2001/08/29 22:41:32 jlam Exp $ HTML_DOC = html/xteddy.html html/xteddy_info.html \ html/images/noise.jpg html/images/xteddy.gif html/images/xteddy.xbm -xteddy_LDADD = -L/usr/X11R6/lib -+xteddy_LDADD = -L${BUILDLINK_X11_DIR} ++xteddy_LDADD = -L${X11BASE}/lib LIBS = -lX11 -lXext -lXpm man_MANS = xteddy.1 diff --git a/x11/xteddy2/Makefile b/x11/xteddy2/Makefile index 112fe88727d..ab63bc0c53d 100644 --- a/x11/xteddy2/Makefile +++ b/x11/xteddy2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2002/03/13 17:38:06 fredb Exp $ +# $NetBSD: Makefile,v 1.11 2002/08/25 21:52:58 jlam Exp $ DISTNAME= xteddy-2.0.1 PKGREVISION= 1 @@ -11,8 +11,9 @@ COMMENT= Teddy bear for your desktop CONFLICT+= xteddy-1.* -USE_BUILDLINK_ONLY= yes -GNU_CONFIGURE= yes +USE_BUILDLINK2= yes +USE_X11= yes +GNU_CONFIGURE= yes pre-configure: files="configure xteddy_test xtoys"; \ @@ -26,6 +27,6 @@ pre-configure: ${RM} -f $${file}.fixme; \ done -.include "../../graphics/imlib/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/imlib/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/x11/xteddy2/distinfo b/x11/xteddy2/distinfo index 75c258cbfc9..b279a4caf30 100644 --- a/x11/xteddy2/distinfo +++ b/x11/xteddy2/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.3 2001/08/23 04:58:04 jlam Exp $ +$NetBSD: distinfo,v 1.4 2002/08/25 21:52:58 jlam Exp $ SHA1 (xteddy-2.0.1.tar.gz) = 371810d7a509cbf6ffd3a4d94c87412ae68022d8 Size (xteddy-2.0.1.tar.gz) = 348055 bytes SHA1 (patch-aa) = 69425a7ccae41c7852c2ccfed7d029a7b93ada6c SHA1 (patch-ab) = af66f8f31baf8581b7b9a115eab6f513cd0c5e5e SHA1 (patch-ac) = e1e5f5e716f70355cb092e726b0400d15601fd96 -SHA1 (patch-ad) = 3e58077f548cfceecc673d45c8d4ae1fa1d9c171 diff --git a/x11/xteddy2/patches/patch-ad b/x11/xteddy2/patches/patch-ad deleted file mode 100644 index d8afaabaf3f..00000000000 --- a/x11/xteddy2/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2001/08/23 04:58:04 jlam Exp $ - ---- Makefile.in.orig Mon Aug 2 02:11:08 1999 -+++ Makefile.in -@@ -69,7 +69,7 @@ - bin_PROGRAMS = xteddy - - xteddy_SOURCES = xteddy.c --LIBS = `imlib-config --libs` -+LIBS = `${IMLIB_CONFIG} --libs` - man_MANS = xteddy.1 - bin_SCRIPTS = xtoys xteddy_test - diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile index 82ad5eedcab..15e79311064 100644 --- a/x11/xterm/Makefile +++ b/x11/xterm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/12/17 14:47:03 tron Exp $ +# $NetBSD: Makefile,v 1.3 2002/08/25 21:53:01 jlam Exp $ DISTNAME= xterm-164 CATEGORIES= x11 @@ -10,6 +10,7 @@ COMMENT= Latest terminal emulator for the X Window System ONLY_FOR_PLATFORM= SunOS-*-* # in NetBSD X11 distribution +USE_BUILDLINK2= YES USE_IMAKE= YES INSTALL_FILE= ${WRKDIR}/INSTALL diff --git a/x11/xtermset/Makefile b/x11/xtermset/Makefile index 0f9cea2fba6..90aec545d53 100644 --- a/x11/xtermset/Makefile +++ b/x11/xtermset/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/02/17 17:07:27 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2002/08/25 21:53:01 jlam Exp $ # DISTNAME= xtermset-0.4 @@ -9,6 +9,7 @@ MAINTAINER= hubertf@netbsd.org HOMEPAGE= http://xtermset.netpedia.net/ COMMENT= Change things like foreground color, size etc. on an xterm +USE_BUILDLINK2= YES USE_X11BASE= YES post-extract: diff --git a/x11/xtoolwait/Makefile b/x11/xtoolwait/Makefile index e452071fb8f..ec2d721e188 100644 --- a/x11/xtoolwait/Makefile +++ b/x11/xtoolwait/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/03/08 10:30:21 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2002/08/25 21:53:02 jlam Exp $ # DISTNAME= xtoolwait-1.3 @@ -9,6 +9,7 @@ MAINTAINER= minoura@netbsd.org HOMEPAGE= http://www.hacom.nl/~richard/software/xtoolwait.html COMMENT= Free implementation of SunOS toolwait(1) +USE_BUILDLINK2= yes USE_IMAKE= yes .include "../../mk/bsd.pkg.mk" diff --git a/x11/xwatchwin/Makefile b/x11/xwatchwin/Makefile index 5ed2f3fa91d..d8babdbb35c 100644 --- a/x11/xwatchwin/Makefile +++ b/x11/xwatchwin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/17 17:07:30 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2002/08/25 21:53:03 jlam Exp $ DISTNAME= xwatchwin PKGNAME= xwatchwin-1.1.1 @@ -10,7 +10,7 @@ COMMENT= watch a window on another X server PLIST_SRC= ${PKGDIR}/PLIST.${LOWER_OPSYS} -USE_X11BASE= yes +USE_BUILDLINK2= yes USE_IMAKE= yes .include "../../mk/bsd.pkg.mk" diff --git a/x11/xwit/Makefile b/x11/xwit/Makefile index 1239d9acdd5..5660388c857 100644 --- a/x11/xwit/Makefile +++ b/x11/xwit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/01/16 14:09:26 seb Exp $ +# $NetBSD: Makefile,v 1.3 2002/08/25 21:53:03 jlam Exp $ # DISTNAME= xwit-3.4 @@ -9,6 +9,7 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB:=utilities/} MAINTAINER= seb@netbsd.org COMMENT= Utility for calling X11 functions from the shell +USE_BUILDLINK2= yes USE_IMAKE= yes .include "../../mk/bsd.pkg.mk" diff --git a/x11/xworld/Makefile b/x11/xworld/Makefile index 4adfe02802c..c0f23e426f9 100644 --- a/x11/xworld/Makefile +++ b/x11/xworld/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/11/26 14:47:06 pooka Exp $ +# $NetBSD: Makefile,v 1.6 2002/08/25 21:53:04 jlam Exp $ # DISTNAME= xworld-2.0 @@ -9,7 +9,9 @@ MASTER_SITES= ftp://gutemine.geo.uni-koeln.de/pub/xworld/ \ MAINTAINER= wennmach@geo.Uni-Koeln.DE COMMENT= Earth as seen from the direction of the sun +USE_BUILDLINK2= yes HAS_CONFIGURE= yes +USE_X11= yes CONFIGURE_ENV+= PREFIX="${PREFIX}" CONFIGURE_ENV+= LDLIBS="-lm ${LDFLAGS} -lX11" diff --git a/x11/xworld/distinfo b/x11/xworld/distinfo index 6821df69430..dd44ce2a161 100644 --- a/x11/xworld/distinfo +++ b/x11/xworld/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.3 2001/08/13 22:27:49 wennmach Exp $ +$NetBSD: distinfo,v 1.4 2002/08/25 21:53:04 jlam Exp $ SHA1 (xworld-2.0.tar.gz) = 99217a8f0b63ef8685c5508fbbff4f5d7bb9b9a8 Size (xworld-2.0.tar.gz) = 113385 bytes -SHA1 (patch-aa) = a9ec5f66cbd033e65cfe4a569ec0490e0724100d +SHA1 (patch-aa) = 197faebefac19a2457c0201ca35eb3a2f333c51a SHA1 (patch-ab) = 60d1591c3c155e9fbf6bac094b20cd6a6df73df0 SHA1 (patch-ac) = f008b4140f3f27be2c6a05a3ece2c74f0a3e2899 SHA1 (patch-ad) = d243d16ef9d79e82c817ae116b3a9b9cba71a1eb diff --git a/x11/xworld/patches/patch-aa b/x11/xworld/patches/patch-aa index 5ffae56fd35..236d6631090 100644 --- a/x11/xworld/patches/patch-aa +++ b/x11/xworld/patches/patch-aa @@ -1,8 +1,9 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/07/28 17:21:48 hubertf Exp $ +$NetBSD: patch-aa,v 1.2 2002/08/25 21:53:05 jlam Exp $ ---- defaults/customize.csh.orig Wed Jul 28 18:29:43 1999 -+++ defaults/customize.csh Wed Jul 28 18:30:57 1999 -@@ -1,2 +1,2 @@ +--- defaults/customize.csh.orig Wed Jul 28 11:44:52 1999 ++++ defaults/customize.csh +@@ -1,2 +1,3 @@ -set PREFIX = /usr/local +#set PREFIX = /usr/local set BINDIR = $PREFIX/bin ++set CC = cc diff --git a/x11/xwrits/Makefile b/x11/xwrits/Makefile index 89fe9888080..34fe976dab1 100644 --- a/x11/xwrits/Makefile +++ b/x11/xwrits/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2002/05/20 17:12:31 cjep Exp $ +# $NetBSD: Makefile,v 1.11 2002/08/25 21:53:05 jlam Exp $ DISTNAME= xwrits-2.19 CATEGORIES= x11 @@ -8,8 +8,8 @@ MAINTAINER= dmcmahill@netbsd.org HOMEPAGE= http://www.lcdf.org/~eddietwo/xwrits/ COMMENT= Wrist break reminder for prevention of repetitive stress injuries -GNU_CONFIGURE= YES -USE_BUILDLINK_ONLY= YES +GNU_CONFIGURE= YES +USE_BUILDLINK2= YES +USE_X11= YES -.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" |