diff options
Diffstat (limited to 'devel')
136 files changed, 358 insertions, 365 deletions
diff --git a/devel/ArX/Makefile b/devel/ArX/Makefile index e7b251a345b..df8b1bb1512 100644 --- a/devel/ArX/Makefile +++ b/devel/ArX/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/08/10 20:56:14 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:01 rillig Exp $ # DISTNAME= ArX-1.0.20 @@ -22,7 +22,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= ARXDIFF=${PREFIX}/bin/${GNU_PROGRAM_PREFIX}diff CONFIGURE_ARGS+= ARXPATCH=${PREFIX}/bin/${GNU_PROGRAM_PREFIX}patch CONFIGURE_ARGS+= ARXTAR=${PREFIX}/bin/${GNU_PROGRAM_PREFIX}tar -CONFIGURE_ARGS+= ARXPKGCONFIG=${PKG_CONFIG} +CONFIGURE_ARGS+= ARXPKGCONFIG=${PKG_CONFIG:Q} IMG_FILES= ArX001.png ArX002.png ArX003.png ArX004.png DOC_FILES= ArX.html ArX.pdf ${IMG_FILES} diff --git a/devel/ArX2/Makefile b/devel/ArX2/Makefile index 822e6836772..21d53ff234b 100644 --- a/devel/ArX2/Makefile +++ b/devel/ArX2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/10/23 18:39:06 rillig Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:01 rillig Exp $ # DISTNAME= ArX-2.2.3 @@ -21,9 +21,9 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= ARXDIFF=${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}diff CONFIGURE_ARGS+= ARXPATCH=${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}patch CONFIGURE_ARGS+= ARXTAR=${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}tar -CONFIGURE_ARGS+= ARXPKGCONFIG=${PKG_CONFIG} +CONFIGURE_ARGS+= ARXPKGCONFIG=${PKG_CONFIG:Q} # XXX Python is needed for build only; this is handled by devel/scons -CONFIGURE_ARGS+= ARXPYTHON=${TRUE} +CONFIGURE_ARGS+= ARXPYTHON=${TRUE:Q} IMG_FILES= ArX001.png ArX002.png ArX003.png ArX004.png DOC_FILES= ArX.html ArX.pdf ${IMG_FILES} diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile index c2c549ae224..2f6dbc0805e 100644 --- a/devel/GConf/Makefile +++ b/devel/GConf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2005/06/01 18:02:42 jlam Exp $ +# $NetBSD: Makefile,v 1.50 2005/12/05 20:50:01 rillig Exp $ # DISTNAME= GConf-1.0.9 @@ -11,7 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://advogato.org/proj/GConf/ COMMENT= Configuration database system used by GNOME -BUILD_DEPENDS= gtk-doc-[0-9]*:../../textproc/gtk-doc +BUILD_DEPENDS+= gtk-doc-[0-9]*:../../textproc/gtk-doc BUILD_USES_MSGFMT= yes USE_PKGLOCALEDIR= YES @@ -21,7 +21,7 @@ MAKE_FLAGS+= AM_MAKEFLAGS="BDBBACKEND=" USE_LIBTOOL= YES PKGCONFIG_OVERRIDE= gconf.pc.in -PLIST_SUBST+= LOCALBASE=${LOCALBASE} +PLIST_SUBST+= LOCALBASE=${LOCALBASE:Q} pre-build: ${RM} -f ${WRKSRC}/gconf/libxml diff --git a/devel/GConf2/schemas.mk b/devel/GConf2/schemas.mk index 6011bd15eac..78420df3b09 100644 --- a/devel/GConf2/schemas.mk +++ b/devel/GConf2/schemas.mk @@ -1,4 +1,4 @@ -# $NetBSD: schemas.mk,v 1.10 2005/03/24 22:42:58 jlam Exp $ +# $NetBSD: schemas.mk,v 1.11 2005/12/05 20:50:01 rillig Exp $ # # This Makefile fragment is intended to be included by packages that install # GConf2 schema files. It takes care of registering them in the GConf2 @@ -42,11 +42,11 @@ CONFIGURE_ARGS+= --with-gconf-schema-file-dir=${GCONF2_SCHEMAS_DIR} .if (defined(GCONF2_SCHEMAS) && !empty(GCONF2_SCHEMAS)) || \ (defined(GCONF2_ENTRIES) && !empty(GCONF2_ENTRIES)) -FILES_SUBST+= GCONFTOOL2="${GCONFTOOL2}" -FILES_SUBST+= GCONF2_CONFIG_SOURCE="${GCONF2_CONFIG_SOURCE}" -FILES_SUBST+= GCONF2_ENTRIES="${GCONF2_ENTRIES}" -FILES_SUBST+= GCONF2_SCHEMAS="${GCONF2_SCHEMAS}" -FILES_SUBST+= GCONF2_SCHEMAS_DIR="${GCONF2_SCHEMAS_DIR}" +FILES_SUBST+= GCONFTOOL2=${GCONFTOOL2:Q} +FILES_SUBST+= GCONF2_CONFIG_SOURCE=${GCONF2_CONFIG_SOURCE:Q} +FILES_SUBST+= GCONF2_ENTRIES=${GCONF2_ENTRIES:Q} +FILES_SUBST+= GCONF2_SCHEMAS=${GCONF2_SCHEMAS:Q} +FILES_SUBST+= GCONF2_SCHEMAS_DIR=${GCONF2_SCHEMAS_DIR:Q} INSTALL_EXTRA_TMPL+= ${.CURDIR}/../../devel/GConf2/files/install.tmpl DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/../../devel/GConf2/files/deinstall.tmpl USE_PKGINSTALL= YES diff --git a/devel/SDL/Makefile.common b/devel/SDL/Makefile.common index 6b3a20e88a1..a104c4ca16c 100644 --- a/devel/SDL/Makefile.common +++ b/devel/SDL/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.23 2005/09/07 10:15:39 adam Exp $ +# $NetBSD: Makefile.common,v 1.24 2005/12/05 20:50:01 rillig Exp $ DISTNAME= SDL-1.2.9 CATEGORIES= devel games @@ -39,7 +39,7 @@ MAKE_ENV+= NASMFLAGS="${NASMFLAGS_${OBJECT_FMT}}" # finding various libraries. This ensure that any unusual -Wl,-R options # are noted correctly in the generated sdl-config. # -CONFIGURE_ENV+= SYSTEM_LIBS="${LDFLAGS}" +CONFIGURE_ENV+= SYSTEM_LIBS=${LDFLAGS:M*:Q} # buildlink passthru the directories required for the Cocoa framework # on Darwin if they exist. @@ -55,7 +55,7 @@ BUILDLINK_PASSTHRU_DIRS+= ${_dir_} .include "../../mk/ossaudio.buildlink3.mk" . if defined(HAVE_OSS) && ${HAVE_OSS} == "YES" AM_CFLAGS= -D_PATH_DEV_DSP="\"${DEVOSSAUDIO}\"" -MAKE_ENV+= AM_CFLAGS="${AM_CFLAGS}" +MAKE_ENV+= AM_CFLAGS=${AM_CFLAGS:Q} .endif # Irix comes with GL, which works fine for SDL diff --git a/devel/acme/Makefile b/devel/acme/Makefile index ce31230f963..4c28858f9cb 100644 --- a/devel/acme/Makefile +++ b/devel/acme/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/06/16 06:57:44 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:01 rillig Exp $ # DISTNAME= acme085_linux @@ -19,7 +19,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} WRKTOP= ${WRKDIR}/acme085 ACME_LIB= ${PREFIX}/share/acme -MAKE_ENV+= ACME_LIB=${ACME_LIB} +MAKE_ENV+= ACME_LIB=${ACME_LIB:Q} INSTALLATION_DIRS= bin diff --git a/devel/adocman/Makefile b/devel/adocman/Makefile index be9349286b7..7aa58e7618f 100644 --- a/devel/adocman/Makefile +++ b/devel/adocman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/08/06 06:19:07 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:02 rillig Exp $ # DISTNAME= adocman-0.10 @@ -30,7 +30,6 @@ do-install: .for f in LICENSE README TODO adocman.html xml_export.html ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/html/adocman .endfor -.undef f .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/aegis/Makefile b/devel/aegis/Makefile index 91a8f817d08..d27c3e302f9 100644 --- a/devel/aegis/Makefile +++ b/devel/aegis/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:17 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:02 rillig Exp $ # DISTNAME= aegis-4.15 @@ -11,6 +11,6 @@ COMMENT= Aegis is a transaction base software configuration management system GNU_CONFIGURE= YES USE_PKGLOCALEDIR= yes -CONFIGURE_ARGS= --with-nlsdir=${_PKGLOCALEDIR} +CONFIGURE_ARGS+= --with-nlsdir=${_PKGLOCALEDIR:Q} .include "../../mk/bsd.pkg.mk" diff --git a/devel/allegro/Makefile b/devel/allegro/Makefile index 1be494c2a63..1b11396978b 100644 --- a/devel/allegro/Makefile +++ b/devel/allegro/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/09/11 14:17:44 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:02 rillig Exp $ DISTNAME= allegro-4.1.18 PKGREVISION= 1 @@ -25,14 +25,16 @@ LIBS+= ${LIBOSSAUDIO} .include "options.mk" -SUBST_CLASSES= oss path +SUBST_CLASSES+= oss SUBST_STAGE.oss= post-patch SUBST_FILES.oss= src/unix/uoss.c setup/setup.c SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSAUDIO},g" SUBST_MESSAGE.oss= "Fixing harcoded audio device." + +SUBST_CLASSES+= path SUBST_STAGE.path= post-patch SUBST_FILES.path= src/unix/umodules.c src/unix/usystem.c -SUBST_SED.path= -e "s,@@PREFIX@@,${PREFIX},g" +SUBST_SED.path= -e "s,@@PREFIX@@,${PREFIX},g" SUBST_MESSAGE.path= "Fixing harcoded path" .include "../../mk/ossaudio.buildlink3.mk" diff --git a/devel/apel/Makefile b/devel/apel/Makefile index 2f9edef8876..4d2edcfff35 100644 --- a/devel/apel/Makefile +++ b/devel/apel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/08/28 04:25:28 uebayasi Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:02 rillig Exp $ DISTNAME= apel-10.6 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -14,9 +14,9 @@ COMMENT= Portable Emacs Library PLIST_SRC= ${PKGDIR}/PLIST.${EMACS_FLAVOR} -MAKE_FLAGS+= EMACS=${EMACS_FLAVOR} -MAKE_FLAGS+= LISPDIR=${EMACS_LISPPREFIX} -MAKE_FLAGS+= VERSION_SPECIFIC_LISPDIR=${EMACS_LISPPREFIX} +MAKE_FLAGS+= EMACS=${EMACS_FLAVOR:Q} +MAKE_FLAGS+= LISPDIR=${EMACS_LISPPREFIX:Q} +MAKE_FLAGS+= VERSION_SPECIFIC_LISPDIR=${EMACS_LISPPREFIX:Q} # apel is included in xemacs-packages EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs20 diff --git a/devel/apr/Makefile b/devel/apr/Makefile index 68e9c6ad706..f850afd8fd2 100644 --- a/devel/apr/Makefile +++ b/devel/apr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2005/10/17 10:28:46 tron Exp $ +# $NetBSD: Makefile,v 1.38 2005/12/05 20:50:02 rillig Exp $ .include "../../www/apache2/Makefile.common" @@ -19,7 +19,7 @@ BUILD_DIRS= ${WRKSRC}/apr ${WRKSRC}/apr-util USE_LIBTOOL= yes GNU_CONFIGURE= yes -CONFIGURE_ENV+= LIBS="${LIBS}" +CONFIGURE_ENV+= LIBS=${LIBS:M*:Q} LIBS.SunOS+= -lnsl APR_CONFIGURE_ARGS= \ diff --git a/devel/atk/Makefile b/devel/atk/Makefile index d98778a9859..27adf9df4d5 100644 --- a/devel/atk/Makefile +++ b/devel/atk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2005/10/02 12:15:54 jmmv Exp $ +# $NetBSD: Makefile,v 1.43 2005/12/05 20:50:02 rillig Exp $ # DISTNAME= atk-1.10.3 @@ -22,7 +22,7 @@ CONFIGURE_ARGS+= --enable-gtk-doc=no CONFIGURE_ARGS+= --with-html-dir="${PREFIX}/share/doc" # Avoid an ICE in gcc2 on sparc64 -CONFIGURE_ENV+= F77=${FALSE} +CONFIGURE_ENV+= F77=${FALSE:Q} # glib-mkenums overflows a 2048kb stack on atkobject.h UNLIMIT_RESOURCES= stacksize diff --git a/devel/automake/Makefile b/devel/automake/Makefile index 05ebb65c3a3..bd0c87a6135 100644 --- a/devel/automake/Makefile +++ b/devel/automake/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.68 2005/08/06 06:19:07 jlam Exp $ +# $NetBSD: Makefile,v 1.69 2005/12/05 20:50:02 rillig Exp $ # DISTNAME= automake-1.9.6 @@ -11,7 +11,7 @@ MAINTAINER= wiz@NetBSD.org HOMEPAGE= http://www.gnu.org/software/automake/automake.html COMMENT= GNU Standards-compliant Makefile generator -DEPENDS= autoconf>=2.58:../../devel/autoconf +DEPENDS+= autoconf>=2.58:../../devel/autoconf USE_TOOLS+= gm4:run perl:run diff --git a/devel/automake14/Makefile b/devel/automake14/Makefile index fdecc366f76..74b967c9ccd 100644 --- a/devel/automake14/Makefile +++ b/devel/automake14/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/07/16 19:10:38 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:02 rillig Exp $ # DISTNAME= automake-1.4-p6 @@ -10,7 +10,7 @@ MAINTAINER= wiz@NetBSD.org HOMEPAGE= http://www.gnu.org/software/automake/automake.html COMMENT= GNU Standards-compliant Makefile generator (old version) -DEPENDS= autoconf213>=2.13:../../devel/autoconf213 +DEPENDS+= autoconf213>=2.13:../../devel/autoconf213 CONFLICTS= automake<1.6 diff --git a/devel/bcc/Makefile b/devel/bcc/Makefile index a05033d0e82..8bfa76a11d7 100644 --- a/devel/bcc/Makefile +++ b/devel/bcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/11/07 19:23:30 tv Exp $ +# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:02 rillig Exp $ DISTNAME= bcc PKGNAME= bcc-95.3.12 @@ -10,8 +10,8 @@ COMMENT= Bruce Evans' C compiler (with as and ld); can do 16-bit code NOT_FOR_PLATFORM= *-*-alpha *-*-x86_64 # Severe LP64 problems NOT_FOR_PLATFORM+= Interix-*-* # no <a.out.h> -MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} BINMODE=${BINMODE} \ - MANOWN=${MANOWN} MANGRP=${MANGRP} MANMODE=${MANMODE} +MAKE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} BINMODE=${BINMODE:Q} \ + MANOWN=${MANOWN:Q} MANGRP=${MANGRP:Q} MANMODE=${MANMODE:Q} MANCOMPRESSED_IF_MANZ= yes do-configure: diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile index 6387561b120..1216aa2192b 100644 --- a/devel/boehm-gc/Makefile +++ b/devel/boehm-gc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2005/10/04 16:44:13 wiz Exp $ +# $NetBSD: Makefile,v 1.51 2005/12/05 20:50:02 rillig Exp $ DISTNAME= gc6.6 PKGNAME= ${DISTNAME:S/gc/boehm-gc-/} @@ -18,7 +18,7 @@ GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-cplusplus INSTALLATION_DIRS= man/man3 -MAKE_ENV+= COPTS=${CFLAGS:Q} +MAKE_ENV+= COPTS=${CFLAGS:M*:Q} #TEST_TARGET= check diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile index 70e6f974f2b..77672a3e825 100644 --- a/devel/bonobo/Makefile +++ b/devel/bonobo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2005/05/22 20:07:49 jlam Exp $ +# $NetBSD: Makefile,v 1.52 2005/12/05 20:50:02 rillig Exp $ DISTNAME= bonobo-1.0.22 CATEGORIES= devel @@ -19,8 +19,8 @@ USE_PKGLOCALEDIR= yes USE_X11BASE= yes USE_TOOLS+= gmake GNU_CONFIGURE= yes -CONFIGURE_ENV+= LOCALBASE="${LOCALBASE}" -CONFIGURE_ENV+= X11BASE="${X11BASE}" +CONFIGURE_ENV+= LOCALBASE=${LOCALBASE:Q} +CONFIGURE_ENV+= X11BASE=${X11BASE:Q} CONFIGURE_ARGS+= --enable-gtk-doc=no PKGCONFIG_OVERRIDE= libefs/libefs.pc.in diff --git a/devel/bugzilla/Makefile b/devel/bugzilla/Makefile index 55065f6f10e..002a18dcdb2 100644 --- a/devel/bugzilla/Makefile +++ b/devel/bugzilla/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/11/02 11:35:57 adrianp Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:02 rillig Exp $ # DISTNAME= bugzilla-2.20 @@ -45,7 +45,7 @@ PAX_DIRS= Bugzilla skins template REPLACE_PERL= *.pl *.cgi -SUBST_CLASSES= conf +SUBST_CLASSES+= conf SUBST_STAGE.conf= pre-install SUBST_FILES.conf= bugzilla.conf localconfig Bugzilla/BugMail.pm SUBST_SED.conf= -e "s|@BZ_WEB_GROUP@|${BZ_WEB_GROUP}|g" \ diff --git a/devel/buildtool-doc/Makefile b/devel/buildtool-doc/Makefile index e73e1644ac7..93d35f73855 100644 --- a/devel/buildtool-doc/Makefile +++ b/devel/buildtool-doc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/04/11 21:45:18 tv Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:02 rillig Exp $ # DISTNAME= buildtool-doc-0.16 @@ -15,7 +15,7 @@ BUILD_DEPENDS+= docbook-xsl>=1.61.3:../../textproc/docbook-xsl CONFIGURE_ARGS+= --dir-html=${PREFIX}/share/doc/buildtool-doc/html -CONFIGURE_ENV+= CATALOG_FILE="${XML_DEFAULT_CATALOG}" +CONFIGURE_ENV+= CATALOG_FILE=${XML_DEFAULT_CATALOG:Q} CONFIGURE_ENV+= DOCBOOK_XSL="${PREFIX}/share/xsl/docbook" BUILDLINK_DEPMETHOD.libxml2?= build diff --git a/devel/buildtool/Makefile b/devel/buildtool/Makefile index 8b16462999f..1298bd0943c 100644 --- a/devel/buildtool/Makefile +++ b/devel/buildtool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/04/11 21:45:18 tv Exp $ +# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:02 rillig Exp $ # DISTNAME= buildtool-0.16 @@ -17,9 +17,9 @@ TEST_TARGET= test PKG_SYSCONFSUBDIR= buildtool -CONFIGURE_ARGS= -p ${PREFIX} +CONFIGURE_ARGS+= -p ${PREFIX} CONFIGURE_ARGS+= -c ${PKG_SYSCONFDIR} -CONFIGURE_ENV+= SH="${SH}" +CONFIGURE_ENV+= SH=${SH:Q} post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/buildtool/pkgflags diff --git a/devel/buildtool/buildlink3.mk b/devel/buildtool/buildlink3.mk index 0c5f6aed43f..8fd661f1843 100644 --- a/devel/buildtool/buildlink3.mk +++ b/devel/buildtool/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2005/05/16 05:09:21 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2005/12/05 20:50:02 rillig Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ BUILDTOOL_BUILDLINK3_MK:= ${BUILDTOOL_BUILDLINK3_MK}+ @@ -20,10 +20,10 @@ USE_TOOLS+= m4 HAS_CONFIGURE= yes CONFIGURE_SCRIPT= ${BUILDTOOL} config -CONFIGURE_ENV+= BT_FLAGS_CC=${CFLAGS:Q} -CONFIGURE_ENV+= BT_FLAGS_CPP=${CPPFLAGS:Q} -CONFIGURE_ENV+= BT_FLAGS_CXX=${CXXFLAGS:Q} -CONFIGURE_ENV+= BT_FLAGS_LD=${LDFLAGS:Q} +CONFIGURE_ENV+= BT_FLAGS_CC=${CFLAGS:M*:Q} +CONFIGURE_ENV+= BT_FLAGS_CPP=${CPPFLAGS:M*:Q} +CONFIGURE_ENV+= BT_FLAGS_CXX=${CXXFLAGS:M*:Q} +CONFIGURE_ENV+= BT_FLAGS_LD=${LDFLAGS:M*:Q} CONFIGURE_ENV+= BT_PROG_AWK=${TOOLS_AWK:Q} CONFIGURE_ENV+= BT_PROG_CC=${CC:Q} CONFIGURE_ENV+= BT_PROG_CXX=${CXX:Q} diff --git a/devel/cssc/Makefile b/devel/cssc/Makefile index 2af0e72899f..d9cce02f3f4 100644 --- a/devel/cssc/Makefile +++ b/devel/cssc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/07/29 04:24:03 grant Exp $ +# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:02 rillig Exp $ # DISTNAME= CSSC-1.0.1 @@ -14,7 +14,7 @@ COMMENT= GNU workalike for the source code control system SCCS USE_LANGUAGES= c c++ GNU_CONFIGURE= YES CONFIGURE_ARGS+=--enable-binary -CONFIGURE_ENV+= CONFIG_DIFF_COMMAND="${TOOLS_DIFF}" +CONFIGURE_ENV+= CONFIG_DIFF_COMMAND=${TOOLS_DIFF:Q} USE_TOOLS+= diff TEST_TARGET= check diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile index 8678e950dbf..4be9188a5cb 100644 --- a/devel/cvs/Makefile +++ b/devel/cvs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.88 2005/12/02 17:10:04 wiz Exp $ +# $NetBSD: Makefile,v 1.89 2005/12/05 20:50:02 rillig Exp $ # DISTNAME= cvs-1.11.20 @@ -17,7 +17,7 @@ GNU_CONFIGURE= yes .include "options.mk" -CONFIGURE_ENV+= perl_path=${PERL5} +CONFIGURE_ENV+= perl_path=${PERL5:Q} INFO_FILES= cvs.info cvsclient.info USE_MAKEINFO= yes diff --git a/devel/cvs2p4/Makefile b/devel/cvs2p4/Makefile index 00a12439d55..18061fad40a 100644 --- a/devel/cvs2p4/Makefile +++ b/devel/cvs2p4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:08 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:02 rillig Exp $ # DISTNAME= cvs2p4-2.3.3 @@ -23,8 +23,8 @@ NO_BUILD= yes DOCDIR= share/doc/${PKGBASE} EGDIR= share/examples/${PKGBASE} LIBDIR= lib/perl5 -PLIST_SUBST+= DOCDIR=${DOCDIR} -PLIST_SUBST+= EGDIR=${EGDIR} +PLIST_SUBST+= DOCDIR=${DOCDIR:Q} +PLIST_SUBST+= EGDIR=${EGDIR:Q} FILES_SUBST+= P4ROOT=${P4ROOT:Q} FILES_SUBST+= P4PORT=${P4PORT:Q} diff --git a/devel/cvsgraph/Makefile b/devel/cvsgraph/Makefile index 6b6d767b333..52173eea26f 100644 --- a/devel/cvsgraph/Makefile +++ b/devel/cvsgraph/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/06/16 06:57:45 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:03 rillig Exp $ # DISTNAME= cvsgraph-1.5.1 @@ -17,11 +17,11 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} DOCDIR= ${PREFIX}/share/doc/${PKGBASE} EGDIR= ${PREFIX}/share/examples/${PKGBASE} CONF_FILES= ${EGDIR}/cvsgraph.conf ${PKG_SYSCONFDIR}/cvsgraph.conf -PLIST_SUBST+= PKGBASE=${PKGBASE} +PLIST_SUBST+= PKGBASE=${PKGBASE:Q} BUILD_TARGET= cvsgraph -SUBST_CLASSES= man +SUBST_CLASSES+= man SUBST_STAGE.man= pre-install SUBST_FILES.man= cvsgraph.1 SUBST_SED.man= -e "s|/usr/local/etc|${PKG_SYSCONFDIR}|g" diff --git a/devel/cvsps/Makefile b/devel/cvsps/Makefile index d96025adc09..b7704756cc7 100644 --- a/devel/cvsps/Makefile +++ b/devel/cvsps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/07/29 03:39:06 grant Exp $ +# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:03 rillig Exp $ # DISTNAME= cvsps-2.1 @@ -16,7 +16,7 @@ USE_TOOLS+= gmake INSTALLATION_DIRS= bin man/man1 LIBS.SunOS+= -lnsl -lsocket -MAKE_ENV+= LIBS=${LIBS:Q} +MAKE_ENV+= LIBS=${LIBS:M*:Q} .include "../../devel/zlib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/cvsup/Makefile.common b/devel/cvsup/Makefile.common index 902fc4968f7..3d8e9c32c12 100644 --- a/devel/cvsup/Makefile.common +++ b/devel/cvsup/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.6 2005/06/05 09:49:01 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.7 2005/12/05 20:50:03 rillig Exp $ DISTNAME= cvsup-snap-16.1h PKGREVISION= 1 @@ -14,7 +14,7 @@ ONLY_FOR_PLATFORM= DragonFly-*-i386 FreeBSD-*-i386 Linux-*-i386 \ .include "../../mk/bsd.prefs.mk" -MAKE_FLAGS+= PREFIX=${PREFIX} M3FLAGS="${M3FLAGS}" +MAKE_FLAGS+= PREFIX=${PREFIX:Q} M3FLAGS=${M3FLAGS:Q} M3BIN= ${PREFIX}/ezm3/bin/m3build diff --git a/devel/cvsync/Makefile b/devel/cvsync/Makefile index a27632a4ed9..2aa0ebfc946 100644 --- a/devel/cvsync/Makefile +++ b/devel/cvsync/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.77 2005/10/01 08:56:46 agc Exp $ +# $NetBSD: Makefile,v 1.78 2005/12/05 20:50:03 rillig Exp $ # DISTNAME= cvsync-0.24.19 @@ -15,9 +15,9 @@ USE_PKGINSTALL= YES USE_TOOLS+= gmake INSTALLATION_DIRS= bin man/man1 -MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} BINMODE=${BINMODE} -MAKE_ENV+= MANMODE=${MANMODE} -MAKE_ENV+= PTHREAD_TYPE=${PTHREAD_TYPE} +MAKE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} BINMODE=${BINMODE:Q} +MAKE_ENV+= MANMODE=${MANMODE:Q} +MAKE_ENV+= PTHREAD_TYPE=${PTHREAD_TYPE:Q} MAKE_ENV+= PTHREAD_PREFIX=${BUILDLINK_PREFIX.pthread} EGDIR= ${PREFIX}/share/examples/cvsync diff --git a/devel/darcs/distinfo b/devel/darcs/distinfo index 58350465a47..44be99b5e72 100644 --- a/devel/darcs/distinfo +++ b/devel/darcs/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.5 2005/11/22 12:57:48 augustss Exp $ +$NetBSD: distinfo,v 1.6 2005/12/05 20:50:03 rillig Exp $ SHA1 (darcs-1.0.4.tar.gz) = 71ab71a9fa94db74ba3b79fa65b797a129a652f2 RMD160 (darcs-1.0.4.tar.gz) = 5b8e4b2396c1cd7a373e103aa90d8a47802a43de Size (darcs-1.0.4.tar.gz) = 950528 bytes -SHA1 (patch-aa) = cb4698c96299b9efcb1cc03a5551912785524ea3 +SHA1 (patch-aa) = 88a11e03384ced43a3d9a8559234acc42e67a791 diff --git a/devel/darcs/patches/patch-aa b/devel/darcs/patches/patch-aa index 280d1aeba84..9a64c8a777f 100644 --- a/devel/darcs/patches/patch-aa +++ b/devel/darcs/patches/patch-aa @@ -1,3 +1,5 @@ +$NetBSD: patch-aa,v 1.4 2005/12/05 20:50:03 rillig Exp $ + *** GNUmakefile.orig Sun Nov 13 22:28:27 2005 --- GNUmakefile Tue Nov 22 12:54:49 2005 *************** diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile index f3c108a92a0..796b2d5baf6 100644 --- a/devel/ddd/Makefile +++ b/devel/ddd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.66 2005/08/04 11:26:34 martti Exp $ +# $NetBSD: Makefile,v 1.67 2005/12/05 20:50:03 rillig Exp $ # DISTNAME= ddd-3.3.11 @@ -20,7 +20,7 @@ USE_X11BASE= YES GCC_REQD+= 3.0 CONFIGURE_ARGS+= --with-ncurses=no -CONFIGURE_ENV+= COMPFACE="${FALSE}" +CONFIGURE_ENV+= COMPFACE=${FALSE:Q} .include "../../mk/bsd.prefs.mk" diff --git a/devel/diffutils/Makefile b/devel/diffutils/Makefile index cf063bc4e3f..12c6fbb1dbd 100644 --- a/devel/diffutils/Makefile +++ b/devel/diffutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2004/05/18 11:58:04 recht Exp $ +# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:03 rillig Exp $ # DISTNAME= diffutils-2.8.1 @@ -19,7 +19,7 @@ INFO_FILES= diff.info .if defined(GNU_PROGRAM_PREFIX) CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX} .endif -PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX} +PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q} BUILD_DEFS+= GNU_PROGRAM_PREFIX .include "../../mk/bsd.pkg.mk" diff --git a/devel/distcc/Makefile b/devel/distcc/Makefile index 6414b19fa81..a25820ca3c4 100644 --- a/devel/distcc/Makefile +++ b/devel/distcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/10/10 09:53:07 jmmv Exp $ +# $NetBSD: Makefile,v 1.26 2005/12/05 20:50:03 rillig Exp $ PKGNAME= ${DISTNAME} PKGREVISION= 1 @@ -17,9 +17,9 @@ PKG_USERS= ${DISTCC_USER}:${DISTCC_GROUP}::Distccd\ user DISTCC_PIDDIR?= ${VARBASE}/run/distccd OWN_DIRS_PERMS= ${DISTCC_PIDDIR} ${DISTCC_USER} ${DISTCC_GROUP} 0750 -FILES_SUBST+= DISTCC_PIDDIR=${DISTCC_PIDDIR} -FILES_SUBST+= DISTCC_USER=${DISTCC_USER} -FILES_SUBST+= DISTCC_GROUP=${DISTCC_GROUP} +FILES_SUBST+= DISTCC_PIDDIR=${DISTCC_PIDDIR:Q} +FILES_SUBST+= DISTCC_USER=${DISTCC_USER:Q} +FILES_SUBST+= DISTCC_GROUP=${DISTCC_GROUP:Q} post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/distcc diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile index 8fa501bbab8..f1ab2182492 100644 --- a/devel/doxygen/Makefile +++ b/devel/doxygen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2005/11/29 04:40:38 joerg Exp $ +# $NetBSD: Makefile,v 1.42 2005/12/05 20:50:03 rillig Exp $ DISTNAME= doxygen-1.4.5.src PKGNAME= doxygen-1.4.5 @@ -21,7 +21,7 @@ CONFIGURE_ARGS+= --install ${INSTALL} CONFIGURE_ARGS+= --dot ${PREFIX}/bin/dot CONFIGURE_ARGS+= --prefix ${PREFIX} CONFIGURE_ARGS+= --docdir ${PREFIX}/share/doc -MAKE_ENV+= PKGSRC_CFLAGS="${CFLAGS}" +MAKE_ENV+= PKGSRC_CFLAGS=${CFLAGS:M*:Q} SUBST_CLASSES+= pybin SUBST_STAGE.pybin= pre-configure diff --git a/devel/eclipse/Makefile b/devel/eclipse/Makefile index 1b9eeaee6a5..bcc8209c930 100644 --- a/devel/eclipse/Makefile +++ b/devel/eclipse/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/11/19 15:42:56 rillig Exp $ +# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:03 rillig Exp $ # DISTNAME= ${PKGNAME} @@ -17,8 +17,8 @@ DEPENDS+= apache-ant>=1.4.1:../../devel/apache-ant PKG_JVMS_ACCEPTED= sun-jdk15 sun-jdk14 -MAKE_ENV+= JAVA_HOME=${PKG_JAVA_HOME} -MAKE_ENV+= ANT_HOME=${PREFIX} +MAKE_ENV+= JAVA_HOME=${PKG_JAVA_HOME:Q} +MAKE_ENV+= ANT_HOME=${PREFIX:Q} VERSION= 3.0.1 diff --git a/devel/elib/Makefile b/devel/elib/Makefile index d393f5e0a95..02918e07e87 100644 --- a/devel/elib/Makefile +++ b/devel/elib/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.13 2005/08/28 04:25:28 uebayasi Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:03 rillig Exp $ # DISTNAME= elib-1.0 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} -PKGREVISION?= 2 +PKGREVISION= 2 CATEGORIES= devel MASTER_SITES= http://jde.sunsite.dk/ @@ -16,9 +16,9 @@ CONFLICTS+= emacs20-elib-[0-9]* BUILD_ENV+= EMACS=${EMACS_FLAVOR} -MAKEFLAGS+= EMACS=${EMACS_FLAVOR} +MAKEFLAGS+= EMACS=${EMACS_FLAVOR:Q} -NO_CONFIGURE= # set +NO_CONFIGURE= yes USE_TOOLS+= gmake USE_MAKEINFO= YES diff --git a/devel/emacs-ilisp/Makefile b/devel/emacs-ilisp/Makefile index 0ae3f959ddc..e0efd3a534f 100644 --- a/devel/emacs-ilisp/Makefile +++ b/devel/emacs-ilisp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/08/28 04:25:28 uebayasi Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:03 rillig Exp $ # DISTNAME= ilisp-20021222 @@ -10,7 +10,7 @@ MAINTAINER= dillo@NetBSD.org HOMEPAGE= http://sourceforge.net/projects/ilisp/ COMMENT= Emacs interface to embedded Lisp process -MAKE_ENV+= EMACS=${EMACS_BIN} +MAKE_ENV+= EMACS=${EMACS_BIN:Q} BUILD_TARGET= compile SITELISP= ${EMACS_LISPPREFIX}/ilisp diff --git a/devel/emacs20-elib/Makefile b/devel/emacs20-elib/Makefile index 26e61eac026..75682e1aa61 100644 --- a/devel/emacs20-elib/Makefile +++ b/devel/emacs20-elib/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2003/11/18 16:29:50 cube Exp $ +# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:03 rillig Exp $ PKGNAME= emacs20-${DISTNAME} -PKGREVISION= # defined DISTINFO_FILE= ${.CURDIR}/../../devel/elib/distinfo PATCHDIR= ${.CURDIR}/../../devel/elib/patches diff --git a/devel/eric3/Makefile b/devel/eric3/Makefile index 9d16302c90d..41524ff08ee 100644 --- a/devel/eric3/Makefile +++ b/devel/eric3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/10/05 16:34:00 drochner Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:03 rillig Exp $ # DISTNAME= eric-3.7.2 @@ -9,7 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.die-offenbachs.de/detlev/eric3.html COMMENT= Python IDE -DEPENDS= ${PYPKGPREFIX}-qt3-modules>=3.11:../../x11/py-qt3-modules +DEPENDS+= ${PYPKGPREFIX}-qt3-modules>=3.11:../../x11/py-qt3-modules DEPENDS+= ${PYPKGPREFIX}-qt3-qscintilla>=3.11:../../x11/py-qt3-qscintilla NO_BUILD= yes @@ -18,7 +18,8 @@ USE_LANGUAGES= PY_PATCHPLIST= yes PYTHON_VERSIONS_ACCEPTED= 24 23 22 -CONFIGURE_ARGS= -b ${PREFIX}/bin -d ${PREFIX}/${PYSITELIB} +CONFIGURE_ARGS+= -b ${PREFIX:Q}/bin +CONFIGURE_ARGS+= -d ${PREFIX:Q}/${PYSITELIB:Q} do-install: (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ diff --git a/devel/error/Makefile b/devel/error/Makefile index 029b2cd8c7f..6801bdccc67 100644 --- a/devel/error/Makefile +++ b/devel/error/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/05/22 05:32:17 minskim Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:03 rillig Exp $ # DISTNAME= error-0.0 @@ -8,7 +8,7 @@ MASTER_SITES= ftp://ftp.gw.com/pub/people/christos/ MAINTAINER= christos@NetBSD.org COMMENT= Insert compiler errors in source files as comments -MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} \ - MANOWN=${MANOWN} MANGRP=${MANGRP} +MAKE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} \ + MANOWN=${MANOWN:Q} MANGRP=${MANGRP:Q} .include "../../mk/bsd.pkg.mk" diff --git a/devel/error/distinfo b/devel/error/distinfo index 4cd0e207fac..a638042a261 100644 --- a/devel/error/distinfo +++ b/devel/error/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.2 2005/06/21 21:02:16 jlam Exp $ +$NetBSD: distinfo,v 1.3 2005/12/05 20:50:03 rillig Exp $ SHA1 (error-0.0.tar.gz) = b791825e6864e9459401d2bc780521a7411f1ce2 RMD160 (error-0.0.tar.gz) = 8546498a08045c44eb1a5693447954640d2bf9e4 Size (error-0.0.tar.gz) = 25818 bytes SHA1 (patch-aa) = 8a5addfb206d969b8cf5d2ff8b1505f28d499f02 -SHA1 (patch-ab) = bb50e813ff1730d79d87b629144674795cae58f2 -SHA1 (patch-ac) = d53fd3b4c241bfc254e21d1ab9abaa99712ba404 +SHA1 (patch-ab) = d07451d05915be0fdc0e941befc292d26807fa8d +SHA1 (patch-ac) = 4077d23e2a155ff022e767eacdabb0a3eb815415 diff --git a/devel/error/patches/patch-ab b/devel/error/patches/patch-ab index eb26b186ca8..a1fec56de92 100644 --- a/devel/error/patches/patch-ab +++ b/devel/error/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.1 2005/06/21 21:02:16 jlam Exp $ +$NetBSD: patch-ab,v 1.2 2005/12/05 20:50:03 rillig Exp $ --- strlcat.c.orig 2005-05-10 16:48:24.000000000 -0400 +++ strlcat.c -@@ -35,6 +35,7 @@ __RCSID("$NetBSD: strlcat.c,v 1.16 2003/ +@@ -35,6 +35,7 @@ size_t strlcat(char *dst, const char *src, size_t siz); diff --git a/devel/error/patches/patch-ac b/devel/error/patches/patch-ac index 11a544d113b..f4c985f47d6 100644 --- a/devel/error/patches/patch-ac +++ b/devel/error/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.1 2005/06/21 21:02:16 jlam Exp $ +$NetBSD: patch-ac,v 1.2 2005/12/05 20:50:03 rillig Exp $ --- strlcpy.c.orig 2005-05-10 16:48:24.000000000 -0400 +++ strlcpy.c -@@ -34,6 +34,7 @@ __RCSID("$NetBSD: strlcpy.c,v 1.14 2003/ +@@ -34,6 +34,7 @@ #include <string.h> size_t strlcpy(char *dst, const char *src, size_t siz); diff --git a/devel/florist/Makefile b/devel/florist/Makefile index ee91d375d28..4489308083c 100644 --- a/devel/florist/Makefile +++ b/devel/florist/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/06/01 20:08:00 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:03 rillig Exp $ # DISTNAME= florist-3.15p-src @@ -23,7 +23,7 @@ USE_TOOLS+= autoconf213 gmake # 1) lang/gcc34-ada and 2) lang/gcc34 built with Ada option # If USE_GCC_34=YES this package will use gcc34. Otherwise, # it will use gcc34-ada -BUILD_DEFS= USE_GCC_34 +BUILD_DEFS+= USE_GCC_34 USE_GCC_34?= NO post-extract: diff --git a/devel/fortran-utils/Makefile b/devel/fortran-utils/Makefile index 571ddc93b01..c9554fe125f 100644 --- a/devel/fortran-utils/Makefile +++ b/devel/fortran-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/04/19 18:39:23 minskim Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:03 rillig Exp $ DISTNAME= fortran-utils-1.1 CATEGORIES= devel @@ -11,7 +11,7 @@ NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL WRKSRC= ${WRKDIR}/fortran-utils -MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} BINMODE=${BINMODE} \ - MANOWN=${MANOWN} MANGRP=${MANGRP} MANMODE=${MANMODE} +MAKE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} BINMODE=${BINMODE:Q} \ + MANOWN=${MANOWN:Q} MANGRP=${MANGRP:Q} MANMODE=${MANMODE:Q} .include "../../mk/bsd.pkg.mk" diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile index 17b9d475c8d..deef6faf4f1 100644 --- a/devel/gdb/Makefile +++ b/devel/gdb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/07/17 19:03:34 kristerw Exp $ +# $NetBSD: Makefile,v 1.23 2005/12/05 20:50:04 rillig Exp $ # DISTNAME= gdb-5.3 @@ -20,7 +20,7 @@ REPLACE_LOCALEDIR_PATTERNS+= Make-in INSTALL_TARGET= install install-info TEST_TARGET= check INFO_FILES= bfd.info gdb.info gdbint.info mmalloc.info stabs.info -CONFIGURE_ENV+= CONFIG_LDFLAGS=${LDFLAGS:Q} +CONFIGURE_ENV+= CONFIG_LDFLAGS=${LDFLAGS:M*:Q} .include "../../mk/bsd.prefs.mk" diff --git a/devel/gdb6/Makefile b/devel/gdb6/Makefile index 91b43502a25..654762c7916 100644 --- a/devel/gdb6/Makefile +++ b/devel/gdb6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/07/17 19:03:34 kristerw Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:04 rillig Exp $ # DISTNAME= gdb-6.2.1 @@ -15,7 +15,7 @@ NOT_FOR_PLATFORM= Darwin-*-* BUILD_USES_MSGFMT= yes -USE_TOOLS= autoconf213 gmake +USE_TOOLS+= autoconf213 gmake USE_LIBTOOL= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool USE_PKGLOCALEDIR= yes @@ -38,10 +38,10 @@ pre-configure: cd ${WRKSRC}/gdb; autoheader; autoconf do-test: - if `${PKG_INFO} -qe dejagnu` ;then \ + if ${PKG_INFO} -qe dejagnu; then \ (cd ${WRKSRC} && ${GMAKE} check); \ else \ - ${ECHO} dejagnu is required for the test target; \ + ${ECHO} "dejagnu is required for the test target"; \ fi .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/devel/gettext-lib/Makefile b/devel/gettext-lib/Makefile index 63eb666d6da..94c7c22d451 100644 --- a/devel/gettext-lib/Makefile +++ b/devel/gettext-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2005/08/21 02:31:27 jlam Exp $ +# $NetBSD: Makefile,v 1.40 2005/12/05 20:50:04 rillig Exp $ DISTNAME= gettext-0.11.5 PKGNAME= gettext-lib-0.11.5 @@ -20,8 +20,8 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-included-gettext -CONFIGURE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" -MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" +CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q} +MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q} BUILD_TARGET= all-yes INSTALL_TARGET= install-exec diff --git a/devel/gettext-m4/Makefile b/devel/gettext-m4/Makefile index ba5d129fc92..ae9d3f9ec55 100644 --- a/devel/gettext-m4/Makefile +++ b/devel/gettext-m4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:23 tv Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:04 rillig Exp $ DISTNAME= gettext-0.11.5 PKGNAME= gettext-m4-0.11.5 @@ -17,8 +17,8 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-included-gettext -CONFIGURE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" -MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" +CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q} +MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q} BUILD_DIRS= ${WRKSRC}/m4 diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile index ee6cd185616..8a2c2d3ed39 100644 --- a/devel/gettext/Makefile +++ b/devel/gettext/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.63 2005/04/11 21:45:23 tv Exp $ +# $NetBSD: Makefile,v 1.64 2005/12/05 20:50:04 rillig Exp $ DISTNAME= gettext-0.11.5 PKGREVISION= 5 @@ -25,7 +25,7 @@ CONFIGURE_ENV+= HAVE_GCJ_IN_PATH= CONFIGURE_ENV+= HAVE_JAVAC_IN_PATH= CONFIGURE_ENV+= HAVE_JIKES_IN_PATH= -MAKE_ENV+= OPSYS="${OPSYS}" +MAKE_ENV+= OPSYS=${OPSYS:Q} TEST_TARGET= check diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile index c3c1523c150..e7e2def4155 100644 --- a/devel/gindent/Makefile +++ b/devel/gindent/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2005/09/28 20:52:19 rillig Exp $ +# $NetBSD: Makefile,v 1.41 2005/12/05 20:50:04 rillig Exp $ # DISTNAME= indent-2.2.8a @@ -22,9 +22,9 @@ INFO_FILES= indent.info .include "../../mk/bsd.prefs.mk" .if defined(GNU_PROGRAM_PREFIX) -CONFIGURE_ARGS= --program-prefix=${GNU_PROGRAM_PREFIX} +CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX:Q} .endif -PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX} +PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q} BUILD_DEFS+= GNU_PROGRAM_PREFIX .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile index 599e003dc5b..7719ba02c0a 100644 --- a/devel/glib2/Makefile +++ b/devel/glib2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.85 2005/11/25 21:30:17 wiz Exp $ +# $NetBSD: Makefile,v 1.86 2005/12/05 20:50:04 rillig Exp $ DISTNAME= glib-2.8.4 PKGNAME= ${DISTNAME:S/glib/glib2/} @@ -34,7 +34,7 @@ PKGCONFIG_OVERRIDE+= gthread-2.0-uninstalled.pc.in PKGCONFIG_OVERRIDE+= gthread-2.0.pc.in GNU_CONFIGURE= yes -CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} +CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q} CONFIGURE_ARGS+= --enable-gtk-doc=no CONFIGURE_ARGS+= --includedir=${PREFIX}/include/glib CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc @@ -43,9 +43,9 @@ CONFIGURE_ARGS+= ${CONFIGURE_ARGS.${ICONV_TYPE}-iconv} CONFIGURE_ARGS.gnu-iconv= --with-libiconv=gnu # Avoid an ICE in gcc2 on sparc64 -CONFIGURE_ENV+= F77=${FALSE} +CONFIGURE_ENV+= F77=${FALSE:Q} -CONFIGURE_ENV+= PERL_PATH=${PERL5} +CONFIGURE_ENV+= PERL_PATH=${PERL5:Q} .include "options.mk" @@ -57,7 +57,7 @@ CPPFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\"" .if ${OPSYS} == "FreeBSD" -SUBST_CLASSES= thr +SUBST_CLASSES+= thr SUBST_STAGE.thr= post-patch SUBST_FILES.thr= gthread/Makefile.in . if ${OS_VERSION:R} >= 5 diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile index 8f6798548e5..1806d73f713 100644 --- a/devel/gmake/Makefile +++ b/devel/gmake/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.60 2005/04/11 21:45:24 tv Exp $ +# $NetBSD: Makefile,v 1.61 2005/12/05 20:50:04 rillig Exp $ DISTNAME= make-3.80 PKGNAME= gmake-3.80 @@ -26,7 +26,7 @@ TEST_TARGET= check .if defined(GNU_PROGRAM_PREFIX) CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX} .endif -PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX} +PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q} BUILD_DEFS+= GNU_PROGRAM_PREFIX .if !defined(GNU_PROGRAM_PREFIX) || ${GNU_PROGRAM_PREFIX} != "g" @@ -39,7 +39,7 @@ PLIST_SRC= ${PKGDIR}/PLIST GMAKE_LOCALE?= yes BUILD_DEFS+= GMAKE_LOCALE -MAKEFLAGS+= GMAKE_LOCALE=${GMAKE_LOCALE} +MAKEFLAGS+= GMAKE_LOCALE=${GMAKE_LOCALE:Q} .if !empty(GMAKE_LOCALE:M[yY][eE][sS]) USE_PKGLOCALEDIR= yes PLIST_SRC+= ${PKGDIR}/PLIST.locale diff --git a/devel/gnustep-base/Makefile b/devel/gnustep-base/Makefile index ebb3000a563..c36df05b81e 100644 --- a/devel/gnustep-base/Makefile +++ b/devel/gnustep-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/11/28 22:12:24 rh Exp $ +# $NetBSD: Makefile,v 1.28 2005/12/05 20:50:04 rillig Exp $ DISTNAME= gnustep-base-1.11.1 CATEGORIES= devel gnustep @@ -11,7 +11,7 @@ COMMENT= GNUstep foundation classes PTHREAD_LIBS= -lpthread CONFIGURE_ARGS+= --exec-prefix=${PREFIX}/libexec/GNUstep -CONFIGURE_ENV+= INSTALL_PROGRAM="${INSTALL_SCRIPT}" +CONFIGURE_ENV+= INSTALL_PROGRAM=${INSTALL_SCRIPT:Q} pre-configure: ${SED} 's|@PREFIX@|${PREFIX}|g' <${FILESDIR}/openapp >${WRKDIR}/openapp diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile index 20e67465fc3..e102465dc7c 100644 --- a/devel/gnustep-make/Makefile +++ b/devel/gnustep-make/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/09/30 23:10:52 rh Exp $ +# $NetBSD: Makefile,v 1.23 2005/12/05 20:50:04 rillig Exp $ DISTNAME= gnustep-make-1.11.1 CATEGORIES= devel gnustep @@ -10,7 +10,7 @@ COMMENT= GNUstep makefile package PKG_INSTALLATION_TYPES= overwrite pkgviews -CONFIGURE_ENV+= INSTALL_PROGRAM="${INSTALL_SCRIPT}" +CONFIGURE_ENV+= INSTALL_PROGRAM=${INSTALL_SCRIPT:Q} .include "../../mk/x11.buildlink3.mk" .include "gnustep.mk" diff --git a/devel/gnustep-make/gnustep.mk b/devel/gnustep-make/gnustep.mk index 691972b710e..48e71c8d053 100644 --- a/devel/gnustep-make/gnustep.mk +++ b/devel/gnustep-make/gnustep.mk @@ -1,4 +1,4 @@ -# $NetBSD: gnustep.mk,v 1.5 2005/07/29 12:57:14 adam Exp $ +# $NetBSD: gnustep.mk,v 1.6 2005/12/05 20:50:04 rillig Exp $ .if !defined(GNUSTEP_MK) GNUSTEP_MK= #defined @@ -56,35 +56,35 @@ MAKEFILE= GNUmakefile GNU_CONFIGURE= yes .endif -MAKE_ENV+= GNUSTEP_ROOT="${GNUSTEP_ROOT}" -MAKE_ENV+= GNUSTEP_SYSTEM_ROOT="${GNUSTEP_SYSTEM_ROOT}" -MAKE_ENV+= GNUSTEP_LOCAL_ROOT="${GNUSTEP_LOCAL_ROOT}" -MAKE_ENV+= GNUSTEP_NETWORK_ROOT="${GNUSTEP_NETWORK_ROOT}" -MAKE_ENV+= GNUSTEP_MAKEFILES="${GNUSTEP_MAKEFILES}" -MAKE_ENV+= GNUSTEP_HOST="${GNUSTEP_HOST}" -MAKE_ENV+= GNUSTEP_HOST_CPU="${GNUSTEP_HOST_CPU}" -MAKE_ENV+= GNUSTEP_HOST_VENDOR="${GNUSTEP_HOST_VENDOR}" -MAKE_ENV+= GNUSTEP_HOST_OS="${GNUSTEP_HOST_OS}" -MAKE_ENV+= GNUSTEP_USER_ROOT="${GNUSTEP_USER_ROOT}" -MAKE_ENV+= GNUSTEP_PATHLIST="${GNUSTEP_PATHLIST}" -MAKE_ENV+= GNUSTEP_FLATTENED="${GNUSTEP_FLATTENED}" -MAKE_ENV+= GUILE_LOAD_PATH="${GUILE_LOAD_PATH}" +MAKE_ENV+= GNUSTEP_ROOT=${GNUSTEP_ROOT:Q} +MAKE_ENV+= GNUSTEP_SYSTEM_ROOT=${GNUSTEP_SYSTEM_ROOT:Q} +MAKE_ENV+= GNUSTEP_LOCAL_ROOT=${GNUSTEP_LOCAL_ROOT:Q} +MAKE_ENV+= GNUSTEP_NETWORK_ROOT=${GNUSTEP_NETWORK_ROOT:Q} +MAKE_ENV+= GNUSTEP_MAKEFILES=${GNUSTEP_MAKEFILES:Q} +MAKE_ENV+= GNUSTEP_HOST=${GNUSTEP_HOST:Q} +MAKE_ENV+= GNUSTEP_HOST_CPU=${GNUSTEP_HOST_CPU:Q} +MAKE_ENV+= GNUSTEP_HOST_VENDOR=${GNUSTEP_HOST_VENDOR:Q} +MAKE_ENV+= GNUSTEP_HOST_OS=${GNUSTEP_HOST_OS:Q} +MAKE_ENV+= GNUSTEP_USER_ROOT=${GNUSTEP_USER_ROOT:Q} +MAKE_ENV+= GNUSTEP_PATHLIST=${GNUSTEP_PATHLIST:Q} +MAKE_ENV+= GNUSTEP_FLATTENED=${GNUSTEP_FLATTENED:Q} +MAKE_ENV+= GUILE_LOAD_PATH=${GUILE_LOAD_PATH:Q} .if defined(GNU_CONFIGURE) || defined(HAS_CONFIGURE) GNU_CONFIGURE_PREFIX?= ${GNUSTEP_ROOT} -CONFIGURE_ENV+= GNUSTEP_ROOT="${GNUSTEP_ROOT}" -CONFIGURE_ENV+= GNUSTEP_SYSTEM_ROOT="${GNUSTEP_SYSTEM_ROOT}" -CONFIGURE_ENV+= GNUSTEP_LOCAL_ROOT="${GNUSTEP_LOCAL_ROOT}" -CONFIGURE_ENV+= GNUSTEP_NETWORK_ROOT="${GNUSTEP_NETWORK_ROOT}" -CONFIGURE_ENV+= GNUSTEP_MAKEFILES="${GNUSTEP_MAKEFILES}" -CONFIGURE_ENV+= GNUSTEP_HOST="${GNUSTEP_HOST}" -CONFIGURE_ENV+= GNUSTEP_HOST_CPU="${GNUSTEP_HOST_CPU}" -CONFIGURE_ENV+= GNUSTEP_HOST_VENDOR="${GNUSTEP_HOST_VENDOR}" -CONFIGURE_ENV+= GNUSTEP_HOST_OS="${GNUSTEP_HOST_OS}" -CONFIGURE_ENV+= GNUSTEP_USER_ROOT="${GNUSTEP_USER_ROOT}" -CONFIGURE_ENV+= GNUSTEP_PATHLIST="${GNUSTEP_PATHLIST}" -CONFIGURE_ENV+= GNUSTEP_FLATTENED="${GNUSTEP_FLATTENED}" -CONFIGURE_ENV+= GUILE_LOAD_PATH="${GUILE_LOAD_PATH}" +CONFIGURE_ENV+= GNUSTEP_ROOT=${GNUSTEP_ROOT:Q} +CONFIGURE_ENV+= GNUSTEP_SYSTEM_ROOT=${GNUSTEP_SYSTEM_ROOT:Q} +CONFIGURE_ENV+= GNUSTEP_LOCAL_ROOT=${GNUSTEP_LOCAL_ROOT:Q} +CONFIGURE_ENV+= GNUSTEP_NETWORK_ROOT=${GNUSTEP_NETWORK_ROOT:Q} +CONFIGURE_ENV+= GNUSTEP_MAKEFILES=${GNUSTEP_MAKEFILES:Q} +CONFIGURE_ENV+= GNUSTEP_HOST=${GNUSTEP_HOST:Q} +CONFIGURE_ENV+= GNUSTEP_HOST_CPU=${GNUSTEP_HOST_CPU:Q} +CONFIGURE_ENV+= GNUSTEP_HOST_VENDOR=${GNUSTEP_HOST_VENDOR:Q} +CONFIGURE_ENV+= GNUSTEP_HOST_OS=${GNUSTEP_HOST_OS:Q} +CONFIGURE_ENV+= GNUSTEP_USER_ROOT=${GNUSTEP_USER_ROOT:Q} +CONFIGURE_ENV+= GNUSTEP_PATHLIST=${GNUSTEP_PATHLIST:Q} +CONFIGURE_ENV+= GNUSTEP_FLATTENED=${GNUSTEP_FLATTENED:Q} +CONFIGURE_ENV+= GUILE_LOAD_PATH=${GUILE_LOAD_PATH:Q} .endif # GNU_CONFIGURE .endif # !NO_GNUSTEP_ENV diff --git a/devel/gtexinfo/Makefile b/devel/gtexinfo/Makefile index cfd80a0298d..d8a57fe1212 100644 --- a/devel/gtexinfo/Makefile +++ b/devel/gtexinfo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2005/10/10 15:14:49 salo Exp $ +# $NetBSD: Makefile,v 1.59 2005/12/05 20:50:04 rillig Exp $ DISTNAME= texinfo-4.8 PKGNAME= g${DISTNAME} @@ -19,13 +19,13 @@ TEST_TARGET= check PLIST_SRC= ${PKGDIR}/PLIST PKGSRC_INFOPATH= ${PREFIX}/${INFO_DIR}:${X11BASE}/info:${LOCALBASE}/info -MAKE_ENV+= PKGSRC_INFOPATH="${PKGSRC_INFOPATH}" +MAKE_ENV+= PKGSRC_INFOPATH=${PKGSRC_INFOPATH:Q} .include "../../mk/bsd.prefs.mk" TEXINFO_LOCALE?= yes BUILD_DEFS+= TEXINFO_LOCALE -MAKEFLAGS+= TEXINFO_LOCALE=${TEXINFO_LOCALE} +MAKEFLAGS+= TEXINFO_LOCALE=${TEXINFO_LOCALE:Q} .if !empty(TEXINFO_LOCALE:M[yY][eE][sS]) USE_PKGLOCALEDIR= yes PLIST_SRC+= ${PKGDIR}/PLIST.locale diff --git a/devel/gtl/Makefile b/devel/gtl/Makefile index 452a08dda4f..b2c44b864e1 100644 --- a/devel/gtl/Makefile +++ b/devel/gtl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/09/28 20:52:19 rillig Exp $ +# $NetBSD: Makefile,v 1.22 2005/12/05 20:50:04 rillig Exp $ DISTNAME= GTL-1.2.1 PKGNAME= gtl-1.2.1 @@ -19,7 +19,7 @@ CONFLICTS= gtl0-[0-9]* LICENSE= no-commercial-use GNU_CONFIGURE= yes -CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS}" +CONFIGURE_ENV+= CXXFLAGS=${CXXFLAGS:M*:Q} DOCDIR= ${PREFIX}/share/doc/GTL diff --git a/devel/guile-gtk/Makefile b/devel/guile-gtk/Makefile index ee6fb258d0a..833988e7e5e 100644 --- a/devel/guile-gtk/Makefile +++ b/devel/guile-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/09/28 20:52:19 rillig Exp $ +# $NetBSD: Makefile,v 1.26 2005/12/05 20:50:04 rillig Exp $ # DISTNAME= guile-gtk-0.40.91 @@ -12,7 +12,7 @@ COMMENT= Library to make GTK 1.2 accessible from guile USE_LIBTOOL= yes GNU_CONFIGURE= yes -MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH} +MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH:Q} # Skip glade, because it pulls in gnome-libs. # Later, make a new package for just the glade parts, diff --git a/devel/guile-lib/Makefile b/devel/guile-lib/Makefile index 23ef784beae..e08166efce5 100644 --- a/devel/guile-lib/Makefile +++ b/devel/guile-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/08/10 19:01:24 gdt Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:04 rillig Exp $ DISTNAME= guile-lib-0.1.2 CATEGORIES= devel @@ -15,9 +15,9 @@ HAS_CONFIGURE= yes CONFIGURE_DIRS= ${WRKSRC}/build BUILD_DIRS= ${WRKSRC}/build CONFIGURE_SCRIPT= ../src/configure -CONFIGURE_ARGS= --prefix=${PREFIX} +CONFIGURE_ARGS+= --prefix=${PREFIX:Q} -USE_TOOLS= gmake +USE_TOOLS+= gmake USE_MAKEINFO= yes TEXINFO_REQD= 4.2 INFO_FILES= guile-library.info diff --git a/devel/guile14-gtk/Makefile b/devel/guile14-gtk/Makefile index 46bd86fa6d4..10028814ac5 100644 --- a/devel/guile14-gtk/Makefile +++ b/devel/guile14-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/09/28 20:52:19 rillig Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:04 rillig Exp $ # DISTNAME= guile-gtk-0.19 @@ -18,7 +18,7 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --datadir=${PREFIX}/${GUILE14_SUBDIR}/share PLIST_SUBST+= GUILE14_SUBDIR=${GUILE14_SUBDIR:Q} -MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH} +MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH:Q} .include "../../lang/guile14/buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" diff --git a/devel/id-utils/Makefile b/devel/id-utils/Makefile index 43761b185b2..c11602b4470 100644 --- a/devel/id-utils/Makefile +++ b/devel/id-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2005/10/31 02:02:16 dbj Exp $ +# $NetBSD: Makefile,v 1.40 2005/12/05 20:50:04 rillig Exp $ DISTNAME= id-utils-3.2 PKGREVISION= 6 @@ -20,11 +20,11 @@ GNU_CONFIGURE= yes .include "../../mk/bsd.prefs.mk" -.ifdef USE_XEMACS +.if defined(USE_XEMACS) EMACS= ${LOCALBASE}/bin/xemacs BUILD_DEPENDS+= xemacs-[0-9]*:../../editors/xemacs BUILD_DEPENDS+= xemacs-packages-[0-9]*:../../editors/xemacs-packages -.elifdef USE_EMACS +.elif defined(USE_EMACS) EMACS= ${LOCALBASE}/bin/emacs BUILD_DEPENDS+= emacs-[0-9]*:../../editors/emacs .endif @@ -43,12 +43,12 @@ CLISPDIR?= '@comment ' # so configure won't search further for emacs EMACS?= ${FALSE:S|^false$|/usr/bin/false|} -CONFIGURE_ENV+= EMACS=${EMACS} +CONFIGURE_ENV+= EMACS=${EMACS:Q} BUILD_DEFS+= EMACS -MAKE_ENV+= BSD_SETENV=${SETENV} +MAKE_ENV+= BSD_SETENV=${SETENV:Q} -PLIST_SUBST+= LISPDIR=${LISPDIR} -PLIST_SUBST+= CLISPDIR=${CLISPDIR} +PLIST_SUBST+= LISPDIR=${LISPDIR:Q} +PLIST_SUBST+= CLISPDIR=${CLISPDIR:Q} .include "../../devel/gettext-lib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/jam/Makefile b/devel/jam/Makefile index 63c519bda4a..cf6fff09ced 100644 --- a/devel/jam/Makefile +++ b/devel/jam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/06/16 06:57:46 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:04 rillig Exp $ # DISTNAME= jam-2.5 @@ -13,7 +13,7 @@ COMMENT= Program construction tool, like make(1) CONFLICTS= acunia-jam-[0-9]* -DIST_SUBDIR= ${PKGNAME} +DIST_SUBDIR= ${PKGNAME_NOREV}nb1 WRKSRC= ${WRKDIR} DOCDIR= share/doc/${PKGBASE} diff --git a/devel/libFoundation/Makefile b/devel/libFoundation/Makefile index 6eac15ce1fd..297cc008953 100644 --- a/devel/libFoundation/Makefile +++ b/devel/libFoundation/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/10/01 04:25:32 rh Exp $ +# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:05 rillig Exp $ # DISTNAME= libFoundation-1.0.72-r107 @@ -19,7 +19,7 @@ MAKE_ENV+= ADDITIONAL_OBJCFLAGS="-I${WRKSRC} -I." MAKE_ENV+= FOUNDATION_LIB="fd" MAKE_ENV+= INSTALL_DATA=${INSTALL_DATA:Q} -PLIST_SUBST+= GNUSTEP_HOST_CPU=${GNUSTEP_HOST_CPU} +PLIST_SUBST+= GNUSTEP_HOST_CPU=${GNUSTEP_HOST_CPU:Q} LIBF_HOST_OS= ${GNUSTEP_HOST:C/.*-//} diff --git a/devel/libFoundation/buildlink3.mk b/devel/libFoundation/buildlink3.mk index 3d7a8415cfe..14a5e86dfad 100644 --- a/devel/libFoundation/buildlink3.mk +++ b/devel/libFoundation/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2005/10/01 04:25:32 rh Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2005/12/05 20:50:05 rillig Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBFOUNDATION_BUILDLINK3_MK:= ${LIBFOUNDATION_BUILDLINK3_MK}+ @@ -60,10 +60,10 @@ PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/Header FOUNDATION_LIB?= fd ADDITIONAL_INCLUDE_DIRS+=-I${GNUSTEP_SYSTEM_ROOT}/Library/Headers/libFoundation/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}/GNU .if !defined(NO_FOUNDATION_ENV) -CONFIGURE_ENV+= FOUNDATION_LIB="${FOUNDATION_LIB}" -CONFIGURE_ENV+= ADDITIONAL_INCLUDE_DIRS="${ADDITIONAL_INCLUDE_DIRS}" -MAKE_ENV+= FOUNDATION_LIB="${FOUNDATION_LIB}" -MAKE_ENV+= ADDITIONAL_INCLUDE_DIRS="${ADDITIONAL_INCLUDE_DIRS}" +CONFIGURE_ENV+= FOUNDATION_LIB=${FOUNDATION_LIB:Q} +CONFIGURE_ENV+= ADDITIONAL_INCLUDE_DIRS=${ADDITIONAL_INCLUDE_DIRS:Q} +MAKE_ENV+= FOUNDATION_LIB=${FOUNDATION_LIB:Q} +MAKE_ENV+= ADDITIONAL_INCLUDE_DIRS=${ADDITIONAL_INCLUDE_DIRS:Q} .endif .endif # LIBFOUNDATION_BUILDLINK3_MK diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile index c4bf42cf7c3..62716f37bf3 100644 --- a/devel/libbonobo/Makefile +++ b/devel/libbonobo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2005/08/21 11:24:45 jmmv Exp $ +# $NetBSD: Makefile,v 1.42 2005/12/05 20:50:05 rillig Exp $ DISTNAME= libbonobo-2.10.1 CATEGORIES= devel gnome @@ -22,7 +22,7 @@ PKGCONFIG_OVERRIDE+= bonobo-activation/bonobo-activation-2.0.pc.in CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc -CONFIGURE_ENV+= PERL_PATH="${TOOLS_PERL5}" +CONFIGURE_ENV+= PERL_PATH=${TOOLS_PERL5:Q} PKG_SYSCONFSUBDIR= bonobo-activation EGDIR= ${PREFIX}/share/examples/bonobo-activation diff --git a/devel/libebml/Makefile b/devel/libebml/Makefile index f097beec145..f472c556de2 100644 --- a/devel/libebml/Makefile +++ b/devel/libebml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/11/04 18:41:31 rillig Exp $ +# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:05 rillig Exp $ # DISTNAME= libebml-0.7.5 @@ -17,7 +17,7 @@ USE_LANGUAGES= c++ NO_CONFIGURE= yes MAKEFLAGS+= prefix=${PREFIX:Q} -MAKE_ENV+= CXXFLAGS=${CXXFLAGS:Q} RANLIB=${RANLIB:Q} +MAKE_ENV+= CXXFLAGS=${CXXFLAGS:M*:Q} RANLIB=${RANLIB:Q} BUILD_DIRS= make/linux BUILD_TARGET= staticlib INSTALL_TARGET= install_headers install_staticlib diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile index 0c4aba70670..a89768df53d 100644 --- a/devel/libglade/Makefile +++ b/devel/libglade/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.56 2005/04/11 21:45:26 tv Exp $ +# $NetBSD: Makefile,v 1.57 2005/12/05 20:50:05 rillig Exp $ DISTNAME= libglade-0.17 PKGREVISION= 7 @@ -15,7 +15,7 @@ USE_X11BASE= yes GNU_CONFIGURE= yes USE_LIBTOOL= yes -MAKE_ENV+= DISPLAY=${DISPLAY} +MAKE_ENV+= DISPLAY=${DISPLAY:Q} .include "../../textproc/libxml/buildlink3.mk" .include "../../x11/gnome-libs/buildlink3.mk" diff --git a/devel/libgnome/Makefile b/devel/libgnome/Makefile index a210054a9f2..b96750980a3 100644 --- a/devel/libgnome/Makefile +++ b/devel/libgnome/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2005/10/10 13:42:11 jmmv Exp $ +# $NetBSD: Makefile,v 1.43 2005/12/05 20:50:05 rillig Exp $ # DISTNAME= libgnome-2.12.0.1 @@ -10,7 +10,7 @@ MAINTAINER= jmmv@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= Core GNOME2 library (non-graphical) -DEPENDS= docbook>=4.2:../../textproc/docbook +DEPENDS+= docbook>=4.2:../../textproc/docbook BUILD_USES_MSGFMT= YES BUILDLINK_DEPENDS.esound+= esound>=0.2.26 diff --git a/devel/libnet/Makefile b/devel/libnet/Makefile index f4da127cddc..f82e7969c2a 100644 --- a/devel/libnet/Makefile +++ b/devel/libnet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2005/09/28 20:52:19 rillig Exp $ +# $NetBSD: Makefile,v 1.27 2005/12/05 20:50:05 rillig Exp $ # DISTNAME= libnet-1.0.2a @@ -17,7 +17,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME:C/l/L/} USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= LIBNET_CONFIG_CFLAGS="-I${PREFIX}/include" \ - LIBNET_CONFIG_LIBS="${LDFLAGS}" + LIBNET_CONFIG_LIBS=${LDFLAGS:M*:Q} INSTALLATION_DIRS= bin lib share/examples diff --git a/devel/libscsi/Makefile b/devel/libscsi/Makefile index c0887473c2b..b72d9fd2807 100644 --- a/devel/libscsi/Makefile +++ b/devel/libscsi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/10/31 19:57:24 tv Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:05 rillig Exp $ # DISTNAME= libscsi-1.6 @@ -12,7 +12,7 @@ NOT_FOR_PLATFORM= Interix-*-* PKG_INSTALLATION_TYPES= overwrite pkgviews -MAKE_ENV= LIBDIR=${PREFIX}/lib MANDIR=${PREFIX}/man NOPIC=1 NOPROFILE=1 +MAKE_ENV+= LIBDIR=${PREFIX:Q}/lib MANDIR=${PREFIX:Q}/man NOPIC=1 NOPROFILE=1 MANCOMPRESSED_IF_MANZ= yes diff --git a/devel/libstash/Makefile b/devel/libstash/Makefile index 466141ea46b..29176bbffa1 100644 --- a/devel/libstash/Makefile +++ b/devel/libstash/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/07/21 16:43:31 martti Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:05 rillig Exp $ # DISTNAME= libstash_s19990912a @@ -11,6 +11,7 @@ HOMEPAGE= http://www.sqrl.org/sqrl/ COMMENT= Collection of programming support routines and useful algorithms GNU_CONFIGURE= YES -CONFIGURE_ARGS= --without-pthreads --disable-shared +CONFIGURE_ARGS+= --without-pthreads +CONFIGURE_ARGS+= --disable-shared .include "../../mk/bsd.pkg.mk" diff --git a/devel/libstree/Makefile b/devel/libstree/Makefile index 6d6ac1da159..a1515670c6d 100644 --- a/devel/libstree/Makefile +++ b/devel/libstree/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:28 tv Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:05 rillig Exp $ # DISTNAME= libstree-0.4.0 @@ -11,6 +11,6 @@ HOMEPAGE= http://www.cl.cam.ac.uk/~cpk25/libstree/ COMMENT= Suffix tree library GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc/html +CONFIGURE_ARGS+= --with-html-dir=${PREFIX:Q}/share/doc/html .include "../../mk/bsd.pkg.mk" diff --git a/devel/libstroke/Makefile b/devel/libstroke/Makefile index a9035df98b4..6b0848c6900 100644 --- a/devel/libstroke/Makefile +++ b/devel/libstroke/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/06/01 18:02:44 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:05 rillig Exp $ # DISTNAME= libstroke-0.5.1 @@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= YES USE_LIBTOOL= YES -USE_TOOLS= gmake +USE_TOOLS+= gmake LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig diff --git a/devel/libusb/Makefile b/devel/libusb/Makefile index 0fb2f3df75d..0dbcf9856b0 100644 --- a/devel/libusb/Makefile +++ b/devel/libusb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/10/25 15:52:33 heinz Exp $ +# $NetBSD: Makefile,v 1.25 2005/12/05 20:50:05 rillig Exp $ DISTNAME= libusb-0.1.10a CATEGORIES= devel @@ -9,7 +9,7 @@ HOMEPAGE= http://libusb.sourceforge.net/ COMMENT= USB access library USE_LANGUAGES= c c++ -GCC_REQD= 3.3 +GCC_REQD+= 3.3 USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-build-docs diff --git a/devel/m4/Makefile b/devel/m4/Makefile index 50a8ed44b29..afca729db11 100644 --- a/devel/m4/Makefile +++ b/devel/m4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2005/10/25 13:14:32 wiz Exp $ +# $NetBSD: Makefile,v 1.36 2005/12/05 20:50:05 rillig Exp $ DISTNAME= m4-1.4.4 CATEGORIES= devel @@ -20,7 +20,7 @@ TEST_TARGET= check .if defined(GNU_PROGRAM_PREFIX) CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX} .endif -PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX} +PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q} BUILD_DEFS+= GNU_PROGRAM_PREFIX .if !defined(GNU_PROGRAM_PREFIX) || ${GNU_PROGRAM_PREFIX} != "g" diff --git a/devel/mantis/Makefile b/devel/mantis/Makefile index 9bbd11ac182..74087e7c5e6 100644 --- a/devel/mantis/Makefile +++ b/devel/mantis/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/11/03 09:50:56 adrianp Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:05 rillig Exp $ DISTNAME= mantis-1.0.0rc3 CATEGORIES= devel www @@ -37,7 +37,7 @@ CONF_FILES+= ${EGDIR}/mantis.conf ${PKG_SYSCONFDIR}/mantis.conf \ SPECIAL_PERMS= ${MANTIS_HOME}/config_inc.php ${APACHE_USER} ${SHAREGRP} 0400 MANTIS_EG= config_inc.php mantis.conf mantis_offline.php.sample -SUBST_CLASSES= conf +SUBST_CLASSES+= conf SUBST_STAGE.conf= pre-install SUBST_FILES.conf= mantis.conf SUBST_SED.conf= -e "s|@MANTIS_HOME@|${MANTIS_HOME}|g" diff --git a/devel/monotone-server/Makefile b/devel/monotone-server/Makefile index 745a04a8cc5..5627163c913 100644 --- a/devel/monotone-server/Makefile +++ b/devel/monotone-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/12/02 17:56:24 jmmv Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:05 rillig Exp $ # DISTNAME= monotone-server-0.24 @@ -46,8 +46,8 @@ SUBST_SED.vars+= -e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g' SUBST_SED.vars+= -e 's|@SH@|${SH}|g' SUBST_SED.vars+= -e 's|@VARBASE@|${VARBASE}|g' -FILES_SUBST+= MONOTONE_GROUP=${MONOTONE_GROUP} -FILES_SUBST+= MONOTONE_USER=${MONOTONE_USER} +FILES_SUBST+= MONOTONE_GROUP=${MONOTONE_GROUP:Q} +FILES_SUBST+= MONOTONE_USER=${MONOTONE_USER:Q} INSTALLATION_DIRS= sbin @@ -55,7 +55,6 @@ do-extract: .for f in branches.conf hooks.conf monotone-server-init.sh ${CP} ${FILESDIR}/${f} ${WRKSRC} .endfor -.undef f do-install: ${INSTALL_SCRIPT} ${WRKSRC}/monotone-server-init.sh \ diff --git a/devel/nasm/Makefile b/devel/nasm/Makefile index 26b1e092dcd..96178e92f20 100644 --- a/devel/nasm/Makefile +++ b/devel/nasm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/07/16 01:19:09 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2005/12/05 20:50:05 rillig Exp $ DISTNAME= nasm-0.98.39 PKGREVISION= 1 @@ -21,8 +21,8 @@ INFO_FILES= nasm.info BUILD_TARGET= everything INSTALL_TARGET= install_everything -MAKE_ENV+= PERL5="${PERL5}" \ - INSTALL_DATA_DIR="${INSTALL_DATA_DIR}" +MAKE_ENV+= PERL5=${PERL5:Q} \ + INSTALL_DATA_DIR=${INSTALL_DATA_DIR:Q} INSTALLATION_DIRS= bin info man/man1 share/doc/html diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile index 84a0d64c6f5..5cab7dbf203 100644 --- a/devel/ncurses/Makefile +++ b/devel/ncurses/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.67 2005/10/20 00:01:32 wiz Exp $ +# $NetBSD: Makefile,v 1.68 2005/12/05 20:50:05 rillig Exp $ DISTNAME= ncurses-${NC_VERS} NC_VERS= 5.5 @@ -39,7 +39,7 @@ PLIST_SUBST+= NOT_SUNOS="" TERMINFODIR= share/terminfo .endif -PLIST_SUBST+= TERMINFODIR="${TERMINFODIR}" +PLIST_SUBST+= TERMINFODIR=${TERMINFODIR:Q} CONFIGURE_ARGS+= --with-default-terminfo-dir=${PREFIX}/${TERMINFODIR} CONFIGURE_ARGS+= --with-terminfo-dirs=${PREFIX}/${TERMINFODIR} diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile index bd9d0104672..6aab3854386 100644 --- a/devel/nspr/Makefile +++ b/devel/nspr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/10/16 11:15:10 jmmv Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:05 rillig Exp $ DISTNAME= nspr-4.4.1 PKGREVISION= 2 @@ -16,9 +16,9 @@ GNU_CONFIGURE= YES CONFIGURE_ARGS+= --disable-debug -MAKE_ENV= DIST=${WRKSRC}/dist +MAKE_ENV+= DIST=${WRKSRC:Q}/dist CONFIGURE_SCRIPT= ../configure -CONFIGURE_ENV= LIBRUNPATH=${PREFIX}/lib/nspr +CONFIGURE_ENV+= LIBRUNPATH=${PREFIX:Q}/lib/nspr .include "../../mk/bsd.prefs.mk" @@ -29,7 +29,7 @@ SO_SUFFIX= dylib .else SO_SUFFIX= so.1.0 .endif -PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX} +PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX:Q} INSTALLATION_DIRS= bin diff --git a/devel/nss/Makefile b/devel/nss/Makefile index 389393f22af..2c071ebdd6a 100644 --- a/devel/nss/Makefile +++ b/devel/nss/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/10/16 11:15:10 jmmv Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:06 rillig Exp $ DISTNAME= nss-3.9.2 PKGREVISION= 3 @@ -24,7 +24,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/mozilla/security/nss USE_TOOLS+= gmake perl DIST= ${WRKSRC}/../../dist BUILD_TARGET= nss_build_all -MAKE_ENV= LD_LIBS="-L${BUILDLINK_PREFIX.nspr}/lib/nspr ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.nspr}/lib/nspr ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib/nss" +MAKE_ENV+= LD_LIBS="-L${BUILDLINK_PREFIX.nspr}/lib/nspr ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.nspr}/lib/nspr ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib/nss" MAKE_ENV+= LIBRUNPATH=${PREFIX}/lib BUILD_OPT=1 .include "../../mk/bsd.prefs.mk" @@ -36,7 +36,7 @@ SO_SUFFIX= dylib .else SO_SUFFIX= so.1.0 .endif -PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX} +PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX:Q} .if ${OPSYS} == "SunOS" && ${PKGSRC_COMPILER} == "gcc" MAKEFLAGS+= NS_USE_GCC=YES diff --git a/devel/p4-docs/Makefile b/devel/p4-docs/Makefile index 501d2a85a3f..916a4c23dd2 100644 --- a/devel/p4-docs/Makefile +++ b/devel/p4-docs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/06/16 06:57:47 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:06 rillig Exp $ # DISTNAME= p4-docs @@ -40,8 +40,8 @@ EXTRACT_CMD.zip= ${LOCALBASE}/bin/unzip -Laq $${extract_file} \ DOCDIR= share/doc/p4 HTMLDIR= share/doc/html/p4 -PLIST_SUBST+= DOCDIR=${DOCDIR} -PLIST_SUBST+= HTMLDIR=${HTMLDIR} +PLIST_SUBST+= DOCDIR=${DOCDIR:Q} +PLIST_SUBST+= HTMLDIR=${HTMLDIR:Q} INSTALLATION_DIRS= man/man1 diff --git a/devel/p5-Devel-SmallProf/Makefile b/devel/p5-Devel-SmallProf/Makefile index 69b23d18160..787d98d1572 100644 --- a/devel/p5-Devel-SmallProf/Makefile +++ b/devel/p5-Devel-SmallProf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/08/06 06:19:10 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:06 rillig Exp $ # DISTNAME= Devel-SmallProf-1.15 @@ -12,7 +12,7 @@ MAINTAINER= bad@NetBSD.org HOMEPAGE= http://search.cpan.org/~salva/Devel-SmallProf-1.15/ COMMENT= Perl5 module for line-by-line profiling perl programs -DEPENDS= p5-Time-HiRes>=1.20:../../time/p5-Time-HiRes +DEPENDS+= p5-Time-HiRes>=1.20:../../time/p5-Time-HiRes PKG_INSTALLATION_TYPES= overwrite pkgviews diff --git a/devel/p5-File-chdir/Makefile b/devel/p5-File-chdir/Makefile index 965e582f196..3cbb6daf60f 100644 --- a/devel/p5-File-chdir/Makefile +++ b/devel/p5-File-chdir/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/10/22 16:47:39 sommerfeld Exp $ +# $NetBSD: Makefile,v 1.2 2005/12/05 20:50:06 rillig Exp $ # DISTNAME= File-chdir-0.06 @@ -6,7 +6,7 @@ PKGNAME= p5-${DISTNAME} CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../../authors/id/M/MS/MSCHWERN/} -MAINTAINER= sommerfeld@netbsd.org +MAINTAINER= sommerfeld@NetBSD.org HOMEPAGE= http://search.cpan.org/dist/File-chdir/ COMMENT= Perl module with a more sensible way to change directories diff --git a/devel/p5-IO-Pager/Makefile b/devel/p5-IO-Pager/Makefile index bda1885c3eb..a9d0c0bef40 100644 --- a/devel/p5-IO-Pager/Makefile +++ b/devel/p5-IO-Pager/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/10/22 16:45:32 sommerfeld Exp $ +# $NetBSD: Makefile,v 1.2 2005/12/05 20:50:06 rillig Exp $ # DISTNAME= IO-Pager-0.06 @@ -7,7 +7,7 @@ CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../../authors/id/J/JP/JPIERCE/} EXTRACT_SUFX= .tgz -MAINTAINER= sommerfeld@netbsd.org +MAINTAINER= sommerfeld@NetBSD.org HOMEPAGE= http://search.cpan.org/dist/IO-Pager-0.06/ COMMENT= Perl module for paged I/O to the terminal diff --git a/devel/pango/Makefile b/devel/pango/Makefile index 13de19642a8..bc9fce32935 100644 --- a/devel/pango/Makefile +++ b/devel/pango/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.63 2005/11/30 18:09:40 wiz Exp $ +# $NetBSD: Makefile,v 1.64 2005/12/05 20:50:06 rillig Exp $ # DISTNAME= pango-1.10.2 @@ -39,7 +39,7 @@ CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc CONFIGURE_ARGS+= --with-qt=no # Avoid an ICE in gcc2 on sparc64 -CONFIGURE_ENV+= F77=${FALSE} +CONFIGURE_ENV+= F77=${FALSE:Q} BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8 BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0 diff --git a/devel/papaya/Makefile b/devel/papaya/Makefile index 365226f23b7..bf878e80107 100644 --- a/devel/papaya/Makefile +++ b/devel/papaya/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/07/16 01:19:09 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:06 rillig Exp $ # DISTNAME= papaya-0.1.7 @@ -17,8 +17,8 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_LANGUAGES= # empty GNU_CONFIGURE= YES -CONFIGURE_ENV+= sh_command=${TOOLS_SH} -CONFIGURE_ENV+= tar_command=${TOOLS_TAR} +CONFIGURE_ENV+= sh_command=${TOOLS_SH:Q} +CONFIGURE_ENV+= tar_command=${TOOLS_TAR:Q} USE_TOOLS+= sh perl:run tar INFO_FILES= papaya.info diff --git a/devel/patch/Makefile b/devel/patch/Makefile index 56fc6a3b39f..d2faadd6c4c 100644 --- a/devel/patch/Makefile +++ b/devel/patch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/05/22 19:11:12 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2005/12/05 20:50:06 rillig Exp $ # DISTNAME= patch-2.5.4 @@ -27,7 +27,7 @@ GNU_CONFIGURE= yes .if defined(GNU_PROGRAM_PREFIX) CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX} .endif -PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX} +PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q} BUILD_DEFS+= GNU_PROGRAM_PREFIX .if !defined(GNU_PROGRAM_PREFIX) || ${GNU_PROGRAM_PREFIX} != "g" diff --git a/devel/pccts/Makefile b/devel/pccts/Makefile index d909ffe85b5..bea22d85e1b 100644 --- a/devel/pccts/Makefile +++ b/devel/pccts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/04/11 21:45:36 tv Exp $ +# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:06 rillig Exp $ # DISTNAME= pccts133mr22 @@ -14,7 +14,7 @@ COMMENT= Purdue Compiler Construction Tool Set PKG_INSTALLATION_TYPES= overwrite pkgviews WRKSRC= ${WRKDIR}/pccts -DIST_SUBDIR= ${PKGNAME} +DIST_SUBDIR= ${PKGNAME_NOREV} MAKEFILE= makefile BUILD_TARGET= diff --git a/devel/pcl-cvs/Makefile b/devel/pcl-cvs/Makefile index 69964fade2d..408f1d6d5bf 100644 --- a/devel/pcl-cvs/Makefile +++ b/devel/pcl-cvs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/08/28 04:25:29 uebayasi Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:06 rillig Exp $ # DISTNAME= pcl-cvs-2.9.9 @@ -20,7 +20,7 @@ EMACS_VERSIONS_ACCEPTED= emacs20 .include "../../mk/emacs.mk" -MAKE_ENV+= PREFIX=${PREFIX} +MAKE_ENV+= PREFIX=${PREFIX:Q} BUILD_TARGET= default INFO_FILES= pcl-cvs.info MESSAGE_SUBST+= EMACS_LISPPREFIX=${EMACS_LISPPREFIX:Q} diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile index c9598e77980..af1d8eac023 100644 --- a/devel/pcre/Makefile +++ b/devel/pcre/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/10/14 09:37:46 adam Exp $ +# $NetBSD: Makefile,v 1.28 2005/12/05 20:50:06 rillig Exp $ DISTNAME= pcre-6.4 PKGREVISION= 1 @@ -25,6 +25,6 @@ TEST_TARGET= test # Avoid an ICE in gcc2 on sparc64 # use CONFIGURE_ARGS instead of the usual CONFIGURE_ENV as the latter just # won't work with -this- configure -CONFIGURE_ARGS+= F77=${FALSE} +CONFIGURE_ARGS+= F77=${FALSE:Q} .include "../../mk/bsd.pkg.mk" diff --git a/devel/pedisassem/Makefile b/devel/pedisassem/Makefile index ad011fd1ba8..79d70ba2c35 100644 --- a/devel/pedisassem/Makefile +++ b/devel/pedisassem/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/04/30 17:13:21 minskim Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:06 rillig Exp $ DISTNAME= dsasmsrc PKGNAME= pedisassem-0.23 @@ -17,7 +17,7 @@ WRKSRC= ${WRKDIR} # LP64 problems NOT_FOR_PLATFORM= *-*-alpha *-*-sparc64 *-*-x86_64 -MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} +MAKE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} INSTALLATION_DIRS= bin diff --git a/devel/php-gettext/Makefile b/devel/php-gettext/Makefile index 83e27ac2e3e..f2ea66a8d7d 100644 --- a/devel/php-gettext/Makefile +++ b/devel/php-gettext/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:36 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:06 rillig Exp $ MODNAME= gettext CATEGORIES+= devel -PKGREVISION= # empty COMMENT= PHP extension for gettext support diff --git a/devel/php-gmp/Makefile b/devel/php-gmp/Makefile index 334f5abc480..85eefd14049 100644 --- a/devel/php-gmp/Makefile +++ b/devel/php-gmp/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:36 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:06 rillig Exp $ MODNAME= gmp CATEGORIES+= devel math -PKGREVISION= # empty COMMENT= PHP extension for arbitrary precision math diff --git a/devel/php-pcntl/Makefile b/devel/php-pcntl/Makefile index 657555f089f..a8c041241ed 100644 --- a/devel/php-pcntl/Makefile +++ b/devel/php-pcntl/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/05/23 21:45:21 jdolecek Exp $ +# $NetBSD: Makefile,v 1.2 2005/12/05 20:50:06 rillig Exp $ MODNAME= pcntl CATEGORIES+= devel -PKGREVISION= # empty COMMENT= PHP extension for Process Control functions diff --git a/devel/php-posix/Makefile b/devel/php-posix/Makefile index ae5e2461f82..f33ce8e9fc6 100644 --- a/devel/php-posix/Makefile +++ b/devel/php-posix/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:36 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:06 rillig Exp $ MODNAME= posix CATEGORIES+= devel -PKGREVISION= # empty COMMENT= PHP extension for POSIX-like functions diff --git a/devel/php-shmop/Makefile b/devel/php-shmop/Makefile index 780be86b076..f16bd394739 100644 --- a/devel/php-shmop/Makefile +++ b/devel/php-shmop/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:36 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:06 rillig Exp $ MODNAME= shmop CATEGORIES+= devel -PKGREVISION= # empty COMMENT= PHP extension for simple SysV shared memory operations diff --git a/devel/php-sysvsem/Makefile b/devel/php-sysvsem/Makefile index 2629ea20719..d23dc419c2e 100644 --- a/devel/php-sysvsem/Makefile +++ b/devel/php-sysvsem/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:36 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:06 rillig Exp $ MODNAME= sysvsem CATEGORIES+= devel -PKGREVISION= # empty COMMENT= PHP extension for SysV semaphore support diff --git a/devel/php-sysvshm/Makefile b/devel/php-sysvshm/Makefile index d558f76bb9c..a3ccca3d3b9 100644 --- a/devel/php-sysvshm/Makefile +++ b/devel/php-sysvshm/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:36 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:06 rillig Exp $ MODNAME= sysvshm CATEGORIES+= devel -PKGREVISION= # empty COMMENT= PHP extension for SysV shared memory support diff --git a/devel/pmccabe/Makefile b/devel/pmccabe/Makefile index 35d933e859e..00ab98c6e0d 100644 --- a/devel/pmccabe/Makefile +++ b/devel/pmccabe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/11/03 13:39:25 rillig Exp $ +# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:06 rillig Exp $ DISTNAME= pmccabe_2.2-3 PKGNAME= pmccabe-2.2.3 @@ -6,7 +6,6 @@ CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_DEBIAN:pool/main/p/pmccabe/} MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= COMMENT= Measures the McCabe cyclomatic complexity of C and C++ WRKSRC= ${WRKDIR}/pmccabe diff --git a/devel/prcs/Makefile b/devel/prcs/Makefile index 8c8e9c89fef..a92f39e489b 100644 --- a/devel/prcs/Makefile +++ b/devel/prcs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2005/06/24 17:53:22 kristerw Exp $ +# $NetBSD: Makefile,v 1.36 2005/12/05 20:50:07 rillig Exp $ DISTNAME= prcs-1.3.3 PKGREVISION= 2 @@ -14,11 +14,11 @@ CONFIGURE_ENV+= lispdir=${PREFIX}/share/examples/prcs INFO_FILES= prcs.info USE_LANGUAGES= c c++ CONFIGURE_ENV+= EMACS=no -CONFIGURE_ENV+= SYS_GDIFF_COMMAND_PATH="${TOOLS_DIFF}" -CONFIGURE_ENV+= SYS_TAR_COMMAND_PATH="${TOOLS_TAR}" -CONFIGURE_ENV+= SYS_LS_COMMAND_PATH="${TOOLS_LS}" +CONFIGURE_ENV+= SYS_GDIFF_COMMAND_PATH=${TOOLS_DIFF:Q} +CONFIGURE_ENV+= SYS_TAR_COMMAND_PATH=${TOOLS_TAR:Q} +CONFIGURE_ENV+= SYS_LS_COMMAND_PATH=${TOOLS_LS:Q} USE_TOOLS+= diff ls tar -GCC_REQD= 3.0 +GCC_REQD+= 3.0 .include "../../mk/bsd.pkg.mk" diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile index 0ec2404ba8e..3faf626ea8c 100644 --- a/devel/pwlib/Makefile +++ b/devel/pwlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2005/07/15 18:27:49 jlam Exp $ +# $NetBSD: Makefile,v 1.45 2005/12/05 20:50:07 rillig Exp $ DISTNAME= pwlib-v1_8_3-src PKGNAME= pwlib-1.8.3 @@ -11,7 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://sourceforge.net/projects/openh323/ COMMENT= Portable Windows Libary -BUILD_DEPENDS= bison-[0-9]*:../../devel/bison +BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison WRKSRC= ${WRKDIR}/pwlib USE_TOOLS+= gmake tar @@ -24,9 +24,9 @@ CONFIGURE_ARGS+= --disable-expat --disable-video --disable-qos PTHREAD_OPTS+= require BUILD_TARGET= opt -MAKE_ENV+= PWLIBDIR="${WRKSRC}" CC="${CC}" CPLUS="${CXX}" +MAKE_ENV+= PWLIBDIR=${WRKSRC:Q} CC=${CC:Q} CPLUS=${CXX:Q} -FILES_SUBST+= LIBTOOL="${LIBTOOL}" +FILES_SUBST+= LIBTOOL=${LIBTOOL:Q} FILES_SUBST+= PTHREADS_PREFIX="${BUILDLINK_PREFIX.pthread}" post-extract: diff --git a/devel/py-checker/Makefile b/devel/py-checker/Makefile index 02c40654806..6f4ee2731e4 100644 --- a/devel/py-checker/Makefile +++ b/devel/py-checker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/04/11 21:45:37 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:07 rillig Exp $ DISTNAME= pychecker-0.8.14 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -10,8 +10,8 @@ HOMEPAGE= http://pychecker.sourceforge.net/ COMMENT= Python code checker PYDISTUTILSPKG= # defined -PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX} -PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} +PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX:Q} +PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} .include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-curses/Makefile b/devel/py-curses/Makefile index 1f33463e168..423b0bdc60f 100644 --- a/devel/py-curses/Makefile +++ b/devel/py-curses/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/04/11 21:45:37 tv Exp $ +# $NetBSD: Makefile,v 1.28 2005/12/05 20:50:07 rillig Exp $ # PKGNAME= ${PYPKGPREFIX}-curses-0 @@ -20,7 +20,7 @@ PY_PATCHPLIST= yes PY_SETUP_SUBST= NCURSESPREFIX=${BUILDLINK_PREFIX.ncurses} -BUILDLINK_DEPENDS.python23= python23>=2.3nb2 +BUILDLINK_DEPENDS.python23+= python23>=2.3nb2 # ignore errors due to missing files (EXTRACT_ELEMENTS!) do-patch: diff --git a/devel/py-distutils/Makefile b/devel/py-distutils/Makefile index 26eba2ccffb..0fad2334afa 100644 --- a/devel/py-distutils/Makefile +++ b/devel/py-distutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/07/22 09:16:01 recht Exp $ +# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:07 rillig Exp $ # DISTNAME= Distutils-1.0.2 @@ -12,7 +12,7 @@ COMMENT= Distribution Utilities for Python PYTHON_VERSIONS_ACCEPTED= 15 PYSITELIB= lib/python1.5/site-packages -PLIST_SUBST+= PYSITELIB=${PYSITELIB} +PLIST_SUBST+= PYSITELIB=${PYSITELIB:Q} PYTHON_DISTUTILS_BOOTSTRAP= yes do-build: diff --git a/devel/py-expect/Makefile b/devel/py-expect/Makefile index e939c324f34..82e491534f4 100644 --- a/devel/py-expect/Makefile +++ b/devel/py-expect/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/05/31 22:44:23 rillig Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:07 rillig Exp $ # DISTNAME= ExpectPy-1.9b1 @@ -16,11 +16,11 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-python=${BUILDLINK_PREFIX.${PYPACKAGE}} \ --with-expect=${BUILDLINK_PREFIX.tcl-expect} \ --with-tcl --enable-shared -CONFIGURE_ENV+= PYTHON=${PYTHONBIN} +CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} CONFIGURE_ENV+= PYTH_CONFIGDIR=${BUILDLINK_PREFIX.${PYPACKAGE}}/${PYLIB}/config INSTALL_TARGET= installshared PY_PATCHPLIST= yes -PLIST_SUBST+= PYLIB=${PYLIB} PYPKGPREFIX=${PYPKGPREFIX} +PLIST_SUBST+= PYLIB=${PYLIB:Q} PYPKGPREFIX=${PYPKGPREFIX:Q} EXAMPLESDIR= ${PREFIX}/share/examples/${PYPKGPREFIX}-expect EXAMPLESFILES= ask.py glob.py ping.py telnet.py xping.py diff --git a/devel/py-idle/Makefile b/devel/py-idle/Makefile index f10b4000f80..0f3ed73de4a 100644 --- a/devel/py-idle/Makefile +++ b/devel/py-idle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/06/16 06:57:47 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2005/12/05 20:50:07 rillig Exp $ # PKGNAME= ${PYPKGPREFIX}-idle-0 @@ -11,7 +11,7 @@ COMMENT= IDLE - The Integrated DeveLopment Environment for Python PLIST_SRC= ${WRKDIR}/.PLIST_SRC PY_PATCHPLIST= yes -PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} +PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} # ignore errors due to missing files (EXTRACT_ELEMENTS!) do-patch: diff --git a/devel/py-kjbuckets/Makefile b/devel/py-kjbuckets/Makefile index 41f293799a1..97af085745d 100644 --- a/devel/py-kjbuckets/Makefile +++ b/devel/py-kjbuckets/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:37 tv Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:07 rillig Exp $ # DISTNAME= gadfly-1.0.0 @@ -17,7 +17,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/kjbuckets PYDISTUTILSPKG= yes PYBINMODULE= yes -PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX} +PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX:Q} KJBDOCDIR= ${PREFIX}/share/doc/${PYPKGPREFIX}-kjbuckets diff --git a/devel/py-pqueue/Makefile b/devel/py-pqueue/Makefile index 57f08392979..9b519cde26a 100644 --- a/devel/py-pqueue/Makefile +++ b/devel/py-pqueue/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/04/11 21:45:37 tv Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:07 rillig Exp $ # DISTNAME= PQueue-0.2 @@ -17,7 +17,7 @@ CONFIGURE_ARGS+= --with-python=${PYTHONBIN} BUILD_TARGET= default PY_PATCHPLIST= yes -PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX} +PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX:Q} PYQ_DOCDIR= ${PREFIX}/share/doc/${PYPKGPREFIX}-PQueue diff --git a/devel/py-subversion/Makefile b/devel/py-subversion/Makefile index 4f4a84f97b1..e5a96b0ed99 100644 --- a/devel/py-subversion/Makefile +++ b/devel/py-subversion/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/05/23 22:58:26 epg Exp $ +# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:07 rillig Exp $ PKGNAME= ${PYPKGPREFIX}-subversion-${SVNVER} COMMENT= Python bindings and tools for Subversion @@ -7,7 +7,7 @@ COMMENT= Python bindings and tools for Subversion SHLIBTOOL_OVERRIDE= libtool -CONFIGURE_ENV+= PYTHON2=${PYTHONBIN} +CONFIGURE_ENV+= PYTHON2=${PYTHONBIN:Q} PY_PATCHPLIST= YES PYBINMODULE= YES @@ -16,7 +16,7 @@ PYTHON_PATCH_SCRIPTS= tools/hook-scripts/mailer/mailer.py BUILD_TARGET= swig-py-lib swig-py INSTALL_TARGET= install-swig-py -MAKE_ENV+= EXTRA_CPPFLAGS="${BUILDLINK_CPPFLAGS}" +MAKE_ENV+= EXTRA_CPPFLAGS=${BUILDLINK_CPPFLAGS:Q} MAKE_FLAGS+= swig_pydir=${LOCALBASE}/${PYSITELIB}/libsvn \ swig_pydir_extra=${LOCALBASE}/${PYSITELIB}/svn diff --git a/devel/rcs/Makefile b/devel/rcs/Makefile index 049d0c78f80..c863785af74 100644 --- a/devel/rcs/Makefile +++ b/devel/rcs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/10/31 19:59:52 tv Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:07 rillig Exp $ # DISTNAME= rcs-5.7 @@ -12,12 +12,12 @@ COMMENT= GNU Revision Control System - version control software .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "SunOS" -DEPENDS= diffutils>=2.7:../../devel/diffutils +DEPENDS+= diffutils>=2.7:../../devel/diffutils CONFIGURE_ARGS+= --with-diffutils=gdiff .endif GNU_CONFIGURE= yes -CONFIGURE_ENV= PATH=${LOCALBASE}/bin:$$PATH +CONFIGURE_ENV+= PATH=${LOCALBASE}/bin:"$$PATH" CONFIGURE_HAS_MANDIR= no post-install: diff --git a/devel/rt3/Makefile.install b/devel/rt3/Makefile.install index 43edfb23796..efef8ad2957 100644 --- a/devel/rt3/Makefile.install +++ b/devel/rt3/Makefile.install @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.install,v 1.1.1.1 2004/08/03 15:33:50 cube Exp $ +# $NetBSD: Makefile.install,v 1.2 2005/12/05 20:50:07 rillig Exp $ RT_SHARE_DIR= ${PREFIX}/share/rt3 RT_EXAMPLE_DIR= ${PREFIX}/share/examples/rt3 @@ -40,7 +40,7 @@ ${ROOT_USER} ${RT_GROUP} 0500 INSTALL_EXTRA_TMPL+= ${PKGDIR}/INSTALL FILES_SUBST+= RTVARDIR=${RT_VAR_DIR:Q} RTLOCALDIR=${RT_LOCAL_DIR:Q} -FILES_SUBST+= WEBUSER=${APACHE_USER} WEBGROUP=${APACHE_GROUP} +FILES_SUBST+= WEBUSER=${APACHE_USER:Q} WEBGROUP=${APACHE_GROUP:Q} do-install: @${ECHO} "=> Configuration files" diff --git a/devel/ruby-mode/Makefile b/devel/ruby-mode/Makefile index 198642f90f5..daabf856d5b 100644 --- a/devel/ruby-mode/Makefile +++ b/devel/ruby-mode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/08/28 04:25:29 uebayasi Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:07 rillig Exp $ # DISTNAME= ${RUBY_DISTNAME} @@ -18,7 +18,7 @@ RUBY_NOVERSION= yes NO_CONFIGURE= yes SRCS= ruby-mode.el rubydb3x.el inf-ruby.el -PLIST_SUBST+= SITE_LISP=${SITE_LISP} +PLIST_SUBST+= SITE_LISP=${SITE_LISP:Q} do-build: for f in ${SRCS}; do \ diff --git a/devel/ruby-racc/raccversion.mk b/devel/ruby-racc/raccversion.mk index 5749bd8a77e..ff49bf00a2d 100644 --- a/devel/ruby-racc/raccversion.mk +++ b/devel/ruby-racc/raccversion.mk @@ -1,6 +1,6 @@ -# $NetBSD: raccversion.mk,v 1.1 2004/11/27 15:22:15 taca Exp $ -.ifndef _RUBY_RACCVERSION_MK +# $NetBSD: raccversion.mk,v 1.2 2005/12/05 20:50:07 rillig Exp $ +.if !defined(_RUBY_RACCVERSION_MK) _RUBY_RACCVERSION_MK= # defined .if ${RUBY_NAME} != "ruby${RUBY_VER_DEFAULT}" diff --git a/devel/ruby-subversion/Makefile b/devel/ruby-subversion/Makefile index f7fb8310a62..7786b5f4697 100644 --- a/devel/ruby-subversion/Makefile +++ b/devel/ruby-subversion/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/11/03 07:20:08 taca Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:07 rillig Exp $ PKGNAME= ${RUBY_PKGPREFIX}-subversion-${SVNVER} PKGREVISION= 1 @@ -9,7 +9,7 @@ COMMENT= Ruby bindings for Subversion USE_RUBY_DIST_SUBDIR= no REPLACE_RUBY_DIRS= ${WRKSRC}/tools -CONFIGURE_ENV+= RUBY=${RUBY} +CONFIGURE_ENV+= RUBY=${RUBY:Q} BUILD_TARGET= swig-rb-lib swig-rb INSTALL_TARGET= install-swig-rb diff --git a/devel/rx/Makefile b/devel/rx/Makefile index 9808b084905..e68c6a71293 100644 --- a/devel/rx/Makefile +++ b/devel/rx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/09/28 20:52:19 rillig Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:07 rillig Exp $ DISTNAME= rx-1.5 PKGREVISION= 1 @@ -21,7 +21,7 @@ INFO_FILES= rx.info # RX_MAJOR= 0 RX_MINOR= 0 -MAKE_ENV+= RX_MAJOR="${RX_MAJOR}" RX_MINOR="${RX_MINOR}" +MAKE_ENV+= RX_MAJOR=${RX_MAJOR:Q} RX_MINOR=${RX_MINOR:Q} post-install: cd ${WRKSRC}/doc; ${INSTALL_DATA} ${INFO_FILES} ${PREFIX}/info diff --git a/devel/sdcc/Makefile b/devel/sdcc/Makefile index fcefce2c434..3c59ba702d5 100644 --- a/devel/sdcc/Makefile +++ b/devel/sdcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2005/07/16 19:10:38 jlam Exp $ +# $NetBSD: Makefile,v 1.33 2005/12/05 20:50:07 rillig Exp $ DISTNAME= sdcc-2.4.0 PKGNAME= ${DISTNAME:S/-src//} @@ -28,7 +28,7 @@ CONFIGURE_ARGS+= --datadir=${PREFIX}/share/sdcc # needed for some arch's. -fdollars-in-identifiers is enabled # by default on some, not on others CPPFLAGS+= -fdollars-in-identifiers -CONFIGURE_ENV+= MACHINE_ARCH=${MACHINE_ARCH} +CONFIGURE_ENV+= MACHINE_ARCH=${MACHINE_ARCH:Q} CONFIGURE_ENV+= sdcc_cv_CCggdb="no" .include "../../mk/bsd.prefs.mk" diff --git a/devel/semantic/Makefile b/devel/semantic/Makefile index 62f4b27e705..e522296d642 100644 --- a/devel/semantic/Makefile +++ b/devel/semantic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/09/28 17:06:53 rillig Exp $ +# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:07 rillig Exp $ # DISTNAME= semantic-1.4.2 @@ -23,7 +23,7 @@ USE_TOOLS+= gmake INFO_FILES= semantic.info OTHER_INFO= semantic.info-1 semantic.info-2 -MAKE_ENV+= EMACS=${EMACS_FLAVOR} +MAKE_ENV+= EMACS=${EMACS_FLAVOR:Q} # XXX cd ${WRKSRC}; ${MAKE} -V semantic_LISP SRCS= semantic.el semantic-util.el semantic-bnf.el semantic-ctxt.el diff --git a/devel/sgi-stl-docs/Makefile b/devel/sgi-stl-docs/Makefile index 1b6ea769ecc..25cfae092f6 100644 --- a/devel/sgi-stl-docs/Makefile +++ b/devel/sgi-stl-docs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/09/28 20:52:20 rillig Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:08 rillig Exp $ DISTNAME= STL_doc PKGNAME= sgi-stl-docs-3.3 @@ -9,7 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.sgi.com/tech/stl/ COMMENT= SGI Standard Template Library Programmer's Guide -DIST_SUBDIR= ${PKGNAME} +DIST_SUBDIR= ${PKGNAME_NOREV} NO_CONFIGURE= yes NO_BUILD= yes diff --git a/devel/sgi-stl/Makefile b/devel/sgi-stl/Makefile index 1efe1fd691c..5d4370a9ad5 100644 --- a/devel/sgi-stl/Makefile +++ b/devel/sgi-stl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/09/28 20:52:19 rillig Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:07 rillig Exp $ DISTNAME= stl PKGNAME= sgi-stl-3.3 @@ -10,7 +10,7 @@ HOMEPAGE= http://www.sgi.com/tech/stl/ COMMENT= SGI Standard Template Library WRKSRC= ${WRKDIR} -DIST_SUBDIR= ${PKGNAME} +DIST_SUBDIR= ${PKGNAME_NOREV} NO_CONFIGURE= yes NO_BUILD= yes diff --git a/devel/silc-toolkit/Makefile b/devel/silc-toolkit/Makefile index 06e2edbf89b..10d8f275b3d 100644 --- a/devel/silc-toolkit/Makefile +++ b/devel/silc-toolkit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/09/17 03:39:41 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:08 rillig Exp $ # DISTNAME= silc-toolkit-0.9.13 @@ -34,7 +34,7 @@ CONFIGURE_ARGS+= --without-libtoolfix # XXX: Avoid an ICE in gcc2 on sparc64 # -CONFIGURE_ENV+= F77=${FALSE} +CONFIGURE_ENV+= F77=${FALSE:Q} # lib/silcclient/client_attrs.c causes an ICE with xlc on Darwin. NOT_FOR_COMPILER+= xlc diff --git a/devel/stlport/Makefile b/devel/stlport/Makefile index 574a06e9556..6073d228cda 100644 --- a/devel/stlport/Makefile +++ b/devel/stlport/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/09/28 20:52:20 rillig Exp $ +# $NetBSD: Makefile,v 1.26 2005/12/05 20:50:08 rillig Exp $ DISTNAME= STLport-4.6 PKGNAME= stlport-4.6 @@ -17,7 +17,7 @@ USE_LANGUAGES= c c++ NO_CONFIGURE= yes BUILD_DIRS= ${WRKSRC}/src -MAKE_ENV+= CXXFLAGS="${CXXFLAGS}" +MAKE_ENV+= CXXFLAGS=${CXXFLAGS:M*:Q} MAKEFILE= gcc-libtool.mak PTHREAD_OPTS+= require diff --git a/devel/subversion-base/Makefile b/devel/subversion-base/Makefile index 4b256c12599..1688f046fc9 100644 --- a/devel/subversion-base/Makefile +++ b/devel/subversion-base/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.27 2005/07/06 21:18:14 epg Exp $ +# $NetBSD: Makefile,v 1.28 2005/12/05 20:50:08 rillig Exp $ PKGNAME= subversion-base-${SVNVER} COMMENT= Version control system, base programs and libraries PKG_INSTALLATION_TYPES= overwrite pkgviews -.include "../subversion/Makefile.common" +.include "../../devel/subversion/Makefile.common" BUILD_USES_MSGFMT= yes @@ -26,7 +26,7 @@ PLIST_SRC= ${PKGDIR}/PLIST ${PKGDIR}/PLIST.bdb CONFIGURE_ARGS+= --without-berkeley-db .endif -SUBST_CLASSES= paths +SUBST_CLASSES+= paths SUBST_STAGE.paths= pre-configure SUBST_FILES.paths= contrib/cgi/tweak-log.cgi SUBST_SED.paths= -e "s|/usr/local/bin/|${PREFIX}/bin|g" @@ -55,6 +55,6 @@ post-install: # Use this target to update the build-outputs.mk hack for sub-packages. svn-build-outputs-hack: cd ${WRKSRC} && ./gen-make.py --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc - mv ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk + ${MV} ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk .include "../../mk/bsd.pkg.mk" diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common index 86f3b3fdac9..60dd91eb688 100644 --- a/devel/subversion/Makefile.common +++ b/devel/subversion/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.20 2005/05/23 22:58:26 epg Exp $ +# $NetBSD: Makefile.common,v 1.21 2005/12/05 20:50:08 rillig Exp $ DISTNAME= subversion-${SVNVER} CATEGORIES= devel @@ -27,6 +27,6 @@ CONFIGURE_ARGS+= --with-ssl MAKE_FLAGS+= SWIG_LIBSWIG_DIR=${BUILDLINK_DIR}/share/swig/1.3 -BUILDLINK_DEPENDS.subversion-base= subversion-base>=${SVNVER} +BUILDLINK_DEPENDS.subversion-base+= subversion-base>=${SVNVER} .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/devel/swig-perl/Makefile b/devel/swig-perl/Makefile index 906398d511a..7f31e141cae 100644 --- a/devel/swig-perl/Makefile +++ b/devel/swig-perl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/08/06 06:19:18 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:08 rillig Exp $ PKGNAME= swig-perl-${SWIG_VERSION} PKGREVISION= 2 @@ -6,7 +6,7 @@ COMMENT= Simplified Wrapper and Interface Generator, Perl runtime PKG_INSTALLATION_TYPES= overwrite pkgviews -.include "../swig-build/Makefile.common" +.include "../../devel/swig-build/Makefile.common" CONFIGURE_ARGS+= --with-perl5=${PERL5} diff --git a/devel/swig-python/Makefile b/devel/swig-python/Makefile index c06b3605e1d..b6523b892e5 100644 --- a/devel/swig-python/Makefile +++ b/devel/swig-python/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2004/12/03 15:14:55 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:08 rillig Exp $ PKGNAME= swig-python-${SWIG_VERSION} PKGREVISION= 1 COMMENT= Simplified Wrapper and Interface Generator, Python runtime -.include "../swig-build/Makefile.common" +.include "../../devel/swig-build/Makefile.common" PYTHON_VERSIONS_INCOMPATIBLE= 21 21pth 20 15 diff --git a/devel/sysexits/distinfo b/devel/sysexits/distinfo deleted file mode 100644 index b73e480fcee..00000000000 --- a/devel/sysexits/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -$NetBSD: distinfo,v 1.1.1.1 2005/10/31 15:53:19 tv Exp $ - diff --git a/devel/tcllib/Makefile b/devel/tcllib/Makefile index fb299b0e678..beeb7ccf889 100644 --- a/devel/tcllib/Makefile +++ b/devel/tcllib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/04/11 21:45:39 tv Exp $ +# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:08 rillig Exp $ # DISTNAME= tcllib-1.7 @@ -13,7 +13,7 @@ COMMENT= Collection of utility modules for Tcl GNU_CONFIGURE= yes NO_BUILD= yes -SUBST_CLASSES= fix +SUBST_CLASSES+= fix SUBST_STAGE.fix= post-patch SUBST_FILES.fix= modules/doctools/mpformats/_html.tcl SUBST_SED.fix= -e "s,/usr/bin/wget -q -O,${FETCH_CMD} -V -o,g" diff --git a/devel/teem/Makefile b/devel/teem/Makefile index 866dabfd7bd..4f6645e625e 100644 --- a/devel/teem/Makefile +++ b/devel/teem/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/06/16 06:57:48 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:08 rillig Exp $ # DISTNAME= teem-1.8.0-src @@ -31,10 +31,10 @@ do-configure: .elif ${OPSYS} == "Linux" && ${MACHINE_ARCH} == "i386" TEEM_ARCH=linux.32 .else -PKG_FAIL_REASON="Support for this platform has not yet been added." +PKG_FAIL_REASON+= "Support for this platform has not yet been added." .endif -MAKE_ENV+= TEEM_ARCH=${TEEM_ARCH} \ +MAKE_ENV+= TEEM_ARCH=${TEEM_ARCH:Q} \ TEEM_PNG=1 TEEM_BZIP2=1 TEEM_ZLIB=1 TEEM_PTHREAD=1 \ TEEM_PNG_IPATH="-I${BUILDLINK_PREFIX.png}/include" \ TEEM_PNG_LPATH="-L${BUILDLINK_PREFIX.png}/lib" \ diff --git a/devel/tet3/Makefile b/devel/tet3/Makefile index ae0426a74c6..6101e934dcb 100644 --- a/devel/tet3/Makefile +++ b/devel/tet3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/07/16 19:10:38 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:08 rillig Exp $ DISTNAME= tet3.3h-unsup.src PKGNAME= tet3-3.3h @@ -33,10 +33,10 @@ post-install: .include "../../mk/pthread.buildlink3.mk" -PTHREAD_OPTS= native # only native threads make sense +PTHREAD_OPTS+= native # only native threads make sense .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "native" -PKG_SKIP_REASON= "Native threads are needed for this package" +PKG_SKIP_REASON+= "Native threads are needed for this package" .endif .include "../../mk/bsd.pkg.mk" diff --git a/devel/tla/Makefile b/devel/tla/Makefile index e109e973892..da0628d4b02 100644 --- a/devel/tla/Makefile +++ b/devel/tla/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/09/28 14:31:06 rillig Exp $ +# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:08 rillig Exp $ # DISTNAME= tla-1.3.3 @@ -37,7 +37,7 @@ post-install: # Install arch documentation. ${INSTALL_DATA_DIR} ${DOCDIR} cd ${WRKDIR}/${DISTNAME}/src/docs-tla && \ - find . \( -name \*.css -or -name \*.html \ + ${FIND} . \( -name \*.css -or -name \*.html \ -or -name \*.txt \) -print \ | ${PAX} -rwppm ${DOCDIR} ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCDIR} diff --git a/devel/tvision/Makefile b/devel/tvision/Makefile index bd5341d346c..3712c0cea65 100644 --- a/devel/tvision/Makefile +++ b/devel/tvision/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/04/11 21:45:39 tv Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:08 rillig Exp $ # DISTNAME= tvision-0.8 @@ -15,7 +15,7 @@ COMMENT= Turbo Vision C++ CUI library for UNIX GNU_CONFIGURE= YES USE_LIBTOOL= YES -GCC_REQD= 3.0 +GCC_REQD+= 3.0 .include "../../devel/ncurses/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ucl/Makefile b/devel/ucl/Makefile index b980b2d93c2..b3e19e5dfa3 100644 --- a/devel/ucl/Makefile +++ b/devel/ucl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/06/24 10:55:20 kristerw Exp $ +# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:08 rillig Exp $ # DISTNAME= ucl-1.02 @@ -17,10 +17,10 @@ GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-shared=yes # Avoid an ICE in gcc2 on sparc64 -CONFIGURE_ENV+= F77=${FALSE} +CONFIGURE_ENV+= F77=${FALSE:Q} # Avoid path to build directory in example Makefile -SUBST_CLASSES= example +SUBST_CLASSES+= example SUBST_STAGE.example= post-patch SUBST_FILES.example= examples/Makefile.in SUBST_SED.example= -e "s|@MAKEINFO@||g" diff --git a/devel/unidiff/Makefile b/devel/unidiff/Makefile index 6de1ffb705d..ac435b62f53 100644 --- a/devel/unidiff/Makefile +++ b/devel/unidiff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/06/16 06:57:48 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:09 rillig Exp $ # DISTNAME= part01 @@ -12,7 +12,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= # COMMENT= Converts between uni-diffs and context diffs -BUILD_DEPENDS= gsharutils>=4.2.1:../../archivers/gsharutils +BUILD_DEPENDS+= gsharutils>=4.2.1:../../archivers/gsharutils WRKSRC= ${WRKDIR} EXTRACT_CMD= zcat ${DOWNLOADED_DISTFILE} | ${PREFIX}/bin/gunshar diff --git a/devel/w32api/Makefile b/devel/w32api/Makefile index 4a3f7a121c1..e9fa4f4967f 100644 --- a/devel/w32api/Makefile +++ b/devel/w32api/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2004/05/24 00:12:21 kristerw Exp $ +# $NetBSD: Makefile,v 1.22 2005/12/05 20:50:09 rillig Exp $ DISTNAME= w32api-2.5-src PKGNAME= w32api-2.5 @@ -19,7 +19,7 @@ PE_CC= ${CROSSBASE}/bin/i386-netbsdpe-cc -I${WRKSRC}/include PE_AR= ${CROSSBASE}/bin/i386-netbsdpe-ar CRTWRKSRC= ${WRKDIR}/pe-crt-1.2.1 PE_CPPFLAGS+= -I${WRKSRC}/include -MAKE_FLAGS+= PE_CPPFLAGS="${PE_CPPFLAGS}" +MAKE_FLAGS+= PE_CPPFLAGS=${PE_CPPFLAGS:Q} USE_PKGINSTALL= yes DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL |