diff options
| -rw-r--r-- | math/xmgr/Makefile | 16 | ||||
| -rw-r--r-- | wm/econf/Makefile | 7 | ||||
| -rw-r--r-- | x11/xplanet/Makefile | 32 | ||||
| -rw-r--r-- | x11/xvattr/Makefile | 13 |
4 files changed, 32 insertions, 36 deletions
diff --git a/math/xmgr/Makefile b/math/xmgr/Makefile index abbbff8196e..926c9dce207 100644 --- a/math/xmgr/Makefile +++ b/math/xmgr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2002/04/23 02:08:54 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2002/09/23 23:19:42 jlam Exp $ # FreeBSD Id: Makefile,v 1.13 1998/12/12 22:27:21 jseger Exp # @@ -17,21 +17,17 @@ COMMENT= Powerful XY plotting tool for workstations or X-terminals using X BUILD_DEPENDS= bison-[0-9]*:../../devel/bison -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES USE_X11BASE= YES USE_FORTRAN= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-acegr-home="${PREFIX}" -CONFIGURE_ARGS+= --enable-extra-incpath="${EXTRA_INCDIRS}" -CONFIGURE_ARGS+= --enable-extra-ldpath="${BUILDLINK_DIR}/lib" - -EXTRA_INCDIRS= ${BUILDLINK_DIR}/include/X11:${BUILDLINK_DIR}/include ALL_TARGET= # empty INSTALL_TARGET= install -.include "../../devel/netcdf/buildlink.mk" -.include "../../graphics/xpm/buildlink.mk" -.include "../../mk/motif.buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../devel/netcdf/buildlink2.mk" +.include "../../graphics/xpm/buildlink2.mk" +.include "../../mk/motif.buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/wm/econf/Makefile b/wm/econf/Makefile index be80e99fe0a..672f348def4 100644 --- a/wm/econf/Makefile +++ b/wm/econf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2002/03/13 17:37:46 fredb Exp $ +# $NetBSD: Makefile,v 1.6 2002/09/23 23:19:55 jlam Exp $ # DISTNAME= enlightenment-conf-0.15 @@ -11,9 +11,10 @@ MAINTAINER= root@garbled.net HOMEPAGE= http://www.enlightenment.org/ COMMENT= configuration tool for easily setting up Enlightenment +USE_BUILDLINK2= yes +USE_X11= yes USE_GMAKE= yes GNU_CONFIGURE= yes -.include "../../x11/controlcenter/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../x11/controlcenter/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xplanet/Makefile b/x11/xplanet/Makefile index 71cf2046d26..f8b565c8841 100644 --- a/x11/xplanet/Makefile +++ b/x11/xplanet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2002/05/12 10:16:52 abs Exp $ +# $NetBSD: Makefile,v 1.6 2002/09/23 23:11:58 jlam Exp $ # DISTNAME= xplanet-0.93 @@ -10,14 +10,15 @@ MAINTAINER= atatat@netbsd.org HOMEPAGE= http://xplanet.sourceforge.net/ COMMENT= Rotating rendered map of the Earth in X11 root window -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-gl-dir=${BUILDLINK_DIR} -CONFIGURE_ARGS+= --with-glut-dir=${BUILDLINK_DIR} - -USE_GMAKE= yes +USE_BUILDLINK2= yes USE_X11= yes +USE_GMAKE= yes + +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --with-gl-dir=${BUILDLINK_PREFIX.Mesa} +CONFIGURE_ARGS+= --with-glut-dir=${BUILDLINK_PREFIX.Mesa} -LIBS= -lpbm -lppm -lpgm +LIBS= -lXext -lpbm -lppm -lpgm MAKE_ENV+= LIBS="${LIBS}" pre-configure: @@ -26,14 +27,13 @@ pre-configure: [ -f $$f.BAK ] || ${MV} $$f $$f.BAK ; \ ${SED} -e 's|@PREFIX@|${PREFIX}|g' < $$f.BAK > $$f -.include "../../graphics/Mesa/buildlink.mk" -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/freetype2/buildlink.mk" -.include "../../graphics/libungif/buildlink.mk" -.include "../../graphics/netpbm/buildlink.mk" -.include "../../graphics/png/buildlink.mk" -.include "../../graphics/tiff/buildlink.mk" -.include "../../x11/tk/buildlink.mk" +.include "../../graphics/Mesa/buildlink2.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/freetype2/buildlink2.mk" +.include "../../graphics/libungif/buildlink2.mk" +.include "../../graphics/netpbm/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../graphics/tiff/buildlink2.mk" +.include "../../x11/tk/buildlink2.mk" -#.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xvattr/Makefile b/x11/xvattr/Makefile index 898e3eeccc1..97f9bf68372 100644 --- a/x11/xvattr/Makefile +++ b/x11/xvattr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/09/16 12:02:24 mycroft Exp $ +# $NetBSD: Makefile,v 1.4 2002/09/23 23:15:14 jlam Exp $ DISTNAME= xvattr-1.3 CATEGORIES= x11 @@ -8,16 +8,15 @@ MAINTAINER= veego@netbsd.org HOMEPAGE= http://www.dtek.chalmers.se/groups/dvd/ COMMENT= Modify Xv attributes -GNU_CONFIGURE= yes -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= # defined +USE_X11= # defined +GNU_CONFIGURE= # defined .include "../../mk/bsd.prefs.mk" .if !exists(${X11BASE}/include/X11/extensions/Xvlib.h) -# you need Xv which isn't there in older X installs -NOT_FOR_PLATFORM= *-*-* +IGNORE= "${PKGNAME} requires libXv.a." .endif -.include "../../mk/x11.buildlink.mk" -.include "../../x11/gtk/buildlink.mk" +.include "../../x11/gtk/buildlink2.mk" .include "../../mk/bsd.pkg.mk" |