diff options
| -rw-r--r-- | emulators/rewind/Makefile | 25 | ||||
| -rw-r--r-- | emulators/vice/Makefile | 21 | ||||
| -rw-r--r-- | games/baduki/Makefile | 13 | ||||
| -rw-r--r-- | games/baduki/distinfo | 4 | ||||
| -rw-r--r-- | games/baduki/patches/patch-aa | 13 | ||||
| -rw-r--r-- | games/baduki/patches/patch-ab | 13 |
6 files changed, 32 insertions, 57 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" diff --git a/games/baduki/Makefile b/games/baduki/Makefile index 07b30ead3d5..b024586a677 100644 --- a/games/baduki/Makefile +++ b/games/baduki/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2001/10/24 22:10:55 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2002/09/21 12:40:10 jlam Exp $ DISTNAME= baduki-0.2.9 CATEGORIES= games @@ -8,13 +8,14 @@ MAINTAINER= bad@netbsd.org HOMEPAGE= http://soback.kornet21.net/~artist/baduk/baduki.html COMMENT= Go playing program based on xamigo -USE_BUILDLINK_ONLY= YES -GNU_CONFIGURE= YES BUILD_USES_MSGFMT= YES +USE_BUILDLINK2= YES +USE_X11= YES +GNU_CONFIGURE= YES CONFIGURE_ARGS+= --without-included-gettext -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../x11/gtk/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../x11/gtk/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/games/baduki/distinfo b/games/baduki/distinfo index 565c90851c7..27710e05379 100644 --- a/games/baduki/distinfo +++ b/games/baduki/distinfo @@ -1,8 +1,6 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 02:08:18 wiz Exp $ +$NetBSD: distinfo,v 1.3 2002/09/21 12:40:10 jlam Exp $ SHA1 (baduki-0.2.9.tar.gz) = a70a2c11b66b97bae979f597de831a99d6c8121f Size (baduki-0.2.9.tar.gz) = 193558 bytes -SHA1 (patch-aa) = ae4c386828c67d6ee922762d8ce4b76bf0f35c12 -SHA1 (patch-ab) = cffcf97af15693e1039f6a9819a9ee08691756cf SHA1 (patch-ac) = fbd0342b4ceda59e8d356f96b2643d0bc876481a SHA1 (patch-ad) = c65aac612e200bbaf10ee57f6bd4bbd1fd6b4653 diff --git a/games/baduki/patches/patch-aa b/games/baduki/patches/patch-aa deleted file mode 100644 index 49b638cc936..00000000000 --- a/games/baduki/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/01/31 22:03:43 bad Exp $ - ---- Makefile.in.orig Fri Jan 15 19:46:33 1999 -+++ Makefile.in Wed Jan 27 20:47:54 1999 -@@ -66,7 +66,7 @@ - GMSGFMT = @GMSGFMT@ - GTK_CFLAGS = @GTK_CFLAGS@ - GTK_CONFIG = @GTK_CONFIG@ --GTK_LIBS = @GTK_LIBS@ -+GTK_LIBS = @GTK_LIBS@ -lintl - GT_NO = @GT_NO@ - GT_YES = @GT_YES@ - INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ diff --git a/games/baduki/patches/patch-ab b/games/baduki/patches/patch-ab deleted file mode 100644 index 859e297b79d..00000000000 --- a/games/baduki/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.2 1999/11/27 21:45:53 rh Exp $ - ---- src/Makefile.in.orig Sat Nov 27 22:40:23 1999 -+++ src/Makefile.in Sat Nov 27 22:40:23 1999 -@@ -111,7 +111,7 @@ - DEFS = @DEFS@ -I. -I$(srcdir) -I.. - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ --LIBS = @LIBS@ -+LIBS = @LIBS@ -lintl - baduki_OBJECTS = baduki.o dialog.o gmp.o gtkgoboard.o killable.o main.o \ - patterns.o patternsval.o think.o utils.o xinterface.o - baduki_DEPENDENCIES = |