From 685c63f39fc2a7bd2c6a367f7e562fc86dd4ab85 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Sun, 27 Aug 2000 02:46:03 +0000
Subject: Use new PERL5 variable instead of ${LOCALBASE}/bin/perl.

---
 news/inn/Makefile | 10 +++++-----
 news/trn/Makefile | 53 ++++++++++++++++++++++++++++-------------------------
 2 files changed, 33 insertions(+), 30 deletions(-)

(limited to 'news')

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 \
-- 
cgit v1.2.3