base version update to 2.2b7.

added important files into pkg/PLIST.
portlint.

2 files changed, 66 insertions, 16 deletions

diff --git a/news/nntpcache/Makefile b/news/nntpcache/Makefile
index 7fa1a4dfa655..2427a65995f5 100644
--- a/news/nntpcache/Makefile
+++ b/news/nntpcache/Makefile
@@ -1,32 +1,49 @@
 # New ports collection makefile for:	nntpcache
-# Version required:	1.0.7.1
+# Version required:	2.2b7
 # Date created:		6 January 1997
 # Whom:			proff@suburbia.net
 #
-# $Id: Makefile,v 1.8 1998/01/25 16:52:44 steve Exp $
+# $Id: Makefile,v 1.7 1997/12/24 01:21:28 alex Exp $
 #
 
-DISTNAME=	nntpcache-2.2b4
+DISTNAME=	nntpcache-2.2b7
 CATEGORIES=	news
 MASTER_SITES=	ftp://nntpcache.org/pub/nntpcache/ \
 		ftp://ftp.ntnu.no/pub/unix/news/ \
 		ftp://ftp.nethelp.no/pub/unix/news/ \
 		ftp://suburbia.net/pub/nntpcache/
 
-BUILD_DEPENDS=	pgp:${PORTSDIR}/security/pgp
 MAINTAINER=	nntpcache@nntpcache.org
 
+BUILD_DEPENDS=	pgp:${PORTSDIR}/security/pgp
+
 GNU_CONFIGURE=	TRUE
 CONFIGURE_ARGS=	--localstatedir=/var/spool
-MAN8=		newshound.8 nntpcached.8
+MAN8=		nntpcached.8 newshound.8
+DOCS=		AUTHORS ChangeLog FAQ FAQ.html HACKING \
+		INSTALL LICENSING NEWS README README.INN VERSION
 
 USE_GMAKE=	TRUE
 
 post-configure:
-	@sed -e "s:%%PREFIX%%:${PREFIX}:g"  \
+	@${SED} -e "s:%%PREFIX%%:${PREFIX}:g"  \
 		${FILESDIR}/nntpcached.rc > ${WRKSRC}/nntpcached.sh
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/nntpcached.sh ${PREFIX}/etc/rc.d
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${PREFIX}/share/doc/nntpcache
+	for i in ${DOCS}; do \
+		${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/doc/nntpcache; \
+	done
+.endif
+	${INSTALL_SCRIPT} ${WRKSRC}/nntpcached.sh \
+		${PREFIX}/etc/rc.d/nntpcached.sh.sample
+#	for i in ${PREFIX}/etc/nntpcache/*asc-dist ${PREFIX}/etc/nntpcache/*pgp-dist ; do \
+#		j=`echo $$i | sed -e 's/-dist//'`; \
+#		if [ \! -f $$j ]; then \
+#			ln $$i $$j; \
+#		fi; \
+#	done
+	@${SED} -e 's#/usr/local#${PREFIX}#' ${PKGDIR}/MESSAGE
 
 .include <bsd.port.mk>
diff --git a/news/nntpcache/pkg-plist b/news/nntpcache/pkg-plist
index a2df4e7fc1eb..f532ea871e77 100644
--- a/news/nntpcache/pkg-plist
+++ b/news/nntpcache/pkg-plist
@@ -1,15 +1,48 @@
+@comment dig /var/spool/nntpcache
+@exec mkdir -p /var/spool/nntpcache
+bin/confused
+bin/mmap_tests
+etc/nntpcache/VERSION
+@exec cp %D/%F /var/spool/nntpcache
+@exec chown -R news.news /var/spool/nntpcache
+@exec chmod 700 /var/spool/nntpcache
+@exec chmod 600 /var/spool/nntpcache/VERSION
+etc/nntpcache/automoose1.asc-dist
+etc/nntpcache/cancelmoose.asc-dist
+etc/nntpcache/clewis.asc-dist
+etc/nntpcache/cosmo.roadkill.asc-dist
+etc/nntpcache/dsr.asc-dist
+etc/nntpcache/jem.asc-dist
+etc/nntpcache/jeremy.asc-dist
+etc/nntpcache/msfc-anti-mmf-2.asc-dist
+etc/nntpcache/newshound.conf-dist
 etc/nntpcache/nntpcache.access-dist
 etc/nntpcache/nntpcache.config-dist
 etc/nntpcache/nntpcache.servers-dist
+etc/nntpcache/pubring.pgp-dist
+etc/nntpcache/rbraver.asc-dist
+etc/nntpcache/red.asc-dist
+etc/nntpcache/roberto.asc-dist
+etc/nntpcache/snowhare.asc-dist
 etc/nntpcache/spam.filter
-etc/nntpcache/pubring.pgp
-etc/nntpcache/VERSION
-etc/nntpcache/newshound.conf
-@unexec rm -rf etc/nntpcache
-etc/rc.d/nntpcached.sh
-bin/confused
-sbin/nntpcached
-sbin/newshound
-man/man8/nntpcached.8.gz
+etc/nntpcache/spamhippo.asc-dist
+etc/rc.d/nntpcached.sh.sample
+include/mmap_results.h
 man/man8/newshound.8.gz
+man/man8/nntpcached.8.gz
+sbin/newshound
+sbin/nntpcached
+share/doc/nntpcache/AUTHORS
+share/doc/nntpcache/ChangeLog
+share/doc/nntpcache/FAQ
+share/doc/nntpcache/FAQ.html
+share/doc/nntpcache/HACKING
+share/doc/nntpcache/INSTALL
+share/doc/nntpcache/LICENSING
+share/doc/nntpcache/NEWS
+share/doc/nntpcache/README
+share/doc/nntpcache/README.INN
+share/doc/nntpcache/VERSION
+@dirrm etc/nntpcache
+@dirrm share/doc/nntpcache
 @unexec rm -rf /var/spool/nntpcache