diff options
-rw-r--r-- | cad/spiceprm/Makefile | 8 | ||||
-rw-r--r-- | devel/automake/Makefile | 8 | ||||
-rw-r--r-- | devel/libgtop/Makefile | 7 | ||||
-rw-r--r-- | graphics/Mesa-glx/Makefile | 15 | ||||
-rw-r--r-- | mail/grepmail/Makefile | 11 | ||||
-rw-r--r-- | mail/mailagent/Makefile | 28 | ||||
-rw-r--r-- | misc/vfu/Makefile | 7 | ||||
-rw-r--r-- | net/gnapfetch/Makefile | 7 | ||||
-rw-r--r-- | net/mirror/Makefile | 7 | ||||
-rw-r--r-- | net/mirror/scripts/configure | 4 | ||||
-rw-r--r-- | net/sirc/Makefile | 6 | ||||
-rw-r--r-- | net/sitescooper/Makefile | 8 | ||||
-rw-r--r-- | net/speakfreely/Makefile | 5 | ||||
-rw-r--r-- | news/inn/Makefile | 10 | ||||
-rw-r--r-- | news/trn/Makefile | 53 | ||||
-rw-r--r-- | print/ghostscript-nox11/Makefile.common | 5 | ||||
-rw-r--r-- | security/openssl/Makefile | 9 | ||||
-rw-r--r-- | sysutils/roller/Makefile | 10 | ||||
-rw-r--r-- | textproc/cdif/Makefile | 13 | ||||
-rw-r--r-- | textproc/texi2html/Makefile | 13 | ||||
-rw-r--r-- | www/adzap/Makefile | 12 | ||||
-rw-r--r-- | www/ap-php3/Makefile | 8 | ||||
-rw-r--r-- | www/php3/Makefile | 8 | ||||
-rw-r--r-- | www/squid/Makefile | 8 | ||||
-rw-r--r-- | x11/gnome-core/Makefile | 4 | ||||
-rw-r--r-- | x11/wmweather/Makefile | 8 |
26 files changed, 137 insertions, 145 deletions
diff --git a/cad/spiceprm/Makefile b/cad/spiceprm/Makefile index 22608e319b8..53652a503ad 100644 --- a/cad/spiceprm/Makefile +++ b/cad/spiceprm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2000/08/26 03:26:44 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2000/08/27 02:46:03 jlam Exp $ # DISTNAME= spiceprm-0.11 @@ -8,12 +8,12 @@ MASTER_SITES= http://metalab.unc.edu/pub/Linux/apps/circuits/ MAINTAINER= packages@netbsd.org -NO_CONFIGURE= YES -USE_PERL5= YES +NO_CONFIGURE= # defined +USE_PERL5= # defined do-build: ${MV} ${WRKSRC}/spiceprm ${WRKSRC}/spiceprm.BAK - ${SED} 's!/usr/bin/perl!${LOCALBASE}/bin/perl!g' \ + ${SED} 's!/usr/bin/perl!${PERL5}!g' \ < ${WRKSRC}/spiceprm.BAK > ${WRKSRC}/spiceprm do-install: diff --git a/devel/automake/Makefile b/devel/automake/Makefile index a90a4b0a19f..886af8d3511 100644 --- a/devel/automake/Makefile +++ b/devel/automake/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 1999/05/22 16:24:09 tv Exp $ +# $NetBSD: Makefile,v 1.18 2000/08/27 02:46:03 jlam Exp $ # FreeBSD Id: Makefile,v 1.5 1997/09/19 09:29:04 max Exp # @@ -11,11 +11,11 @@ HOMEPAGE= http://www.gnu.org/software/automake/automake.html DEPENDS= autoconf-2.13:../../devel/autoconf -GNU_CONFIGURE= yes -CONFIGURE_ENV= PERL=${PREFIX}/bin/perl +USE_PERL5= # defined +GNU_CONFIGURE= # defined +CONFIGURE_ENV= PERL=${PERL5} STRIPFLAG= # none -USE_PERL5= yes INFO_FILES= automake.info .include "../../mk/bsd.pkg.mk" diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile index c2036264eec..000ee12cbe7 100644 --- a/devel/libgtop/Makefile +++ b/devel/libgtop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2000/08/21 21:01:30 hubertf Exp $ +# $NetBSD: Makefile,v 1.42 2000/08/27 02:46:04 jlam Exp $ DISTNAME= libgtop-1.0.9 CATEGORIES= devel gnome @@ -7,7 +7,7 @@ MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/libgtop/} MAINTAINER= tron@netbsd.org HOMEPAGE= http://www.home-of-linux.org/gnome/libgtop/ -BUILD_DEPENDS= ${PERL}:../../lang/perl5 +BUILD_DEPENDS= ${PERL5}:../../lang/perl5 DEPENDS+= gettext>=0.10.35nb1:../../devel/gettext DEPENDS+= gnome-libs-*:../../x11/gnome-libs DEPENDS+= guile-[0-9]*:../../lang/guile @@ -34,7 +34,6 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lintl -PERL= ${LOCALBASE}/bin/perl # The following flags are for debugging purposes. They don't need to # be used unless you are actively developing/debugging libgtop. @@ -47,7 +46,7 @@ CONFIGURE_ARGS+= --with-glib-prefix=${LOCALBASE} \ CONFIGURE_ENV+= AWK="${AWK}" \ CPP="${CPP}" \ LN_S="${LN} -s" \ - PERL="${PERL}" \ + PERL="${PERL5}" \ CPPFLAGS="${CPPFLAGS}" \ LOCALBASE=${LOCALBASE} \ X11BASE=${X11BASE} diff --git a/graphics/Mesa-glx/Makefile b/graphics/Mesa-glx/Makefile index e6eb8b4d9ef..0033487983d 100644 --- a/graphics/Mesa-glx/Makefile +++ b/graphics/Mesa-glx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2000/08/14 07:27:39 tron Exp $ +# $NetBSD: Makefile,v 1.11 2000/08/27 02:46:04 jlam Exp $ DISTNAME= glx-20000813 PKGNAME= Mesa-${DISTNAME} @@ -12,27 +12,26 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ MAINTAINER= tron@netbsd.org HOMEPAGE= http://utah-glx.sourceforge.net/ -BUILD_DEPENDS+= ${PERL}:../../lang/perl5 +BUILD_DEPENDS+= ${PERL5}:../../lang/perl5 BUILD_DEPENDS+= ${AUTOCONF}:../../devel/autoconf BUILD_DEPENDS+= ${TCLSH}:../../lang/tcl80 CONFLICTS+= Mesa-* ONLY_FOR_PLATFORM= NetBSD-*-i386 -GNU_CONFIGURE= yes -USE_GMAKE= yes -USE_LIBTOOL= yes -USE_X11BASE= yes +GNU_CONFIGURE= # defined +USE_GMAKE= # defined +USE_LIBTOOL= # defined +USE_X11BASE= # defined CONFIGURE_ARGS+= --enable-static --with-mesa=${MESA_WRKSRC} CONFIGURE_ARGS+= --with-moduledir=${PREFIX}/lib/modules CONFIGURE_ENV+= TCLSH=${TCLSH} AUTOCONF= ${LOCALBASE}/bin/autoconf WRKSRCDIRS= ${MESA_WRKSRC} ${WRKSRC} ${WRKSRC}/docs -MAKE_ENV+= PERL=${PERL} +MAKE_ENV+= PERL=${PERL5} MESA_VERSION= 3.1 MESA_WRKSRC= ${WRKDIR}/Mesa-${MESA_VERSION} -PERL= ${LOCALBASE}/bin/perl TCLSH= ${LOCALBASE}/bin/tclsh8.0 pre-configure: diff --git a/mail/grepmail/Makefile b/mail/grepmail/Makefile index ba1605cc33a..8e63eb37cbc 100644 --- a/mail/grepmail/Makefile +++ b/mail/grepmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2000/01/24 14:19:56 agc Exp $ +# $NetBSD: Makefile,v 1.3 2000/08/27 02:46:04 jlam Exp $ # DISTNAME= grepmail-4.11 @@ -8,17 +8,16 @@ MASTER_SITES= http://www.cs.virginia.edu/~dwc3q/code/ MAINTAINER= david@fundy.net HOMEPAGE= http://www.cs.virginia.edu/~dwc3q/code/index.html -CONFIGURE_ENV= PERL=${PREFIX}/bin/perl - -USE_PERL5= yes +USE_PERL5= # defined +CONFIGURE_ENV= PERL=${PERL5} do-build: @cd ${WRKSRC} ; \ for i in 1 2 ; do \ - ${ECHO} "$$i" | ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL; \ + ${ECHO} "$$i" | ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL; \ ${MAKE}; \ ${RM} -f grepmail-$$i; \ - ${SED} -e '1s|.*|#! ${PREFIX}/bin/perl|' grepmail > grepmail-$$i; \ + ${SED} -e '1s|.*|#! ${PERL5}|' grepmail > grepmail-$$i; \ done do-install: diff --git a/mail/mailagent/Makefile b/mail/mailagent/Makefile index 95159ffdd4e..550893bc418 100644 --- a/mail/mailagent/Makefile +++ b/mail/mailagent/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2000/03/27 08:54:59 tron Exp $ +# $NetBSD: Makefile,v 1.4 2000/08/27 02:46:04 jlam Exp $ # FreeBSD: ports/mail/mailagent/Makefile,v 1.28 1999/08/31 06:47:24 mharo Exp # @@ -6,30 +6,23 @@ DISTNAME= mailagent-3.0@68 PKGNAME= mailagent-3.0.68 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_PERL_CPAN:S/by-module/by-authors\/id\/RAM/g} -#MASTER_SITE_SUBDIR= ../../authors/id/RAM -MAINTAINER= itojun@itojun.org +MAINTAINER= itojun@itojun.org -# be friendly with FreeBSD-ish use of ${PERL5} -PERL5= ${LOCALBASE}/bin/perl +USE_PERL5= # defined -USE_PERL5= yes -NO_PACKAGE= "Correct FQDN needs to be hardcoded" -IS_INTERACTIVE= yes -HAS_CONFIGURE= yes +NO_PACKAGE= "Correct FQDN needs to be hardcoded" +IS_INTERACTIVE= # defined + +HAS_CONFIGURE= # defined CONFIGURE_SCRIPT= ./Configure CONFIGURE_ARGS= -dres \ -Dperlpath='${PERL5}' \ -Dutmp='/var/run/utmp' \ -Dprefix='${PREFIX}' -Dmansrc='${PREFIX}/man/man1' \ -Dnotifypatches='false' -MAKE_ENV= PATH=`dirname ${PERL5}`:${PATH} -INSTALL_TARGET= install install.man - -# Note that mailhelp.1 is intentionally left uncompressed as it is referred -# from several other man pages with .so macro. -MAN1= edusers.1 mailagent.1 maildist.1 \ - maillist.1 mailpatch.1 package.1 +MAKE_ENV= PATH=`dirname ${PERL5}`:${PATH} +INSTALL_TARGET= install install.man pre-extract: @if [ `${SH} -c umask` != 0022 ]; then \ @@ -44,6 +37,7 @@ post-install: @${MKDIR} ${PREFIX}/share/examples/mailagent @${MKDIR} ${PREFIX}/share/examples/mailagent/misc ${CP} -pR ${WRKSRC}/misc/* ${PREFIX}/share/examples/mailagent/misc - @${LN} -fs ${PREFIX}/lib/mailagent/examples ${PREFIX}/share/examples/mailagent/agent + @${LN} -fs ${PREFIX}/lib/mailagent/examples \ + ${PREFIX}/share/examples/mailagent/agent .include "../../mk/bsd.pkg.mk" diff --git a/misc/vfu/Makefile b/misc/vfu/Makefile index e35d360c8dc..e46f7bafd43 100644 --- a/misc/vfu/Makefile +++ b/misc/vfu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2000/06/15 21:08:54 hubertf Exp $ +# $NetBSD: Makefile,v 1.15 2000/08/27 02:46:04 jlam Exp $ # DISTNAME= vfu-3.01 @@ -12,7 +12,7 @@ HOMEPAGE= http://www.biscom.net/~cade/away/vfu/ DEPENDS= ncurses>=5.0:../../devel/ncurses -USE_PERL5= yes +USE_PERL5= # defined post-extract: ${ECHO} "" >>build.netbsd @@ -26,7 +26,8 @@ do-install: ${INSTALL_PROGRAM} vfu/vfu ftparc/ftparc ${PREFIX}/bin for i in rx_auto rx_deb rx_ftp rx_tar rx_zip ; do \ echo $$i ; \ - ${SED} 's,/usr/bin/perl,${LOCALBASE}/bin/perl,' <${WRKSRC}/rx/$$i >${WRKSRC}/rx/$$i.new ; \ + ${SED} 's,/usr/bin/perl,${PERL5},' \ + <${WRKSRC}/rx/$$i >${WRKSRC}/rx/$$i.new ; \ ${INSTALL_SCRIPT} ${WRKSRC}/rx/$$i.new ${PREFIX}/bin/$$i ; \ done ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vfu diff --git a/net/gnapfetch/Makefile b/net/gnapfetch/Makefile index 8597d357e25..aad99863a07 100644 --- a/net/gnapfetch/Makefile +++ b/net/gnapfetch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2000/08/08 08:18:44 jlam Exp $ +# $NetBSD: Makefile,v 1.2 2000/08/27 02:46:05 jlam Exp $ DISTNAME= gnapfetch-0.3 CATEGORIES= net @@ -8,11 +8,10 @@ MAINTAINER= jlam@netbsd.org HOMEPAGE= http://entropy.atlantic.net/gnapfetch/ USE_PERL5= # defined -PERL= ${LOCALBASE}/bin/perl do-build: - ${SED} -e "s,/usr/bin/perl,${PERL},g" < ${WRKSRC}/gnapfetch \ - > ${WRKDIR}/gnapfetch + ${SED} -e "s,/usr/bin/perl,${PERL5},g" \ + < ${WRKSRC}/gnapfetch > ${WRKDIR}/gnapfetch do-install: ${INSTALL_SCRIPT} ${WRKDIR}/gnapfetch ${PREFIX}/bin diff --git a/net/mirror/Makefile b/net/mirror/Makefile index b9dccdcfb41..068cb753c4f 100644 --- a/net/mirror/Makefile +++ b/net/mirror/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2000/04/19 16:16:51 kim Exp $ +# $NetBSD: Makefile,v 1.11 2000/08/27 02:46:05 jlam Exp $ # FreeBSD Id: Makefile,v 1.6 1996/12/01 01:22:54 obrien Exp # @@ -8,10 +8,11 @@ MASTER_SITES= ftp://src.doc.ic.ac.uk/computing/archiving/mirror/ MAINTAINER= packages@netbsd.org -USE_PERL5= yes +USE_PERL5= # defined -NO_WRKSUBDIR= yes +NO_WRKSUBDIR= # defined MAKEFILE= makefile +SCRIPTS_ENV+= PERL5=${PERL5} # If you are tempted to add a target that runs ${SED} (or other stuff) # on the files, please look at scripts/configure first. diff --git a/net/mirror/scripts/configure b/net/mirror/scripts/configure index 534d7cea982..05a4bad47a9 100644 --- a/net/mirror/scripts/configure +++ b/net/mirror/scripts/configure @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: configure,v 1.4 2000/03/26 22:33:18 kim Exp $ +# $NetBSD: configure,v 1.5 2000/08/27 02:46:05 jlam Exp $ # # Id: configure,v 1.1.1.1 1997/10/27 05:01:31 hubertf Exp # @@ -9,7 +9,7 @@ for i in do_unlinks.pl mirror.pl mm.pl pkgs_to_mmin.pl do sed \ -e s:!!PREFIX!!:$PREFIX:g \ - -e s:/usr/bin/perl:${PREFIX}/bin/perl: \ + -e s:/usr/bin/perl:${PERL5}: \ <$i >$i.BAK mv -f $i.BAK $i done diff --git a/net/sirc/Makefile b/net/sirc/Makefile index 35be925a8ba..0f9b042fb94 100644 --- a/net/sirc/Makefile +++ b/net/sirc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2000/04/06 23:24:32 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2000/08/27 02:46:05 jlam Exp $ DISTNAME= sirc-2.211 CATEGORIES= net @@ -10,7 +10,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ MAINTAINER= hubertf@netbsd.org HOMEPAGE= http://www.iagora.com/~espel/sirc/sirc.html -USE_PERL5= YES +USE_PERL5= # defined EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} SIRC_SCRIPTS= \ @@ -54,7 +54,7 @@ do-install: ${ECHO} "" ; \ ${ECHO} "-O3" ; \ ${ECHO} "" ; \ - ${ECHO} "${PREFIX}/bin/perl" ; \ + ${ECHO} "${PERL5}" ; \ ${ECHO} "${PREFIX}/bin" ; \ ${ECHO} "y" ; \ ${ECHO} "${PREFIX}/lib/sirc" ; \ diff --git a/net/sitescooper/Makefile b/net/sitescooper/Makefile index 06c3853be02..c0028108396 100644 --- a/net/sitescooper/Makefile +++ b/net/sitescooper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2000/06/07 16:48:56 rh Exp $ +# $NetBSD: Makefile,v 1.2 2000/08/27 02:46:05 jlam Exp $ # DISTNAME= sitescooper-2.2.8 @@ -11,13 +11,13 @@ HOMEPAGE= http://sitescooper.cx/ DEPENDS+= p5-libwww>=5.46:../../www/p5-libwww DEPENDS+= pilotmgr-*:../../comms/pilotmgr -USE_PERL5= YES -NO_BUILD= YES +USE_PERL5= # defined +NO_BUILD= # defined do-configure: .for file in sitescooper rss-to-site subs-to-site cd ${WRKSRC} && \ - ${SED} -e 's:/usr/bin/perl:${PREFIX}/bin/perl:g' <${file}.pl >${file} + ${SED} -e 's:/usr/bin/perl:${PERL5}:g' <${file}.pl >${file} .endfor .for file in lib/Scoop.pm sitescooper.cf cd ${WRKSRC} && ${CP} ${file} ${file}.orig && \ diff --git a/net/speakfreely/Makefile b/net/speakfreely/Makefile index e964977d741..1e8f453a594 100644 --- a/net/speakfreely/Makefile +++ b/net/speakfreely/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2000/08/26 06:18:53 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2000/08/27 02:46:06 jlam Exp $ # DISTNAME= speak_freely-7.2 @@ -12,7 +12,6 @@ HOMEPAGE= http://www.fourmilab.ch/speakfree/unix/ DEPENDS+= gsm-1.0.10:../../audio/gsm USE_PERL5= # defined -PERL_PATH= ${LOCALBASE}/bin/perl RESTRICTED= Source includes crypto code NO_SRC_ON_FTP= ${RESTRICTED} @@ -49,7 +48,7 @@ LICENSE= no-commercial-use .endif SOUNDDIR= ${PREFIX}/share/speakfreely -MAKE_ENV+= PERL="${PERL_PATH}" CCFLAGS="${CCFLAGS}" \ +MAKE_ENV+= PERL="${PERL5}" CCFLAGS="${CCFLAGS}" \ SOUNDDIR="${SOUNDDIR}" MAKE_ENV+= USE_CRYPTO="${USE_CRYPTO}" HAVE_LIBCRYPTO="${HAVE_LIBCRYPTO}" \ SSLBASE="${SSLBASE}" USE_IDEA="${USE_IDEA}" diff --git a/news/inn/Makefile b/news/inn/Makefile index 6dc833460f5..ae63df2fe2c 100644 --- a/news/inn/Makefile +++ b/news/inn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2000/08/17 14:00:27 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2000/08/27 02:46:06 jlam Exp $ DISTNAME= inn-2.2.2 CATEGORIES= news @@ -13,9 +13,9 @@ CONFLICTS+= nntpclnt-* INN_DATA_DIR?= /var/news -USE_PERL5= yes -USE_LIBTOOL= yes -HAS_CONFIGURE= yes +USE_PERL5= # defined +USE_LIBTOOL= # defined +HAS_CONFIGURE= # defined CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM} --prefix=${PREFIX}/inn \ --mandir=${PREFIX}/man \ --with-perl --with-tmp-path=/tmp \ @@ -24,7 +24,7 @@ CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM} --prefix=${PREFIX}/inn \ --with-log-dir=${INN_DATA_DIR}/log \ --with-run-dir=${INN_DATA_DIR}/run \ --with-spool-dir=${INN_DATA_DIR}/spool -CONFIGURE_ENV+= _PATH_PERL=${LOCALBASE}/bin/perl +CONFIGURE_ENV+= _PATH_PERL=${PERL5} .include "../../mk/bsd.prefs.mk" diff --git a/news/trn/Makefile b/news/trn/Makefile index d07c4ba2a72..096ebaad687 100644 --- a/news/trn/Makefile +++ b/news/trn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2000/03/27 08:54:59 tron Exp $ +# $NetBSD: Makefile,v 1.8 2000/08/27 02:46:06 jlam Exp $ # DISTNAME= trn4-test72 @@ -23,34 +23,37 @@ DEPENDS= nntpclnt-1.6.1:../nntpclnt # foo.y.z.com for the purposes of allowing cancels. TRN_HOSTBITS?= 0 -USE_PERL5= yes +USE_PERL5= # defined -HAS_CONFIGURE= yes +HAS_CONFIGURE= # defined CONFIGURE_SCRIPT= ./Configure CONFIGURE_ENV= PREFIX=${PREFIX} CONFIGURE_ARGS= -d -e -D bin=${PREFIX}/bin \ - -D binexp=${PREFIX}/bin \ - -D phost=${PREFIX}'/etc/nntp/domainname' \ - -D filexp=${PREFIX}'/share/trn/filexp' \ - -D hostbits=${TRN_HOSTBITS} \ - -D installbin=${PREFIX}'/bin' \ - -D installmansrc=${PREFIX}'/man/man1' \ - -D installprivlib=${PREFIX}'/share/trn' \ - -D libpth=${PREFIX}'/lib /usr/lib' \ - -D mansrc=${PREFIX}'/man/man1' \ - -D mansrcexp=${PREFIX}'/man/man1' \ - -D mimecap=${PREFIX}'/etc/mimecap' \ - -D orgname=${PREFIX}'/etc/nntp/organization' \ - -D perl=${PREFIX}'/bin/perl' \ - -D perlpath=${PREFIX}'/bin/perl' \ - -D prefix=${PREFIX} \ - -D prefixexp=${PREFIX} \ - -D privlib=${PREFIX}'/share/trn' \ - -D privlibexp=${PREFIX}'/share/trn' \ - -D servername=${PREFIX}'/etc/nntp/server' \ - -D d_nntp -U d_local -D libs=' ' -D usevfork=false \ - -D inews=${PREFIX}'/bin/inews' \ - -D useinews=${PREFIX}'/bin/inews' + -D binexp=${PREFIX}/bin \ + -D phost=${PREFIX}'/etc/nntp/domainname' \ + -D filexp=${PREFIX}'/share/trn/filexp' \ + -D hostbits=${TRN_HOSTBITS} \ + -D installbin=${PREFIX}'/bin' \ + -D installmansrc=${PREFIX}'/man/man1' \ + -D installprivlib=${PREFIX}'/share/trn' \ + -D libpth=${PREFIX}'/lib /usr/lib' \ + -D mansrc=${PREFIX}'/man/man1' \ + -D mansrcexp=${PREFIX}'/man/man1' \ + -D mimecap=${PREFIX}'/etc/mimecap' \ + -D orgname=${PREFIX}'/etc/nntp/organization' \ + -D perl=${PERL5} \ + -D perlpath=${PERL5} \ + -D prefix=${PREFIX} \ + -D prefixexp=${PREFIX} \ + -D privlib=${PREFIX}'/share/trn' \ + -D privlibexp=${PREFIX}'/share/trn' \ + -D servername=${PREFIX}'/etc/nntp/server' \ + -D d_nntp \ + -U d_local \ + -D libs=' ' \ + -D usevfork=false \ + -D inews=${PREFIX}'/bin/inews' \ + -D useinews=${PREFIX}'/bin/inews' post-install: @${RM} -f ${PREFIX}/bin/rn ${PREFIX}/man/man1/rn.1 \ diff --git a/print/ghostscript-nox11/Makefile.common b/print/ghostscript-nox11/Makefile.common index 277f867dbfe..b98f0601907 100644 --- a/print/ghostscript-nox11/Makefile.common +++ b/print/ghostscript-nox11/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2000/07/26 08:10:14 itohy Exp $ +# $NetBSD: Makefile.common,v 1.4 2000/08/27 02:46:06 jlam Exp $ DISTNAME= ghostscript-${GS_VERS} GS_VERS= 6.01 @@ -136,7 +136,6 @@ MAKEFRAGS= ${FILESDIR}/devs.x11 .endif MAKEFRAGS+= ${FILESDIR}/devs.nox11 -PERL_PATH= ${LOCALBASE}/bin/perl GSINST_DIR= ${PREFIX}/share/ghostscript/${GS_VERS}vflib DOC_DIR= ${PREFIX}/share/doc/ghostscript LIB_DIR= ${GSINST_DIR}/lib @@ -196,7 +195,7 @@ do-configure: > ${WRKDIR}/unix-gcc.mak ${MV} -f ${WRKDIR}/unix-gcc.mak ${WRKSRC}/src - ${SED} -e "s,@PERL@,${PERL_PATH},g" \ + ${SED} -e "s,@PERL@,${PERL5},g" \ < ${WRKSRC}/lib/fixmswrd.pl.in > ${WRKSRC}/lib/fixmswrd.pl post-install: diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 71989b60b34..db795130e5a 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2000/08/21 21:01:33 hubertf Exp $ +# $NetBSD: Makefile,v 1.19 2000/08/27 02:46:06 jlam Exp $ # DISTNAME= openssl-0.9.5a @@ -11,7 +11,7 @@ HOMEPAGE= http://www.openssl.org/ CONFLICTS= SSLeay-* ssleay-* -USE_PERL5= yes +USE_PERL5= # defined RESTRICTED= "Crypto; export-controlled" NO_SRC_ON_FTP= ${RESTRICTED} @@ -68,10 +68,9 @@ pre-patch: # The Perl stuff doesn't work yet (nor did it work properly in SSLeay...) do-configure: - @cd ${WRKSRC} && ${LOCALBASE}/bin/perl util/perlpath.pl ${LOCALBASE}/bin + @cd ${WRKSRC} && ${PERL5} util/perlpath.pl ${LOCALBASE}/bin @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./config ${CONFIGURE_ARGS} -# @cd ${WRKSRC}/perl && ${SETENV} ${CONFIGURE_ENV} ${LOCALBASE}/bin/perl \ -# Makefile.PL +# @cd ${WRKSRC}/perl && ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL #post-build: # @cd ${WRKSRC}/perl && ${MAKE} diff --git a/sysutils/roller/Makefile b/sysutils/roller/Makefile index ce90031191a..70657ef30f3 100644 --- a/sysutils/roller/Makefile +++ b/sysutils/roller/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2000/06/10 18:06:27 kim Exp $ +# $NetBSD: Makefile,v 1.7 2000/08/27 02:46:07 jlam Exp $ # DISTNAME= roller-1.4 @@ -12,13 +12,13 @@ DEPENDS+= logtime-*:../../sysutils/logtime .include "../../mk/bsd.prefs.mk" -NO_CONFIGURE= yes -NO_PATCH= yes -USE_PERL5= yes +NO_CONFIGURE= # defined +NO_PATCH= # defined +USE_PERL5= # defined MAKE_PARAMS+= PREFIX=${PREFIX} MAKE_PARAMS+= GAWK=${AWK} -MAKE_PARAMS+= PERL=${LOCALBASE}/bin/perl +MAKE_PARAMS+= PERL=${PERL5} MAKE_PARAMS+= SH=${SH} ALL_TARGET= all ${MAKE_PARAMS} diff --git a/textproc/cdif/Makefile b/textproc/cdif/Makefile index e85bdbfe21c..2de2aac1254 100644 --- a/textproc/cdif/Makefile +++ b/textproc/cdif/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2000/03/16 14:08:38 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2000/08/27 02:46:07 jlam Exp $ # DISTNAME= cdif-1.15 @@ -8,19 +8,18 @@ EXTRACT_SUFX= # empty MAINTAINER= packages@netbsd.org -USE_PERL5= yes +USE_PERL5= # defined -NO_WRKSUBDIR= yes -NO_CONFIGURE= yes -NO_BUILD= yes +NO_WRKSUBDIR= # defined +NO_CONFIGURE= # defined +NO_BUILD= # defined do-extract: ${MKDIR} ${WRKSRC} ${CP} ${DISTDIR}/${DISTNAME} ${WRKSRC}/${DISTNAME}.dist -# assumes perl is in ${LOCALBASE}/bin/perl do-patch: - ${SED} -e '1s@/usr/local/bin/perl@${LOCALBASE}/bin/perl@' \ + ${SED} -e '1s@/usr/local/bin/perl@${PERL5}@' \ < ${WRKSRC}/${DISTNAME}.dist > ${WRKSRC}/${DISTNAME} do-install: diff --git a/textproc/texi2html/Makefile b/textproc/texi2html/Makefile index 852a27aa1bc..a986449491a 100644 --- a/textproc/texi2html/Makefile +++ b/textproc/texi2html/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 1999/04/01 14:07:56 agc Exp $ +# $NetBSD: Makefile,v 1.7 2000/08/27 02:46:07 jlam Exp $ # DISTNAME= texi2html @@ -10,17 +10,18 @@ EXTRACT_SUFX= .shar.Z MAINTAINER= tv@netbsd.org HOMEPAGE= http://wwwcn1.cern.ch/dci/texi2html/ -USE_PERL5= YES +USE_PERL5= # defined EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} | ${SH} -NO_WRKSUBDIR= yes -NO_CONFIGURE= yes +NO_WRKSUBDIR= # defined +NO_CONFIGURE= # defined do-build: cd ${WRKSRC}; \ - ${SED} -e s@/usr/local/bin/perl@${PREFIX}/bin/perl@ texi2html >texi2html.new; \ - ${SED} -e 1,/__END__/d texi2html >texi2html.1 + ${SED} -e s@/usr/local/bin/perl@${PERL5}@ \ + <texi2html >texi2html.new; \ + ${SED} -e 1,/__END__/d <texi2html >texi2html.1 do-install: ${INSTALL_SCRIPT} ${WRKSRC}/texi2html.new ${PREFIX}/bin/texi2html diff --git a/www/adzap/Makefile b/www/adzap/Makefile index 372f8256486..715bd18ac39 100644 --- a/www/adzap/Makefile +++ b/www/adzap/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2000/06/18 00:07:05 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2000/08/27 02:46:07 jlam Exp $ # DISTNAME= adzap-20000616 -CATEGORIES= www perl +CATEGORIES= www perl5 MASTER_SITES= http://www.zip.com.au/~cs/adzap/ MAINTAINER= packages@netbsd.org @@ -10,14 +10,14 @@ HOMEPAGE= http://www.zip.com.au/~cs/adzap/index.html MESSAGE_FILE= ${WRKDIR}/MESSAGE -NO_WRKSUBDIR= YES -NO_BUILD= YES -USE_PERL5= YES +NO_WRKSUBDIR= # defined +NO_BUILD= # defined +USE_PERL5= # defined do-configure: .for FILE in squid_redirect wrapzap ${CP} ${WRKSRC}/${FILE} ${WRKSRC}/${FILE}.orig - ${SED} -e "s:/usr/bin/perl:${PREFIX}/bin/perl:g" \ + ${SED} -e "s:/usr/bin/perl:${PERL5}:g" \ -e "s:@@PREFIX@@:${PREFIX}:g" \ <${WRKSRC}/${FILE}.orig >${WRKSRC}/${FILE} .endfor diff --git a/www/ap-php3/Makefile b/www/ap-php3/Makefile index 18956834c1c..6c0addd28b7 100644 --- a/www/ap-php3/Makefile +++ b/www/ap-php3/Makefile @@ -1,16 +1,16 @@ -# $NetBSD: Makefile,v 1.5 1999/11/21 22:12:59 tron Exp $ +# $NetBSD: Makefile,v 1.6 2000/08/27 02:46:07 jlam Exp $ # PKGNAME= ap-${DISTNAME} DEPENDS+= apache-1.3.*:../../www/apache -USE_PERL5= yes +USE_PERL5= # defined CONFIGURE_ARGS+= --with-apxs=${LOCALBASE}/sbin/apxs -CONFIGURE_ENV+= PERL_PATH=${LOCALBASE}/bin/perl +CONFIGURE_ENV+= PERL_PATH=${PERL5} -BUILDING_SERVER_MODULE=yes +BUILDING_SERVER_MODULE= yes do-install: @cd ${WRKSRC} && ${CP} libphp3.so mod_php3.so diff --git a/www/php3/Makefile b/www/php3/Makefile index 479dc730c6a..b7a1c6eb4c8 100644 --- a/www/php3/Makefile +++ b/www/php3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2000/06/13 10:40:27 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2000/08/27 02:46:08 jlam Exp $ # DISTNAME= php-${PHP_VERSION} @@ -10,7 +10,7 @@ DISTFILES+= ${DISTNAME}.tar.gz MAINTAINER= cjs@netbsd.org HOMEPAGE= http://www.php.net/ -BUILD_DEPENDS+= ${LOCALBASE}/bin/perl:../../lang/perl5 +BUILD_DEPENDS+= ${PERL5}:../../lang/perl5 DEPENDS+= gdbm>=1.7.3:../../databases/gdbm .include "../../mk/bsd.prefs.mk" @@ -29,7 +29,7 @@ PATCHDIR?= ${PKGSRCDIR}/www/php3/patches .endif # Here we configure only for what NetBSD ships. We add the rest via modules. -GNU_CONFIGURE= YES +GNU_CONFIGURE= # defined CONFIGURE_ARGS+=--with-system-regex --without-gd \ --with-gdbm=${PREFIX} \ --with-yp --with-zlib --with-dbase --with-filepro \ @@ -38,7 +38,7 @@ CONFIGURE_ARGS+=--with-system-regex --without-gd \ --enable-track-vars --enable-force-cgi-redirect \ --enable-discard-path --enable-memory-limit \ --enable-sysvsem --enable-sysvshm -CONFIGURE_ENV+= PERL_PATH=${LOCALBASE}/bin/perl +CONFIGURE_ENV+= PERL_PATH=${PERL5} .if !defined(BUILDING_EXTENSION_MODULE) CONFIGURE_ENV+= CPPFLAGS="-DPHP_INTERNAL_FUNCS" diff --git a/www/squid/Makefile b/www/squid/Makefile index 4af1a5fde9f..598b65d9391 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2000/05/19 07:18:55 tron Exp $ +# $NetBSD: Makefile,v 1.30 2000/08/27 02:46:08 jlam Exp $ DISTNAME= squid-2.3.STABLE3-src PKGNAME= squid-2.3s3 @@ -18,15 +18,15 @@ PATCHFILES= squid-2.3.stable3-carp_compile.patch \ MAINTAINER= tron@netbsd.org HOMEPAGE= http://www.squid-cache.org/ -BUILD_DEPENDS+= ${LOCALBASE}/bin/perl:../../lang/perl5 +BUILD_DEPENDS+= ${PERL5}:../../lang/perl5 -GNU_CONFIGURE= yes +GNU_CONFIGURE= # defined CONFIGURE_ARGS+= --sysconfdir=/etc \ --localstatedir=/var/squid \ ${SQUID_CONFIGURE_ARGS} CONFIGURE_ENV+= CACHE_HTTP_PORT=${SQUID_HTTP_PORT} \ CACHE_ICP_PORT=${SQUID_ICP_PORT} \ - PERL=${LOCALBASE}/bin/perl + PERL=${PERL5} BUILD_DEFS+= SQUID_CONFIGURE_ARGS SQUID_HTTP_PORT SQUID_ICP_PORT MAKEFILE= makefile diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile index ade0c30084c..705db859f6e 100644 --- a/x11/gnome-core/Makefile +++ b/x11/gnome-core/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2000/08/23 14:43:26 tron Exp $ +# $NetBSD: Makefile,v 1.49 2000/08/27 02:46:08 jlam Exp $ DISTNAME= gnome-core-1.2.1 CATEGORIES= x11 gnome @@ -38,7 +38,7 @@ post-patch: cd ${WRKSRC}; \ for FILE in ${PERL_SCRIPTS}; do \ ${CP} $$FILE $${FILE}.orig; \ - ${SED} -e 's#/usr/bin/perl#${LOCALBASE}/bin/perl#g' \ + ${SED} -e 's#/usr/bin/perl#${PERL5}#g' \ <$${FILE}.orig >$$FILE; \ done diff --git a/x11/wmweather/Makefile b/x11/wmweather/Makefile index 2c34a846392..b247aa08d31 100644 --- a/x11/wmweather/Makefile +++ b/x11/wmweather/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2000/05/12 05:57:52 rh Exp $ +# $NetBSD: Makefile,v 1.2 2000/08/27 02:46:08 jlam Exp $ # DISTNAME= wmWeather-1.31 @@ -11,12 +11,12 @@ HOMEPAGE= http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml DEPENDS+= windowmaker-*:../../x11/windowmaker -USE_PERL5= yes -USE_X11BASE= yes +USE_PERL5= # defined +USE_X11BASE= # defined do-configure: ${CP} ${WRKSRC}/GrabWeather ${WRKSRC}/GrabWeather.orig - ${SED} "s:/usr/bin/perl:${LOCALBASE}/bin/perl:g" \ + ${SED} "s:/usr/bin/perl:${PERL5}:g" \ <${WRKSRC}/GrabWeather.orig >${WRKSRC}/GrabWeather .include "../../mk/bsd.pkg.mk" |