Index: Makefile =================================================================== RCS file: /home/ncvs/ports/news/inn-stable/Makefile,v retrieving revision 1.113 diff -u -r1.113 Makefile --- Makefile 11 May 2006 22:49:54 -0000 1.113 +++ Makefile 6 Aug 2006 21:07:29 -0000 @@ -1,23 +1,22 @@ -# New ports collection makefile for: inn +# New ports collection makefile for: inn-stable # Date created: 20 Oct 1994 (1.4), 18 Dec 1996 (1.5.1), 14 Feb 1999 (2.2) # Whom: torstenb # -# $FreeBSD: ports/news/inn-stable/Makefile,v 1.113 2006/05/11 22:49:54 edwin Exp $ +# $FreeBSD$ # PORTNAME= inn PORTVERSION= ${SNAPSHOT} CATEGORIES= news ipv6 -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR=clement +MASTER_SITES= http://ftp.isc.org/isc/inn/snapshots/ PKGNAMESUFFIX= -${BRANCH} DISTNAME= ${PORTNAME}-${BRANCH:U}-${SNAPSHOT} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= gaod@hychen.org COMMENT= InterNetNews -- the Internet meets Netnews BRANCH= stable -SNAPSHOT= 20040707 +SNAPSHOT= 20060525 NO_LATEST_LINK= yes USE_GMAKE= yes @@ -48,20 +47,19 @@ --with-etc-dir=${ETC_DIR} .if defined(WITH_BERKELEYDB) +CONFIGURE_ARGS+= --with-berkeleydb . if !defined(WITH_BDB_VER) -WITH_BDB_VER= 42 +WITH_BDB_VER= 4 . 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} == 42) -LIB_DEPENDS+= db-4.2:${PORTSDIR}/databases/db42 +LIB_DEPENDS+= db${WITH_BDB_VER}:${PORTSDIR}/databases/db${WITH_BDB_VER} . elif ${WITH_BDB_VER} == 2 -IGNORE= "Does not compile with db2" +BROKEN= Does not compile with db2 . else -IGNORE= "Unknown BerkeleyDB version" +BROKEN= Unknown BerkeleyDB version . endif -CONFIGURE_ENV+= DB_VER=db${WITH_BDB_VER} -CONFIGURE_ARGS+= --with-berkeleydb +CONFIGURE_ENV+= DB_VER=db${WITH_BDB_VER} +CONFIGURE_ARGS+= --with-berkeleydb=${LOCALBASE} .endif .if defined(WITH_PYTHON) @@ -103,7 +101,7 @@ 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 \ + innfeed.1 innmail.1 nntpget.1 pgpverify.1 pullnews.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 @@ -120,7 +118,7 @@ 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 \ + ovdb_stat.8 overchan.8 perl-nocem.8 prunehistory.8 \ radius.8 rc.news.8 scanlogs.8 send-nntp.8 send-uucp.8 sendinpaths.8 \ tally.control.8 tdx-util.8 writelog.8 Index: distinfo =================================================================== RCS file: /home/ncvs/ports/news/inn-stable/distinfo,v retrieving revision 1.54 diff -u -r1.54 distinfo --- distinfo 23 Jan 2006 23:46:35 -0000 1.54 +++ distinfo 6 Aug 2006 21:07:29 -0000 @@ -1,3 +1,3 @@ -MD5 (inn-STABLE-20040707.tar.gz) = 72644e9c1fa6f4f7834896813ab8691d -SHA256 (inn-STABLE-20040707.tar.gz) = 95c75ea0074e243bd6d0a08a701d397247c55388cb66f70d3448d395faceeb93 -SIZE (inn-STABLE-20040707.tar.gz) = 1852037 +MD5 (inn-STABLE-20060525.tar.gz) = dedb85e7ee66c12dc40639260aca9c7d +SHA256 (inn-STABLE-20060525.tar.gz) = 2b198e19274642b0466887e7a71e8bda7b8b1331c4d3719e6e108b9568328f0a +SIZE (inn-STABLE-20060525.tar.gz) = 1865441 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/news/inn-stable/pkg-plist,v retrieving revision 1.25 diff -u -r1.25 pkg-plist --- pkg-plist 22 Jan 2006 02:47:41 -0000 1.25 +++ pkg-plist 6 Aug 2006 21:07:29 -0000 @@ -1,17 +1,18 @@ etc/rc.d/innd.sh -news/bin/actmerge -news/bin/actsync -news/bin/actsyncd -news/bin/archive +%%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%% +news/bin/auth/resolv/domain +news/bin/auth/resolv/ident 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/cnfsheadconf -news/bin/cnfsstat news/bin/control/checkgroups.pl news/bin/control/ihave.pl news/bin/control/newgroup.pl @@ -20,103 +21,111 @@ 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/startup_innd.pl news/bin/filter/filter_innd.pl -news/bin/filter/filter_innd.py news/bin/filter/filter_nnrpd.pl +news/bin/filter/filter_innd.py +news/bin/filter/INN.py +news/bin/filter/startup.tcl +news/bin/filter/filter.tcl 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/inncheck -news/bin/innconfval +news/bin/filter/nnrpd_access.pl +news/bin/rnews.libexec/c7unbatch +news/bin/rnews.libexec/decode +news/bin/rnews.libexec/encode +news/bin/rnews.libexec/gunbatch +news/bin/tdx-util news/bin/innd -news/bin/inndf news/bin/inndstart +news/bin/nnrpd 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/imapfeed +news/bin/procbatch +news/bin/startinnfeed +news/bin/controlbatch +news/bin/controlchan +news/bin/docheckgroups +news/bin/gpgverify +news/bin/perl-nocem +news/bin/pgpverify +news/bin/signcontrol +news/bin/convdate +news/bin/fastrm +news/bin/grephistory +news/bin/expire +news/bin/expireover 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/prunehistory +news/bin/expirerm +news/bin/inews +news/bin/rnews +news/bin/cnfsheadconf +news/bin/cnfsstat +news/bin/mailpost +news/bin/pullnews +news/bin/scanspool +news/bin/ctlinnd 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/getlist +news/bin/innconfval +news/bin/sm +news/bin/actmerge +news/bin/actsyncd +news/bin/news2mail +news/bin/nntpsend news/bin/send-ihave news/bin/send-nntp news/bin/send-uucp news/bin/sendinpaths news/bin/sendxbatches +news/bin/mod-active +news/bin/overchan +news/bin/actsync +news/bin/archive +news/bin/batcher +news/bin/buffchan +news/bin/cvtbatch +news/bin/filechan +news/bin/inndf +news/bin/innxbatch +news/bin/innxmit +news/bin/ninpaths +news/bin/nntpget news/bin/shlock news/bin/shrinkfile -news/bin/signcontrol +news/bin/innmail +news/bin/innreport news/bin/simpleftp -news/bin/sm -news/bin/startinnfeed +news/bin/inncheck +news/bin/innstat +news/bin/innupgrade +news/bin/innwatch +news/bin/news.daily +news/bin/rc.news +news/bin/scanlogs news/bin/tally.control -news/bin/tdx-util news/bin/writelog -@comment news/db/active -@comment news/db/active.times -@comment news/db/history -@comment news/db/history.dir +news/db/active.times +news/db/active +news/db/history +news/db/newsgroups +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/GPL news/doc/compliance-nntp news/doc/config-design news/doc/config-semantics @@ -127,88 +136,66 @@ 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 -@exec [ -f %B/actsync.cfg ] || cp -fp %B/%f %B/actsync.cfg -@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 -@exec [ -f %B/actsync.ign ] || cp -fp %B/%f %B/actsync.ign -@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 -@exec [ -f %B/buffindexed.conf ] || cp -fp %B%/%f %B/buffindexed.conf -@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 -@exec [ -f %B/control.ctl ] || cp -fp %B/%f %B/control.ctl -@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 -@exec [ -f %B/cycbuff.conf ] || cp -fp %B/%f %B/cycbuff.conf -@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 -@exec [ -f %B/distrib.pats ] || cp -fp %B/%f %B/distrib.pats -@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 -@exec [ -f %B/expire.ctl ] || cp -fp %B/%f %B/expire.ctl -@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 -@exec [ -f %B/incoming ] || cp -fp %B/%f %B/incoming.conf -@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 -@exec [ -f %B/inn.conf ] || cp -fp %B/%f %B/inn.conf -@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 -@exec [ -f %B/innfeed.conf.dist ] || cp -fp %B/%f %B/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 -@exec [ -f %B/innreport.conf ] || cp -fp %B/%f %B/innreport.conf -@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 -@exec [ -f %B/innwatch.ctl ] || cp -fp %B/%f %B/innwatch.ctl -@unexec if cmp -s %D/%%ETCDIR%%/moderators %D/%%ETCDIR%%/moderators.dist; then rm -f %D/%%ETCDIR%%/moderators ; fi -%%ETCDIR%%/moderators.dist -@exec [ -f %B/moderators ] || cp -fp %B/%f %B/moderators -@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 -@exec [ -f %B/motd.news ] || cp -fp %B/%f %B/motd.news -@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 -@exec [ -f %B/news2mail.cf ] || cp -fp %B/%f %B/news2mail.cf -@unexec if cmp -s %D/%%ETCDIR%%/newsfeeds %D/%%ETCDIR%%/newsfeeds.dist; then rm -f %D/%%ETCDIR%%/newsfeeds ; fi -%%ETCDIR%%/newsfeeds.dist -@exec [ -f %B/newsfeeds ] || cp -fp %B/%f %B/newsfeeds -@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 -@exec [ -f %B/nnrpd.track ] || cp -fp %B/%f %B/nnrpd.track -@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 -@exec [ -f %B/nntpsend.ctl ] || cp -fp %B/%f %B/nntpsend.ctl -@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 -@exec [ -f %B/ovdb.conf ] || cp -fp %B/%f %B/ovdb.conf -@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 -@exec [ -f %B/overview.fmt ] || cp -fp %B/%f %B/overview.fmt -@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 -@exec [ -f %B/passwd.nntp ] || cp -fp %B/%f %B/passwd.nntp -@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 -@exec [ -f %B/radius.conf ] || cp -fp %B/%f %B/radius.conf -@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 -@exec [ -f %B/readers.conf ] || cp -fp %B/%f %B/readers.conf -@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 -@exec [ -f %B/sasl.conf ] || cp -fp %B/%f %B/sasl.conf -@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 -@exec [ -f %B/storage.conf ] || cp -fp %B/%f %B/storage.conf -@unexec if cmp -s %D/%%ETCDIR%%/subscriptions %D/%%ETCDIR%%/subscriptions.dist; then rm -f %D/%%ETCDIR%%/subscriptions ; fi -%%ETCDIR%%/subscriptions.dist -@exec [ -f %B/subscriptions ] || cp -fp %B/%f %B/subscriptions -news/include/clibrary.h -news/include/conffile.h -news/include/config.h -news/include/dbz.h +news/doc/README.snapshot +news/etc/newsfeeds +news/etc/newsfeeds.dist +news/etc/incoming.conf.dist +news/etc/nnrpd.track.dist +news/etc/passwd.nntp.dist +news/etc/inn.conf.dist +news/etc/moderators.dist +news/etc/control.ctl.dist +news/etc/expire.ctl.dist +news/etc/nntpsend.ctl.dist +news/etc/innreport.conf.dist +news/etc/innwatch.ctl.dist +news/etc/distrib.pats.dist +news/etc/overview.fmt.dist +news/etc/actsync.cfg.dist +news/etc/actsync.ign.dist +news/etc/motd.news.dist +news/etc/storage.conf.dist +news/etc/cycbuff.conf.dist +news/etc/buffindexed.conf.dist +news/etc/innfeed.conf.dist +news/etc/news2mail.cf.dist +news/etc/readers.conf.dist +news/etc/radius.conf.dist +news/etc/ovdb.conf.dist +news/etc/sasl.conf.dist +news/etc/subscriptions.dist +news/etc/incoming.conf +news/etc/nnrpd.track +news/etc/passwd.nntp +news/etc/inn.conf +news/etc/moderators +news/etc/control.ctl +news/etc/expire.ctl +news/etc/nntpsend.ctl +news/etc/innreport.conf +news/etc/innwatch.ctl +news/etc/distrib.pats +news/etc/overview.fmt +news/etc/actsync.cfg +news/etc/actsync.ign +news/etc/motd.news +news/etc/storage.conf +news/etc/cycbuff.conf +news/etc/buffindexed.conf +news/etc/innfeed.conf +news/etc/news2mail.cf +news/etc/readers.conf +news/etc/radius.conf +news/etc/ovdb.conf +news/etc/sasl.conf +news/etc/subscriptions +news/lib/libinn.a +news/lib/libstorage.a +news/lib/libinnhist.a +news/lib/innreport_inn.pm +news/lib/innshellvars +news/lib/innshellvars.pl +news/lib/innshellvars.tcl news/include/inn/buffer.h news/include/inn/confparse.h news/include/inn/defines.h @@ -227,50 +214,27 @@ news/include/inn/vector.h news/include/inn/version.h news/include/inn/wire.h +news/include/config.h +news/include/conffile.h +news/include/dbz.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 +news/include/clibrary.h +@dirrmtry share/doc/inn +@dirrmtry news/lib +@dirrmtry news/include/inn +@dirrmtry news/include +@dirrmtry news/etc +@dirrmtry news/doc @dirrmtry 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 && for i in $(find %D/news -type f); do echo " - $i"; done) +@dirrmtry news/bin/rnews.libexec +@dirrmtry news/bin/filter +@dirrmtry news/bin/control +@dirrmtry news/bin/auth/resolv +@dirrmtry news/bin/auth/passwd +@dirrmtry news/bin/auth +@dirrmtry news/bin Index: files/patch-configure =================================================================== RCS file: /home/ncvs/ports/news/inn-stable/files/patch-configure,v retrieving revision 1.3 diff -u -r1.3 patch-configure --- files/patch-configure 9 Jul 2004 08:16:40 -0000 1.3 +++ files/patch-configure 6 Aug 2006 21:07:29 -0000 @@ -1,15 +1,12 @@ ---- configure.orig Mon Jun 14 16:49:57 2004 -+++ configure Fri Jul 9 07:47:06 2004 -@@ -5811,49 +5811,18 @@ - BERKELEY_DB_LIB= - else +--- configure.orig Fri May 26 11:42:46 2006 ++++ configure Fri May 26 11:55:02 2006 +@@ -7593,47 +7593,9 @@ echo "$ac_t""yes" 1>&6 -- echo $ac_n "checking for BerkeleyDB location""... $ac_c" 1>&6 -+ echo $ac_n "checking for BerkeleyDB ${DB_VER} location""... $ac_c" 1>&6 - echo "configure:5816: checking for BerkeleyDB location" >&5 + echo $ac_n "checking for BerkeleyDB location""... $ac_c" 1>&6 + echo "configure:7596: checking for BerkeleyDB location" >&5 - if test x"$BERKELEY_DB_DIR" = xyes ; then - for v in BerkeleyDB BerkeleyDB.3.0 BerkeleyDB.3.1 BerkeleyDB.3.2 \ -- BerkeleyDB.3.3 BerkeleyDB.4.0 BerkeleyDB.4.1 BerkeleyDB.4.2 ; do +- BerkeleyDB.3.3 BerkeleyDB.4.0 BerkeleyDB.4.1 BerkeleyDB.4.2 BerkeleyDB.4.3 ; do - for d in $prefix /usr/local /opt /usr ; do - if test -d "$d/$v" ; then - BERKELEY_DB_DIR="$d/$v" @@ -19,7 +16,7 @@ - done - fi - if test x"$BERKELEY_DB_DIR" = xyes ; then -- for v in db42 db41 db4 db3 db2 ; do +- for v in db43 db42 db41 db4 db3 db2 ; do - if test -d "/usr/local/include/$v" ; then - BERKELEY_DB_LDFLAGS="-L/usr/local/lib" - BERKELEY_DB_CFLAGS="-I/usr/local/include/$v" @@ -29,7 +26,7 @@ - fi - done - if test x"$BERKELEY_DB_LIB" = x ; then -- for v in db42 db41 db4 db3 db2 ; do +- for v in db43 db42 db41 db4 db3 db2 ; do - if test -d "/usr/include/$v" ; then - BERKELEY_DB_CFLAGS="-I/usr/include/$v" - BERKELEY_DB_LIB="-l$v" @@ -43,21 +40,13 @@ - fi - fi - else -- BERKELEY_DB_LDFLAGS="-L$BERKELEY_DB_DIR/lib" + BERKELEY_DB_LDFLAGS="-L$BERKELEY_DB_DIR/lib" - BERKELEY_DB_CFLAGS="-I$BERKELEY_DB_DIR/include" - BERKELEY_DB_LIB="-ldb" - echo "$ac_t""$BERKELEY_DB_DIR" 1>&6 - fi -+ BERKELEY_DB_DIR="${LOCALBASE}" -+ BERKELEY_DB_LDFLAGS="-L${LOCALBASE}/lib" -+ BERKELEY_DB_CFLAGS="-I${LOCALBASE}/include/${DB_VER}" -+ if [ "${DB_VER}" != "db42" ] -+ then ++ BERKELEY_DB_CFLAGS="-I$BERKELEY_DB_DIR/include/${DB_VER}" + BERKELEY_DB_LIB="-l${DB_VER}" -+ else -+ BERKELEY_DB_LIB="-ldb-4.2" -+ fi -+ echo "$ac_t""$BERKELEY_DB_DIR" 1>&6 cat >> confdefs.h <<\EOF #define USE_BERKELEY_DB 1 EOF Index: files/patch-site:Makefile =================================================================== RCS file: /home/ncvs/ports/news/inn-stable/files/patch-site:Makefile,v retrieving revision 1.1 diff -u -r1.1 patch-site:Makefile --- files/patch-site:Makefile 9 Jul 2004 08:16:40 -0000 1.1 +++ files/patch-site:Makefile 6 Aug 2006 21:07:29 -0000 @@ -1,8 +1,8 @@ ---- site/Makefile.orig Wed May 26 04:02:32 2004 -+++ site/Makefile Fri Jul 9 07:56:05 2004 -@@ -23,29 +23,29 @@ - PATH_NNRPAUTH = ${PATHFILTER}/nnrpd_auth.pl +--- site/Makefile.orig Thu May 25 17:07:06 2006 ++++ site/Makefile Fri May 26 12:17:54 2006 +@@ -24,29 +24,29 @@ PATH_NNRPYAUTH = ${PATHFILTER}/nnrpd_auth.py + PATH_NNRPACCESS = ${PATHFILTER}/nnrpd_access.pl -PATH_CONFIG = ${PATHETC}/inn.conf -PATH_CONTROLCTL = ${PATHETC}/control.ctl @@ -53,7 +53,7 @@ PATH_ACTIVE = ${PATHDB}/active PATH_ACTIVE_TIMES = ${PATHDB}/active.times -@@ -72,8 +72,8 @@ +@@ -73,8 +73,8 @@ $D$(PATH_NEWSFEEDS) $D$(PATH_INNDHOSTS) \ $D$(PATH_NNRPDTRACK) $D$(PATH_NNTPPASS) \ $D$(PATH_CONFIG) $D$(PATH_MODERATORS) \ @@ -64,14 +64,14 @@ $D$(PATH_CTLWATCH) $D$(PATH_DISTPATS) $D$(PATH_SCHEMA) \ $D$(PATH_ACTSYNC_CFG) $D$(PATH_ACTSYNC_IGN) \ $D$(PATH_MOTD) $D$(PATH_STORAGECONF) \ -@@ -82,14 +82,14 @@ +@@ -83,14 +83,14 @@ $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) + $D$(PATH_SASL_CONF) $D$(PATH_SUBSCRIPTIONS) $D$(PATH_NNRPACCESS) ALL_INSTALLED = $(MOST_INSTALLED) $(REST_INSTALLED) @@ -81,16 +81,16 @@ ## Get new versions of everything from samples directory. all: $(P) $(ALL) config -@@ -175,9 +175,9 @@ +@@ -179,9 +179,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$(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) $? $@