3 files changed, 43 insertions, 28 deletions

diff --git a/news/inn/Makefile b/news/inn/Makefile
index 6c75eaa0ff1c..68ab41d41da1 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	inn
 PORTVERSION=	2.4.0
+PORTREVISION=	1
 CATEGORIES=	news ipv6
 MASTER_SITES=	${MASTER_SITE_ISC}
 MASTER_SITE_SUBDIR=	inn
@@ -29,18 +30,34 @@ INN_NEWSSPOOL?=${PREFIX}/news/spool
 INN_NEWSLOG?=/var/log/news
 
 HAS_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--mandir=${PREFIX}/man
-CONFIGURE_ARGS+=	--prefix=${PREFIX}/news
-CONFIGURE_ARGS+=	--with-spool-dir=${INN_NEWSSPOOL}
-CONFIGURE_ARGS+=	--with-log-dir=${INN_NEWSLOG}
-CONFIGURE_ARGS+=	--with-perl
-CONFIGURE_ARGS+=	--with-tmp-path=${INN_NEWSSPOOL}/tmp
+CONFIGURE_ARGS+=	--mandir=${PREFIX}/man \
+			--prefix=${PREFIX}/news \
+			--with-spool-dir=${INN_NEWSSPOOL} \
+			--with-log-dir=${INN_NEWSLOG} \
+			--with-perl \
+			--with-tmp-path=${INN_NEWSSPOOL}/tmp \
+			--with-openssl \
+			--enable-ipv6
+
+.if defined(WITH_PYTHON)
+USE_PYTHON=		YES
+CONFIGURE_ARGS+=	--with-python
+.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
-CONFIGURE_ARGS+=	--with-openssl
-CONFIGURE_ARGS+=	--enable-ipv6
+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
+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 \
@@ -64,9 +81,8 @@ MAN8=	actsync.8 actsyncd.8 archive.8 auth_smb.8 batcher.8 buffchan.8 \
 	radius.8 rc.news.8 scanlogs.8 send-nntp.8 send-uucp.8 sendinpaths.8 \
 	tally.control.8 tdx-util.8 writelog.8
 
-do-install:
+post-install:
 	${MKDIR} ${INN_NEWSSPOOL}
-	(cd ${WRKSRC} && ${GMAKE} install)
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for FILE in ${EXTRA}
@@ -79,8 +95,6 @@ do-install:
 .endfor
 	@${SED} <${FILESDIR}/innd.sh >${PREFIX}/etc/rc.d/innd.sh \
 	    s+!!PREFIX!!+${PREFIX}+g && ${CHMOD} +x ${PREFIX}/etc/rc.d/innd.sh
-
-post-install:
 	@${CHOWN} root:news ${PREFIX}/news/bin/auth/passwd/ckpasswd
 	@${CHMOD} 4755 ${PREFIX}/news/bin/auth/passwd/ckpasswd
 	@(if [ ! -f ${PREFIX}/news/db/history ] ; then \
@@ -90,7 +104,7 @@ post-install:
 	    ${CHMOD} 644 history ; \
 	    ${CHOWN} news:news history ; \
 	    su -fm news -c "../bin/makedbz -i" ; \
-	    for s in dir hash index ; do \
+	    for s in ${DBZ_FILES}  ; do \
 		${MV} history.n.$${s} history.$${s} ; \
 	    done ; \
 	fi)
diff --git a/news/inn/pkg-install b/news/inn/pkg-install
index 7732199e100c..78f7bdb4cc1f 100644
--- a/news/inn/pkg-install
+++ b/news/inn/pkg-install
@@ -1,12 +1,13 @@
 #!/bin/sh
 
 PKGNAME=$1
+[ ! -n PKG_PREFIX ] && exit 1
 
 case $2 in
     PRE-INSTALL)
 	;;
     POST-INSTALL)
-	NEWSBASE=${PKG_PREFIX:-/usr/local}/news
+	NEWSBASE=${PKG_PREFIX}/news
         install -d -o news -g news -m 755 \
 	    ${NEWSBASE}/run \
 	    ${NEWSBASE}/spool \
@@ -25,4 +26,3 @@ case $2 in
 	;;
 esac
 exit 0
-
diff --git a/news/inn/pkg-plist b/news/inn/pkg-plist
index e019b86895dd..ddf0b439b152 100644
--- a/news/inn/pkg-plist
+++ b/news/inn/pkg-plist
@@ -104,8 +104,9 @@ news/db/active
 news/db/active.times
 news/db/history
 news/db/history.dir
-news/db/history.hash
-news/db/history.index
+%%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
@@ -186,15 +187,15 @@ news/lib/innshellvars.tcl
 news/lib/libinn.a
 news/lib/libinnhist.a
 news/lib/libstorage.a
-%%PORTDOCS%%share/doc/inn/CONTRIBUTORS
-%%PORTDOCS%%share/doc/inn/HACKING
-%%PORTDOCS%%share/doc/inn/INSTALL
-%%PORTDOCS%%share/doc/inn/LICENSE
-%%PORTDOCS%%share/doc/inn/MANIFEST
-%%PORTDOCS%%share/doc/inn/NEWS
-%%PORTDOCS%%share/doc/inn/README
-%%PORTDOCS%%share/doc/inn/TODO
-%%PORTDOCS%%@dirrm share/doc/inn
+%%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%%
 @dirrm news/tmp
 @dirrm news/spool/overview
 @dirrm news/spool/outgoing