diff options
Diffstat (limited to 'net')
128 files changed, 320 insertions, 318 deletions
diff --git a/net/adns/Makefile b/net/adns/Makefile index 7ea2e99977b..43393e265fb 100644 --- a/net/adns/Makefile +++ b/net/adns/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/05/22 20:08:23 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:44 rillig Exp $ # DISTNAME= adns-1.1 @@ -14,6 +14,6 @@ USE_TOOLS+= gmake USE_LIBTOOL= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS= --disable-dynamic +CONFIGURE_ARGS+= --disable-dynamic .include "../../mk/bsd.pkg.mk" diff --git a/net/airport2basestationconfig/Makefile b/net/airport2basestationconfig/Makefile index 995ae6ebbb8..aa1ebd48dc7 100644 --- a/net/airport2basestationconfig/Makefile +++ b/net/airport2basestationconfig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/11/04 19:00:19 rillig Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:44 rillig Exp $ DISTNAME= configurator_201 PKGNAME= ${BINNAME}-2.0.1 @@ -10,7 +10,7 @@ MAINTAINER= markd@NetBSD.org HOMEPAGE= http://edge.mcs.drexel.edu/GICL/people/sevy/airport/ COMMENT= Configuration program for Apple's Airport Base Station -PLIST_SUBST+= BINNAME=${BINNAME} JARNAME=${JARNAME} +PLIST_SUBST+= BINNAME=${BINNAME:Q} JARNAME=${JARNAME:Q} ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-powerpc Darwin-*-* diff --git a/net/airportbasestationconfig/Makefile b/net/airportbasestationconfig/Makefile index 08b5e5201b5..54d5669a379 100644 --- a/net/airportbasestationconfig/Makefile +++ b/net/airportbasestationconfig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2005/11/04 19:00:19 rillig Exp $ +# $NetBSD: Makefile,v 1.29 2005/12/05 20:50:44 rillig Exp $ DISTNAME= configurator_152-128 PKGNAME= ${BINNAME}-1.5.2 @@ -11,7 +11,7 @@ MAINTAINER= tron@NetBSD.org HOMEPAGE= http://edge.mcs.drexel.edu/GICL/people/sevy/airport/ COMMENT= Configuration program for Apple's Airport Base Station -PLIST_SUBST+= BINNAME=${BINNAME} JARNAME=${JARNAME} +PLIST_SUBST+= BINNAME=${BINNAME:Q} JARNAME=${JARNAME:Q} ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-powerpc Darwin-*-* diff --git a/net/airportmodemutility/Makefile b/net/airportmodemutility/Makefile index 6e198a4a45f..23de09313db 100644 --- a/net/airportmodemutility/Makefile +++ b/net/airportmodemutility/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/11/04 19:00:19 rillig Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:44 rillig Exp $ DISTNAME= ${BINNAME}_20 PKGNAME= ${BINNAME}-2.0 @@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://edge.mcs.drexel.edu/GICL/people/sevy/airport/ COMMENT= Modem (dis)connection utility for Apple's Airport Base Station -PLIST_SUBST+= BINNAME=${BINNAME} JARNAME=${JARNAME} +PLIST_SUBST+= BINNAME=${BINNAME:Q} JARNAME=${JARNAME:Q} ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-powerpc Darwin-*-* diff --git a/net/arla/Makefile b/net/arla/Makefile index e2e96444027..6ab79be58d1 100644 --- a/net/arla/Makefile +++ b/net/arla/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2005/06/01 18:03:07 jlam Exp $ +# $NetBSD: Makefile,v 1.46 2005/12/05 20:50:44 rillig Exp $ DISTNAME= arla-0.38 PKGREVISION= 2 @@ -28,7 +28,7 @@ INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL . if exists(${BSDSRCDIR}/sys/lib/libkern/libkern.h) CONFIGURE_ARGS+= --with-sys=${BSDSRCDIR}/sys . else -PKG_FAIL_REASON= "${PKGNAME} requires kernel sources available under \$$BSDSRCDIR/sys (or //usr/src/sys)" +PKG_FAIL_REASON+= "${PKGNAME} requires kernel sources available under \$$BSDSRCDIR/sys (or //usr/src/sys)" . endif .endif @@ -41,8 +41,8 @@ CONFIGURE_ARGS+= --enable-shared=no #CONFIGURE_ENV+= KERNEL_CPPFLAGS="-DMULTIPROCESSOR -DDEBUG -DDIAGNOSTIC" MESSAGE_SUBST+= ARLA_CACHE=${ARLA_CACHE} -PLIST_SUBST+= ARLA_CACHE=${ARLA_CACHE} -FILES_SUBST+= ARLA_CACHE=${ARLA_CACHE} +PLIST_SUBST+= ARLA_CACHE=${ARLA_CACHE:Q} +FILES_SUBST+= ARLA_CACHE=${ARLA_CACHE:Q} EGDIR= ${PREFIX}/share/examples/arla RCD_SCRIPTS= arlad diff --git a/net/arpwatch/distinfo b/net/arpwatch/distinfo index 56a00e80a15..c1120e73696 100644 --- a/net/arpwatch/distinfo +++ b/net/arpwatch/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.8 2005/11/30 22:36:43 bouyer Exp $ +$NetBSD: distinfo,v 1.9 2005/12/05 20:50:44 rillig Exp $ SHA1 (arpwatch-2.1a13.tar.gz) = 03d98e239405529f97b742f04d2a9b837b5da43a RMD160 (arpwatch-2.1a13.tar.gz) = 80b89d36d9c20e9d0ac272ba7b66494d2888a557 Size (arpwatch-2.1a13.tar.gz) = 152779 bytes SHA1 (patch-aa) = 01d72e1342cdcf2c566a2c761743d4b71af5985c -SHA1 (patch-ab) = 06a51f7958a4afddac2820886566e89b1b261093 -SHA1 (patch-ac) = 87dfb675a2eaf3c65e1e28dfe647fded229e04e9 +SHA1 (patch-ab) = 73fb4cca476b58c3456f4d418779ae9aecfcf885 +SHA1 (patch-ac) = 0f89214364e5007f9929ad5a4449d4b11bd7dffe SHA1 (patch-ad) = 0292675b4b48656575ad4429c98e1187962a1bef -SHA1 (patch-ae) = 019f724d84054a775e6b81f93772831aea5e4db7 +SHA1 (patch-ae) = cb392c6bb2c10b261a759e7c7835dd959d34a047 diff --git a/net/arpwatch/patches/patch-ab b/net/arpwatch/patches/patch-ab index 15b2b9fe00c..28e5d7b454d 100644 --- a/net/arpwatch/patches/patch-ab +++ b/net/arpwatch/patches/patch-ab @@ -1,3 +1,5 @@ +$NetBSD: patch-ab,v 1.8 2005/12/05 20:50:44 rillig Exp $ + --- arpwatch.8.orig 2005-10-25 12:51:51.000000000 +0200 +++ arpwatch.8 2005-10-25 12:52:40.000000000 +0200 @@ -71,6 +71,12 @@ diff --git a/net/arpwatch/patches/patch-ac b/net/arpwatch/patches/patch-ac index 3bad1578533..6c97420f552 100644 --- a/net/arpwatch/patches/patch-ac +++ b/net/arpwatch/patches/patch-ac @@ -1,3 +1,5 @@ +$NetBSD: patch-ac,v 1.9 2005/12/05 20:50:44 rillig Exp $ + --- arpwatch.c.orig 2005-10-25 12:53:57.000000000 +0200 +++ arpwatch.c 2005-10-25 12:56:40.000000000 +0200 @@ -107,6 +107,8 @@ diff --git a/net/arpwatch/patches/patch-ae b/net/arpwatch/patches/patch-ae index e9449e7ea24..069eb464c54 100644 --- a/net/arpwatch/patches/patch-ae +++ b/net/arpwatch/patches/patch-ae @@ -1,3 +1,5 @@ +$NetBSD: patch-ae,v 1.5 2005/12/05 20:50:44 rillig Exp $ + --- report.c.orig 2000-10-01 01:41:10.000000000 +0200 +++ report.c 2005-10-25 13:07:21.000000000 +0200 @@ -70,6 +70,8 @@ diff --git a/net/batchftp/Makefile b/net/batchftp/Makefile index 509df5fd948..165f3f6a9a1 100644 --- a/net/batchftp/Makefile +++ b/net/batchftp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/11/08 15:51:52 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:44 rillig Exp $ DISTNAME= batchftp102 PKGNAME= batchftp-1.02 @@ -13,7 +13,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews WRKSRC= ${WRKDIR} CPPFLAGS.Interix+= -Dsetpgrp=setpgid -MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} +MAKE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} INSTALLATION_DIRS= bin diff --git a/net/bind8/Makefile b/net/bind8/Makefile index 3eedd822032..b98d517e5ff 100644 --- a/net/bind8/Makefile +++ b/net/bind8/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2005/11/04 19:36:01 rillig Exp $ +# $NetBSD: Makefile,v 1.33 2005/12/05 20:50:44 rillig Exp $ DISTNAME= bind-${BIND_VERSION} PKGREVISION= 1 @@ -25,7 +25,7 @@ BUILD_DIRS= src doc/man .if ${OPSYS} == "SunOS" MAKEFLAGS+= MANROFF=cat -MAKEFLAGS+= INSTALL=${INSTALL} +MAKEFLAGS+= INSTALL=${INSTALL:Q} OWN_DIRS_PERMS= ${PKG_SYSCONFDIR}/ndc.d root other 700 .endif diff --git a/net/bind9/Makefile b/net/bind9/Makefile index fb4e20cbf8d..928638ba5ee 100644 --- a/net/bind9/Makefile +++ b/net/bind9/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.72 2005/08/23 11:48:50 rillig Exp $ +# $NetBSD: Makefile,v 1.73 2005/12/05 20:50:44 rillig Exp $ DISTNAME= bind-${BIND_VERSION} -PKGNAME= bind-${BIND_VERSION} CATEGORIES= net MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/ @@ -33,7 +32,7 @@ PKG_GROUPS= ${BIND_GROUP} PTHREAD_OPTS+= native -FILES_SUBST+= BIND_GROUP=${BIND_GROUP} BIND_USER=${BIND_USER} PAX=${PAX} +FILES_SUBST+= BIND_GROUP=${BIND_GROUP:Q} BIND_USER=${BIND_USER:Q} PAX=${PAX:Q} MESSAGE_SUBST+= BIND_DIR=${BIND_DIR} BIND_USER=${BIND_USER} # include/isc/ipv6.h is installed on non-ipv6 platforms .if defined(USE_INET6) && (${USE_INET6} == "YES") diff --git a/net/bing/Makefile b/net/bing/Makefile index 5ef62f2c1b9..8afbde119f5 100644 --- a/net/bing/Makefile +++ b/net/bing/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/03/24 21:12:58 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:44 rillig Exp $ DISTNAME= bing-1.0.4 CATEGORIES= net @@ -33,4 +33,3 @@ CXXFLAGS:= ${CXXFLAGS:C/-O[0-9]*//g} CFLAGS:= ${CFLAGS:C/-O[0-9]*//g} . endif .endif - diff --git a/net/boinc3-seti/Makefile b/net/boinc3-seti/Makefile index 17b29bd9733..0f180053b4a 100644 --- a/net/boinc3-seti/Makefile +++ b/net/boinc3-seti/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:23 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:44 rillig Exp $ # DISTNAME= seti_boinc-client-cvs-2004-07-15 @@ -21,7 +21,7 @@ USE_TOOLS+= gmake CLIENTBINNAME= setiathome-3.10.${MACHINE_GNU_PLATFORM} CLIENTVERSION= 310 -PLIST_SUBST+= CLIENTBINNAME=${CLIENTBINNAME} +PLIST_SUBST+= CLIENTBINNAME=${CLIENTBINNAME:Q} APPINFO_SED= -e "s|@CLIENTBINNAME@|${CLIENTBINNAME}|g" APPINFO_SED+= -e "s|@CLIENTVERSION@|${CLIENTVERSION}|g" diff --git a/net/chrony/Makefile b/net/chrony/Makefile index cc78ae8c350..6af527bb98c 100644 --- a/net/chrony/Makefile +++ b/net/chrony/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/06/17 04:49:47 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:44 rillig Exp $ DISTNAME= chrony-1.20 PKGREVISION= 1 @@ -18,9 +18,9 @@ EGDIR= ${PREFIX}/share/examples/chrony EGFILES= chrony.conf.example chrony.keys.example RCD_SCRIPTS= chronyd -MAKE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" -MAKE_ENV+= INSTALL_DATA="${INSTALL_DATA}" -MAKE_ENV+= INSTALL_MAN="${INSTALL_MAN}" +MAKE_ENV+= INSTALL_PROGRAM=${INSTALL_PROGRAM:Q} +MAKE_ENV+= INSTALL_DATA=${INSTALL_DATA:Q} +MAKE_ENV+= INSTALL_MAN=${INSTALL_MAN:Q} pre-install: for file in ${EGFILES}; do \ diff --git a/net/cidr/Makefile b/net/cidr/Makefile index 53d26e71394..8a6ec6248f1 100644 --- a/net/cidr/Makefile +++ b/net/cidr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/10/12 07:10:57 seb Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:44 rillig Exp $ # DISTNAME= cidr-current @@ -13,6 +13,6 @@ COMMENT= RFC 1878 subnet calculator / helper WRKSRC= ${WRKDIR}/cidr-2.3 LIBS.SunOS+= -lnsl -lsocket -MAKE_ENV+= LIBS="${LIBS}" +MAKE_ENV+= LIBS=${LIBS:M*:Q} .include "../../mk/bsd.pkg.mk" diff --git a/net/cisco-mibs/Makefile b/net/cisco-mibs/Makefile index 136ab5ef281..1f4b28a6784 100644 --- a/net/cisco-mibs/Makefile +++ b/net/cisco-mibs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/07/15 18:27:52 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:44 rillig Exp $ DISTNAME= cisco-mibs-20050210 CATEGORIES= net @@ -13,7 +13,7 @@ DISTFILES= v1.tar.gz \ # MAINTAINER= kim@tac.nyc.ny.us -COMMENT= Public SNMPv1 and SNMPv2 MIBs from Cisco. +COMMENT= Public SNMPv1 and SNMPv2 MIBs from Cisco WRKSRC= ${WRKDIR} DIST_SUBDIR= ${PKGBASE} diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile index 5df344fa8e9..f7fa29acefa 100644 --- a/net/citrix_ica/Makefile +++ b/net/citrix_ica/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/09/27 16:09:50 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2005/12/05 20:50:44 rillig Exp $ # # A default so lintpkgsrc is happy, overridden below @@ -35,7 +35,7 @@ PKGNAME= citrix_ica-7.00.77757 # see http://www.citrix.com/download/unix-downloads.htm .if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386" -DEPENDS= suse_x11>=6.4:../../emulators/${SUSE_DIR_PREFIX}_x11 +DEPENDS+= suse_x11>=6.4:../../emulators/${SUSE_DIR_PREFIX}_x11 .endif LICENSE= citrix_ica-license @@ -46,14 +46,14 @@ NO_SRC_ON_CDROM= ${RESTRICTED} NO_BIN_ON_CDROM= ${RESTRICTED} WRKSRC= ${WRKDIR} -DIST_SUBDIR= ${PKGNAME} +DIST_SUBDIR= ${PKGNAME_NOREV} CDIR= ${PREFIX}/lib/ICAClient BINDIR= ${PREFIX}/bin .if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "sparc" . if !exists(/emul/svr4/usr/lib/ld.so) -PKG_FAIL_REASON= "${PKGNAME} requires SVR4 compability - see compat_svr4(8)" +PKG_FAIL_REASON+= "${PKGNAME} requires SVR4 compability - see compat_svr4(8)" . endif .endif diff --git a/net/dc_gui2/distinfo b/net/dc_gui2/distinfo index 456bf7e0bde..9ffce71eb11 100644 --- a/net/dc_gui2/distinfo +++ b/net/dc_gui2/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.3 2005/02/24 12:13:45 agc Exp $ +$NetBSD: distinfo,v 1.4 2005/12/05 20:50:44 rillig Exp $ SHA1 (dc_gui2-0.75.tar.gz) = ac99b99e292d1646c8f87e5016762795e6f721b1 RMD160 (dc_gui2-0.75.tar.gz) = 7851bc5d0d8a941f622d9397c3fcfe7840f7f39e Size (dc_gui2-0.75.tar.gz) = 612248 bytes SHA1 (patch-aa) = ac14a12d740b030f068b9947f87fc4a29b84313a SHA1 (patch-ac) = 5a78d9f28de9b8df1d02c821b39ac14ec00e4622 -SHA1 (patch-af) = c680de415395ac112627e9b55ce5aabdf5f7ece4 +SHA1 (patch-af) = f867979e46a62611d2201a93e26deaf3c08b298e diff --git a/net/dc_gui2/patches/patch-af b/net/dc_gui2/patches/patch-af index efe83bab11e..dba8f853e5e 100644 --- a/net/dc_gui2/patches/patch-af +++ b/net/dc_gui2/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.2 2003/07/16 10:56:57 wiz Exp $ +$NetBSD: patch-af,v 1.3 2005/12/05 20:50:45 rillig Exp $ --- src/init_fnc.c.orig Wed Jul 9 18:20:53 2003 +++ src/init_fnc.c -@@ -35,7 +35,13 @@ $Id: init_fnc.c,v 1.13 2003/07/09 16:20: +@@ -35,7 +35,13 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/wait.h> diff --git a/net/dctc/distinfo b/net/dctc/distinfo index 99a9fd38d05..ace2cdcfbb1 100644 --- a/net/dctc/distinfo +++ b/net/dctc/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.15 2005/02/24 12:13:45 agc Exp $ +$NetBSD: distinfo,v 1.16 2005/12/05 20:50:45 rillig Exp $ SHA1 (dctc-0.85.4.tar.gz) = 8422f041ccd398fcabb032a6ece9f2f50d827bb7 RMD160 (dctc-0.85.4.tar.gz) = ded2d6e8f8de47c50ef689d0c49f6b3bcc2439f6 Size (dctc-0.85.4.tar.gz) = 493733 bytes SHA1 (patch-aa) = 62cae1e95c3422cb8b184cd8ee13989073b9fc06 SHA1 (patch-ab) = 4a28cc7d9e2a22c52ad319bbda0893d70fd000be -SHA1 (patch-ac) = 0f9070bc9ce04caaad8612d075d3b5dfcb5523f5 -SHA1 (patch-ad) = 09466a9fec9403bf3dc911a5af5f86050087159b +SHA1 (patch-ac) = 6f73d5b954bc69c7b83e25411ae3819101c5d4e3 +SHA1 (patch-ad) = ce699efbc6d009146a909e2ffac83435fdb2932e SHA1 (patch-ae) = d53881200e85a4ebcb62b37d8acbe5ab8bddabae diff --git a/net/dctc/patches/patch-ac b/net/dctc/patches/patch-ac index c430b3db582..a6a2cba0c80 100644 --- a/net/dctc/patches/patch-ac +++ b/net/dctc/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.5 2003/07/15 19:46:15 wiz Exp $ +$NetBSD: patch-ac,v 1.6 2005/12/05 20:50:45 rillig Exp $ --- src/keyboard_master.c.orig Sun Jun 22 10:40:35 2003 +++ src/keyboard_master.c -@@ -39,7 +40,6 @@ $Id: keyboard_master.c,v 1.1 2003/06/22 +@@ -39,7 +40,6 @@ #include <openssl/md4.h> #include <glib.h> @@ -10,7 +10,7 @@ $NetBSD: patch-ac,v 1.5 2003/07/15 19:46:15 wiz Exp $ #if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) /* union semun is defined by including <sys/sem.h> */ #else -@@ -51,7 +51,6 @@ $Id: keyboard_master.c,v 1.1 2003/06/22 +@@ -51,7 +51,6 @@ struct seminfo *__buf; /* buffer for IPC_INFO */ }; #endif diff --git a/net/dctc/patches/patch-ad b/net/dctc/patches/patch-ad index 697a436daed..3f1d72a8afd 100644 --- a/net/dctc/patches/patch-ad +++ b/net/dctc/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.3 2003/07/15 19:46:15 wiz Exp $ +$NetBSD: patch-ad,v 1.4 2005/12/05 20:50:45 rillig Exp $ --- src/mydb.h.orig Sat May 17 08:12:37 2003 +++ src/mydb.h -@@ -24,6 +24,9 @@ $Id: mydb.h,v 1.1.1.1 2003/05/17 06:12:3 +@@ -24,6 +24,9 @@ #ifndef __DB_H__ #define __DB_H__ diff --git a/net/delegate/Makefile b/net/delegate/Makefile index a1b2476b942..f9c463597b5 100644 --- a/net/delegate/Makefile +++ b/net/delegate/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2005/06/17 03:50:24 jlam Exp $ +# $NetBSD: Makefile,v 1.32 2005/12/05 20:50:45 rillig Exp $ DISTNAME= ${PKGNAME_NOREV:S/-//} PKGNAME= delegate-8.9.6 @@ -29,7 +29,7 @@ BUILD_DEFS+= DELEGATE_MANAGER DELEGATE_MANAGER?= root@localhost RCD_SCRIPTS= delegated -FILES_SUBST+= ADMIN="${DELEGATE_MANAGER}" +FILES_SUBST+= ADMIN=${DELEGATE_MANAGER:Q} OWN_DIRS_PERMS+=${VARBASE}/spool/delegate/cache ${ROOT_USER} ${ROOT_GROUP} 1777 OWN_DIRS_PERMS+=${VARBASE}/spool/delegate-nobody nobody nobody 755 diff --git a/net/djbdns-run/Makefile b/net/djbdns-run/Makefile index 1da9928ec36..6784fd2e173 100644 --- a/net/djbdns-run/Makefile +++ b/net/djbdns-run/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/09/28 20:52:24 rillig Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:45 rillig Exp $ # DISTNAME= djbdns-run-20050415 @@ -33,7 +33,7 @@ PKG_USERS+= dnscache:djbdns::dnscache PKG_USERS+= rbldns:djbdns::rbldns PKG_USERS+= tinydns:djbdns::tinydns RCD_SCRIPTS= axfrdns djbdns dnscache rbldns tinydns -FILES_SUBST+= PKGNAME=${PKGNAME} +FILES_SUBST+= PKGNAME=${PKGNAME:Q} INSTALLATION_DIRS= bin share/doc/djbdns-run diff --git a/net/driftnet/Makefile b/net/driftnet/Makefile index cd5f580f964..2e30cced54c 100644 --- a/net/driftnet/Makefile +++ b/net/driftnet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/06/17 03:50:24 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:45 rillig Exp $ # DISTNAME= driftnet-0.1.6 @@ -10,11 +10,11 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.ex-parrot.com/~chris/driftnet/ COMMENT= Real-time image sniffer -DEPENDS= mpg123-[0-9]*:../../audio/mpg123 +DEPENDS+= mpg123-[0-9]*:../../audio/mpg123 BUILD_TARGET= default -MAKE_ENV+= CAT="${CAT}" TRUE="${TRUE}" +MAKE_ENV+= CAT=${CAT:Q} TRUE=${TRUE:Q} INSTALLATION_DIRS= bin man/man1 diff --git a/net/ed2k-gtk-gui/Makefile b/net/ed2k-gtk-gui/Makefile index bda29b4e47f..f09bb7ab6d4 100644 --- a/net/ed2k-gtk-gui/Makefile +++ b/net/ed2k-gtk-gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/08/10 20:56:21 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:45 rillig Exp $ DISTNAME= ed2k-gtk-gui-0.6.3 PKGREVISION= 1 @@ -13,7 +13,7 @@ USE_TOOLS+= pkg-config USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes -CONFIGURE_ENV+= CONFIGURE_LDFLAGS=${LDFLAGS:Q} +CONFIGURE_ENV+= CONFIGURE_LDFLAGS=${LDFLAGS:M*:Q} SUBST_CLASSES+= shell SUBST_MESSAGE.shell= "Fixing hardcoded shell." diff --git a/net/entropy/Makefile b/net/entropy/Makefile index ade59409748..cfcfa35339b 100644 --- a/net/entropy/Makefile +++ b/net/entropy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/11/08 15:59:38 tv Exp $ +# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:45 rillig Exp $ # DISTNAME= entropy_rsa-${ENTROPY_VERSION} @@ -50,11 +50,11 @@ CONFIGURE_ARGS+= --with-tree CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} .include "../../mk/mysql.buildlink3.mk" .elif ${ENTROPY_STORE_TYPE} != "monolithic" -.error unknown ENTROPY_STORE_TYPE: ${ENTROPY_STORE_TYPE} +PKG_FAIL_REASON+= "unknown ENTROPY_STORE_TYPE: "${ENTROPY_STORE_TYPE:Q}"" .endif # maximum allowed peer connections (and child processes); default 64 -.ifdef ENTROPY_MAX_PEERS +.if defined(ENTROPY_MAX_PEERS) CONFIGURE_ARGS+= --enable-max-peers=${ENTROPY_MAX_PEERS} .endif diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile index 40ca5ccdd01..13a0ff9ef7e 100644 --- a/net/ethereal/Makefile +++ b/net/ethereal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.118 2005/11/01 20:09:50 frueauf Exp $ +# $NetBSD: Makefile,v 1.119 2005/12/05 20:50:45 rillig Exp $ DISTNAME= ethereal-0.10.13 PKGREVISION= 1 @@ -39,7 +39,7 @@ CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} CONFIGURE_ARGS+= --with-pcre=${BUILDLINK_PREFIX.pcre} CONFIGURE_ENV+= ac_cv_func_pcap_compile_nopcap=no -PTHREAD_OPTS= require +PTHREAD_OPTS+= require .include "../../mk/bsd.prefs.mk" diff --git a/net/ettercap/Makefile b/net/ettercap/Makefile index a5cf0ae9cb0..753f1164a1e 100644 --- a/net/ettercap/Makefile +++ b/net/ettercap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2005/11/19 14:28:50 rillig Exp $ +# $NetBSD: Makefile,v 1.39 2005/12/05 20:50:45 rillig Exp $ DISTNAME= ettercap-0.6.b PKGREVISION= 3 @@ -22,7 +22,7 @@ USE_NCURSES= # putwin() USE_OLD_DES_API= yes PTHREAD_OPTS+= require PTHREAD_AUTO_VARS= yes -MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH} +MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH:Q} BUILD_DIRS= . plugins INSTALL_DIRS= . plugins diff --git a/net/firewalk/Makefile b/net/firewalk/Makefile index 27a496eeb51..913151f236f 100644 --- a/net/firewalk/Makefile +++ b/net/firewalk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/09/23 20:06:26 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:45 rillig Exp $ DISTNAME= firewalk-5.0 CATEGORIES= net security @@ -15,7 +15,7 @@ CONFIGURE_ENV+= CFLAGS=-I${LOCALBASE}/include BUILDLINK_DEPENDS.libnet+= libnet-1.1.* -MAKE_ENV+= FIREWALK_LOC=${PREFIX} +MAKE_ENV+= FIREWALK_LOC=${PREFIX:Q} .include "../../devel/libnet11/buildlink3.mk" .include "../../net/libdnet/buildlink3.mk" diff --git a/net/freenet-tools/Makefile b/net/freenet-tools/Makefile index e87d3925b32..11f636b27e6 100644 --- a/net/freenet-tools/Makefile +++ b/net/freenet-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/10/23 21:45:57 rillig Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:45 rillig Exp $ # DISTNAME= ft-0.2.23 @@ -14,7 +14,7 @@ COMMENT= Freenet Tools, freesite manipulation tools for Freenet and Entropy USE_TOOLS+= gmake -MAKE_FLAGS+= CC=${CC:Q} LD=${CC:Q} CFLAGS=${CFLAGS:Q} LDFLAGS=${LDFLAGS:Q} +MAKE_FLAGS+= CC=${CC:Q} LD=${CC:Q} CFLAGS=${CFLAGS:M*:Q} LDFLAGS=${LDFLAGS:M*:Q} CFLAGS+= -DFT_BIN=\"${PREFIX}/bin\" INSTALLATION_DIRS= bin diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile index db34c094bdc..19a03ab463b 100644 --- a/net/freeradius/Makefile +++ b/net/freeradius/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2005/11/28 23:44:02 adrianp Exp $ +# $NetBSD: Makefile,v 1.38 2005/12/05 20:50:45 rillig Exp $ DISTNAME= freeradius-1.0.5 PKGREVISION= 2 @@ -18,8 +18,8 @@ GNU_CONFIGURE= YES USE_PKGINSTALL= YES LIBTOOLIZE_PLIST= NO PLIST_SRC= ${WRKDIR}/.PLIST_SRC -FILES_SUBST+= ROOT_USER=${ROOT_USER} -FILES_SUBST+= ROOT_GROUP=${ROOT_GROUP} +FILES_SUBST+= ROOT_USER=${ROOT_USER:Q} +FILES_SUBST+= ROOT_GROUP=${ROOT_GROUP:Q} USE_OLD_DES_API= YES BUILDLINK_DEPENDS.openssl+= openssl>=0.9.7 @@ -44,7 +44,7 @@ CONFIGURE_ARGS+= --without-rlm_sql_iodbc CONFIGURE_ARGS+= --without-rlm_sql_oracle CONFIGURE_ARGS+= --without-rlm_sql_unixodbc -SUBST_CLASSES= make +SUBST_CLASSES+= make SUBST_STAGE.make= post-patch SUBST_FILES.make= src/modules/rlm_ldap/Makefile.in \ src/modules/rlm_mschap/Makefile \ diff --git a/net/freewais-sf/Makefile b/net/freewais-sf/Makefile index 2a8c339caa8..f8d7942070d 100644 --- a/net/freewais-sf/Makefile +++ b/net/freewais-sf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/09/28 20:52:24 rillig Exp $ +# $NetBSD: Makefile,v 1.22 2005/12/05 20:50:45 rillig Exp $ # DISTNAME= freeWAIS-sf-2.2.12 @@ -17,11 +17,11 @@ USE_LIBTOOL= yes USE_TOOLS+= perl:run HAS_CONFIGURE= yes -CONFIGURE_ENV+= PREFIX=${PREFIX} +CONFIGURE_ENV+= PREFIX=${PREFIX:Q} CONFIGURE_SCRIPT= ./Configure CONFIGURE_ARGS+= -sde -Dprefix=${PREFIX} \ -Darchname=${MACHINE_ARCH}-${LOWER_OPSYS} -CONFIGURE_ENV+= PERL5="${PERL5}" +CONFIGURE_ENV+= PERL5=${PERL5:Q} INSTALL_TARGET= install install.man USE_MAKEINFO= YES diff --git a/net/freewais-sf/distinfo b/net/freewais-sf/distinfo index 6fbe25653ba..1cd10d08a1d 100644 --- a/net/freewais-sf/distinfo +++ b/net/freewais-sf/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2005/06/23 22:12:44 kristerw Exp $ +$NetBSD: distinfo,v 1.6 2005/12/05 20:50:45 rillig Exp $ SHA1 (freeWAIS-sf-2.2.12.tar.gz) = a18ec82b773e0114c3c2b15aa3fbeadc21b2cd47 RMD160 (freeWAIS-sf-2.2.12.tar.gz) = 3b25c10f0cb62d69ce7001affe53c18bfaf9cede @@ -29,4 +29,4 @@ SHA1 (patch-aw) = 00f267dd288dfcce627dbbb631cd388eae1a81af SHA1 (patch-ax) = 9934346f7d22c23d0682c316079bb4cdf01d77d7 SHA1 (patch-ay) = b699615b0a152136fc6be02c899a2a0d4ea6ced1 SHA1 (patch-az) = 8b608484a353c73e6e532bb4cb9f32a4270f1385 -SHA1 (patch-ba) = 55414bc530ef72426793014f09578bac1378cbb8 +SHA1 (patch-ba) = fc98fc590a86720f39fc77d650bfc985508b064b diff --git a/net/freewais-sf/patches/patch-ba b/net/freewais-sf/patches/patch-ba index 77ed44602c0..03aa8f68fd6 100644 --- a/net/freewais-sf/patches/patch-ba +++ b/net/freewais-sf/patches/patch-ba @@ -1,8 +1,8 @@ -$NetBSD: patch-ba,v 1.1 2004/03/09 11:24:04 seb Exp $ +$NetBSD: patch-ba,v 1.2 2005/12/05 20:50:45 rillig Exp $ --- server/waisserver.c.orig 1999-04-16 09:59:45.000000000 +0000 +++ server/waisserver.c -@@ -44,6 +44,9 @@ static char *PRCSid = "$Id: waisserver.c +@@ -44,6 +44,9 @@ #ifdef I_SYS_SELECT #include <sys/select.h> #endif diff --git a/net/ftpproxy/Makefile b/net/ftpproxy/Makefile index 1168bc4c8b8..d7c51ad4b6b 100644 --- a/net/ftpproxy/Makefile +++ b/net/ftpproxy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/06/17 03:50:25 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:45 rillig Exp $ # DISTNAME= ftpproxy-${VERSION} @@ -20,7 +20,7 @@ VERSION= 1.2.3 LIBS+= "-lsocket -lnsl" OSFLAG= -DSOLARIS .endif -MAKE_ENV+= OSFLAG=${OSFLAG} OSLIB=${LIBS} VERSION=${VERSION} +MAKE_ENV+= OSFLAG=${OSFLAG:Q} OSLIB=${LIBS:M*:Q} VERSION=${VERSION:Q} INSTALLATION_DIRS= libexec man/man8 diff --git a/net/gftp/Makefile.common b/net/gftp/Makefile.common index 365693852b6..990e3328af6 100644 --- a/net/gftp/Makefile.common +++ b/net/gftp/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.9 2005/04/11 21:46:46 tv Exp $ +# $NetBSD: Makefile.common,v 1.10 2005/12/05 20:50:46 rillig Exp $ DISTNAME= gftp-${VERSION} CATEGORIES= net @@ -15,7 +15,7 @@ USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes -PTHREAD_OPTS= require +PTHREAD_OPTS+= require CONFIGURE_ARGS+= --with-readline diff --git a/net/gkrellm-multiping/Makefile b/net/gkrellm-multiping/Makefile index dbeb1050083..0c11be48236 100644 --- a/net/gkrellm-multiping/Makefile +++ b/net/gkrellm-multiping/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:21 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:46 rillig Exp $ # DISTNAME= gkrellm-multiping-2.0.8 @@ -16,7 +16,7 @@ SPECIAL_PERMS+= ${PREFIX}/lib/gkrellm2/plugins/pinger ${SETUID_ROOT_PERMS} USE_TOOLS+= pkg-config -PTHREAD_OPTS= require +PTHREAD_OPTS+= require PTHREAD_AUTO_VARS= yes post-patch: diff --git a/net/gnet/Makefile b/net/gnet/Makefile index ddef1db46bf..5d03aa056c1 100644 --- a/net/gnet/Makefile +++ b/net/gnet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2005/08/10 20:56:22 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2005/12/05 20:50:46 rillig Exp $ # DISTNAME= gnet-2.0.7 @@ -14,7 +14,7 @@ USE_TOOLS+= pkg-config USE_LIBTOOL= YES PKGCONFIG_OVERRIDE= gnet-2.0.pc.in GNU_CONFIGURE= YES -CONFIGURE_ARGS= --enable-glib2 +CONFIGURE_ARGS+= --enable-glib2 CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc TEST_TARGET= check diff --git a/net/gnet1/Makefile b/net/gnet1/Makefile index a4aa1eec523..dac5638bc52 100644 --- a/net/gnet1/Makefile +++ b/net/gnet1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/08/10 20:56:22 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:46 rillig Exp $ # DISTNAME= gnet-1.1.8 @@ -17,7 +17,7 @@ USE_TOOLS+= pkg-config USE_LIBTOOL= YES PKGCONFIG_OVERRIDE= gnet.pc.in GNU_CONFIGURE= YES -CONFIGURE_ARGS= --enable-glib2 +CONFIGURE_ARGS+= --enable-glib2 TEST_TARGET= check .include "../../devel/glib2/buildlink3.mk" diff --git a/net/gnugk/Makefile b/net/gnugk/Makefile index d978b23ab2f..0aaf5562a3c 100644 --- a/net/gnugk/Makefile +++ b/net/gnugk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:24 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:46 rillig Exp $ DISTNAME= gnugk-2.2.0 PKGREVISION= 1 @@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.gnugk.org/ COMMENT= H.323 Gatekeeper -USE_TOOLS= gmake +USE_TOOLS+= gmake USE_PKGINSTALL= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= ac_cv_path_PTLIB_CONFIG=${PREFIX}/bin/ptlib-config @@ -18,7 +18,7 @@ CONFIGURE_ENV+= PWLIBDIR=${PREFIX}/share/pwlib CONFIGURE_ENV+= OPENH323DIR=${PREFIX}/share/openh323 CFLAGS+= -fexceptions -MAKE_ENV+= LIBTOOL="${LIBTOOL}" SYSLIBDIR="${PREFIX}/lib" +MAKE_ENV+= LIBTOOL=${LIBTOOL:Q} SYSLIBDIR="${PREFIX}/lib" PKG_SYSCONFSUBDIR= ${PKGBASE} EGDIR= ${PREFIX}/share/examples/${PKGBASE} diff --git a/net/gofish/Makefile b/net/gofish/Makefile index d926b20715b..8ea7c595f50 100644 --- a/net/gofish/Makefile +++ b/net/gofish/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/11/11 21:14:50 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:46 rillig Exp $ DISTNAME= gofish-1.1 PKGREVISION= 1 @@ -33,8 +33,8 @@ RCD_SCRIPTS= gopherd CONF_FILES= ${EGDIR}/gofish.conf ${PKG_SYSCONFDIR}/gofish.conf \ ${EGDIR}/gofish-www.conf ${PKG_SYSCONFDIR}/gofish-www.conf -FILES_SUBST+= RUNTIMEDIR=${RUNTIMEDIR} -FILES_SUBST+= PKG_USERS=${PKG_USERS} +FILES_SUBST+= RUNTIMEDIR=${RUNTIMEDIR:Q} +FILES_SUBST+= PKG_USERS=${PKG_USERS:Q} post-configure: ${MV} ${WRKSRC}/gofish.conf ${WRKSRC}/gofish.conf.orig diff --git a/net/gtk-gnutella/Makefile b/net/gtk-gnutella/Makefile index 54602aef180..3ebe4ccc7c2 100644 --- a/net/gtk-gnutella/Makefile +++ b/net/gtk-gnutella/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2005/09/27 12:57:06 adam Exp $ +# $NetBSD: Makefile,v 1.46 2005/12/05 20:50:46 rillig Exp $ DISTNAME= gtk-gnutella-0.95.4 CATEGORIES= net @@ -16,11 +16,11 @@ USE_TOOLS+= gmake HAS_CONFIGURE= yes CONFIGURE_SCRIPT= ./Configure CONFIGURE_ARGS+= -d -e -r -s \ - -D prefix="${PREFIX}" \ + -D prefix=${PREFIX:Q} \ -D privlib="${PREFIX}/share/gtk-gnutella" \ -D sysman="${PREFIX}/man" \ -D locale="${PREFIX}/${PKGLOCALEDIR}/locale" \ - -D cc="${CC}" \ + -D cc=${CC:Q} \ -D ccflags="${CFLAGS:Unone}" \ -D gtkversion=2 \ -D yacc="yacc" \ diff --git a/net/hesiod/Makefile b/net/hesiod/Makefile index e99dbd65b20..6f1090903c1 100644 --- a/net/hesiod/Makefile +++ b/net/hesiod/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/11/04 02:24:04 minskim Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:46 rillig Exp $ DISTNAME= hesiod-3.0.2 CATEGORIES= net @@ -10,7 +10,7 @@ COMMENT= Hesiod network database client and library .include "../../mk/bsd.prefs.mk" .if exists(/usr/include/hesiod.h) && !defined(USE_HESIOD) -PKG_SKIP_REASON= "${PKGNAME} is part of your ${OPSYS} distribution" +PKG_SKIP_REASON+= "${PKGNAME} is part of your ${OPSYS} distribution" .endif GNU_CONFIGURE= YES diff --git a/net/hobbitmon/Makefile b/net/hobbitmon/Makefile index 12bc288c8e1..8acb439c98c 100644 --- a/net/hobbitmon/Makefile +++ b/net/hobbitmon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/09/17 20:33:11 minskim Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:46 rillig Exp $ # DISTNAME= hobbit-4.0-beta6 @@ -46,21 +46,21 @@ CONFIGURE_ENV+= ENABLESSL=y CONFIGURE_ENV+= ENABLELDAP=y CONFIGURE_ENV+= ENABLELDAPSSL=y CONFIGURE_ENV+= BBHOSTNAME="" -CONFIGURE_ENV+= BBUSER=${BBUSER} -CONFIGURE_ENV+= BBTOPDIR=${BBTOPDIR} -CONFIGURE_ENV+= BBHOSTURL=${BBHOSTURL} -CONFIGURE_ENV+= CGIDIR=${CGIDIR} -CONFIGURE_ENV+= BBCGIURL=${BBCGIURL} -CONFIGURE_ENV+= HTTPDGID=${APACHE_GROUP} -CONFIGURE_ENV+= BBLOGDIR=${BBLOGDIR} -CONFIGURE_ENV+= BBHOSTIP=${BBHOSTIP} +CONFIGURE_ENV+= BBUSER=${BBUSER:Q} +CONFIGURE_ENV+= BBTOPDIR=${BBTOPDIR:Q} +CONFIGURE_ENV+= BBHOSTURL=${BBHOSTURL:Q} +CONFIGURE_ENV+= CGIDIR=${CGIDIR:Q} +CONFIGURE_ENV+= BBCGIURL=${BBCGIURL:Q} +CONFIGURE_ENV+= HTTPDGID=${APACHE_GROUP:Q} +CONFIGURE_ENV+= BBLOGDIR=${BBLOGDIR:Q} +CONFIGURE_ENV+= BBHOSTIP=${BBHOSTIP:Q} CONFIGURE_ENV+= MANROOT=${PREFIX}/man CONFIGURE_ENV+= BARS=all CONFIGURE_ENV+= USENEWHIST=y CONFIGURE_ENV+= PIXELCOUNT=560 -MAKE_ENV+= MAKE=${MAKE_PROGRAM} -MAKE_ENV+= PKGDIR=${PREFIX} +MAKE_ENV+= MAKE=${MAKE_PROGRAM:Q} +MAKE_ENV+= PKGDIR=${PREFIX:Q} do-install: cd ${WRKSRC} ; \ diff --git a/net/hping/Makefile b/net/hping/Makefile index 177a7eba38a..39069491be9 100644 --- a/net/hping/Makefile +++ b/net/hping/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/07/13 14:18:22 drochner Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:46 rillig Exp $ # DISTNAME= hping2.0.0-rc2 @@ -13,8 +13,8 @@ COMMENT= Traceroute and ping using TCP and UDP as well as ICMP WRKSRC= ${WRKDIR}/hping2-rc2 HAS_CONFIGURE= YES MANPATH= ${PREFIX}/man -CONFIGURE_ENV+= MANPATH="${MANPATH}" -NOT_FOR_PLATFORM= NetBSD-0.* NetBSD-1.[0-4]* +CONFIGURE_ENV+= MANPATH=${MANPATH:Q} +NOT_FOR_PLATFORM= NetBSD-0.*-* NetBSD-1.[0-4]*-* BINMODE= 4755 INSTALLATION_DIRS= man/man8 sbin diff --git a/net/iperf/Makefile b/net/iperf/Makefile index 92193a4edf1..6772bae479d 100644 --- a/net/iperf/Makefile +++ b/net/iperf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/10/07 20:29:52 markd Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:46 rillig Exp $ DISTNAME= iperf-2.0.2 CATEGORIES= net @@ -22,7 +22,7 @@ GNU_CONFIGURE= yes INSTALLATION_DIRS+= share/doc/html/${PKGBASE} -PTHREAD_OPTS= native optional +PTHREAD_OPTS+= native optional .include "../../mk/pthread.buildlink3.mk" post-install: diff --git a/net/ipw/Makefile b/net/ipw/Makefile index 0f247297138..cd6d808c1f6 100644 --- a/net/ipw/Makefile +++ b/net/ipw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/07/31 13:32:27 grant Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:46 rillig Exp $ # DISTNAME= ipw-3.3a @@ -15,7 +15,7 @@ WRKSRC= ${WRKDIR} INSTALLATION_DIRS= bin share/doc LIBS.SunOS+= -lnsl -lsocket -MAKE_ENV+= LIBS=${LIBS:Q} +MAKE_ENV+= LIBS=${LIBS:M*:Q} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ipw ${PREFIX}/bin diff --git a/net/ishell/Makefile b/net/ishell/Makefile index 2d532a37857..c159d32f0c7 100644 --- a/net/ishell/Makefile +++ b/net/ishell/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/07/31 13:33:42 grant Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:46 rillig Exp $ # DISTNAME= ish-v${VERSION} @@ -19,7 +19,7 @@ USE_TOOLS+= gmake NO_CONFIGURE= yes LIBS.SunOS+= -lnsl -lsocket -MAKE_ENV+= LIBS=${LIBS:Q} +MAKE_ENV+= LIBS=${LIBS:M*:Q} INSTALLATION_DIRS= bin sbin diff --git a/net/isic/Makefile b/net/isic/Makefile index d21226fbdf4..a1aa8f15d0a 100644 --- a/net/isic/Makefile +++ b/net/isic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/04/11 21:46:48 tv Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:46 rillig Exp $ # DISTNAME= isic-0.06 @@ -28,7 +28,7 @@ post-install: . if (${MACHINE_ARCH} == "alpha") CPPFLAGS:= ${CPPFLAGS:C/-O[0-9]*//g} CFLAGS:= ${CFLAGS:C/-O[0-9]*//g} -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" -CONFIGURE_ENV+= CFLAGS="${CFLAGS}" +CONFIGURE_ENV+= CPPFLAGS=${CPPFLAGS:M*:Q} +CONFIGURE_ENV+= CFLAGS=${CFLAGS:M*:Q} . endif .endif diff --git a/net/ja-samba/Makefile b/net/ja-samba/Makefile index ee97fae2853..cc2e46c8282 100644 --- a/net/ja-samba/Makefile +++ b/net/ja-samba/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2005/08/23 11:48:50 rillig Exp $ +# $NetBSD: Makefile,v 1.40 2005/12/05 20:50:46 rillig Exp $ DISTNAME= samba-${SAMBA_VERSION}-ja-${JA_VERSION} PKGNAME= ja-samba-${SAMBA_VERSION}.${JA_PKG_VERSION} @@ -34,12 +34,12 @@ SAMBA_PIDDIR?= ${SAMBA_VARDIR}/run SAMBA_PRIVATE?= ${SAMBA_ETCDIR}/private SAMBA_VARDIR?= ${VARBASE} -FILES_SUBST= SAMBA_ETCDIR=${SAMBA_ETCDIR} -FILES_SUBST+= SAMBA_LOCKDIR=${SAMBA_LOCKDIR} -FILES_SUBST+= SAMBA_LOGDIR=${SAMBA_LOGDIR} -FILES_SUBST+= SAMBA_PIDDIR=${SAMBA_PIDDIR} -FILES_SUBST+= SAMBA_PRIVATE=${SAMBA_PRIVATE} -FILES_SUBST+= SAMBA_VARDIR=${SAMBA_VARDIR} +FILES_SUBST+= SAMBA_ETCDIR=${SAMBA_ETCDIR:Q} +FILES_SUBST+= SAMBA_LOCKDIR=${SAMBA_LOCKDIR:Q} +FILES_SUBST+= SAMBA_LOGDIR=${SAMBA_LOGDIR:Q} +FILES_SUBST+= SAMBA_PIDDIR=${SAMBA_PIDDIR:Q} +FILES_SUBST+= SAMBA_PRIVATE=${SAMBA_PRIVATE:Q} +FILES_SUBST+= SAMBA_VARDIR=${SAMBA_VARDIR:Q} CONFIGURE_ARGS+= --with-configdir=${SAMBA_ETCDIR} CONFIGURE_ARGS+= --with-libdir=${SAMBA_LIBDIR} @@ -127,7 +127,7 @@ PKG_GROUPS= ${SAMBA_GROUP} PKG_USERS= ${SAMBA_USER}:${SAMBA_GROUP}::Samba\ pseudo-user BUILD_DEFS+= SAMBA_USER SAMBA_GROUP -MAKE_FLAGS= CFLAGS='-DGUEST_ACCOUNT=\"${SAMBA_USER:Q}\"' +MAKE_FLAGS+= CFLAGS='-DGUEST_ACCOUNT=\"${SAMBA_USER:Q}\"' INSTALL_LIBRARY= \ ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} diff --git a/net/kftpgrabber/Makefile b/net/kftpgrabber/Makefile index 108129c1206..8684fa15a38 100644 --- a/net/kftpgrabber/Makefile +++ b/net/kftpgrabber/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/10/08 10:55:05 markd Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:46 rillig Exp $ DISTNAME= kftpgrabber-0.6.0 CATEGORIES= net kde @@ -7,7 +7,7 @@ EXTRACT_SUFX= .tar.bz2 MAINTAINER= markd@NetBSD.org HOMEPAGE= http://kftpgrabber.sourceforge.net/ -COMMENT= graphical FTP client for KDE +COMMENT= Graphical FTP client for KDE BUILD_USES_MSGFMT= yes USE_LANGUAGES= c c++ diff --git a/net/kphone/Makefile b/net/kphone/Makefile index 9f3b177b087..b8f31ece58e 100644 --- a/net/kphone/Makefile +++ b/net/kphone/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/11/29 10:15:18 tron Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:46 rillig Exp $ DISTNAME= kphone-4.2 CATEGORIES= net comms @@ -14,7 +14,7 @@ WRKSRC= ${WRKDIR}/kphone USE_X11BASE= yes GNU_CONFIGURE= yes USE_TOOLS+= gmake -CONFIGURE_ENV+= QTDIR="${QTDIR}" +CONFIGURE_ENV+= QTDIR=${QTDIR:Q} PTHREAD_OPTS+= require PTHREAD_AUTO_VARS= yes diff --git a/net/kphone/distinfo b/net/kphone/distinfo index 8a75dc65d0a..94144403223 100644 --- a/net/kphone/distinfo +++ b/net/kphone/distinfo @@ -1,15 +1,15 @@ -$NetBSD: distinfo,v 1.8 2005/11/29 10:15:18 tron Exp $ +$NetBSD: distinfo,v 1.9 2005/12/05 20:50:46 rillig Exp $ SHA1 (kphone-4.2.tar.gz) = 10c7559b79fb13f42714008cd89a3981f66df2cf RMD160 (kphone-4.2.tar.gz) = 6176a97d19fe05741503f5b81dfd21e6130193e1 Size (kphone-4.2.tar.gz) = 287320 bytes SHA1 (patch-aa) = ecb31fdeeaf4cb2a5aafe50b5fe58b85375cfd65 SHA1 (patch-ab) = 6edbc28aeb485b8004b6258b04d50c0888c28a31 -SHA1 (patch-ac) = 7b58171b4cb7b56c6ee939a86f861744ee7b6673 -SHA1 (patch-ad) = e69160d4ff68420a473d1f8b64ef32e3b8cedc24 +SHA1 (patch-ac) = 9182af58e48cb20df9c353da2384f69c9ef71a85 +SHA1 (patch-ad) = ad4e7244e35dc0292e5afa7c9119aee02ce85052 SHA1 (patch-ae) = 9d92b2585f673c7275a153f41c72623ad08b0b78 -SHA1 (patch-af) = 6bd63111a707d50096b360e7f0821cdafb3c798d -SHA1 (patch-ag) = 666218619747ba1107f1967a86eb2fcb680dce7b +SHA1 (patch-af) = 8b6d80d870d73a75e5060faaed3254d4317d6c33 +SHA1 (patch-ag) = cc2d220da55b7657452a97f2c3b442f0f6939848 SHA1 (patch-ah) = 24157b3b121ee64a87f020c1b140fad1a11428b7 SHA1 (patch-ai) = bba9c0f8ab9c34e65b43e283e4d29e78aecd642c SHA1 (patch-aj) = 600f96693fcf6f00f0b23a76923cdf0046116936 diff --git a/net/kphone/patches/patch-ac b/net/kphone/patches/patch-ac index 018bc72e966..5816e2f996c 100644 --- a/net/kphone/patches/patch-ac +++ b/net/kphone/patches/patch-ac @@ -1,3 +1,5 @@ +$NetBSD: patch-ac,v 1.3 2005/12/05 20:50:46 rillig Exp $ + --- dissipate2/siputil.cpp.orig 2005-06-21 12:14:49.000000000 +0100 +++ dissipate2/siputil.cpp 2005-11-24 16:47:03.000000000 +0000 @@ -5,6 +5,9 @@ diff --git a/net/kphone/patches/patch-ad b/net/kphone/patches/patch-ad index 1a319ab88da..b27192b0178 100644 --- a/net/kphone/patches/patch-ad +++ b/net/kphone/patches/patch-ad @@ -1,3 +1,5 @@ +$NetBSD: patch-ad,v 1.3 2005/12/05 20:50:46 rillig Exp $ + --- dissipate2/udpmessagesocket.cpp.orig 2005-04-18 14:04:40.000000000 +0100 +++ dissipate2/udpmessagesocket.cpp 2005-11-24 16:49:55.000000000 +0000 @@ -1,5 +1,7 @@ diff --git a/net/kphone/patches/patch-af b/net/kphone/patches/patch-af index b8d4d3135b4..979c2939e6e 100644 --- a/net/kphone/patches/patch-af +++ b/net/kphone/patches/patch-af @@ -1,3 +1,5 @@ +$NetBSD: patch-af,v 1.8 2005/12/05 20:50:46 rillig Exp $ + --- configure.orig 2005-06-22 09:37:20.000000000 +0100 +++ configure 2005-11-24 16:55:26.000000000 +0000 @@ -1295,8 +1295,8 @@ diff --git a/net/kphone/patches/patch-ag b/net/kphone/patches/patch-ag index 019e6bec278..a92119f8cf3 100644 --- a/net/kphone/patches/patch-ag +++ b/net/kphone/patches/patch-ag @@ -1,3 +1,5 @@ +$NetBSD: patch-ag,v 1.6 2005/12/05 20:50:46 rillig Exp $ + --- kphone/Makefile.in.orig 2005-06-22 09:37:20.000000000 +0100 +++ kphone/Makefile.in 2005-11-24 16:59:45.000000000 +0000 @@ -6,7 +6,7 @@ diff --git a/net/lambdamoo/Makefile b/net/lambdamoo/Makefile index 9ac0e376565..796b7d79b62 100644 --- a/net/lambdamoo/Makefile +++ b/net/lambdamoo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/06/17 03:50:25 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:47 rillig Exp $ DISTNAME= LambdaMOO-1.8.1 PKGNAME= lambdamoo-1.8.1 @@ -26,7 +26,7 @@ PKG_USERS= ${LAMBDAMOO_USER}:${LAMBDAMOO_GROUP} _PKG_USER_HOME= ${LAMBDAMOO_HOME} _PKG_USER_SHELL= ${SH} -FILES_SUBST+= LAMBDAMOO_HOME=${LAMBDAMOO_HOME} +FILES_SUBST+= LAMBDAMOO_HOME=${LAMBDAMOO_HOME:Q} WRKSRC= ${WRKDIR}/MOO-1.8.1 BUILD_TARGET= diff --git a/net/lftp/Makefile b/net/lftp/Makefile index bf4c99d38a1..71441465dd0 100644 --- a/net/lftp/Makefile +++ b/net/lftp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.59 2005/12/04 22:12:07 salo Exp $ +# $NetBSD: Makefile,v 1.60 2005/12/05 20:50:47 rillig Exp $ DISTNAME= lftp-3.3.5 CATEGORIES= net @@ -29,7 +29,7 @@ PLIST_SRC+= ${PKGDIR}/PLIST CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --with-modules -CONFIGURE_ENV+= F77=${FALSE} +CONFIGURE_ENV+= F77=${FALSE:Q} EGDIR= ${PREFIX}/share/examples/lftp CONF_FILES= ${EGDIR}/lftp.conf.default ${PKG_SYSCONFDIR}/lftp.conf diff --git a/net/libIDL/Makefile b/net/libIDL/Makefile index cea684521ea..6416ae3d3b9 100644 --- a/net/libIDL/Makefile +++ b/net/libIDL/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2005/08/18 13:17:01 adam Exp $ +# $NetBSD: Makefile,v 1.38 2005/12/05 20:50:47 rillig Exp $ DISTNAME= libIDL-0.8.6 CATEGORIES= net gnome @@ -26,7 +26,7 @@ CONFIGURE_ENV.SunOS+= CPP=/usr/lib/cpp .endif # Avoid an ICE in gcc2 on sparc64 -CONFIGURE_ENV+= F77=${FALSE} +CONFIGURE_ENV+= F77=${FALSE:Q} .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" diff --git a/net/libares/distinfo b/net/libares/distinfo index d7c5d570340..f5f2a12bbb3 100644 --- a/net/libares/distinfo +++ b/net/libares/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.4 2005/11/20 15:08:35 tonio Exp $ +$NetBSD: distinfo,v 1.5 2005/12/05 20:50:47 rillig Exp $ SHA1 (ares-1.1.1.tar.gz) = eafe6ba9c85122538f06dabd735a048abea8bb1e RMD160 (ares-1.1.1.tar.gz) = 2b564f1194f538ba12378034428bd3a22f8e5a98 Size (ares-1.1.1.tar.gz) = 65463 bytes SHA1 (patch-aa) = cb8aaad721963f958d61b6b9f3d466c522736c56 -SHA1 (patch-ab) = 380f6cc08630e8173ca7106a939c77fbf6994010 -SHA1 (patch-ac) = 563e29d30d0542b5baac60eba5d053a64c4980da +SHA1 (patch-ab) = 093014d0747a2077826fa2ae07a1a7a576cde6e4 +SHA1 (patch-ac) = b3c1688b4e9c6c590eaf269d634c5506869f1c7d diff --git a/net/libares/patches/patch-ab b/net/libares/patches/patch-ab index d68d86aa915..6a69225b799 100644 --- a/net/libares/patches/patch-ab +++ b/net/libares/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.1 2005/03/12 05:42:48 tv Exp $ +$NetBSD: patch-ab,v 1.2 2005/12/05 20:50:47 rillig Exp $ --- ares_init.c.orig 1999-10-23 15:28:13.000000000 -0400 +++ ares_init.c -@@ -32,6 +32,10 @@ static const char rcsid[] = "$Id: ares_i +@@ -32,6 +32,10 @@ #include "ares.h" #include "ares_private.h" diff --git a/net/libares/patches/patch-ac b/net/libares/patches/patch-ac index d73db6d6fe9..e71417acbb2 100644 --- a/net/libares/patches/patch-ac +++ b/net/libares/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.1 2005/11/20 15:08:35 tonio Exp $ +$NetBSD: patch-ac,v 1.2 2005/12/05 20:50:47 rillig Exp $ --- adig.c.orig 2001-05-18 22:59:51.000000000 +0200 +++ adig.c -@@ -35,6 +35,10 @@ static const char rcsid[] = "$Id: adig.c +@@ -35,6 +35,10 @@ #define INADDR_NONE 0xffffffff #endif diff --git a/net/mDNSResponder/Makefile b/net/mDNSResponder/Makefile index 7c0a2f585be..7de76ff7f90 100644 --- a/net/mDNSResponder/Makefile +++ b/net/mDNSResponder/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/11/03 22:40:58 rillig Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:47 rillig Exp $ DISTNAME= mDNSResponder-107.1 PKGREVISION= 1 @@ -9,7 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://developer.apple.com/darwin/projects/bonjour/ COMMENT= Apple's mDNS responder -USE_TOOLS= gmake +USE_TOOLS+= gmake BUILD_DIRS= mDNSPosix BUILDDIR= ${WRKSRC}/mDNSPosix/build/prod @@ -38,7 +38,7 @@ SO_SUFFIX= dylib .else MAKE_ENV+= os=netbsd .endif -PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX} +PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX:Q} BINARY= mDNSClientPosix mDNSIdentify mDNSNetMonitor \ mDNSProxyResponderPosix mDNSResponderPosix diff --git a/net/mldonkey/Makefile b/net/mldonkey/Makefile index 3cd0d5faec1..ae3c771aedf 100644 --- a/net/mldonkey/Makefile +++ b/net/mldonkey/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2005/10/06 11:50:03 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2005/12/05 20:50:47 rillig Exp $ # .include "Makefile.common" @@ -14,9 +14,9 @@ OWN_DIRS_PERMS= ${MLDONKEY_HOME} ${MLDONKEY_USER} ${MLDONKEY_GROUP} 0700 PKG_GROUPS= ${MLDONKEY_GROUP} PKG_USERS= ${MLDONKEY_USER}:${MLDONKEY_GROUP}::Dedicated\ mldonkey\ server:${MLDONKEY_HOME}:${SH} -FILES_SUBST+= MLDONKEY_GROUP="${MLDONKEY_GROUP}" -FILES_SUBST+= MLDONKEY_HOME="${MLDONKEY_HOME}" -FILES_SUBST+= MLDONKEY_USER="${MLDONKEY_USER}" +FILES_SUBST+= MLDONKEY_GROUP=${MLDONKEY_GROUP:Q} +FILES_SUBST+= MLDONKEY_HOME=${MLDONKEY_HOME:Q} +FILES_SUBST+= MLDONKEY_USER=${MLDONKEY_USER:Q} do-install: ${INSTALL_PROGRAM_DIR} ${PREFIX}/libexec/mldonkey diff --git a/net/mrstat/Makefile b/net/mrstat/Makefile index 3056e48dbf2..2d3905afa3b 100644 --- a/net/mrstat/Makefile +++ b/net/mrstat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/06/06 17:09:05 abs Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:47 rillig Exp $ # DISTNAME= mrstat-1.19 @@ -9,6 +9,6 @@ MAINTAINER= abs@mono.org HOMEPAGE= http://www.mono.org/abs/tools/mrstat/ COMMENT= Track load and number of users on specified hosts -MAKE_ENV+= SYSCONFDIR=${PKG_SYSCONFDIR} +MAKE_ENV+= SYSCONFDIR=${PKG_SYSCONFDIR:Q} .include "../../mk/bsd.pkg.mk" diff --git a/net/nam/Makefile b/net/nam/Makefile index 49eff040cc0..5cd8718c09a 100644 --- a/net/nam/Makefile +++ b/net/nam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/06/01 18:03:07 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:47 rillig Exp $ DISTNAME= nam-src-1.11 PKGNAME= ${DISTNAME:S/-src//} @@ -21,7 +21,7 @@ CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk} CONFIGURE_ARGS+= --with-otcl=${BUILDLINK_PREFIX.tcl-otcl} CONFIGURE_ARGS+= --with-tclcl=${BUILDLINK_PREFIX.tcl-tclcl} -CONFIGURE_ENV+= V_LIBS="`${CONFIG_SHELL} -c '. ${TCLCONFIG_SH}; . ${TKCONFIG_SH}; echo $$TCL_LIBS $$TK_LIBS'`" +CONFIGURE_ENV+= V_LIBS="`${CONFIG_SHELL} -c '. ${TCLCONFIG_SH}; . ${TKCONFIG_SH}; ${ECHO} $$TCL_LIBS $$TK_LIBS'`" MESSAGE_SUBST+= HOMEPAGE=${HOMEPAGE} diff --git a/net/nasd/Makefile b/net/nasd/Makefile index 2c50023f0f0..fe5f6f040a1 100644 --- a/net/nasd/Makefile +++ b/net/nasd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/07/16 01:19:16 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:47 rillig Exp $ DISTNAME= repackaged-${PKGNAME} PKGNAME= nasd-1.3 @@ -13,7 +13,7 @@ ONLY_FOR_PLATFORM= NetBSD-*-* SunOS-*-* Linux-*-* USE_IMAKE= yes USE_TOOLS+= perl -WRKSRC= ${WRKDIR}/${PKGNAME} +WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} pre-patch: ${MKDIR} ${WRKSRC}/include/nasd/netbsd diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile index b7a027787e1..bf18dced952 100644 --- a/net/net-snmp/Makefile +++ b/net/net-snmp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2005/10/18 04:32:37 grant Exp $ +# $NetBSD: Makefile,v 1.38 2005/12/05 20:50:47 rillig Exp $ DISTNAME= net-snmp-5.2.1.2 PKGREVISION= 1 @@ -79,7 +79,7 @@ CONFIGURE_ARGS+= --enable-ucd-snmp-compatibility CONFIGURE_ARGS+= --with-perl-modules=${MAKE_PARAMS:Q} PERL5_CONFIGURE= NO PERL5_PACKLIST= auto/Bundle/NetSNMP/.packlist -CONFIGURE_ENV+= PERLPROG="${PERL5}" +CONFIGURE_ENV+= PERLPROG=${PERL5:Q} .include "options.mk" diff --git a/net/netdisco/Makefile b/net/netdisco/Makefile index bbb08f1a3aa..c3251d7203c 100644 --- a/net/netdisco/Makefile +++ b/net/netdisco/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/09/11 11:43:23 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:47 rillig Exp $ # DISTNAME= netdisco-0.94_with_mibs @@ -43,7 +43,7 @@ REPLACE_PERL+= mibs/rm_cisco_dups REPLACE_PERL+= mibs/chk_mibs REPLACE_PERL+= mibs/snmpwalkmib -SUBST_CLASSES= installdir path var +SUBST_CLASSES+= installdir path var SUBST_STAGE.installdir= pre-configure SUBST_FILES.installdir= sql/pg_run sql/pg_init sql/pg_back SUBST_FILES.installdir+= bin/netdisco_daemon @@ -81,7 +81,7 @@ SUBST_MESSAGE.var= "Fixing data directory." NETDISCOUSER?= netdisco NETDISCOGROUP?= netdisco -BUILD_DEFS= NETDISCOUSER NETDISCOGROUP +BUILD_DEFS+= NETDISCOUSER NETDISCOGROUP PKG_USERS= ${NETDISCOUSER}:${NETDISCOGROUP}::Netdisco\ administrator:${PREFIX}/netdisco:${SH} PKG_GROUPS= ${NETDISCOGROUP} diff --git a/net/netpipes/Makefile b/net/netpipes/Makefile index 8a26551d4fe..5d21ef2f974 100644 --- a/net/netpipes/Makefile +++ b/net/netpipes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/11/07 02:48:50 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:47 rillig Exp $ DISTNAME= netpipes-4.2-export PKGNAME= ${DISTNAME:S/-export//} @@ -7,12 +7,12 @@ MASTER_SITES= http://web.purplefrog.com/ftp/thoth/netpipes/ MAINTAINER= jlam@NetBSD.org HOMEPAGE= http://web.purplefrog.com/~thoth/netpipes/netpipes.html -COMMENT= utilities for communicating via sockets +COMMENT= Utilities for communicating via sockets WRKSRC= ${WRKDIR} USE_TOOLS+= tbl -LIBS.SunOS= -lsocket -lnsl +LIBS.SunOS+= -lsocket -lnsl INSTALLATION_DIRS= bin ${PKGMANDIR} diff --git a/net/netsaint-base/Makefile b/net/netsaint-base/Makefile index 6af0634d8a0..9d2f0dfef1c 100644 --- a/net/netsaint-base/Makefile +++ b/net/netsaint-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/09/27 16:09:50 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2005/12/05 20:50:47 rillig Exp $ # DISTNAME= netsaint-0.0.7 @@ -21,7 +21,6 @@ OWN_DIRS_PERMS= /var/run/netsaint /var/run/netsaint/rw OWN_DIRS_PERMS+= ${dir} ${NETSAINT_USER} ${NETSAINT_GROUP} 0755 .endfor -.undef dir INSTALL_TARGET= install install-config diff --git a/net/ns/Makefile b/net/ns/Makefile index 5519b8deed9..38f1d0ca161 100644 --- a/net/ns/Makefile +++ b/net/ns/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/09/08 02:50:58 minskim Exp $ +# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:47 rillig Exp $ DISTNAME= ns-src-2.28 PKGNAME= ${DISTNAME:S/-src//} @@ -18,7 +18,7 @@ PTHREAD_OPTS+= require # Perl is only needed if you want to run the validation tests. #USE_TOOLS+= perl -CONFIGURE_ARGS+= LIBS="`${CONFIG_SHELL} -c '. ${TCLCONFIG_SH}; echo $$TCL_LIBS'`" +CONFIGURE_ARGS+= LIBS="`${CONFIG_SHELL} -c '. ${TCLCONFIG_SH}; ${ECHO} $$TCL_LIBS'`" CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl} CONFIGURE_ARGS+= --with-tcl-ver=8.4 CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk} diff --git a/net/nsd/Makefile b/net/nsd/Makefile index 4d353d838f8..9885d4c88f2 100644 --- a/net/nsd/Makefile +++ b/net/nsd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2005/11/06 16:36:48 joerg Exp $ +# $NetBSD: Makefile,v 1.32 2005/12/05 20:50:47 rillig Exp $ DISTNAME= nsd-2.2.0 CATEGORIES= net @@ -16,7 +16,7 @@ BUILDLINK_DEPENDS.openssl+= openssl>=0.9.7 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+=--enable-bind8-stats CONFIGURE_ARGS+=--with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers} .if !defined(USE_INET6) diff --git a/net/ntp4/Makefile b/net/ntp4/Makefile index 697f0865c32..d2298756989 100644 --- a/net/ntp4/Makefile +++ b/net/ntp4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2005/09/10 10:43:42 adrianp Exp $ +# $NetBSD: Makefile,v 1.44 2005/12/05 20:50:47 rillig Exp $ # DISTNAME= ntp-4.2.0 @@ -19,7 +19,7 @@ GNU_CONFIGURE= YES USE_TOOLS+= perl USE_PKGINSTALL= YES -CONFIGURE_ENV+= PATH_PERL="${PERL5}" ac_cv_header_sys_soundcard_h=no +CONFIGURE_ENV+= PATH_PERL=${PERL5:Q} ac_cv_header_sys_soundcard_h=no CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR} @@ -62,7 +62,7 @@ TIMETRIM= "@comment " NO_TIMETRIM= "" .endif -PLIST_SUBST+= TIMETRIM=${TIMETRIM} NO_TIMETRIM=${NO_TIMETRIM} +PLIST_SUBST+= TIMETRIM=${TIMETRIM:Q} NO_TIMETRIM=${NO_TIMETRIM:Q} .include "../../security/openssl/buildlink3.mk" diff --git a/net/oinkmaster/Makefile b/net/oinkmaster/Makefile index 5cc93138286..792c834ff73 100644 --- a/net/oinkmaster/Makefile +++ b/net/oinkmaster/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/08/06 06:19:24 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:47 rillig Exp $ DISTNAME= oinkmaster-1.2 PKGREVISION= 1 @@ -26,7 +26,7 @@ REPLACE_PERL+= ${WRKSRC}/oinkmaster.pl PKG_SYSCONFSUBDIR= snort -SUBST_CLASSES= pub +SUBST_CLASSES+= pub SUBST_STAGE.pub= post-patch SUBST_FILES.pub= oinkmaster.pl oinkmaster.conf oinkmaster.1 SUBST_SED.pub= -e "s|/usr/local/etc|${PKG_SYSCONFDIR}|g" \ @@ -42,7 +42,6 @@ do-install: . for f in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCDIR}/${f} . endfor -. undef f ${INSTALL_DATA} ${WRKSRC}/oinkmaster.conf ${EGDIR} ${INSTALL_DATA} ${WRKSRC}/template-examples.conf ${EGDIR} diff --git a/net/openh323/Makefile b/net/openh323/Makefile index c86a9126bd1..152c8f91717 100644 --- a/net/openh323/Makefile +++ b/net/openh323/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2005/07/15 18:27:53 jlam Exp $ +# $NetBSD: Makefile,v 1.33 2005/12/05 20:50:47 rillig Exp $ DISTNAME= openh323-v1_15_2-src PKGNAME= openh323-1.15.2 @@ -15,10 +15,10 @@ USE_TOOLS+= gmake tar USE_LIBTOOL= yes USE_PKGINSTALL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= PWLIBDIR=${PREFIX} +CONFIGURE_ARGS+= PWLIBDIR=${PREFIX:Q} BUILD_TARGET= opt apps -MAKE_ENV+= PWLIBDIR=${PREFIX}/share/pwlib OPENH323DIR=${WRKSRC} +MAKE_ENV+= PWLIBDIR=${PREFIX}/share/pwlib OPENH323DIR=${WRKSRC:Q} MAKE_ENV+= SYSLIBDIR=${PREFIX}/lib post-extract: diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile index 3ec0e02b879..fe45eae6b33 100644 --- a/net/openvpn/Makefile +++ b/net/openvpn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/11/03 14:31:19 salo Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:48 rillig Exp $ # DISTNAME= openvpn-2.0.5 @@ -11,7 +11,7 @@ HOMEPAGE= http://openvpn.net/ COMMENT= Easy-to-use SSL VPN daemon GNU_CONFIGURE= yes -USE_TOOLS= grep:run +USE_TOOLS+= grep:run USE_LIBTOOL= yes USE_PKGINSTALL= yes USE_OLD_DES_API= yes diff --git a/net/p5-Net-IPv4Addr/Makefile b/net/p5-Net-IPv4Addr/Makefile index 64eba423ca7..cb410aac30c 100644 --- a/net/p5-Net-IPv4Addr/Makefile +++ b/net/p5-Net-IPv4Addr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/08/13 07:56:40 adrianp Exp $ +# $NetBSD: Makefile,v 1.2 2005/12/05 20:50:48 rillig Exp $ DISTNAME= Net-IPv4Addr-0.10 PKGNAME= p5-${DISTNAME} @@ -6,7 +6,7 @@ CATEGORIES= net perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Net/} MAINTAINER= adrianp@NetBSD.org -COMMENT= Perl extension for manipulating IPv4 addresses. +COMMENT= Perl extension for manipulating IPv4 addresses PKG_INSTALLATION_TYPES= overwrite pkgviews diff --git a/net/p5-POE-Component-Client-Ident/Makefile b/net/p5-POE-Component-Client-Ident/Makefile index c1457937397..7b3aba4a05d 100644 --- a/net/p5-POE-Component-Client-Ident/Makefile +++ b/net/p5-POE-Component-Client-Ident/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/08/06 06:19:28 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:48 rillig Exp $ # DISTNAME= POE-Component-Client-Ident-0.7 @@ -9,7 +9,7 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=POE/} MAINTAINER= adrianp@NetBSD.org HOMEPAGE= http://search.cpan.org/~bingos/POE-Component-Client-Ident-0.7/ -COMMENT= Non-blocking ident lookups to your sessions. +COMMENT= Non-blocking ident lookups to your sessions DEPENDS+= p5-POE-[0-9]*:../../devel/p5-POE diff --git a/net/pchar/Makefile b/net/pchar/Makefile index 6f2f317f7fa..d5f97927bdd 100644 --- a/net/pchar/Makefile +++ b/net/pchar/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2005/06/17 03:50:27 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2005/12/05 20:50:48 rillig Exp $ DISTNAME= pchar-1.4 PKGREVISION= 4 @@ -20,7 +20,7 @@ CONFIGURE_ARGS+= --with-ipv6 .endif .if ${OPSYS} == "NetBSD" -.include "../net-snmp/buildlink3.mk" +.include "../../net/net-snmp/buildlink3.mk" CONFIGURE_ARGS+= --with-snmp=${BUILDLINK_PREFIX.net-snmp} LIBS+= -lsnmp -lcrypto -ldes diff --git a/net/php-ftp/Makefile b/net/php-ftp/Makefile index 41c6e15f575..a928c549b66 100644 --- a/net/php-ftp/Makefile +++ b/net/php-ftp/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:57 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:48 rillig Exp $ MODNAME= ftp -PKGREVISION= # empty CATEGORIES+= net COMMENT= PHP extension for FTP access diff --git a/net/php-snmp/Makefile b/net/php-snmp/Makefile index acadaa5470b..32bf74d6322 100644 --- a/net/php-snmp/Makefile +++ b/net/php-snmp/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:57 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:48 rillig Exp $ MODNAME= snmp CATEGORIES+= net -PKGREVISION= # empty COMMENT= PHP extension for SNMP diff --git a/net/php-sockets/Makefile b/net/php-sockets/Makefile index c4151d8e550..36dd0c85c25 100644 --- a/net/php-sockets/Makefile +++ b/net/php-sockets/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:57 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:48 rillig Exp $ MODNAME= sockets CATEGORIES+= net -PKGREVISION= # empty COMMENT= PHP extension for sockets support diff --git a/net/php-xmlrpc/Makefile b/net/php-xmlrpc/Makefile index e945b183b19..b0c4b7bb929 100644 --- a/net/php-xmlrpc/Makefile +++ b/net/php-xmlrpc/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2005/12/03 18:53:57 jdolecek Exp $ +# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:48 rillig Exp $ MODNAME= xmlrpc CATEGORIES+= net -PKGREVISION= # empty COMMENT= PHP extension for XML-RPC support HOMEPAGE= http://xmlrpc-epi.sourceforge.net/ diff --git a/net/php-yp/Makefile b/net/php-yp/Makefile index b80c56ef88b..84ea7f3939e 100644 --- a/net/php-yp/Makefile +++ b/net/php-yp/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2005/12/03 19:50:31 jdolecek Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:48 rillig Exp $ MODNAME= yp CATEGORIES+= net -PKGREVISION= # empty COMMENT= PHP extension for YP domain support # yp extension has been unbundled in PHP 5.1.1, it's only available diff --git a/net/ppp-lzs/Makefile b/net/ppp-lzs/Makefile index f30e0674379..12df972b200 100644 --- a/net/ppp-lzs/Makefile +++ b/net/ppp-lzs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/07/15 18:27:53 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:48 rillig Exp $ DISTNAME= ppp-lzs-1.2 CATEGORIES= net @@ -13,7 +13,7 @@ ONLY_FOR_PLATFORM= NetBSD-*-* .include "../../mk/bsd.prefs.mk" -MAKE_ENV+= NETBSDSRCDIR="${NETBSDSRCDIR}" +MAKE_ENV+= NETBSDSRCDIR=${NETBSDSRCDIR:Q} MAKE_ENV+= S="${NETBSDSRCDIR}/sys" MESSAGE_SUBST+= PREFIX="${PREFIX}" diff --git a/net/pppd/Makefile b/net/pppd/Makefile index e326e45b873..5c622b8b190 100644 --- a/net/pppd/Makefile +++ b/net/pppd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:25 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:48 rillig Exp $ DISTNAME= ppp-${PPPD_VERSION} PKGNAME= ${DISTNAME:S/ppp/&d/} @@ -17,9 +17,9 @@ USE_PKGINSTALL= yes ONLY_FOR_PLATFORM+= NetBSD-*-* Linux-*-* PKG_SYSCONFSUBDIR= ppp -CONFIGURE_ENV+= PREFIX=${PREFIX} PKGSYSCONFDIR=${PKG_SYSCONFDIR} +CONFIGURE_ENV+= PREFIX=${PREFIX:Q} PKGSYSCONFDIR=${PKG_SYSCONFDIR:Q} PPPD_VERSION= 2.4.3 -PLIST_SUBST+= PPPD_VERSION=${PPPD_VERSION} +PLIST_SUBST+= PPPD_VERSION=${PPPD_VERSION:Q} .include "../../mk/bsd.pkg.mk" diff --git a/net/proxycheck/Makefile b/net/proxycheck/Makefile index 8716087c9d0..423f6a448e8 100644 --- a/net/proxycheck/Makefile +++ b/net/proxycheck/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/06/17 03:50:27 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:48 rillig Exp $ # DISTNAME= proxycheck-0.49a @@ -10,7 +10,7 @@ HOMEPAGE= http://www.corpit.ru/mjt/proxycheck.html COMMENT= Tester for open (promiscuous) proxy systems HAS_CONFIGURE= YES -MAKE_FLAGS+= CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +MAKE_FLAGS+= CC=${CC:Q} CFLAGS=${CFLAGS:M*:Q} LDFLAGS=${LDFLAGS:M*:Q} INSTALLATION_DIRS= bin man/man1 diff --git a/net/py-ORBit/Makefile b/net/py-ORBit/Makefile index 14c6e00bbcd..af2b1d42b79 100644 --- a/net/py-ORBit/Makefile +++ b/net/py-ORBit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/08/10 20:56:22 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:48 rillig Exp $ # DISTNAME= pyorbit-2.0.1 @@ -16,10 +16,10 @@ USE_TOOLS+= gmake pkg-config USE_LIBTOOL= YES PKGCONFIG_OVERRIDE+= pyorbit-2.pc.in GNU_CONFIGURE= YES -CONFIGURE_ENV+= PYTHON=${PYTHONBIN} +CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} PYTHON_VERSIONS_ACCEPTED= 24 23 22 -BUILDLINK_DEPENDS.python22= python22>=2.2.2nb2 +BUILDLINK_DEPENDS.python22+= python22>=2.2.2nb2 .include "../../net/ORBit2/buildlink3.mk" .include "../../lang/python/extension.mk" diff --git a/net/py-mimelib/Makefile b/net/py-mimelib/Makefile index d7bbd0b3136..91e36c93bc0 100644 --- a/net/py-mimelib/Makefile +++ b/net/py-mimelib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:58 tv Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:48 rillig Exp $ # DISTNAME= email-2.5 @@ -24,4 +24,4 @@ NOT21= "@comment " .else NOT21= #empty .endif -PLIST_SUBST+= NOT21=${NOT21} +PLIST_SUBST+= NOT21=${NOT21:Q} diff --git a/net/py-zsi/Makefile b/net/py-zsi/Makefile index 8da4eadfe64..4dc0d9d8850 100644 --- a/net/py-zsi/Makefile +++ b/net/py-zsi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/04/11 21:46:59 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:48 rillig Exp $ # DISTNAME= ZSI-1.5.0 @@ -13,7 +13,7 @@ COMMENT= SOAP implementation PYDISTUTILSPKG= yes PY_PATCHPLIST= yes -PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} +PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} #DIST_SUBDIR= py-ZSI diff --git a/net/pygopherd/Makefile b/net/pygopherd/Makefile index e9326f861d7..ec0006f723e 100644 --- a/net/pygopherd/Makefile +++ b/net/pygopherd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:59 tv Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:48 rillig Exp $ # DISTNAME= pygopherd_2.0.9 @@ -32,8 +32,8 @@ EGFILES+= ${WRKSRC}/conf/mime.types EGFILES+= ${WRKSRC}/conf/pygopherd.conf RCD_SCRIPTS= pygopherd -FILES_SUBST+= RUNTIMEDIR=${RUNTIMEDIR} -FILES_SUBST+= PYTHONBIN=${PYTHONBIN} +FILES_SUBST+= RUNTIMEDIR=${RUNTIMEDIR:Q} +FILES_SUBST+= PYTHONBIN=${PYTHONBIN:Q} PYTHON_PATCH_SCRIPTS= bin/pygopherd PYTHON_PATCH_SCRIPTS+= pygopherd/GopherExceptionsTest.py diff --git a/net/qadsl/Makefile b/net/qadsl/Makefile index e5b269b2f24..f9a6f5154e1 100644 --- a/net/qadsl/Makefile +++ b/net/qadsl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/06/17 03:50:27 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:48 rillig Exp $ # DISTNAME= qadsl-final-1.2 @@ -10,12 +10,12 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://qba.linuxsweden.nu/ COMMENT= Login software for Swedish Telia ADSL/Comhem cable Internet users -LIBS.SunOS= -lnsl -lsocket +LIBS.SunOS+= -lnsl -lsocket MANCOMPRESSED= yes -MAKE_ENV+= LIBS="${LIBS}" -MAKE_ENV+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} +MAKE_ENV+= LIBS=${LIBS:M*:Q} +MAKE_ENV+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} INSTALLATION_DIRS= man/man8 sbin diff --git a/net/quagga/Makefile b/net/quagga/Makefile index 3ebc5a5ddc2..4ead4467dd6 100644 --- a/net/quagga/Makefile +++ b/net/quagga/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/07/16 01:19:16 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2005/12/05 20:50:48 rillig Exp $ # Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp # @@ -39,7 +39,6 @@ PKG_USERS= quagga:quagga CONF_FILES_PERMS+= ${PREFIX}/share/examples/quagga/log_syslog.conf \ ${PKG_SYSCONFDIR}/${_file_} quagga quagga 0600 .endfor -.undef _file_ BUILD_DEFS+= USE_ZEBRA_VTYSH USE_ZEBRA_OSPF_OPAQUELSA USE_ZEBRA_VTYSH?= YES @@ -68,7 +67,6 @@ RCD_SCRIPTS+= ospf6d ripngd CONF_FILES_PERMS+= ${PREFIX}/share/examples/quagga/log_syslog.conf \ ${PKG_SYSCONFDIR}/${_file_} quagga quagga 0600 .endfor -.undef _file_ .else CONFIGURE_ARGS+= --disable-ospf6d CONFIGURE_ARGS+= --disable-ripngd diff --git a/net/radiusd-cistron/Makefile b/net/radiusd-cistron/Makefile index d5cc5545c2b..1a96129a367 100644 --- a/net/radiusd-cistron/Makefile +++ b/net/radiusd-cistron/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/07/19 04:25:43 kristerw Exp $ +# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:48 rillig Exp $ DISTNAME= radiusd-cistron-1.6.7 PKGREVISION= 1 @@ -33,7 +33,6 @@ CONF_FILES= naslist.sample naspasswd.sample realms.sample users.sample CONF_FILES+= ${EGDIR}/${cfile} ${PKG_SYSCONFDIR}/${cfile:S/.sample//} .endfor -.undef cfile post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/radiusd-cistron diff --git a/net/rdist6/Makefile b/net/rdist6/Makefile index b948b8d5470..147bee8ca8b 100644 --- a/net/rdist6/Makefile +++ b/net/rdist6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/08/26 08:42:09 abs Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:49 rillig Exp $ # DISTNAME= freerdist-0.92 @@ -13,7 +13,7 @@ COMMENT= Network file distribution/synchronisation utility RDIST6_NAME= rdist6 INSTALL_TARGET= install install.man -MAKE_ENV+= RDIST6_NAME=${RDIST6_NAME} +MAKE_ENV+= RDIST6_NAME=${RDIST6_NAME:Q} CONFLICTS= rdist6-[0-9]* diff --git a/net/rinetd/Makefile b/net/rinetd/Makefile index 3190fb8a0b8..4682ee858e3 100644 --- a/net/rinetd/Makefile +++ b/net/rinetd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/09/28 20:52:25 rillig Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:49 rillig Exp $ # DISTNAME= rinetd @@ -11,7 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.boutell.com/rinetd/ COMMENT= Internet redirection server -WRKSRC= ${WRKDIR}/${PKGNAME:S|nb*||} +WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} NO_CONFIGURE= yes USE_PKGINSTALL= yes BUILD_TARGET= rinetd diff --git a/net/ripe-whois-tools/Makefile b/net/ripe-whois-tools/Makefile index 73eae51c530..feca3ab1a98 100644 --- a/net/ripe-whois-tools/Makefile +++ b/net/ripe-whois-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/10/12 07:10:57 seb Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:49 rillig Exp $ # DISTNAME= ripe-whois-tools-2.4 @@ -11,9 +11,9 @@ COMMENT= RIPE WHOIS client and tools WRKSRC= ${WRKDIR} -LIBS.NetBSD= -lcrypt -LIBS.SunOS= -lnsl -lsocket +LIBS.NetBSD+= -lcrypt +LIBS.SunOS+= -lnsl -lsocket -MAKE_ENV+= LIBS="${LIBS}" +MAKE_ENV+= LIBS=${LIBS:M*:Q} .include "../../mk/bsd.pkg.mk" diff --git a/net/ripe-whois/Makefile b/net/ripe-whois/Makefile index c3a205541cb..a3d57b7677a 100644 --- a/net/ripe-whois/Makefile +++ b/net/ripe-whois/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/07/16 01:19:16 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:49 rillig Exp $ # DISTNAME= ripe-whois-3.1.1v6 @@ -13,7 +13,7 @@ COMMENT= RIPE very simple and generic whois client WRKSRC= ${WRKDIR}/whois-3.1.1v6 GNU_CONFIGURE= YES USE_TOOLS+= perl -MAKE_ENV+= PERL5=${PERL5} +MAKE_ENV+= PERL5=${PERL5:Q} BUILD_DEFS+= USE_INET6 ASCII_DOC= ripe-223.txt diff --git a/net/rp-pppoe/Makefile b/net/rp-pppoe/Makefile index 10df2e12acb..4bd62dcc171 100644 --- a/net/rp-pppoe/Makefile +++ b/net/rp-pppoe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2005/11/08 16:57:40 tv Exp $ +# $NetBSD: Makefile,v 1.31 2005/12/05 20:50:49 rillig Exp $ DISTNAME= rp-pppoe-3.5 PKGREVISION= 2 @@ -18,8 +18,8 @@ USE_PKGINSTALL= YES USE_TOOLS+= id GNU_CONFIGURE= YES CONFIGURE_DIRS= src -CONFIGURE_ENV+= PPPD=${PPPD} -CONFIGURE_ENV+= ID="${TOOLS_ID}" +CONFIGURE_ENV+= PPPD=${PPPD:Q} +CONFIGURE_ENV+= ID=${TOOLS_ID:Q} BUILD_DIRS= src RCD_SCRIPTS= pppoe diff --git a/net/samba/Makefile b/net/samba/Makefile index 948f1805cbe..eecc237f690 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.150 2005/11/15 13:58:14 jlam Exp $ +# $NetBSD: Makefile,v 1.151 2005/12/05 20:50:49 rillig Exp $ .include "Makefile.mirrors" @@ -38,14 +38,14 @@ SAMBA_STATEDIR?= ${SAMBA_VARDIR}/db/samba SAMBA_VARDIR?= ${VARBASE} WINBINDD_RCD_SCRIPT= # empty -FILES_SUBST= SAMBA_ETCDIR=${SAMBA_ETCDIR} -FILES_SUBST+= SAMBA_LOCKDIR=${SAMBA_LOCKDIR} -FILES_SUBST+= SAMBA_LOGDIR=${SAMBA_LOGDIR} -FILES_SUBST+= SAMBA_PIDDIR=${SAMBA_PIDDIR} -FILES_SUBST+= SAMBA_PRIVATE=${SAMBA_PRIVATE} -FILES_SUBST+= SAMBA_STATEDIR=${SAMBA_STATEDIR} -FILES_SUBST+= SAMBA_VARDIR=${SAMBA_VARDIR} -FILES_SUBST+= WINBINDD_RCD_SCRIPT=${WINBINDD_RCD_SCRIPT} +FILES_SUBST+= SAMBA_ETCDIR=${SAMBA_ETCDIR:Q} +FILES_SUBST+= SAMBA_LOCKDIR=${SAMBA_LOCKDIR:Q} +FILES_SUBST+= SAMBA_LOGDIR=${SAMBA_LOGDIR:Q} +FILES_SUBST+= SAMBA_PIDDIR=${SAMBA_PIDDIR:Q} +FILES_SUBST+= SAMBA_PRIVATE=${SAMBA_PRIVATE:Q} +FILES_SUBST+= SAMBA_STATEDIR=${SAMBA_STATEDIR:Q} +FILES_SUBST+= SAMBA_VARDIR=${SAMBA_VARDIR:Q} +FILES_SUBST+= WINBINDD_RCD_SCRIPT=${WINBINDD_RCD_SCRIPT:Q} CONFIGURE_ARGS+= --with-configdir=${SAMBA_ETCDIR} CONFIGURE_ARGS+= --with-libdir=${SAMBA_LIBDIR} diff --git a/net/scamper/Makefile b/net/scamper/Makefile index 927b6b5a469..729aee8dea1 100644 --- a/net/scamper/Makefile +++ b/net/scamper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/11/02 15:32:38 tv Exp $ +# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:49 rillig Exp $ # DISTNAME= scamper-cvs-20050529 @@ -12,7 +12,7 @@ COMMENT= Dual-stack traceroute software INSTALLATION_DIRS=bin -MAKE_FLAGS= WITH_DEBUG=yes # recommended by the the software developer +MAKE_FLAGS+= WITH_DEBUG=yes # recommended by the the software developer do-install: ${INSTALL_PROGRAM} ${WRKSRC}/scamper ${PREFIX}/bin diff --git a/net/skype/Makefile b/net/skype/Makefile index dcfc47e6672..be78c2e56c6 100644 --- a/net/skype/Makefile +++ b/net/skype/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/11/02 20:11:47 abs Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:49 rillig Exp $ # DISTNAME= skype_staticQT-1.2.0.18 @@ -29,7 +29,7 @@ ONLY_FOR_PLATFORM= *-*-i386 NO_CONFIGURE= yes CHECK_SHLIBS= no USE_DIRS+= xdg-1.1 -WRKSRC= ${WRKDIR}/${PKGNAME} +WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} RESTRICTED= "Redistribution not allowed yet." NO_SRC_ON_CDROM= ${RESTRICTED} diff --git a/net/smokeping/Makefile b/net/smokeping/Makefile index 09eee2c870f..9dc127f8cf7 100644 --- a/net/smokeping/Makefile +++ b/net/smokeping/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/10/28 21:43:18 adrianp Exp $ +# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:49 rillig Exp $ DISTNAME= smokeping-2.0.4 CATEGORIES= net @@ -8,7 +8,7 @@ MAINTAINER= bouyer@NetBSD.org HOMEPAGE= http://people.ee.ethz.ch/~oetiker/webtools/smokeping/index.en.html COMMENT= Latency/packet loss monitoring/graphing tool -DEPENDS= rrdtool>=1.0:../../databases/rrdtool +DEPENDS+= rrdtool>=1.0:../../databases/rrdtool DEPENDS+= fping>=2.4b2:../../net/fping DEPENDS+= p5-Digest-MD5>=2.20:../../security/p5-Digest-MD5 DEPENDS+= p5-libwww>=5.64:../../www/p5-libwww diff --git a/net/snort/Makefile.common b/net/snort/Makefile.common index 57b5f5edb11..80f4031afae 100644 --- a/net/snort/Makefile.common +++ b/net/snort/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.27 2005/10/18 15:15:04 adrianp Exp $ +# $NetBSD: Makefile.common,v 1.28 2005/12/05 20:50:49 rillig Exp $ # DISTNAME= snort-2.4.3 @@ -25,7 +25,7 @@ SNORT_USER?= snort SNORT_GROUP?= snort PKG_GROUPS= ${SNORT_GROUP} PKG_USERS= ${SNORT_USER}:${SNORT_GROUP}::Snort\ user -FILES_SUBST+= SNORT_USER="${SNORT_USER}" SNORT_GROUP="${SNORT_GROUP}" +FILES_SUBST+= SNORT_USER=${SNORT_USER:Q} SNORT_GROUP=${SNORT_GROUP:Q} OWN_DIRS_PERMS= ${VARBASE}/log/snort ${SNORT_USER} ${SNORT_GROUP} 700 CONF_FILES= ${EGDIR}/snort.conf.default \ @@ -50,7 +50,7 @@ CONF_FILES+= ${EGDIR}/unicode.map \ EGDIR= ${PREFIX}/share/examples/snort SNORTDIR= ${PREFIX}/share/snort -SUBST_CLASSES= paths +SUBST_CLASSES+= paths SUBST_STAGE.paths= post-patch SUBST_FILES.paths= etc/snort.conf src/snort.c SUBST_SED.paths= -e "s|@PREFIX@|${PREFIX}|g" \ diff --git a/net/socks4/Makefile b/net/socks4/Makefile index 9ba4f0f921d..fd9a5eb915a 100644 --- a/net/socks4/Makefile +++ b/net/socks4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/10/06 21:18:24 bad Exp $ +# $NetBSD: Makefile,v 1.23 2005/12/05 20:50:49 rillig Exp $ # DISTNAME= export.socks.cstc.4.2.2 @@ -17,7 +17,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews WRKSRC= ${WRKDIR}/socks.cstc.4.2 USE_PKGINSTALL= yes -MAKE_ENV+= OPTIMIZE="${CFLAGS}" +MAKE_ENV+= OPTIMIZE=${CFLAGS:M*:Q} EGDIR= ${PREFIX}/share/examples/socks4 CONF_FILES= ${EGDIR}/socks.conf ${PKG_SYSCONFDIR}/socks.conf diff --git a/net/socks5/Makefile b/net/socks5/Makefile index 7a9a5a10542..d69c510654c 100644 --- a/net/socks5/Makefile +++ b/net/socks5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2005/10/23 21:49:01 rillig Exp $ +# $NetBSD: Makefile,v 1.40 2005/12/05 20:50:49 rillig Exp $ DISTNAME= socks5-v1_0r2 PKGNAME= socks5-1.0.2 @@ -30,7 +30,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews WRKSRC= ${WRKDIR}/socks5-v1.0r2 USE_PKGINSTALL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-libconffile=${PREFIX}/etc/libsocks5.conf \ +CONFIGURE_ARGS+= --with-libconffile=${PREFIX}/etc/libsocks5.conf \ --with-srvconffile=${PREFIX}/etc/socks5.conf \ --with-srvpidfile=/var/run/socks5.pid \ --with-srvidtfile=/var/run/socks5.ident \ diff --git a/net/speedtouch/Makefile b/net/speedtouch/Makefile index 82ea2ecb334..85d08a120f2 100644 --- a/net/speedtouch/Makefile +++ b/net/speedtouch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/06/18 11:29:10 kristerw Exp $ +# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:49 rillig Exp $ DISTNAME= speedtouch-1.3.1 PKGREVISION= 3 @@ -27,7 +27,7 @@ USE_PKGINSTALL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -PLIST_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} +PLIST_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} RCD_SCRIPTS= adsl .include "../../mk/pthread.buildlink3.mk" diff --git a/net/spread/Makefile b/net/spread/Makefile index c385f5ac6f8..106dd0d2518 100644 --- a/net/spread/Makefile +++ b/net/spread/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/07/16 01:19:16 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:49 rillig Exp $ # DISTNAME= spread-src-3.17.3 @@ -15,15 +15,15 @@ WRKSRC= ${WRKDIR}/${DISTNAME} USE_TOOLS+= perl USE_PKGINSTALL= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS= --includedir=${PREFIX}/include/spread -MAKE_FLAGS= LD=${CC:Q} +CONFIGURE_ARGS+= --includedir=${PREFIX:Q}/include/spread +MAKE_FLAGS+= LD=${CC:Q} SPREAD_USER= spread SPREAD_GROUP= spread -FILES_SUBST+= SPREAD_USER=${SPREAD_USER} -FILES_SUBST+= SPREAD_GROUP=${SPREAD_GROUP} -FILES_SUBST+= RUNTIME_DIR=${RUNTIME_DIR} +FILES_SUBST+= SPREAD_USER=${SPREAD_USER:Q} +FILES_SUBST+= SPREAD_GROUP=${SPREAD_GROUP:Q} +FILES_SUBST+= RUNTIME_DIR=${RUNTIME_DIR:Q} BUILD_DEFS+= SPREAD_USER SPREAD_GROUP diff --git a/net/stripes/Makefile b/net/stripes/Makefile index da81a070e20..6f23a86c699 100644 --- a/net/stripes/Makefile +++ b/net/stripes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/07/16 01:19:17 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:49 rillig Exp $ # DISTNAME= stripes-2.1 @@ -14,7 +14,7 @@ DEPENDS+= p5-Net-Telnet>=3.02:../../net/p5-Net-Telnet PKG_SYSCONFSUBDIR?= httpd BUILD_TARGET= all -MAKE_FLAGS+= DEST=${PREFIX} PERL=${PERL5} \ +MAKE_FLAGS+= DEST=${PREFIX:Q} PERL=${PERL5:Q} \ CONFIGFILE=${PKG_SYSCONFDIR}/lg.conf USE_TOOLS+= perl:run diff --git a/net/tcpdstat/Makefile b/net/tcpdstat/Makefile index 9eca89a2171..1ca9d4098cf 100644 --- a/net/tcpdstat/Makefile +++ b/net/tcpdstat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/11/01 18:45:32 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:49 rillig Exp $ DISTNAME= tcpd-tools-0.8 PKGNAME= tcpdstat-0.8 @@ -11,6 +11,6 @@ COMMENT= Analyze tcpdump output NOT_FOR_PLATFORM= Interix-*-* WRKSRC= ${WRKDIR}/${DISTNAME}/tcpdstat -MAKE_ENV= BINDIR=${PREFIX}/bin +MAKE_ENV+= BINDIR=${PREFIX:Q}/bin .include "../../mk/bsd.pkg.mk" diff --git a/net/tinyfugue/Makefile b/net/tinyfugue/Makefile index dc5cd21b330..64036025d32 100644 --- a/net/tinyfugue/Makefile +++ b/net/tinyfugue/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/04/11 21:47:00 tv Exp $ +# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:49 rillig Exp $ DISTNAME= tf-40s1 PKGNAME= tf-4.0s1 @@ -13,7 +13,7 @@ COMMENT= Popular programmable MUD client, with macro support and more MAKEFILE= ${WRKSRC}/unix/Makefile -MAKE_ENV= TFVER="${DISTNAME:S/^tf-//}" +MAKE_ENV+= TFVER=${DISTNAME:S/^tf-//:Q} PATCH_SITES= http://discworld.imaginary.com/external/taffyd/ PATCHFILES= tf-40s1-mccp-patch.gz diff --git a/net/tor/Makefile b/net/tor/Makefile index 41884e771e0..a684bac6a87 100644 --- a/net/tor/Makefile +++ b/net/tor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/09/27 19:53:41 tv Exp $ +# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:50 rillig Exp $ # DISTNAME= tor-0.1.0.15 @@ -37,8 +37,8 @@ RCD_SCRIPT= tor INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL -FILES_SUBST+= PKG_HOME=${PKG_HOME} -FILES_SUBST+= TOR_USER=${TOR_USER} TOR_GROUP=${TOR_GROUP} +FILES_SUBST+= PKG_HOME=${PKG_HOME:Q} +FILES_SUBST+= TOR_USER=${TOR_USER:Q} TOR_GROUP=${TOR_GROUP:Q} .if !empty(PKGSRC_COMPILER:Mmipspro) CFLAGS+= -c99 diff --git a/net/torrentutils/Makefile b/net/torrentutils/Makefile index 5d48aba3bf1..010c0f8d3fb 100644 --- a/net/torrentutils/Makefile +++ b/net/torrentutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:17 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:50 rillig Exp $ # DISTNAME= torrentutils-0.3.0 @@ -14,7 +14,7 @@ DEPENDS+= bash-[0-9]*:../../shells/bash DEPENDS+= p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1 DEPENDS+= p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5 -USE_TOOLS= gmake perl:run +USE_TOOLS+= gmake perl:run REPLACE_PERL= torrenttool.in post-build: diff --git a/net/traceroute-as/Makefile b/net/traceroute-as/Makefile index ff8859537bc..7e31c34132b 100644 --- a/net/traceroute-as/Makefile +++ b/net/traceroute-as/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2004/01/20 12:22:22 agc Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:50 rillig Exp $ # DISTNAME= traceroute_991603.tar @@ -19,9 +19,9 @@ PKG_SYSDEFS= -DSYSV PKG_LIBRARIES= -lresolv -lsocket -lnsl .endif -MAKE_FLAGS+= CC=${CC:Q} PKG_CFLAGS=${CFLAGS:Q} PKG_SYSDEFS=${PKG_SYSDEFS:Q} +MAKE_FLAGS+= CC=${CC:Q} PKG_CFLAGS=${CFLAGS:M*:Q} PKG_SYSDEFS=${PKG_SYSDEFS:Q} MAKE_FLAGS+= PKG_LIBRARIES=${PKG_LIBRARIES:Q} INSTALL_PROGRAM_SUID= ${INSTALL} ${COPY} ${_STRIPFLAG_INSTALL} -o ${BINOWN} -g ${BINGRP} -m 4555 -MAKE_ENV+= BSD_INSTALL_PROGRAM_SUID="${INSTALL_PROGRAM_SUID}" +MAKE_ENV+= BSD_INSTALL_PROGRAM_SUID=${INSTALL_PROGRAM_SUID:Q} .include "../../mk/bsd.pkg.mk" diff --git a/net/unison-devel/Makefile b/net/unison-devel/Makefile index a9309c784dd..3d18eeb5cf7 100644 --- a/net/unison-devel/Makefile +++ b/net/unison-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/10/27 12:56:24 tonio Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:50 rillig Exp $ DISTNAME= unison-2.17.1 PKGREVISION= 1 @@ -18,7 +18,7 @@ BUILDLINK_DEPENDS.ocaml+= ocaml>=3.08.2 WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} USE_TOOLS+= gmake MAKE_FLAGS+= CFLAGS="" UISTYLE=text -MAKE_ENV+= HOME=${WRKDIR} +MAKE_ENV+= HOME=${WRKDIR:Q} .include "../../mk/bsd.prefs.mk" diff --git a/net/unison/Makefile b/net/unison/Makefile index 5bd97080f58..2b8fe7ba511 100644 --- a/net/unison/Makefile +++ b/net/unison/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2005/10/27 12:54:06 tonio Exp $ +# $NetBSD: Makefile,v 1.30 2005/12/05 20:50:50 rillig Exp $ DISTNAME= unison-2.13.16 PKGREVISION= 1 @@ -18,7 +18,7 @@ BUILDLINK_DEPENDS.ocaml+= ocaml>=3.08.2 WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} USE_TOOLS+= gmake MAKE_FLAGS+= CFLAGS="" UISTYLE=text -MAKE_ENV+= HOME=${WRKDIR} +MAKE_ENV+= HOME=${WRKDIR:Q} .include "../../mk/bsd.prefs.mk" diff --git a/net/userppp/Makefile b/net/userppp/Makefile index ca6eb923663..ee623daf0af 100644 --- a/net/userppp/Makefile +++ b/net/userppp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/04/11 21:47:01 tv Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:50 rillig Exp $ DISTNAME= ppp-001107.src PKGNAME= userppp-001107 @@ -31,7 +31,7 @@ post-patch: USERPPP_GROUP?= network BUILD_DEFS+= USERPPP_GROUP -MAKE_ENV+= USERPPP_GROUP="${USERPPP_GROUP}" +MAKE_ENV+= USERPPP_GROUP=${USERPPP_GROUP:Q} USE_PKGINSTALL= yes PKG_GROUPS= ${USERPPP_GROUP} diff --git a/net/wap-utils/Makefile b/net/wap-utils/Makefile index cf423cadb27..71dc8f5b585 100644 --- a/net/wap-utils/Makefile +++ b/net/wap-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/10/28 22:01:47 kristerw Exp $ +# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:50 rillig Exp $ # DISTNAME= ap-utils-1.3.2 @@ -15,8 +15,8 @@ COMMENT= Wireless access points UNIX management tool GNU_CONFIGURE= YES USE_PKGLOCALEDIR= YES -INCOMPAT_CURSES= NetBSD-1.5* NetBSD-1.6[-_.]* -INCOMPAT_CURSES+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-C]* +INCOMPAT_CURSES= NetBSD-1.5*-* NetBSD-1.6[-_.]*-* +INCOMPAT_CURSES+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-C]*-* .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" diff --git a/net/whoson/Makefile b/net/whoson/Makefile index 9c323a16f33..3972387fe0e 100644 --- a/net/whoson/Makefile +++ b/net/whoson/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:02 tv Exp $ +# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:50 rillig Exp $ # DISTNAME= whoson-2.03 @@ -20,7 +20,7 @@ GNU_CONFIGURE= yes WHOSOND_CHROOT?= ${VARBASE}/chroot/whosond CONFIGURE_ARGS+= --with-config="${PKG_SYSCONFDIR}/whoson.conf" -FILES_SUBST+= CHROOTDIR=${WHOSOND_CHROOT} +FILES_SUBST+= CHROOTDIR=${WHOSOND_CHROOT:Q} USE_PKGINSTALL= yes DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL diff --git a/net/wimon/Makefile b/net/wimon/Makefile index ebedfb59ec7..0703e7cb9ff 100644 --- a/net/wimon/Makefile +++ b/net/wimon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/04/11 21:47:02 tv Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:50 rillig Exp $ # DISTNAME= wimon-0.3 @@ -14,8 +14,8 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews ONLY_FOR_PLATFORM= FreeBSD-*-* NetBSD-*-* OpenBSD-*-* # Needs net80211/*.h header files which appeared in 1.6ZD. -NOT_FOR_PLATFORM= NetBSD-0* NetBSD-1.[012345]* NetBSD-1.6[-_.]* -NOT_FOR_PLATFORM+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-C]* +NOT_FOR_PLATFORM= NetBSD-0*-* NetBSD-1.[012345]*-* NetBSD-1.6[-_.]*-* +NOT_FOR_PLATFORM+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-C]*-* WRKSRC= ${WRKDIR}/wimon diff --git a/net/wistumbler2/Makefile.common b/net/wistumbler2/Makefile.common index f24840cd1a2..538767bb311 100644 --- a/net/wistumbler2/Makefile.common +++ b/net/wistumbler2/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2005/05/25 14:47:05 wiz Exp $ +# $NetBSD: Makefile.common,v 1.4 2005/12/05 20:50:50 rillig Exp $ # DISTNAME= wistumbler2-2.0pre10 @@ -20,7 +20,7 @@ CONFLICTS+= wistumbler-[0-9]* HAS_CONFIGURE= YES USE_PKGINSTALL= YES -CONFIGURE_ENV+= PREFIX=${PREFIX} +CONFIGURE_ENV+= PREFIX=${PREFIX:Q} CONF_FILES= ${PREFIX}/share/examples/wistumbler2/wistumbler2.conf \ ${PKG_SYSCONFDIR}/wistumbler2.conf diff --git a/net/wu-ftpd/Makefile b/net/wu-ftpd/Makefile index 7e6327faed5..1329acca98c 100644 --- a/net/wu-ftpd/Makefile +++ b/net/wu-ftpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/03/24 21:12:59 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2005/12/05 20:50:50 rillig Exp $ DISTNAME= wu-ftpd-2.6.2 PKGREVISION= 3 @@ -47,9 +47,9 @@ DIST_SUBDIR= wu-ftpd CFLAGS+= -DHAVE_SYS_MOUNT .endif -MAKE_ENV+= INSTALL="${INSTALL}" -MAKE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" -MAKE_ENV+= INSTALL_DATA="${INSTALL_DATA}" -MAKE_ENV+= INSTALL_MAN="${INSTALL_MAN}" +MAKE_ENV+= INSTALL=${INSTALL:Q} +MAKE_ENV+= INSTALL_PROGRAM=${INSTALL_PROGRAM:Q} +MAKE_ENV+= INSTALL_DATA=${INSTALL_DATA:Q} +MAKE_ENV+= INSTALL_MAN=${INSTALL_MAN:Q} .include "../../mk/bsd.pkg.mk" diff --git a/net/xipdump/Makefile b/net/xipdump/Makefile index 8d618eff52d..d5b0cd6b96a 100644 --- a/net/xipdump/Makefile +++ b/net/xipdump/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/10/16 12:58:37 tonio Exp $ +# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:50 rillig Exp $ # DISTNAME= xipdump-1.5.4 @@ -17,7 +17,7 @@ PLIST_SRC= ${WRKDIR}/PLIST USE_X11BASE= yes GNU_CONFIGURE= yes CFLAGS+= -I${PREFIX}/include ${LIBNET_CFLAGS_CMD:sh} -LIBS= -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lnet +LIBS+= -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lnet LIBNET_CFLAGS_CMD= ${BUILDLINK_PREFIX.libnet}/bin/libnet-config --defines diff --git a/net/zebra/Makefile b/net/zebra/Makefile index 8fb98e3ed63..11e75a276fa 100644 --- a/net/zebra/Makefile +++ b/net/zebra/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.69 2005/09/28 20:52:25 rillig Exp $ +# $NetBSD: Makefile,v 1.70 2005/12/05 20:50:50 rillig Exp $ # Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp DISTNAME= zebra-0.95 @@ -24,7 +24,7 @@ CONF_FILES= ${EGDIR}/bgpd.conf.sample ${PKG_SYSCONFDIR}/bgpd.conf \ ${EGDIR}/zebra.conf.sample ${PKG_SYSCONFDIR}/zebra.conf # with optimization, the timer/scheduler (esp. for MRT dump rotation) appears # to have problems. -CFLAGS= -O0 +CFLAGS+= -O0 CONFLICTS+= quagga-[0-9]* |