Upgrade to 2.4.0, which introduces, amongs other new features, IPv6

support.

Many thanks to Thierry Thomas <thierry@pompo.net> for advice and testing.

1 files changed, 44 insertions, 42 deletions

diff --git a/news/inn/Makefile b/news/inn/Makefile
index 371f203f19da..3162b0a19a0f 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -6,17 +6,18 @@
 #
 
 PORTNAME=	inn
-PORTVERSION=	2.3.5
-CATEGORIES=	news
+PORTVERSION=	2.4.0
+CATEGORIES=	news ipv6
 MASTER_SITES=	${MASTER_SITE_ISC}
 MASTER_SITE_SUBDIR=	inn
-NO_LATEST_LINK=	yes
 
 MAINTAINER=	des@FreeBSD.org
 COMMENT=	InterNetNews -- the Internet meets Netnews
 
-USE_GMAKE=YES
+NO_LATEST_LINK=	yes
+USE_GMAKE=	yes
 USE_PERL5=	yes
+USE_OPENSSL=	yes
 
 .if exists(/var/news) && !defined(PACKAGE_BUILDING)
 INN_NEWSSPOOL?=/var/news
@@ -34,41 +35,50 @@ 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+=	--with-largefiles
+CONFIGURE_ARGS+=	--enable-largefiles
 CONFIGURE_ARGS+=	--with-openssl
+CONFIGURE_ARGS+=	--enable-ipv6
 
-# Various Options. See ${WRKSRC}/INSTALL for details
-
-# Use tagged hash table for the history database. Uses much less memory but
-# is somewhat slower
-#CONFIGURE_ARGS+=	--enable-tagged-hash
-
-MAN1=	ckpasswd.1 convdate.1 fastrm.1 getlist.1 grephistory.1 inews.1 \
-	innconfval.1 innfeed.1 innmail.1 nntpget.1 rnews.1 shlock.1 \
-	shrinkfile.1 simpleftp.1 startinnfeed.1
-MAN3=	clientlib.3 dbz.3 inndcomm.3 libinn.3 libstorage.3 parsedate.3 qio.3 \
-	wildmat.3
-MAN5=	active.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 nnrp.access.5 nnrpd.track.5 nntpsend.ctl.5 ovdb.5 \
-	overview.fmt.5 passwd.nntp.5 readers.conf.5 sasl.conf.5 \
-	storage.conf.5 subscriptions.5
-MAN8=	actsync.8 actsyncd.8 archive.8 batcher.8 buffchan.8 cnfsheadconf.8 \
-	cnfsstat.8 controlchan.8 ctlinnd.8 cvtbatch.8 dbprocs.8 expire.8 \
-	expireover.8 expirerm.8 filechan.8 inncheck.8 innd.8 inndf.8 \
-	inndstart.8 innreport.8 innstat.8 innwatch.8 innxbatch.8 innxmit.8 \
-	mailpost.8 makedbz.8 makehistory.8 mod-active.8 news.daily.8 \
-	news2mail.8 newsrequeue.8 nnrpd.8 nntpsend.8 ovdb_recover.8 \
-	ovdb_upgrade.8 overchan.8 pgpverify.8 prunehistory.8 pullnews.8 \
-	scanlogs.8 send-uucp.8 sm.8 tally.control.8 writelog.8
+EXTRA=	CONTRIBUTORS HACKING INSTALL LICENSE MANIFEST NEWS README TODO
+HEADERS=clibrary.h config.h dbz.h libinn.h storage.h
 
-EXTRA=	${WRKSRC}/HISTORY ${WRKSRC}/INSTALL ${WRKSRC}/LICENSE
+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 startinnfeed.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 inncheck.8 innd.8 inndf.8 inndstart.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
 
-INN_INCLUDES=	clibrary.h config.h configdata.h dbz.h libinn.h storage.h
-
-pre-install:
+do-install:
 	${MKDIR} ${INN_NEWSSPOOL}
+	(cd ${WRKSRC} && ${GMAKE} install)
+.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
 
 post-install:
 	@${CHOWN} root:news ${PREFIX}/news/bin/auth/passwd/ckpasswd
@@ -84,14 +94,6 @@ post-install:
 		${MV} history.n.$${s} history.$${s} ; \
 	    done ; \
 	fi)
-	@${SED} <${FILESDIR}/innd.sh >${PREFIX}/etc/rc.d/innd.sh \
-	    s+!!PREFIX!!+${PREFIX}+g && ${CHMOD} +x ${PREFIX}/etc/rc.d/innd.sh
-	@${MKDIR} ${PREFIX}/share/doc/inn
-	@${INSTALL_DATA} ${EXTRA} ${PREFIX}/share/doc/inn
-	@${MKDIR} ${PREFIX}/news/include
-.for FILE in ${INN_INCLUDES}
-	@${INSTALL_DATA} ${WRKSRC}/include/${FILE} ${PREFIX}/news/include/
-.endfor
 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>