diff options
author | Daichi GOTO <daichi@FreeBSD.org> | 2003-08-01 05:16:19 +0000 |
---|---|---|
committer | Daichi GOTO <daichi@FreeBSD.org> | 2003-08-01 05:16:19 +0000 |
commit | 2711d2b7342e46fac459cc91fe660836636c1382 (patch) | |
tree | 2fa68ee85639c02382b4f04d0c44920eb0545375 | |
parent | update news/inn: (diff) |
update news/inn-stable:
- update to 20030731 snapshot
- Add python knob
- Add WITH_TAGGED_HASH (from PR 36587 (thanks to Thomas Seck))
- clean/move stuff from do-install: to post-install:
- make "portlint -A" happy
PR: 55110
Submitted by: Clement Laforet <sheepkiller@cultdeadsheep.org> (mainteiner)
Pointed out by: Thomas Seck <tmseck@netcologne.de>
Notes
Notes:
svn path=/head/; revision=86098
-rw-r--r-- | news/inn-stable/Makefile | 59 | ||||
-rw-r--r-- | news/inn-stable/distinfo | 3 | ||||
-rw-r--r-- | news/inn-stable/pkg-descr | 24 | ||||
-rw-r--r-- | news/inn-stable/pkg-install | 4 | ||||
-rw-r--r-- | news/inn-stable/pkg-plist | 24 |
5 files changed, 57 insertions, 57 deletions
diff --git a/news/inn-stable/Makefile b/news/inn-stable/Makefile index 1c5ce493fdd6..a02e798e6c3a 100644 --- a/news/inn-stable/Makefile +++ b/news/inn-stable/Makefile @@ -1,22 +1,26 @@ # New ports collection makefile for: inn -# Date created: 20 Oct 1994 (1.4), 18 Dec 1996 (1.5.1) +# Date created: 20 Oct 1994 (1.4), 18 Dec 1996 (1.5.1), 14 Feb 1999 (2.2) # Whom: torstenb # # $FreeBSD$ # PORTNAME= inn -#SNAPSHOT!= date -j -f%s `date '+%s - 86400' | bc` +%Y%m%d -SNAPSHOT= 20030512 -PORTVERSION= 2.4.${SNAPSHOT} +PORTVERSION= 2.4.20030731 +#SNAPSHOT= 20030731 CATEGORIES= news ipv6 MASTER_SITES= ${MASTER_SITE_ISC} -MASTER_SITE_SUBDIR= inn/snapshots -DISTNAME= inn-STABLE-${SNAPSHOT} +MASTER_SITE_SUBDIR= inn +DISTNAME= ${PORTNAME}-${PORTVERSION:C/\.[0-9]*$/.0/} + +PATCH_SITES= http://www.cultdeadsheep.org/FreeBSD/ports/download/distfiles/ +PATCHFILES= inn-patch-2.4_to_${PORTVERSION:C/2\.4\.//}-snap.gz +PATCH_DIST_STRIP=-p1 MAINTAINER= sheepkiller@cultdeadsheep.org COMMENT= InterNetNews -- the Internet meets Netnews +NO_LATEST_LINK= yes USE_GMAKE= yes USE_PERL5= yes USE_OPENSSL= yes @@ -31,18 +35,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 \ @@ -66,9 +86,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} @@ -81,8 +100,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 \ @@ -92,7 +109,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-stable/distinfo b/news/inn-stable/distinfo index aacb53c41f19..6d1d0a6bbc48 100644 --- a/news/inn-stable/distinfo +++ b/news/inn-stable/distinfo @@ -1 +1,2 @@ -MD5 (inn-STABLE-20030512.tar.gz) = d1a2905c98c5e0a6f1ace326df7dac11 +MD5 (inn-2.4.0.tar.gz) = 629c445b7c7fe2a01257b883abb7bddf +MD5 (inn-patch-2.4_to_20030731-snap.gz) = 804be2f5fa912e3cc4f3b6d9e009035a diff --git a/news/inn-stable/pkg-descr b/news/inn-stable/pkg-descr index a6354c314d06..3ac36756d06b 100644 --- a/news/inn-stable/pkg-descr +++ b/news/inn-stable/pkg-descr @@ -1,24 +1,6 @@ -InterNetNews is a complete Usenet system. The cornerstone of the package +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. It's also -possible to have UUCP and NNTP feeds and clients. +and nnrpd have some slight variances from the NNTP protocol. -Some statements to meet the COPYRIGHT: -- This is the new version, maintained by the ISC -- This product includes software developed by Rich Salz -- The only changes that have been made are a post-install target in the - Makefile of the FreeBSD port, so that the news spool area is created - automatically for ease of use of our inn2 port in the FreeBSD ports collection - -Installation is relatively complex but nicely explained in the file INSTALL, -see the inn2 sources under the work directory. -Year 2000: http://www.isc.org/inn-y2k.html -Support Contracts: http://www.isc.org/support.html - -Final note for UUCP users. The path of the rnews executeable has changed ! -Add this to /etc/uucp/sys: - command-path /bin /usr/bin /usr/local/bin /usr/local/news/bin - commands rmail uucp rnews - -WWW: http://www.isc.org/inn.html +WWW: http://www.isc.org/products/INN/ diff --git a/news/inn-stable/pkg-install b/news/inn-stable/pkg-install index ccfece42914a..78f7bdb4cc1f 100644 --- a/news/inn-stable/pkg-install +++ b/news/inn-stable/pkg-install @@ -1,12 +1,13 @@ #!/bin/sh PKGNAME=$1 +[ ! -n PKG_PREFIX ] && exit 1 case $2 in PRE-INSTALL) ;; POST-INSTALL) - NEWSBASE=${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-stable/pkg-plist b/news/inn-stable/pkg-plist index 20ed50c0ecf3..bb6f746a9e17 100644 --- a/news/inn-stable/pkg-plist +++ b/news/inn-stable/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 @@ -187,17 +188,16 @@ 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/tmp @dirrm news/spool/overview @dirrm news/spool/outgoing @dirrm news/spool/innfeed |