diff options
-rw-r--r-- | chat/fugu/Makefile | 8 | ||||
-rw-r--r-- | lang/clisp/Makefile | 8 | ||||
-rw-r--r-- | lang/egcs/Makefile | 4 | ||||
-rw-r--r-- | lang/gcc/Makefile | 4 | ||||
-rw-r--r-- | lang/gforth/Makefile | 8 | ||||
-rw-r--r-- | lang/gpc/Makefile | 4 | ||||
-rw-r--r-- | lang/mercury/Makefile | 8 | ||||
-rw-r--r-- | lang/nhc98/Makefile | 7 | ||||
-rw-r--r-- | lang/onyx/Makefile | 6 | ||||
-rw-r--r-- | x11/py-Pmw/Makefile | 6 | ||||
-rw-r--r-- | x11/py-Pmw/buildlink3.mk | 20 |
11 files changed, 51 insertions, 32 deletions
diff --git a/chat/fugu/Makefile b/chat/fugu/Makefile index 1f3891cefd3..3bec0d15119 100644 --- a/chat/fugu/Makefile +++ b/chat/fugu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/03/26 02:27:35 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2004/05/02 05:23:26 snj Exp $ # DISTNAME= fugu-1.0 @@ -12,7 +12,7 @@ COMMENT= Graphical client for the gale secure instant messaging system PYTHON_VERSIONS_ACCEPTED= 20 21 # no 22 - uses Makefile.pre.in -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES GNU_CONFIGURE= YES CONFIGURE_ENV+= vi_cv_path_python=${PYTHONBIN} LDFLAGS+= -L${BUILDLINK_PREFIX.py-Pmw}/lib \ @@ -22,6 +22,6 @@ CPPFLAGS+= -I${BUILDLINK_PREFIX.py-Pmw}/include \ -I${BUILDLINK_PREFIX.rsaref}/include .include "../../lang/python/application.mk" -.include "../../security/rsaref/buildlink2.mk" -.include "../../x11/py-Pmw/buildlink2.mk" +.include "../../security/rsaref/buildlink3.mk" +.include "../../x11/py-Pmw/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile index 71ec9c90551..4a647e2baed 100644 --- a/lang/clisp/Makefile +++ b/lang/clisp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2004/03/29 02:46:18 perry Exp $ +# $NetBSD: Makefile,v 1.34 2004/05/02 04:59:23 snj Exp $ DISTNAME= clisp-2.33 CATEGORIES= lang @@ -12,7 +12,7 @@ COMMENT= CLISP, a Common Lisp implementation NOT_FOR_PLATFORM= *-*-alpha # severe LP64 problems WRKSRC= ${WRKDIR}/${DISTNAME}/src -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_PKGLOCALEDIR= YES CONFIGURE_ENV+= CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \ gt_cv_func_gnugettext2_libintl=yes @@ -38,7 +38,7 @@ pre-build: cd ${WRKSRC}/avcall && ${MAKE} cd ${WRKSRC}/callback && ${MAKE} -.include "../../devel/gettext-lib/buildlink2.mk" -.include "../../devel/readline/buildlink2.mk" +.include "../../devel/gettext-lib/buildlink3.mk" +.include "../../devel/readline/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/egcs/Makefile b/lang/egcs/Makefile index bcb98886b1f..c7e39b14117 100644 --- a/lang/egcs/Makefile +++ b/lang/egcs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2003/08/09 10:59:06 seb Exp $ +# $NetBSD: Makefile,v 1.11 2004/05/02 04:59:23 snj Exp $ # DISTNAME= egcs-1.1.2 @@ -9,7 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://egcs.cygnus.com/index.html COMMENT= The experimental GNU compiler suite -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes GNU_CONFIGURE= yes ONLY_FOR_PLATFORM= SunOS-*-* # in NetBSD base system diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile index e4072c7bef9..315d9bbb259 100644 --- a/lang/gcc/Makefile +++ b/lang/gcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.76 2004/03/25 23:34:01 jlam Exp $ +# $NetBSD: Makefile,v 1.77 2004/05/02 04:59:23 snj Exp $ DISTNAME= gcc-2.95.3 PKGREVISION= 5 @@ -17,7 +17,7 @@ COMMENT= GNU Compiler Collection, version 2 NOT_FOR_PLATFORM= Darwin-*-* *-*-x86_64 -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_PKGINSTALL= YES USE_GNU_TOOLS+= make MAKEFLAGS+= GMAKE_LOCALE=no diff --git a/lang/gforth/Makefile b/lang/gforth/Makefile index 804e62ade03..56bc106d51f 100644 --- a/lang/gforth/Makefile +++ b/lang/gforth/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2003/12/05 00:26:38 uebayasi Exp $ +# $NetBSD: Makefile,v 1.17 2004/05/02 04:59:23 snj Exp $ DISTNAME= gforth-0.6.2 CATEGORIES= lang @@ -11,7 +11,7 @@ COMMENT= Fast interpreter for the Forth language ONLY_FOR_PLATFORM= *-*-alpha *-*-i386 *-*-m68k *-*-powerpc *-*-sparc -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES GNU_CONFIGURE= YES # Make sure elisp will be installed even if no emacs installed. @@ -28,7 +28,7 @@ KERNEL_FI= `cd ${WRKSRC} && (${ECHO} 'prkern:'; ${ECHO} ' @${ECHO} $$(kernel_fi) # XXX Need test. #.if ${OPSYS} == "Darwin" -#. include "../../devel/dlcompat/buildlink2.mk" +#. include "../../devel/dlcompat/buildlink3.mk" #.endif post-build: @@ -39,6 +39,6 @@ post-build: pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp -.include "../../devel/ffcall/buildlink2.mk" +.include "../../devel/ffcall/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/gpc/Makefile b/lang/gpc/Makefile index d6829fe2f9a..e0e6fa07a5f 100644 --- a/lang/gpc/Makefile +++ b/lang/gpc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2004/03/02 11:28:22 seb Exp $ +# $NetBSD: Makefile,v 1.19 2004/05/02 04:59:23 snj Exp $ DISTNAME= gpc-2.1 PKGREVISION= 3 @@ -19,7 +19,7 @@ PATCHFILES= gcc-2.95.3-diff-2002-08-29.gz BUILD_DEPENDS+= gsed-[0-9]*:../../textproc/gsed WRKSRC= ${WRKDIR}/gcc-2.95.3 -USE_BUILDLINK2= # defined +USE_BUILDLINK3= yes USE_GNU_TOOLS+= make USE_NCURSES= # defined PLIST_SRC= PLIST diff --git a/lang/mercury/Makefile b/lang/mercury/Makefile index 799cecd4291..183287a8deb 100644 --- a/lang/mercury/Makefile +++ b/lang/mercury/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2004/03/07 00:19:29 seb Exp $ +# $NetBSD: Makefile,v 1.21 2004/05/02 04:59:23 snj Exp $ DISTNAME= mercury-compiler-0.11.0 PKGNAME= mercury-0.11.0 @@ -11,7 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.cs.mu.oz.au/mercury/ COMMENT= Modern logic/functional programming language -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes GNU_CONFIGURE= yes USE_GNU_TOOLS+= make USE_GNU_READLINE= yes # rl_prep_term_function @@ -46,6 +46,6 @@ do-install: ${FIND} ${WRKSRC} -type f -name ".cvsignore" -print | ${XARGS} ${RM} -f cd ${WRKSRC}/samples && ${PAX} -rw . ${PREFIX}/share/examples/mercury -.include "../../devel/readline/buildlink2.mk" -.include "../../devel/ncurses/buildlink2.mk" +.include "../../devel/readline/buildlink3.mk" +.include "../../devel/ncurses/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/nhc98/Makefile b/lang/nhc98/Makefile index f95df7ac84a..b5dfc512139 100644 --- a/lang/nhc98/Makefile +++ b/lang/nhc98/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2004/03/26 21:19:53 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2004/05/02 04:59:23 snj Exp $ DISTNAME= nhc98src-1.16 PKGNAME= nhc98-1.16 @@ -14,8 +14,7 @@ COMMENT= Portable Haskell 98 compiler NOT_FOR_PLATFORM= *-*-alpha *-*-sparc64 *-*-x86_64 WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} -USE_BUILDLINK2= YES -BUILDLINK_SETENV.CC= CC=gcc +USE_BUILDLINK3= YES INCOMPAT_CURSES= NetBSD-1.5* NetBSD-1.6[-_.]* INCOMPAT_CURSES+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-K]* @@ -36,5 +35,5 @@ PLIST_SUBST+= HARCH=${HARCH} post-extract: @${FIND} ${WRKSRC}/docs -type d -name \*CVS\* -print | ${XARGS} ${RM} -rf -.include "../../devel/ncurses/buildlink2.mk" +.include "../../devel/ncurses/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/onyx/Makefile b/lang/onyx/Makefile index 99ba7149db0..adad49b5612 100644 --- a/lang/onyx/Makefile +++ b/lang/onyx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/02/23 02:49:31 kristerw Exp $ +# $NetBSD: Makefile,v 1.12 2004/05/02 04:59:23 snj Exp $ DISTNAME= onyx-${VERS} CATEGORIES= lang @@ -14,7 +14,7 @@ BUILD_DEPENDS+= cook-[0-9]*:../../devel/cook # needs EL_CLIENTDATA in /usr/include/histedit.h ONLY_FOR_PLATFORM= NetBSD-1.5[YZ]*-* NetBSD-1.6*-* NetBSD-1.7*-* NetBSD-[2-9]* -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-pcre-prefix=${BUILDLINK_PREFIX.pcre} # XXX @@ -34,5 +34,5 @@ do-install: post-install: @strip ${PREFIX}/bin/onyx -.include "../../devel/pcre/buildlink2.mk" +.include "../../devel/pcre/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/py-Pmw/Makefile b/x11/py-Pmw/Makefile index a85819c6a69..7a2969a056c 100644 --- a/x11/py-Pmw/Makefile +++ b/x11/py-Pmw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2004/01/27 00:53:10 heinz Exp $ +# $NetBSD: Makefile,v 1.12 2004/05/02 05:23:21 snj Exp $ # DISTNAME= Pmw.0.8.5 @@ -13,7 +13,7 @@ COMMENT= Python meta widgets PLIST_SRC= ${WRKDIR}/.PLIST_SRC WRKSRC= ${WRKDIR}/Pmw -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES do-build: @@ -29,5 +29,5 @@ do-install: -type d -print | ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}) .include "../../lang/python/extension.mk" -.include "../../x11/py-Tk/buildlink2.mk" +.include "../../x11/py-Tk/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/py-Pmw/buildlink3.mk b/x11/py-Pmw/buildlink3.mk new file mode 100644 index 00000000000..530b072bc8d --- /dev/null +++ b/x11/py-Pmw/buildlink3.mk @@ -0,0 +1,20 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/05/02 05:23:21 snj Exp $ + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +PY_PMW_BUILDLINK3_MK:= ${PY_PMW_BUILDLINK3_MK}+ + +.include "../../lang/python/pyversion.mk" + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= pypmw +.endif + +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npypmw} +BUILDLINK_PACKAGES+= pypmw + +.if !empty(PY_PMW_BUILDLINK3_MK:M+) +BUILDLINK_DEPENDS.pypmw+= ${PYPKGPREFIX}-Pmw-[0-9]* +BUILDLINK_PKGSRCDIR.pypmw?= ../../x11/py-Pmw +.endif # PY_PMW_BUILDLINK3_MK + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |