Work with perl5.

Submitted by:	Don Croyle <croyle@gelemna.ft-wayne.in.us> (ports/7627)

6 files changed, 15 insertions, 210 deletions

diff --git a/news/inn-current/Makefile b/news/inn-current/Makefile
index 47e69ec74c93..31f199121460 100644
--- a/news/inn-current/Makefile
+++ b/news/inn-current/Makefile
@@ -3,14 +3,13 @@
 # Date created:		20 Oct 1994 (1.4), 18 Dec 1996 (1.5.1)
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.26 1998/02/10 06:05:23 andreas Exp $
+# $Id: Makefile,v 1.27 1998/02/11 17:58:27 andreas Exp $
 #
 
 DISTNAME=	inn-1.7.2
 CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.isc.org/isc/inn/
 
-
 MAINTAINER=	torstenb@FreeBSD.ORG
 
 # If you want PGP verification of control messages set PGPVERIFY to "DO"
@@ -22,7 +21,9 @@ PGPVERIFY?=	DONT
 USE_TCL?=	DONT
 USE_PERL5?=	DONT
 
-SCRIPTS_ENV+= PGPVERIFY=${PGPVERIFY} USE_TCL=${USE_TCL} USE_PERL5=${USE_PERL5}
+SCRIPTS_ENV=	PGPVERIFY=${PGPVERIFY} USE_TCL=${USE_TCL} \
+		USE_PERL5=${USE_PERL5} PERL_VERSION=${PERL_VERSION}
+		
 
 NO_PACKAGE=	"Too many compile-time options"
 MAN1=	convdate.1 getlist.1 grephistory.1 inews.1 innconfval.1 installit.1 \
@@ -69,7 +70,7 @@ post-install:
 	${MKDIR} ${PREFIX}/news/locks
 	chown news.news ${PREFIX}/news/locks
 	chmod 0755 ${PREFIX}/news/locks
-	sed <${FILESDIR}/innd.sh >${PREFIX}/etc/rc.d/innd.sh \
+	${SED} <${FILESDIR}/innd.sh >${PREFIX}/etc/rc.d/innd.sh \
 		s+!!PREFIX!!+${PREFIX}+g && chmod +x ${PREFIX}/etc/rc.d/innd.sh
 
 .include <bsd.port.mk>
diff --git a/news/inn-current/pkg-plist b/news/inn-current/pkg-plist
index 29c881e62ac5..0d4f61280d61 100644
--- a/news/inn-current/pkg-plist
+++ b/news/inn-current/pkg-plist
@@ -6,72 +6,6 @@ include/inndcomm.h
 include/libinn.h
 include/qio.h
 lib/libinn.a
-man/man1/getlist.1.gz
-man/man1/grephistory.1.gz
-man/man1/inews.1.gz
-man/man1/innconfval.1.gz
-man/man1/installit.1.gz
-man/man1/nntpget.1.gz
-man/man1/rnews.1.gz
-man/man1/shrinkfile.1.gz
-man/man1/subst.1.gz
-man/man1/convdate.1.gz
-man/man1/shlock.1.gz
-man/man3/dbz.3.gz
-man/man3/inndcomm.3.gz
-man/man3/libinn.3.gz
-man/man3/parsedate.3.gz
-man/man3/qio.3.gz
-man/man3/wildmat.3.gz
-man/man3/clientlib.3.gz
-man/man5/active.5.gz
-man/man5/distrib.pats.5.gz
-man/man5/expire.ctl.5.gz
-man/man5/history.5.gz
-man/man5/hosts.nntp.5.gz
-man/man5/inn.conf.5.gz
-man/man5/innwatch.ctl.5.gz
-man/man5/moderators.5.gz
-man/man5/newsfeeds.5.gz
-man/man5/newslog.5.gz
-man/man5/nntpsend.ctl.5.gz
-man/man5/overview.fmt.5.gz
-man/man5/passwd.nntp.5.gz
-man/man5/control.ctl.5.gz
-man/man5/nnrp.access.5.gz
-man/man8/archive.8.gz
-man/man8/batcher.8.gz
-man/man8/buffchan.8.gz
-man/man8/crosspost.8.gz
-man/man8/ctlinnd.8.gz
-man/man8/expire.8.gz
-man/man8/expireover.8.gz
-man/man8/expirerm.8.gz
-man/man8/fastrm.8.gz
-man/man8/filechan.8.gz
-man/man8/inncheck.8.gz
-man/man8/innd.8.gz
-man/man8/innlog.pl.8.gz
-man/man8/innwatch.8.gz
-man/man8/innxbatch.8.gz
-man/man8/innxmit.8.gz
-man/man8/makeactive.8.gz
-man/man8/makehistory.8.gz
-man/man8/nnrpd.8.gz
-man/man8/news.daily.8.gz
-man/man8/newslog.8.gz
-man/man8/nntpsend.8.gz
-man/man8/overchan.8.gz
-man/man8/prunehistory.8.gz
-man/man8/scanlogs.8.gz
-man/man8/tally.control.8.gz
-man/man8/writelog.8.gz
-man/man8/actsync.8.gz
-man/man8/cvtbatch.8.gz
-man/man8/innstat.8.gz
-man/man8/news-recovery.8.gz
-man/man8/newsrequeue.8.gz
-man/man8/tally.unwanted.8.gz
 sbin/innd
 sbin/inndstart
 sbin/in.nnrpd
diff --git a/news/inn-stable/Makefile b/news/inn-stable/Makefile
index 47e69ec74c93..31f199121460 100644
--- a/news/inn-stable/Makefile
+++ b/news/inn-stable/Makefile
@@ -3,14 +3,13 @@
 # Date created:		20 Oct 1994 (1.4), 18 Dec 1996 (1.5.1)
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.26 1998/02/10 06:05:23 andreas Exp $
+# $Id: Makefile,v 1.27 1998/02/11 17:58:27 andreas Exp $
 #
 
 DISTNAME=	inn-1.7.2
 CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.isc.org/isc/inn/
 
-
 MAINTAINER=	torstenb@FreeBSD.ORG
 
 # If you want PGP verification of control messages set PGPVERIFY to "DO"
@@ -22,7 +21,9 @@ PGPVERIFY?=	DONT
 USE_TCL?=	DONT
 USE_PERL5?=	DONT
 
-SCRIPTS_ENV+= PGPVERIFY=${PGPVERIFY} USE_TCL=${USE_TCL} USE_PERL5=${USE_PERL5}
+SCRIPTS_ENV=	PGPVERIFY=${PGPVERIFY} USE_TCL=${USE_TCL} \
+		USE_PERL5=${USE_PERL5} PERL_VERSION=${PERL_VERSION}
+		
 
 NO_PACKAGE=	"Too many compile-time options"
 MAN1=	convdate.1 getlist.1 grephistory.1 inews.1 innconfval.1 installit.1 \
@@ -69,7 +70,7 @@ post-install:
 	${MKDIR} ${PREFIX}/news/locks
 	chown news.news ${PREFIX}/news/locks
 	chmod 0755 ${PREFIX}/news/locks
-	sed <${FILESDIR}/innd.sh >${PREFIX}/etc/rc.d/innd.sh \
+	${SED} <${FILESDIR}/innd.sh >${PREFIX}/etc/rc.d/innd.sh \
 		s+!!PREFIX!!+${PREFIX}+g && chmod +x ${PREFIX}/etc/rc.d/innd.sh
 
 .include <bsd.port.mk>
diff --git a/news/inn-stable/pkg-plist b/news/inn-stable/pkg-plist
index 29c881e62ac5..0d4f61280d61 100644
--- a/news/inn-stable/pkg-plist
+++ b/news/inn-stable/pkg-plist
@@ -6,72 +6,6 @@ include/inndcomm.h
 include/libinn.h
 include/qio.h
 lib/libinn.a
-man/man1/getlist.1.gz
-man/man1/grephistory.1.gz
-man/man1/inews.1.gz
-man/man1/innconfval.1.gz
-man/man1/installit.1.gz
-man/man1/nntpget.1.gz
-man/man1/rnews.1.gz
-man/man1/shrinkfile.1.gz
-man/man1/subst.1.gz
-man/man1/convdate.1.gz
-man/man1/shlock.1.gz
-man/man3/dbz.3.gz
-man/man3/inndcomm.3.gz
-man/man3/libinn.3.gz
-man/man3/parsedate.3.gz
-man/man3/qio.3.gz
-man/man3/wildmat.3.gz
-man/man3/clientlib.3.gz
-man/man5/active.5.gz
-man/man5/distrib.pats.5.gz
-man/man5/expire.ctl.5.gz
-man/man5/history.5.gz
-man/man5/hosts.nntp.5.gz
-man/man5/inn.conf.5.gz
-man/man5/innwatch.ctl.5.gz
-man/man5/moderators.5.gz
-man/man5/newsfeeds.5.gz
-man/man5/newslog.5.gz
-man/man5/nntpsend.ctl.5.gz
-man/man5/overview.fmt.5.gz
-man/man5/passwd.nntp.5.gz
-man/man5/control.ctl.5.gz
-man/man5/nnrp.access.5.gz
-man/man8/archive.8.gz
-man/man8/batcher.8.gz
-man/man8/buffchan.8.gz
-man/man8/crosspost.8.gz
-man/man8/ctlinnd.8.gz
-man/man8/expire.8.gz
-man/man8/expireover.8.gz
-man/man8/expirerm.8.gz
-man/man8/fastrm.8.gz
-man/man8/filechan.8.gz
-man/man8/inncheck.8.gz
-man/man8/innd.8.gz
-man/man8/innlog.pl.8.gz
-man/man8/innwatch.8.gz
-man/man8/innxbatch.8.gz
-man/man8/innxmit.8.gz
-man/man8/makeactive.8.gz
-man/man8/makehistory.8.gz
-man/man8/nnrpd.8.gz
-man/man8/news.daily.8.gz
-man/man8/newslog.8.gz
-man/man8/nntpsend.8.gz
-man/man8/overchan.8.gz
-man/man8/prunehistory.8.gz
-man/man8/scanlogs.8.gz
-man/man8/tally.control.8.gz
-man/man8/writelog.8.gz
-man/man8/actsync.8.gz
-man/man8/cvtbatch.8.gz
-man/man8/innstat.8.gz
-man/man8/news-recovery.8.gz
-man/man8/newsrequeue.8.gz
-man/man8/tally.unwanted.8.gz
 sbin/innd
 sbin/inndstart
 sbin/in.nnrpd
diff --git a/news/inn/Makefile b/news/inn/Makefile
index 47e69ec74c93..31f199121460 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -3,14 +3,13 @@
 # Date created:		20 Oct 1994 (1.4), 18 Dec 1996 (1.5.1)
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.26 1998/02/10 06:05:23 andreas Exp $
+# $Id: Makefile,v 1.27 1998/02/11 17:58:27 andreas Exp $
 #
 
 DISTNAME=	inn-1.7.2
 CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.isc.org/isc/inn/
 
-
 MAINTAINER=	torstenb@FreeBSD.ORG
 
 # If you want PGP verification of control messages set PGPVERIFY to "DO"
@@ -22,7 +21,9 @@ PGPVERIFY?=	DONT
 USE_TCL?=	DONT
 USE_PERL5?=	DONT
 
-SCRIPTS_ENV+= PGPVERIFY=${PGPVERIFY} USE_TCL=${USE_TCL} USE_PERL5=${USE_PERL5}
+SCRIPTS_ENV=	PGPVERIFY=${PGPVERIFY} USE_TCL=${USE_TCL} \
+		USE_PERL5=${USE_PERL5} PERL_VERSION=${PERL_VERSION}
+		
 
 NO_PACKAGE=	"Too many compile-time options"
 MAN1=	convdate.1 getlist.1 grephistory.1 inews.1 innconfval.1 installit.1 \
@@ -69,7 +70,7 @@ post-install:
 	${MKDIR} ${PREFIX}/news/locks
 	chown news.news ${PREFIX}/news/locks
 	chmod 0755 ${PREFIX}/news/locks
-	sed <${FILESDIR}/innd.sh >${PREFIX}/etc/rc.d/innd.sh \
+	${SED} <${FILESDIR}/innd.sh >${PREFIX}/etc/rc.d/innd.sh \
 		s+!!PREFIX!!+${PREFIX}+g && chmod +x ${PREFIX}/etc/rc.d/innd.sh
 
 .include <bsd.port.mk>
diff --git a/news/inn/pkg-plist b/news/inn/pkg-plist
index 29c881e62ac5..0d4f61280d61 100644
--- a/news/inn/pkg-plist
+++ b/news/inn/pkg-plist
@@ -6,72 +6,6 @@ include/inndcomm.h
 include/libinn.h
 include/qio.h
 lib/libinn.a
-man/man1/getlist.1.gz
-man/man1/grephistory.1.gz
-man/man1/inews.1.gz
-man/man1/innconfval.1.gz
-man/man1/installit.1.gz
-man/man1/nntpget.1.gz
-man/man1/rnews.1.gz
-man/man1/shrinkfile.1.gz
-man/man1/subst.1.gz
-man/man1/convdate.1.gz
-man/man1/shlock.1.gz
-man/man3/dbz.3.gz
-man/man3/inndcomm.3.gz
-man/man3/libinn.3.gz
-man/man3/parsedate.3.gz
-man/man3/qio.3.gz
-man/man3/wildmat.3.gz
-man/man3/clientlib.3.gz
-man/man5/active.5.gz
-man/man5/distrib.pats.5.gz
-man/man5/expire.ctl.5.gz
-man/man5/history.5.gz
-man/man5/hosts.nntp.5.gz
-man/man5/inn.conf.5.gz
-man/man5/innwatch.ctl.5.gz
-man/man5/moderators.5.gz
-man/man5/newsfeeds.5.gz
-man/man5/newslog.5.gz
-man/man5/nntpsend.ctl.5.gz
-man/man5/overview.fmt.5.gz
-man/man5/passwd.nntp.5.gz
-man/man5/control.ctl.5.gz
-man/man5/nnrp.access.5.gz
-man/man8/archive.8.gz
-man/man8/batcher.8.gz
-man/man8/buffchan.8.gz
-man/man8/crosspost.8.gz
-man/man8/ctlinnd.8.gz
-man/man8/expire.8.gz
-man/man8/expireover.8.gz
-man/man8/expirerm.8.gz
-man/man8/fastrm.8.gz
-man/man8/filechan.8.gz
-man/man8/inncheck.8.gz
-man/man8/innd.8.gz
-man/man8/innlog.pl.8.gz
-man/man8/innwatch.8.gz
-man/man8/innxbatch.8.gz
-man/man8/innxmit.8.gz
-man/man8/makeactive.8.gz
-man/man8/makehistory.8.gz
-man/man8/nnrpd.8.gz
-man/man8/news.daily.8.gz
-man/man8/newslog.8.gz
-man/man8/nntpsend.8.gz
-man/man8/overchan.8.gz
-man/man8/prunehistory.8.gz
-man/man8/scanlogs.8.gz
-man/man8/tally.control.8.gz
-man/man8/writelog.8.gz
-man/man8/actsync.8.gz
-man/man8/cvtbatch.8.gz
-man/man8/innstat.8.gz
-man/man8/news-recovery.8.gz
-man/man8/newsrequeue.8.gz
-man/man8/tally.unwanted.8.gz
 sbin/innd
 sbin/inndstart
 sbin/in.nnrpd