Overhaul for the inn ports:

- Turn inn-stable and inn-current into slaves, as they are pretty much
  clones of news/inn.
- Update the above ports to recent snapshots.
- Allow inn's database and spool directories to be placed outside
  PREFIX (e.g. under /var).
- Add OPTIONS knobs.

8 files changed, 32 insertions, 598 deletions

diff --git a/news/inn-current/Makefile b/news/inn-current/Makefile
index 51e4d77c1e8..e8e4c7cb4e8 100644
--- a/news/inn-current/Makefile
+++ b/news/inn-current/Makefile
@@ -5,184 +5,22 @@
 # $FreeBSD$
 #
 
-PORTNAME=	inn
 PORTVERSION=	${SNAPSHOT}
-PORTREVISION=	1
-CATEGORIES=	news ipv6
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	clement
+PORTREVISION=	1			# Ensure master is overridden
+MASTER_SITE_ISC?=			# Empty
+MASTER_SITES=	${MASTER_SITE_ISC:C/$/ ${MASTER_SITE_LOCAL:C/%SUBDIR%/shaun/g}/1}
+MASTER_SITE_SUBDIR=	inn/snapshots
 PKGNAMESUFFIX=	-${BRANCH}
 DISTNAME=	${PORTNAME}-${BRANCH:U}-${SNAPSHOT}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	InterNetNews -- the Internet meets Netnews
-
 BRANCH=		current
-SNAPSHOT=	20040118
-
-NO_LATEST_LINK=	yes
-USE_GMAKE=	yes
-USE_PERL5=	yes
-USE_OPENSSL=	yes
-
-CONFLICTS=	inn-2.4* inn-stable-*
-
-.if exists(/var/news) && !defined(PACKAGE_BUILDING)
-INN_NEWSSPOOL?=/var/news
-.elif exists(/var/spool/news) && !defined(PACKAGE_BUILDING)
-INN_NEWSSPOOL?=/var/spool/news
-.else
-INN_NEWSSPOOL?=${PREFIX}/news/spool
-.endif
-INN_NEWSLOG?=/var/log/news
-
-HAS_CONFIGURE=		yes
-CONFIGURE_ENV+=		LOCALBASE=${LOCALBASE}
-CONFIGURE_ARGS+=	--mandir=${PREFIX}/man \
-			--prefix=${PREFIX}/news \
-			--with-spool-dir=${INN_NEWSSPOOL} \
-			--with-log-dir=${INN_NEWSLOG} \
-			--with-perl \
-			--with-tmp-dir=${INN_NEWSSPOOL}/tmp \
-			--with-openssl=${OPENSSLBASE} \
-			--with-etc-dir=${ETC_DIR}
-
-.if !defined(WITHOUT_IPV6)
-CONFIGURE_ARGS+=	--enable-ipv6
-.endif
-
-.if defined(WITH_BERKELEYDB)
-.    if !defined(WITH_BDB_VER)
-WITH_BDB_VER=	41
-.    endif
-.    if (${WITH_BDB_VER} == 3) || (${WITH_BDB_VER} == 4) || (${WITH_BDB_VER} == 41)
-LIB_DEPENDS+=	db${WITH_BDB_VER}:${PORTSDIR}/databases/db${WITH_BDB_VER}
-.    elif ${WITH_BDB_VER} == 2
-BROKEN=		does not compile with db2
-.    else
-BROKEN=		unknown BerkeleyDB version
-.    endif
-CONFIGURE_ENV+=		DB_VER=db${WITH_BDB_VER}
-CONFIGURE_ARGS+=	--with-berkeleydb=${LOCALBASE}
-.endif
-
-.if defined(WITH_PYTHON)
-USE_PYTHON=		YES
-CONFIGURE_ARGS+=	--with-python
-.endif
-
-.if defined(WITH_TCL)
-CONFIGURE_ARGS+=	--with-tcl=${LOCALBASE}
-BUILD_DEPENDS+=		${LOCALBASE}/include/tcl8.3/tcl.h:${PORTSDIR}/lang/tcl83
-.endif
-
-.if defined (WITH_MAXSOCKET)
-CONFIGURE_ARGS+=	--with-max-sockets=${WITH_MAXSOCKET}
-.endif
-
-.if defined(WITH_KEYWORDS)
-CONFIGURE_ARGS+=	--enable-keywords
-.endif
-
-.if defined(WITH_SASL)
-CONFIGURE_ARGS+=	--with-sasl=${LOCALBASE}
-LIB_DEPENDS+=		sasl2:${PORTSDIR}/security/cyrus-sasl2
-.endif
-
-.if defined(WITH_TAGGED_HASH)
-CONFIGURE_ARGS+=	--enable-tagged-hash
-DBZ_FILES=		dir pag
-PLIST_SUB=		SUB_WITH_TAGGED_HASH=""
-PLIST_SUB+=		SUB_WITHOUT_TAGGED_HASH="@comment "
-.else
-CONFIGURE_ARGS+=	--enable-largefiles
-DBZ_FILES=		dir hash index
-PLIST_SUB=		SUB_WITH_TAGGED_HASH="@comment "
-PLIST_SUB+=		SUB_WITHOUT_TAGGED_HASH=""
-.endif
-
-EXTRA=		CONTRIBUTORS HACKING INSTALL LICENSE MANIFEST NEWS README TODO
-HEADERS=	clibrary.h config.h dbz.h libinn.h storage.h
-
-MAN1=	convdate.1 fastrm.1 getlist.1 grephistory.1 inews.1 innconfval.1 \
-	innfeed.1 innmail.1 nntpget.1 pgpverify.1 rnews.1 shlock.1 \
-	shrinkfile.1 simpleftp.1 sm.1
-MAN3=	clientlib.3 dbz.3 inndcomm.3 libauth.3 libinn.3 libinnhist.3 \
-	libstorage.3 list.3 parsedate.3 qio.3 tst.3 uwildmat.3
-MAN5=	active.5 active.times.5 buffindexed.conf.5 control.ctl.5 \
-	cycbuff.conf.5 distrib.pats.5 expire.ctl.5 history.5 incoming.conf.5 \
-	inn.conf.5 innfeed.conf.5 innwatch.ctl.5 moderators.5 motd.news.5 \
-	newsfeeds.5 newslog.5 nnrpd.track.5 nntpsend.ctl.5 ovdb.5 \
-	overview.fmt.5 passwd.nntp.5 radius.conf.5 readers.conf.5 \
-	sasl.conf.5 storage.conf.5 subscriptions.5
-MAN8=	actsync.8 actsyncd.8 archive.8 auth_smb.8 batcher.8 buffchan.8 \
-	ckpasswd.8 cnfsheadconf.8 cnfsstat.8 controlchan.8 ctlinnd.8 \
-	cvtbatch.8 domain.8 expire.8 expireover.8 expirerm.8 filechan.8 \
-	ident.8 innbind.8 inncheck.8 innd.8 inndf.8 innreport.8 innstat.8 \
-	innupgrade.8 innwatch.8 innxbatch.8 innxmit.8 mailpost.8 makedbz.8 \
-	makehistory.8 mod-active.8 news.daily.8 news2mail.8 ninpaths.8 \
-	nnrpd.8 nntpsend.8 ovdb_init.8 ovdb_monitor.8 ovdb_server.8 \
-	ovdb_stat.8 overchan.8 perl-nocem.8 prunehistory.8 pullnews.8 \
-	radius.8 rc.news.8 scanlogs.8 send-nntp.8 send-uucp.8 sendinpaths.8 \
-	tally.control.8 tdx-util.8 writelog.8
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "ia64"
-BROKEN=		does not compile on ${ARCH}
-.endif
+SNAPSHOT=	20061024
 
-.if defined(WITH_STANDARD_ETC)
-ETC_DIR=	${PREFIX}/etc/inn
-PLIST_SUB+=	ETCDIR="etc/inn"
-.else
-ETC_DIR=	${PREFIX}/news/etc
-PLIST_SUB+=	ETCDIR=news/etc
-.endif
+CONFLICTS=	inn-2.[0-9]* inn-stable-[0-9]*
 
-post-patch:
-	@${REINPLACE_CMD} -e 's!/usr/local!${LOCALBASE}!' ${WRKSRC}/configure
-.if defined(WITH_TCL)
-	@${REINPLACE_CMD} -e 's!<tcl.h>!<tcl8.3/tcl.h>!' ${WRKSRC}/innd/innd.h
-	@${REINPLACE_CMD} -e 's!-ltcl!-ltcl83!' ${WRKSRC}/configure
-.endif
+PATCHDIR=	${.CURDIR}/files
+MD5_FILE=	${.CURDIR}/distinfo
 
-post-install:
-	${CHOWN} root:wheel ${PREFIX}/man ${PREFIX}/man/man1 ${PREFIX}/man/man3 \
-		${PREFIX}/man/man5 ${PREFIX}/man/man8
-	${MKDIR} ${INN_NEWSSPOOL}
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for FILE in ${EXTRA}
-	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
-.endfor
-.endif
-	${MKDIR} ${PREFIX}/news/include
-.for FILE in ${HEADERS}
-	${INSTALL_DATA} ${WRKSRC}/include/${FILE} ${PREFIX}/news/include/
-.endfor
-	@${SED} <${FILESDIR}/innd.sh >${PREFIX}/etc/rc.d/innd.sh \
-	    s+!!PREFIX!!+${PREFIX}+g && ${CHMOD} +x ${PREFIX}/etc/rc.d/innd.sh
-	@${CHOWN} root:news ${PREFIX}/news/bin/auth/passwd/ckpasswd
-	@${CHMOD} 4755 ${PREFIX}/news/bin/auth/passwd/ckpasswd
-	@${FIND} ${WRKSRC} -name "inn.conf" \
-	    | ${XARGS} ${REINPLACE_CMD} -e 's/^pathhost:.*/pathhost:               host.example.com/'
-	@PKG_PREFIX=${PKG_PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} CHECK-CONF ${ETC_DIR}
-	@(if [ ! -f ${PREFIX}/news/db/history ] ; then \
-	    ${ECHO} 'Creating empty history database...' ; \
-	    cd ${PREFIX}/news/db ; \
-	    ${TOUCH} history ; \
-	    ${CHMOD} 644 history ; \
-	    ${CHOWN} news:news history ; \
-	    su -fm news -c "../bin/makedbz -i" ; \
-	    for s in ${DBZ_FILES}  ; do \
-		${MV} history.n.$${s} history.$${s} ; \
-	    done ; \
-	fi)
-	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-	@${ECHO_MSG} "*********************** WARNING ***********************"
-	@${ECHO_MSG} "  This port may NOT work correctly. It has been made"
-	@${ECHO_MSG} "  for people who want to track inn-CURRENT via the"
-	@${ECHO_MSG} "  FreeBSD ports tree."
+MASTERDIR=	${.CURDIR}/../inn
 
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/news/inn-current/distinfo b/news/inn-current/distinfo
index 8b2a1930a87..9e3e74f640e 100644
--- a/news/inn-current/distinfo
+++ b/news/inn-current/distinfo
@@ -1,3 +1,3 @@
-MD5 (inn-CURRENT-20040118.tar.gz) = b1c986626a3aa9e184b3630e5c587d76
-SHA256 (inn-CURRENT-20040118.tar.gz) = 6bf93fcae03e06bf9153282048d3b522388852c98c9c03c23f054a6c7c5d33ba
-SIZE (inn-CURRENT-20040118.tar.gz) = 1957520
+MD5 (inn-CURRENT-20061024.tar.gz) = a052ce18e47c6e16ecc3fa566b960b40
+SHA256 (inn-CURRENT-20061024.tar.gz) = 01302c2a89a3a61721c0dcc208cfe5434a944b485579c3bd7201969313e755c4
+SIZE (inn-CURRENT-20061024.tar.gz) = 2152219
diff --git a/news/inn-current/files/innd.sh b/news/inn-current/files/innd.sh
deleted file mode 100644
index 1bcc4f7b5ad..00000000000
--- a/news/inn-current/files/innd.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-if [ $# -eq 0 -o x$1 = xstart ]; then
-   if [ -x !!PREFIX!!/news/bin/rc.news -a -f !!PREFIX!!/news/db/history.dir ]; then
-      su -fm news -c !!PREFIX!!/news/bin/rc.news && echo ' inn'
-   fi
-fi
-if [ x$1 = xstop ]; then
-      su -fm news -c '!!PREFIX!!/news/bin/rc.news stop'
-fi
diff --git a/news/inn-current/files/patch-configure b/news/inn-current/files/patch-configure
index 752d1c658b7..83c031ddbbf 100644
--- a/news/inn-current/files/patch-configure
+++ b/news/inn-current/files/patch-configure
@@ -1,13 +1,14 @@
---- configure.orig	Mon Jan 12 06:10:08 2004
-+++ configure	Thu Jan 22 11:40:42 2004
-@@ -10949,51 +10949,11 @@
-     echo "$as_me:$LINENO: checking for Berkeley DB location" >&5
- echo $ECHO_N "checking for Berkeley DB location... $ECHO_C" >&6
+--- configure.orig	Tue Oct 24 18:54:13 2006
++++ configure	Tue Oct 24 20:49:19 2006
+@@ -24229,52 +24229,11 @@
+     { echo "$as_me:$LINENO: checking for Berkeley DB location" >&5
+ echo $ECHO_N "checking for Berkeley DB location... $ECHO_C" >&6; }
  
 -        if test x"$DB_DIR" = xyes ; then
--        for version in BerkeleyDB.4.1 BerkeleyDB.4.0 BerkeleyDB.3.3 \
--                       BerkeleyDB.3.2 BerkeleyDB.3.1 BerkeleyDB.3.0 \
--                       BerkeleyDB ; do
+-        for version in BerkeleyDB.4.4 BerkeleyDB.4.3 BerkeleyDB.4.2 \
+-                       BerkeleyDB.4.1 BerkeleyDB.4.0 \
+-                       BerkeleyDB.3.3 BerkeleyDB.3.2 BerkeleyDB.3.1 \
+-                       BerkeleyDB.3.0 BerkeleyDB ; do
 -            if test -d "/usr/local/$version" ; then
 -                DB_DIR=/usr/local/$version
 -                break
@@ -16,40 +17,40 @@
 -    fi
 -
 -            if test x"$DB_DIR" = xyes ; then
--        for version in db41 db4 db3 db2 ; do
+-        for version in db44 db43 db42 db41 db4 db3 db2 ; do
 -            if test -d "/usr/local/include/$version" ; then
 -                DB_CPPFLAGS="-I/usr/local/include/$version"
 +                DB_CPPFLAGS="-I/usr/local/include/${DB_VER}"
                  DB_LDFLAGS="-L/usr/local/lib"
 -                DB_LIBS="-l$version"
 +                DB_LIBS="-l${DB_VER}"
-                 echo "$as_me:$LINENO: result: FreeBSD locations" >&5
- echo "${ECHO_T}FreeBSD locations" >&6
+                 { echo "$as_me:$LINENO: result: FreeBSD locations" >&5
+ echo "${ECHO_T}FreeBSD locations" >&6; }
 -                break
 -            fi
 -        done
 -        if test x"$DB_LIBS" = x ; then
--            for version in db41 db4 db3 db2 ; do
+-            for version in db44 db43 db42 db41 db4 db3 db2 ; do
 -                if test -d "/usr/include/$version" ; then
 -                    DB_CPPFLAGS="-I/usr/include/$version"
 -                    DB_LIBS="-l$version"
--                    echo "$as_me:$LINENO: result: Red Hat locations" >&5
--echo "${ECHO_T}Red Hat locations" >&6
+-                    { echo "$as_me:$LINENO: result: Red Hat locations" >&5
+-echo "${ECHO_T}Red Hat locations" >&6; }
 -                    break
 -                fi
 -            done
 -            if test x"$DB_LIBS" = x ; then
 -                DB_LIBS=-ldb
--                echo "$as_me:$LINENO: result: trying -ldb" >&5
--echo "${ECHO_T}trying -ldb" >&6
+-                { echo "$as_me:$LINENO: result: trying -ldb" >&5
+-echo "${ECHO_T}trying -ldb" >&6; }
 -            fi
 -        fi
 -    else
 -        DB_CPPFLAGS="-I$DB_DIR/include"
 -        DB_LDFLAGS="-L$DB_DIR/lib"
 -        DB_LIBS="-ldb"
--        echo "$as_me:$LINENO: result: $DB_DIR" >&5
--echo "${ECHO_T}$DB_DIR" >&6
+-        { echo "$as_me:$LINENO: result: $DB_DIR" >&5
+-echo "${ECHO_T}$DB_DIR" >&6; }
 -    fi
  
  cat >>confdefs.h <<\_ACEOF
diff --git a/news/inn-current/files/patch-site::Makefile b/news/inn-current/files/patch-site::Makefile
deleted file mode 100644
index 5a22a277e00..00000000000
--- a/news/inn-current/files/patch-site::Makefile
+++ /dev/null
@@ -1,88 +0,0 @@
---- site/Makefile.orig	Sat Jul 12 21:11:02 2003
-+++ site/Makefile	Sun Sep 21 12:53:00 2003
-@@ -23,29 +23,29 @@
- PATH_NNRPAUTH           = ${PATHFILTER}/nnrpd_auth.pl
- PATH_NNRPYAUTH          = ${PATHFILTER}/nnrpd_auth.py
- 
--PATH_CONFIG		= ${PATHETC}/inn.conf
--PATH_CONTROLCTL		= ${PATHETC}/control.ctl
--PATH_EXPIRECTL		= ${PATHETC}/expire.ctl
--PATH_INNDHOSTS		= ${PATHETC}/incoming.conf
--PATH_MODERATORS		= ${PATHETC}/moderators
--PATH_DISTPATS		= ${PATHETC}/distrib.pats
--PATH_NEWSFEEDS		= ${PATHETC}/newsfeeds
--PATH_READERSCONF	= ${PATHETC}/readers.conf
--PATH_NNRPDTRACK		= ${PATHETC}/nnrpd.track
--PATH_SCHEMA		= ${PATHETC}/overview.fmt
--PATH_NNTPPASS		= ${PATHETC}/passwd.nntp
--PATH_CTLWATCH		= ${PATHETC}/innwatch.ctl
--PATH_ACTSYNC_IGN	= ${PATHETC}/actsync.ign
--PATH_ACTSYNC_CFG	= ${PATHETC}/actsync.cfg
--PATH_MOTD		= ${PATHETC}/motd.news
--PATH_STORAGECONF	= ${PATHETC}/storage.conf
--PATH_CYCBUFFCONFIG	= ${PATHETC}/cycbuff.conf
--PATH_INNFEEDCTL		= ${PATHETC}/innfeed.conf
--PATH_BUFFINDEXED	= ${PATHETC}/buffindexed.conf
--PATH_RADIUS_CONF	= ${PATHETC}/radius.conf
--PATH_OVDB_CONF		= ${PATHETC}/ovdb.conf
--PATH_SASL_CONF		= ${PATHETC}/sasl.conf
--PATH_SUBSCRIPTIONS	= ${PATHETC}/subscriptions
-+PATH_CONFIG		= ${PATHETC}/inn.conf.dist
-+PATH_CONTROLCTL		= ${PATHETC}/control.ctl.dist
-+PATH_EXPIRECTL		= ${PATHETC}/expire.ctl.dist
-+PATH_INNDHOSTS		= ${PATHETC}/incoming.conf.dist
-+PATH_MODERATORS		= ${PATHETC}/moderators.dist
-+PATH_DISTPATS		= ${PATHETC}/distrib.pats.dist
-+PATH_NEWSFEEDS		= ${PATHETC}/newsfeeds.dist
-+PATH_READERSCONF	= ${PATHETC}/readers.conf.dist
-+PATH_NNRPDTRACK		= ${PATHETC}/nnrpd.track.dist
-+PATH_SCHEMA		= ${PATHETC}/overview.fmt.dist
-+PATH_NNTPPASS		= ${PATHETC}/passwd.nntp.dist
-+PATH_CTLWATCH		= ${PATHETC}/innwatch.ctl.dist
-+PATH_ACTSYNC_IGN	= ${PATHETC}/actsync.ign.dist
-+PATH_ACTSYNC_CFG	= ${PATHETC}/actsync.cfg.dist
-+PATH_MOTD		= ${PATHETC}/motd.news.dist
-+PATH_STORAGECONF	= ${PATHETC}/storage.conf.dist
-+PATH_CYCBUFFCONFIG	= ${PATHETC}/cycbuff.conf.dist
-+PATH_INNFEEDCTL		= ${PATHETC}/innfeed.conf.dist
-+PATH_BUFFINDEXED	= ${PATHETC}/buffindexed.conf.dist
-+PATH_RADIUS_CONF	= ${PATHETC}/radius.conf.dist
-+PATH_OVDB_CONF		= ${PATHETC}/ovdb.conf.dist
-+PATH_SASL_CONF		= ${PATHETC}/sasl.conf.dist
-+PATH_SUBSCRIPTIONS	= ${PATHETC}/subscriptions.dist
- 
- PATH_ACTIVE		= ${PATHDB}/active
- PATH_ACTIVE_TIMES	= ${PATHDB}/active.times
-@@ -71,8 +71,8 @@
- 	$D$(PATH_NEWSFEEDS) $D$(PATH_INNDHOSTS) \
- 	$D$(PATH_NNRPDTRACK) $D$(PATH_NNTPPASS) \
- 	$D$(PATH_CONFIG) $D$(PATH_MODERATORS) \
--	$D$(PATH_CONTROLCTL) $D$(PATH_EXPIRECTL) $D$(PATHETC)/nntpsend.ctl \
--	$D$(PATHETC)/innreport.conf \
-+	$D$(PATH_CONTROLCTL) $D$(PATH_EXPIRECTL) $D$(PATHETC)/nntpsend.ctl.dist \
-+	$D$(PATHETC)/innreport.conf.dist \
- 	$D$(PATH_CTLWATCH) $D$(PATH_DISTPATS) $D$(PATH_SCHEMA) \
- 	$D$(PATH_ACTSYNC_CFG) $D$(PATH_ACTSYNC_IGN) \
- 	$D$(PATH_MOTD) $D$(PATH_STORAGECONF) \
-@@ -81,7 +81,7 @@
- 	$D$(PATH_PERL_FILTER_INND) $D$(PATH_PERL_FILTER_NNRPD) \
- 	$D$(PATH_PYTHON_FILTER_INND) $D$(PATH_PYTHON_INN_MODULE) \
- 	$D$(PATH_TCL_STARTUP) $D$(PATH_TCL_FILTER) \
--	$D$(PATH_NNRPAUTH) $D$(PATHETC)/news2mail.cf $D$(PATH_READERSCONF) \
-+	$D$(PATH_NNRPAUTH) $D$(PATHETC)/news2mail.cf.dist $D$(PATH_READERSCONF) \
- 	$D$(PATH_RADIUS_CONF) $D$(PATH_NNRPYAUTH) $D$(PATH_OVDB_CONF) \
- 	$D$(PATH_SASL_CONF) $D$(PATH_SUBSCRIPTIONS)
- 
-@@ -170,9 +170,9 @@
- $D$(PATH_MODERATORS):	moderators	; $(COPY_RPUB) $? $@
- $D$(PATH_DISTPATS):	distrib.pats	; $(COPY_RPUB) $? $@
- $D$(PATH_NNTPPASS):	passwd.nntp	; $(COPY_RPRI) $? $@
--$D$(PATHETC)/nntpsend.ctl: nntpsend.ctl	; $(COPY_RPUB) $? $@
--$D$(PATHETC)/news2mail.cf: news2mail.cf	; $(COPY_RPUB) $? $@
--$D$(PATHETC)/innreport.conf: innreport.conf	; $(COPY_RPUB) $? $@
-+$D$(PATHETC)/nntpsend.ctl.dist: nntpsend.ctl	; $(COPY_RPUB) $? $@
-+$D$(PATHETC)/news2mail.cf.dist: news2mail.cf	; $(COPY_RPUB) $? $@
-+$D$(PATHETC)/innreport.conf.dist: innreport.conf	; $(COPY_RPUB) $? $@
- $D$(PATH_STORAGECONF): storage.conf	; $(COPY_RPUB) $? $@
- $D$(PATH_CYCBUFFCONFIG): cycbuff.conf	; $(COPY_RPUB) $? $@
- $D$(PATH_BUFFINDEXED): buffindexed.conf	; $(COPY_RPUB) $? $@
diff --git a/news/inn-current/pkg-descr b/news/inn-current/pkg-descr
deleted file mode 100644
index 86e93a92a32..00000000000
--- a/news/inn-current/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-InterNetNews is a complete Usenet system.  The cornerstone of the package
-is innd, an NNTP server that multiplexes all I/O. Newsreading is handled
-by a separate server, nnrpd, that is spawned for each client.  Both innd
-and nnrpd have some slight variances from the NNTP protocol.
-This ports is the development version, DON'T USE IT OR TRY TO USE IT ON 
-A PRODUCTION SERVER.
-
-WWW: http://www.isc.org/products/INN/
diff --git a/news/inn-current/pkg-install b/news/inn-current/pkg-install
deleted file mode 100644
index d351162bd33..00000000000
--- a/news/inn-current/pkg-install
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-PKGNAME=$1
-[ ! -n PKG_PREFIX ] && exit 1
-PKG_PREFIX=${PKG_PREFIX:-/usr/local}
-
-case $2 in
-    PRE-INSTALL)
-	;;
-    CHECK-CONF)
-	ETC_DIR=${3}
-	echo "Checking for configuration files"
-	for f in $(find ${ETC_DIR} -name "*.dist" -type f)
-		do
-			REALFILE=${f%%.dist}
-			echo -n "Checking if ${REALFILE} exists:   "
-			if [ -e ${REALFILE} ] 
-				then
-					echo "[YES]"
-				else
-					echo "[NO]"
-					echo "     Installing ${f} to ${REALFILE}"
-					cp ${f} ${REALFILE}
-			fi
-		done
-	;;
-    POST-INSTALL)
-	NEWSBASE=${PKG_PREFIX}/news
-        install -d -o news -g news -m 755 \
-	    ${NEWSBASE}/run \
-	    ${NEWSBASE}/spool \
-	    ${NEWSBASE}/spool/archive \
-	    ${NEWSBASE}/spool/articles \
-	    ${NEWSBASE}/spool/incoming \
-	    ${NEWSBASE}/spool/incoming/bad \
-	    ${NEWSBASE}/spool/innfeed \
-	    ${NEWSBASE}/spool/outgoing \
-	    ${NEWSBASE}/spool/overview \
-	    ${NEWSBASE}/spool/tmp
-	;;
-    *)
-	echo "Unexpected Argument $2!!!"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/news/inn-current/pkg-plist b/news/inn-current/pkg-plist
deleted file mode 100644
index d8f992bcf5c..00000000000
--- a/news/inn-current/pkg-plist
+++ /dev/null
@@ -1,254 +0,0 @@
-etc/rc.d/innd.sh
-news/bin/actmerge
-news/bin/actsync
-news/bin/actsyncd
-news/bin/archive
-news/bin/auth/passwd/auth_smb
-news/bin/auth/passwd/ckpasswd
-news/bin/auth/passwd/radius
-news/bin/auth/resolv/domain
-news/bin/auth/resolv/ident
-news/bin/batcher
-news/bin/buffchan
-news/bin/buffindexed_d
-news/bin/cnfsheadconf
-news/bin/cnfsstat
-news/bin/control/checkgroups.pl
-news/bin/control/ihave.pl
-news/bin/control/newgroup.pl
-news/bin/control/rmgroup.pl
-news/bin/control/sendme.pl
-news/bin/control/sendsys.pl
-news/bin/control/senduuname.pl
-news/bin/control/version.pl
-news/bin/controlbatch
-news/bin/controlchan
-news/bin/convdate
-news/bin/ctlinnd
-news/bin/cvtbatch
-news/bin/docheckgroups
-news/bin/expire
-news/bin/expireover
-news/bin/expirerm
-news/bin/fastrm
-news/bin/filechan
-news/bin/filter/INN.py
-news/bin/filter/filter.tcl
-news/bin/filter/filter_innd.pl
-news/bin/filter/filter_innd.py
-news/bin/filter/filter_nnrpd.pl
-news/bin/filter/nnrpd_auth.pl
-news/bin/filter/nnrpd_auth.py
-news/bin/filter/startup.tcl
-news/bin/filter/startup_innd.pl
-news/bin/getlist
-news/bin/gpgverify
-news/bin/grephistory
-news/bin/imapfeed
-news/bin/inews
-news/bin/innbind
-news/bin/inncheck
-news/bin/innconfval
-news/bin/innd
-news/bin/inndf
-news/bin/innfeed
-news/bin/innmail
-news/bin/innreport
-news/bin/innstat
-news/bin/innupgrade
-news/bin/innwatch
-news/bin/innxbatch
-news/bin/innxmit
-news/bin/mailpost
-news/bin/makedbz
-news/bin/makehistory
-news/bin/mod-active
-news/bin/news.daily
-news/bin/news2mail
-news/bin/ninpaths
-news/bin/nnrpd
-news/bin/nntpget
-news/bin/nntpsend
-news/bin/ovdb_init
-news/bin/ovdb_monitor
-news/bin/ovdb_server
-news/bin/ovdb_stat
-news/bin/overchan
-news/bin/perl-nocem
-news/bin/pgpverify
-news/bin/procbatch
-news/bin/prunehistory
-news/bin/pullnews
-news/bin/rc.news
-news/bin/rnews
-news/bin/rnews.libexec/c7unbatch
-news/bin/rnews.libexec/decode
-news/bin/rnews.libexec/encode
-news/bin/rnews.libexec/gunbatch
-news/bin/scanlogs
-news/bin/scanspool
-news/bin/send-ihave
-news/bin/send-nntp
-news/bin/send-uucp
-news/bin/sendinpaths
-news/bin/sendxbatches
-news/bin/shlock
-news/bin/shrinkfile
-news/bin/signcontrol
-news/bin/simpleftp
-news/bin/sm
-news/bin/tally.control
-news/bin/tdx-util
-news/bin/writelog
-news/db/active
-news/db/active.times
-news/db/history
-news/db/history.dir
-%%SUB_WITHOUT_TAGGED_HASH%%news/db/history.hash
-%%SUB_WITHOUT_TAGGED_HASH%%news/db/history.index
-%%SUB_WITH_TAGGED_HASH%%news/db/history.pag
-news/db/newsgroups
-news/doc/CONTRIBUTORS
-news/doc/GPL
-news/doc/HACKING
-news/doc/INSTALL
-news/doc/LICENSE
-news/doc/NEWS
-news/doc/README
-news/doc/README.snapshot
-news/doc/TODO
-news/doc/compliance-nntp
-news/doc/config-design
-news/doc/config-semantics
-news/doc/config-syntax
-news/doc/external-auth
-news/doc/history
-news/doc/hook-perl
-news/doc/hook-python
-news/doc/hook-tcl
-news/doc/sample-control
-@unexec if cmp -s %D/%%ETCDIR%%/actsync.cfg %D/%%ETCDIR%%/actsync.cfg.dist; then rm -f %D/%%ETCDIR%%/actsync.cfg ; fi
-%%ETCDIR%%/actsync.cfg.dist
-@unexec if cmp -s %D/%%ETCDIR%%/actsync.ign %D/%%ETCDIR%%/actsync.ign.dist; then rm -f %D/%%ETCDIR%%/actsync.ign ; fi
-%%ETCDIR%%/actsync.ign.dist
-@unexec if cmp -s %D/%%ETCDIR%%/buffindexed.conf %D/%%ETCDIR%%/buffindexed.conf.dist; then rm -f %D/%%ETCDIR%%/buffindexed.conf ; fi
-%%ETCDIR%%/buffindexed.conf.dist
-@unexec if cmp -s %D/%%ETCDIR%%/control.ctl %D/%%ETCDIR%%/control.ctl.dist; then rm -f %D/%%ETCDIR%%/control.ctl ; fi
-%%ETCDIR%%/control.ctl.dist
-@unexec if cmp -s %D/%%ETCDIR%%/cycbuff.conf %D/%%ETCDIR%%/cycbuff.conf.dist; then rm -f %D/%%ETCDIR%%/cycbuff.conf ; fi
-%%ETCDIR%%/cycbuff.conf.dist
-@unexec if cmp -s %D/%%ETCDIR%%/distrib.pats %D/%%ETCDIR%%/distrib.pats.dist; then rm -f %D/%%ETCDIR%%/distrib.pats ; fi
-%%ETCDIR%%/distrib.pats.dist
-@unexec if cmp -s %D/%%ETCDIR%%/expire.ctl %D/%%ETCDIR%%/expire.ctl.dist; then rm -f %D/%%ETCDIR%%/expire.ctl ; fi
-%%ETCDIR%%/expire.ctl.dist
-@unexec if cmp -s %D/%%ETCDIR%%/incoming.conf %D/%%ETCDIR%%/incoming.conf.dist; then rm -f %D/%%ETCDIR%%/incoming.conf ; fi
-%%ETCDIR%%/incoming.conf.dist
-@unexec if cmp -s %D/%%ETCDIR%%/inn.conf %D/%%ETCDIR%%/inn.conf.dist; then rm -f %D/%%ETCDIR%%/inn.conf ; fi
-%%ETCDIR%%/inn.conf.dist
-@unexec if cmp -s %D/%%ETCDIR%%/innfeed.conf %D/%%ETCDIR%%/innfeed.conf.dist; then rm -f %D/%%ETCDIR%%/innfeed.conf ; fi
-%%ETCDIR%%/innfeed.conf.dist
-@unexec if cmp -s %D/%%ETCDIR%%/innreport.conf %D/%%ETCDIR%%/innreport.conf.dist; then rm -f %D/%%ETCDIR%%/innreport.conf ; fi
-%%ETCDIR%%/innreport.conf.dist
-@unexec if cmp -s %D/%%ETCDIR%%/innwatch.ctl %D/%%ETCDIR%%/innwatch.ctl.dist; then rm -f %D/%%ETCDIR%%/innwatch.ctl ; fi
-%%ETCDIR%%/innwatch.ctl.dist
-@unexec if cmp -s %D/%%ETCDIR%%/moderators %D/%%ETCDIR%%/moderators.dist; then rm -f %D/%%ETCDIR%%/moderators ; fi
-%%ETCDIR%%/moderators.dist
-@unexec if cmp -s %D/%%ETCDIR%%/motd.news %D/%%ETCDIR%%/motd.news.dist; then rm -f %D/%%ETCDIR%%/motd.news ; fi
-%%ETCDIR%%/motd.news.dist
-@unexec if cmp -s %D/%%ETCDIR%%/news2mail.cf %D/%%ETCDIR%%/news2mail.cf.dist; then rm -f %D/%%ETCDIR%%/news2mail.cf ; fi
-%%ETCDIR%%/news2mail.cf.dist
-@unexec if cmp -s %D/%%ETCDIR%%/newsfeeds %D/%%ETCDIR%%/newsfeeds.dist; then rm -f %D/%%ETCDIR%%/newsfeeds ; fi
-%%ETCDIR%%/newsfeeds.dist
-@unexec if cmp -s %D/%%ETCDIR%%/nnrpd.track %D/%%ETCDIR%%/nnrpd.track.dist; then rm -f %D/%%ETCDIR%%/nnrpd.track ; fi
-%%ETCDIR%%/nnrpd.track.dist
-@unexec if cmp -s %D/%%ETCDIR%%/nntpsend.ctl %D/%%ETCDIR%%/nntpsend.ctl.dist; then rm -f %D/%%ETCDIR%%/nntpsend.ctl ; fi
-%%ETCDIR%%/nntpsend.ctl.dist
-@unexec if cmp -s %D/%%ETCDIR%%/ovdb.conf %D/%%ETCDIR%%/ovdb.conf.dist; then rm -f %D/%%ETCDIR%%/ovdb.conf ; fi
-%%ETCDIR%%/ovdb.conf.dist
-@unexec if cmp -s %D/%%ETCDIR%%/overview.fmt %D/%%ETCDIR%%/overview.fmt.dist; then rm -f %D/%%ETCDIR%%/overview.fmt ; fi
-%%ETCDIR%%/overview.fmt.dist
-@unexec if cmp -s %D/%%ETCDIR%%/passwd.nntp %D/%%ETCDIR%%/passwd.nntp.dist; then rm -f %D/%%ETCDIR%%/passwd.nntp ; fi
-%%ETCDIR%%/passwd.nntp.dist
-@unexec if cmp -s %D/%%ETCDIR%%/radius.conf %D/%%ETCDIR%%/radius.conf.dist; then rm -f %D/%%ETCDIR%%/radius.conf ; fi
-%%ETCDIR%%/radius.conf.dist
-@unexec if cmp -s %D/%%ETCDIR%%/readers.conf %D/%%ETCDIR%%/readers.conf.dist; then rm -f %D/%%ETCDIR%%/readers.conf; fi
-%%ETCDIR%%/readers.conf.dist
-@unexec if cmp -s %D/%%ETCDIR%%/sasl.conf %D/%%ETCDIR%%/sasl.conf.dist; then rm -f %D/%%ETCDIR%%/sasl.conf ; fi
-%%ETCDIR%%/sasl.conf.dist
-@unexec if cmp -s %D/%%ETCDIR%%/storage.conf %D/%%ETCDIR%%/storage.conf.dist; then rm -f %D/%%ETCDIR%%/storage.conf ; fi
-%%ETCDIR%%/storage.conf.dist
-@unexec if cmp -s %D/%%ETCDIR%%/subscriptions %D/%%ETCDIR%%/subscriptions.dist; then rm -f %D/%%ETCDIR%%/subscriptions ; fi
-%%ETCDIR%%/subscriptions.dist
-news/include/clibrary.h
-news/include/conffile.h
-news/include/config.h
-news/include/dbz.h
-news/include/inn/buffer.h
-news/include/inn/confparse.h
-news/include/inn/defines.h
-news/include/inn/dispatch.h
-news/include/inn/hashtab.h
-news/include/inn/history.h
-news/include/inn/innconf.h
-news/include/inn/list.h
-news/include/inn/md5.h
-news/include/inn/messages.h
-news/include/inn/mmap.h
-news/include/inn/network.h
-news/include/inn/nntp.h
-news/include/inn/options.h
-news/include/inn/qio.h
-news/include/inn/sequence.h
-news/include/inn/system.h
-news/include/inn/timer.h
-news/include/inn/tst.h
-news/include/inn/vector.h
-news/include/inn/version.h
-news/include/inn/wire.h
-news/include/inndcomm.h
-news/include/libinn.h
-news/include/nntp.h
-news/include/ov.h
-news/include/paths.h
-news/include/storage.h
-news/lib/innreport_inn.pm
-news/lib/innshellvars
-news/lib/innshellvars.pl
-news/lib/innshellvars.tcl
-news/lib/libinn.a
-news/lib/libinnhist.a
-news/lib/libstorage.a
-%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTORS
-%%PORTDOCS%%%%DOCSDIR%%/HACKING
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/MANIFEST
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry news/tmp
-@dirrm news/spool/overview
-@dirrm news/spool/outgoing
-@dirrm news/spool/innfeed
-@dirrm news/spool/incoming/bad
-@dirrm news/spool/incoming
-@dirrm news/spool/articles
-@dirrm news/spool/archive
-@dirrm news/spool/tmp
-@dirrm news/spool
-@dirrm news/run
-@dirrm news/lib
-@dirrm news/include/inn
-@dirrm news/include
-@dirrmtry %%ETCDIR%%
-@dirrm news/doc
-@dirrm news/db
-@dirrm news/bin/rnews.libexec
-@dirrm news/bin/filter
-@dirrm news/bin/control
-@dirrm news/bin/auth/resolv
-@dirrm news/bin/auth/passwd
-@dirrm news/bin/auth
-@dirrm news/bin
-@unexec rmdir %D/news 2>/dev/null || echo "===>  If you don't plan to use inn later, you can safely remove %D/news. Deinstall process kept these files intact:" | fmt && if [ -d %D/news ] ; then  for i in $(find %D/news -type f ); do echo "    - $i"; done;fi