diff options
| author | jlam <jlam@pkgsrc.org> | 2001-10-24 22:10:43 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-10-24 22:10:43 +0000 |
| commit | a4bc16d30c123e03c4125fdd70bde0eb8a71f4a4 (patch) | |
| tree | e280bcd13b77df59c664f968eda46414c756ada4 | |
| parent | 452509b0a2eb744db237df7645a87161418d6935 (diff) | |
| download | pkgsrc-a4bc16d30c123e03c4125fdd70bde0eb8a71f4a4.tar.gz | |
I am a triple idiot. The only relevant variable that x11.buildlink.mk
redefines about which buildlink.mk files would care is BUILDLINK_X11_DIR,
which points to the location of the X11R6 hierarchy used during building.
If x11.buildlink.mk isn't included, then BUILDLINK_X11_DIR defaults to
${X11BASE} (set in bsd.pkg.mk), so its value is always safe to use. Remove
the ifdefs surrounding the use of BUILDLINK_X11_DIR in tk/buildlink.mk and
revert changes to move x11.buildlink.mk before the other buildlink.mk files.
138 files changed, 278 insertions, 286 deletions
diff --git a/Packages.txt b/Packages.txt index 2991f3bc6b4..ae3051c35f5 100644 --- a/Packages.txt +++ b/Packages.txt @@ -1,4 +1,4 @@ -# $NetBSD: Packages.txt,v 1.204 2001/10/24 20:06:19 jlam Exp $ +# $NetBSD: Packages.txt,v 1.205 2001/10/24 22:10:43 jlam Exp $ ########################################################################### ========================== @@ -1532,10 +1532,6 @@ buildlink.mk files: USE_XAW --> .include "../../mk/xaw.buildlink.mk" USE_XPM --> .include "../../graphics/xpm/buildlink.mk" -x11.buildlink.mk must be included before other buildlink.mk files that test -for whether X11_BUILDLINK_MK is defined. In general, x11.buildlink.mk -should be included before all other buildlink.mk files. - Packages that have an explicit dependency on ncurses should set USE_NCURSES to the reason why the system curses is insufficient, and include "../../devel/ncurses/buildlink.mk" afterwards. This helps to identify diff --git a/audio/gmp3info/Makefile b/audio/gmp3info/Makefile index a10857ad012..c28e6f846e7 100644 --- a/audio/gmp3info/Makefile +++ b/audio/gmp3info/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/10/23 13:14:43 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2001/10/24 22:10:43 jlam Exp $ DISTNAME= mp3info-0.8.2 PKGNAME= g${DISTNAME} @@ -24,7 +24,7 @@ HAVE_WGETNSTR!= ${GREP} -cw wgetnstr /usr/include/curses.h || ${TRUE} USE_NCURSES= YES .endif -.include "../../mk/x11.buildlink.mk" .include "../../devel/ncurses/buildlink.mk" .include "../../x11/gtk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile index b0cb59d0846..24cee3c1adc 100644 --- a/audio/gqmpeg/Makefile +++ b/audio/gqmpeg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2001/10/23 13:14:43 jlam Exp $ +# $NetBSD: Makefile,v 1.44 2001/10/24 22:10:44 jlam Exp $ # FreeBSD Id: Makefile,v 1.6 1998/12/28 01:02:05 vanilla Exp DISTNAME= gqmpeg-0.9.0 @@ -27,8 +27,8 @@ pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/gnome/apps/Multimedia ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps -.include "../../mk/x11.buildlink.mk" .include "../../devel/gettext-lib/buildlink.mk" .include "../../graphics/gdk-pixbuf/buildlink.mk" .include "../../x11/gtk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/snd/Makefile b/audio/snd/Makefile index 72874bea29c..1d0de9e8572 100644 --- a/audio/snd/Makefile +++ b/audio/snd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2001/10/23 13:14:43 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2001/10/24 22:10:44 jlam Exp $ # DISTNAME= snd @@ -25,7 +25,7 @@ do-install: ${INSTALL_DATA_DIR} ${HTMLDIR} cd ${WRKSRC} ; ${INSTALL_DATA} *.gif *.html *.txt README.Snd ${HTMLDIR} -.include "../../mk/x11.buildlink.mk" .include "../../graphics/xpm/buildlink.mk" .include "../../mk/motif.buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile index d0f16b1b797..93f361d4752 100644 --- a/audio/wsoundserver/Makefile +++ b/audio/wsoundserver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/10/23 13:14:44 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2001/10/24 22:10:44 jlam Exp $ # DISTNAME= WSoundServer-0.4.0 @@ -33,10 +33,10 @@ post-patch: post-install: ${INSTALL_DATA} ${WRKSRC}/WMSound ${PREFIX}/etc/WindowMaker -.include "../../mk/x11.buildlink.mk" .include "../../audio/libaudiofile/buildlink.mk" .include "../../devel/libdockapp/buildlink.mk" .include "../../devel/libproplist/buildlink.mk" .include "../../wm/windowmaker/buildlink.mk" .include "../../mk/ossaudio.buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/xmms-crossfade/Makefile b/audio/xmms-crossfade/Makefile index e9da0fc274f..e6fa77026d8 100644 --- a/audio/xmms-crossfade/Makefile +++ b/audio/xmms-crossfade/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/10/23 13:14:44 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2001/10/24 22:10:44 jlam Exp $ # DISTNAME= xmms-crossfade-0.2.9 @@ -18,7 +18,7 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig LDFLAGS+= ${LIBOSSAUDIO} CPPFLAGS+= -D_POSIX_THREAD_SYSCALL_SOFT=1 -.include "../../mk/x11.buildlink.mk" .include "../../audio/xmms/buildlink.mk" .include "../../mk/ossaudio.buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/xmms-dflowers/Makefile b/audio/xmms-dflowers/Makefile index 277d2575570..4b79da20837 100644 --- a/audio/xmms-dflowers/Makefile +++ b/audio/xmms-dflowers/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/10/23 13:14:44 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2001/10/24 22:10:45 jlam Exp $ # DISTNAME= dflowers-1.2 @@ -14,6 +14,6 @@ USE_BUILDLINK_ONLY= YES USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -.include "../../mk/x11.buildlink.mk" .include "../../audio/xmms/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/xmms-dscope/Makefile b/audio/xmms-dscope/Makefile index cfbb302a75a..0964440227b 100644 --- a/audio/xmms-dscope/Makefile +++ b/audio/xmms-dscope/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/10/23 13:14:44 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2001/10/24 22:10:45 jlam Exp $ # DISTNAME= dscope-1.2 @@ -16,6 +16,6 @@ USE_LIBTOOL= YES pre-build: cd ${WRKSRC} ; ${MAKE} clean -.include "../../mk/x11.buildlink.mk" .include "../../audio/xmms/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/xmms-dspectogram/Makefile b/audio/xmms-dspectogram/Makefile index a68f40274bf..64fca03603a 100644 --- a/audio/xmms-dspectogram/Makefile +++ b/audio/xmms-dspectogram/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/10/23 13:14:44 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2001/10/24 22:10:45 jlam Exp $ # DISTNAME= dspectogram-1.2 @@ -16,6 +16,6 @@ USE_LIBTOOL= YES pre-build: cd ${WRKSRC} ; ${MAKE} clean -.include "../../mk/x11.buildlink.mk" .include "../../audio/xmms/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/xmms-dspectralizer/Makefile b/audio/xmms-dspectralizer/Makefile index 1dc5267377d..68688d0eb5a 100644 --- a/audio/xmms-dspectralizer/Makefile +++ b/audio/xmms-dspectralizer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/10/23 13:14:45 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2001/10/24 22:10:45 jlam Exp $ # DISTNAME= dspectral-1.2 @@ -16,6 +16,6 @@ USE_LIBTOOL= YES pre-build: cd ${WRKSRC} ; ${MAKE} clean -.include "../../mk/x11.buildlink.mk" .include "../../audio/xmms/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/xmms-gdancer/Makefile b/audio/xmms-gdancer/Makefile index 41f76fe05e5..9e2dc35e62e 100644 --- a/audio/xmms-gdancer/Makefile +++ b/audio/xmms-gdancer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/10/23 13:14:45 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2001/10/24 22:10:46 jlam Exp $ # DISTNAME= gdancer-0.4.3 @@ -15,6 +15,6 @@ GNU_CONFIGURE= YES USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -.include "../../mk/x11.buildlink.mk" .include "../../audio/xmms/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/xmms-neato/Makefile b/audio/xmms-neato/Makefile index 420793906e2..5bb15f8f36f 100644 --- a/audio/xmms-neato/Makefile +++ b/audio/xmms-neato/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/10/23 13:14:45 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2001/10/24 22:10:46 jlam Exp $ # DISTNAME= neato @@ -31,6 +31,6 @@ post-extract: ${CHMOD} +x install-sh ; \ ${MAKE} distclean -.include "../../mk/x11.buildlink.mk" .include "../../audio/xmms/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/xmms-vismsa/Makefile b/audio/xmms-vismsa/Makefile index fce48543c89..c128f32e005 100644 --- a/audio/xmms-vismsa/Makefile +++ b/audio/xmms-vismsa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/10/23 13:14:45 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2001/10/24 22:10:46 jlam Exp $ # DISTNAME= vismsa-xmms-plugin-0.2 @@ -16,6 +16,6 @@ USE_LIBTOOL= YES pre-build: cd ${WRKSRC} ; ${MAKE} clean -.include "../../mk/x11.buildlink.mk" .include "../../audio/xmms/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile index 9cf8cd2d11c..7a1587c5e1b 100644 --- a/audio/xsidplay/Makefile +++ b/audio/xsidplay/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2001/10/23 13:14:45 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2001/10/24 22:10:46 jlam Exp $ # DISTNAME= xsidplay-1_5_4 @@ -25,7 +25,7 @@ CONFIGURE_ARGS+= --with-qt-dir=${BUILDLINK_QTDIR} do-install: @${INSTALL_PROGRAM} ${WRKSRC}/src/xsidplay ${PREFIX}/bin -.include "../../mk/x11.buildlink.mk" .include "../../audio/libsidplay/buildlink.mk" .include "../../x11/qt2-libs/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/dinotrace/Makefile b/cad/dinotrace/Makefile index 96ea094297f..0f8f1679c2d 100644 --- a/cad/dinotrace/Makefile +++ b/cad/dinotrace/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2001/10/23 13:14:46 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2001/10/24 22:10:46 jlam Exp $ # DISTNAME= dinotrace-9.1d @@ -16,6 +16,6 @@ INFO_FILES= dinotrace.info USE_BUILDLINK_ONLY= YES GNU_CONFIGURE= YES -.include "../../mk/x11.buildlink.mk" .include "../../mk/motif.buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/felt/Makefile b/cad/felt/Makefile index 3ecd75ca7f3..332b1f3bb2e 100644 --- a/cad/felt/Makefile +++ b/cad/felt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2001/10/23 13:14:46 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2001/10/24 22:10:47 jlam Exp $ DISTNAME= felt-3.05.src PKGNAME= felt-3.05 @@ -36,7 +36,7 @@ post-install: COPYING CHANGELOG TODO ${PREFIX}/share/doc/felt ${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/felt -.include "../../mk/x11.buildlink.mk" .include "../../devel/readline/buildlink.mk" .include "../../mk/xaw.buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/ng-spice/Makefile b/cad/ng-spice/Makefile index 2bc6a491715..7506e8d53da 100644 --- a/cad/ng-spice/Makefile +++ b/cad/ng-spice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/10/23 13:14:46 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2001/10/24 22:10:47 jlam Exp $ # DISTNAME= ng-spice-rework-13 @@ -21,7 +21,7 @@ LIBS+= ${LIBGETOPT} USE_BUILDLINK_ONLY= YES -.include "../../mk/x11.buildlink.mk" .include "../../devel/libgetopt/buildlink.mk" .include "../../devel/ncurses/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile index 5170f77b1cb..d786a5b8981 100644 --- a/cad/qcad/Makefile +++ b/cad/qcad/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/10/23 13:14:46 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2001/10/24 22:10:47 jlam Exp $ DISTNAME= qcad-1.4.7-src PKGNAME= qcad-1.4.7 @@ -33,6 +33,6 @@ do-install: TODO cur doc examples fonts hatches libraries messages xpm) | \ (cd ${PREFIX}/share/qcad; ${GTAR} vxf - ) -.include "../../mk/x11.buildlink.mk" .include "../../x11/qt2-libs/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/vipec/Makefile b/cad/vipec/Makefile index 118b1abc59b..2c5d3e8bdd0 100644 --- a/cad/vipec/Makefile +++ b/cad/vipec/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2001/10/23 13:14:46 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2001/10/24 22:10:47 jlam Exp $ # DISTNAME= vipec-2.0.4 @@ -34,6 +34,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/vipec/help/models/*.html ${PREFIX}/share/doc/vipec/models ${INSTALL_DATA} ${WRKSRC}/vipec/help/models/*.png ${PREFIX}/share/doc/vipec/models -.include "../../mk/x11.buildlink.mk" .include "../../x11/qt2-libs/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile index 2092995de4d..899a020cc5d 100644 --- a/chat/gaim/Makefile +++ b/chat/gaim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/10/23 13:14:47 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2001/10/24 22:10:48 jlam Exp $ # DISTNAME= gaim-0.44 @@ -30,7 +30,7 @@ CONFIGURE_ARGS+= --enable-pixbuf CONFIGURE_ENV+= pixbufcfg="${GDK_PIXBUF_CONFIG}" -.include "../../mk/x11.buildlink.mk" .include "../../audio/esound/buildlink.mk" .include "../../graphics/gdk-pixbuf/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/gtkyahoo/Makefile b/chat/gtkyahoo/Makefile index f7891910525..365ee9acca2 100644 --- a/chat/gtkyahoo/Makefile +++ b/chat/gtkyahoo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/10/23 13:14:47 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2001/10/24 22:10:48 jlam Exp $ DISTNAME= gtkyahoo-0.18.2 CATEGORIES= chat @@ -20,7 +20,7 @@ CONFIGURE_ARGS+= --with-libyahoo="${BUILDLINK_DIR}" pre-configure: ${RM} -rf ${WRKSRC}/libyahoo -.include "../../mk/x11.buildlink.mk" .include "../../chat/libyahoo/buildlink.mk" .include "../../x11/gtk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/kyahoo/Makefile b/chat/kyahoo/Makefile index 71791bc1e54..695c01bac0b 100644 --- a/chat/kyahoo/Makefile +++ b/chat/kyahoo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/10/23 13:14:47 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2001/10/24 22:10:48 jlam Exp $ DISTNAME= kyahoo-0.7 CATEGORIES= chat @@ -25,7 +25,7 @@ MAKE_ENV+= USER_LDFLAGS="${LDFLAGS}" pre-build: ${CHMOD} +x ${WRKSRC}/missing -.include "../../mk/x11.buildlink.mk" .include "../../chat/libyahoo/buildlink.mk" .include "../../x11/kdebase2/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/comms/jpilot-expense/Makefile b/comms/jpilot-expense/Makefile index 5270f8e5b1e..c0a495be472 100644 --- a/comms/jpilot-expense/Makefile +++ b/comms/jpilot-expense/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/10/23 13:14:47 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2001/10/24 22:10:48 jlam Exp $ DISTNAME= jpilot-0.99 PKGNAME= jpilot-expense-0.99 @@ -26,7 +26,7 @@ post-extract: ${RM} -f ${WRKSRC}/../libtool ${LN} -sf ${LIBTOOL} ${WRKSRC}/../libtool -.include "../../mk/x11.buildlink.mk" .include "../../comms/jpilot/buildlink.mk" .include "../../comms/pilot-link-libs/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/comms/jpilot-syncmal/Makefile b/comms/jpilot-syncmal/Makefile index 4501f8e4eeb..78c862d852b 100644 --- a/comms/jpilot-syncmal/Makefile +++ b/comms/jpilot-syncmal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/10/23 13:14:47 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2001/10/24 22:10:48 jlam Exp $ DISTNAME= jpilot-syncmal_0.60 PKGNAME= jpilot-syncmal-0.60 @@ -32,7 +32,7 @@ CFLAGS+= -D__unix__=1 do-install: ${INSTALL_DATA} ${WRKSRC}/.libs/libsyncmal.so ${PLUGINSDIR} -.include "../../mk/x11.buildlink.mk" .include "../../comms/jpilot/buildlink.mk" .include "../../comms/pilot-link-libs/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/comms/jpilot-synctime/Makefile b/comms/jpilot-synctime/Makefile index b83206813d8..bbd9155ec32 100644 --- a/comms/jpilot-synctime/Makefile +++ b/comms/jpilot-synctime/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/10/23 13:14:48 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2001/10/24 22:10:49 jlam Exp $ DISTNAME= jpilot-0.99 PKGNAME= jpilot-synctime-0.99 @@ -26,7 +26,7 @@ post-extract: ${RM} -f ${WRKSRC}/../libtool ${LN} -sf ${LIBTOOL} ${WRKSRC}/../libtool -.include "../../mk/x11.buildlink.mk" .include "../../comms/jpilot/buildlink.mk" .include "../../comms/pilot-link-libs/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/comms/jpilot/Makefile b/comms/jpilot/Makefile index c55150f2604..45cccf6020e 100644 --- a/comms/jpilot/Makefile +++ b/comms/jpilot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2001/10/23 13:14:48 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2001/10/24 22:10:49 jlam Exp $ # DISTNAME= jpilot-0.99 @@ -41,8 +41,8 @@ post-install: cd ${WRKSRC}/docs; ${INSTALL_MAN} *.1 ${MAN1DIR} ${TOUCH} ${PLUGINSDIR}/.directory -.include "../../mk/x11.buildlink.mk" .include "../../comms/pilot-link-libs/buildlink.mk" .include "../../devel/gettext-lib/buildlink.mk" .include "../../x11/gtk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/comms/pilot-link/Makefile b/comms/pilot-link/Makefile index 6dd64cd53f0..735e9f97f21 100644 --- a/comms/pilot-link/Makefile +++ b/comms/pilot-link/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2001/10/23 20:46:46 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2001/10/24 22:10:49 jlam Exp $ # .include "../../comms/pilot-link/Makefile.common" @@ -21,9 +21,9 @@ LIBS+= -lpisock -liconv INSTALL_TARGET= install-execs install-man -.include "../../mk/x11.buildlink.mk" .include "../../comms/pilot-link-libs/buildlink.mk" .include "../../devel/readline/buildlink.mk" .include "../../lang/tcl/buildlink.mk" .include "../../x11/tk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/converters/psiconv/Makefile b/converters/psiconv/Makefile index f973a71803a..288067798f1 100644 --- a/converters/psiconv/Makefile +++ b/converters/psiconv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/10/23 13:14:48 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2001/10/24 22:10:49 jlam Exp $ # DISTNAME= psiconv-0.6.1 @@ -23,6 +23,6 @@ post-install: ${INSTALL_DATA} $${file} ${DOCDIR}; \ done -.include "../../mk/x11.buildlink.mk" .include "../../graphics/ImageMagick/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/converters/wv/Makefile b/converters/wv/Makefile index 1aab71deab5..bcfb4c44c54 100644 --- a/converters/wv/Makefile +++ b/converters/wv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2001/10/23 13:14:48 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2001/10/24 22:10:50 jlam Exp $ # DISTNAME= wv-0.6.7 @@ -25,9 +25,9 @@ post-install: cd ${WRKSRC} && ${INSTALL_DATA} COPYING CREDITS INSTALL KNOWN-BUGS \ README help/Docs/XML_Tags ${PREFIX}/share/doc/wv -.include "../../mk/x11.buildlink.mk" .include "../../converters/libiconv/buildlink.mk" .include "../../devel/glib/buildlink.mk" .include "../../graphics/ImageMagick/buildlink.mk" .include "../../graphics/libwmf/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/gtksql/Makefile b/databases/gtksql/Makefile index de70c551c86..c7abf256ecd 100644 --- a/databases/gtksql/Makefile +++ b/databases/gtksql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2001/10/23 13:14:49 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2001/10/24 22:10:50 jlam Exp $ # DISTNAME= gtksql-0.3 @@ -16,7 +16,7 @@ USE_X11BASE= # defined USE_BUILDLINK_ONLY= # defined MAKE_ENV+= MCFLAGS="${CFLAGS}" -.include "../../mk/x11.buildlink.mk" .include "../../databases/postgresql-lib/buildlink.mk" .include "../../x11/gtk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/tk-postgresql/Makefile b/databases/tk-postgresql/Makefile index 14bee24db8c..9f7dd8964e9 100644 --- a/databases/tk-postgresql/Makefile +++ b/databases/tk-postgresql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/10/23 12:51:19 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2001/10/24 22:10:50 jlam Exp $ .include "../../databases/postgresql/Makefile.common" .include "../../databases/postgresql/Makefile.ssl" @@ -40,8 +40,8 @@ post-install: ${GTAR} zxCf ${PREFIX}/man ${WRKSRC}/doc/man.tar.gz \ `${SED} -e "s|#.*||" ${FILESDIR}/man.tk` -.include "../../mk/x11.buildlink.mk" .include "../../databases/postgresql-lib/buildlink.mk" .include "../../databases/tcl-postgresql/buildlink.mk" .include "../../x11/tk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile index d8557979ee2..756a40d59dc 100644 --- a/devel/GConf/Makefile +++ b/devel/GConf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2001/10/23 13:14:49 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2001/10/24 22:10:50 jlam Exp $ # DISTNAME= GConf-1.0.4 @@ -30,8 +30,8 @@ post-install: ${CP} -p ${PREFIX}/etc/gconf/1/path.example \ ${PREFIX}/etc/gconf/1/path -.include "../../mk/x11.buildlink.mk" .include "../../devel/gettext-lib/buildlink.mk" .include "../../databases/db3/buildlink.mk" .include "../../devel/oaf/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile index dc63ef6b96e..231d1771520 100644 --- a/devel/SDL/Makefile +++ b/devel/SDL/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2001/10/23 13:14:49 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2001/10/24 22:10:51 jlam Exp $ # DISTNAME= SDL-1.2.2 @@ -50,9 +50,9 @@ pre-configure: post-configure: cd ${WRKSRC}/src/audio && ${CP} *.[ch] netbsd/ -.include "../../mk/x11.buildlink.mk" .include "../../audio/esound/buildlink.mk" .include "../../devel/pth/buildlink.mk" .include "../../graphics/Mesa/buildlink.mk" .include "../../mk/ossaudio.buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile index 5b994e94d10..322e162ee86 100644 --- a/devel/bonobo/Makefile +++ b/devel/bonobo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2001/10/23 13:14:49 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2001/10/24 22:10:51 jlam Exp $ # DISTNAME= bonobo-1.0.9 @@ -26,10 +26,10 @@ LDFLAGS+= -Wl,-R${LOCALBASE}/lib LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -.include "../../mk/x11.buildlink.mk" .include "../../graphics/gdk-pixbuf-gnome/buildlink.mk" .include "../../print/gnome-print/buildlink.mk" .include "../../textproc/libxml/buildlink.mk" .include "../../devel/popt/buildlink.mk" .include "../../devel/oaf/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile index c4802a4b409..fb2c1b22d8c 100644 --- a/devel/ddd/Makefile +++ b/devel/ddd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2001/10/23 13:14:49 jlam Exp $ +# $NetBSD: Makefile,v 1.38 2001/10/24 22:10:51 jlam Exp $ # DISTNAME= ddd-3.3 @@ -46,7 +46,7 @@ post-install: test: (cd ${WRKSRC} ; ${MAKE_PROGRAM} check) -.include "../../mk/x11.buildlink.mk" .include "../../graphics/xpm/buildlink.mk" .include "../../mk/motif.buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/gcvs/Makefile b/devel/gcvs/Makefile index 43e6206c2b3..74f545a5ed1 100644 --- a/devel/gcvs/Makefile +++ b/devel/gcvs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/10/23 13:14:50 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2001/10/24 22:10:52 jlam Exp $ DISTNAME= gcvs-1.0a7 CATEGORIES= devel @@ -22,7 +22,7 @@ post-patch: ${MV} -f ${WRKSRC}/configure.done ${WRKSRC}/configure ${CHMOD} +x ${WRKSRC}/configure -.include "../../mk/x11.buildlink.mk" .include "../../lang/tcl/buildlink.mk" .include "../../x11/gtk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/libdockapp/Makefile b/devel/libdockapp/Makefile index 0a2436a37aa..6967fb2e817 100644 --- a/devel/libdockapp/Makefile +++ b/devel/libdockapp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/10/23 13:14:50 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2001/10/24 22:10:52 jlam Exp $ # DISTNAME= libdockapp-0.4.0 @@ -18,6 +18,6 @@ post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libdockapp ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/libdockapp -.include "../../mk/x11.buildlink.mk" .include "../../graphics/xpm/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile index f5921e05765..ebf469b2f54 100644 --- a/devel/libglade/Makefile +++ b/devel/libglade/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2001/10/23 13:14:50 jlam Exp $ +# $NetBSD: Makefile,v 1.34 2001/10/24 22:10:53 jlam Exp $ # DISTNAME= libglade-0.17 @@ -23,9 +23,9 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig pre-configure: ${RM} ${WRKSRC}/libgladeConf.sh -.include "../../mk/x11.buildlink.mk" .include "../../devel/gettext-lib/buildlink.mk" .include "../../textproc/libxml/buildlink.mk" .include "../../x11/gnome-libs/buildlink.mk" .include "../../audio/esound/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/maketool/Makefile b/devel/maketool/Makefile index 7f2a786cc48..645687b5c14 100644 --- a/devel/maketool/Makefile +++ b/devel/maketool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2001/10/23 13:14:50 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2001/10/24 22:10:53 jlam Exp $ # DISTNAME= maketool-0.6.1 @@ -16,7 +16,7 @@ BUILD_USES_MSGFMT= YES USE_GMAKE= yes GNU_CONFIGURE= yes -.include "../../mk/x11.buildlink.mk" .include "../../devel/gettext-lib/buildlink.mk" .include "../../x11/gtk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index 6c124267387..00bba939c9e 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2001/10/23 13:14:50 jlam Exp $ +# $NetBSD: Makefile,v 1.38 2001/10/24 22:10:53 jlam Exp $ # # According to AbiSource's explanation of their trademark rights, # compilations/distributions of AbiWord not provided by AbiSource must @@ -61,9 +61,9 @@ post-install: ${CHMOD} -R a+r ${PREFIX}/share/AbiSuite PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL -.include "../../mk/x11.buildlink.mk" .include "../../converters/libiconv/buildlink.mk" .include "../../graphics/png/buildlink.mk" .include "../../graphics/xpm/buildlink.mk" .include "../../x11/gtk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile index f7f13765cf8..5efb6c5d335 100644 --- a/editors/nedit/Makefile +++ b/editors/nedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2001/10/23 13:14:51 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2001/10/24 22:10:53 jlam Exp $ DISTNAME= nedit-5.1.1-src PKGNAME= nedit-5.1.1 @@ -22,7 +22,7 @@ do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nedit ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/nedit -.include "../../mk/x11.buildlink.mk" .include "../../graphics/xpm/buildlink.mk" .include "../../mk/motif.buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/vim-gtk/Makefile b/editors/vim-gtk/Makefile index f1f5cb6987e..540c8eef5b3 100644 --- a/editors/vim-gtk/Makefile +++ b/editors/vim-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2001/10/23 13:14:51 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2001/10/24 22:10:54 jlam Exp $ .include "../vim-share/Makefile.common" @@ -27,7 +27,7 @@ post-install: ${LN} -s vim ${PREFIX}/bin/$$f; \ done -.include "../../mk/x11.buildlink.mk" .include "../../devel/ncurses/buildlink.mk" .include "../../x11/gtk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/vim-xaw/Makefile b/editors/vim-xaw/Makefile index 2c743f672e8..52a67ca9b31 100644 --- a/editors/vim-xaw/Makefile +++ b/editors/vim-xaw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2001/10/23 13:14:51 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2001/10/24 22:10:54 jlam Exp $ .include "../vim-share/Makefile.common" @@ -35,7 +35,7 @@ post-install: ${LN} -s vim ${PREFIX}/bin/$$f; \ done -.include "../../mk/x11.buildlink.mk" .include "../../devel/ncurses/buildlink.mk" .include "../../mk/xaw.buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile index 6f72f4f47b2..b5c46aed211 100644 --- a/emulators/vice/Makefile +++ b/emulators/vice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2001/10/23 13:14:51 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2001/10/24 22:10:54 jlam Exp $ # DISTNAME= vice-1.7 @@ -63,13 +63,13 @@ post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/vice ${MV} ${PREFIX}/share/doc/vice/*.html ${PREFIX}/share/doc/html/vice -.include "../../mk/x11.buildlink.mk" .include "../../audio/esound/buildlink.mk" .include "../../devel/readline/buildlink.mk" .include "../../devel/gettext-lib/buildlink.mk" .include "../../devel/zlib/buildlink.mk" #.include "../../graphics/png/buildlink.mk" .include "../../graphics/xpm/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" # This is the emulator's recommended setting. We place it last so that it diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile index 7fa69c0f5f5..c12395f454c 100644 --- a/emulators/zsnes/Makefile +++ b/emulators/zsnes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/10/23 13:14:51 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2001/10/24 22:10:54 jlam Exp $ # DISTNAME= zsnes1337src @@ -23,7 +23,7 @@ USE_GMAKE= # defined USE_CONFIG_WRAPPER= # defined USE_BUILDLINK_ONLY= # defined -.include "../../mk/x11.buildlink.mk" .include "../../devel/SDL/buildlink.mk" .include "../../graphics/png/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/baduki/Makefile b/games/baduki/Makefile index d29bc41ba37..07b30ead3d5 100644 --- a/games/baduki/Makefile +++ b/games/baduki/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2001/10/23 13:14:52 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2001/10/24 22:10:55 jlam Exp $ DISTNAME= baduki-0.2.9 CATEGORIES= games @@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= YES CONFIGURE_ARGS+= --without-included-gettext -.include "../../mk/x11.buildlink.mk" .include "../../devel/gettext-lib/buildlink.mk" .include "../../x11/gtk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/clanbomber/Makefile b/games/clanbomber/Makefile index 5dcb1c99893..7e605265487 100644 --- a/games/clanbomber/Makefile +++ b/games/clanbomber/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/10/23 13:14:52 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2001/10/24 22:10:55 jlam Exp $ DISTNAME= clanbomber-1.01 PKGNAME= ${DISTNAME}nb1 @@ -30,6 +30,6 @@ pre-build: exit 1; \ fi; -.include "../../mk/x11.buildlink.mk" .include "../../graphics/clanlib/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/fire/Makefile b/games/fire/Makefile index 748c2422480..2ae12a2a3f0 100644 --- a/games/fire/Makefile +++ b/games/fire/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/10/23 13:14:52 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2001/10/24 22:10:55 jlam Exp $ # DISTNAME= fire-1.0 @@ -12,6 +12,6 @@ COMMENT= organic fireworks demo USE_BUILDLINK_ONLY= YES GNU_CONFIGURE= YES -.include "../../mk/x11.buildlink.mk" .include "../../devel/SDL/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/freeciv-client-gtk/Makefile b/games/freeciv-client-gtk/Makefile index e8455dfe463..a5f7ebaf14e 100644 --- a/games/freeciv-client-gtk/Makefile +++ b/games/freeciv-client-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2001/10/23 13:14:52 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2001/10/24 22:10:55 jlam Exp $ PKGNAME= ${DISTNAME:S/-/-client-gtk-/} COMMENT= Freeciv client with GTK+ interface @@ -18,8 +18,8 @@ do-install: cd ${WRKSRC}/client; ${SETENV} ${MAKE_ENV} \ ${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET} -.include "../../mk/x11.buildlink.mk" .include "../../devel/zlib/buildlink.mk" .include "../../graphics/imlib/buildlink.mk" .include "../../x11/gtk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/freeciv-client/Makefile b/games/freeciv-client/Makefile index 6f6e3b7042c..9cd58d6031f 100644 --- a/games/freeciv-client/Makefile +++ b/games/freeciv-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2001/10/23 13:14:52 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2001/10/24 22:10:56 jlam Exp $ PKGNAME= ${DISTNAME:S/-/-client-/} COMMENT= Freeciv client with Xaw interface @@ -25,8 +25,8 @@ do-install: cd ${WRKSRC}/client; ${SETENV} ${MAKE_ENV} \ ${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET} -.include "../../mk/x11.buildlink.mk" .include "../../devel/zlib/buildlink.mk" .include "../../graphics/xpm/buildlink.mk" .include "../../mk/xaw.buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/gnome-chess/Makefile b/games/gnome-chess/Makefile index 71266155379..5a7c37c082c 100644 --- a/games/gnome-chess/Makefile +++ b/games/gnome-chess/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/10/23 13:14:53 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2001/10/24 22:10:56 jlam Exp $ DISTNAME= gnome-chess-0.3.3 CATEGORIES= games gnome @@ -11,6 +11,6 @@ COMMENT= GNOME's graphical interface for playing chess GNU_CONFIGURE= yes USE_X11BASE= yes -.include "../../mk/x11.buildlink.mk" .include "../../x11/gnome-core/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/imaze/Makefile b/games/imaze/Makefile index 9b76d2e9b97..62850ea09e8 100644 --- a/games/imaze/Makefile +++ b/games/imaze/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2001/10/23 13:14:53 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2001/10/24 22:10:56 jlam Exp $ DISTNAME= imaze1.3 PKGNAME= imaze-1.3 @@ -19,6 +19,6 @@ USE_X11BASE= yes post-build: cd ${WRKSRC} && ${PAX} -rf ${DISTDIR}/imaze-sounds.tar -.include "../../mk/x11.buildlink.mk" .include "../../mk/motif.buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/kulki/Makefile b/games/kulki/Makefile index 42e56958db7..035b08473e1 100644 --- a/games/kulki/Makefile +++ b/games/kulki/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/10/23 13:14:53 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2001/10/24 22:10:56 jlam Exp $ # DISTNAME= kulki-1.01 @@ -29,6 +29,6 @@ do-install: cd ${PREFIX}/share/kulki && \ ( ${GUNZIP_CMD} -c ${WRKSRC}/images.tgz | ${GTAR} xf - ) -.include "../../mk/x11.buildlink.mk" .include "../../x11/qt2-libs/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/lbreakout/Makefile b/games/lbreakout/Makefile index f8a091c751a..35a2f1723c7 100644 --- a/games/lbreakout/Makefile +++ b/games/lbreakout/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/10/23 13:14:54 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2001/10/24 22:10:56 jlam Exp $ # DISTNAME= lbreakout-010315 @@ -13,6 +13,6 @@ USE_BUILDLINK_ONLY= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --disable-sound -.include "../../mk/x11.buildlink.mk" .include "../../devel/SDL/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile index ed7500a5340..68e0f05e0ef 100644 --- a/games/nethack-qt/Makefile +++ b/games/nethack-qt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2001/10/23 13:14:54 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2001/10/24 22:10:57 jlam Exp $ # .include "../nethack-lib/Makefile.common" @@ -23,7 +23,7 @@ post-install: @${CP} -f ${WRKSRC}/dat/x11tiles ${WRKSRC}/dat/tiles.xpm @${INSTALL_DATA} ${WRKSRC}/dat/tiles.xpm ${PREFIX}/share/nethackdir -.include "../../mk/x11.buildlink.mk" .include "../../graphics/xpm/buildlink.mk" .include "../../x11/qt2-libs/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/nethack-x11/Makefile b/games/nethack-x11/Makefile index 7aa380283e3..4934cbb0ce1 100644 --- a/games/nethack-x11/Makefile +++ b/games/nethack-x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/10/23 13:14:54 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2001/10/24 22:10:57 jlam Exp $ # .include "../nethack-lib/Makefile.common" @@ -22,6 +22,6 @@ ALLFILES= ${DISTFILES} # don't checksum shared patches post-install: @${INSTALL_DATA} ${WRKSRC}/dat/x11tiles ${PREFIX}/share/nethackdir -.include "../../mk/x11.buildlink.mk" .include "../../graphics/xpm/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/newvox/Makefile b/games/newvox/Makefile index 9a35f89e607..6e755ff77b8 100644 --- a/games/newvox/Makefile +++ b/games/newvox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/10/23 13:14:54 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2001/10/24 22:10:57 jlam Exp $ # DISTNAME= newvox-1.0 @@ -12,6 +12,6 @@ COMMENT= voxel-style landscape rendering fly-by USE_BUILDLINK_ONLY= YES GNU_CONFIGURE= YES -.include "../../mk/x11.buildlink.mk" .include "../../devel/SDL/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/pacman/Makefile b/games/pacman/Makefile index 87d2ae7cdf0..3267db00b12 100644 --- a/games/pacman/Makefile +++ b/games/pacman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/10/23 13:14:54 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2001/10/24 22:10:57 jlam Exp $ DISTNAME= Pacman-0.3-CVS-00-11-17 PKGNAME= Pacman-0.3 @@ -33,6 +33,6 @@ pre-build: exit 1; \ fi; -.include "../../mk/x11.buildlink.mk" .include "../../graphics/clanlib/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xboard/Makefile b/games/xboard/Makefile index 2b067f70f35..613fd31425f 100644 --- a/games/xboard/Makefile +++ b/games/xboard/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2001/10/23 13:14:55 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2001/10/24 22:10:58 jlam Exp $ DISTNAME= xboard-4.2.3 CATEGORIES= games @@ -22,7 +22,7 @@ CONFIGURE_ARGS+= --enable-zippy # interface to ICS CONFIGURE_ARGS+= --with-Xaw3d .endif -.include "../../mk/x11.buildlink.mk" .include "../../graphics/xpm/buildlink.mk" .include "../../mk/xaw.buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xconq/Makefile b/games/xconq/Makefile index 89a3e2fbbdf..d59e0d229d4 100644 --- a/games/xconq/Makefile +++ b/games/xconq/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/10/23 13:25:30 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2001/10/24 22:10:58 jlam Exp $ DISTNAME= xconq-7.4.1 CATEGORIES= games x11 @@ -26,6 +26,6 @@ post-build: post-install: cd ${WRKSRC}/doc && ${MAKE_PROGRAM} install-info -.include "../../mk/x11.buildlink.mk" .include "../../x11/tk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xracer/Makefile b/games/xracer/Makefile index f607437ca31..891a77e66da 100644 --- a/games/xracer/Makefile +++ b/games/xracer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2001/10/23 13:14:55 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2001/10/24 22:10:58 jlam Exp $ # DISTNAME= xracer-0.96.9 @@ -39,8 +39,8 @@ pre-patch: @${RM} ${WRKSRC}/tools/${perlfile}.BAK .endfor -.include "../../mk/x11.buildlink.mk" .include "../../devel/gettext-lib/buildlink.mk" .include "../../graphics/Mesa/buildlink.mk" .include "../../graphics/jpeg/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index 687f34324a6..47c00a49efd 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.79 2001/10/23 13:14:55 jlam Exp $ +# $NetBSD: Makefile,v 1.80 2001/10/24 22:10:58 jlam Exp $ DISTNAME= ImageMagick-5.3.9 CATEGORIES= graphics @@ -39,9 +39,9 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/Copyright.txt ${WRKSRC}/QuickStart.txt \ ${PREFIX}/share/ImageMagick -.include "../../mk/x11.buildlink.mk" .include "../../archivers/bzip2/buildlink.mk" .include "../../graphics/jpeg/buildlink.mk" .include "../../graphics/png/buildlink.mk" .include "../../graphics/tiff/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/Ngraph/Makefile b/graphics/Ngraph/Makefile index 5e59f419b06..19b84a5795e 100644 --- a/graphics/Ngraph/Makefile +++ b/graphics/Ngraph/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/10/23 13:14:55 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2001/10/24 22:10:59 jlam Exp $ # DISTNAME= Ngraph-6.3.06-src @@ -24,6 +24,6 @@ post-extract: post-install: ${GTAR} -C ${PREFIX}/libexec/Ngraph -xzf ${DISTDIR}/Ngraph-6.3-doc.tar.gz -.include "../../mk/x11.buildlink.mk" .include "../../mk/motif.buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/SDL-image/Makefile b/graphics/SDL-image/Makefile index 434ce9dd42a..608ec7994f6 100644 --- a/graphics/SDL-image/Makefile +++ b/graphics/SDL-image/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/10/23 13:14:55 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2001/10/24 22:10:59 jlam Exp $ # DISTNAME= SDL_image-1.2.0 @@ -16,8 +16,8 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig USE_BUILDLINK_ONLY= YES -.include "../../mk/x11.buildlink.mk" .include "../../graphics/jpeg/buildlink.mk" .include "../../graphics/png/buildlink.mk" .include "../../devel/SDL/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile index d0fb05cf78c..03d80742de6 100644 --- a/graphics/autotrace/Makefile +++ b/graphics/autotrace/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/10/23 13:14:56 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2001/10/24 22:10:59 jlam Exp $ # DISTNAME= autotrace-0.26 @@ -13,6 +13,6 @@ COMMENT= convert bitmap to vector graphics USE_BUILDLINK_ONLY= YES GNU_CONFIGURE= YES -.include "../../mk/x11.buildlink.mk" .include "../../graphics/ImageMagick/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/avifile-devel/Makefile b/graphics/avifile-devel/Makefile index 7551e3948fc..5d0fc09fbc5 100644 --- a/graphics/avifile-devel/Makefile +++ b/graphics/avifile-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2001/10/23 13:14:56 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2001/10/24 22:10:59 jlam Exp $ # DISTNAME= avifile-0.6.20010814 @@ -62,6 +62,6 @@ CONFIGURE_ARGS+= --with-qt-dir="${BUILDLINK_DIR}/qt2" pre-configure: cd ${WRKSRC} && ${SH} autogen.sh -.include "../../mk/x11.buildlink.mk" .include "../../devel/SDL/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/clanlib/Makefile b/graphics/clanlib/Makefile index 5d21b9abe14..be24fc3249a 100644 --- a/graphics/clanlib/Makefile +++ b/graphics/clanlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2001/10/23 13:14:56 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2001/10/24 22:10:59 jlam Exp $ DISTNAME= ClanLib-0.4.4 CATEGORIES= graphics games devel x11 @@ -34,12 +34,12 @@ post-patch: .include "../../mk/bsd.prefs.mk" -.include "../../mk/x11.buildlink.mk" .include "../../graphics/hermes/buildlink.mk" .include "../../graphics/png/buildlink.mk" .include "../../graphics/Mesa/buildlink.mk" .include "../../devel/pth/buildlink.mk" .include "../../mk/ossaudio.buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" .if ${OPSYS} == "NetBSD" diff --git a/graphics/dx/Makefile b/graphics/dx/Makefile index 390c29454eb..0050d52f677 100644 --- a/graphics/dx/Makefile +++ b/graphics/dx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/10/23 13:14:56 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2001/10/24 22:11:00 jlam Exp $ DISTNAME= dx-4.1.0 CATEGORIES= graphics @@ -36,7 +36,6 @@ post-patch: ${MV} -f $${file}.fixed $${file}; \ done -.include "../../mk/x11.buildlink.mk" .include "../../devel/netcdf/buildlink.mk" .include "../../graphics/Mesa/buildlink.mk" .include "../../graphics/freetype-lib/buildlink.mk" @@ -44,4 +43,5 @@ post-patch: .include "../../graphics/png/buildlink.mk" .include "../../graphics/tiff/buildlink.mk" .include "../../mk/motif.buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile index 097e52204d6..886bed2d365 100644 --- a/graphics/fnlib/Makefile +++ b/graphics/fnlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2001/10/23 13:14:56 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2001/10/24 22:11:00 jlam Exp $ DISTNAME= fnlib-0.5 CATEGORIES= x11 graphics @@ -31,6 +31,6 @@ post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fnlib ${INSTALL_DATA} ${WRKSRC}/doc/fontinfo.README ${PREFIX}/share/doc/fnlib -.include "../../mk/x11.buildlink.mk" .include "../../graphics/imlib/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/freetype-utils/Makefile b/graphics/freetype-utils/Makefile index 86a202ae7a2..a8c441ac423 100644 --- a/graphics/freetype-utils/Makefile +++ b/graphics/freetype-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/10/23 13:14:57 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2001/10/24 22:11:00 jlam Exp $ PKGNAME= freetype-utils-${FT_VERS} COMMENT= Utilities for manipulating TrueType fonts @@ -12,6 +12,6 @@ CONFIGURE_ARGS+= --with-x ALL_TARGET= tttest INSTALL_TARGET= install-tttest -.include "../../mk/x11.buildlink.mk" .include "../../graphics/freetype-lib/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile index ba99acb7ebf..bd0966de6dc 100644 --- a/graphics/gd/Makefile +++ b/graphics/gd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2001/10/23 13:14:57 jlam Exp $ +# $NetBSD: Makefile,v 1.33 2001/10/24 22:11:00 jlam Exp $ # FreeBSD Id: Makefile,v 1.2 1997/02/14 07:55:45 asami Exp # @@ -31,10 +31,10 @@ GD_MAJOR= 1 GD_MINOR= 9 MAKE_ENV+= GD_MAJOR="${GD_MAJOR}" GD_MINOR="${GD_MINOR}" COMPILER="${CC}" -.include "../../mk/x11.buildlink.mk" .include "../../devel/zlib/buildlink.mk" .include "../../graphics/freetype-lib/buildlink.mk" .include "../../graphics/jpeg/buildlink.mk" .include "../../graphics/png/buildlink.mk" .include "../../graphics/xpm/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile index d6351c06378..a9c1cb86c55 100644 --- a/graphics/geomview/Makefile +++ b/graphics/geomview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2001/10/23 13:14:58 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2001/10/24 22:11:00 jlam Exp $ DISTNAME= geomview-1.8.1 CATEGORIES= graphics math @@ -40,7 +40,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/html/pix/* \ ${PREFIX}/share/doc/html/geomview/pix -.include "../../mk/x11.buildlink.mk" .include "../../graphics/Mesa/buildlink.mk" .include "../../mk/motif.buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/gfract/Makefile b/graphics/gfract/Makefile index 2cfb9f33dc2..d5434d1a36d 100644 --- a/graphics/gfract/Makefile +++ b/graphics/gfract/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/10/23 13:14:58 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2001/10/24 22:11:01 jlam Exp $ # DISTNAME= gfract-0.21 @@ -35,7 +35,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/gfract.xpm ${PREFIX}/share/gfract/ ${INSTALL_PROGRAM} ${WRKSRC}/gfract ${PREFIX}/bin/ -.include "../../mk/x11.buildlink.mk" .include "../../graphics/png/buildlink.mk" .include "../../x11/gtk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile index 650aa42f9be..524661a8f94 100644 --- a/graphics/gimp/Makefile +++ b/graphics/gimp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.74 2001/10/23 13:14:58 jlam Exp $ +# $NetBSD: Makefile,v 1.75 2001/10/24 22:11:01 jlam Exp $ DISTNAME= gimp-1.2.2 CATEGORIES= graphics @@ -66,8 +66,8 @@ post-install: ${LN} -fs ${PREFIX}/share/aclocal/gimp.m4 \ ${LOCALBASE}/share/aclocal/gimp.m4 -.include "../../mk/x11.buildlink.mk" .include "../../devel/gettext-lib/buildlink.mk" .include "../../graphics/mpeg-lib/buildlink.mk" .include "../../x11/gnome-libs/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/gle/Makefile b/graphics/gle/Makefile index 5802d757ac4..e0cfdb0806f 100644 --- a/graphics/gle/Makefile +++ b/graphics/gle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/10/23 13:14:58 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2001/10/24 22:11:01 jlam Exp $ # DISTNAME= gle-3.0.3 @@ -18,6 +18,6 @@ USE_BUILDLINK_ONLY= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -.include "../../mk/x11.buildlink.mk" .include "../../graphics/Mesa/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile index 46a0015376d..22eaaffc8e6 100644 --- a/graphics/gqview/Makefile +++ b/graphics/gqview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2001/10/23 13:14:58 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2001/10/24 22:11:01 jlam Exp $ # DISTNAME= gqview-0.12.0 @@ -19,8 +19,8 @@ CONFIGURE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" BUILDLINK_DEPENDS.gdk-pixbuf= gdk-pixbuf>=0.9.0 -.include "../../mk/x11.buildlink.mk" .include "../../devel/gettext-lib/buildlink.mk" .include "../../graphics/gdk-pixbuf/buildlink.mk" .include "../../x11/gtk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile index 570dd32ffed..ceffdc47018 100644 --- a/graphics/imlib/Makefile +++ b/graphics/imlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.59 2001/10/23 13:14:59 jlam Exp $ +# $NetBSD: Makefile,v 1.60 2001/10/24 22:11:02 jlam Exp $ # DISTNAME= imlib-1.9.11 @@ -42,7 +42,6 @@ post-install: ${LN} -fs ${PREFIX}/share/aclocal/imlib.m4 \ ${LOCALBASE}/share/aclocal/imlib.m4 -.include "../../mk/x11.buildlink.mk" .include "../../devel/gettext-lib/buildlink.mk" .include "../../graphics/jpeg/buildlink.mk" .include "../../graphics/libungif/buildlink.mk" @@ -50,4 +49,5 @@ post-install: .include "../../graphics/png/buildlink.mk" .include "../../graphics/tiff/buildlink.mk" .include "../../x11/gtk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile index 1928c3209cb..a3835d7c588 100644 --- a/graphics/libwmf/Makefile +++ b/graphics/libwmf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2001/10/23 13:14:59 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2001/10/24 22:11:02 jlam Exp $ # DISTNAME= libwmf-0.2.1 @@ -20,9 +20,9 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig INCLUDEDIR= ${PREFIX}/include/libwmf HTMLDIR= ${PREFIX}/share/doc/html/libwmf -.include "../../mk/x11.buildlink.mk" .include "../../graphics/freetype2/buildlink.mk" .include "../../graphics/png/buildlink.mk" .include "../../graphics/xpm/buildlink.mk" .include "../../textproc/libxml2/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/php4-gd/Makefile b/graphics/php4-gd/Makefile index 08ec7d4f7c2..d6766896ef1 100644 --- a/graphics/php4-gd/Makefile +++ b/graphics/php4-gd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/10/23 13:14:59 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2001/10/24 22:11:02 jlam Exp $ .include "../../www/php4/Makefile.module" @@ -18,6 +18,6 @@ CONFIGURE_ARGS+= --with-ttf=shared,${BUILDLINK_DIR} CONFIGURE_ARGS+= --enable-${MODNAME}-native-ttf CONFIGURE_ARGS+= --without-t1lib -.include "../../mk/x11.buildlink.mk" .include "../../graphics/gd/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/tcm/Makefile b/graphics/tcm/Makefile index f6b761c1499..1387e5981dc 100644 --- a/graphics/tcm/Makefile +++ b/graphics/tcm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/10/23 13:14:59 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2001/10/24 22:11:02 jlam Exp $ DISTNAME= tcm-2.01.src PKGNAME= tcm-2.01 @@ -84,8 +84,8 @@ do-install: ${INSTALL_DATA} ${TCM_SRC}/doc/wishlist/* \ ${PREFIX}/share/doc/html/tcm/wishlist/ -.include "../../mk/x11.buildlink.mk" .include "../../mk/motif.buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" .if defined(MOTIF_TYPE) && (${MOTIF_TYPE} == "lesstif") diff --git a/graphics/xzgv/Makefile b/graphics/xzgv/Makefile index 35a34dfc6bd..200a89e30db 100644 --- a/graphics/xzgv/Makefile +++ b/graphics/xzgv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/10/23 13:14:59 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2001/10/24 22:11:03 jlam Exp $ DISTNAME= xzgv-0.7 CATEGORIES= graphics @@ -22,6 +22,6 @@ do-install: @for f in xzgv xzgv-1 xzgv-2 xzgv-3 ; do \ ${INSTALL_DATA} ${WRKSRC}/doc/$$f ${PREFIX}/info ; done -.include "../../mk/x11.buildlink.mk" .include "../../graphics/imlib/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile index c2b9f9e23ff..2d2831bef8f 100644 --- a/mail/sylpheed/Makefile +++ b/mail/sylpheed/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/10/23 13:15:00 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2001/10/24 22:11:03 jlam Exp $ DISTNAME= sylpheed-0.6.3 CATEGORIES= mail news x11 @@ -19,7 +19,7 @@ CONFIGURE_ARGS+= --enable-nls CONFIGURE_ARGS+= --enable-ipv6 CONFIGURE_ARGS+= --enable-ssl -.include "../../mk/x11.buildlink.mk" .include "../../security/openssl/buildlink.mk" .include "../../x11/gtk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/R/Makefile b/math/R/Makefile index 9c31f4863c0..dbcedea133d 100644 --- a/math/R/Makefile +++ b/math/R/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2001/08/27 14:35:10 tron Exp $ +# $NetBSD: Makefile,v 1.28 2001/10/24 22:11:04 jlam Exp $ DISTNAME= R-1.3.0 CATEGORIES= math @@ -108,4 +108,5 @@ post-install: .include "../../graphics/png/buildlink.mk" .include "../../math/blas/buildlink.mk" .include "../../x11/tk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile index b202cb48af9..81851500789 100644 --- a/math/gnumeric/Makefile +++ b/math/gnumeric/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2001/10/23 13:15:00 jlam Exp $ +# $NetBSD: Makefile,v 1.39 2001/10/24 22:11:04 jlam Exp $ # DISTNAME= gnumeric-0.71 @@ -32,7 +32,6 @@ pre-configure: ${MV} $$i.fixed $$i ; \ done -.include "../../mk/x11.buildlink.mk" .include "../../devel/gettext-lib/buildlink.mk" .include "../../textproc/libxml/buildlink.mk" .include "../../devel/libglade/buildlink.mk" @@ -40,4 +39,5 @@ pre-configure: .include "../../devel/oaf/buildlink.mk" .include "../../devel/gal/buildlink.mk" .include "../../lang/gb/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/grace/Makefile b/math/grace/Makefile index 4eda2209a48..7ee908aee7c 100644 --- a/math/grace/Makefile +++ b/math/grace/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2001/10/23 13:15:00 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2001/10/24 22:11:04 jlam Exp $ # DISTNAME= grace-5.1.4 @@ -29,7 +29,6 @@ post-install: ${RM} -f ${PREFIX}/bin/xmgrace ${LN} -s ${PREFIX}/grace/bin/xmgrace ${PREFIX}/bin -.include "../../mk/x11.buildlink.mk" .include "../../devel/netcdf/buildlink.mk" .include "../../graphics/jpeg/buildlink.mk" .include "../../graphics/png/buildlink.mk" @@ -39,4 +38,5 @@ post-install: .include "../../textproc/t1lib/buildlink.mk" .include "../../x11/Xbae/buildlink.mk" .include "../../mk/motif.buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/xmgr/Makefile b/math/xmgr/Makefile index 7fa42618a02..ace4f33caa1 100644 --- a/math/xmgr/Makefile +++ b/math/xmgr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2001/10/23 13:15:00 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2001/10/24 22:11:04 jlam Exp $ # FreeBSD Id: Makefile,v 1.13 1998/12/12 22:27:21 jseger Exp # @@ -29,8 +29,8 @@ EXTRA_INCDIRS= ${BUILDLINK_DIR}/include/X11:${BUILDLINK_DIR}/include ALL_TARGET= # empty INSTALL_TARGET= install -.include "../../mk/x11.buildlink.mk" .include "../../devel/netcdf/buildlink.mk" .include "../../graphics/xpm/buildlink.mk" .include "../../mk/motif.buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mk/x11.buildlink.mk b/mk/x11.buildlink.mk index 8c8cf9b2a97..35c496e8275 100644 --- a/mk/x11.buildlink.mk +++ b/mk/x11.buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: x11.buildlink.mk,v 1.10 2001/10/23 13:15:00 jlam Exp $ +# $NetBSD: x11.buildlink.mk,v 1.11 2001/10/24 22:11:05 jlam Exp $ # # This Makefile fragment is included by packages that use X11. # @@ -10,9 +10,6 @@ # # NOTE: This file must be included _before_ bsd.pkg.mk. # NOTE: This file should _not_ be included in any package's buildlink.mk file. -# NOTE: This file should be included _before_ any buildlink.mk files that -# use X11_BUILDLINK_MK as a test value. Generally, this file should be -# included before the other buildlink.mk files. .if !defined(X11_BUILDLINK_MK) X11_BUILDLINK_MK= # defined diff --git a/net/gtk-gnutella/Makefile b/net/gtk-gnutella/Makefile index 9211e337171..9739ad2c9ac 100644 --- a/net/gtk-gnutella/Makefile +++ b/net/gtk-gnutella/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/10/23 13:15:01 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2001/10/24 22:11:05 jlam Exp $ # DISTNAME= gtk-gnutella-0.16 @@ -17,6 +17,6 @@ post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gtk-gnutella ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/gtk-gnutella -.include "../../mk/x11.buildlink.mk" .include "../../x11/gtk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/news/pan/Makefile b/news/pan/Makefile index e4e990a3686..77d78b84f5f 100644 --- a/news/pan/Makefile +++ b/news/pan/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/10/23 13:15:01 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2001/10/24 22:11:05 jlam Exp $ # DISTNAME= pan-0.10.0.93 @@ -18,7 +18,7 @@ GNU_CONFIGURE= YES CONFIGURE_ENV+= LOCALEDIR="${PKGLOCALEDIR}" CPPFLAGS+= -D_POSIX_THREAD_SYSCALL_SOFT=1 -.include "../../mk/x11.buildlink.mk" .include "../../devel/gettext-lib/buildlink.mk" .include "../../x11/gnome-core/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile index 40b7ef15e62..574fa8f1334 100644 --- a/print/gnome-print/Makefile +++ b/print/gnome-print/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2001/10/23 13:15:01 jlam Exp $ +# $NetBSD: Makefile,v 1.43 2001/10/24 22:11:05 jlam Exp $ # DISTNAME= gnome-print-0.29 @@ -23,8 +23,8 @@ MAKE_ENV+= HOME=${WRKSRC} CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -.include "../../mk/x11.buildlink.mk" .include "../../graphics/gdk-pixbuf-gnome/buildlink.mk" .include "../../textproc/libunicode/buildlink.mk" .include "../../textproc/libxml/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/mgv/Makefile b/print/mgv/Makefile index 7a339efb041..e790b823652 100644 --- a/print/mgv/Makefile +++ b/print/mgv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/10/23 13:15:01 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2001/10/24 22:11:06 jlam Exp $ DISTNAME= mgv-3.1.5 CATEGORIES= print @@ -21,7 +21,7 @@ post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html ${LN} -fs ${PREFIX}/share/mgv/3.1.5/help ${PREFIX}/share/doc/html/mgv -.include "../../mk/x11.buildlink.mk" .include "../../graphics/xpm/buildlink.mk" .include "../../mk/motif.buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/xpdf/Makefile b/print/xpdf/Makefile index 46175962371..36f576855f3 100644 --- a/print/xpdf/Makefile +++ b/print/xpdf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/10/23 13:15:01 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2001/10/24 22:11:06 jlam Exp $ # DISTNAME= xpdf-0.92 @@ -37,8 +37,8 @@ post-install: ${FILESDIR}/xpdf-app-defaults \ > ${X11PREFIX}/lib/X11/app-defaults/Xpdf -.include "../../mk/x11.buildlink.mk" .include "../../graphics/freetype-lib/buildlink.mk" .include "../../graphics/xpm/buildlink.mk" .include "../../textproc/t1lib/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/xpp/Makefile b/print/xpp/Makefile index d2e2ee114cf..3d6b843e715 100644 --- a/print/xpp/Makefile +++ b/print/xpp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/10/23 13:15:02 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2001/10/24 22:11:06 jlam Exp $ DISTNAME= xpp-1.0 CATEGORIES= print x11 @@ -21,7 +21,7 @@ post-install: ${INSTALL_DATA_DIR} ${DOCDIR} cd ${WRKSRC}; ${INSTALL_DATA} LICENSE README ${DOCDIR} -.include "../../mk/x11.buildlink.mk" .include "../../print/cups/buildlink.mk" .include "../../x11/fltk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/asapm/Makefile b/sysutils/asapm/Makefile index d959e51e4f6..e242393645f 100644 --- a/sysutils/asapm/Makefile +++ b/sysutils/asapm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2001/10/23 13:15:02 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2001/10/24 22:11:06 jlam Exp $ # FreeBSD Id: Makefile,v 1.5 1998/11/29 12:43:12 asami Exp # @@ -23,6 +23,6 @@ CONFIGURE_ARGS+= --with-xpm CONFIGURE_ARGS+= --with-xpm-includes=${BUILDLINK_DIR}/include CONFIGURE_ARGS+= --with-xpm-library=${BUILDLINK_DIR}/lib -.include "../../mk/x11.buildlink.mk" .include "../../graphics/xpm/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/fsviewer/Makefile b/sysutils/fsviewer/Makefile index 1f5fedcc051..00bbb93b697 100644 --- a/sysutils/fsviewer/Makefile +++ b/sysutils/fsviewer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/10/23 13:15:02 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2001/10/24 22:11:06 jlam Exp $ # DISTNAME= FSViewer.app-0.2.3 @@ -26,6 +26,6 @@ post-install: cd ${PREFIX}/GNUstep/Apps/FSViewer.app && \ ${PAX} -zrf ${_DISTDIR}${DISTSUBDIR}/icons.tar.gz *.xpm *.tif -.include "../../mk/x11.buildlink.mk" .include "../../wm/windowmaker/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile index b2d4664cc22..1ca24111942 100644 --- a/sysutils/gkrellm/Makefile +++ b/sysutils/gkrellm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/10/23 13:15:02 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2001/10/24 22:11:07 jlam Exp $ # DISTNAME= gkrellm-1.2.2 @@ -21,8 +21,8 @@ post-install: ${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm ${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm/plugins -.include "../../mk/x11.buildlink.mk" .include "../../devel/pth/buildlink.mk" .include "../../graphics/imlib/buildlink.mk" .include "../../x11/gtk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xnc/Makefile b/sysutils/xnc/Makefile index 0408b20413e..6c9a3d22415 100644 --- a/sysutils/xnc/Makefile +++ b/sysutils/xnc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/10/23 13:15:02 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2001/10/24 22:11:07 jlam Exp $ DISTNAME= xnc-4.4.5.src PKGNAME= xnc-4.4.5 @@ -18,7 +18,7 @@ post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xnc ${INSTALL_DATA} ${WRKSRC}/Docs/* ${PREFIX}/share/doc/xnc -.include "../../mk/x11.buildlink.mk" .include "../../graphics/jpeg/buildlink.mk" .include "../../graphics/png/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile index 8d313e6ea2a..9f47e06dd0e 100644 --- a/sysutils/xosview/Makefile +++ b/sysutils/xosview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2001/10/23 13:15:03 jlam Exp $ +# $NetBSD: Makefile,v 1.38 2001/10/24 22:11:07 jlam Exp $ # DISTNAME= xosview-1.7.0.b @@ -31,6 +31,6 @@ LIBS+= -lsocket -lnsl USE_GMAKE= YES .endif -.include "../../mk/x11.buildlink.mk" .include "../../graphics/xpm/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xps/Makefile b/sysutils/xps/Makefile index 4cd831821a5..0d3db08aea1 100644 --- a/sysutils/xps/Makefile +++ b/sysutils/xps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2001/10/23 13:15:03 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2001/10/24 22:11:07 jlam Exp $ DISTNAME= xps-3.14 CATEGORIES= sysutils @@ -17,6 +17,6 @@ USE_BUILDLINK_ONLY= # defined GNU_CONFIGURE= # defined CONFIGURE_ENV+= XINCLUDES="-I${BUILDLINK_X11_DIR}/include" -.include "../../mk/x11.buildlink.mk" .include "../../mk/motif.buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/asclock-gtk/Makefile b/time/asclock-gtk/Makefile index 30b3c1b1e35..a070394d023 100644 --- a/time/asclock-gtk/Makefile +++ b/time/asclock-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/10/23 13:15:03 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2001/10/24 22:11:07 jlam Exp $ # DISTNAME= asclock-gtk-2.1.10beta @@ -37,6 +37,6 @@ do-install: ${CP} -R ${WRKSRC}/themes/* ${PREFIX}/share/asclock-gtk ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/asclock-gtk -.include "../../mk/x11.buildlink.mk" .include "../../x11/gtk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/glclock/Makefile b/time/glclock/Makefile index 2705bf648bc..35830ae10a6 100644 --- a/time/glclock/Makefile +++ b/time/glclock/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/10/23 13:15:03 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2001/10/24 22:11:08 jlam Exp $ # DISTNAME= glclock-6.0b6.0 @@ -26,6 +26,6 @@ do-install: # mwclock woodclock;do \ # ${INSTALL_SCRIPT} ${WRKSRC}/$$i ${PREFIX}/bin; done -.include "../../mk/x11.buildlink.mk" .include "../../graphics/Mesa/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/plan/Makefile b/time/plan/Makefile index 3ff1940810d..502bfcb39a1 100644 --- a/time/plan/Makefile +++ b/time/plan/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/10/23 13:15:03 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2001/10/24 22:11:08 jlam Exp $ # DISTNAME= plan-1.8.4 @@ -22,6 +22,6 @@ pre-install: ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/$$f ${PREFIX}/share/plan; \ done -.include "../../mk/x11.buildlink.mk" .include "../../mk/motif.buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/afterstep/Makefile b/wm/afterstep/Makefile index 7b57e495748..5f5e64cb7dc 100644 --- a/wm/afterstep/Makefile +++ b/wm/afterstep/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2001/10/23 13:15:04 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2001/10/24 22:11:08 jlam Exp $ DISTNAME= AfterStep-1.8.9 PKGNAME= afterstep-1.8.9 @@ -40,9 +40,9 @@ pre-configure: ${CHMOD} 755 configure; \ autoheader --localdir=autoconf autoconf/configure.in > autoconf/config.h.in; -.include "../../mk/x11.buildlink.mk" .include "../../audio/rplay/buildlink.mk" .include "../../graphics/jpeg/buildlink.mk" .include "../../graphics/png/buildlink.mk" .include "../../graphics/xpm/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/amaterus/Makefile b/wm/amaterus/Makefile index 0be2f9ddaeb..740d4ecf651 100644 --- a/wm/amaterus/Makefile +++ b/wm/amaterus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/10/23 13:15:04 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2001/10/24 22:11:08 jlam Exp $ DISTNAME= amaterus-0.34.1 CATEGORIES= wm @@ -16,7 +16,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/amaterus ${INSTALL_DATA} ${WRKSRC}/README.en ${PREFIX}/share/doc/amaterus -.include "../../mk/x11.buildlink.mk" .include "../../textproc/libxml/buildlink.mk" .include "../../x11/gtk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/enlightenment/Makefile b/wm/enlightenment/Makefile index 505c57789d7..63be6ffa60b 100644 --- a/wm/enlightenment/Makefile +++ b/wm/enlightenment/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/10/23 13:15:04 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2001/10/24 22:11:09 jlam Exp $ DISTNAME= enlightenment-0.16.4 CATEGORIES= x11 gnome wm @@ -38,10 +38,10 @@ post-install: ${FIND} ${PREFIX}/share/enlightenment/themes -type f | \ ${XARGS} ${CHMOD} ${NONBINMODE} -.include "../../mk/x11.buildlink.mk" .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 "../../mk/bsd.pkg.mk" diff --git a/wm/flwm/Makefile b/wm/flwm/Makefile index 0d99213360f..92db899190a 100644 --- a/wm/flwm/Makefile +++ b/wm/flwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/10/23 13:15:05 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2001/10/24 22:11:09 jlam Exp $ # DISTNAME= flwm-1.00 @@ -16,6 +16,6 @@ USE_X11BASE= # defined GNU_CONFIGURE= # defined CONFIGURE_ENV+= X_LIBS="-lGL" -.include "../../mk/x11.buildlink.mk" .include "../../x11/fltk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/icewm-gnome/Makefile b/wm/icewm-gnome/Makefile index e080e0873ed..3aa46418062 100644 --- a/wm/icewm-gnome/Makefile +++ b/wm/icewm-gnome/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/10/23 13:15:05 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2001/10/24 22:11:09 jlam Exp $ PKGNAME= ${DISTNAME:S/-/-gnome-/} COMMENT= small, fast and light-weight window manager (GNOME version) @@ -12,6 +12,6 @@ USE_BUILDLINK_ONLY= # defined CONFIGURE_ARGS+= --with-gnome-menus="${GNOME_CONFIG}" CONFIGURE_ARGS+= --with-imlib -.include "../../mk/x11.buildlink.mk" .include "../../x11/gnome-libs/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/icewm/Makefile b/wm/icewm/Makefile index 54d60a0f16c..8b74bd2ec9e 100644 --- a/wm/icewm/Makefile +++ b/wm/icewm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/10/23 13:15:05 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2001/10/24 22:11:09 jlam Exp $ # COMMENT= small, fast and light-weight window manager @@ -8,6 +8,6 @@ CONFLICTS+= icewm-gnome-[0-9]* USE_BUILDLINK_ONLY= # defined .include "Makefile.common" -.include "../../mk/x11.buildlink.mk" .include "../../graphics/xpm/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile index dfa8220189b..fbe51506501 100644 --- a/wm/windowmaker/Makefile +++ b/wm/windowmaker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2001/10/23 13:15:05 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2001/10/24 22:11:09 jlam Exp $ DISTNAME= WindowMaker-0.70.0 PKGNAME= windowmaker-0.70.0 @@ -79,7 +79,6 @@ post-install: FAQ FAQ.I18N \ ${PREFIX}/share/doc/WindowMaker -.include "../../mk/x11.buildlink.mk" .include "../../devel/gettext-lib/buildlink.mk" .include "../../graphics/hermes/buildlink.mk" .include "../../graphics/libungif/buildlink.mk" @@ -87,4 +86,5 @@ post-install: .include "../../graphics/png/buildlink.mk" .include "../../graphics/tiff/buildlink.mk" .include "../../graphics/xpm/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/wmakerconf/Makefile b/wm/wmakerconf/Makefile index 0359fd6d96d..434d8511ac4 100644 --- a/wm/wmakerconf/Makefile +++ b/wm/wmakerconf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/10/23 13:15:06 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2001/10/24 22:11:10 jlam Exp $ # DISTNAME= wmakerconf-2.8.1 @@ -15,10 +15,10 @@ USE_X11BASE= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= wraster="${GET_WRASTER_FLAGS}" -.include "../../mk/x11.buildlink.mk" .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 "../../mk/bsd.pkg.mk" diff --git a/www/Mosaic/Makefile b/www/Mosaic/Makefile index 6a6a804741b..0a9b61670bb 100644 --- a/www/Mosaic/Makefile +++ b/www/Mosaic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2001/10/23 13:15:06 jlam Exp $ +# $NetBSD: Makefile,v 1.33 2001/10/24 22:11:10 jlam Exp $ # FreeBSD Id: Makefile,v 1.15 1998/05/27 08:44:56 dburr Exp # @@ -38,10 +38,10 @@ do-install: ${PREFIX}/lib/X11/app-defaults/Mosaic ${INSTALL_DATA_DIR} ${PREFIX}/share/mosaic -.include "../../mk/x11.buildlink.mk" .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 "../../mk/bsd.pkg.mk" diff --git a/www/amaya/Makefile b/www/amaya/Makefile index 99179439d70..4e5f3383772 100644 --- a/www/amaya/Makefile +++ b/www/amaya/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/10/23 13:15:06 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2001/10/24 22:11:10 jlam Exp $ DISTNAME= amaya-src-5.1 PKGNAME= amaya-5.1 @@ -47,9 +47,9 @@ post-patch: pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/lib/Amaya -.include "../../mk/x11.buildlink.mk" .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 "../../mk/bsd.pkg.mk" diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile index 2d465fac2be..f51af11500a 100644 --- a/www/gtkhtml/Makefile +++ b/www/gtkhtml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2001/10/23 13:15:06 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2001/10/24 22:11:10 jlam Exp $ DISTNAME= gtkhtml-0.14.0 CATEGORIES= www gnome @@ -17,11 +17,11 @@ GNU_CONFIGURE= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -.include "../../mk/x11.buildlink.mk" .include "../../devel/bonobo/buildlink.mk" .include "../../devel/gal/buildlink.mk" .include "../../print/gnome-print/buildlink.mk" .include "../../www/glibwww/buildlink.mk" .include "../../www/libghttp/buildlink.mk" .include "../../x11/controlcenter/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/Xbae/Makefile b/x11/Xbae/Makefile index 02be864c87c..d9de519736f 100644 --- a/x11/Xbae/Makefile +++ b/x11/Xbae/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/10/23 13:15:06 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2001/10/24 22:11:11 jlam Exp $ # DISTNAME= Xbae-4.9.1 @@ -25,6 +25,6 @@ post-install: ${LN} -fs ${PREFIX}/share/aclocal/ac_find_xbae.m4 \ ${LOCALBASE}/share/aclocal/ac_find_xbae.m4 -.include "../../mk/x11.buildlink.mk" .include "../../mk/motif.buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/XmHTML/Makefile b/x11/XmHTML/Makefile index f764b733a51..29ba6b436f2 100644 --- a/x11/XmHTML/Makefile +++ b/x11/XmHTML/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2001/10/23 13:15:07 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2001/10/24 22:11:11 jlam Exp $ # DISTNAME= XmHTML-1.1.7 @@ -21,9 +21,9 @@ do-install: ${INSTALL_DATA_DIR} ${PREFIX}/include/XmHTML ${INSTALL_DATA} ${WRKSRC}/include/XmHTML/*.h ${PREFIX}/include/XmHTML -.include "../../mk/x11.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 "../../mk/bsd.pkg.mk" diff --git a/x11/controlcenter/Makefile b/x11/controlcenter/Makefile index bee0e541e7e..e2abcb618cb 100644 --- a/x11/controlcenter/Makefile +++ b/x11/controlcenter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2001/10/23 13:15:07 jlam Exp $ +# $NetBSD: Makefile,v 1.34 2001/10/24 22:11:11 jlam Exp $ DISTNAME= control-center-1.4.0.1 CATEGORIES= x11 gnome @@ -27,10 +27,10 @@ CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} post-patch: @${ECHO} >>${WRKSRC}/control-center/cappletConf.sh.in "" -.include "../../mk/x11.buildlink.mk" -.include "../../graphics/gdk-pixbuf/buildlink.mk" +.include "../../devel/popt/buildlink.mk" .include "../../devel/gettext-lib/buildlink.mk" +.include "../../graphics/gdk-pixbuf/buildlink.mk" .include "../../sysutils/gnome-vfs/buildlink.mk" .include "../../x11/gnome-libs/buildlink.mk" -.include "../../devel/popt/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/ebuilder/Makefile b/x11/ebuilder/Makefile index 2449ad55f67..e0b5548408c 100644 --- a/x11/ebuilder/Makefile +++ b/x11/ebuilder/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2001/10/23 13:15:07 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2001/10/24 22:11:11 jlam Exp $ # DISTNAME= ebuilder-0.56d @@ -19,6 +19,6 @@ MAKE_ENV+= CXXFLAGS="${CXXFLAGS}" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/ebuilder ${PREFIX}/bin -.include "../../mk/x11.buildlink.mk" .include "../../x11/qt2-libs/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile index 58c28b8d5d3..d25af5094b0 100644 --- a/x11/eterm/Makefile +++ b/x11/eterm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2001/10/23 13:15:07 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2001/10/24 22:11:11 jlam Exp $ DISTNAME= Eterm-0.8.10 PKGNAME= eterm-0.8.10 @@ -41,6 +41,6 @@ post-install: ${CHMOD} 4711 ${PREFIX}/bin/Eterm .endif -.include "../../mk/x11.buildlink.mk" .include "../../graphics/imlib/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile index e56125fe157..03202b2d027 100644 --- a/x11/fltk/Makefile +++ b/x11/fltk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2001/10/23 13:15:07 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2001/10/24 22:11:12 jlam Exp $ # DISTNAME= ${PKGNAME}-source @@ -30,6 +30,6 @@ test: @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} test -.include "../../mk/x11.buildlink.mk" .include "../../graphics/Mesa/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile index 93e01b1bc01..6b20d6bbf01 100644 --- a/x11/gnome-core/Makefile +++ b/x11/gnome-core/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.71 2001/10/23 13:15:08 jlam Exp $ +# $NetBSD: Makefile,v 1.72 2001/10/24 22:11:12 jlam Exp $ DISTNAME= gnome-core-1.4.0.4 CATEGORIES= x11 gnome @@ -42,12 +42,12 @@ post-install: .endfor .endfor -.include "../../mk/x11.buildlink.mk" .include "../../archivers/bzip2/buildlink.mk" +.include "../../devel/gettext-lib/buildlink.mk" +.include "../../devel/libglade/buildlink.mk" .include "../../graphics/gdk-pixbuf-gnome/buildlink.mk" -.include "../../www/libghttp/buildlink.mk" .include "../../textproc/libxml/buildlink.mk" -.include "../../devel/libglade/buildlink.mk" .include "../../www/gtkhtml/buildlink.mk" -.include "../../devel/gettext-lib/buildlink.mk" +.include "../../www/libghttp/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile index 7a556656265..7349acfd8d2 100644 --- a/x11/gnome-libs/Makefile +++ b/x11/gnome-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.72 2001/10/23 13:15:08 jlam Exp $ +# $NetBSD: Makefile,v 1.73 2001/10/24 22:11:12 jlam Exp $ DISTNAME= gnome-libs-1.4.1.2 CATEGORIES= x11 gnome @@ -63,11 +63,11 @@ post-install: ${LN} -fs ${PREFIX}/share/aclocal/libart.m4 \ ${LOCALBASE}/share/aclocal/libart.m4 -.include "../../mk/x11.buildlink.mk" .include "../../audio/esound/buildlink.mk" .include "../../devel/gettext-lib/buildlink.mk" .include "../../graphics/imlib/buildlink.mk" .include "../../graphics/xpm/buildlink.mk" .include "../../net/ORBit/buildlink.mk" .include "../../x11/gtk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtk--/Makefile b/x11/gtk--/Makefile index 7405d4dc9d4..b87668122ab 100644 --- a/x11/gtk--/Makefile +++ b/x11/gtk--/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2001/10/23 13:15:08 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2001/10/24 22:11:12 jlam Exp $ # FreeBSD Id: Makefile,v 1.6 1999/01/12 16:50:43 vanilla Exp # @@ -31,7 +31,7 @@ post-install: ${LN} -fs ${PREFIX}/share/aclocal/gtk--.m4 \ ${LOCALBASE}/share/aclocal/gtk--.m4 -.include "../../mk/x11.buildlink.mk" .include "../../devel/libsigc++/buildlink.mk" .include "../../x11/gtk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile index 334acf56a7b..e6f0316b899 100644 --- a/x11/gtk/Makefile +++ b/x11/gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.67 2001/10/23 13:15:08 jlam Exp $ +# $NetBSD: Makefile,v 1.68 2001/10/24 22:11:13 jlam Exp $ DISTNAME= gtk+-1.2.10 CATEGORIES= x11 @@ -62,7 +62,7 @@ post-install: ${LN} -fs ${PREFIX}/share/aclocal/gtk.m4 \ ${LOCALBASE}/share/aclocal/gtk.m4 -.include "../../mk/x11.buildlink.mk" .include "../../devel/gettext-lib/buildlink.mk" .include "../../devel/glib/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/p5-Tk/Makefile b/x11/p5-Tk/Makefile index ef66c803235..407907509ca 100644 --- a/x11/p5-Tk/Makefile +++ b/x11/p5-Tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2001/10/23 21:02:17 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2001/10/24 22:11:13 jlam Exp $ # FreeBSD Id: Makefile,v 1.14 1997/09/14 04:00:00 jfitz Exp # @@ -22,6 +22,6 @@ MAKE_PARAMS= X11=${BUILDLINK_X11_DIR} do-configure: @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL ${MAKE_PARAMS} -.include "../../mk/x11.buildlink.mk" .include "../../x11/tk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/qt2-designer-kde/Makefile b/x11/qt2-designer-kde/Makefile index 7f87841a90b..a50a2a97090 100644 --- a/x11/qt2-designer-kde/Makefile +++ b/x11/qt2-designer-kde/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/10/23 13:15:08 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2001/10/24 22:11:13 jlam Exp $ # .include "../qt2-libs/Makefile.common" @@ -24,7 +24,7 @@ do-install: ${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/tools/designer/uic/uic ${QTPREFIX}/bin ${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/tools/designer/designer/designer ${QTPREFIX}/bin -.include "../../mk/x11.buildlink.mk" .include "../../x11/kdelibs2/buildlink.mk" .include "../../x11/qt2-libs/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/qt2-libs/Makefile b/x11/qt2-libs/Makefile index 411355aab5b..6e9f31e2b05 100644 --- a/x11/qt2-libs/Makefile +++ b/x11/qt2-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2001/10/23 13:15:09 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2001/10/24 22:11:14 jlam Exp $ # #USE_MESA= yes @@ -25,10 +25,10 @@ do-install: ${INSTALL_DATA_DIR} ${QTPREFIX}/include ${INSTALL_DATA} ${WRKSRC}/include/* ${QTPREFIX}/include -.include "../../mk/x11.buildlink.mk" .include "../../devel/zlib/buildlink.mk" .include "../../graphics/jpeg/buildlink.mk" .include "../../graphics/Mesa/buildlink.mk" .include "../../graphics/mng/buildlink.mk" .include "../../graphics/png/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/qwt/Makefile b/x11/qwt/Makefile index d93a3501fe8..3870782c9dd 100644 --- a/x11/qwt/Makefile +++ b/x11/qwt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2001/10/23 13:15:09 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2001/10/24 22:11:14 jlam Exp $ DISTNAME= qwt-0.3.0 CATEGORIES= x11 @@ -30,6 +30,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qwt ${INSTALL_DATA} ${WRKSRC}/doc/man/man3/* ${PREFIX}/man/man3 -.include "../../mk/x11.buildlink.mk" .include "../../x11/qt2-libs/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile index f341924e444..92ee22d6540 100644 --- a/x11/rxvt/Makefile +++ b/x11/rxvt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2001/10/23 13:15:09 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2001/10/24 22:11:15 jlam Exp $ # FreeBSD Id: Makefile,v 1.13 1997/03/07 12:29:49 obrien Exp # @@ -53,6 +53,6 @@ pre-install: ${INSTALL_DATA} ${FILESDIR}/Rxvt ${X11PREFIX}/lib/X11/app-defaults; \ fi -.include "../../mk/x11.buildlink.mk" .include "../../graphics/xpm/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/tk/Makefile b/x11/tk/Makefile index dd96ddbb0d4..3fa3583c527 100644 --- a/x11/tk/Makefile +++ b/x11/tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/10/23 13:15:09 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2001/10/24 22:11:15 jlam Exp $ DISTNAME= tk8.3.2 PKGNAME= tk-8.3.2nb1 @@ -79,6 +79,6 @@ post-install: test: cd ${WRKSRC}; ${SETENV} LIBTOOL=${LIBTOOL} PREFIX=${PREFIX} ${MAKE} test -.include "../../mk/x11.buildlink.mk" .include "../../lang/tcl/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/tk/buildlink.mk b/x11/tk/buildlink.mk index 2fb822da952..49b40954a3d 100644 --- a/x11/tk/buildlink.mk +++ b/x11/tk/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.7 2001/10/23 13:02:11 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.8 2001/10/24 22:11:15 jlam Exp $ # # This Makefile fragment is included by packages that use tk. # @@ -42,10 +42,8 @@ tk-buildlink: _BUILDLINK_USE _TKCONFIG_SED= -e "/^TK_PREFIX/s|${BUILDLINK_PREFIX.tcl}|${BUILDLINK_DIR}|g" _TKCONFIG_SED+= -e "s|-L${BUILDLINK_PREFIX.tk}/lib|-L${BUILDLINK_DIR}/lib|g" _TKCONFIG_SED+= -e "s|${BUILDLINK_PREFIX.tk}/lib/libtkstub|-L${BUILDLINK_DIR}/lib/libtkstub|g" -.if defined(X11_BUILDLINK_MK) _TKCONFIG_SED+= -e "s|-I${X11BASE}/|-I${BUILDLINK_X11_DIR}/|g" _TKCONFIG_SED+= -e "s|-L${X11BASE}/|-L${BUILDLINK_X11_DIR}/|g" -.endif tkConfig-buildlink: ${_PKG_SILENT}${_PKG_DEBUG} \ diff --git a/x11/wmessage/Makefile b/x11/wmessage/Makefile index 57fa668c7ed..80f0916cadd 100644 --- a/x11/wmessage/Makefile +++ b/x11/wmessage/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/10/23 13:15:09 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2001/10/24 22:11:15 jlam Exp $ DISTNAME= wmessage-0.10 CATEGORIES= x11 @@ -10,7 +10,7 @@ COMMENT= WINGs based message viewer similar to xmessage USE_BUILDLINK_ONLY= yes -.include "../../mk/x11.buildlink.mk" .include "../../devel/libproplist/buildlink.mk" .include "../../wm/windowmaker/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/wmfire/Makefile b/x11/wmfire/Makefile index 5cb88b18a25..23cc590ec68 100644 --- a/x11/wmfire/Makefile +++ b/x11/wmfire/Makefile @@ -1,4 +1,4 @@ -#$NetBSD: Makefile,v 1.9 2001/10/23 13:15:10 jlam Exp $ +#$NetBSD: Makefile,v 1.10 2001/10/24 22:11:15 jlam Exp $ # DISTNAME= wmfire-0.0.3.8 @@ -19,6 +19,6 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/CREDITS ${PREFIX}/share/doc/wmfire ${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/wmfire -.include "../../mk/x11.buildlink.mk" .include "../../graphics/xpm/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/wmweather/Makefile b/x11/wmweather/Makefile index ed35ee58646..6130499ff4e 100644 --- a/x11/wmweather/Makefile +++ b/x11/wmweather/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/10/23 13:15:10 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2001/10/24 22:11:16 jlam Exp $ # DISTNAME= wmWeather-1.31 @@ -17,6 +17,6 @@ REPLACE_PERL= GrabWeather CPPFLAGS+= -I${X11BASE}/include -.include "../../mk/x11.buildlink.mk" .include "../../graphics/xpm/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/wterm/Makefile b/x11/wterm/Makefile index 4defe8cf5bb..8094d7a91ef 100644 --- a/x11/wterm/Makefile +++ b/x11/wterm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2001/10/23 13:15:10 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2001/10/24 22:11:16 jlam Exp $ DISTNAME= wterm-6.2.9 CATEGORIES= x11 @@ -25,6 +25,6 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/wtermthai.tiff \ ${PREFIX}/share/WindowMaker/Icons -.include "../../mk/x11.buildlink.mk" .include "../../wm/windowmaker/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xpenguins/Makefile b/x11/xpenguins/Makefile index 9f346ce2160..e365b8d51b4 100644 --- a/x11/xpenguins/Makefile +++ b/x11/xpenguins/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/10/23 13:15:10 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2001/10/24 22:11:16 jlam Exp $ # DISTNAME= xpenguins-2.1 @@ -12,6 +12,6 @@ COMMENT= Little penguins walking along the tops of your windows USE_BUILDLINK_ONLY= YES GNU_CONFIGURE= YES -.include "../../mk/x11.buildlink.mk" .include "../../graphics/xpm/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xpmroot/Makefile b/x11/xpmroot/Makefile index 734a65138e6..73d33f3eca8 100644 --- a/x11/xpmroot/Makefile +++ b/x11/xpmroot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2001/10/23 13:15:10 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2001/10/24 22:11:17 jlam Exp $ # DISTNAME= fvwm-${PKG_VERSION} @@ -31,6 +31,6 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/utils/xpmroot ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/utils/xpmroot.1 ${PREFIX}/man/man1 -.include "../../mk/x11.buildlink.mk" .include "../../graphics/xpm/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xteddy/Makefile b/x11/xteddy/Makefile index e641568e16b..4a383276cde 100644 --- a/x11/xteddy/Makefile +++ b/x11/xteddy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/10/23 13:15:11 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2001/10/24 22:11:17 jlam Exp $ DISTNAME= xteddy-1.1 CATEGORIES= x11 games @@ -15,6 +15,6 @@ pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/xteddy ${INSTALL_DATA_DIR} ${PREFIX}/share/xteddy/pixmaps -.include "../../mk/x11.buildlink.mk" .include "../../graphics/xpm/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xteddy2/Makefile b/x11/xteddy2/Makefile index 5e494631b2b..c7527a8b592 100644 --- a/x11/xteddy2/Makefile +++ b/x11/xteddy2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/10/23 13:15:11 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2001/10/24 22:11:17 jlam Exp $ DISTNAME= xteddy-2.0.1 CATEGORIES= x11 games @@ -25,6 +25,6 @@ pre-configure: ${RM} -f $${file}.fixme; \ done -.include "../../mk/x11.buildlink.mk" .include "../../graphics/imlib/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" |