diff options
| author | jlam <jlam> | 2002-08-25 21:50:52 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-08-25 21:50:52 +0000 |
| commit | b6b94f0c669b1ef2a824c69854900b68ec821681 (patch) | |
| tree | f54fdc39f5381d6b58a06e7e3ed458f63f0e9df2 | |
| parent | ac9820da6cdeb5833fdaf2717a1633972572c5de (diff) | |
| download | pkgsrc-b6b94f0c669b1ef2a824c69854900b68ec821681.tar.gz | |
Merge packages from the buildlink2 branch back into the main trunk that
have been converted to USE_BUILDLINK2.
272 files changed, 763 insertions, 942 deletions
diff --git a/shells/zsh/distinfo b/shells/zsh/distinfo index af39be6b725..0afd45be8a9 100644 --- a/shells/zsh/distinfo +++ b/shells/zsh/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2002/08/15 06:54:55 uebayasi Exp $ +$NetBSD: distinfo,v 1.12 2002/08/25 21:50:52 jlam Exp $ SHA1 (zsh-4.0.6.tar.bz2) = 16caf04f4f8901e0f0d98a23f42fe5b27eaa112e Size (zsh-4.0.6.tar.bz2) = 1699373 bytes diff --git a/shells/zsh/patches/patch-ac b/shells/zsh/patches/patch-ac index 78628bcdb10..6d7a8b3b154 100644 --- a/shells/zsh/patches/patch-ac +++ b/shells/zsh/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.9 2002/07/18 18:01:56 mycroft Exp $ +$NetBSD: patch-ac,v 1.10 2002/08/25 21:50:52 jlam Exp $ --- zshconfig.ac.orig Wed Oct 24 11:16:27 2001 +++ zshconfig.ac Thu Jul 18 17:59:09 2002 diff --git a/shells/zsh/patches/patch-ad b/shells/zsh/patches/patch-ad index baacacd7f18..b1e7d43abe1 100644 --- a/shells/zsh/patches/patch-ad +++ b/shells/zsh/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.5 2002/07/18 18:01:56 mycroft Exp $ +$NetBSD: patch-ad,v 1.6 2002/08/25 21:50:53 jlam Exp $ --- configure.orig Thu Jul 18 17:50:10 2002 +++ configure Thu Jul 18 17:59:13 2002 diff --git a/sysutils/amanda-common/Makefile b/sysutils/amanda-common/Makefile index cca1f1effc3..2f92955e696 100644 --- a/sysutils/amanda-common/Makefile +++ b/sysutils/amanda-common/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2001/12/25 20:50:01 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2002/08/25 21:50:53 jlam Exp $ # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp # @@ -12,7 +12,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.amanda.org/ COMMENT= Libraries and binaries used by both the client and server parts of amanda -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES .include "../../mk/bsd.prefs.mk" .include "../../sysutils/amanda-common/Makefile.common" diff --git a/sysutils/amanda-common/Makefile.common b/sysutils/amanda-common/Makefile.common index c6ec5734415..a42a48ce5e6 100644 --- a/sysutils/amanda-common/Makefile.common +++ b/sysutils/amanda-common/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2002/07/21 19:07:32 schmonz Exp $ +# $NetBSD: Makefile.common,v 1.8 2002/08/25 21:50:54 jlam Exp $ # # common make file fragment shared by all amanda-* pkgs. # diff --git a/sysutils/amanda-dev-common/Makefile b/sysutils/amanda-dev-common/Makefile index bb15460fa18..a5b565a6926 100644 --- a/sysutils/amanda-dev-common/Makefile +++ b/sysutils/amanda-dev-common/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $ +# $NetBSD: Makefile,v 1.2 2002/08/25 21:50:54 jlam Exp $ # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp # @@ -7,7 +7,7 @@ SVR4_PKGNAME= amaco COMMENT= Libraries and binaries used by both the client and server parts of amanda -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES .include "../../mk/bsd.prefs.mk" .include "../../sysutils/amanda-dev-common/Makefile.common" diff --git a/sysutils/asapm/Makefile b/sysutils/asapm/Makefile index 6f86c8e7c06..8bcfd1e540c 100644 --- a/sysutils/asapm/Makefile +++ b/sysutils/asapm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2001/11/26 19:55:40 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2002/08/25 21:50:54 jlam Exp $ # DISTNAME= asapm-2.11 @@ -15,13 +15,13 @@ COMMENT= Laptop battery status display for X11 IGNORE+= "APM is not available for ${MACHINE_PLATFORM}" .endif -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES +USE_X11= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --disable-jpeg # there actually is no JPEG support CONFIGURE_ARGS+= --with-xpm -CONFIGURE_ARGS+= --with-xpm-includes=${BUILDLINK_DIR}/include -CONFIGURE_ARGS+= --with-xpm-library=${BUILDLINK_DIR}/lib +CONFIGURE_ARGS+= --with-xpm-includes=${BUILDLINK_PREFIX.xpm}/include +CONFIGURE_ARGS+= --with-xpm-library=${BUILDLINK_PREFIX.xpm}/lib -.include "../../graphics/xpm/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/xpm/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/bbsload/Makefile b/sysutils/bbsload/Makefile index 4addd80404b..38261b742e0 100644 --- a/sysutils/bbsload/Makefile +++ b/sysutils/bbsload/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/04/16 21:49:25 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2002/08/25 21:50:55 jlam Exp $ # DISTNAME= bbsload-0.2.5 @@ -10,10 +10,7 @@ HOMEPAGE= http://bbtools.thelinuxcommunity.org/ COMMENT= Small (in dimensions) tool to display the avarage load GNU_CONFIGURE= YES -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES USE_X11BASE= YES -GNU_CONFIGURE= YES - -.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/cdrecord/Makefile b/sysutils/cdrecord/Makefile index 439cebb1cfc..ec4a3845a96 100644 --- a/sysutils/cdrecord/Makefile +++ b/sysutils/cdrecord/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2001/09/27 23:18:42 jlam Exp $ +# $NetBSD: Makefile,v 1.40 2002/08/25 21:50:55 jlam Exp $ DISTNAME= cdrtools-1.10 PKGNAME= cdrecord-1.10 @@ -11,6 +11,7 @@ COMMENT= This program allows you to create CD's on a CD-Recorder CONFLICTS= mkisofs-[0-9]* USE_GMAKE= yes +USE_BUILDLINK2= yes WRKSRC= ${WRKDIR}/${DISTNAME:C/a.*//} TARGET_ARCH= ${MACHINE_ARCH}-netbsd-cc diff --git a/sysutils/cdrecord/distinfo b/sysutils/cdrecord/distinfo index 61da39c7a99..f0be0e6b9af 100644 --- a/sysutils/cdrecord/distinfo +++ b/sysutils/cdrecord/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2002/05/18 15:00:42 wiz Exp $ +$NetBSD: distinfo,v 1.6 2002/08/25 21:50:56 jlam Exp $ SHA1 (cdrtools-1.10.tar.gz) = 0d61bd1331d69a579e6582719a119d94166fcf10 Size (cdrtools-1.10.tar.gz) = 1331424 bytes diff --git a/sysutils/cdrecord/patches/patch-aj b/sysutils/cdrecord/patches/patch-aj index 112bf92fa04..83c977120d2 100644 --- a/sysutils/cdrecord/patches/patch-aj +++ b/sysutils/cdrecord/patches/patch-aj @@ -1,4 +1,4 @@ -$NetBSD: patch-aj,v 1.3 2002/05/18 14:52:31 bouyer Exp $ +$NetBSD: patch-aj,v 1.4 2002/08/25 21:50:56 jlam Exp $ --- cdrecord/scsi_cdr.c.orig Wed Apr 11 00:22:21 2001 +++ cdrecord/scsi_cdr.c Wed May 15 19:55:52 2002 diff --git a/sysutils/fsviewer/Makefile b/sysutils/fsviewer/Makefile index fa70856dba6..2e05c68cd50 100644 --- a/sysutils/fsviewer/Makefile +++ b/sysutils/fsviewer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2002/03/13 17:37:42 fredb Exp $ +# $NetBSD: Makefile,v 1.7 2002/08/25 21:50:57 jlam Exp $ # DISTNAME= FSViewer.app-0.2.3 @@ -17,16 +17,16 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} # needed for the new location of WINGs include files -- can be removed # when the application gets updated for windowmaker>=0.64.0 -CFLAGS+= -I${BUILDLINK_DIR}/include/WINGs +CFLAGS+= -I${BUILDLINK_PREFIX.windowmaker}/include/WINGs USE_GMAKE= yes GNU_CONFIGURE= yes -USE_BUILDLINK_ONLY= yes +USE_X11= yes +USE_BUILDLINK2= yes post-install: cd ${PREFIX}/GNUstep/Apps/FSViewer.app && \ ${PAX} -zrf ${_DISTDIR}${DISTSUBDIR}/icons.tar.gz *.xpm *.tif -.include "../../wm/windowmaker/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../wm/windowmaker/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/gentoo/Makefile b/sysutils/gentoo/Makefile index 4a1a23611bd..ac5b67ffaf7 100644 --- a/sysutils/gentoo/Makefile +++ b/sysutils/gentoo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2002/08/24 03:52:30 grant Exp $ +# $NetBSD: Makefile,v 1.5 2002/08/25 21:50:57 jlam Exp $ # DISTNAME= gentoo-0.11.31 @@ -9,9 +9,9 @@ MAINTAINER= dunse@goa.nu HOMEPAGE= http://www.obsession.se/gentoo/ COMMENT= Two-pane filemanager using GTK+, 100% GUI configurable -GNU_CONFIGURE= YES -USE_BUILDLINK_ONLY= YES +GNU_CONFIGURE= YES +USE_BUILDLINK2= YES +USE_X11= YES -.include "../../x11/gtk/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../x11/gtk/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/gentoo/PLIST b/sysutils/gentoo/PLIST index 3868951276e..8230c8ed7e5 100644 --- a/sysutils/gentoo/PLIST +++ b/sysutils/gentoo/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/08/24 03:52:30 grant Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/08/25 21:50:58 jlam Exp $ bin/gentoo etc/gentoogtkrc etc/gentoorc diff --git a/sysutils/gentoo/distinfo b/sysutils/gentoo/distinfo index 38f7e1e3fd0..5034fcdd183 100644 --- a/sysutils/gentoo/distinfo +++ b/sysutils/gentoo/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/08/24 03:52:30 grant Exp $ +$NetBSD: distinfo,v 1.5 2002/08/25 21:50:58 jlam Exp $ SHA1 (gentoo-0.11.31.tar.gz) = 327b6241613e4c5ae256dffa528c6f2f46fe60b0 Size (gentoo-0.11.31.tar.gz) = 923857 bytes diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile index 16270315f0f..eeed23dbd15 100644 --- a/sysutils/gkrellm/Makefile +++ b/sysutils/gkrellm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2002/06/07 17:15:57 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2002/08/25 21:50:59 jlam Exp $ # DISTNAME= gkrellm-1.2.11 @@ -13,13 +13,14 @@ COMMENT= GTK based system monitor BUILD_USES_MSGFMT= YES -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES +USE_X11= YES USE_GMAKE= YES ALL_TARGET= netbsd INSTALL_TARGET= install_netbsd -MAKE_ENV+= PTHREAD_INC="-I${BUILDLINK_DIR}/include" +MAKE_ENV+= PTHREAD_INC="-I${LOCALBASE}/include" post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/gkrellm @@ -28,6 +29,5 @@ post-install: ${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm/plugins ${INSTALL_DATA_DIR} ${PREFIX}/share/gkrellm/themes -.include "../../graphics/imlib/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/imlib/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/gkrellm/buildlink.mk b/sysutils/gkrellm/buildlink.mk index 49f5e0af8c7..4d61e90606e 100644 --- a/sysutils/gkrellm/buildlink.mk +++ b/sysutils/gkrellm/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.2 2002/07/24 17:24:50 he Exp $ +# $NetBSD: buildlink.mk,v 1.3 2002/08/25 21:50:59 jlam Exp $ # # This Makefile fragment is included by packages that use gkrellm. # diff --git a/sysutils/gkrellm/distinfo b/sysutils/gkrellm/distinfo index 79a4f239aa7..baa0b514785 100644 --- a/sysutils/gkrellm/distinfo +++ b/sysutils/gkrellm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2002/06/07 17:15:57 wiz Exp $ +$NetBSD: distinfo,v 1.13 2002/08/25 21:50:59 jlam Exp $ SHA1 (gkrellm-1.2.11.tar.bz2) = 809d4bb0c983d65651919b7fd483b64b097a7bf3 Size (gkrellm-1.2.11.tar.bz2) = 434998 bytes diff --git a/sysutils/gkrellm/patches/patch-aa b/sysutils/gkrellm/patches/patch-aa index d28d6482a6c..58ca932550b 100644 --- a/sysutils/gkrellm/patches/patch-aa +++ b/sysutils/gkrellm/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.7 2002/06/07 17:15:57 wiz Exp $ +$NetBSD: patch-aa,v 1.8 2002/08/25 21:51:00 jlam Exp $ --- Makefile.top_enable_nls.orig Wed Dec 5 08:41:15 2001 +++ Makefile.top_enable_nls diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile index c5636b24895..b4edb1c6a0e 100644 --- a/sysutils/grub/Makefile +++ b/sysutils/grub/Makefile @@ -1,4 +1,5 @@ -# $NetBSD: Makefile,v 1.9 2002/07/20 13:27:32 tron Exp $ +# $NetBSD: Makefile,v 1.10 2002/08/25 21:51:00 jlam Exp $ +# DISTNAME= grub-0.92 CATEGORIES= sysutils @@ -12,7 +13,7 @@ ONLY_FOR_PLATFORM= *-*-i386 GNU_CONFIGURE= YES USE_GMAKE= YES -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES .include "../../mk/bsd.prefs.mk" @@ -28,7 +29,7 @@ CONFIGURE_ARGS+= --enable-${GRUB_NETWORK_CARD} post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/grub ${INSTALL_DATA} ${WRKSRC}/netboot/README.netboot \ - ${PREFIX}/share/doc/grub + ${PREFIX}/share/doc/grub .else PLIST_SUBST+= NETBOOT="@comment " .endif @@ -37,6 +38,7 @@ PLIST_SUBST+= NETBOOT="@comment " CONFIGURE_ARGS+= ${GRUB_SCAN_ARGS} .endif -.include "../../devel/binutils/buildlink.mk" -.include "../../devel/ncurses/buildlink.mk" +.include "../../devel/binutils/buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/grub/PLIST b/sysutils/grub/PLIST index 8745ac9b093..cc3ba1f64aa 100644 --- a/sysutils/grub/PLIST +++ b/sysutils/grub/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/07/20 13:27:33 tron Exp $ +@comment $NetBSD: PLIST,v 1.4 2002/08/25 21:51:01 jlam Exp $ bin/mbchk @unexec install-info --delete --info-dir=%D/info %D/info/grub.info info/grub.info diff --git a/sysutils/grun/Makefile b/sysutils/grun/Makefile index 5fc1684102c..fac15ab80dd 100644 --- a/sysutils/grun/Makefile +++ b/sysutils/grun/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/08/01 05:48:23 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2002/08/25 21:51:01 jlam Exp $ DISTNAME= grun-0.9.2 CATEGORIES= misc @@ -8,7 +8,8 @@ MAINTAINER= epg@pretzelnet.org HOMEPAGE= ${MASTER_SITES}/grun.html COMMENT= GTK+ based Run dialog -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES +USE_X11= YES GNU_CONFIGURE= YES USE_GMAKE= YES PTHREAD_OPTS+= require @@ -16,6 +17,7 @@ PTHREAD_OPTS+= require post-install: ${MV} ${LOCALBASE}/man/man1/grun.1x ${LOCALBASE}/man/man1/grun.1 -.include "../../x11/gtk/buildlink.mk" -.include "../../mk/pthread.buildlink.mk" +.include "../../x11/gtk/buildlink2.mk" +.include "../../mk/pthread.buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/psmisc/Makefile b/sysutils/psmisc/Makefile index 8a1d51aeda9..0657e209ce0 100644 --- a/sysutils/psmisc/Makefile +++ b/sysutils/psmisc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/08/20 03:55:32 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2002/08/25 21:51:02 jlam Exp $ DISTNAME= psmisc-20.1 CATEGORIES= sysutils @@ -10,7 +10,7 @@ COMMENT= miscellaneous procfs tools: killall, pidof, and pstree CONFLICTS+= pstree-[0-9]* -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK2= # defined GNU_CONFIGURE= # defined LIBS+= ${LIBGETOPT} @@ -19,5 +19,5 @@ post-install: ${RM} -f ${PREFIX}/bin/pidof ${LN} -f ${PREFIX}/bin/killall ${PREFIX}/bin/pidof -.include "../../devel/libgetopt/buildlink.mk" +.include "../../devel/libgetopt/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/stow/Makefile b/sysutils/stow/Makefile index b3628375926..4ebb1ef8683 100644 --- a/sysutils/stow/Makefile +++ b/sysutils/stow/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2002/06/03 13:29:55 cjep Exp $ +# $NetBSD: Makefile,v 1.7 2002/08/25 21:51:03 jlam Exp $ # DISTNAME= stow-1.3.3 @@ -9,11 +9,12 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnu.ai.mit.edu/software/stow/stow.html COMMENT= Maps several separate packages into a tree without merging them -USE_BUILDLINK_ONLY= YES -GNU_CONFIGURE= YES +USE_BUILDLINK2= YES +GNU_CONFIGURE= YES INFO_FILES= stow.info -.include "../../lang/perl5/buildlink.mk" +.include "../../lang/perl5/buildlink2.mk" + .include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/stow/PLIST b/sysutils/stow/PLIST index 1e80636f782..ac23fa532c8 100644 --- a/sysutils/stow/PLIST +++ b/sysutils/stow/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/06/03 13:29:55 cjep Exp $ +@comment $NetBSD: PLIST,v 1.4 2002/08/25 21:51:03 jlam Exp $ bin/stow @unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/stow.info info/stow.info diff --git a/sysutils/stow/distinfo b/sysutils/stow/distinfo index eaf5c2909b0..6475bce4d06 100644 --- a/sysutils/stow/distinfo +++ b/sysutils/stow/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2002/06/03 13:29:55 cjep Exp $ +$NetBSD: distinfo,v 1.6 2002/08/25 21:51:03 jlam Exp $ SHA1 (stow-1.3.3.tar.gz) = 570c501f8663feb26360db25df0be342278b7b99 Size (stow-1.3.3.tar.gz) = 139417 bytes diff --git a/sysutils/ups-nut-cgi/Makefile b/sysutils/ups-nut-cgi/Makefile index 76045f6aee5..b1bd1254dc9 100644 --- a/sysutils/ups-nut-cgi/Makefile +++ b/sysutils/ups-nut-cgi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2002/07/03 11:57:14 lukem Exp $ +# $NetBSD: Makefile,v 1.18 2002/08/25 21:51:07 jlam Exp $ DISTNAME= nut-0.50.0 PKGNAME= ups-nut-cgi-0.50.0 @@ -20,7 +20,8 @@ NUT_CONFDIR= ${PKG_SYSCONFDIR} NUT_STATEDIR= /var/db/nut NUT_CGIDIR= ${PREFIX}/share/nut/cgi -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes +USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${NUT_CONFDIR} \ --with-statepath=${NUT_STATEDIR} \ @@ -30,6 +31,5 @@ CONFIGURE_ARGS+= --sysconfdir=${NUT_CONFDIR} \ pre-configure: cd ${WRKSRC}; ${LOCALBASE}/bin/autoreconf --force -.include "../../graphics/gd/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/gd/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/ups-nut-cgi/PLIST b/sysutils/ups-nut-cgi/PLIST index 65afed21c39..d586f7a473b 100644 --- a/sysutils/ups-nut-cgi/PLIST +++ b/sysutils/ups-nut-cgi/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/05/13 15:15:24 lukem Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/08/25 21:51:07 jlam Exp $ man/man5/hosts.conf.5 man/man5/multimon.conf.5 man/man5/upsset.conf.5 diff --git a/sysutils/ups-nut-cgi/distinfo b/sysutils/ups-nut-cgi/distinfo index 4767e05580a..6e8ba20ce46 100644 --- a/sysutils/ups-nut-cgi/distinfo +++ b/sysutils/ups-nut-cgi/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2002/07/03 11:57:14 lukem Exp $ +$NetBSD: distinfo,v 1.10 2002/08/25 21:51:07 jlam Exp $ SHA1 (nut-0.50.0.tar.gz) = b8826f2e7301e5c753ac946574a53d651faf69c3 Size (nut-0.50.0.tar.gz) = 382755 bytes diff --git a/sysutils/ups-nut-cgi/patches/patch-aa b/sysutils/ups-nut-cgi/patches/patch-aa index d2e8e5fa0fd..4a9cef4a296 100644 --- a/sysutils/ups-nut-cgi/patches/patch-aa +++ b/sysutils/ups-nut-cgi/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.5 2002/07/03 11:57:14 lukem Exp $ +$NetBSD: patch-aa,v 1.6 2002/08/25 21:51:07 jlam Exp $ --- Makefile.in.orig Wed Apr 17 00:00:49 2002 +++ Makefile.in diff --git a/sysutils/ups-nut-cgi/patches/patch-ad b/sysutils/ups-nut-cgi/patches/patch-ad index a23d45a27b8..bdc5984ad81 100644 --- a/sysutils/ups-nut-cgi/patches/patch-ad +++ b/sysutils/ups-nut-cgi/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.6 2002/07/03 11:57:14 lukem Exp $ +$NetBSD: patch-ad,v 1.7 2002/08/25 21:51:08 jlam Exp $ --- configure.in.orig Tue Apr 16 23:34:38 2002 +++ configure.in diff --git a/sysutils/ups-nut-cgi/patches/patch-ae b/sysutils/ups-nut-cgi/patches/patch-ae index 52f204c5515..9f364aeb950 100644 --- a/sysutils/ups-nut-cgi/patches/patch-ae +++ b/sysutils/ups-nut-cgi/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.2 2002/07/03 11:57:14 lukem Exp $ +$NetBSD: patch-ae,v 1.3 2002/08/25 21:51:08 jlam Exp $ --- clients/upsstats.c.orig Thu Mar 21 17:01:16 2002 +++ clients/upsstats.c diff --git a/sysutils/ups-nut/MESSAGE b/sysutils/ups-nut/MESSAGE index 0f0df12dbcb..651789a1c76 100644 --- a/sysutils/ups-nut/MESSAGE +++ b/sysutils/ups-nut/MESSAGE @@ -1,5 +1,5 @@ ====================================================================== -$NetBSD: MESSAGE,v 1.2 2002/07/03 11:57:11 lukem Exp $ +$NetBSD: MESSAGE,v 1.3 2002/08/25 21:51:04 jlam Exp $ ${NUT_CONFDIR}/upsd.users has a new format from version 0.45.5. You will need to update this before restarting upsd(8). diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile index a40c14f32d8..6b092b46284 100644 --- a/sysutils/ups-nut/Makefile +++ b/sysutils/ups-nut/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2002/07/03 11:57:12 lukem Exp $ +# $NetBSD: Makefile,v 1.22 2002/08/25 21:51:04 jlam Exp $ # DISTNAME= nut-0.50.0 @@ -12,7 +12,7 @@ COMMENT= Network UPS Tools BUILD_DEPENDS+= autoconf>=2.13:../../devel/autoconf -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${NUT_CONFDIR} \ --with-user=${NUT_USER} \ diff --git a/sysutils/ups-nut/PLIST b/sysutils/ups-nut/PLIST index a2144ec3f2e..9139398a2f8 100644 --- a/sysutils/ups-nut/PLIST +++ b/sysutils/ups-nut/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2002/07/03 11:57:12 lukem Exp $ +@comment $NetBSD: PLIST,v 1.10 2002/08/25 21:51:04 jlam Exp $ bin/upsc bin/upscmd bin/upsct diff --git a/sysutils/ups-nut/distinfo b/sysutils/ups-nut/distinfo index 3768fccf2ec..f16b4bd40d1 100644 --- a/sysutils/ups-nut/distinfo +++ b/sysutils/ups-nut/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2002/07/03 11:57:12 lukem Exp $ +$NetBSD: distinfo,v 1.14 2002/08/25 21:51:05 jlam Exp $ SHA1 (nut-0.50.0.tar.gz) = b8826f2e7301e5c753ac946574a53d651faf69c3 Size (nut-0.50.0.tar.gz) = 382755 bytes diff --git a/sysutils/ups-nut/files/ups.sh b/sysutils/ups-nut/files/ups.sh index 66f4ea4bdb7..99371f31e32 100644 --- a/sysutils/ups-nut/files/ups.sh +++ b/sysutils/ups-nut/files/ups.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: ups.sh,v 1.8 2002/05/24 22:28:27 hubertf Exp $ +# $NetBSD: ups.sh,v 1.9 2002/08/25 21:51:05 jlam Exp $ # # KEYWORD: nostart diff --git a/sysutils/ups-nut/patches/patch-aa b/sysutils/ups-nut/patches/patch-aa index b06f339e18c..75598290e63 100644 --- a/sysutils/ups-nut/patches/patch-aa +++ b/sysutils/ups-nut/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.6 2002/07/03 11:57:13 lukem Exp $ +$NetBSD: patch-aa,v 1.7 2002/08/25 21:51:06 jlam Exp $ --- models/upscommon.c.orig Fri May 17 15:27:55 2002 +++ models/upscommon.c diff --git a/sysutils/ups-nut/patches/patch-ac b/sysutils/ups-nut/patches/patch-ac index 16286d5f35a..567735ca3b3 100644 --- a/sysutils/ups-nut/patches/patch-ac +++ b/sysutils/ups-nut/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.4 2002/07/03 11:57:13 lukem Exp $ +$NetBSD: patch-ac,v 1.5 2002/08/25 21:51:06 jlam Exp $ --- clients/upslog.c.orig Fri May 17 08:26:22 2002 +++ clients/upslog.c diff --git a/sysutils/ups-nut/patches/patch-ag b/sysutils/ups-nut/patches/patch-ag index ea9e99f5ac1..ff0f31b73fa 100644 --- a/sysutils/ups-nut/patches/patch-ag +++ b/sysutils/ups-nut/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.4 2002/05/13 14:40:51 lukem Exp $ +$NetBSD: patch-ag,v 1.5 2002/08/25 21:51:06 jlam Exp $ --- models/Makefile.in.orig Tue Mar 26 10:30:31 2002 +++ models/Makefile.in diff --git a/sysutils/vcdimager/Makefile b/sysutils/vcdimager/Makefile index 0c7f6f35143..1e68779a57e 100644 --- a/sysutils/vcdimager/Makefile +++ b/sysutils/vcdimager/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/02/18 15:14:42 seb Exp $ +# $NetBSD: Makefile,v 1.3 2002/08/25 21:51:08 jlam Exp $ # DISTNAME= vcdimager-0.6.2 @@ -9,10 +9,11 @@ MAINTAINER= collver@linuxfreemail.com HOMEPAGE= http://www.gnu.org/software/vcdimager/ COMMENT= mastering suite for Video CDs -USE_BUILDLINK_ONLY= YES -USE_GMAKE= YES -GNU_CONFIGURE= YES +USE_BUILDLINK2= YES +USE_GMAKE= YES +GNU_CONFIGURE= YES + +.include "../../devel/gettext-lib/buildlink2.mk" -.include "../../devel/gettext-lib/buildlink.mk" .include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/whowatch/Makefile b/sysutils/whowatch/Makefile index d96652ea340..3b0277b2882 100644 --- a/sysutils/whowatch/Makefile +++ b/sysutils/whowatch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/06/20 04:29:52 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2002/08/25 21:51:09 jlam Exp $ # DISTNAME= whowatch-1.4 @@ -10,8 +10,8 @@ MAINTAINER= rh@netbsd.org HOMEPAGE= http://wizard.ae.krakow.pl/~mike/\#whowatch COMMENT= interactive who-like program displaying real-time user information -GNU_CONFIGURE= YES -USE_BUILDLINK_ONLY= YES +GNU_CONFIGURE= YES +USE_BUILDLINK2= YES -.include "../../devel/ncurses/buildlink.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wmcpuload/Makefile b/sysutils/wmcpuload/Makefile index 081aeb20aad..4d3c4386eb5 100644 --- a/sysutils/wmcpuload/Makefile +++ b/sysutils/wmcpuload/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/03/24 18:04:57 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2002/08/25 21:51:10 jlam Exp $ # DISTNAME= wmcpuload-0.9.0 @@ -9,9 +9,9 @@ MAINTAINER= coto@core.de HOMEPAGE= http://www.sh.rim.or.jp/~ssato/dockapp/index.shtml COMMENT= dockable CPU monitor -GNU_CONFIGURE= YES -USE_BUILDLINK_ONLY= YES +GNU_CONFIGURE= YES +USE_BUILDLINK2= YES +USE_X11= YES -.include "../../graphics/xpm/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/xpm/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xbattbar/Makefile b/sysutils/xbattbar/Makefile index 666cf6ec1f8..3b0c8db341b 100644 --- a/sysutils/xbattbar/Makefile +++ b/sysutils/xbattbar/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/12/19 20:21:30 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2002/08/25 21:51:10 jlam Exp $ DISTNAME= xbattbar_1.4.2 PKGNAME= ${DISTNAME:S/_/-/} @@ -11,6 +11,8 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://infonet.aist-nara.ac.jp/member/suguru/xbattbar.html COMMENT= X11 battery graph for laptops +USE_BUILDLINK2= # defined + USE_X11BASE= # defined USE_IMAKE= # defined diff --git a/sysutils/xps/Makefile b/sysutils/xps/Makefile index f97a290fbee..453de27e207 100644 --- a/sysutils/xps/Makefile +++ b/sysutils/xps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2002/07/24 19:45:28 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2002/08/25 21:51:11 jlam Exp $ DISTNAME= xps-3.14 CATEGORIES= sysutils @@ -12,10 +12,8 @@ USE_PERL5= build USE_GMAKE= # defined USE_X11BASE= # defined -USE_BUILDLINK_ONLY= # defined -GNU_CONFIGURE= # defined -CONFIGURE_ENV+= XINCLUDES="-I${BUILDLINK_X11_DIR}/include" +USE_BUILDLINK2= # defined +GNU_CONFIGURE= # defined -.include "../../mk/motif.buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../mk/motif.buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/bibclean/Makefile b/textproc/bibclean/Makefile index 57864bb3f90..89583d9b285 100644 --- a/textproc/bibclean/Makefile +++ b/textproc/bibclean/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/08/15 00:18:48 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2002/08/25 21:51:11 jlam Exp $ # DISTNAME= bibclean-2.11.4 @@ -9,7 +9,7 @@ MAINTAINER= seb@pbox.org HOMEPAGE= http://www.math.utah.edu/~beebe/software/bibtex-bibliography-tools.html COMMENT= prettyprinter and syntax checker for BibTeX bibliography databases -GNU_CONFIGURE= YES -USE_BUILDLINK_ONLY= YES +GNU_CONFIGURE= YES +USE_BUILDLINK2= YES .include "../../mk/bsd.pkg.mk" diff --git a/textproc/bibparse/Makefile b/textproc/bibparse/Makefile index bb384e0af80..0a05bd50003 100644 --- a/textproc/bibparse/Makefile +++ b/textproc/bibparse/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/07/24 13:47:34 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2002/08/25 21:51:12 jlam Exp $ # DISTNAME= bibparse-1.04 @@ -9,7 +9,7 @@ MAINTAINER= seb@pbox.org HOMEPAGE= http://www.math.utah.edu/~beebe/software/bibtex-bibliography-tools.html COMMENT= syntax checking tools for BibTeX bibliography databases -GNU_CONFIGURE= YES -USE_BUILDLINK_ONLY= YES +GNU_CONFIGURE= YES +USE_BUILDLINK2= YES .include "../../mk/bsd.pkg.mk" diff --git a/textproc/chasen-base/Makefile b/textproc/chasen-base/Makefile index 5fe454f61f9..b5250bd2de8 100644 --- a/textproc/chasen-base/Makefile +++ b/textproc/chasen-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/05/31 13:00:50 seb Exp $ +# $NetBSD: Makefile,v 1.2 2002/08/25 21:51:12 jlam Exp $ # DISTNAME= chasen-${CHASEN_VERSION} @@ -16,7 +16,7 @@ COMMENT= ChaSen, Japanese Morphological Analysis System GNU_CONFIGURE= # defined USE_LIBTOOL= # defined -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK2= # defined OWN_DIRS= ${CHASEN_DICDIR} LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig diff --git a/textproc/chasen-base/PLIST b/textproc/chasen-base/PLIST index 43ea8c03b80..19f19e24343 100644 --- a/textproc/chasen-base/PLIST +++ b/textproc/chasen-base/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 13:00:50 seb Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/08/25 21:51:13 jlam Exp $ bin/chasen bin/chasen-config include/chasen.h diff --git a/textproc/chasen-base/distinfo b/textproc/chasen-base/distinfo index c4937d86bec..9476aba5c2e 100644 --- a/textproc/chasen-base/distinfo +++ b/textproc/chasen-base/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/05/31 13:00:50 seb Exp $ +$NetBSD: distinfo,v 1.2 2002/08/25 21:51:13 jlam Exp $ SHA1 (chasen-2.2.9.tar.gz) = bd17162f2fcb4254ded6eebf35c6aa06caecbaeb Size (chasen-2.2.9.tar.gz) = 578068 bytes diff --git a/textproc/chasen-base/patches/patch-ag b/textproc/chasen-base/patches/patch-ag index f0f9542a75e..0b8ba1c8a44 100644 --- a/textproc/chasen-base/patches/patch-ag +++ b/textproc/chasen-base/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.1.1.1 2002/05/31 13:00:50 seb Exp $ +$NetBSD: patch-ag,v 1.2 2002/08/25 21:51:14 jlam Exp $ --- Makefile.am.orig Sat Feb 2 10:08:19 2002 +++ Makefile.am diff --git a/textproc/chasen-base/patches/patch-ah b/textproc/chasen-base/patches/patch-ah index e8ef6435974..5e2812ae186 100644 --- a/textproc/chasen-base/patches/patch-ah +++ b/textproc/chasen-base/patches/patch-ah @@ -1,4 +1,4 @@ -$NetBSD: patch-ah,v 1.1.1.1 2002/05/31 13:00:50 seb Exp $ +$NetBSD: patch-ah,v 1.2 2002/08/25 21:51:14 jlam Exp $ --- Makefile.in.orig Fri Feb 8 15:31:20 2002 +++ Makefile.in diff --git a/textproc/chasen-base/patches/patch-ai b/textproc/chasen-base/patches/patch-ai index f3614f16a21..9d788fa1283 100644 --- a/textproc/chasen-base/patches/patch-ai +++ b/textproc/chasen-base/patches/patch-ai @@ -1,4 +1,4 @@ -$NetBSD: patch-ai,v 1.1.1.1 2002/05/31 13:00:50 seb Exp $ +$NetBSD: patch-ai,v 1.2 2002/08/25 21:51:14 jlam Exp $ --- chasen-config.in.orig Thu Mar 1 08:54:17 2001 +++ chasen-config.in diff --git a/textproc/chasen-base/patches/patch-aj b/textproc/chasen-base/patches/patch-aj index 3c2cdb950ab..4d8b571386f 100644 --- a/textproc/chasen-base/patches/patch-aj +++ b/textproc/chasen-base/patches/patch-aj @@ -1,4 +1,4 @@ -$NetBSD: patch-aj,v 1.1.1.1 2002/05/31 13:00:50 seb Exp $ +$NetBSD: patch-aj,v 1.2 2002/08/25 21:51:14 jlam Exp $ --- mkchadic/Makefile.am.orig Sun Jun 24 15:19:02 2001 +++ mkchadic/Makefile.am diff --git a/textproc/chasen-base/patches/patch-ak b/textproc/chasen-base/patches/patch-ak index a28f6ae8494..f3078d588ef 100644 --- a/textproc/chasen-base/patches/patch-ak +++ b/textproc/chasen-base/patches/patch-ak @@ -1,4 +1,4 @@ -$NetBSD: patch-ak,v 1.1.1.1 2002/05/31 13:00:50 seb Exp $ +$NetBSD: patch-ak,v 1.2 2002/08/25 21:51:14 jlam Exp $ --- mkchadic/Makefile.in.orig Fri Feb 8 15:31:51 2002 +++ mkchadic/Makefile.in diff --git a/textproc/gsed/Makefile b/textproc/gsed/Makefile index 826f86cfb1e..ac43bc48abb 100644 --- a/textproc/gsed/Makefile +++ b/textproc/gsed/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2002/02/18 15:14:43 seb Exp $ +# $NetBSD: Makefile,v 1.6 2002/08/25 21:51:15 jlam Exp $ # DISTNAME= sed-3.02 @@ -10,6 +10,7 @@ MAINTAINER= seb@netbsd.org HOMEPAGE= http://www.gnu.org/software/sed/sed.html COMMENT= GNU version of sed +USE_BUILDLINK2= YES GNU_CONFIGURE= YES CONFIGURE_ARGS= --program-prefix=g INFO_FILES= sed.info diff --git a/textproc/ispell-base/Makefile b/textproc/ispell-base/Makefile index ea0b8436596..7af20d0a31b 100644 --- a/textproc/ispell-base/Makefile +++ b/textproc/ispell-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2002/07/22 10:31:30 agc Exp $ +# $NetBSD: Makefile,v 1.9 2002/08/25 21:51:16 jlam Exp $ # DISTNAME= ispell-3.1.20 @@ -26,7 +26,7 @@ INFO_FILES= ispell.info CFLAGS+= -DHAVE_INTTYPES_H .endif -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes do-configure: cd ${WRKSRC}; \ diff --git a/textproc/ispell-base/distinfo b/textproc/ispell-base/distinfo index 0477a63da93..7386f8c52b3 100644 --- a/textproc/ispell-base/distinfo +++ b/textproc/ispell-base/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2002/07/22 10:31:30 agc Exp $ +$NetBSD: distinfo,v 1.6 2002/08/25 21:51:16 jlam Exp $ SHA1 (ispell-3.1.20.tar.gz) = f8f849a3868ef3d88c1ba6fe5b49505f75de786e Size (ispell-3.1.20.tar.gz) = 677987 bytes diff --git a/textproc/ispell-base/patches/patch-al b/textproc/ispell-base/patches/patch-al index a43db6a201f..887eacd3dee 100644 --- a/textproc/ispell-base/patches/patch-al +++ b/textproc/ispell-base/patches/patch-al @@ -1,4 +1,4 @@ -$NetBSD: patch-al,v 1.1 2002/07/22 10:31:30 agc Exp $ +$NetBSD: patch-al,v 1.2 2002/08/25 21:51:17 jlam Exp $ --- config.X.orig Fri Jul 19 21:47:10 2002 +++ config.X Fri Jul 19 21:48:05 2002 diff --git a/textproc/ispell-base/patches/patch-am b/textproc/ispell-base/patches/patch-am index 3949623df07..23562fe7dff 100644 --- a/textproc/ispell-base/patches/patch-am +++ b/textproc/ispell-base/patches/patch-am @@ -1,4 +1,4 @@ -$NetBSD: patch-am,v 1.1 2002/07/22 10:31:30 agc Exp $ +$NetBSD: patch-am,v 1.2 2002/08/25 21:51:17 jlam Exp $ --- munchlist.X.orig Fri Jul 19 21:47:10 2002 +++ munchlist.X Fri Jul 19 21:48:24 2002 diff --git a/textproc/ispell-base/patches/patch-an b/textproc/ispell-base/patches/patch-an index eb30943b7d1..2737617d80e 100644 --- a/textproc/ispell-base/patches/patch-an +++ b/textproc/ispell-base/patches/patch-an @@ -1,4 +1,4 @@ -$NetBSD: patch-an,v 1.1 2002/07/22 10:31:31 agc Exp $ +$NetBSD: patch-an,v 1.2 2002/08/25 21:51:18 jlam Exp $ --- splitdict.orig Fri Jul 19 21:49:28 2002 +++ splitdict Fri Jul 19 21:48:33 2002 diff --git a/textproc/ispell-base/patches/patch-ao b/textproc/ispell-base/patches/patch-ao index f78b24c0b5b..32fb2aa3edb 100644 --- a/textproc/ispell-base/patches/patch-ao +++ b/textproc/ispell-base/patches/patch-ao @@ -1,4 +1,4 @@ -$NetBSD: patch-ao,v 1.1 2002/07/22 10:31:31 agc Exp $ +$NetBSD: patch-ao,v 1.2 2002/08/25 21:51:18 jlam Exp $ --- subset.X.orig Fri Jul 19 21:47:10 2002 +++ subset.X Fri Jul 19 21:48:52 2002 diff --git a/textproc/ispell-base/patches/patch-ap b/textproc/ispell-base/patches/patch-ap index f7170f46df2..bfc8abba611 100644 --- a/textproc/ispell-base/patches/patch-ap +++ b/textproc/ispell-base/patches/patch-ap @@ -1,4 +1,4 @@ -$NetBSD: patch-ap,v 1.1 2002/07/22 10:31:31 agc Exp $ +$NetBSD: patch-ap,v 1.2 2002/08/25 21:51:18 jlam Exp $ --- tryaffix.X.orig Fri Jul 19 21:47:10 2002 +++ tryaffix.X Fri Jul 19 21:49:02 2002 diff --git a/textproc/ispell-base/patches/patch-aq b/textproc/ispell-base/patches/patch-aq index 2c609ae8b84..3c87eea4d8c 100644 --- a/textproc/ispell-base/patches/patch-aq +++ b/textproc/ispell-base/patches/patch-aq @@ -1,4 +1,4 @@ -$NetBSD: patch-aq,v 1.1 2002/07/22 10:31:31 agc Exp $ +$NetBSD: patch-aq,v 1.2 2002/08/25 21:51:19 jlam Exp $ --- zapdups.X.orig Fri Jul 19 21:47:10 2002 +++ zapdups.X Fri Jul 19 21:49:09 2002 diff --git a/textproc/lq-sp/Makefile b/textproc/lq-sp/Makefile index b25370aee18..6255459fdd7 100644 --- a/textproc/lq-sp/Makefile +++ b/textproc/lq-sp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2002/04/11 01:56:24 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.5 2002/08/25 21:51:19 jlam Exp $ # DISTNAME= lq-sp-1.3.4.7 @@ -9,7 +9,7 @@ MAINTAINER= norm@sandbox.org.uk HOMEPAGE= http://www.htmlhelp.com/tools/validator/offline/ COMMENT= Modified SP package -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES # doesn't build (LP64 bugs) NOT_FOR_PLATFORM= *-*-alpha diff --git a/textproc/source-highlight/Makefile b/textproc/source-highlight/Makefile index 8e9e965ae7f..6ba62bbb58d 100644 --- a/textproc/source-highlight/Makefile +++ b/textproc/source-highlight/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/01/22 10:40:01 agc Exp $ +# $NetBSD: Makefile,v 1.3 2002/08/25 21:51:19 jlam Exp $ # DISTNAME= source-highlight-1.2.1 @@ -10,8 +10,8 @@ MAINTAINER= seb@netbsd.org HOMEPAGE= http://www.gnu.org/software/src-highlite/source-highlight.html COMMENT= Highlight syntax of C, C++ or Java source into HTML document -GNU_CONFIGURE= YES -USE_BUILDLINK_ONLY= YES +GNU_CONFIGURE= YES +USE_BUILDLINK2= YES .include "../../mk/bsd.prefs.mk" diff --git a/textproc/texi2html/Makefile b/textproc/texi2html/Makefile index 251062c31b5..403a93cb4d9 100644 --- a/textproc/texi2html/Makefile +++ b/textproc/texi2html/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2002/08/01 02:37:42 jschauma Exp $ +# $NetBSD: Makefile,v 1.13 2002/08/25 21:51:20 jlam Exp $ # DISTNAME= texi2html-1.64 @@ -11,8 +11,8 @@ COMMENT= Texinfo-to-HTML direct translator CONFLICTS= teTeX-bin-1.0 teTeX-bin-1.0.[1234567] -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES GNU_CONFIGURE= YES -.include "../../lang/perl5/buildlink.mk" +.include "../../lang/perl5/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/urlview/Makefile b/textproc/urlview/Makefile index 9057e729213..3ae5a583ddc 100644 --- a/textproc/urlview/Makefile +++ b/textproc/urlview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/06/20 04:26:43 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2002/08/25 21:51:20 jlam Exp $ DISTNAME= urlview-0.9 CATEGORIES= textproc @@ -10,9 +10,8 @@ MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/contrib/ \ MAINTAINER= tron@netbsd.org COMMENT= extract URLs from text files and display them in a menu -GNU_CONFIGURE= yes -USE_NCURSES= yes -USE_BUILDLINK_ONLY= yes +GNU_CONFIGURE= yes +USE_BUILDLINK2= yes -.include "../../devel/ncurses/buildlink.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/xml-i18n-tools/Makefile b/textproc/xml-i18n-tools/Makefile index 8d767b91724..57684c7cf93 100644 --- a/textproc/xml-i18n-tools/Makefile +++ b/textproc/xml-i18n-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/11/29 13:27:47 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2002/08/25 21:51:21 jlam Exp $ DISTNAME= xml-i18n-tools-0.9 CATEGORIES= textproc gnome @@ -8,7 +8,7 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://news.gnome.org/gnome-news/979851911/ COMMENT= XML internationalisation tools -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES GNU_CONFIGURE= YES USE_GMAKE= YES @@ -20,5 +20,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/$${file} ${DOCDIR}; \ done -.include "../../lang/perl5/buildlink.mk" +.include "../../lang/perl5/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/asclock-gtk/Makefile b/time/asclock-gtk/Makefile index a070394d023..81966f9d03c 100644 --- a/time/asclock-gtk/Makefile +++ b/time/asclock-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/10/24 22:11:07 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2002/08/25 21:51:22 jlam Exp $ # DISTNAME= asclock-gtk-2.1.10beta @@ -12,15 +12,13 @@ COMMENT= dockable clock and calendar with themes for GTK+ NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL -USE_BUILDLINK_ONLY= # defined -USE_CONFIG_WRAPPER= # defined -USE_X11BASE= # defined +USE_BUILDLINK2= # defined +USE_X11BASE= # defined PLIST_SRC= ${PKGDIR}/PLIST \ ${PKGDIR}/PLIST.themes ALL_TARGET= asclock -MAKE_ENV+= CONFIG_PATH="${BUILDLINK_DIR}/bin/" # for gtk-config pre-configure: cd ${WRKSRC}; ${LN} -sf themes/classic default_theme @@ -37,6 +35,5 @@ do-install: ${CP} -R ${WRKSRC}/themes/* ${PREFIX}/share/asclock-gtk ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/asclock-gtk -.include "../../x11/gtk/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../x11/gtk/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/devtodo/Makefile b/time/devtodo/Makefile index 10fefa35e70..0e32552a4ae 100644 --- a/time/devtodo/Makefile +++ b/time/devtodo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/06/21 02:14:43 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2002/08/25 21:51:22 jlam Exp $ # DISTNAME= devtodo-0.1.6-1 @@ -14,7 +14,7 @@ COMMENT= Display and manage a list of items that are outstanding USE_LIBTOOL= # defined LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK2= # defined GNU_CONFIGURE= # defined # We don't need curses, just termcap. @@ -22,5 +22,5 @@ CONFIGURE_ENV+= ac_cv_lib_curses_tputs=no USE_GNU_READLINE= # uses rl_startup_hook() -.include "../../devel/readline/buildlink.mk" +.include "../../devel/readline/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/glclock/Makefile b/time/glclock/Makefile index 35830ae10a6..772f6759a4f 100644 --- a/time/glclock/Makefile +++ b/time/glclock/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/10/24 22:11:08 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2002/08/25 21:51:23 jlam Exp $ # DISTNAME= glclock-6.0b6.0 @@ -11,7 +11,9 @@ COMMENT= OpenGL-based pocket watch MAKEFILE= makefile ALL_TARGET= glclock -USE_BUILDLINK_ONLY= yes + +USE_BUILDLINK2= # defined +USE_X11= # defined .include "../../mk/bsd.prefs.mk" @@ -26,6 +28,5 @@ do-install: # mwclock woodclock;do \ # ${INSTALL_SCRIPT} ${WRKSRC}/$$i ${PREFIX}/bin; done -.include "../../graphics/Mesa/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/Mesa/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/glclock/distinfo b/time/glclock/distinfo index 8b88800a728..3c26d767268 100644 --- a/time/glclock/distinfo +++ b/time/glclock/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2001/09/14 16:32:30 drochner Exp $ +$NetBSD: distinfo,v 1.4 2002/08/25 21:51:23 jlam Exp $ SHA1 (glclock-6.0b6.0.tar.gz) = e276a516d543c9a6c04f06cfa046f89a476a8685 Size (glclock-6.0b6.0.tar.gz) = 811803 bytes -SHA1 (patch-aa) = ad8e2962a1648c0d3b977c658ea3c150dac16687 +SHA1 (patch-aa) = 388d8c9e3236f377912dd6261af50cd42064eb22 SHA1 (patch-ab) = 8d4f12c9948d703e4fbff68282388efc7a352f59 diff --git a/time/glclock/patches/patch-aa b/time/glclock/patches/patch-aa index a68e19a0db8..a1a75d2072b 100644 --- a/time/glclock/patches/patch-aa +++ b/time/glclock/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2001/09/14 16:32:31 drochner Exp $ +$NetBSD: patch-aa,v 1.4 2002/08/25 21:51:23 jlam Exp $ --- makefile.orig Sun Jun 18 16:37:40 2000 +++ makefile @@ -11,8 +11,8 @@ $NetBSD: patch-aa,v 1.3 2001/09/14 16:32:31 drochner Exp $ - INCLUDE_PATH = -I/usr/X11R6/include - LIB_PATH = -L/usr/X11R6/lib -+ INCLUDE_PATH = -I${BUILDLINK_DIR}/include -+ LIB_PATH = -L${BUILDLINK_DIR}/lib -L${BUILDLINK_X11_DIR}/lib -Wl,-R${X11BASE}/lib -Wl,-R${LOCALBASE}/lib ++ INCLUDE_PATH = -I${LOCALBASE}/include ++ LIB_PATH = -L${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -Wl,-R${LOCALBASE}/lib - LIBS = -lglut -lGLU -lGL -lXi -lXmu -lXext -lX11 -lm + LIBS = -lglut -lGLU -lGL -lXext -lXmu -lXt -lSM -lICE -lXi -lX11 -lm diff --git a/time/plan/Makefile b/time/plan/Makefile index 0b6358975f8..eba05190890 100644 --- a/time/plan/Makefile +++ b/time/plan/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2002/04/23 02:08:54 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2002/08/25 21:51:24 jlam Exp $ # DISTNAME= plan-1.8.4 @@ -10,9 +10,9 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.in-berlin.de/User/bitrot/plan.html COMMENT= Schedule planner based on X/Motif -USE_BUILDLINK_ONLY= YES -USE_X11BASE= YES -ALL_TARGET= netbsd +USE_BUILDLINK2= YES +USE_X11BASE= YES +ALL_TARGET= netbsd pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/libexec/plan ${PREFIX}/share/plan \ @@ -23,6 +23,5 @@ pre-install: ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/$$f ${PREFIX}/share/plan; \ done -.include "../../mk/motif.buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../mk/motif.buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/plan/PLIST b/time/plan/PLIST index 6640bf01191..f6cde288acb 100644 --- a/time/plan/PLIST +++ b/time/plan/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/06/26 10:30:03 seb Exp $ +@comment $NetBSD: PLIST,v 1.4 2002/08/25 21:51:24 jlam Exp $ bin/plan libexec/plan/pland libexec/plan/notifier diff --git a/time/sunclock/Makefile b/time/sunclock/Makefile index e1c91988502..9fdf7bec810 100644 --- a/time/sunclock/Makefile +++ b/time/sunclock/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/06/11 06:34:53 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2002/08/25 21:51:25 jlam Exp $ # DISTNAME= sunclock-1.4 @@ -8,6 +8,7 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/} MAINTAINER= perry@netbsd.org COMMENT= Show which portion of the Earth's surface is illuminated by the Sun +USE_BUILDLINK2= yes USE_IMAKE= yes .include "../../mk/bsd.prefs.mk" diff --git a/time/wmcalclock/Makefile b/time/wmcalclock/Makefile index 6969f7e100c..027d6af0b38 100644 --- a/time/wmcalclock/Makefile +++ b/time/wmcalclock/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/11/15 07:58:50 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2002/08/25 21:51:26 jlam Exp $ # DISTNAME= wmCalClock-1.25 @@ -9,22 +9,21 @@ MAINTAINER= wiz@netbsd.org HOMEPAGE= http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml COMMENT= another WindowMaker calendar/clock dockapp -USE_BUILDLINK_ONLY= YES -USE_X11BASE= YES -USE_GMAKE= YES +USE_BUILDLINK2= YES +USE_X11BASE= YES +USE_GMAKE= YES -WRKSRC= ${WRKDIR}/${DISTNAME}/Src +WRKSRC= ${WRKDIR}/${DISTNAME}/Src .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "SunOS" -MAKE_ENV+= EXTRALIBS="-lsocket -lnsl" +MAKE_ENV+= EXTRALIBS="-lsocket -lnsl" .endif do-install: ${INSTALL_MAN} ${WRKSRC}/wmCalClock.1 ${PREFIX}/man/man1/ ${INSTALL_PROGRAM} ${WRKSRC}/wmCalClock ${PREFIX}/bin/ -.include "../../graphics/xpm/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/xpm/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/amaterus/Makefile b/wm/amaterus/Makefile index 740d4ecf651..4f7fd64171a 100644 --- a/wm/amaterus/Makefile +++ b/wm/amaterus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/10/24 22:11:08 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2002/08/25 21:51:26 jlam Exp $ DISTNAME= amaterus-0.34.1 CATEGORIES= wm @@ -8,15 +8,16 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.taiyaki.org/ COMMENT= GTK+ window manager -GNU_CONFIGURE= YES -USE_BUILDLINK_ONLY= YES +GNU_CONFIGURE= YES +USE_BUILDLINK2= YES +USE_X11= YES post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/amaterus ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/amaterus ${INSTALL_DATA} ${WRKSRC}/README.en ${PREFIX}/share/doc/amaterus -.include "../../textproc/libxml/buildlink.mk" -.include "../../x11/gtk/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../textproc/libxml/buildlink2.mk" +.include "../../x11/gtk/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/wm/amiwm/Makefile b/wm/amiwm/Makefile index 956bd69b1e2..561cfc4a421 100644 --- a/wm/amiwm/Makefile +++ b/wm/amiwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2002/03/12 22:25:18 jmc Exp $ +# $NetBSD: Makefile,v 1.7 2002/08/25 21:51:27 jlam Exp $ # DISTNAME= amiwm0.20pl48 @@ -15,12 +15,11 @@ RESTRICTED= "Restrictive copyright (non-commerical use only)" NO_SRC_ON_CDROM= ${RESTRICTED} NO_BIN_ON_CDROM= ${RESTRICTED} -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= yes USE_X11= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CFLAGS="-DHAVE_X11_EXTENSIONS_SHAPE_H=1 -O" \ X_PRE_LIBS="-Wl,-R${X11BASE}/lib" \ X_EXTRA_LIBS="-lXt" -.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/bbkeys/Makefile b/wm/bbkeys/Makefile index 80c4ded2be1..dfc7f611be6 100644 --- a/wm/bbkeys/Makefile +++ b/wm/bbkeys/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2002/03/18 09:23:00 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2002/08/25 21:51:27 jlam Exp $ # DISTNAME= bbkeys-0.8.4 @@ -12,10 +12,9 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://bbkeys.sourceforge.net/ COMMENT= General X Window keygrabber -GNU_CONFIGURE= YES -USE_BUILDLINK_ONLY= YES -USE_PERL5= YES -USE_X11BASE= YES +GNU_CONFIGURE= YES +USE_BUILDLINK2= YES +USE_X11BASE= YES -.include "../../mk/x11.buildlink.mk" +.include "../../lang/perl5/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/bbpager/Makefile b/wm/bbpager/Makefile index 47f270727c3..bfec0bc590f 100644 --- a/wm/bbpager/Makefile +++ b/wm/bbpager/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/03/14 15:14:40 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2002/08/25 21:51:27 jlam Exp $ # DISTNAME= bbpager-0.3.0 @@ -9,9 +9,8 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://bbtools.thelinuxcommunity.org/available.phtml COMMENT= pager for the blackbox window manager -GNU_CONFIGURE= YES -USE_BUILDLINK_ONLY= YES -USE_X11BASE= YES +GNU_CONFIGURE= YES +USE_BUILDLINK2= YES +USE_X11BASE= YES -.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/bbrun/Makefile b/wm/bbrun/Makefile index 198cd39e19c..94ec2718417 100644 --- a/wm/bbrun/Makefile +++ b/wm/bbrun/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/06/17 18:57:49 tron Exp $ +# $NetBSD: Makefile,v 1.3 2002/08/25 21:51:28 jlam Exp $ DISTNAME= bbrun-1.3 WRKSRC= ${WRKDIR}/${DISTNAME}/bbrun @@ -9,8 +9,9 @@ MAINTAINER= ptiJo@noos.fr HOMEPAGE= http://www.dwave.net/~jking/bbrun/ COMMENT= run utility for BlackBox -USE_GMAKE= YES -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES +USE_X11= YES +USE_GMAKE= YES ALL_TARGET= bbrun @@ -19,7 +20,7 @@ do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bbrun ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/README ${PREFIX}/share/doc/bbrun -.include "../../mk/x11.buildlink.mk" -.include "../../graphics/xpm/buildlink.mk" -.include "../../x11/gtk/buildlink.mk" +.include "../../graphics/xpm/buildlink2.mk" +.include "../../x11/gtk/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/wm/bbrun/PLIST b/wm/bbrun/PLIST index b715541d6b2..ce6be6b60bd 100644 --- a/wm/bbrun/PLIST +++ b/wm/bbrun/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/12 00:36:21 wiz Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/08/25 21:51:28 jlam Exp $ bin/bbrun share/doc/bbrun/README @dirrm share/doc/bbrun diff --git a/wm/bbrun/distinfo b/wm/bbrun/distinfo index c010fec9595..ca0d7c0c7dd 100644 --- a/wm/bbrun/distinfo +++ b/wm/bbrun/distinfo @@ -1,5 +1,4 @@ -$NetBSD: distinfo,v 1.2 2002/06/17 18:57:50 tron Exp $ +$NetBSD: distinfo,v 1.3 2002/08/25 21:51:28 jlam Exp $ SHA1 (bbrun-1.3.tar.gz) = 719af622334f6c3186f07da7c9246a8b05381f6c Size (bbrun-1.3.tar.gz) = 19423 bytes -SHA1 (patch-aa) = 20abf46fedcd208fc2a50d8afc2615bf4b6ae95a diff --git a/wm/bbrun/patches/patch-aa b/wm/bbrun/patches/patch-aa deleted file mode 100644 index e2ffcda84b4..00000000000 --- a/wm/bbrun/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2002/06/17 18:57:50 tron Exp $ - ---- Makefile.orig Wed Feb 6 20:05:51 2002 -+++ Makefile Mon Jun 17 07:16:33 2002 -@@ -1,6 +1,6 @@ - CC = gcc --LIBS = -lXpm `gtk-config --libs` --CFLAGS = `gtk-config --cflags` -+LIBS += -lXpm `${GTK_CONFIG} --libs` -+CFLAGS += `${GTK_CONFIG} --cflags` - OBJS = bbrun.o \ - ../wmgeneral/wmgeneral.o \ - ../wmgeneral/misc.o \ diff --git a/wm/blackbox/Makefile b/wm/blackbox/Makefile index d90b7315180..f69c263644a 100644 --- a/wm/blackbox/Makefile +++ b/wm/blackbox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2002/03/14 15:07:01 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2002/08/25 21:51:30 jlam Exp $ # DISTNAME= blackbox-0.62.1 @@ -9,11 +9,10 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://blackboxwm.sourceforge.net/ COMMENT= small and fast X11R6 window manager -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes USE_X11BASE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-kde -.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/enlightenment/Makefile b/wm/enlightenment/Makefile index 86385fa114f..dab7babf82e 100644 --- a/wm/enlightenment/Makefile +++ b/wm/enlightenment/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2002/03/13 17:37:46 fredb Exp $ +# $NetBSD: Makefile,v 1.10 2002/08/25 21:51:31 jlam Exp $ DISTNAME= enlightenment-0.16.4 PKGREVISION= 1 @@ -9,27 +9,13 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.enlightenment.org/ COMMENT= Window manager for X -USE_BUILDLINK_ONLY= yes -USE_PERL5= yes +USE_BUILDLINK2= yes USE_X11BASE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-fsstd MAKE_ENV+= USER=${SHAREOWN}:${SHAREGRP} -# Remove -I$(includedir) from the INCLUDES passed to the compiler as this -# defeats buildlink. -# -post-patch: - cd ${WRKSRC}; \ - files=`${FIND} . -name "Makefile.in" -print`; \ - for file in $${files}; do \ - ${MV} -f $${file} $${file}.fixme; \ - ${SED} -e "/^INCLUDES.*=.*/s|[ ]*-I\$$(includedir)||" \ - $${file}.fixme > $${file}; \ - ${RM} $${file}.fixme; \ - done - post-install: for FILE in `${GREP} "\.directory$$" ${PKGDIR}/PLIST`; do \ ${TOUCH} ${PREFIX}/$${FILE}; \ @@ -39,10 +25,11 @@ post-install: ${FIND} ${PREFIX}/share/enlightenment/themes -type f | \ ${XARGS} ${CHMOD} ${NONBINMODE} -.include "../../audio/esound/buildlink.mk" -.include "../../graphics/imlib/buildlink.mk" -.include "../../graphics/fnlib/buildlink.mk" -.include "../../graphics/freetype-lib/buildlink.mk" -.include "../../www/libghttp/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../audio/esound/buildlink2.mk" +.include "../../graphics/imlib/buildlink2.mk" +.include "../../graphics/fnlib/buildlink2.mk" +.include "../../graphics/freetype-lib/buildlink2.mk" +.include "../../lang/perl5/buildlink2.mk" +.include "../../www/libghttp/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/wm/fluxbox/Makefile b/wm/fluxbox/Makefile index 1eabd83a27a..d04a80654ec 100644 --- a/wm/fluxbox/Makefile +++ b/wm/fluxbox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/04/22 18:39:18 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2002/08/25 21:51:31 jlam Exp $ # DISTNAME= fluxbox-0.1.8 @@ -9,7 +9,7 @@ MAINTAINER= jmcneill@invisible.yi.org HOMEPAGE= http://fluxbox.sourceforge.net/ COMMENT= Window Manager for X based on Blackbox -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES USE_X11BASE= YES GNU_CONFIGURE= YES @@ -21,5 +21,4 @@ GCC_VERSION!= gcc --version .include "../../lang/gcc/Makefile.gcc" .endif -.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/fluxbox/distinfo b/wm/fluxbox/distinfo index 26698099613..07f7c667c42 100644 --- a/wm/fluxbox/distinfo +++ b/wm/fluxbox/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2002/08/11 04:43:14 dmcmahill Exp $ +$NetBSD: distinfo,v 1.4 2002/08/25 21:51:31 jlam Exp $ SHA1 (fluxbox-0.1.8.tar.gz) = 48c010631d24ed3cf9620169cd1203c2cc7cb0b3 Size (fluxbox-0.1.8.tar.gz) = 437047 bytes diff --git a/wm/fluxbox/patches/patch-ab b/wm/fluxbox/patches/patch-ab index 8708122d3a0..06ec5836dce 100644 --- a/wm/fluxbox/patches/patch-ab +++ b/wm/fluxbox/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.3 2002/08/11 13:15:26 dmcmahill Exp $ +$NetBSD: patch-ab,v 1.4 2002/08/25 21:51:32 jlam Exp $ --- src/Makefile.in.orig Sat Apr 20 06:11:45 2002 +++ src/Makefile.in diff --git a/wm/flwm/Makefile b/wm/flwm/Makefile index 92db899190a..2aa6ab69b38 100644 --- a/wm/flwm/Makefile +++ b/wm/flwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/10/24 22:11:09 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2002/08/25 21:51:32 jlam Exp $ # DISTNAME= flwm-1.00 @@ -10,12 +10,11 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://flwm.sourceforge.net/ COMMENT= The Fast, Light Window Manager -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= # defined USE_X11BASE= # defined GNU_CONFIGURE= # defined CONFIGURE_ENV+= X_LIBS="-lGL" -.include "../../x11/fltk/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../x11/fltk/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/icewm/Makefile b/wm/icewm/Makefile index 004b2b1afad..34ac3c08f5b 100644 --- a/wm/icewm/Makefile +++ b/wm/icewm/Makefile @@ -1,14 +1,14 @@ -# $NetBSD: Makefile,v 1.12 2002/08/22 10:58:34 martti Exp $ +# $NetBSD: Makefile,v 1.13 2002/08/25 21:51:33 jlam Exp $ PKGNAME= ${DISTNAME} COMMENT= Small, fast and light-weight window manager CONFLICTS+= icewm-gnome-[0-9]* -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK2= # defined .include "Makefile.common" -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../graphics/xpm/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../graphics/xpm/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common index de57416b4f9..600c871d0f4 100644 --- a/wm/icewm/Makefile.common +++ b/wm/icewm/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.14 2002/08/22 10:58:34 martti Exp $ +# $NetBSD: Makefile.common,v 1.15 2002/08/25 21:51:34 jlam Exp $ DISTNAME= icewm-1.2.0 CATEGORIES= x11 wm diff --git a/wm/icewm/PLIST b/wm/icewm/PLIST index 2a4fc5f1997..ca1160b0e63 100644 --- a/wm/icewm/PLIST +++ b/wm/icewm/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/08/22 10:58:34 martti Exp $ +@comment $NetBSD: PLIST,v 1.4 2002/08/25 21:51:34 jlam Exp $ bin/genpref bin/icehelp bin/icesh diff --git a/wm/icewm/distinfo b/wm/icewm/distinfo index c271f612531..027b4678e6f 100644 --- a/wm/icewm/distinfo +++ b/wm/icewm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2002/08/22 10:58:34 martti Exp $ +$NetBSD: distinfo,v 1.8 2002/08/25 21:51:34 jlam Exp $ SHA1 (icewm-1.2.0.tar.gz) = bef4daba4bb94120f08f90755a9bc3518c254c21 Size (icewm-1.2.0.tar.gz) = 684306 bytes diff --git a/wm/icewm/patches/patch-ae b/wm/icewm/patches/patch-ae index 03da865c289..687bc5d112b 100644 --- a/wm/icewm/patches/patch-ae +++ b/wm/icewm/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.3 2002/08/22 10:58:35 martti Exp $ +$NetBSD: patch-ae,v 1.4 2002/08/25 21:51:35 jlam Exp $ --- src/wmtaskbar.cc.orig Thu May 16 05:00:02 2002 +++ src/wmtaskbar.cc Sat May 25 09:41:09 2002 diff --git a/wm/ion/Makefile b/wm/ion/Makefile index f7f66cf3eb3..8f4fb50dae1 100644 --- a/wm/ion/Makefile +++ b/wm/ion/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/08/29 22:41:24 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2002/08/25 21:51:35 jlam Exp $ # DISTNAME= ion-20010523 @@ -9,9 +9,8 @@ MAINTAINER= daniel@codefactory.se,zuntum@netbsd.org HOMEPAGE= http://www.students.tut.fi/~tuomov/ion/ COMMENT= keyboard friendly tiling window manager -USE_BUILDLINK_ONLY= YES -USE_X11BASE= YES -USE_GMAKE= YES +USE_BUILDLINK2= YES +USE_X11BASE= YES +USE_GMAKE= YES -.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/pwm/Makefile b/wm/pwm/Makefile index 2f04fa99fdd..b5c11b3e9a3 100644 --- a/wm/pwm/Makefile +++ b/wm/pwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2002/01/31 04:07:59 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2002/08/25 21:51:36 jlam Exp $ # DISTNAME= pwm-1.0 @@ -9,7 +9,8 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.students.tut.fi/~tuomov/pwm/ COMMENT= Window manager that frames multiple client windows in a single frame -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES +USE_X11= YES USE_GMAKE= YES MAKE_ENV+= SYSCONFDIR="${PKG_SYSCONFDIR}" @@ -29,6 +30,5 @@ SUPPORT_FILES+= ${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE} post-install: ${RM} -f ${EGDIR}/sample.conf -.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/pwm/distinfo b/wm/pwm/distinfo index a31ec421cdd..188cb9cf0b8 100644 --- a/wm/pwm/distinfo +++ b/wm/pwm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2002/01/31 04:07:59 jlam Exp $ +$NetBSD: distinfo,v 1.9 2002/08/25 21:51:36 jlam Exp $ SHA1 (pwm-1.0.tar.gz) = 79c708a2a6260a06bc8dc586110578bf23aa01e7 Size (pwm-1.0.tar.gz) = 93239 bytes @@ -8,5 +8,5 @@ SHA1 (patch-ac) = 53b2d849539a533ba03ad18ec2f1831177a8c892 SHA1 (patch-ad) = ce5e61f7c4011366708b4a7f0b7f2f575def1867 SHA1 (patch-ae) = 66aab44974a3076fdf72cdbf7b32c9281ff6b04b SHA1 (patch-af) = 58d7a96776487f0356120775084fc7d616187fde -SHA1 (patch-ag) = f60d81c0f92fdff44e50c73b3e7bed57071cfd8c +SHA1 (patch-ag) = c2f75054ac2d1daffb5ab40a8f4448d72e5bc5ea SHA1 (patch-ah) = a2ad468be06120abf44790e237aba8c003e61557 diff --git a/wm/pwm/patches/patch-ag b/wm/pwm/patches/patch-ag index b8943876709..5bec063fb62 100644 --- a/wm/pwm/patches/patch-ag +++ b/wm/pwm/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.2 2001/09/09 03:10:08 jlam Exp $ +$NetBSD: patch-ag,v 1.3 2002/08/25 21:51:36 jlam Exp $ --- system.mk.orig Sat Jul 1 12:37:50 2000 +++ system.mk @@ -16,7 +16,7 @@ $NetBSD: patch-ag,v 1.2 2001/09/09 03:10:08 jlam Exp $ ## -X11_PREFIX=/usr/X11R6 -+X11_PREFIX=${BUILDLINK_X11_DIR} ++X11_PREFIX=${X11BASE} # SunOS/Solaris #X11_PREFIX=/usr/openwin diff --git a/wm/ratpoison/Makefile b/wm/ratpoison/Makefile index 8f805477a31..4b602a20315 100644 --- a/wm/ratpoison/Makefile +++ b/wm/ratpoison/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2002/02/18 15:14:44 seb Exp $ +# $NetBSD: Makefile,v 1.7 2002/08/25 21:51:37 jlam Exp $ # DISTNAME= ratpoison-1.0.0 @@ -9,9 +9,9 @@ MAINTAINER= zuntum@netbsd.org HOMEPAGE= http://ratpoison.sourceforge.net/ COMMENT= Simple window manager with no fat library dependencies -USE_BUILDLINK_ONLY= YES -GNU_CONFIGURE= YES +USE_BUILDLINK2= YES +USE_X11= YES +GNU_CONFIGURE= YES -.include "../../mk/x11.buildlink.mk" .include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/wm2/Makefile b/wm/wm2/Makefile index 352c1e34ce8..a76fcb61883 100644 --- a/wm/wm2/Makefile +++ b/wm/wm2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/08/29 22:41:25 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2002/08/25 21:51:38 jlam Exp $ DISTNAME= wm2-4 PKGNAME= wm2-4.0 @@ -11,13 +11,12 @@ COMMENT= Minimalist window manager for X ALL_TARGET= depend wm2 -USE_BUILDLINK_ONLY= YES -USE_X11BASE= YES -MAKE_ENV+= CCC="${CXX}" +USE_BUILDLINK2= YES +USE_X11BASE= YES +MAKE_ENV+= CCC="${BUILDLINK_CXX}" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wm2 ${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/man/cat1/wm2.0 -.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/wm2/distinfo b/wm/wm2/distinfo index f0f05098e50..9df81737d28 100644 --- a/wm/wm2/distinfo +++ b/wm/wm2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/05/11 18:10:43 wiz Exp $ +$NetBSD: distinfo,v 1.5 2002/08/25 21:51:38 jlam Exp $ SHA1 (wm2-4.tar.gz) = dd959e72eedca113b372ddf67b95260e25226a91 Size (wm2-4.tar.gz) = 32807 bytes diff --git a/wm/wm2/patches/patch-ac b/wm/wm2/patches/patch-ac index 5f2f987c25d..44ebef93cb1 100644 --- a/wm/wm2/patches/patch-ac +++ b/wm/wm2/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1 2002/05/11 18:10:43 wiz Exp $ +$NetBSD: patch-ac,v 1.2 2002/08/25 21:51:38 jlam Exp $ --- General.h.orig Fri Mar 21 12:12:30 1997 +++ General.h diff --git a/wm/wmakerconf/Makefile b/wm/wmakerconf/Makefile index 5bf667e28ba..6240461e4aa 100644 --- a/wm/wmakerconf/Makefile +++ b/wm/wmakerconf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2002/03/13 17:37:49 fredb Exp $ +# $NetBSD: Makefile,v 1.12 2002/08/25 21:51:39 jlam Exp $ # DISTNAME= wmakerconf-2.8.1 @@ -11,15 +11,14 @@ MAINTAINER= wiz@netbsd.org HOMEPAGE= http://ulli.on.openave.net/wmakerconf/ COMMENT= Gtk+ based configuration tool for Window Maker -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes USE_X11BASE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV+= wraster="${GET_WRASTER_FLAGS}" -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../devel/libproplist/buildlink.mk" -.include "../../graphics/imlib/buildlink.mk" -.include "../../wm/windowmaker/buildlink.mk" -.include "../../x11/gtk/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../devel/libproplist/buildlink2.mk" +.include "../../graphics/imlib/buildlink2.mk" +.include "../../wm/windowmaker/buildlink2.mk" +.include "../../x11/gtk/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/wm/wmx/Makefile b/wm/wmx/Makefile index f0e80a34dea..159c03d2cfa 100644 --- a/wm/wmx/Makefile +++ b/wm/wmx/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.5 2001/08/29 22:41:26 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2002/08/25 21:51:40 jlam Exp $ PKGNAME= wmx-${WMX_VERS} COMMENT= another X11 window manager based on wm2 -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK2= # defined .include "../../wm/wmx/Makefile.common" -.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/wmx/Makefile.common b/wm/wmx/Makefile.common index 81b1d64374c..8d187e5dfbf 100644 --- a/wm/wmx/Makefile.common +++ b/wm/wmx/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2001/11/01 09:41:14 jlam Exp $ +# $NetBSD: Makefile.common,v 1.3 2002/08/25 21:51:40 jlam Exp $ DISTNAME= wmx-6 WMX_VERS= 6.0 @@ -25,4 +25,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/README.contrib ${PREFIX}/share/doc/wmx ${INSTALL_DATA_DIR} ${PREFIX}/etc/wmx -.include "../../graphics/xpm/buildlink.mk" +.include "../../graphics/xpm/buildlink2.mk" diff --git a/wm/wmx/PLIST b/wm/wmx/PLIST index 63f38a4547f..60c98100f02 100644 --- a/wm/wmx/PLIST +++ b/wm/wmx/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/06/26 10:30:05 seb Exp $ +@comment $NetBSD: PLIST,v 1.4 2002/08/25 21:51:40 jlam Exp $ bin/wmx share/doc/wmx/README share/doc/wmx/README.contrib diff --git a/www/Mosaic/Makefile b/www/Mosaic/Makefile index 88cd9fd1f46..267b7ef0368 100644 --- a/www/Mosaic/Makefile +++ b/www/Mosaic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2002/08/01 02:37:42 jschauma Exp $ +# $NetBSD: Makefile,v 1.36 2002/08/25 21:51:41 jlam Exp $ # FreeBSD Id: Makefile,v 1.15 1998/05/27 08:44:56 dburr Exp # @@ -17,14 +17,14 @@ LICENSE= mosaic-license NOT_FOR_PLATFORM= *-*-alpha #LP64 problems -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES USE_X11BASE= YES USE_MOTIF12= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --with-jpegdir=${BUILDLINK_DIR} -CONFIGURE_ARGS+= --with-pngdir=${BUILDLINK_DIR} -CONFIGURE_ARGS+= --with-zdir=${BUILDLINK_DIR} +CONFIGURE_ARGS+= --with-jpegdir=${BUILDLINK_PREFIX.jpeg} +CONFIGURE_ARGS+= --with-pngdir=${BUILDLINK_PREFIX.png} +CONFIGURE_ARGS+= --with-zdir=${BUILDLINK_PREFIX.zlib} CPPFLAGS+= -Dunix @@ -39,10 +39,9 @@ do-install: ${PREFIX}/lib/X11/app-defaults/Mosaic ${INSTALL_DATA_DIR} ${PREFIX}/share/mosaic -.include "../../devel/zlib/buildlink.mk" -.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 "../../devel/zlib/buildlink2.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/www/Mosaic/PLIST b/www/Mosaic/PLIST index 7b132edd133..c6dd2055419 100644 --- a/www/Mosaic/PLIST +++ b/www/Mosaic/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/06/26 10:30:05 seb Exp $ +@comment $NetBSD: PLIST,v 1.4 2002/08/25 21:51:41 jlam Exp $ bin/Mosaic bin/mosaic lib/X11/app-defaults/Mosaic diff --git a/www/amaya/Makefile b/www/amaya/Makefile index a11d5764851..7dc7d59ece4 100644 --- a/www/amaya/Makefile +++ b/www/amaya/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2002/04/23 02:08:54 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2002/08/25 21:51:42 jlam Exp $ DISTNAME= amaya-src-5.1 PKGNAME= amaya-5.1 @@ -15,7 +15,7 @@ HOMEPAGE= http://www.w3.org/Amaya/ COMMENT= Web Browser/Editor from the World Wide Web Consortium EXTRACT_ELEMENTS= Amaya -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes USE_X11BASE= yes USE_GMAKE= yes @@ -30,8 +30,8 @@ CFLAGS+= -Dunix # files in the right place. # ac_cv_path_motif= no_motif= -ac_cv_path_motif+= ac_motif_includes=${BUILDLINK_DIR}/include -ac_cv_path_motif+= ac_motif_libraries=${BUILDLINK_DIR}/lib +ac_cv_path_motif+= ac_motif_includes=${MOTIFBASE}/include +ac_cv_path_motif+= ac_motif_libraries=${MOTIFBASE}/lib post-extract: ${MKDIR} ${WRKSRC} @@ -49,9 +49,9 @@ post-patch: pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/lib/Amaya -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/png/buildlink.mk" -.include "../../www/libwww/buildlink.mk" -.include "../../mk/motif.buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../www/libwww/buildlink2.mk" +.include "../../mk/motif.buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/www/amaya/distinfo b/www/amaya/distinfo index b0ce9e11c47..0eb11a035bd 100644 --- a/www/amaya/distinfo +++ b/www/amaya/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.5 2002/07/01 02:23:16 kristerw Exp $ +$NetBSD: distinfo,v 1.6 2002/08/25 21:51:42 jlam Exp $ SHA1 (amaya-src-5.1.tgz) = fe032cce47ed3979606d43bd21e10c2d41d6e05b Size (amaya-src-5.1.tgz) = 4925073 bytes SHA1 (patch-aa) = 22dd34ab9dcd70220effb2fff690f70a5f1bbeb7 SHA1 (patch-ab) = 6f5940d24e285dcdcaf4420cf25b6bc8f750ab28 SHA1 (patch-ac) = e8740b482a7422fadadff451fb148beacd081838 -SHA1 (patch-ad) = 18a23b68f0f81d8767d17905cd762956b37e33b4 +SHA1 (patch-ad) = de880e28c117fdb64fc48e2b2d03be16c634bd8b SHA1 (patch-ae) = 5e1e356471bb26ca463e3f09f0447044d2aaac39 SHA1 (patch-af) = 9f29ef449cd5112b771e4c248a881ec4b41d7a0f diff --git a/www/amaya/patches/patch-aa b/www/amaya/patches/patch-aa index 5911b4c8c7f..270e007a1ad 100644 --- a/www/amaya/patches/patch-aa +++ b/www/amaya/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.8 2002/07/01 02:23:17 kristerw Exp $ +$NetBSD: patch-aa,v 1.9 2002/08/25 21:51:43 jlam Exp $ --- ../configure.orig Tue Jul 3 13:23:50 2001 +++ ../configure Mon Jul 1 02:48:37 2002 @@ -3049,7 +3049,7 @@ diff --git a/www/amaya/patches/patch-ad b/www/amaya/patches/patch-ad index 7f400064792..0381b191b19 100644 --- a/www/amaya/patches/patch-ad +++ b/www/amaya/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.4 2001/08/09 19:03:19 jlam Exp $ +$NetBSD: patch-ad,v 1.5 2002/08/25 21:51:43 jlam Exp $ --- ../annotlib/Makefile.in.orig Thu Apr 5 06:49:33 2001 +++ ../annotlib/Makefile.in @@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.4 2001/08/09 19:03:19 jlam Exp $ - -I@top_srcdir@/../libwww/modules/expat/xmlparse \ - -I@top_srcdir@/../libwww/modules/expat/xmltok \ + -I@top_srcdir@/amaya/f \ -+ -I${BUILDLINK_DIR}/include/w3c-libwww \ ++ -I${LOCALBASE}/include/w3c-libwww \ @THOTINCLUDES@ $(X_FLAGS) diff --git a/www/amaya/patches/patch-ae b/www/amaya/patches/patch-ae index f433c8f3dc5..2588356d406 100644 --- a/www/amaya/patches/patch-ae +++ b/www/amaya/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.5 2002/07/01 02:23:17 kristerw Exp $ +$NetBSD: patch-ae,v 1.6 2002/08/25 21:51:44 jlam Exp $ --- ../thotlib/include/ustring.h.orig Mon Jul 1 02:49:43 2002 +++ ../thotlib/include/ustring.h Mon Jul 1 02:55:09 2002 @@ -5,7 +5,11 @@ diff --git a/www/amaya/patches/patch-af b/www/amaya/patches/patch-af index b0159b8d36e..83595a3e7a0 100644 --- a/www/amaya/patches/patch-af +++ b/www/amaya/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.4 2002/07/01 02:23:17 kristerw Exp $ +$NetBSD: patch-af,v 1.5 2002/08/25 21:51:44 jlam Exp $ --- ../config.h.in.orig Mon Jul 1 02:52:16 2002 +++ ../config.h.in Mon Jul 1 02:52:51 2002 @@ -321,6 +321,9 @@ diff --git a/www/ap-DBI/Makefile b/www/ap-DBI/Makefile index beb93be1117..75a5b9ce2e7 100644 --- a/www/ap-DBI/Makefile +++ b/www/ap-DBI/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/11/26 06:50:28 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2002/08/25 21:51:44 jlam Exp $ # DISTNAME= ApacheDBI-0.87 @@ -12,11 +12,11 @@ COMMENT= perl5 Apache modules for DBI connections DEPENDS+= ap-perl-[0-9]*:../../www/ap-perl DEPENDS+= apache{,6}-1.3.*:../../www/apache -USE_BUILDLINK_ONLY= YES -PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Apache/DBI/.packlist +USE_BUILDLINK2= YES +PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Apache/DBI/.packlist do-configure: @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL -.include "../../lang/perl5/buildlink.mk" +.include "../../lang/perl5/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/ap-auth-pam/Makefile b/www/ap-auth-pam/Makefile index 8f330ae57be..4485053854a 100644 --- a/www/ap-auth-pam/Makefile +++ b/www/ap-auth-pam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/03/06 19:33:38 jlam Exp $ +# $NetBSD: Makefile,v 1.2 2002/08/25 21:51:45 jlam Exp $ DISTNAME= mod_auth_pam-1.0a PKGNAME= ap-auth-pam-1.0a @@ -9,9 +9,8 @@ MAINTAINER= jlam@netbsd.org HOMEPAGE= http://pam.sourceforge.net/mod_auth_pam/ COMMENT= module to allow Apache authentication using PAM -DEPENDS+= ${BUILDLINK_DEPENDS.apache}:../../www/apache - -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES +APACHE_MODULE= YES LIBS+= -lpam EGDIR= ${PREFIX}/share/examples/mod_auth_pam @@ -27,6 +26,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/doc/configure.html ${HTMLDIR} ${INSTALL_DATA} ${WRKSRC}/doc/faq.html ${HTMLDIR} -.include "../../security/PAM/buildlink.mk" -.include "../../www/apache/buildlink.mk" +.include "../../security/PAM/buildlink2.mk" +.include "../../www/apache/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/ap-dav/Makefile b/www/ap-dav/Makefile index 35b82e9004a..233df7d6b1f 100644 --- a/www/ap-dav/Makefile +++ b/www/ap-dav/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2002/08/13 22:19:48 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2002/08/25 21:51:45 jlam Exp $ DISTNAME= mod_dav-1.0.3-1.3.6 PKGNAME= ap-dav-1.0.3 @@ -12,11 +12,10 @@ COMMENT= Apache WebDAV module # Ugly mess that says apache>=1.3.9 and apache<2.0. BUILDLINK_DEPENDS.apache= {apache-1.3.9*,apache-1.3.[1-9][0-9]*,apache6-1.3.9*,apache6-1.3.[1-9][0-9]*} -DEPENDS+= ${BUILDLINK_DEPENDS.apache}:../../www/apache - -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES +APACHE_MODULE= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --with-expat=${BUILDLINK_DIR} +CONFIGURE_ARGS+= --with-expat=${BUILDLINK_PREFIX.expat} AP_MODULE_DIR= ${PREFIX}/lib/httpd DOCDIR= ${PREFIX}/share/doc/mod_dav @@ -29,6 +28,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR} ${INSTALL_DATA} ${WRKSRC}/LICENSE.html ${HTMLDIR} -.include "../../textproc/expat/buildlink.mk" -.include "../../www/apache/buildlink.mk" +.include "../../textproc/expat/buildlink2.mk" +.include "../../www/apache/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/www/ap-dav/distinfo b/www/ap-dav/distinfo index 54a943b8033..9e28a4502a9 100644 --- a/www/ap-dav/distinfo +++ b/www/ap-dav/distinfo @@ -1,7 +1,5 @@ -$NetBSD: distinfo,v 1.3 2002/03/06 15:35:04 jlam Exp $ +$NetBSD: distinfo,v 1.4 2002/08/25 21:51:46 jlam Exp $ SHA1 (mod_dav-1.0.3-1.3.6.tar.gz) = cf1baa75c14131f96299be3fdf26d1fa91e6c7e3 Size (mod_dav-1.0.3-1.3.6.tar.gz) = 185284 bytes -SHA1 (patch-aa) = 1c5cf37e8b8f750bb4b02bf0bce2e3a3ce5033a2 -SHA1 (patch-ab) = 9da9919f52e309135637977c4ea200b8273d47b1 SHA1 (patch-ad) = 5c08ec68748b6fabb5cb5361ef04fb760cd76008 diff --git a/www/ap-dav/patches/patch-aa b/www/ap-dav/patches/patch-aa deleted file mode 100644 index 214a4bd1c2f..00000000000 --- a/www/ap-dav/patches/patch-aa +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2002/03/06 15:35:05 jlam Exp $ - ---- configure.in.orig Sat Nov 3 09:48:13 2001 -+++ configure.in -@@ -24,15 +24,6 @@ - CPPFLAGS="$CPPFLAGS -traditional-cpp" - fi - --# --# Check for /usr/pkg/{lib,include} which is where NetBSD puts binary --# and source packages. This should be harmless on other OSs. --# --if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then -- CFLAGS="$CFLAGS -I/usr/pkg/include" -- LDFLAGS="$LDFLAGS -L/usr/pkg/lib" --fi -- - AC_HEADER_STDC - - AC_MSG_CHECKING(for static Apache module support) diff --git a/www/ap-dav/patches/patch-ab b/www/ap-dav/patches/patch-ab deleted file mode 100644 index a356182000e..00000000000 --- a/www/ap-dav/patches/patch-ab +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2002/03/06 15:35:06 jlam Exp $ - ---- configure.orig Mon Nov 5 00:04:50 2001 -+++ configure -@@ -1720,15 +1720,6 @@ - CPPFLAGS="$CPPFLAGS -traditional-cpp" - fi - --# --# Check for /usr/pkg/{lib,include} which is where NetBSD puts binary --# and source packages. This should be harmless on other OSs. --# --if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then -- CFLAGS="$CFLAGS -I/usr/pkg/include" -- LDFLAGS="$LDFLAGS -L/usr/pkg/lib" --fi -- - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' diff --git a/www/ap-perl/Makefile b/www/ap-perl/Makefile index 8e924177f8d..2df99c2f086 100644 --- a/www/ap-perl/Makefile +++ b/www/ap-perl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2002/07/26 08:57:14 grant Exp $ +# $NetBSD: Makefile,v 1.23 2002/08/25 21:51:49 jlam Exp $ # DISTNAME= mod_perl-1.25 @@ -16,13 +16,11 @@ DEPENDS+= ${BUILDLINK_DEPENDS.apache}:../../www/apache DEPENDS+= {libperl>=${LIBPERL5_REQD},perl>=5.8.0}:../../lang/libperl DEPENDS+= p5-BSD-Resource>=1.10:../../devel/p5-BSD-Resource -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES +APACHE_MODULE= YES LIBPERL5_REQD= ${PERL5_REQD} PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/mod_perl/.packlist -REPLACE_BUILDLINK= blib/lib/Apache/MyConfig.pm -REPLACE_BUILDLINK_SED= -e "s|${APXS}|${PREFIX}/sbin/apxs|g" - MAKE_PARAMS+= USE_APXS=1 MAKE_PARAMS+= WITH_APXS=${APXS} MAKE_PARAMS+= EVERYTHING=1 @@ -35,10 +33,14 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/htdocs/manual/mod/mod_perl.html \ ${PREFIX}/share/httpd/htdocs/manual/mod -.include "../../lang/perl5/buildlink.mk" -.include "../../www/apache/buildlink.mk" +.include "../../lang/perl5/buildlink2.mk" +.include "../../www/apache/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" .if exists(${PERL5_ARCHLIB}/DynaLoader_pic.o) -MAKE_ENV+= DYNALOADER_OBJ_PIC="${PERL5_ARCHLIB}/DynaLoader_pic.o" +DYNALOADER_OBJ_PIC= ${PERL5_ARCHLIB}/DynaLoader_pic.o +.elif ${OPSYS} == "NetBSD" +DYNALOADER_OBJ_PIC= ${PERL5_ARCHLIB}/auto/DynaLoader/DynaLoader.a .endif +MAKE_ENV+= DYNALOADER_OBJ_PIC="${DYNALOADER_OBJ_PIC}" diff --git a/www/ap-perl/distinfo b/www/ap-perl/distinfo index efd5f4ad331..e556646eafa 100644 --- a/www/ap-perl/distinfo +++ b/www/ap-perl/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.6 2002/07/26 08:57:15 grant Exp $ +$NetBSD: distinfo,v 1.7 2002/08/25 21:51:50 jlam Exp $ SHA1 (mod_perl-1.25.tar.gz) = a3ad57bbf1143cdda4b80754ce8f34913f5df053 Size (mod_perl-1.25.tar.gz) = 366834 bytes -SHA1 (patch-aa) = c19469efd351e3a545feb79a6d3af4f734b27449 +SHA1 (patch-aa) = 22e439087a30b042e8a79e646b57f61040c47f36 SHA1 (patch-ab) = 18b02747ae4b9ab17ce252cf003bf9fd7e4b2560 diff --git a/www/ap-perl/patches/patch-aa b/www/ap-perl/patches/patch-aa index e6cde71440a..f6c76bdbc2d 100644 --- a/www/ap-perl/patches/patch-aa +++ b/www/ap-perl/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.5 2001/10/01 08:36:44 jlam Exp $ +$NetBSD: patch-aa,v 1.6 2002/08/25 21:51:50 jlam Exp $ --- apaci/Makefile.tmpl.orig Tue Nov 24 11:38:52 1998 +++ apaci/Makefile.tmpl Fri Apr 30 20:36:05 1999 @@ -11,15 +11,6 @@ $NetBSD: patch-aa,v 1.5 2001/10/01 08:36:44 jlam Exp $ all: lib -@@ -58,7 +58,7 @@ - - libperl.so: $(MP_OBJS_PIC) - $(MP_RM) $@ -- $(MP_LD) $(MP_LDFLAGS_SHLIB) -o $@ $(MP_OBJS_PIC) $(MP_LIBS) -+ ld $(MP_LDFLAGS_SHLIB:S/-Wl,//g) -o $@ $(MP_OBJS_PIC) $(MP_LIBS:S/-Wl,//g:N*.a) - - .SUFFIXES: .xs .c .o .lo - @@ -94,7 +94,8 @@ # FOR STAND-ALONE BUILDING ONLY diff --git a/www/ap-php4/Makefile b/www/ap-php4/Makefile index 4bc8add773c..f91c1e84c32 100644 --- a/www/ap-php4/Makefile +++ b/www/ap-php4/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.21 2002/02/28 18:32:19 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2002/08/25 21:51:51 jlam Exp $ PKGNAME= ap-php-${PHP_BASE_VERS} PKGREVISION= # empty COMMENT= Apache module for PHP4 DEPENDS+= php>=${PHP_BASE_VERS}:../../www/php4 -DEPENDS+= ${BUILDLINK_DEPENDS.apache}:../../www/apache -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES +APACHE_MODULE= YES .include "../../www/php4/Makefile.php" @@ -20,5 +20,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/.libs/libphp4.so \ ${PREFIX}/lib/httpd/mod_php4.so -.include "../../www/apache/buildlink.mk" +.include "../../www/apache/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile index c450b9623b6..72c58bd7a06 100644 --- a/www/ap-ssl/Makefile +++ b/www/ap-ssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2002/08/01 01:03:17 mycroft Exp $ +# $NetBSD: Makefile,v 1.59 2002/08/25 21:51:52 jlam Exp $ DISTNAME= mod_ssl-2.8.10-1.3.26 PKGNAME= ap-ssl-2.8.10 @@ -14,13 +14,19 @@ COMMENT= SSL/TLS protocols module for Apache CONFLICTS= apache-1.3.[0-9] apache-*modssl-[0-9]* apache6-[0-9]* -DEPENDS+= apache-1.3.26nb4:../../www/apache +BUILDLINK_DEPENDS.apache= apache-1.3.26nb4 -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES +APACHE_MODULE= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_DIR} +CONFIGURE_ARGS+= --with-ssl=${SSLBASE} + +.include "../../mk/bsd.prefs.mk" + +.if ${_USE_RPATH} == "yes" MAKE_ENV+= SSL_RPATH_LDFLAGS="-R${SSLBASE}/lib" +.endif PKG_SYSCONFSUBDIR?= httpd @@ -93,7 +99,8 @@ post-install: cd ${WRKSRC}/pkg.sslcfg; ${INSTALL_DATA} README.PRM *.prm \ ${EGDIR}/ssl.prm -.include "../../security/openssl/buildlink.mk" -.include "../../www/apache/buildlink.mk" +.include "../../security/openssl/buildlink2.mk" +.include "../../www/apache/buildlink2.mk" + .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/ap-ssl/distinfo b/www/ap-ssl/distinfo index d74201615a6..fc6dc7e21cf 100644 --- a/www/ap-ssl/distinfo +++ b/www/ap-ssl/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2002/06/24 16:26:50 taca Exp $ +$NetBSD: distinfo,v 1.13 2002/08/25 21:51:52 jlam Exp $ SHA1 (mod_ssl-2.8.10-1.3.26.tar.gz) = 6af4bbd91f2323c95f8d3ca1c461edc17fc1d13e Size (mod_ssl-2.8.10-1.3.26.tar.gz) = 753241 bytes diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 48174c447a3..90916d9a928 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2002/07/30 18:40:15 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2002/08/25 21:51:53 jlam Exp $ DISTNAME= httpd-${APACHE_VERSION} PKGNAME= apache-${APACHE_VERSION} @@ -19,10 +19,7 @@ CONFLICTS+= ap-*-[0-9]* # Apache-1.x DSOs BUILD_DEFS+= USE_INET6 -USE_BUILDLINK_ONLY= YES -REPLACE_BUILDLINK= config_vars.mk -REPLACE_BUILDLINK_SED= -e "s|${BUILDLINK_DIR}|${LOCALBASE}|g" - +USE_BUILDLINK2= YES USE_GMAKE= YES USE_LIBTOOL= YES @@ -39,7 +36,7 @@ CONFIGURE_ARGS+= --with-mpm=prefork --with-devrandom=/dev/urandom # Apache Portable Runtime Utility library configure options CONFIGURE_ARGS+= --with-dbm=sdbm -CONFIGURE_ARGS+= --with-expat=${BUILDLINK_DIR} +CONFIGURE_ARGS+= --with-expat=${BUILDLINK_PREFIX.expat} .include "../../mk/bsd.prefs.mk" @@ -94,15 +91,15 @@ OWN_DIRS_PERMS+= /var/db/httpd/proxy ${APACHE_USER} ${APACHE_GROUP} 0755 # Add dependencies for the modules that will be built. For each module # ap_mod listed in ${APACHE_MODULES}, _AP_DEPENDS.ap_mod is a whitespace -# separated list of dependencies or buildlink.mk files needed to build +# separated list of dependencies or buildlink2.mk files needed to build # ap_mod, and _AP_CFG_ARGS.ap_mod is a whitespace separated list of # configure script options for ap_mod. # -_AP_DEPENDS.ssl= ../../security/openssl/buildlink.mk -_AP_DEPENDS.deflate= ../../devel/zlib/buildlink.mk +_AP_DEPENDS.ssl= ../../security/openssl/buildlink2.mk +_AP_DEPENDS.deflate= ../../devel/zlib/buildlink2.mk -_AP_CFG_ARGS.ssl= --with-ssl=${BUILDLINK_DIR} -_AP_CFG_ARGS.deflate= --with-z=${BUILDLINK_DIR} +_AP_CFG_ARGS.ssl= --with-ssl=${BUILDLINK_PREFIX.openssl} +_AP_CFG_ARGS.deflate= --with-z=${BUILDLINK_PREFIX.zlib} .for _ap_mod in ${APACHE_MODULES} . if defined(_AP_DEPENDS.${_ap_mod}) && !empty(_AP_DEPENDS.${_ap_mod}) @@ -158,7 +155,8 @@ post-install: done ${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache -.include "../../lang/perl5/buildlink.mk" -.include "../../textproc/expat/buildlink.mk" +.include "../../lang/perl5/buildlink2.mk" +.include "../../textproc/expat/buildlink2.mk" + .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/apache2/PLIST b/www/apache2/PLIST index a703fc38546..10492b1dc88 100644 --- a/www/apache2/PLIST +++ b/www/apache2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2002/06/18 23:58:07 itojun Exp $ +@comment $NetBSD: PLIST,v 1.6 2002/08/25 21:51:53 jlam Exp $ bin/apr-config bin/apu-config etc/rc.d/apache diff --git a/www/apache2/distinfo b/www/apache2/distinfo index eb04878cd1d..275fd049f14 100644 --- a/www/apache2/distinfo +++ b/www/apache2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2002/06/18 23:58:07 itojun Exp $ +$NetBSD: distinfo,v 1.9 2002/08/25 21:51:54 jlam Exp $ SHA1 (httpd-2.0.39.tar.gz) = 3f04dbffc081a34dbfc9aeab6738f320285db292 Size (httpd-2.0.39.tar.gz) = 4413542 bytes diff --git a/www/apache2/files/apache.sh b/www/apache2/files/apache.sh index d0e23dfd460..22e29461d57 100644 --- a/www/apache2/files/apache.sh +++ b/www/apache2/files/apache.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: apache.sh,v 1.4 2002/07/07 00:45:19 tv Exp $ +# $NetBSD: apache.sh,v 1.5 2002/08/25 21:51:55 jlam Exp $ # # PROVIDE: apache # REQUIRE: DAEMON diff --git a/www/apache2/patches/patch-aa b/www/apache2/patches/patch-aa index afb9d0159c6..f6dd727f42a 100644 --- a/www/apache2/patches/patch-aa +++ b/www/apache2/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.5 2002/06/18 23:58:07 itojun Exp $ +$NetBSD: patch-aa,v 1.6 2002/08/25 21:51:55 jlam Exp $ --- Makefile.in.orig Sat Jun 15 18:41:03 2002 +++ Makefile.in Wed Jun 19 07:39:04 2002 diff --git a/www/apache2/patches/patch-ad b/www/apache2/patches/patch-ad index 46c70bbfd95..19e255f87cb 100644 --- a/www/apache2/patches/patch-ad +++ b/www/apache2/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.4 2002/06/18 23:58:07 itojun Exp $ +$NetBSD: patch-ad,v 1.5 2002/08/25 21:51:56 jlam Exp $ --- config.layout.orig Fri May 17 23:49:30 2002 +++ config.layout Wed Jun 19 07:39:33 2002 diff --git a/www/apache2/patches/patch-ag b/www/apache2/patches/patch-ag index 1daea42bd56..17311fc94cf 100644 --- a/www/apache2/patches/patch-ag +++ b/www/apache2/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.5 2002/06/18 23:58:07 itojun Exp $ +$NetBSD: patch-ag,v 1.6 2002/08/25 21:51:56 jlam Exp $ --- support/Makefile.in.orig Sat Jun 15 13:41:52 2002 +++ support/Makefile.in Wed Jun 19 07:39:51 2002 diff --git a/www/apache2/patches/patch-ah b/www/apache2/patches/patch-ah index 213e51de12c..7bd670cd6e4 100644 --- a/www/apache2/patches/patch-ah +++ b/www/apache2/patches/patch-ah @@ -1,4 +1,4 @@ -$NetBSD: patch-ah,v 1.5 2002/06/18 23:58:07 itojun Exp $ +$NetBSD: patch-ah,v 1.6 2002/08/25 21:51:57 jlam Exp $ --- support/apachectl.in.orig Mon May 27 20:46:01 2002 +++ support/apachectl.in Wed Jun 19 07:40:07 2002 diff --git a/www/apache2/patches/patch-ak b/www/apache2/patches/patch-ak index b41d3aba122..f38289721b6 100644 --- a/www/apache2/patches/patch-ak +++ b/www/apache2/patches/patch-ak @@ -1,4 +1,4 @@ -$NetBSD: patch-ak,v 1.2 2002/06/01 13:18:02 itojun Exp $ +$NetBSD: patch-ak,v 1.3 2002/08/25 21:51:57 jlam Exp $ --- docs/conf/httpd-std.conf.in.orig Wed Apr 24 16:24:35 2002 +++ docs/conf/httpd-std.conf.in diff --git a/www/apache2/patches/patch-an b/www/apache2/patches/patch-an index a3556ccde6f..560177b1d27 100644 --- a/www/apache2/patches/patch-an +++ b/www/apache2/patches/patch-an @@ -1,4 +1,4 @@ -$NetBSD: patch-an,v 1.2 2002/06/18 23:58:07 itojun Exp $ +$NetBSD: patch-an,v 1.3 2002/08/25 21:51:57 jlam Exp $ --with-randomdev=foo does not work. diff --git a/www/apache2/patches/patch-ao b/www/apache2/patches/patch-ao index 1968e2f8621..51a179fba15 100644 --- a/www/apache2/patches/patch-ao +++ b/www/apache2/patches/patch-ao @@ -1,4 +1,4 @@ -$NetBSD: patch-ao,v 1.2 2002/06/18 23:58:08 itojun Exp $ +$NetBSD: patch-ao,v 1.3 2002/08/25 21:51:57 jlam Exp $ --with-randomdev=foo does not work. diff --git a/www/apache6/Makefile b/www/apache6/Makefile index 22d4ec13618..40687be9ab9 100644 --- a/www/apache6/Makefile +++ b/www/apache6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2002/08/01 00:58:33 mycroft Exp $ +# $NetBSD: Makefile,v 1.56 2002/08/25 21:51:58 jlam Exp $ # # This package does not compile in mod_ssl support hooks, as it conflicts # with IPv6-enable patch. @@ -30,7 +30,7 @@ COMMENT= Apache HTTP (Web) server with IPv6 support CONFLICTS= apache-[0-9]* apache-*ssl-[0-9]* apache6-[0-9]* EXTRACT_ONLY= ${DISTFILES:N*.gif:N*.diff.gz} -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES HAS_CONFIGURE= YES CONFIGURE_ARGS+= --with-layout="${WRKDIR}/config.layout:pkgsrc" CONFIGURE_ARGS+= --enable-module=most \ @@ -110,10 +110,10 @@ MAKE_ENV+= LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}" .if (${OPSYS} == "SunOS") LDFLAGS+= -Wl,-R/usr/ucblib -L/usr/ucblib -CONFIGURE_ENV+= INCLUDES="-I${BUILDLINK_DIR}/include/db2" +CONFIGURE_ENV+= INCLUDES="-I${BUILDLINK_PREFIX.db}/include/db2" CONFIGURE_ENV+= LIBS="-ldbm -ldb2" BUILDLINK_DEPENDS.db= db>=2.7.7 -.include "../../databases/db/buildlink.mk" +.include "../../databases/db/buildlink2.mk" .endif BUILD_DEFS+= APACHE_CUSTOM_CFLAGS @@ -166,6 +166,7 @@ post-install: ${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/httpd/htdocs ${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache -.include "../../textproc/expat/buildlink.mk" +.include "../../textproc/expat/buildlink2.mk" + .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/apache6/PLIST b/www/apache6/PLIST index 8dc35c896d9..117a2a3a31b 100644 --- a/www/apache6/PLIST +++ b/www/apache6/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/07/30 18:40:15 wiz Exp $ +@comment $NetBSD: PLIST,v 1.4 2002/08/25 21:51:58 jlam Exp $ bin/checkgid bin/dbmmanage bin/htdigest diff --git a/www/apache6/distinfo b/www/apache6/distinfo index cbc6354bf8e..13a09c62da5 100644 --- a/www/apache6/distinfo +++ b/www/apache6/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2002/06/20 07:24:18 itojun Exp $ +$NetBSD: distinfo,v 1.13 2002/08/25 21:51:59 jlam Exp $ SHA1 (apache_1.3.26.tar.gz) = c8ab59541267c3e570592115b280e6cb2fb2b30f Size (apache_1.3.26.tar.gz) = 2303147 bytes diff --git a/www/apache6/files/apache.sh b/www/apache6/files/apache.sh index ecd1538c740..3d98771f53d 100644 --- a/www/apache6/files/apache.sh +++ b/www/apache6/files/apache.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: apache.sh,v 1.14 2002/07/07 00:45:19 tv Exp $ +# $NetBSD: apache.sh,v 1.15 2002/08/25 21:51:59 jlam Exp $ # # PROVIDE: apache # REQUIRE: DAEMON diff --git a/www/apache6/files/config.layout b/www/apache6/files/config.layout index 7f6ab362761..a425fdf3a53 100644 --- a/www/apache6/files/config.layout +++ b/www/apache6/files/config.layout @@ -1,4 +1,4 @@ -# $NetBSD: config.layout,v 1.4 2002/07/30 18:40:15 wiz Exp $ +# $NetBSD: config.layout,v 1.5 2002/08/25 21:52:00 jlam Exp $ <Layout pkgsrc> prefix: @PREFIX@ diff --git a/www/bozohttpd/Makefile b/www/bozohttpd/Makefile index 8977736d919..97fed7fd952 100644 --- a/www/bozohttpd/Makefile +++ b/www/bozohttpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2002/08/23 08:37:24 mrg Exp $ +# $NetBSD: Makefile,v 1.23 2002/08/25 21:52:00 jlam Exp $ # DISTNAME= bozohttpd-5.14 @@ -12,7 +12,7 @@ COMMENT= bozotic HTTP server; small and secure BUILD_DEFS+= USE_INET6 -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES MAKE_ENV+= BINDIR=${PREFIX}/libexec MANDIR=${PREFIX}/man @@ -23,10 +23,10 @@ CPPFLAGS+= -DINET6 .endif pre-patch: - ${MV} ${WRKSRC}/bozohttpd.8 ${WRKSRC}/bozohttpd.8.in + ${MV} -f ${WRKSRC}/bozohttpd.8 ${WRKSRC}/bozohttpd.8.in post-patch: - ${SED} -e "s,@PREFIX@,${PREFIX},g" <${WRKSRC}/bozohttpd.8.in \ - >${WRKSRC}/bozohttpd.8 + ${SED} -e "s,@PREFIX@,${PREFIX},g" \ + ${WRKSRC}/bozohttpd.8.in > ${WRKSRC}/bozohttpd.8 .include "../../mk/bsd.pkg.mk" diff --git a/www/bozohttpd/distinfo b/www/bozohttpd/distinfo index 3e976b522e3..08e029babf5 100644 --- a/www/bozohttpd/distinfo +++ b/www/bozohttpd/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.16 2002/08/23 08:37:24 mrg Exp $ +$NetBSD: distinfo,v 1.17 2002/08/25 21:52:00 jlam Exp $ SHA1 (bozohttpd-5.14.tar.bz2) = ce4eeb87b8005b4eac5d52c8647c0ed3cae9f56e Size (bozohttpd-5.14.tar.bz2) = 21666 bytes diff --git a/www/bozohttpd/patches/patch-ab b/www/bozohttpd/patches/patch-ab index 0ada442a2d8..ce776824eed 100644 --- a/www/bozohttpd/patches/patch-ab +++ b/www/bozohttpd/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.11 2002/08/23 08:37:25 mrg Exp $ +$NetBSD: patch-ab,v 1.12 2002/08/25 21:52:01 jlam Exp $ --- bozohttpd.8.in.orig Fri Aug 23 15:43:44 2002 +++ bozohttpd.8.in Fri Aug 23 15:48:04 2002 diff --git a/www/cadaver/Makefile b/www/cadaver/Makefile index 2b2f9cb18da..a76a6d023ba 100644 --- a/www/cadaver/Makefile +++ b/www/cadaver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2002/02/28 18:23:57 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2002/08/25 21:52:02 jlam Exp $ DISTNAME= cadaver-0.19.1 CATEGORIES= www @@ -9,14 +9,14 @@ HOMEPAGE= http://www.webdav.org/cadaver/ COMMENT= command-line WebDAV client USE_GMAKE= YES -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES ALL_TARGET= cadaver GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-netrc CONFIGURE_ARGS+= --with-included-neon CONFIGURE_ARGS+= --with-libxml1 -CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_DIR} +CONFIGURE_ARGS+= --with-ssl=${SSLBASE} # We don't need curses, just termcap. CONFIGURE_ENV+= ac_cv_lib_curses_tputs=no @@ -35,7 +35,8 @@ pre-build: post-install: ${INSTALL_DATA} ${WRKSRC}/doc/cadaver.1 ${PREFIX}/man/man1 -.include "../../devel/readline/buildlink.mk" -.include "../../security/openssl/buildlink.mk" -.include "../../textproc/libxml/buildlink.mk" +.include "../../devel/readline/buildlink2.mk" +.include "../../security/openssl/buildlink2.mk" +.include "../../textproc/libxml/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/www/communicator/MESSAGE b/www/communicator/MESSAGE index cf0207e201c..3afe517e97b 100644 --- a/www/communicator/MESSAGE +++ b/www/communicator/MESSAGE @@ -1,5 +1,5 @@ ============================================================================== -$NetBSD: MESSAGE,v 1.2 2002/06/30 19:07:18 dmcmahill Exp $ +$NetBSD: MESSAGE,v 1.3 2002/08/25 21:52:02 jlam Exp $ alpha: The Digital UNIX version of Netscape requires COMPAT_OSF1 in your kernel, plus /emul/osf1 libraries. diff --git a/www/communicator/Makefile b/www/communicator/Makefile index e13f855a82e..d8814e5f1c3 100644 --- a/www/communicator/Makefile +++ b/www/communicator/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2002/04/05 09:33:22 tron Exp $ +# $NetBSD: Makefile,v 1.31 2002/08/25 21:52:03 jlam Exp $ # COMMENT= Netscape communicator - Digital UNIX/Linux/SunOS binary @@ -6,4 +6,6 @@ COMMENT= Netscape communicator - Digital UNIX/Linux/SunOS binary BINNAME= communicator DIST_SDIR_NAME= complete_install +USE_BUILDLINK2= # defined + .include "../navigator/Makefile.common" diff --git a/www/communicator/PLIST.post b/www/communicator/PLIST.post index b9478e12b26..5e4e9a9b158 100644 --- a/www/communicator/PLIST.post +++ b/www/communicator/PLIST.post @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.post,v 1.3 2002/06/26 10:30:06 seb Exp $ +@comment $NetBSD: PLIST.post,v 1.4 2002/08/25 21:52:03 jlam Exp $ @dirrm lib/netscape/${BINNAME}-${NS_VERS}/spell @dirrm lib/netscape/${BINNAME}-${NS_VERS}/plugins @dirrm lib/netscape/${BINNAME}-${NS_VERS}/nethelp/netscape/trouble diff --git a/www/curl/Makefile b/www/curl/Makefile index 376f2eb0acd..f30303e08e1 100644 --- a/www/curl/Makefile +++ b/www/curl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2002/06/10 01:32:37 shell Exp $ +# $NetBSD: Makefile,v 1.20 2002/08/25 21:52:03 jlam Exp $ DISTNAME= curl-7.9.7 CATEGORIES= www @@ -13,16 +13,11 @@ COMMENT= client that groks URLs # list it into IPv6-ready packages BUILD_DEFS+= USE_INET6 -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes GNU_CONFIGURE= yes USE_LIBTOOL= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool -CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_DIR} - -# This causes curl-config not to be regenerated during build-time as it was -# already created at configure-time. -# -AUTOMAKE_POST_PATTERNS+= curl-config +CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_PREFIX.openssl} post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/curl @@ -37,5 +32,5 @@ post-install: ${SED} '/php/d' ${WRKSRC}/docs/examples/README > \ ${PREFIX}/share/examples/curl/README -.include "../../security/openssl/buildlink.mk" +.include "../../security/openssl/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/curl/PLIST b/www/curl/PLIST index 175674531c8..3e74f5890ee 100644 --- a/www/curl/PLIST +++ b/www/curl/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2002/06/10 01:32:38 shell Exp $ +@comment $NetBSD: PLIST,v 1.5 2002/08/25 21:52:04 jlam Exp $ bin/curl bin/curl-config include/curl/curl.h diff --git a/www/curl/distinfo b/www/curl/distinfo index 049bc876f18..ad74ff8fc63 100644 --- a/www/curl/distinfo +++ b/www/curl/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2002/07/19 04:25:17 mycroft Exp $ +$NetBSD: distinfo,v 1.15 2002/08/25 21:52:04 jlam Exp $ SHA1 (curl-7.9.7.tar.gz) = 6fcb23be788984bcfca7debe5f307ec65fb56101 Size (curl-7.9.7.tar.gz) = 717489 bytes diff --git a/www/curl/patches/patch-aa b/www/curl/patches/patch-aa index c49ccc5dd46..70f422a7538 100644 --- a/www/curl/patches/patch-aa +++ b/www/curl/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.5 2002/06/11 12:35:14 agc Exp $ +$NetBSD: patch-aa,v 1.6 2002/08/25 21:52:05 jlam Exp $ --- src/writeout.c 2002/06/11 12:31:17 1.1 +++ src/writeout.c 2002/06/11 12:31:35 diff --git a/www/curl/patches/patch-ab b/www/curl/patches/patch-ab index 73debccae81..00ec637fcad 100644 --- a/www/curl/patches/patch-ab +++ b/www/curl/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.2 2002/07/19 04:25:18 mycroft Exp $ +$NetBSD: patch-ab,v 1.3 2002/08/25 21:52:05 jlam Exp $ --- lib/ftp.c.orig Mon Apr 29 11:57:25 2002 +++ lib/ftp.c Fri Jul 19 04:22:35 2002 diff --git a/www/cvsweb/Makefile b/www/cvsweb/Makefile index 682b213e63f..38bdaf653be 100644 --- a/www/cvsweb/Makefile +++ b/www/cvsweb/Makefile @@ -1,5 +1,5 @@ # -# $NetBSD: Makefile,v 1.13 2002/08/06 00:01:53 lukem Exp $ +# $NetBSD: Makefile,v 1.14 2002/08/25 21:52:06 jlam Exp $ # DISTNAME= cvsweb-2.0.5 @@ -10,7 +10,7 @@ MAINTAINER= lukem@netbsd.org HOMEPAGE= http://www.freebsd.org/projects/cvsweb.html COMMENT= Web interface for browsing a CVS repository -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES PKG_SYSCONFSUBDIR?= httpd EGDIR= ${PREFIX}/share/examples/${PKGBASE} @@ -56,6 +56,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCDIR}/${f} .endfor -.include "../../lang/perl5/buildlink.mk" +.include "../../lang/perl5/buildlink2.mk" + .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/cvsweb/PLIST b/www/cvsweb/PLIST index 137772fd506..aa3ef16dba1 100644 --- a/www/cvsweb/PLIST +++ b/www/cvsweb/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/06/27 03:22:23 lukem Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/08/25 21:52:06 jlam Exp $ libexec/cgi-bin/cvsweb.cgi share/doc/cvsweb/ChangeLog share/doc/cvsweb/INSTALL diff --git a/www/cvsweb/distinfo b/www/cvsweb/distinfo index 1b52921be46..0312a61a64b 100644 --- a/www/cvsweb/distinfo +++ b/www/cvsweb/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2002/07/24 11:38:47 martti Exp $ +$NetBSD: distinfo,v 1.8 2002/08/25 21:52:06 jlam Exp $ SHA1 (cvsweb-2.0.5.tar.gz) = 6fb2049eb8f9a79788b9f84523399d761dbc6205 Size (cvsweb-2.0.5.tar.gz) = 51948 bytes diff --git a/www/cvsweb/patches/patch-aa b/www/cvsweb/patches/patch-aa index adc4bc8a931..047560575bc 100644 --- a/www/cvsweb/patches/patch-aa +++ b/www/cvsweb/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.5 2002/07/24 11:38:47 martti Exp $ +$NetBSD: patch-aa,v 1.6 2002/08/25 21:52:07 jlam Exp $ --- cvsweb.cgi.orig Tue Jul 23 15:58:32 2002 +++ cvsweb.cgi Wed Jul 24 11:01:53 2002 diff --git a/www/cvsweb/patches/patch-ab b/www/cvsweb/patches/patch-ab index 887883c3ccd..fb5ad4dce57 100644 --- a/www/cvsweb/patches/patch-ab +++ b/www/cvsweb/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.3 2002/07/24 11:38:47 martti Exp $ +$NetBSD: patch-ab,v 1.4 2002/08/25 21:52:07 jlam Exp $ --- cvsweb.conf.orig Wed Jul 10 17:30:56 2002 +++ cvsweb.conf Wed Jul 24 11:02:29 2002 diff --git a/www/dillo/Makefile b/www/dillo/Makefile index c3928dc51c2..1e0e5568931 100644 --- a/www/dillo/Makefile +++ b/www/dillo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2002/06/27 20:15:04 agc Exp $ +# $NetBSD: Makefile,v 1.9 2002/08/25 21:52:08 jlam Exp $ # DISTNAME= dillo-0.6.6 @@ -9,16 +9,17 @@ MAINTAINER= Benjamin.Wong@cc.gatech.edu HOMEPAGE= http://dillo.cipsga.org.br/ COMMENT= Very small and fast graphical web-browser -USE_BUILDLINK_ONLY= yes -USE_GMAKE= yes -GNU_CONFIGURE= yes +USE_BUILDLINK2= yes +USE_X11= yes +USE_GMAKE= yes +GNU_CONFIGURE= yes post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dillo ${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/dillo -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/png/buildlink.mk" -.include "../../x11/gtk/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../x11/gtk/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/www/dillo/distinfo b/www/dillo/distinfo index 0ce76f0ab5a..8b7072b2fc0 100644 --- a/www/dillo/distinfo +++ b/www/dillo/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2002/06/27 20:15:05 agc Exp $ +$NetBSD: distinfo,v 1.10 2002/08/25 21:52:08 jlam Exp $ SHA1 (dillo-0.6.6.tar.gz) = 6ff27fe122f53f2e554a5377b67258d2df7ec381 Size (dillo-0.6.6.tar.gz) = 310331 bytes diff --git a/www/dillo/patches/patch-ab b/www/dillo/patches/patch-ab index af04a4fb0df..8c92ab926e2 100644 --- a/www/dillo/patches/patch-ab +++ b/www/dillo/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.4 2002/05/21 11:13:31 wiz Exp $ +$NetBSD: patch-ab,v 1.5 2002/08/25 21:52:09 jlam Exp $ --- Makefile.in.orig Tue May 21 12:53:53 2002 +++ Makefile.in diff --git a/www/elinks/Makefile b/www/elinks/Makefile index e677806d308..c2acb21b29d 100644 --- a/www/elinks/Makefile +++ b/www/elinks/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/06/30 04:02:54 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2002/08/25 21:52:09 jlam Exp $ # DISTNAME= elinks-0.3.0 @@ -13,7 +13,7 @@ COMMENT= Extended/Enhanced Links (elinks) CONFLICTS= links-[0-9]* links-gui-[0-9]* GNU_CONFIGURE= YES -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES -.include "../../security/openssl/buildlink.mk" +.include "../../security/openssl/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/elinks/PLIST b/www/elinks/PLIST index f873c74ea0c..86193dffab0 100644 --- a/www/elinks/PLIST +++ b/www/elinks/PLIST @@ -1,3 +1,3 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/17 18:06:19 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/08/25 21:52:09 jlam Exp $ bin/links man/man1/links.1 diff --git a/www/elinks/distinfo b/www/elinks/distinfo index a245ad05e18..bceb64299bf 100644 --- a/www/elinks/distinfo +++ b/www/elinks/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2002/07/02 13:03:11 wiz Exp $ +$NetBSD: distinfo,v 1.3 2002/08/25 21:52:10 jlam Exp $ SHA1 (elinks-0.3.0.tar.bz2) = c531d7922b1fb51fb8eeda960ff1e41c656db03e Size (elinks-0.3.0.tar.bz2) = 446820 bytes diff --git a/www/kannel/Makefile b/www/kannel/Makefile index b96f7504015..9c238159345 100644 --- a/www/kannel/Makefile +++ b/www/kannel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2002/08/22 11:31:33 martti Exp $ +# $NetBSD: Makefile,v 1.12 2002/08/25 21:52:10 jlam Exp $ # DISTNAME= gateway-${KANNEL_VER} @@ -13,14 +13,16 @@ COMMENT= Open source WAP and SMS gateway KANNEL_VER= 1.2.0 GNU_CONFIGURE= YES -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES USE_GMAKE= YES USE_PERL5= YES PTHREAD_OPTS+= require CONFIGURE_ARGS+= --disable-docs CONFIGURE_ARGS+= --disable-ssl +CFLAGS+= -I${BUILDLINK_PREFIX.libxml2}/include/libxml2/libxml + +.include "../../textproc/libxml2/buildlink2.mk" +.include "../../mk/pthread.buildlink2.mk" -.include "../../textproc/libxml2/buildlink.mk" -.include "../../mk/pthread.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/kannel/PLIST b/www/kannel/PLIST index 2ccc25843f3..3c479ac6329 100644 --- a/www/kannel/PLIST +++ b/www/kannel/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/08/22 11:31:33 martti Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/08/25 21:52:11 jlam Exp $ bin/seewbmp bin/wmlsc bin/wmlsdasm diff --git a/www/kannel/distinfo b/www/kannel/distinfo index c8dcb6d4983..8849ff73f22 100644 --- a/www/kannel/distinfo +++ b/www/kannel/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/08/22 11:31:34 martti Exp $ +$NetBSD: distinfo,v 1.5 2002/08/25 21:52:11 jlam Exp $ SHA1 (gateway-1.2.0.tar.gz) = f81fdfca26be69de8505550a076fb3628f477af2 Size (gateway-1.2.0.tar.gz) = 2094749 bytes diff --git a/www/kannel/patches/patch-aa b/www/kannel/patches/patch-aa index 44833ee7cf7..f29dc5d844d 100644 --- a/www/kannel/patches/patch-aa +++ b/www/kannel/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2002/08/22 11:31:35 martti Exp $ +$NetBSD: patch-aa,v 1.4 2002/08/25 21:52:11 jlam Exp $ --- utils/start-stop-daemon.c.orig Mon Apr 23 16:52:29 2001 +++ utils/start-stop-daemon.c Sun Jul 7 21:28:04 2002 diff --git a/www/kannel/patches/patch-ab b/www/kannel/patches/patch-ab index b0cc30f4055..099d58a9054 100644 --- a/www/kannel/patches/patch-ab +++ b/www/kannel/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.3 2002/08/22 11:31:35 martti Exp $ +$NetBSD: patch-ab,v 1.4 2002/08/25 21:52:12 jlam Exp $ --- Makefile.in.orig Tue Jun 11 20:59:52 2002 +++ Makefile.in Sun Jul 7 21:30:27 2002 diff --git a/www/links-gui/Makefile b/www/links-gui/Makefile index 0b870aaf104..e7d417a214c 100644 --- a/www/links-gui/Makefile +++ b/www/links-gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2002/07/26 15:29:23 jschauma Exp $ +# $NetBSD: Makefile,v 1.8 2002/08/25 21:52:14 jlam Exp $ # PKGNAME= links-gui-2.1.0.2 @@ -6,9 +6,14 @@ COMMENT= Lynx-like text and graphics WWW browser CONFLICTS+= links-[0-9]* elinks-[0-9]* +USE_BUILDLINK2= YES +USE_X11= YES + +.include "../../www/links/Makefile.common" + CONFIGURE_ARGS+= --enable-graphics -.include "../../graphics/png/buildlink.mk" -.include "../../graphics/tiff/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../graphics/tiff/buildlink2.mk" + .include "../../www/links/Makefile.common" diff --git a/www/links-gui/distinfo b/www/links-gui/distinfo index bea413ca0a8..3add7a0c8b9 100644 --- a/www/links-gui/distinfo +++ b/www/links-gui/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2002/07/02 11:23:05 wiz Exp $ +$NetBSD: distinfo,v 1.3 2002/08/25 21:52:14 jlam Exp $ SHA1 (links-2.1pre2.tar.bz2) = b3a807968ce028fe9fc702292bb107c6249d05e3 Size (links-2.1pre2.tar.bz2) = 3509541 bytes diff --git a/www/links/Makefile b/www/links/Makefile index 26f1eea6774..ffe1bed752f 100644 --- a/www/links/Makefile +++ b/www/links/Makefile @@ -1,13 +1,12 @@ -# $NetBSD: Makefile,v 1.13 2002/07/02 11:23:04 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2002/08/25 21:52:13 jlam Exp $ # PKGNAME= links-2.1.0.2 - COMMENT= Lynx-like text WWW browser CONFLICTS+= links-gui-[0-9]* elinks-[0-9]* -GNU_CONFIGURE= YES -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES .include "../../www/links/Makefile.common" +.include "../../mk/bsd.pkg.mk" diff --git a/www/links/Makefile.common b/www/links/Makefile.common index 2ff6b33369a..63e80aa5ad8 100644 --- a/www/links/Makefile.common +++ b/www/links/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2002/07/02 11:23:04 wiz Exp $ +# $NetBSD: Makefile.common,v 1.3 2002/08/25 21:52:13 jlam Exp $ # DISTNAME= links-2.1pre2 @@ -13,10 +13,8 @@ MAINTAINER= jschauma@netbsd.org HOMEPAGE= http://atrey.karlin.mff.cuni.cz/~clock/twibright/links/ GNU_CONFIGURE= YES -USE_BUILDLINK_ONLY= YES - CONFIGURE_ARGS+= --enable-javascript -PLIST_SRC= ../../www/links/PLIST -.include "../../security/openssl/buildlink.mk" -.include "../../mk/bsd.pkg.mk" +PLIST_SRC= ${.CURDIR}/../../www/links/PLIST + +.include "../../security/openssl/buildlink2.mk" diff --git a/www/links/distinfo b/www/links/distinfo index 8bd039c1387..9d57f1c4a52 100644 --- a/www/links/distinfo +++ b/www/links/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2002/07/02 11:23:04 wiz Exp $ +$NetBSD: distinfo,v 1.7 2002/08/25 21:52:13 jlam Exp $ SHA1 (links-2.1pre2.tar.bz2) = b3a807968ce028fe9fc702292bb107c6249d05e3 Size (links-2.1pre2.tar.bz2) = 3509541 bytes diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile index c3a1835cbce..e786337ca68 100644 --- a/www/lynx-current/Makefile +++ b/www/lynx-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2002/05/22 15:01:28 fredb Exp $ +# $NetBSD: Makefile,v 1.40 2002/08/25 21:52:16 jlam Exp $ # DISTNAME= lynx2.8.5dev.7 @@ -15,11 +15,10 @@ HOMEPAGE= http://lynx.browser.org/ COMMENT= Alphanumeric display oriented World-Wide Web Client BUILD_USES_MSGFMT= yes -USE_BUILDLINK_ONLY= yes WRKSRC= ${WRKDIR}/lynx2-8-5 -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes GNU_CONFIGURE= yes USE_GMAKE= yes INSTALL_TARGET= install-full install-lss @@ -63,10 +62,10 @@ post-install: .include "../../mk/bsd.prefs.mk" .if (${LYNX_SCREEN_LIB} == slang) -. include "../../devel/libslang/buildlink.mk" +. include "../../devel/libslang/buildlink2.mk" .elif (${LYNX_SCREEN_LIB} == ncurses) USE_NCURSES= color -. include "../../devel/ncurses/buildlink.mk" +. include "../../devel/ncurses/buildlink2.mk" CONFIGURE_ARGS+= --enable-color-style .elif (${LYNX_SCREEN_LIB} == curses) . if ${MACHINE_PLATFORM:MNetBSD-1.5*-i386} != "" @@ -97,10 +96,10 @@ pre-configure: .endif .if ${USE_SOCKS} == 4 CONFIGURE_ARGS+= --with-socks -. include "../../net/socks4/buildlink.mk" +. include "../../net/socks4/buildlink2.mk" .else CONFIGURE_ARGS+= --with-socks5 -. include "../../net/socks5/buildlink.mk" +. include "../../net/socks5/buildlink2.mk" .endif .endif @@ -109,7 +108,8 @@ CONFIGURE_ARGS+= --with-socks5 CONFIGURE_ARGS+= --enable-ipv6 .endif -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../devel/zlib/buildlink.mk" -.include "../../security/openssl/buildlink.mk" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../devel/zlib/buildlink2.mk" +.include "../../security/openssl/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/www/lynx-current/distinfo b/www/lynx-current/distinfo index 65c3306a1c0..91d4eaa336c 100644 --- a/www/lynx-current/distinfo +++ b/www/lynx-current/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2002/08/21 12:01:04 blymn Exp $ +$NetBSD: distinfo,v 1.6 2002/08/25 21:52:16 jlam Exp $ SHA1 (lynx2.8.5dev.7.tar.bz2) = 8e9eb4bf11944c24517e99ec0ef76b203022c5fe Size (lynx2.8.5dev.7.tar.bz2) = 1966524 bytes diff --git a/www/lynx-current/patches/patch-ab b/www/lynx-current/patches/patch-ab index 418ef218bfa..50d84e01d56 100644 --- a/www/lynx-current/patches/patch-ab +++ b/www/lynx-current/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.3 2002/08/21 12:01:04 blymn Exp $ +$NetBSD: patch-ab,v 1.4 2002/08/25 21:52:17 jlam Exp $ --- src/LYCurses.c.orig Wed Aug 21 21:16:48 2002 +++ src/LYCurses.c diff --git a/www/lynx/Makefile b/www/lynx/Makefile index 260063fdc6f..af308c11057 100644 --- a/www/lynx/Makefile +++ b/www/lynx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2002/08/19 23:56:15 fredb Exp $ +# $NetBSD: Makefile,v 1.51 2002/08/25 21:52:14 jlam Exp $ # DISTNAME= lynx2.8.4rel.1 @@ -26,7 +26,7 @@ BUILD_USES_MSGFMT= yes WRKSRC= ${WRKDIR}/lynx2-8-4 -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes GNU_CONFIGURE= yes INSTALL_TARGET= install-bin install-cfg install-help install-lss INSTALL_TARGET+= install-doc install-man @@ -71,10 +71,10 @@ post-install: .include "../../mk/bsd.prefs.mk" .if (${LYNX_SCREEN_LIB} == slang) -. include "../../devel/libslang/buildlink.mk" +. include "../../devel/libslang/buildlink2.mk" .elif (${LYNX_SCREEN_LIB} == ncurses) USE_NCURSES= color -. include "../../devel/ncurses/buildlink.mk" +. include "../../devel/ncurses/buildlink2.mk" CONFIGURE_ARGS+= --enable-color-style .elif (${LYNX_SCREEN_LIB} != curses) pre-configure: @@ -101,10 +101,10 @@ pre-configure: .endif .if ${USE_SOCKS} == 4 CONFIGURE_ARGS+= --with-socks -. include "../../net/socks4/buildlink.mk" +. include "../../net/socks4/buildlink2.mk" .else CONFIGURE_ARGS+= --with-socks5 -. include "../../net/socks5/buildlink.mk" +. include "../../net/socks5/buildlink2.mk" .endif .endif @@ -113,7 +113,8 @@ CONFIGURE_ARGS+= --with-socks5 CONFIGURE_ARGS+= --enable-ipv6 .endif -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../devel/zlib/buildlink.mk" -.include "../../security/openssl/buildlink.mk" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../devel/zlib/buildlink2.mk" +.include "../../security/openssl/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/www/lynx/distinfo b/www/lynx/distinfo index 8bc21ff1066..7aaf0ca5f31 100644 --- a/www/lynx/distinfo +++ b/www/lynx/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2002/08/20 13:39:43 blymn Exp $ +$NetBSD: distinfo,v 1.7 2002/08/25 21:52:15 jlam Exp $ SHA1 (lynx2.8.4rel.1.tar.bz2) = 11285022fbe6910fb0a47adc14581ceb0c3bfc98 Size (lynx2.8.4rel.1.tar.bz2) = 1940531 bytes diff --git a/www/lynx/patches/patch-ab b/www/lynx/patches/patch-ab index 587b6005028..8885ec50eb3 100644 --- a/www/lynx/patches/patch-ab +++ b/www/lynx/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.3 2002/08/20 13:41:33 blymn Exp $ +$NetBSD: patch-ab,v 1.4 2002/08/25 21:52:16 jlam Exp $ --- src/LYCurses.c.orig Tue Aug 20 22:33:51 2002 +++ src/LYCurses.c diff --git a/www/netscape/Makefile b/www/netscape/Makefile index 8236cc29f23..512f226f6a9 100644 --- a/www/netscape/Makefile +++ b/www/netscape/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2002/04/05 11:56:28 tron Exp $ +# $NetBSD: Makefile,v 1.8 2002/08/25 21:52:18 jlam Exp $ # COMMENT= Open new communicator, navigator, or mozilla window @@ -21,6 +21,8 @@ DEPENDS+= {communicator,navigator,mozilla}-[0-9]*:../../www/communicator DISTFILES= # empty MASTER_SITES= # empty +USE_BUILDLINK2= # defined + EXTRACT_ONLY= # empty WRKSRC= ${WRKDIR} NO_CHECKSUM= yes diff --git a/www/ns-remote/Makefile b/www/ns-remote/Makefile index a11fca0e798..4b9ffe77d72 100644 --- a/www/ns-remote/Makefile +++ b/www/ns-remote/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2002/03/26 22:43:46 abs Exp $ +# $NetBSD: Makefile,v 1.13 2002/08/25 21:52:18 jlam Exp $ DISTNAME= ns-remote PKGNAME= ns-remote-1.6 @@ -12,7 +12,8 @@ COMMENT= remote-control Netscape Navigator and Communicator DIST_SUBDIR= netscape -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= # defined +USE_X11= # defined .include "../../mk/bsd.prefs.mk" @@ -31,5 +32,4 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ns-remote ${PREFIX}/bin ${INSTALL_SCRIPT} ${FILESDIR}/ns-open ${PREFIX}/bin -.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/opera6/Makefile b/www/opera6/Makefile index 32530ff0f73..33e0b46ba1e 100644 --- a/www/opera6/Makefile +++ b/www/opera6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2002/07/04 22:11:21 tron Exp $ +# $NetBSD: Makefile,v 1.12 2002/08/25 21:52:19 jlam Exp $ DISTNAME= opera-${OPERA_PKG_VERSION} CATEGORIES= www @@ -25,10 +25,12 @@ DIST_SUBDIR= . EXTRACT_ONLY= # empty PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC +USE_BUILDLINK2= # defined + .include "../../mk/bsd.prefs.mk" # A default so lintpkgsrc is happy -OPERA_PKG_VERSION= 6.02 +OPERA_PKG_VERSION= 6.01 .if (${MACHINE_ARCH} == i386) DEPENDS+= suse_compat>=6.3:../../emulators/${SUSE_DIR_PREFIX}_compat diff --git a/www/opera6/distinfo b/www/opera6/distinfo index 9409d8e109b..ade677721cf 100644 --- a/www/opera6/distinfo +++ b/www/opera6/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2002/07/04 22:11:21 tron Exp $ +$NetBSD: distinfo,v 1.7 2002/08/25 21:52:19 jlam Exp $ SHA1 (./opera-6.02-20020701.1-static-qt.i386.rpm) = 8d043a6340907289011a6be7a3bd3ffa2b740a2a Size (./opera-6.02-20020701.1-static-qt.i386.rpm) = 4915848 bytes diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile index 134c6260054..cb0b8fc3b50 100644 --- a/www/sitecopy/Makefile +++ b/www/sitecopy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2002/08/20 08:52:33 uebayasi Exp $ +# $NetBSD: Makefile,v 1.12 2002/08/25 21:52:20 jlam Exp $ DISTNAME= sitecopy-0.11.4 CATEGORIES= www @@ -9,11 +9,11 @@ HOMEPAGE= http://www.lyra.org/sitecopy/ COMMENT= utility for synchronizing remote and local web sites USE_GMAKE= # defined -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK2= # defined BUILD_USES_MSGFMT= # defined GNU_CONFIGURE= # defined -CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_DIR} +CONFIGURE_ARGS+= --with-ssl=${SSLBASE} CONFIGURE_ARGS+= --with-included-neon CONFIGURE_ARGS+= --enable-libxml @@ -29,8 +29,9 @@ pre-build: ${RM} -f ${WRKSRC}/fnmatch.h ${LN} -sf ${WRKSRC}/lib/fnmatch.h ${WRKSRC}/fnmatch.h -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../devel/libgetopt/buildlink.mk" -.include "../../security/openssl/buildlink.mk" -.include "../../textproc/libxml/buildlink.mk" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../devel/libgetopt/buildlink2.mk" +.include "../../security/openssl/buildlink2.mk" +.include "../../textproc/libxml/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/www/sitecopy/PLIST b/www/sitecopy/PLIST index 36c6f3ad640..34c7c86259d 100644 --- a/www/sitecopy/PLIST +++ b/www/sitecopy/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/08/20 08:52:33 uebayasi Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/08/25 21:52:20 jlam Exp $ bin/sitecopy man/man1/sitecopy.1 share/doc/sitecopy/FAQ diff --git a/www/sitecopy/distinfo b/www/sitecopy/distinfo index 4ec0136ceed..bbc7d2d658c 100644 --- a/www/sitecopy/distinfo +++ b/www/sitecopy/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2002/08/22 09:45:35 uebayasi Exp $ +$NetBSD: distinfo,v 1.4 2002/08/25 21:52:20 jlam Exp $ SHA1 (sitecopy-0.11.4.tar.gz) = 765e40e769e91fff0323e4cae73ad8048b453a2c Size (sitecopy-0.11.4.tar.gz) = 737326 bytes diff --git a/www/sitecopy/patches/patch-aa b/www/sitecopy/patches/patch-aa index cc9cd5e600a..5b3f368e4b0 100644 --- a/www/sitecopy/patches/patch-aa +++ b/www/sitecopy/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2002/08/20 08:52:34 uebayasi Exp $ +$NetBSD: patch-aa,v 1.3 2002/08/25 21:52:21 jlam Exp $ --- Makefile.in.orig Mon Jan 14 06:02:02 2002 +++ Makefile.in diff --git a/www/sitecopy/patches/patch-ab b/www/sitecopy/patches/patch-ab index 35219df9a09..b7b3919c7de 100644 --- a/www/sitecopy/patches/patch-ab +++ b/www/sitecopy/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1 2002/08/20 08:52:34 uebayasi Exp $ +$NetBSD: patch-ab,v 1.2 2002/08/25 21:52:22 jlam Exp $ --- src/console_fe.c.orig Mon Jan 14 05:42:21 2002 +++ src/console_fe.c diff --git a/www/surfraw/Makefile b/www/surfraw/Makefile index 4c9624f5e0d..0c9fb9edacc 100644 --- a/www/surfraw/Makefile +++ b/www/surfraw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2002/03/22 05:04:12 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2002/08/25 21:52:22 jlam Exp $ # DISTNAME= surfraw-1.0.7 @@ -11,15 +11,15 @@ COMMENT= Shell Users' Revolutionary Front Rage Against the Web CONFLICTS+= surfaw-[0-9]* -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} # Override sysconfdir so that the installation puts the example config file # in ${EGDIR}. # -MAKE_FLAGS+= sysconfdir=${EGDIR} -MAKE_ENV+= AM_MAKEFLAGS="${MAKE_FLAGS}" +MAKE_FLAGS+= sysconfdir=${EGDIR} +MAKE_ENV+= AM_MAKEFLAGS="${MAKE_FLAGS}" DOCDIR= ${PREFIX}/share/doc/surfraw EGDIR= ${PREFIX}/share/examples/${PKGBASE} diff --git a/www/urlget/Makefile b/www/urlget/Makefile index b4f047c5b4f..41bc10aaeb6 100644 --- a/www/urlget/Makefile +++ b/www/urlget/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/09/27 19:57:02 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2002/08/25 21:52:23 jlam Exp $ # DISTNAME= urlget-1.3 @@ -8,7 +8,7 @@ MASTER_SITES= ftp://ftp.gw.com/pub/people/kim/ MAINTAINER= kim@tac.nyc.ny.us COMMENT= simple command-line tool to retrieve an HTTP URL -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES .include "../../mk/bsd.prefs.mk" diff --git a/www/w3m/Makefile b/www/w3m/Makefile index 41ea2d4a98a..2502e501fa3 100644 --- a/www/w3m/Makefile +++ b/www/w3m/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2002/05/17 00:01:12 kei Exp $ +# $NetBSD: Makefile,v 1.38 2002/08/25 21:52:23 jlam Exp $ # PKGNAME= w3m-${W3M_BASE_VERS} diff --git a/www/w3m/Makefile.common b/www/w3m/Makefile.common index a3c5fa577a3..78dc5bce1d4 100644 --- a/www/w3m/Makefile.common +++ b/www/w3m/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2002/07/19 11:56:47 wiz Exp $ +# $NetBSD: Makefile.common,v 1.8 2002/08/25 21:52:24 jlam Exp $ # DISTNAME= w3m-${W3M_VERS} @@ -8,7 +8,7 @@ MASTER_SITES= http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/ MAINTAINER= kei@netbsd.org HOMEPAGE= http://www2u.biglobe.ne.jp/~hsaka/w3m/ -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes W3M_VERS= ${W3M_BASE_VERS}-m17n-${W3M_M17N_VERS} W3M_BASE_VERS= 0.3 @@ -96,9 +96,9 @@ CONFIGURE_ENV+= use_cookie=n .endif .if ${W3M_USE_SSL} == YES CONFIGURE_ENV+= use_ssl=y use_ssl_verify=y -CONFIGURE_ARGS+= --ssl-includedir=${BUILDLINK_DIR}/include/openssl -CONFIGURE_ARGS+= --ssl-libdir=${BUILDLINK_DIR}/lib -.include "../../security/openssl/buildlink.mk" +CONFIGURE_ARGS+= --ssl-includedir=${SSLBASE}/include/openssl +CONFIGURE_ARGS+= --ssl-libdir=${SSLBASE}/lib +.include "../../security/openssl/buildlink2.mk" .else CONFIGURE_ENV+= use_ssl=n use_ssl_verify=n .endif @@ -126,8 +126,8 @@ CONFIGURE_ARGS+= --prefix=${PREFIX} CONFIGURE_ARGS+= --bindir=${PREFIX}/bin CONFIGURE_ARGS+= --libdir=${PREFIX}/${HELPERDIR} CONFIGURE_ARGS+= --helpdir=${PREFIX}/${HELPDIR} -CONFIGURE_ARGS+= --gc-includedir=${BUILDLINK_DIR}/include -CONFIGURE_ARGS+= --gc-libdir=${BUILDLINK_DIR}/lib +CONFIGURE_ARGS+= --gc-includedir=${BUILDLINK_PREFIX.boehm-gc}/include +CONFIGURE_ARGS+= --gc-libdir=${BUILDLINK_PREFIX.boehm-gc}/lib .if ${W3M_USE_IMAGE} == YES PLIST_SUBST+= USE_IMAGE='' @@ -184,8 +184,8 @@ post-install: ${LN} -s w3mhelp${HELP_W3M}${HELP_LANG}.html w3mhelp.html) .if ${W3M_USE_IMAGE} == YES -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/imlib/buildlink.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/imlib/buildlink2.mk" .endif -.include "../../devel/boehm-gc/buildlink.mk" +.include "../../devel/boehm-gc/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/w3m/PLIST b/www/w3m/PLIST index fde92532c96..0625cec1d1c 100644 --- a/www/w3m/PLIST +++ b/www/w3m/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2002/05/10 06:27:22 kei Exp $ +@comment $NetBSD: PLIST,v 1.5 2002/08/25 21:52:24 jlam Exp $ bin/w3m man/man1/w3m.1 man/ja_JP.EUC/man1/w3m.1 diff --git a/www/wdg-validate/Makefile b/www/wdg-validate/Makefile index 439a0e784b9..5486438db26 100644 --- a/www/wdg-validate/Makefile +++ b/www/wdg-validate/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2002/07/11 09:51:11 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2002/08/25 21:52:24 jlam Exp $ # DISTNAME= validate @@ -16,9 +16,9 @@ DEPENDS+= lq-sp>=1.3.4.5:../../textproc/lq-sp DIST_SUBDIR= ${PKGNAME} EXTRACT_ONLY= sgml-lib-1.0.tar.gz -USE_BUILDLINK_ONLY= YES -REPLACE_PERL= validate.netbsd -NO_BUILD= YES +USE_BUILDLINK2= YES +REPLACE_PERL= validate.netbsd +NO_BUILD= YES post-extract: ${CP} ${DISTDIR}/${DIST_SUBDIR}/validate ${WRKSRC}/validate.netbsd @@ -34,5 +34,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/validate.README ${CP} -R ${WRKSRC}/lib/* ${PREFIX}/lib/validate -.include "../../lang/perl5/buildlink.mk" +.include "../../lang/perl5/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/wdg-validate/distinfo b/www/wdg-validate/distinfo index cc99954c28d..b3441276d5a 100644 --- a/www/wdg-validate/distinfo +++ b/www/wdg-validate/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2002/07/11 09:51:11 wiz Exp $ +$NetBSD: distinfo,v 1.6 2002/08/25 21:52:25 jlam Exp $ SHA1 (wdg-validate-1.0.4/validate) = eb9ea352528fa5db2cbedc5ad4dbe59aa91d5e58 Size (wdg-validate-1.0.4/validate) = 15210 bytes diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile index d2ee917b8ef..94687e85b9c 100644 --- a/www/webalizer/Makefile +++ b/www/webalizer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2002/03/13 17:37:53 fredb Exp $ +# $NetBSD: Makefile,v 1.21 2002/08/25 21:52:25 jlam Exp $ # DISTNAME= webalizer-2.01-09-src @@ -16,11 +16,12 @@ COMMENT= Web server log file analysis program WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES +USE_X11= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --enable-dns -CONFIGURE_ENV+= ac_cv_GDLIB=${BUILDLINK_DIR}/include +CONFIGURE_ENV+= ac_cv_GDLIB=${BUILDLINK_PREFIX.gd}/include EGDIR= ${PREFIX}/share/examples CONF_FILES= ${EGDIR}/webalizer.conf.sample ${PKG_SYSCONFDIR}/webalizer.conf @@ -32,7 +33,7 @@ post-build: ${MV} -f ${WRKSRC}/$${file}.fixed ${WRKSRC}/$${file}; \ done -.include "../../graphics/gd/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/gd/buildlink2.mk" + .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/weblint/Makefile b/www/weblint/Makefile index 4455e3abe11..4b91e6ff35c 100644 --- a/www/weblint/Makefile +++ b/www/weblint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/11/29 13:27:48 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2002/08/25 21:52:25 jlam Exp $ # DISTNAME= weblint-1.020 @@ -13,7 +13,7 @@ MAINTAINER= packages@netbsd.org #HOMEPAGE= http://www.weblint.org/ COMMENT= HTML validator and sanity checker -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES -.include "../../lang/perl5/buildlink.mk" +.include "../../lang/perl5/buildlink2.mk" .include "../../mk/bsd.pkg.mk" 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" |