diff options
| author | jlam <jlam@pkgsrc.org> | 2002-09-21 12:31:23 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-09-21 12:31:23 +0000 |
| commit | 635e71e9e4a7a200cde50beb7a25cadc48941352 (patch) | |
| tree | 56e43bfcbb61d1d996587f80af6ce0cedcfd490a /emulators | |
| parent | 204241bc9f176dbd3a2c3083af642c1d2782e8e1 (diff) | |
| download | pkgsrc-635e71e9e4a7a200cde50beb7a25cadc48941352.tar.gz | |
buildlink1 -> buildlink2
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/rewind/Makefile | 25 | ||||
| -rw-r--r-- | emulators/vice/Makefile | 21 |
2 files changed, 24 insertions, 22 deletions
diff --git a/emulators/rewind/Makefile b/emulators/rewind/Makefile index 48f249d3fb5..1ee5ab3128d 100644 --- a/emulators/rewind/Makefile +++ b/emulators/rewind/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/04/20 08:10:29 rh Exp $ +# $NetBSD: Makefile,v 1.2 2002/09/21 12:31:23 jlam Exp $ DISTNAME= rewind-20020420 CATEGORIES= emulators @@ -13,24 +13,25 @@ CONFLICTS= wine-[0-9]* ONLY_FOR_PLATFORM= NetBSD-1.5Z*-i386 NetBSD-1.[6-9]*-i386 -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES +USE_X11= YES USE_GMAKE= YES + GNU_CONFIGURE= YES CONFIGURE_ARGS+= --without-curses +CONFIGURE_ENV+= ac_cv_prog_sane_devel=no -# The rewind configure script has problems locating the freetype-config -# script and the libraries in the buildlink directory, so explicitly -# set the location of freetype-config and prepend all of the LDFLAGS -# necessary to link against the libraries. +# The rewind configure script has problems locating the libraries in the +# buildlink directory, so prepend all of the LDFLAGS necessary to link +# against the libraries. # -CONFIGURE_ENV+= ft_devel=${FREETYPE_CONFIG} CONFIGURE_ENV+= X_LIBS="${LDFLAGS}" LIBS+= ${LDFLAGS} .include "../../mk/bsd.prefs.mk" .if defined(USE_CUPS) && (${USE_CUPS} == YES) -.include "../../print/cups/buildlink.mk" +. include "../../print/cups/buildlink2.mk" BUILD_DEFS+= USE_CUPS .endif @@ -43,8 +44,8 @@ post-install: ${INSTALL_DATA} generic.ppd ${EGDIR}/generic.ppd; \ ${INSTALL_DATA} system.ini ${EGDIR}/system.ini -.include "../../graphics/Mesa/buildlink.mk" -.include "../../graphics/freetype2/buildlink.mk" -.include "../../graphics/jpeg/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/Mesa/buildlink2.mk" +.include "../../graphics/freetype2/buildlink2.mk" +.include "../../graphics/jpeg/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile index 6b15d5185d7..a56539467c9 100644 --- a/emulators/vice/Makefile +++ b/emulators/vice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2002/09/07 09:17:11 kristerw Exp $ +# $NetBSD: Makefile,v 1.28 2002/09/21 12:37:12 jlam Exp $ # DISTNAME= vice-1.10 @@ -23,10 +23,11 @@ NO_SRC_ON_FTP= ${RESTRICTED} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} +BUILD_USES_MSGFMT= YES +USE_BUILDLINK2= YES +USE_X11= YES USE_GMAKE= YES GNU_CONFIGURE= YES -BUILD_USES_MSGFMT= YES -USE_BUILDLINK_ONLY= YES # These changes are rather common, so sed instead of patch: post-patch: @@ -63,13 +64,13 @@ post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/vice ${MV} ${PREFIX}/share/doc/vice/*.html ${PREFIX}/share/doc/html/vice -.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 "../../audio/esound/buildlink2.mk" +.include "../../devel/readline/buildlink2.mk" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../devel/zlib/buildlink2.mk" +#.include "../../graphics/png/buildlink2.mk" +.include "../../graphics/xpm/buildlink2.mk" + .include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" |