diff options
| author | rillig <rillig> | 2005-12-05 20:49:47 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2005-12-05 20:49:47 +0000 |
| commit | 472dafdd2e1560bc21a20b89efd58a911dc44409 (patch) | |
| tree | dac5b1dd14794d86b061d26b9503adb2552ed3f8 /lang | |
| parent | 55a30558d8942bf85417fab3ed26bec7a7c3aae6 (diff) | |
| download | pkgsrc-472dafdd2e1560bc21a20b89efd58a911dc44409.tar.gz | |
Fixed pkglint warnings. The warnings are mostly quoting issues, for
example MAKE_ENV+=FOO=${BAR} is changed to MAKE_ENV+=FOO=${BAR:Q}. Some
other changes are outlined in
http://mail-index.netbsd.org/tech-pkg/2005/12/02/0034.html
Diffstat (limited to 'lang')
80 files changed, 261 insertions, 264 deletions
diff --git a/lang/SmartEiffel/Makefile b/lang/SmartEiffel/Makefile index 3351c736bbb..651f511c5d3 100644 --- a/lang/SmartEiffel/Makefile +++ b/lang/SmartEiffel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/06/17 04:49:47 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:24 rillig Exp $ DISTNAME= se PKGNAME= SmartEiffel-2.0 @@ -14,7 +14,7 @@ WRKSRC= ${WRKDIR}/SmartEiffel DIST_SUBDIR= ${PKGNAME_NOREV} -MAKE_ENV= SmartEiffel=${WRKSRC}/sys/system.se +MAKE_ENV+= SmartEiffel=${WRKSRC:Q}/sys/system.se # This package relies heavily on GCC. ONLY_FOR_COMPILER= gcc diff --git a/lang/blackdown-jdk13/Makefile b/lang/blackdown-jdk13/Makefile index 1cc5d88765a..d66b380d885 100644 --- a/lang/blackdown-jdk13/Makefile +++ b/lang/blackdown-jdk13/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/05/15 11:53:20 veego Exp $ +# $NetBSD: Makefile,v 1.24 2005/12/05 20:50:24 rillig Exp $ # BD_BASENAME= j2sdk @@ -7,7 +7,7 @@ PKGNAME= blackdown-jdk13-1 PKGREVISION= 5 COMMENT= Linux port of the Blackdown Java(tm) Runtime Environment -DEPENDS= blackdown-jre13>=1:../../lang/blackdown-jre13 +DEPENDS+= blackdown-jre13>=1:../../lang/blackdown-jre13 .include "../../lang/blackdown-jre13/Makefile.common" diff --git a/lang/blackdown-jre13/Makefile.common b/lang/blackdown-jre13/Makefile.common index a5d143d8434..2df3c8c81a2 100644 --- a/lang/blackdown-jre13/Makefile.common +++ b/lang/blackdown-jre13/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.20 2005/07/15 18:27:51 jlam Exp $ +# $NetBSD: Makefile.common,v 1.21 2005/12/05 20:50:24 rillig Exp $ # RELVERSION= 1.3.1 @@ -46,7 +46,7 @@ CHECK_SHLIBS= NO # This would use NetBSD ldd on Linux shlibs. JVM_HOME= ${PREFIX}/java/blackdown-${RELVERSION} USE_TOOLS+= gunzip -PLIST_SUBST+= BLACKDOWN_ARCH=${BLACKDOWN_ARCH} +PLIST_SUBST+= BLACKDOWN_ARCH=${BLACKDOWN_ARCH:Q} ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-powerpc NetBSD-*-sparc \ Linux-*-i[3-6]86 Linux-*-powerpc Linux-*-sparc diff --git a/lang/chicken/Makefile b/lang/chicken/Makefile index f7a8b7e7508..5660c3cb91b 100644 --- a/lang/chicken/Makefile +++ b/lang/chicken/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/11/20 13:44:46 rillig Exp $ +# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:24 rillig Exp $ # DISTNAME= chicken-2.2 @@ -17,6 +17,6 @@ INFO_FILES= chicken.info MAKE_FLAGS+= MAKEINFO=${TRUE:Q} # Avoid an ICE in gcc2 on sparc64 -CONFIGURE_ENV+= F77=${FALSE} +CONFIGURE_ENV+= F77=${FALSE:Q} .include "../../mk/bsd.pkg.mk" diff --git a/lang/cint/Makefile b/lang/cint/Makefile index b5569e35c42..e4ed88a08d4 100644 --- a/lang/cint/Makefile +++ b/lang/cint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/11/09 21:24:12 tv Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:24 rillig Exp $ DISTNAME= cint5.15 PKGNAME= cint-5.15.174 @@ -11,7 +11,7 @@ HOMEPAGE= http://root.cern.ch/root/Cint.html COMMENT= C/C++ interpreter #same distribution file name for minor versions -DIST_SUBDIR= ${PKGNAME} +DIST_SUBDIR= ${PKGNAME_NOREV} WRKSRC= ${WRKDIR} GCC_REQD+= 3.0 PTHREAD_OPTS+= native diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile index 26fcf1a3e9d..90c9cd16a27 100644 --- a/lang/clisp/Makefile +++ b/lang/clisp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2005/08/31 12:12:32 drochner Exp $ +# $NetBSD: Makefile,v 1.46 2005/12/05 20:50:24 rillig Exp $ DISTNAME= clisp-2.33.2 PKGREVISION= 1 @@ -16,7 +16,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews WRKSRC= ${WRKDIR}/${DISTNAME}/src USE_PKGLOCALEDIR= YES -CONFIGURE_ENV+= CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \ +CONFIGURE_ENV+= CC=${CC:Q} CFLAGS=${CFLAGS:M*:Q} CPPFLAGS=${CPPFLAGS:M*:Q} \ gt_cv_func_gnugettext2_libintl=yes GNU_CONFIGURE= YES UNLIMIT_RESOURCES= stacksize diff --git a/lang/drscheme/Makefile b/lang/drscheme/Makefile index ab771e0596a..801d4a1a88a 100644 --- a/lang/drscheme/Makefile +++ b/lang/drscheme/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2005/10/23 21:37:32 rillig Exp $ +# $NetBSD: Makefile,v 1.32 2005/12/05 20:50:24 rillig Exp $ # DISTNAME= plt-${DRSCHEME_VERSION}-src-unix @@ -20,7 +20,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.drscheme.org/ COMMENT= R4RS-compliant and nearly R5RS-compliant scheme tailored for teaching -CONFLICTS+= mzscheme-[0-9]*:../../lang/mzscheme +CONFLICTS+= mzscheme-[0-9]* WRKSRC= ${WRKDIR}/plt/src USE_TOOLS+= gmake perl:run diff --git a/lang/dylan-compiler/Makefile b/lang/dylan-compiler/Makefile index 5caa920aa3e..f955f911453 100644 --- a/lang/dylan-compiler/Makefile +++ b/lang/dylan-compiler/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.4 2002/10/03 14:25:04 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:24 rillig Exp $ # PKGNAME= dylan-compiler-${DYLAN_VERSION} -PATCHDIR= ${.CURDIR}/../dylan-interpreter/patches -DISTINFO_FILE= ${.CURDIR}/../dylan-interpreter/distinfo +PATCHDIR= ${.CURDIR}/../../lang/dylan-interpreter/patches +DISTINFO_FILE= ${.CURDIR}/../../lang/dylan-interpreter/distinfo CONFIGURE_ARGS+= --enable-mindy-bootstrap @@ -16,4 +16,4 @@ pre-build: @${ECHO_MSG} "You could try the dylan interpreter, in ${.CURDIR}/../dylan-interpreter" @${ECHO_MSG} "********************************** WARNING ***********************************" -.include "../dylan-interpreter/Makefile.common" +.include "../../lang/dylan-interpreter/Makefile.common" diff --git a/lang/dylan-interpreter/Makefile.common b/lang/dylan-interpreter/Makefile.common index 8d076fe3afe..b3fc040322f 100644 --- a/lang/dylan-interpreter/Makefile.common +++ b/lang/dylan-interpreter/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.21 2005/07/16 19:10:39 jlam Exp $ +# $NetBSD: Makefile.common,v 1.22 2005/12/05 20:50:24 rillig Exp $ # DISTNAME= gwydion-dylan-${DYLAN_VERSION} @@ -39,8 +39,8 @@ ALT_ARCH= ppc ALT_ARCH= ${MACHINE_ARCH} .endif -PLIST_SUBST+= ALT_ARCH=${ALT_ARCH} -PLIST_SUBST+= DYLAN_VERSION=${DYLAN_VERSION} +PLIST_SUBST+= ALT_ARCH=${ALT_ARCH:Q} +PLIST_SUBST+= DYLAN_VERSION=${DYLAN_VERSION:Q} post-patch: cd ${WRKSRC}; \ diff --git a/lang/eieio/Makefile b/lang/eieio/Makefile index 64dcc57435d..c8f4cf0f1b4 100644 --- a/lang/eieio/Makefile +++ b/lang/eieio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/08/28 04:25:30 uebayasi Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:24 rillig Exp $ # DISTNAME= eieio-0.17 @@ -16,9 +16,9 @@ COMMENT= Enhanced Integration of Emacs Interpreted Objects DEPENDS+= xemacs-packages-[0-9]*:../../editors/xemacs-packages .endif -MAKEFLAGS+= EMACS=${EMACS_BIN} +MAKEFLAGS+= EMACS=${EMACS_BIN:Q} -NO_CONFIGURE= # set +NO_CONFIGURE= yes USE_TOOLS+= gmake INFO_FILES= eieio.info diff --git a/lang/elk/Makefile b/lang/elk/Makefile index 814beebc843..bcc0d260b81 100644 --- a/lang/elk/Makefile +++ b/lang/elk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2005/10/15 23:07:21 tonio Exp $ +# $NetBSD: Makefile,v 1.31 2005/12/05 20:50:25 rillig Exp $ DISTNAME= elk-3.99.6 CATEGORIES= lang @@ -11,7 +11,7 @@ COMMENT= Embeddable Scheme interpreter GNU_CONFIGURE=yes USE_LIBTOOL= yes -CONFIGURE_ENV= WITH_XAW="${ELK_AWK}" +CONFIGURE_ENV+= WITH_XAW=${ELK_AWK:Q} .include "options.mk" diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile index bf98887cf05..521ba9acef9 100644 --- a/lang/erlang/Makefile +++ b/lang/erlang/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/07/16 01:19:11 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:25 rillig Exp $ DISTNAME= otp_src_R9C-0 PKGNAME= erlang-9.2 @@ -19,7 +19,7 @@ USE_JAVA2= yes CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_PREFIX.openssl} -SUBST_CLASSES= target +SUBST_CLASSES+= target SUBST_STAGE.target= post-patch SUBST_FILES.target= make/target.mk SUBST_SED.target= -e "s|=.*config.guess)|= ${MACHINE_GNU_PLATFORM}|" diff --git a/lang/ezm3/Makefile b/lang/ezm3/Makefile index 220da22f1af..2d5cf226532 100644 --- a/lang/ezm3/Makefile +++ b/lang/ezm3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/06/05 09:47:16 jmmv Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:25 rillig Exp $ DISTNAME= ezm3-1.1 PKGREVISION= 1 @@ -14,7 +14,7 @@ DIST_SUBDIR= ezm3 USE_TOOLS+= gmake INSTALL_TARGET= all MAKE_ARGS+= M3OPTIONS="-DBUILD_ALL -DSHIP_ALL" -PLIST_SUBST+= TARGET=${TARGET} TARGETDIR=${TARGETDIR} +PLIST_SUBST+= TARGET=${TARGET:Q} TARGETDIR=${TARGETDIR:Q} # XXX CFLAGS has to be empty, because if it's not, the build # XXX process will fail. diff --git a/lang/f2c/Makefile b/lang/f2c/Makefile index 8e417668d20..4caacd015fb 100644 --- a/lang/f2c/Makefile +++ b/lang/f2c/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2005/12/01 13:06:07 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.38 2005/12/05 20:50:25 rillig Exp $ DISTNAME= f2c-20001205 PKGREVISION= 8 @@ -26,10 +26,10 @@ CONFLICTS= egcs-current-19980608 F2CMAJOR= 0 F2CMINOR= 0 -MAKE_ENV+= F2CMAJOR=${F2CMAJOR} F2CMINOR=${F2CMINOR} -MAKE_ENV+= LIBOWN=${LIBOWN} LIBGRP=${LIBGRP} -MAKE_ENV+= AWK=${AWK} -MAKE_ENV+= ECHO=${ECHO} +MAKE_ENV+= F2CMAJOR=${F2CMAJOR:Q} F2CMINOR=${F2CMINOR:Q} +MAKE_ENV+= LIBOWN=${LIBOWN:Q} LIBGRP=${LIBGRP:Q} +MAKE_ENV+= AWK=${AWK:Q} +MAKE_ENV+= ECHO=${ECHO:Q} WRKSRC= ${WRKDIR}/f2c USE_LIBTOOL= yes @@ -40,7 +40,7 @@ USE_TOOLS+= gunzip post-extract: @${RM} ${WRKSRC}/index.html @for f in ${WRKSRC}/*.gz ; do \ - if test "$$f" = "${WRKSRC}/00lastchange.gz" ; then \ + if ${TEST} "$$f" = "${WRKSRC}/00lastchange.gz" ; then \ ${ECHO} "Skipping $$f" ; \ else \ ${GUNZIP_CMD} $$f ; \ @@ -59,7 +59,7 @@ do-configure: @${CP} -f ${WRKSRC}/f2c.h ${WRKSRC}/libI77/f2c.h .include "../../mk/bsd.prefs.mk" -MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH} +MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH:Q} .include "../../mk/bsd.pkg.mk" diff --git a/lang/f2c/buildlink3.mk b/lang/f2c/buildlink3.mk index 43fbc0df4ca..ba5bc297250 100644 --- a/lang/f2c/buildlink3.mk +++ b/lang/f2c/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2005/01/28 23:37:42 dmcmahill Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2005/12/05 20:50:25 rillig Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ F2C_BUILDLINK3_MK:= ${F2C_BUILDLINK3_MK}+ @@ -19,9 +19,9 @@ BUILDLINK_PKGSRCDIR.f2c?= ../../lang/f2c # The f2c-f77 script takes some environment variables to override hardcoded # values for the compiler and C preprocessor. # -CONFIGURE_ENV+= CC_f2c="${CC}" -CONFIGURE_ENV+= CPP="${CPP}" -MAKE_ENV+= CC_f2c="${CC}" -MAKE_ENV+= CPP="${CPP}" +CONFIGURE_ENV+= CC_f2c=${CC:Q} +CONFIGURE_ENV+= CPP=${CPP:Q} +MAKE_ENV+= CC_f2c=${CC:Q} +MAKE_ENV+= CPP=${CPP:Q} BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/lang/fort77/Makefile b/lang/fort77/Makefile index e2250c9231c..5a820042e24 100644 --- a/lang/fort77/Makefile +++ b/lang/fort77/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/07/16 01:19:11 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:25 rillig Exp $ # DISTNAME= fort77-1.14a @@ -19,7 +19,7 @@ F2CPKGHASNOSHAREDLIB= .endif .if exists(/usr/bin/fort77) -PKG_SKIP_REASON= "${PKGNAME} is part of your ${OPSYS} distribution" +PKG_SKIP_REASON+= "${PKGNAME} is part of your ${OPSYS} distribution" .endif BUILD_TARGET= test diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile index 2d578379cd2..00e7db0a088 100644 --- a/lang/gawk/Makefile +++ b/lang/gawk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2005/09/05 16:58:22 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2005/12/05 20:50:25 rillig Exp $ # DISTNAME= gawk-3.1.5 @@ -20,7 +20,7 @@ TEST_TARGET= check INFO_FILES= gawk.info gawkinet.info -MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" +MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q} LDFLAGS.IRIX+= -lgen diff --git a/lang/gcc-ssp/Makefile b/lang/gcc-ssp/Makefile index 9bfc39d8ada..71d9e562b23 100644 --- a/lang/gcc-ssp/Makefile +++ b/lang/gcc-ssp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2005/11/09 21:25:39 tv Exp $ +# $NetBSD: Makefile,v 1.40 2005/12/05 20:50:25 rillig Exp $ DISTNAME= gcc-2.95.3 PKGNAME= gcc-ssp-2.95.3.13 @@ -34,17 +34,17 @@ USE_TOOLS+= gmake HAS_CONFIGURE= YES CONFIGURE_SCRIPT= ${WRKSRC}/configure -CONFIGURE_ARGS= --host=${MACHINE_GNU_PLATFORM} +CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM} CONFIGURE_ARGS+= --prefix=${GCC_PREFIX} CONFIGURE_ARGS+= --enable-shared USE_TOOLS+= chmod -MAKE_ENV+= ac_cv_prog_chmod="${TOOLS_CHMOD}" +MAKE_ENV+= ac_cv_prog_chmod=${TOOLS_CHMOD:Q} CONFIGURE_DIRS= ${WRKDIR}/objdir BUILD_DIRS= ${CONFIGURE_DIRS} -FILES_SUBST+= PKGNAME_NOREV=${PKGNAME_NOREV} GCC_PREFIX=${GCC_PREFIX} +FILES_SUBST+= PKGNAME_NOREV=${PKGNAME_NOREV:Q} GCC_PREFIX=${GCC_PREFIX:Q} MESSAGE_SUBST+= PKGNAME_NOREV=${PKGNAME_NOREV} INFO_DIR= ${GCC_PREFIX:S|^${PREFIX}/||}/info diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile index 00ebda18e52..16580743bd5 100644 --- a/lang/gcc/Makefile +++ b/lang/gcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.82 2005/11/09 21:25:39 tv Exp $ +# $NetBSD: Makefile,v 1.83 2005/12/05 20:50:25 rillig Exp $ DISTNAME= gcc-2.95.3 PKGREVISION= 6 @@ -23,19 +23,19 @@ MAKEFLAGS+= GMAKE_LOCALE=no HAS_CONFIGURE= YES CONFIGURE_SCRIPT= ${WRKSRC}/configure -CONFIGURE_ARGS= --host=${MACHINE_GNU_PLATFORM} +CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM} CONFIGURE_ARGS+= --prefix=${GCC_PREFIX} CONFIGURE_ARGS+= --enable-shared USE_TOOLS+= chmod -MAKE_ENV+= ac_cv_prog_chmod="${TOOLS_CHMOD}" +MAKE_ENV+= ac_cv_prog_chmod=${TOOLS_CHMOD:Q} CONFIGURE_DIRS= ${WRKDIR}/objdir BUILD_DIRS= ${CONFIGURE_DIRS} -FILES_SUBST+= DISTNAME=${DISTNAME} GCC_PREFIX=${GCC_PREFIX} +FILES_SUBST+= DISTNAME=${DISTNAME:Q} GCC_PREFIX=${GCC_PREFIX:Q} MESSAGE_SUBST+= DISTNAME=${DISTNAME} -PLIST_SUBST+= DISTNAME=${DISTNAME} +PLIST_SUBST+= DISTNAME=${DISTNAME:Q} INFO_DIR= ${GCC_PREFIX:S|^${PREFIX}/||}/info INFO_FILES= chill.info cpp.info g77.info gcc.info diff --git a/lang/gcc3-f77/Makefile b/lang/gcc3-f77/Makefile index 9abf8db1b7e..76d77d9c2b9 100644 --- a/lang/gcc3-f77/Makefile +++ b/lang/gcc3-f77/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/06/19 00:10:45 kristerw Exp $ +# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:25 rillig Exp $ PKGNAME= gcc3${GCC3_PKGMODIF}-f77-${GCC_VERSION} PKGREVISION= 1 @@ -11,7 +11,7 @@ INSTLIBS= libf2c/libg2c.la .include "../../lang/gcc3/language.mk" USE_TOOLS+= chmod -MAKE_ENV+= ac_cv_path_ac_cv_prog_chmod="${TOOLS_CHMOD}" +MAKE_ENV+= ac_cv_path_ac_cv_prog_chmod=${TOOLS_CHMOD:Q} CONFIGURE_ARGS+= --enable-languages="f77" ONLY_FOR_COMPILER= gcc diff --git a/lang/gcc3-java/Makefile b/lang/gcc3-java/Makefile index 5ecabe0c702..eae1a2a6433 100644 --- a/lang/gcc3-java/Makefile +++ b/lang/gcc3-java/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/06/16 06:58:00 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:25 rillig Exp $ PKGNAME= gcc3${GCC3_PKGMODIF}-java-${GCC_VERSION} COMMENT= GNU Compiler Collection, v3 - Java compiler @@ -56,6 +56,6 @@ do-install: . if ${MACHINE_ARCH} == "alpha" CONFIG_CFLAGS= ${CFLAGS:C/-O[0-9]*//g} CONFIG_CPPFLAGS= ${CPPFLAGS:C/-O[0-9]*//g} -CONFIGURE_ENV+= CFLAGS="${CONFIG_CFLAGS}" CPPFLAGS="${CONFIG_CPPFLAGS}" +CONFIGURE_ENV+= CFLAGS=${CONFIG_CFLAGS:Q} CPPFLAGS=${CONFIG_CPPFLAGS:Q} . endif .endif diff --git a/lang/gcc3/Makefile.common b/lang/gcc3/Makefile.common index 518dd9a980a..3fea3b23d81 100644 --- a/lang/gcc3/Makefile.common +++ b/lang/gcc3/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.17 2005/05/22 20:08:09 jlam Exp $ +# $NetBSD: Makefile.common,v 1.18 2005/12/05 20:50:25 rillig Exp $ GCC_VERSION= 3.3.5 DISTNAME= gcc-${GCC_VERSION} @@ -31,9 +31,9 @@ GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} GCC_SUBPREFIX= ${GCC3_INSTALLTO_SUBPREFIX} GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX} CONFIGURE_ARGS+= --prefix=${GCC_PREFIX} -PLIST_SUBST+= GCC_SUBPREFIX=${GCC_SUBPREFIX} -FILES_SUBST+= GCC_PREFIX=${GCC_PREFIX} -FILES_SUBST+= PKGNAME=${PKGNAME} +PLIST_SUBST+= GCC_SUBPREFIX=${GCC_SUBPREFIX:Q} +FILES_SUBST+= GCC_PREFIX=${GCC_PREFIX:Q} +FILES_SUBST+= PKGNAME=${PKGNAME:Q} MESSAGE_SUBST+= GCC_PREFIX=${GCC_PREFIX} BUILDLINK_PASSTHRU_RPATHDIRS+= ${GCC_PREFIX} @@ -57,7 +57,7 @@ PTHREAD_OPTS+= require native GCC_PLATFORM= ${MACHINE_GNU_PLATFORM} .endif CONFIGURE_ARGS+= --host=${GCC_PLATFORM} -PLIST_SUBST+= GCC_PLATFORM=${GCC_PLATFORM} +PLIST_SUBST+= GCC_PLATFORM=${GCC_PLATFORM:Q} .if ${OPSYS} == "AIX" CONFIGURE_ARGS+= --disable-aix64 @@ -83,7 +83,7 @@ AS_VERSION!= ${AS_PATH} --version | ${AWK} '{ \ }' USE_BINUTILS!= ${TEST} ${AS_VERSION} -lt 02130201 && ${ECHO} YES || ${ECHO} NO . endif -MAKEFLAGS+= USE_BINUTILS=${USE_BINUTILS} +MAKEFLAGS+= USE_BINUTILS=${USE_BINUTILS:Q} . endif .endif diff --git a/lang/gcc34-ada/Makefile b/lang/gcc34-ada/Makefile index db30872a4f5..b2e5415c5ad 100644 --- a/lang/gcc34-ada/Makefile +++ b/lang/gcc34-ada/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/11/05 10:30:06 rillig Exp $ +# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:25 rillig Exp $ # DISTNAME= gcc-${GCC_VERSION} @@ -45,7 +45,7 @@ AS_VERSION!= ${AS} --version | ${AWK} '{ \ }' USE_BINUTILS!= ${TEST} ${AS_VERSION} -lt 02130201 && ${ECHO} YES || ${ECHO} NO . endif -MAKEFLAGS+= USE_BINUTILS=${USE_BINUTILS} +MAKEFLAGS+= USE_BINUTILS=${USE_BINUTILS:Q} . endif .endif .if defined(USE_BINUTILS) && !empty(USE_BINUTILS:M[yY][eE][sS]) @@ -71,14 +71,14 @@ ALT_GCC_RTS!= ${ALT_GCC} --print-file-name=adalib . if !empty(ALT_GCC_RTS) RALT_GCC_RTS= ${ALT_GCC_RTS:S%${LOCALBASE}%%:S%/%%} . else -PKG_SKIP_REASON= "${ALT_GCC} does not appear to be an Ada compiler" +PKG_SKIP_REASON+= "${ALT_GCC} does not appear to be an Ada compiler" . endif . else -PKG_SKIP_REASON= "Missing bootstrap Ada compiler" +PKG_SKIP_REASON+= "Missing bootstrap Ada compiler" . endif .endif .if !defined(USE_GCC34) && !defined(ALT_GCC) -PKG_SKIP_REASON= "An Ada bootstrap compiler must be specified" +PKG_SKIP_REASON+= "An Ada bootstrap compiler must be specified" .endif # Make location overridable, to allow ping-pong bootstraps. @@ -94,9 +94,9 @@ GCC_PLATFORM= ${LOWER_ARCH}--${LOWER_OPSYS}${APPEND_ELF}${LOWER_OS_VERSION:C/[_ CONFIGURE_ARGS+= --host=${GCC_PLATFORM} GCC_ARCHSUBDIR= ${GCC_SUBPREFIX}/lib/gcc/${GCC_PLATFORM}/${GCC_VERSION} GCC_ARCHDIR= ${PREFIX}/${GCC_ARCHSUBDIR} -PLIST_SUBST+= GCC_SUBPREFIX=${GCC_SUBPREFIX} -FILES_SUBST+= GCC_PREFIX=${GCC_PREFIX} -FILES_SUBST+= PKGNAME=${PKGNAME} +PLIST_SUBST+= GCC_SUBPREFIX=${GCC_SUBPREFIX:Q} +FILES_SUBST+= GCC_PREFIX=${GCC_PREFIX:Q} +FILES_SUBST+= PKGNAME=${PKGNAME:Q} MESSAGE_SUBST+= GCC_PREFIX=${GCC_PREFIX} CONFIGURE_ARGS+= --prefix=${GCC_PREFIX} PTHREAD_OPTS+= require native diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile index 9236c22d91c..7e4b7f1a6ad 100644 --- a/lang/gcc34/Makefile +++ b/lang/gcc34/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2005/11/05 08:43:44 rillig Exp $ +# $NetBSD: Makefile,v 1.27 2005/12/05 20:50:25 rillig Exp $ # DISTNAME= gcc-${GCC_VERSION} @@ -40,7 +40,7 @@ AS_VERSION!= ${AS_PATH} --version | ${AWK} '{ \ }' USE_BINUTILS!= ${TEST} ${AS_VERSION} -lt 02130201 && ${ECHO} YES || ${ECHO} NO . endif -MAKEFLAGS+= USE_BINUTILS=${USE_BINUTILS} +MAKEFLAGS+= USE_BINUTILS=${USE_BINUTILS:Q} . endif .endif .if defined(USE_BINUTILS) && !empty(USE_BINUTILS:M[yY][eE][sS]) @@ -54,7 +54,7 @@ CONFIGURE_ARGS+= --with-gnu-ld # Optional languages - change as required # If BUILD_ADA is YES, then you'll need to specify # an Ada in the "Ada bootstrap compiler section" -BUILD_DEFS= BUILD_ADA BUILD_CXX BUILD_F77 \ +BUILD_DEFS+= BUILD_ADA BUILD_CXX BUILD_F77 \ BUILD_JAVA BUILD_OBJC BUILD_ADA?= NO BUILD_CXX?= YES @@ -91,15 +91,15 @@ MAKE_ENV+= ICONVPREFIX=${BUILDLINK_PREFIX.iconv} .include "../../devel/gmp/buildlink3.mk" CONFIGURE_ARGS+= --with-gmp=${BUILDLINK_PREFIX.gmp} USE_TOOLS+= chmod -MAKE_ENV+= ac_cv_path_ac_cv_prog_chmod="${TOOLS_CHMOD}" +MAKE_ENV+= ac_cv_path_ac_cv_prog_chmod=${TOOLS_CHMOD:Q} .endif # GNU pth is useless here .if !empty(BUILD_ADA:M[Yy][Ee][Ss]) # ADA tasking strictly requires native threads -PTHREAD_OPTS= require native +PTHREAD_OPTS+= require native .else -PTHREAD_OPTS= native +PTHREAD_OPTS+= native .endif .include "../../mk/pthread.buildlink3.mk" .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "native" @@ -110,7 +110,7 @@ USE_PKGINSTALL= YES USE_TOOLS+= gmake HAS_CONFIGURE= YES # no GNU_CONFIGURE! CONFIG_SHELL?= ${SH} -CONFIGURE_ENV+= CONFIG_SHELL=${CONFIG_SHELL} +CONFIGURE_ENV+= CONFIG_SHELL=${CONFIG_SHELL:Q} USE_MAKEINFO= YES PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC @@ -129,20 +129,20 @@ ALT_GCC_RTS!= ${ALT_GCC} --print-file-name=adalib . if !empty(ALT_GCC_RTS) RALT_GCC_RTS= ${ALT_GCC_RTS:S%${LOCALBASE}%%:S%/%%} . else -PKG_SKIP_REASON= "${ALT_GCC} does not appear to be an Ada compiler" +PKG_SKIP_REASON+= "${ALT_GCC} does not appear to be an Ada compiler" . endif . else -PKG_SKIP_REASON= "Missing bootstrap Ada compiler" +PKG_SKIP_REASON+= "Missing bootstrap Ada compiler" . endif . endif . if !defined(USE_GCC34ADA) && !defined(ALT_GCC) -PKG_SKIP_REASON= "An Ada bootstrap compiler must be specified to BUILD_ADA" +PKG_SKIP_REASON+= "An Ada bootstrap compiler must be specified to BUILD_ADA" . endif .endif GCC_SUBPREFIX= gcc34 GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX} -FILES_SUBST+= PKGNAME=${PKGNAME} +FILES_SUBST+= PKGNAME=${PKGNAME:Q} MESSAGE_SUBST+= GCC_PREFIX=${GCC_PREFIX} CONFIGURE_ARGS+= --prefix=${GCC_PREFIX} CPPFLAGS+= -I${BUILDLINK_DIR}/include @@ -152,7 +152,7 @@ CFLAGS+= -I${BUILDLINK_DIR}/include GCC_PLATFORM= ${LOWER_ARCH}--${LOWER_OPSYS}${APPEND_ELF}${LOWER_OS_VERSION:C/[_a-z].*//} CONFIGURE_ARGS+= --host=${GCC_PLATFORM} ABI_BASELINE_PAIR= ${GCC_PLATFORM:C/--/-/} -MAKE_ENV+= ABI_BASELINE_PAIR=${ABI_BASELINE_PAIR} +MAKE_ENV+= ABI_BASELINE_PAIR=${ABI_BASELINE_PAIR:Q} .endif # NetBSD post-patch: diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile index 07b52524625..e810ebbd1a6 100644 --- a/lang/ghc/Makefile +++ b/lang/ghc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/10/14 18:47:28 kristerw Exp $ +# $NetBSD: Makefile,v 1.26 2005/12/05 20:50:25 rillig Exp $ DISTNAME= ghc-6.4.1 CATEGORIES= lang @@ -18,7 +18,7 @@ ONLY_FOR_PLATFORM= NetBSD-1.5*-i386 NetBSD-1.6*-i386 NetBSD-[2-9]*-i386 GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-ghc=${WRKDIR}/bootstrap/bin/ghc -CONFIGURE_ENV+= PerlCmd=${PERL5} +CONFIGURE_ENV+= PerlCmd=${PERL5:Q} USE_GNU_READLINE= yes # uses the UNDO_ constants USE_TOOLS+= gmake perl:run diff --git a/lang/gpc/Makefile b/lang/gpc/Makefile index 754e36973e3..d01b9e9c1a6 100644 --- a/lang/gpc/Makefile +++ b/lang/gpc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/11/09 21:26:45 tv Exp $ +# $NetBSD: Makefile,v 1.24 2005/12/05 20:50:25 rillig Exp $ DISTNAME= gpc-2.1 PKGREVISION= 3 @@ -22,7 +22,7 @@ NOT_FOR_PLATFORM+= Interix-*-* WRKSRC= ${WRKDIR}/gcc-2.95.3 USE_TOOLS+= gmake -USE_NCURSES= # defined +USE_NCURSES= yes PLIST_SRC= PLIST .include "../../mk/bsd.prefs.mk" @@ -41,13 +41,13 @@ GPC_SUBPREFIX= ${_GCC_SUBPREFIX}/ HAS_CONFIGURE= yes CONFIGURE_SCRIPT= ${WRKSRC}/configure -CONFIGURE_ARGS= --host=${MACHINE_GNU_PLATFORM} +CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM} CONFIGURE_ARGS+= --prefix=${GPC_PREFIX} CONFIGURE_ARGS+= --infodir=${PREFIX}/info CONFIGURE_ARGS+= --enable-shared CONFIGURE_ARGS+= --enable-languages=pascal -PLIST_SUBST+= GPC_SUBPREFIX=${GPC_SUBPREFIX} +PLIST_SUBST+= GPC_SUBPREFIX=${GPC_SUBPREFIX:Q} CONFIGURE_DIRS= ${WRKDIR}/objdir BUILD_DIRS= ${CONFIGURE_DIRS} diff --git a/lang/icon/Makefile b/lang/icon/Makefile index fbf2760f9cf..608d639ff4a 100644 --- a/lang/icon/Makefile +++ b/lang/icon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2005/06/01 18:02:58 jlam Exp $ +# $NetBSD: Makefile,v 1.36 2005/12/05 20:50:25 rillig Exp $ DISTNAME= icon.v942src PKGNAME= icon-9.4.2 @@ -35,7 +35,7 @@ NAME= sun_gcc . elif !empty(CC_VERSION:MSun) NAME= sun_sunc . else -PKG_FAIL_REASON= "${PKGNAME} does not know about ${CC_VERSION}" +PKG_FAIL_REASON+= "${PKGNAME} does not know about ${CC_VERSION}" . endif . if ${MACHINE_ARCH} == "sparc" @@ -45,7 +45,7 @@ PTHREAD_OPTS+= require native . endif .else -PKG_FAIL_REASON= "${PKGNAME} does not have the correct config name for this system" +PKG_FAIL_REASON+= "${PKGNAME} does not have the correct config name for this system" .endif .include "../../mk/x11.buildlink3.mk" diff --git a/lang/jdk-openjit/Makefile.common b/lang/jdk-openjit/Makefile.common index 48d08d787d7..e4ebbf662e7 100644 --- a/lang/jdk-openjit/Makefile.common +++ b/lang/jdk-openjit/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.8 2005/05/22 20:08:10 jlam Exp $ +# $NetBSD: Makefile.common,v 1.9 2005/12/05 20:50:25 rillig Exp $ OPENJIT_VERSION=1.1.16 @@ -10,7 +10,7 @@ MAINTAINER= tv@pobox.com HOMEPAGE= http://www.openjit.org/ COMMENT= Reflective JIT compiler for Java -GNU_CONFIGURE= # defined +GNU_CONFIGURE= yes USE_TOOLS+= gmake .include "../../mk/bsd.prefs.mk" @@ -18,7 +18,7 @@ USE_TOOLS+= gmake CONFIGURE_ARGS+=--with-jdk=${PKG_JAVA_HOME} -PLIST_SUBST+= CLASSDIR=${CLASSDIR} JRELIB=${JRELIB} JAVADIR=${PKG_JAVA_HOME:C|^${PREFIX}/||} +PLIST_SUBST+= CLASSDIR=${CLASSDIR:Q} JRELIB=${JRELIB:Q} JAVADIR=${PKG_JAVA_HOME:C|^${PREFIX}/||} PKGDIR= ${.CURDIR}/../../lang/jdk-openjit DISTINFO_FILE= ${PKGDIR}/distinfo diff --git a/lang/ksi/Makefile b/lang/ksi/Makefile index 0a38ba1c870..bf1458b375b 100644 --- a/lang/ksi/Makefile +++ b/lang/ksi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:14 tv Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:26 rillig Exp $ DISTNAME= ksi-3.4.1 PKGREVISION= 3 @@ -12,7 +12,7 @@ COMMENT= Portable, embeddable Scheme implementation written in C CPPFLAGS+= -Dunix GNU_CONFIGURE= yes INFO_FILES= ksi-lang.info ksi-lib.info ksi.info -MAKE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR} +MAKE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR:Q} USE_GNU_READLINE= # uses rl_event_hook() interface USE_LIBTOOL= yes USE_MAKEINFO= YES diff --git a/lang/librep/buildlink3.mk b/lang/librep/buildlink3.mk index ba4619ea9eb..392cc3faa8a 100644 --- a/lang/librep/buildlink3.mk +++ b/lang/librep/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2004/10/03 00:15:01 tv Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2005/12/05 20:50:26 rillig Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBREP_BUILDLINK3_MK:= ${LIBREP_BUILDLINK3_MK}+ @@ -14,7 +14,7 @@ BUILDLINK_PACKAGES+= librep BUILDLINK_DEPENDS.librep+= librep>=0.17 BUILDLINK_RECOMMENDED.librep+= librep>=0.17nb1 BUILDLINK_PKGSRCDIR.librep?= ../../lang/librep -MAKE_FLAGS+= rep_LIBTOOL=${LIBTOOL} +MAKE_FLAGS+= rep_LIBTOOL=${LIBTOOL:Q} .endif # LIBREP_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/lang/libtcl-nothread/Makefile b/lang/libtcl-nothread/Makefile index dba9c06c99b..3c39806aa63 100644 --- a/lang/libtcl-nothread/Makefile +++ b/lang/libtcl-nothread/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/06/16 06:58:00 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:26 rillig Exp $ # DISTNAME= tcl8.4.6-src @@ -15,7 +15,7 @@ DEPENDS+= tcl>=8.4.6nb5:../../lang/tcl WRKSRC= ${WRKDIR}/${DISTNAME:C/-src//}/unix GNU_CONFIGURE= yes -MAKE_ENV+= TOUCH="${TOUCH}" +MAKE_ENV+= TOUCH=${TOUCH:Q} MAKE_ENV+= NOTHREAD_SUFX=-nothread USE_LIBTOOL= yes diff --git a/lang/mercury/Makefile b/lang/mercury/Makefile index c25778672c8..a8262c59060 100644 --- a/lang/mercury/Makefile +++ b/lang/mercury/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/07/12 21:33:17 kristerw Exp $ +# $NetBSD: Makefile,v 1.26 2005/12/05 20:50:26 rillig Exp $ DISTNAME= mercury-compiler-0.11.0 PKGNAME= mercury-0.11.0 @@ -22,7 +22,7 @@ INFO_FILES+= mercury_user_guide.info # Some of the scripts test CC and use special settings for gcc. CONFIGURE_ENV+= CC=gcc -CONFIGURE_ENV+= HOSTNAMECMD=${TOOLS_HOSTNAME_CMD} +CONFIGURE_ENV+= HOSTNAMECMD=${TOOLS_HOSTNAME_CMD:Q} USE_TOOLS+= hostname MAKE_ENV+= READLINE_PREFIX=${BUILDLINK_PREFIX.readline} diff --git a/lang/mono/Makefile b/lang/mono/Makefile index 055e49e946e..a9f0835110d 100644 --- a/lang/mono/Makefile +++ b/lang/mono/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2005/08/10 20:56:18 jlam Exp $ +# $NetBSD: Makefile,v 1.43 2005/12/05 20:50:26 rillig Exp $ DISTNAME= mono-1.1.8.3 PKGREVISION= 1 @@ -29,7 +29,7 @@ EXTRACT_USING= gtar GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} -MAKE_FLAGS+= PERL=${PERL5} +MAKE_FLAGS+= PERL=${PERL5:Q} UNLIMIT_RESOURCES= datasize UNLIMIT_RESOURCES+= stacksize UNLIMIT_RESOURCES+= memorysize diff --git a/lang/mpd/Makefile b/lang/mpd/Makefile index 30f7b272d95..e1821e886b7 100644 --- a/lang/mpd/Makefile +++ b/lang/mpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/10/19 08:45:24 is Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:26 rillig Exp $ # PKGNAME= mpd-1.0.1 @@ -9,7 +9,7 @@ MASTER_SITES= http://www.cs.arizona.edu/mpd/download/ EXTRACT_SUFX= .tgz DIST_SUBDIR= mpd-language -CONFLICTS= audio/musicpd +CONFLICTS+= musicpd-[0-9]* MAINTAINER= is@NetBSD.org HOMEPAGE= http://www.cs.arizona.edu/mpd/ diff --git a/lang/mzscheme/Makefile b/lang/mzscheme/Makefile index 33d29d4d327..33820d7ac84 100644 --- a/lang/mzscheme/Makefile +++ b/lang/mzscheme/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/09/24 02:30:57 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:26 rillig Exp $ DISTNAME= mzscheme-205.src.unix PKGNAME= mzscheme-205 @@ -9,7 +9,7 @@ MAINTAINER= pooka@NetBSD.org HOMEPAGE= http://www.plt-scheme.org/software/mzscheme/ COMMENT= R5RS-compliant scheme -CONFLICTS+= drscheme*:../drscheme +CONFLICTS+= drscheme-[0-9]* WRKSRC= ${WRKDIR}/plt/src GNU_CONFIGURE= yes diff --git a/lang/nawk/Makefile b/lang/nawk/Makefile index f87813ea15f..b0d96d2a466 100644 --- a/lang/nawk/Makefile +++ b/lang/nawk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/05/22 19:11:12 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2005/12/05 20:50:26 rillig Exp $ # DISTNAME= awk @@ -15,13 +15,13 @@ MAINTAINER= cjep@NetBSD.org HOMEPAGE= http://cm.bell-labs.com/who/bwk/ COMMENT= Brian Kernighan's pattern-directed scanning and processing language -DIST_SUBDIR= ${PKGNAME} +DIST_SUBDIR= ${PKGNAME_NOREV} PKG_INSTALLATION_TYPES= overwrite pkgviews USE_TOOLS+= yacc WRKSRC= ${WRKDIR} CFLAGS+= ${CPPFLAGS} -MAKE_FLAGS+= CC=${CC:Q} YACC=${YACC:Q} CFLAGS=${CFLAGS:Q} +MAKE_FLAGS+= CC=${CC:Q} YACC=${YACC:Q} CFLAGS=${CFLAGS:M*:Q} BUILD_TARGET= a.out INSTALLATION_DIRS= bin man/man1 diff --git a/lang/nhc98/Makefile b/lang/nhc98/Makefile index faaef23f9e5..86a7400d853 100644 --- a/lang/nhc98/Makefile +++ b/lang/nhc98/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2005/05/22 20:08:10 jlam Exp $ +# $NetBSD: Makefile,v 1.37 2005/12/05 20:50:26 rillig Exp $ DISTNAME= nhc98src-1.18.tar.gz PKGNAME= nhc98-1.18 @@ -17,8 +17,8 @@ NOT_FOR_PLATFORM= *-*-alpha *-*-sparc64 *-*-x86_64 WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} -INCOMPAT_CURSES= NetBSD-1.5* NetBSD-1.6[-_.]* -INCOMPAT_CURSES+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-K]* +INCOMPAT_CURSES= NetBSD-1.5*-* NetBSD-1.6[-_.]*-* +INCOMPAT_CURSES+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-K]*-* HAS_CONFIGURE= YES CONFIGURE_ARGS+= --buildwith=gcc --installdir=${PREFIX} \ @@ -28,7 +28,7 @@ USE_TOOLS+= gmake BUILD_TARGET= default HARCH= `${WRKSRC}/script/harch` -PLIST_SUBST+= HARCH=${HARCH} +PLIST_SUBST+= HARCH=${HARCH:Q} post-extract: @${FIND} ${WRKSRC}/docs -type d -name \*CVS\* -print | ${XARGS} ${RM} -rf diff --git a/lang/ocaml/Makefile.common b/lang/ocaml/Makefile.common index 4a8a0aae6d9..796db89b058 100644 --- a/lang/ocaml/Makefile.common +++ b/lang/ocaml/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.11 2005/09/04 13:57:50 tonio Exp $ +# $NetBSD: Makefile.common,v 1.12 2005/12/05 20:50:26 rillig Exp $ DISTNAME= ocaml-3.08.4 CATEGORIES= lang @@ -17,7 +17,7 @@ HAS_CONFIGURE= yes CONFIGURE_ARGS+= -prefix ${PREFIX} CONFIGURE_ARGS+= -libs "${LDFLAGS}" CONFIGURE_ARGS+= -with-pthread -CONFIGURE_ENV+= BDB_LIBS=${BDB_LIBS} \ +CONFIGURE_ENV+= BDB_LIBS=${BDB_LIBS:Q} \ BDB_BUILTIN=${USE_BUILTIN.${BDB_TYPE}} CPPFLAGS+= -DDB_DBM_HSEARCH diff --git a/lang/ocaml/PLIST.stub b/lang/ocaml/PLIST.stub index abd01f65c1e..7ca7a465e71 100644 --- a/lang/ocaml/PLIST.stub +++ b/lang/ocaml/PLIST.stub @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.stub,v 1.1 2005/02/04 21:35:51 adrianp Exp $ +@comment $NetBSD: PLIST.stub,v 1.2 2005/12/05 20:50:26 rillig Exp $ lib/ocaml/stublibs/dllbigarray.so lib/ocaml/stublibs/dllmldbm.so lib/ocaml/stublibs/dllnums.so @@ -6,5 +6,5 @@ lib/ocaml/stublibs/dllstr.so lib/ocaml/stublibs/dllthreads.so lib/ocaml/stublibs/dllunix.so lib/ocaml/stublibs/dllvmthreads.so -@unexec ${RMDIR} %D/lib/ocaml/stublibs +@dirrm lib/ocaml/stublibs @unexec ${RMDIR} %D/lib/ocaml 2>/dev/null || ${TRUE} diff --git a/lang/onyx/Makefile b/lang/onyx/Makefile index 1ccac42ad58..13935a1421b 100644 --- a/lang/onyx/Makefile +++ b/lang/onyx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/04/11 21:46:15 tv Exp $ +# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:26 rillig Exp $ DISTNAME= onyx-${VERS} PKGREVISION= 1 @@ -13,7 +13,7 @@ COMMENT= Embeddable stack-based threaded interpreted language 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]* +ONLY_FOR_PLATFORM= NetBSD-1.5[YZ]*-* NetBSD-1.6*-* NetBSD-1.7*-* NetBSD-[2-9]*-* GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-pcre-prefix=${BUILDLINK_PREFIX.pcre} @@ -21,7 +21,7 @@ CONFIGURE_ARGS+= --with-pcre-prefix=${BUILDLINK_PREFIX.pcre} BUILDLINK_DEPENDS.pcre?= pcre>=4.0 VERS= 5.1.1 -PLIST_SUBST+= VERS=${VERS} +PLIST_SUBST+= VERS=${VERS:Q} do-build: @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} cook) diff --git a/lang/opencobol/Makefile b/lang/opencobol/Makefile index 26af76ebd71..cb120f487d5 100644 --- a/lang/opencobol/Makefile +++ b/lang/opencobol/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:15 tv Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:26 rillig Exp $ # DISTNAME= open-cobol-0.23 @@ -28,7 +28,7 @@ CONF_FILES= ${EGDIR}/libconf.conf ${PKG_SYSCONFDIR}/libconf.conf .include "../../mk/bsd.prefs.mk" -SUBST_CLASSES= lnk +SUBST_CLASSES+= lnk SUBST_STAGE.lnk= post-patch SUBST_FILES.lnk= configure SUBST_SED.lnk= -e "s|COBC_LIBS=\"\"|COBC_LIBS=\"\$$LDFLAGS\"|g" \ diff --git a/lang/perl5/hacks.mk b/lang/perl5/hacks.mk index c65ce0aee4b..1aa7403fbdb 100644 --- a/lang/perl5/hacks.mk +++ b/lang/perl5/hacks.mk @@ -1,4 +1,4 @@ -# $NetBSD: hacks.mk,v 1.1 2005/06/24 06:43:45 jlam Exp $ +# $NetBSD: hacks.mk,v 1.2 2005/12/05 20:50:26 rillig Exp $ .include "../../mk/compiler.mk" @@ -16,7 +16,7 @@ _GCC_IS_TOO_OLD!= \ else \ ${ECHO} "no"; \ fi -MAKEFLAGS+= _GCC_IS_TOO_OLD=${_GCC_IS_TOO_OLD} +MAKEFLAGS+= _GCC_IS_TOO_OLD=${_GCC_IS_TOO_OLD:Q} . endif . if !empty(_GCC_IS_TOO_OLD:M[yY][eE][sS]) PKG_HACKS+= sparc64-codegen diff --git a/lang/php5/MESSAGE b/lang/php5/MESSAGE index 56649187689..9903a4c390f 100644 --- a/lang/php5/MESSAGE +++ b/lang/php5/MESSAGE @@ -1,7 +1,6 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.4 2005/10/08 16:51:50 jdolecek Exp $ +$NetBSD: MESSAGE,v 1.5 2005/12/05 20:50:26 rillig Exp $ Note php-openssl has been removed as separate package as of 5.0.5nb1, the main PHP5 package has it built-in now. =========================================================================== - diff --git a/lang/php5/Makefile.common b/lang/php5/Makefile.common index 094cbc1e583..777cedf9ce1 100644 --- a/lang/php5/Makefile.common +++ b/lang/php5/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.12 2005/12/03 18:53:57 jdolecek Exp $ +# $NetBSD: Makefile.common,v 1.13 2005/12/05 20:50:26 rillig Exp $ # DISTNAME?= php-${PHP_BASE_VERS} @@ -17,7 +17,7 @@ HOMEPAGE?= http://www.php.net/ PHP_BASE_VERS= 5.1.1 PHP_EXTENSION_DIR= lib/php/20040412 -PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR} +PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR:Q} PKG_SYSCONFVAR?= php diff --git a/lang/php5/Makefile.php b/lang/php5/Makefile.php index 919dd5bb53c..3dfc50fd3be 100644 --- a/lang/php5/Makefile.php +++ b/lang/php5/Makefile.php @@ -1,11 +1,11 @@ -# $NetBSD: Makefile.php,v 1.15 2005/12/03 18:53:57 jdolecek Exp $ +# $NetBSD: Makefile.php,v 1.16 2005/12/05 20:50:26 rillig Exp $ # .include "../../lang/php5/Makefile.common" DISTINFO_FILE= ${.CURDIR}/../../lang/php5/distinfo -BUILD_DEFS= USE_INET6 +BUILD_DEFS+= USE_INET6 USE_LIBTOOL= YES GNU_CONFIGURE= YES @@ -13,7 +13,7 @@ GNU_CONFIGURE= YES CONFIGURE_ENV+= EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}" PHP_EXTENSION_DIR= lib/php/20040412 -PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR} +PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR:Q} .include "../../mk/bsd.prefs.mk" diff --git a/lang/pnet/Makefile b/lang/pnet/Makefile index 68aebe0a873..b54ea3bbeeb 100644 --- a/lang/pnet/Makefile +++ b/lang/pnet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:10 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:26 rillig Exp $ DISTNAME= pnet-0.6.6 PKGREVISION= 1 @@ -9,7 +9,7 @@ MAINTAINER= pancake@phreaker.net HOMEPAGE= http://www.dotgnu.org/ COMMENT= DotGNU Portable.NET (development tools) -BUILD_DEPENDS= treecc>=0.2.6:../../devel/treecc +BUILD_DEPENDS+= treecc>=0.2.6:../../devel/treecc CONFLICTS= mono-[0-9]* diff --git a/lang/py-basicproperty/Makefile b/lang/py-basicproperty/Makefile index 23ed6dcdc64..5f120a51a71 100644 --- a/lang/py-basicproperty/Makefile +++ b/lang/py-basicproperty/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:11 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:26 rillig Exp $ # DISTNAME= basicproperty-0.6.3a @@ -15,7 +15,7 @@ MAKE_ENV+= BINDIR=${PREFIX}/bin USE_TOOLS+= gmake PYDISTUTILSPKG= yes -PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX} +PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX:Q} .include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/py-funge/Makefile b/lang/py-funge/Makefile index db2d711776e..7c3c3d3898b 100644 --- a/lang/py-funge/Makefile +++ b/lang/py-funge/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/04/11 21:46:15 tv Exp $ +# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:26 rillig Exp $ DISTNAME= pyfunge-0.2-beta1 PKGNAME= ${PYPKGPREFIX}-funge-0.2beta1 @@ -15,7 +15,7 @@ NO_CONFIGURE= yes PYTHON_VERSIONS_ACCEPTED?= 23 WRKSRC?= ${WRKDIR}/PyFunge -PLIST_SUBST+= PYSITELIB=${PYSITELIB} +PLIST_SUBST+= PYSITELIB=${PYSITELIB:Q} PYCOMPILEALL= ${BUILDLINK_PREFIX.${PYPACKAGE}}/${PYLIB}/compileall.py diff --git a/lang/py-pyrex/Makefile b/lang/py-pyrex/Makefile index 5787ef50b98..9c3aca2407f 100644 --- a/lang/py-pyrex/Makefile +++ b/lang/py-pyrex/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/04/11 21:46:15 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:26 rillig Exp $ DISTNAME= Pyrex-0.9.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/P/p/} @@ -7,7 +7,7 @@ MASTER_SITES= http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/ MAINTAINER= tsarna@NetBSD.org HOMEPAGE= http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/ -COMMENT= A Language for Writing Python Extension Modules +COMMENT= Language for Writing Python Extension Modules PYTHON_VERSIONS_ACCEPTED= 23 22 diff --git a/lang/python15/Makefile b/lang/python15/Makefile index c992ec2d4c6..42f42dc7082 100644 --- a/lang/python15/Makefile +++ b/lang/python15/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/12/03 01:35:36 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:27 rillig Exp $ # DISTNAME= py152 @@ -35,7 +35,7 @@ PY_PLATNAME= ${LOWER_OPSYS:C/\..*//} .else PY_PLATNAME= ${LOWER_OPSYS}${OS_VERSION:C/\..*//} .endif -PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME} +PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME:Q} post-patch: ${RM} -f ${WRKSRC}/Lib/test/test_fcntl.py.orig diff --git a/lang/python21/Makefile b/lang/python21/Makefile index 6ed92fa250f..15c92823f8c 100644 --- a/lang/python21/Makefile +++ b/lang/python21/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/11/16 19:18:58 joerg Exp $ +# $NetBSD: Makefile,v 1.26 2005/12/05 20:50:27 rillig Exp $ # DISTNAME= Python-2.1.3 @@ -17,7 +17,7 @@ CONFLICTS+= python-[0-9]* USE_LANGUAGES= c c++ GNU_CONFIGURE= YES -PTHREAD_OPTS= require +PTHREAD_OPTS+= require .include "../../mk/pthread.buildlink3.mk" .if ${PTHREAD_TYPE} == "pth" CONFIGURE_ARGS+= --with-pth @@ -45,7 +45,7 @@ PY_PLATNAME= sunos${OS_VERSION:C/\..*//} .else PY_PLATNAME= ${LOWER_OPSYS}${OS_VERSION:C/\..*//} .endif -PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME} +PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME:Q} PLAT_SOCKET= "@comment " PLAT_TERMIOS= "@comment " @@ -57,7 +57,7 @@ PLAT_SOCKET= "" PLAT_TERMIOS= "" . endif .endif -PLIST_SUBST+= PLAT_SOCKET=${PLAT_SOCKET} PLAT_TERMIOS=${PLAT_TERMIOS} +PLIST_SUBST+= PLAT_SOCKET=${PLAT_SOCKET:Q} PLAT_TERMIOS=${PLAT_TERMIOS:Q} # bsddb.so is not built on Solaris (or IRIX?) BSDDB= @@ -65,13 +65,13 @@ BSDDB= BSDDB= "@comment " .else .include "../../mk/bdb.buildlink3.mk" -MAKE_ENV+= PY_BDB_TYPE=${BDB_TYPE} +MAKE_ENV+= PY_BDB_TYPE=${BDB_TYPE:Q} MAKE_ENV+= PY_BDB_INCDIRS=${BDBBASE}/${BUILDLINK_INCDIRS.${BDB_TYPE}} MAKE_ENV+= PY_BDB_LIBDIRS=${BDBBASE}/lib .endif -PLIST_SUBST+= BSDDB=${BSDDB} +PLIST_SUBST+= BSDDB=${BSDDB:Q} -PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX} +PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q} post-extract: ${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX} diff --git a/lang/python22/Makefile b/lang/python22/Makefile index aa4ee9b356c..03ec4644efc 100644 --- a/lang/python22/Makefile +++ b/lang/python22/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2005/11/16 19:18:58 joerg Exp $ +# $NetBSD: Makefile,v 1.30 2005/12/05 20:50:27 rillig Exp $ # DISTNAME= Python-2.2.3 @@ -17,7 +17,7 @@ CONFLICTS+= python-[0-9]* USE_LANGUAGES= c c++ GNU_CONFIGURE= YES -PTHREAD_OPTS= require +PTHREAD_OPTS+= require .include "../../mk/pthread.buildlink3.mk" .if ${PTHREAD_TYPE} == "pth" CONFIGURE_ARGS+= --with-pth @@ -34,7 +34,7 @@ PLIST_SRC+= ${.CURDIR}/../../lang/python22/PLIST.${OPSYS} PLIST_SRC+= ${.CURDIR}/../../lang/python22/PLIST.common_end .if ${OPSYS} == "Darwin" || ${OPSYS} == "Interix" -PLIST_SUBST+= PY_PLATNAME=${LOWER_OPSYS} +PLIST_SUBST+= PY_PLATNAME=${LOWER_OPSYS:Q} .elif ${OPSYS} == "IRIX" PLIST_SUBST+= PY_PLATNAME=${LOWER_OPSYS:C/\..*//} .elif ${OPSYS} == "SunOS" @@ -43,7 +43,7 @@ PLIST_SUBST+= PY_PLATNAME=sunos${OS_VERSION:C/\..*//} PLIST_SUBST+= PY_PLATNAME=${LOWER_OPSYS}${OS_VERSION:C/\..*//} .endif -PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX} +PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q} INSTALL_TARGET= altinstall diff --git a/lang/python23/Makefile b/lang/python23/Makefile index 128224f9730..80da4710c29 100644 --- a/lang/python23/Makefile +++ b/lang/python23/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2005/11/16 19:18:59 joerg Exp $ +# $NetBSD: Makefile,v 1.32 2005/12/05 20:50:27 rillig Exp $ # PKGNAME= python23-2.3.5 @@ -8,7 +8,7 @@ CONFLICTS+= python-[0-9]* #PKG_INSTALLATION_TYPES= overwrite pkgviews -PTHREAD_OPTS= require +PTHREAD_OPTS+= require .include "../../mk/pthread.buildlink3.mk" .if ${PTHREAD_TYPE} == "pth" CONFIGURE_ARGS+= --with-pth diff --git a/lang/python23/Makefile.common b/lang/python23/Makefile.common index 0180eba6936..b327f0f164b 100644 --- a/lang/python23/Makefile.common +++ b/lang/python23/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.27 2005/07/03 19:49:06 recht Exp $ +# $NetBSD: Makefile.common,v 1.28 2005/12/05 20:50:27 rillig Exp $ # DISTNAME= Python-2.3.5 @@ -13,10 +13,10 @@ COMMENT= Interpreted, interactive, object-oriented programming language USE_LANGUAGES= c c++ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-shared -CONFIGURE_ARGS+= OPT="${CFLAGS}" +CONFIGURE_ARGS+= OPT=${CFLAGS:M*:Q} # fdatasync() -LIBS.SunOS= -lrt +LIBS.SunOS+= -lrt .include "../../mk/bsd.prefs.mk" @@ -35,7 +35,7 @@ PY_PLATNAME= sunos${OS_VERSION:C/\..*//} .else PY_PLATNAME= ${LOWER_OPSYS}${OS_VERSION:C/\..*//} .endif -PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME} +PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME:Q} # the dl module isn't built for 64 bit archs and Darwin .if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" \ @@ -62,8 +62,8 @@ OSSAUDIODEV_SUBST= EXTRA_SO_SUBST= .endif -PLIST_SUBST+= EXTRA_SO=${EXTRA_SO_SUBST} -PLIST_SUBST+= OSSAUDIODEV=${OSSAUDIODEV_SUBST} +PLIST_SUBST+= EXTRA_SO=${EXTRA_SO_SUBST:Q} +PLIST_SUBST+= OSSAUDIODEV=${OSSAUDIODEV_SUBST:Q} # Make sure python modules can link correctly .if ${OPSYS} == "Darwin" @@ -80,7 +80,7 @@ PLIST_SUBST+= BSDDBMODULE="@comment " PLIST_SUBST+= NOSHLIB="@comment " .else . include "../../mk/bdb.buildlink3.mk" -MAKE_ENV+= PY_BDB_TYPE=${BDB_TYPE} +MAKE_ENV+= PY_BDB_TYPE=${BDB_TYPE:Q} MAKE_ENV+= PY_BDB_INCDIRS=${BDBBASE}/${BUILDLINK_INCDIRS.${BDB_TYPE}} MAKE_ENV+= PY_BDB_LIBDIRS=${BDBBASE}/lib PLIST_SUBST+= BSDDBMODULE= @@ -94,10 +94,10 @@ PLIST_SUBST+= NISMODULE= .endif .if defined(BUILDLINK_TRANSFORM) -MAKE_ENV+= PY_BDB_TRANSFORM="${BUILDLINK_TRANSFORM}" +MAKE_ENV+= PY_BDB_TRANSFORM=${BUILDLINK_TRANSFORM:Q} .endif -PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX} +PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q} TEST_TARGET= test INSTALL_TARGET= altinstall diff --git a/lang/python24/Makefile b/lang/python24/Makefile index 49f01426422..0a3b35b5818 100644 --- a/lang/python24/Makefile +++ b/lang/python24/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/11/16 19:18:59 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:27 rillig Exp $ # DISTNAME= Python-2.4.2 @@ -19,16 +19,16 @@ CONFLICTS+= python-[0-9]* USE_LANGUAGES= c c++ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-shared -CONFIGURE_ARGS+= OPT="${CFLAGS}" +CONFIGURE_ARGS+= OPT=${CFLAGS:M*:Q} -PTHREAD_OPTS= require +PTHREAD_OPTS+= require .include "../../mk/pthread.buildlink3.mk" .if ${PTHREAD_TYPE} == "pth" CONFIGURE_ARGS+= --with-pth .endif # fdatasync() -LIBS.SunOS= -lrt +LIBS.SunOS+= -lrt PY_VER_SUFFIX= 2.4 @@ -49,7 +49,7 @@ PY_PLATNAME= sunos${OS_VERSION:C/\..*//} .else PY_PLATNAME= ${LOWER_OPSYS}${OS_VERSION:C/\..*//} .endif -PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME} +PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME:Q} # the dl module isn't built for 64 bit archs and Darwin .if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" \ @@ -76,8 +76,8 @@ OSSAUDIODEV_SUBST= EXTRA_SO_SUBST= .endif -PLIST_SUBST+= EXTRA_SO=${EXTRA_SO_SUBST} -PLIST_SUBST+= OSSAUDIODEV=${OSSAUDIODEV_SUBST} +PLIST_SUBST+= EXTRA_SO=${EXTRA_SO_SUBST:Q} +PLIST_SUBST+= OSSAUDIODEV=${OSSAUDIODEV_SUBST:Q} # Make sure python modules can link correctly .if ${OPSYS} == "Darwin" @@ -94,7 +94,7 @@ PLIST_SUBST+= BSDDBMODULE="@comment " PLIST_SUBST+= NOSHLIB="@comment " .else . include "../../mk/bdb.buildlink3.mk" -MAKE_ENV+= PY_BDB_TYPE=${BDB_TYPE} +MAKE_ENV+= PY_BDB_TYPE=${BDB_TYPE:Q} MAKE_ENV+= PY_BDB_INCDIRS=${BDBBASE}/${BUILDLINK_INCDIRS.${BDB_TYPE}} MAKE_ENV+= PY_BDB_LIBDIRS=${BDBBASE}/lib PLIST_SUBST+= BSDDBMODULE= @@ -103,10 +103,10 @@ PLIST_SUBST+= NISMODULE= .endif .if defined(BUILDLINK_TRANSFORM) -MAKE_ENV+= PY_BDB_TRANSFORM="${BUILDLINK_TRANSFORM}" +MAKE_ENV+= PY_BDB_TRANSFORM=${BUILDLINK_TRANSFORM:Q} .endif -PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX} +PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q} TEST_TARGET= test INSTALL_TARGET= altinstall diff --git a/lang/ruby/Makefile.common b/lang/ruby/Makefile.common index 326e27c25c2..31540c430c5 100644 --- a/lang/ruby/Makefile.common +++ b/lang/ruby/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2005/03/06 16:42:30 taca Exp $ +# $NetBSD: Makefile.common,v 1.8 2005/12/05 20:50:27 rillig Exp $ # # Ruby base distribution common definition @@ -36,10 +36,10 @@ DIST_SUBDIR?= ${RUBY_DIST_SUBDIR} # # PLIST substitution # -PLIST_SUBST+= RUBY_SHLIBVER="${RUBY_SHLIBVER}" \ - RUBY_SHLIBMAJOR="${RUBY_SHLIBMAJOR}" \ - RUBY_NOSHLIBMAJOR=${RUBY_NOSHLIBMAJOR} \ - RUBY_NAME="${RUBY_NAME}" +PLIST_SUBST+= RUBY_SHLIBVER=${RUBY_SHLIBVER:Q} \ + RUBY_SHLIBMAJOR=${RUBY_SHLIBMAJOR:Q} \ + RUBY_NOSHLIBMAJOR=${RUBY_NOSHLIBMAJOR:Q} \ + RUBY_NAME=${RUBY_NAME:Q} # Common macros. .if ${OPSYS} == "NetBSD" diff --git a/lang/ruby/modules.mk b/lang/ruby/modules.mk index 861d04cd8ca..8d62c1d4107 100644 --- a/lang/ruby/modules.mk +++ b/lang/ruby/modules.mk @@ -1,4 +1,4 @@ -# $NetBSD: modules.mk,v 1.12 2005/11/02 07:44:24 taca Exp $ +# $NetBSD: modules.mk,v 1.13 2005/12/05 20:50:27 rillig Exp $ .if !defined(_RUBY_MODULE_MK) _RUBY_MODULE_MK= # defined @@ -16,7 +16,7 @@ DEPENDS+= ruby${RUBY_VER}-base>=${RUBY_REQD}:../../lang/ruby${RUBY_VER}-base .include "../../lang/ruby/buildlink3.mk" .endif -CONFIGURE_ENV+= RUBY=${RUBY} RDOC=${RDOC} +CONFIGURE_ENV+= RUBY=${RUBY:Q} RDOC=${RDOC:Q} # # extconf.rb support diff --git a/lang/ruby/replace.mk b/lang/ruby/replace.mk index 4d783b0a505..5e83b3584ef 100644 --- a/lang/ruby/replace.mk +++ b/lang/ruby/replace.mk @@ -1,7 +1,7 @@ -# $NetBSD: replace.mk,v 1.2 2005/11/02 07:44:33 taca Exp $ +# $NetBSD: replace.mk,v 1.3 2005/12/05 20:50:27 rillig Exp $ # -.ifndef _RUBY_REPLACE_MK +.if !defined(_RUBY_REPLACE_MK) _RUBY_REPLACE_MK= # defined # fix shebang line. diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk index 5d9c9905ef4..5060813f0df 100644 --- a/lang/ruby/rubyversion.mk +++ b/lang/ruby/rubyversion.mk @@ -1,7 +1,7 @@ -# $NetBSD: rubyversion.mk,v 1.17 2005/11/10 00:17:36 minskim Exp $ +# $NetBSD: rubyversion.mk,v 1.18 2005/12/05 20:50:27 rillig Exp $ # -.ifndef _RUBYVERSION_MK +.if !defined(_RUBYVERSION_MK) _RUBYVERSION_MK= # defined .include "../../mk/bsd.prefs.mk" @@ -183,12 +183,12 @@ DIST_SUBDIR?= ${_RUBY_DIST_SUBDIR} # # MAKE_ENV # -MAKE_ENV+= RUBY="${RUBY}" RUBY_VER="${RUBY_VER}" \ - RUBY_VERSION="${RUBY_VERSION}" \ - RUBY_VERSION_DEFAULT="${RUBY_VERSION_DEFAULT}" +MAKE_ENV+= RUBY=${RUBY:Q} RUBY_VER=${RUBY_VER:Q} \ + RUBY_VERSION=${RUBY_VERSION:Q} \ + RUBY_VERSION_DEFAULT=${RUBY_VERSION_DEFAULT:Q} -MAKEFLAGS+= RUBY_VERSION="${RUBY_VERSION}" \ - RUBY_VERSION_DEFAULT="${RUBY_VERSION_DEFAULT}" +MAKEFLAGS+= RUBY_VERSION=${RUBY_VERSION:Q} \ + RUBY_VERSION_DEFAULT=${RUBY_VERSION_DEFAULT:Q} # PLIST # @@ -206,9 +206,9 @@ PLIST_RUBY_DIRS= RUBY_LIBDIR="${RUBY_LIBDIR}" \ # # substitutions # -FILES_SUBST+= RUBY="${RUBY}" RUBY_NAME="${RUBY_NAME}" \ - RUBY_PKGPREFIX="${RUBY_PKGPREFIX}" \ - RUBY_VER="${RUBY_VER}" \ +FILES_SUBST+= RUBY=${RUBY:Q} RUBY_NAME=${RUBY_NAME:Q} \ + RUBY_PKGPREFIX=${RUBY_PKGPREFIX:Q} \ + RUBY_VER=${RUBY_VER:Q} \ ${PLIST_RUBY_DIRS} MESSAGE_SUBST+= RUBY="${RUBY}" RUBY_VER="${RUBY_VER}" \ @@ -216,10 +216,10 @@ MESSAGE_SUBST+= RUBY="${RUBY}" RUBY_VER="${RUBY_VER}" \ RUBY_PKGPREFIX="${RUBY_PKGPREFIX}" \ ${PLIST_RUBY_DIRS:S,DIR="${PREFIX}/,DIR=",} -PLIST_SUBST+= RUBY="${RUBY}" RUBY_VER="${RUBY_VER}" \ - RUBY_VERSION="${RUBY_VERSION}" \ - RUBY_VER_DIR="${RUBY_VER_DIR}" \ - RUBY_DLEXT="${RUBY_DLEXT}" \ +PLIST_SUBST+= RUBY=${RUBY:Q} RUBY_VER=${RUBY_VER:Q} \ + RUBY_VERSION=${RUBY_VERSION:Q} \ + RUBY_VER_DIR=${RUBY_VER_DIR:Q} \ + RUBY_DLEXT=${RUBY_DLEXT:Q} \ ${PLIST_RUBY_DIRS:S,DIR="${PREFIX}/,DIR=",} .endif # _RUBY_MK diff --git a/lang/ruby18-base/Makefile b/lang/ruby18-base/Makefile index 347ec36a661..4fe874c1475 100644 --- a/lang/ruby18-base/Makefile +++ b/lang/ruby18-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/11/08 11:18:02 joerg Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:27 rillig Exp $ # DISTNAME= ${RUBY_DISTNAME} @@ -24,7 +24,7 @@ TEST_TARGET= test CONFIGURE_ARGS+= --enable-shared \ --with-ssl-include="${BUILDLINK_PREFIX.openssl}/include" \ --with-ssl-lib="${BUILDLINK_PREFIX.openssl}/lib" -CONFIGURE_ENV+= PREFIX="${PREFIX}" +CONFIGURE_ENV+= PREFIX=${PREFIX:Q} INSTALL_TARGET= install install-doc WRKSRC= ${RUBY_WRKSRC} @@ -42,7 +42,7 @@ MAKE_DIRS+= ${RUBY_SITERIDIR} CONFIGURE_ARGS+= --program-suffix="${RUBY_SUFFIX}" .endif -FILES_SUBST+= DATE=${DATE} +FILES_SUBST+= DATE=${DATE:Q} # # IRIX work around should be fixed. diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile index 746ba4ae4a3..7f9a38d1596 100644 --- a/lang/sbcl/Makefile +++ b/lang/sbcl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/08/02 05:22:05 jonb Exp $ +# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:27 rillig Exp $ DISTNAME= ${PKGNAME}-source PKGNAME= sbcl-0.9.1 @@ -20,7 +20,7 @@ ONLY_FOR_PLATFORM= NetBSD-[2-9]*-i386 USE_TOOLS+= gmake gtar:run PKG_INSTALLATION_TYPES= overwrite pkgviews -WRKSRC= ${WRKDIR}/${PKGNAME}/ +WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}/ # # Bootstrap section. @@ -38,7 +38,7 @@ BUILD_DEPENDS+= clisp-[0-9]*:../../lang/clisp .endif .if !defined(SBCL_BOOT_SYSTEM) -PKG_SKIP_REASON= "Sorry, need a Common Lisp system" +PKG_SKIP_REASON+= "Sorry, need a Common Lisp system" .endif post-patch: diff --git a/lang/siod/Makefile b/lang/siod/Makefile index b7532f269f2..61d6b1f278e 100644 --- a/lang/siod/Makefile +++ b/lang/siod/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/04/05 10:25:13 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:27 rillig Exp $ DISTNAME= siod PKGNAME= siod-3.0 @@ -13,7 +13,7 @@ COMMENT= Small-footprint implementation of the Scheme programming language WRKSRC= ${WRKDIR} MAKEFILE= makefile BUILD_TARGET= ${OPSYS} -MAKE_ENV+= CC="${CC}" +MAKE_ENV+= CC=${CC:Q} CPPFLAGS+= -Dunix=1 .include "../../mk/bsd.prefs.mk" diff --git a/lang/smlnj/Makefile.common b/lang/smlnj/Makefile.common index 6370415ef6b..a1c56a9350b 100644 --- a/lang/smlnj/Makefile.common +++ b/lang/smlnj/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.4 2004/06/22 20:34:11 xtraeme Exp $ +# $NetBSD: Makefile.common,v 1.5 2005/12/05 20:50:27 rillig Exp $ # smlnj also supports hppa, sparc, ppc, mlrisc & alpha # pkg support for those platforms, and say, solaris-x86 @@ -28,4 +28,4 @@ NLFFI= "@comment " BOX= ${MACHINE_ARCH} .endif -PLIST_SUBST+= BOX=${BOX} OS=${OS} NLFFI=${NLFFI} +PLIST_SUBST+= BOX=${BOX:Q} OS=${OS:Q} NLFFI=${NLFFI:Q} diff --git a/lang/snobol/Makefile b/lang/snobol/Makefile index a46eb470202..ad745938670 100644 --- a/lang/snobol/Makefile +++ b/lang/snobol/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/07/15 18:27:51 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:27 rillig Exp $ # DISTNAME= snobol-0.99.4 @@ -12,7 +12,7 @@ MAINTAINER= refling@comet.lbl.gov HOMEPAGE= http://people.ne.mediaone.net/philbudne/snobol.html COMMENT= Macro implementation of SNOBOL4 in C -BUILD_DEPENDS= unzip-[0-9]*:../../archivers/unzip +BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} diff --git a/lang/sun-jdk13/Makefile b/lang/sun-jdk13/Makefile index 12ec222ef92..81ce7ab9962 100644 --- a/lang/sun-jdk13/Makefile +++ b/lang/sun-jdk13/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2005/10/10 14:59:20 jschauma Exp $ +# $NetBSD: Makefile,v 1.37 2005/12/05 20:50:27 rillig Exp $ DISTNAME= j2sdk-1_3_1_16-linux-i586 PKGNAME= sun-jdk13-1.0.16 @@ -8,7 +8,7 @@ COMMENT= Sun's Java(tm) Development Kit 1.3.1 SHORT= JDK -DEPENDS= sun-jre13>=1.0.16:../../lang/sun-jre13 +DEPENDS+= sun-jre13>=1.0.16:../../lang/sun-jre13 JAVA_CLASSPATH= ${JAVA_HOME}/src.jar JAVA_WRAPPERS= appletviewer extcheck idlj jar jarsigner \ diff --git a/lang/sun-jdk14/Makefile b/lang/sun-jdk14/Makefile index 719ec07c776..064366c6cb5 100644 --- a/lang/sun-jdk14/Makefile +++ b/lang/sun-jdk14/Makefile @@ -1,15 +1,14 @@ -# $NetBSD: Makefile,v 1.27 2005/09/17 16:44:54 dillo Exp $ +# $NetBSD: Makefile,v 1.28 2005/12/05 20:50:27 rillig Exp $ DISTNAME= j2sdk-1_4_2_09-linux-i586 PKGNAME= sun-jdk14-2.9 -PKGREVISION= # none MASTER_SITES= # empty COMMENT= Sun's Java(tm) 2 SDK, Standard Edition 1.4.2 SHORT= SDK -DEPENDS= sun-jre14>=2.9:../../lang/sun-jre14 +DEPENDS+= sun-jre14>=2.9:../../lang/sun-jre14 WRKSRC= ${WRKDIR}/j2sdk1.4.2_09 JAVA_WRAPPERS= appletviewer extcheck idlj jar jarsigner \ diff --git a/lang/sun-jdk15/Makefile b/lang/sun-jdk15/Makefile index 8bda73b8b9a..e5c5f9d7711 100644 --- a/lang/sun-jdk15/Makefile +++ b/lang/sun-jdk15/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/12/01 15:39:27 tv Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:27 rillig Exp $ DISTNAME= jdk-1_5_0_06-linux-i586 PKGNAME= sun-jdk15-5.0.6 @@ -6,7 +6,7 @@ MASTER_SITES= # empty SHORT_NAME= JDK -DEPENDS= ${PKGNAME_NOREV:S/jdk/jre/}*:../../lang/sun-jre15 +DEPENDS+= ${PKGNAME_NOREV:S/jdk/jre/}*:../../lang/sun-jre15 WRKSRC= ${WRKDIR}/${DISTNAME:S/-//:S/_/./:S/_/./:S/-linux-i586//} JAVA_WRAPPERS= appletviewer apt extcheck idlj jar jarsigner \ diff --git a/lang/sun-jre14/Makefile b/lang/sun-jre14/Makefile index dd6222a3c99..1a26342cce0 100644 --- a/lang/sun-jre14/Makefile +++ b/lang/sun-jre14/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.31 2005/10/11 15:49:48 tv Exp $ +# $NetBSD: Makefile,v 1.32 2005/12/05 20:50:27 rillig Exp $ # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce DISTNAME= j2re-1_4_2_09-linux-i586 PKGNAME= sun-jre14-2.9 -PKGREVISION= # none MASTER_SITES= # empty COMMENT= Sun's Java(tm) 2 Runtime Environment 1.4.2 @@ -52,7 +51,7 @@ do-configure: pre-install: .if !empty(PKG_OPTIONS:Msun-jre-jce) - cd ${WRKDIR}/jce ; pax -rw -pe -v . ${WRKSRC}/lib/security + cd ${WRKDIR}/jce ; ${PAX} -rw -pe -v . ${WRKSRC}/lib/security ${SED} 's/@SUN_JRE14_USE_JCE@//' ${PKGDIR}/PLIST > ${PLIST_SRC} .else ${SED} '/@SUN_JRE14_USE_JCE@/d' ${PKGDIR}/PLIST > ${PLIST_SRC} diff --git a/lang/sun-jre15/Makefile b/lang/sun-jre15/Makefile index 2afe851f307..38a0816bb4d 100644 --- a/lang/sun-jre15/Makefile +++ b/lang/sun-jre15/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/12/01 15:39:27 tv Exp $ +# $NetBSD: Makefile,v 1.25 2005/12/05 20:50:27 rillig Exp $ # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce @@ -42,7 +42,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} jce_policy-1_5_0.zip .endif post-extract: - -${MKDIR} ${WRKSRC}/.systemPrefs + ${MKDIR} ${WRKSRC}/.systemPrefs ${TOUCH} ${WRKSRC}/.systemPrefs/.system.lock ${TOUCH} ${WRKSRC}/.systemPrefs/.systemRootModFile @@ -54,7 +54,7 @@ do-configure: pre-install: .if !empty(PKG_OPTIONS:Msun-jre-jce) - cd ${WRKDIR}/jce ; pax -rw -pe -v . ${WRKSRC}/lib/security + cd ${WRKDIR}/jce ; ${PAX} -rw -pe -v . ${WRKSRC}/lib/security ${SED} 's/@SUN_JRE15_USE_JCE@//' ${PKGDIR}/PLIST > ${PLIST_SRC} .else ${SED} '/@SUN_JRE15_USE_JCE@/d' ${PKGDIR}/PLIST > ${PLIST_SRC} diff --git a/lang/swi-prolog-lite/Makefile.common b/lang/swi-prolog-lite/Makefile.common index a7ec9ab153e..4df520ff0bb 100644 --- a/lang/swi-prolog-lite/Makefile.common +++ b/lang/swi-prolog-lite/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2004/05/27 22:37:04 hubertf Exp $ +# $NetBSD: Makefile.common,v 1.3 2005/12/05 20:50:28 rillig Exp $ SWIPLVERS= 5.2.13 DISTNAME= pl-${SWIPLVERS} @@ -11,4 +11,4 @@ DIST_SUBDIR= swi-prolog DISTINFO_FILE= ${.CURDIR}/../../lang/swi-prolog-lite/distinfo PATCHDIR= ${.CURDIR}/../../lang/swi-prolog-lite/patches -PLIST_SUBST+= APPEND_ELF=${APPEND_ELF} +PLIST_SUBST+= APPEND_ELF=${APPEND_ELF:Q} diff --git a/lang/swi-prolog-packages/Makefile b/lang/swi-prolog-packages/Makefile index 495b0fc0e38..de593a27f33 100644 --- a/lang/swi-prolog-packages/Makefile +++ b/lang/swi-prolog-packages/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.8 2005/09/28 14:31:07 rillig Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:28 rillig Exp $ -.include "../swi-prolog-lite/Makefile.common" +.include "../../lang/swi-prolog-lite/Makefile.common" PKGNAME= swi-prolog-packages-${SWIPLVERS} PKGREVISION= 1 @@ -24,7 +24,7 @@ post-configure: cd ${WRKSRC}/packages; \ ${SETENV} \ CPP=${CPP} \ - gmake configure + ${GMAKE} configure pre-build: ${LN} -sf ${LOCALBASE}/bin/plld ${WRKSRC}/src @@ -49,14 +49,14 @@ DISPLAY= :2 . endif #Xvfb .endif #DISPLAY -MAKE_ENV+= DISPLAY=${DISPLAY} +MAKE_ENV+= DISPLAY=${DISPLAY:Q} post-install: teardownx teardownx: ${ECHO} teardownx: Xvfb-PID: `${CAT} ${WRKDIR}/.Xvfb.pid` sleep 5 -kill `${CAT} ${WRKDIR}/.Xvfb.pid` - rm -f ${WRKDIR}/.Xvfb.pid + ${RM} -f ${WRKDIR}/.Xvfb.pid .include "../../lang/swi-prolog-lite/buildlink3.mk" diff --git a/lang/swi-prolog/Makefile b/lang/swi-prolog/Makefile index cb744bfe297..516580d2aab 100644 --- a/lang/swi-prolog/Makefile +++ b/lang/swi-prolog/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.34 2005/07/19 10:02:11 grant Exp $ +# $NetBSD: Makefile,v 1.35 2005/12/05 20:50:28 rillig Exp $ -.include "../swi-prolog-lite/Makefile.common" +.include "../../lang/swi-prolog-lite/Makefile.common" PKGNAME= swi-prolog-${SWIPLVERS} PKGREVISION= 1 diff --git a/lang/tcl-itcl-current/Makefile b/lang/tcl-itcl-current/Makefile index 20f84d7cbdc..a824175324d 100644 --- a/lang/tcl-itcl-current/Makefile +++ b/lang/tcl-itcl-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/04/13 20:06:24 jschauma Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:28 rillig Exp $ DISTNAME= tcl-itcl-20040920 PKGNAME= ${DISTNAME:S/itcl/itcl-current/} @@ -18,9 +18,9 @@ WRKSRC= ${WRKDIR}/tcl-itcl-${ITCL_VERS} ITCL_VERS= 3.3 GNU_CONFIGURE= yes USE_LIBTOOL= yes -CONFIGURE_ARGS= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib \ - --with-tk=${BUILDLINK_PREFIX.tk}/lib \ - --enable-shared +CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl:Q}/lib +CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk:Q}/lib +CONFIGURE_ARGS+= --enable-shared MAKE_ENV+= TCL_HEADER_DIR=${BUILDLINK_PREFIX.tcl}/include/tcl diff --git a/lang/tcl-itcl/Makefile b/lang/tcl-itcl/Makefile index e85fca51201..5b25efea232 100644 --- a/lang/tcl-itcl/Makefile +++ b/lang/tcl-itcl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/10/26 04:22:38 minskim Exp $ +# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:28 rillig Exp $ DISTNAME= itcl3.2.1_src PKGNAME= tcl-itcl-3.2.1 @@ -18,10 +18,10 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes WRKSRC= ${WRKDIR}/itcl3.2.1 -CONFIGURE_ARGS= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib \ - --with-tk=${BUILDLINK_PREFIX.tk}/lib \ - --enable-shared -CONFIGURE_ENV+= AR="${AR}" +CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl:Q}/lib +CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk:Q}/lib +CONFIGURE_ARGS+= --enable-shared +CONFIGURE_ENV+= AR=${AR:Q} MAKE_ENV+= TCL_HEADER_DIR=${BUILDLINK_PREFIX.tcl}/include/tcl diff --git a/lang/tcl-otcl/Makefile b/lang/tcl-otcl/Makefile index 0610a48b1dd..bebdcf5e650 100644 --- a/lang/tcl-otcl/Makefile +++ b/lang/tcl-otcl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:59 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:28 rillig Exp $ DISTNAME= otcl-1.9 PKGNAME= tcl-${DISTNAME} @@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= yes USE_LIBTOOL= yes -CONFIGURE_ARGS+= V_LIBS="`${CONFIG_SHELL} -c '. ${TCLCONFIG_SH}; echo $$TCL_LIBS'`" +CONFIGURE_ARGS+= V_LIBS="`${CONFIG_SHELL} -c '. ${TCLCONFIG_SH}; ${ECHO} $$TCL_LIBS'`" CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl} CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk} diff --git a/lang/tcl-tclX/Makefile b/lang/tcl-tclX/Makefile index 5338b41ccab..14aa96f7f5c 100644 --- a/lang/tcl-tclX/Makefile +++ b/lang/tcl-tclX/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2005/05/16 01:15:32 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2005/12/05 20:50:28 rillig Exp $ # DISTNAME= tclx8.3.5-src @@ -30,12 +30,12 @@ TEST_TARGET= test .include "../../mk/bsd.prefs.mk" PKGSRC_TCL_SRC_DIR= ${PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl${TCL_VERSION} -CONFIGURE_ENV+= PKGSRC_TCL_SRC_DIR="${PKGSRC_TCL_SRC_DIR}" +CONFIGURE_ENV+= PKGSRC_TCL_SRC_DIR=${PKGSRC_TCL_SRC_DIR:Q} -MAKE_ENV+= GTAR=${GTAR} CHOWN=${CHOWN} CHMOD=${CHMOD} \ - SHAREMODE=${SHAREMODE} SHAREOWN=${SHAREOWN} \ - SHAREGRP=${SHAREGRP} \ - TCLX_PREFIX=${PREFIX} +MAKE_ENV+= GTAR=${GTAR:Q} CHOWN=${CHOWN:Q} CHMOD=${CHMOD:Q} \ + SHAREMODE=${SHAREMODE:Q} SHAREOWN=${SHAREOWN:Q} \ + SHAREGRP=${SHAREGRP:Q} \ + TCLX_PREFIX=${PREFIX:Q} INSTALLATION_DIRS= bin include diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile index 5df5698e080..b2ae7b92a69 100644 --- a/lang/tcl/Makefile +++ b/lang/tcl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2005/10/07 18:38:34 reed Exp $ +# $NetBSD: Makefile,v 1.56 2005/12/05 20:50:28 rillig Exp $ DISTNAME= tcl${TCL_VERSION}-src PKGNAME= tcl-${TCL_VERSION} @@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME:C/-src//}/unix USE_LIBTOOL= yes GNU_CONFIGURE= yes -MAKE_ENV+= TOUCH="${TOUCH}" +MAKE_ENV+= TOUCH=${TOUCH:Q} INSTALL_TARGET= install diff --git a/lang/tcl83/Makefile b/lang/tcl83/Makefile index 11d4474a345..44f6e875428 100644 --- a/lang/tcl83/Makefile +++ b/lang/tcl83/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/11/04 09:56:09 rillig Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:28 rillig Exp $ # DISTNAME= tcl8.3.4 @@ -21,7 +21,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= yes CONFIGURE_DIRS= unix BUILD_DIRS= ${CONFIGURE_DIRS} -MAKE_ENV+= TOUCH="${TOUCH}" +MAKE_ENV+= TOUCH=${TOUCH:Q} TEST_TARGET= test USE_LIBTOOL= yes diff --git a/lang/tk-tclX/Makefile b/lang/tk-tclX/Makefile index d09325d62da..4a96140629e 100644 --- a/lang/tk-tclX/Makefile +++ b/lang/tk-tclX/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/09/08 21:32:35 minskim Exp $ +# $NetBSD: Makefile,v 1.28 2005/12/05 20:50:28 rillig Exp $ # DISTNAME= tclx8.3.5-src @@ -32,12 +32,12 @@ TEST_TARGET= test PKGSRC_TCL_SRC_DIR="${PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl${TCL_VERSION}" PKGSRC_TK_SRC_DIR="${PKGSRCDIR}/x11/tk/${WRKDIR:T}/tk${TK_VERSION}" -CONFIGURE_ENV+= PKGSRC_TCL_SRC_DIR="${PKGSRC_TCL_SRC_DIR}" \ - PKGSRC_TK_SRC_DIR="${PKGSRC_TK_SRC_DIR}" +CONFIGURE_ENV+= PKGSRC_TCL_SRC_DIR=${PKGSRC_TCL_SRC_DIR:Q} \ + PKGSRC_TK_SRC_DIR=${PKGSRC_TK_SRC_DIR:Q} -MAKE_ENV+= GTAR=${GTAR} CHOWN=${CHOWN} CHMOD=${CHMOD} \ - SHAREMODE=${SHAREMODE} SHAREOWN=${SHAREOWN} \ - SHAREGRP=${SHAREGRP} \ +MAKE_ENV+= GTAR=${GTAR:Q} CHOWN=${CHOWN:Q} CHMOD=${CHMOD:Q} \ + SHAREMODE=${SHAREMODE:Q} SHAREOWN=${SHAREOWN:Q} \ + SHAREGRP=${SHAREGRP:Q} \ TCLX_PREFIX=${BUILDLINK_PREFIX.tcl-tclX} FILESDIR= ${.CURDIR}/../../lang/tcl-tclX/files diff --git a/lang/ucblogo/Makefile b/lang/ucblogo/Makefile index dc2027c9522..4cc8d153cb1 100644 --- a/lang/ucblogo/Makefile +++ b/lang/ucblogo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:59 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:28 rillig Exp $ DISTNAME= ucblogo-5.3 PKGREVISION= 1 @@ -14,7 +14,7 @@ COMMENT= Brian Harvey's logo language interpreter MAKEFILE= makefile GNU_CONFIGURE= yes # otherwise ./configure guesses -L incorrectly -LIBS= -L${X11BASE}/lib +LIBS+= -L${X11BASE}/lib post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ucblogo |