aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--news/Makefile1
-rw-r--r--news/inn-current/Makefile59
-rw-r--r--news/inn-current/distinfo2
-rw-r--r--news/inn-current/files/patch-configure71
-rw-r--r--news/inn-current/pkg-descr2
-rw-r--r--news/inn-current/pkg-plist41
6 files changed, 110 insertions, 66 deletions
diff --git a/news/Makefile b/news/Makefile
index 06dc58dfca93..09906f026b6f 100644
--- a/news/Makefile
+++ b/news/Makefile
@@ -32,6 +32,7 @@
SUBDIR += ifmail
SUBDIR += ija
SUBDIR += inn
+ SUBDIR += inn-current
SUBDIR += inn-stable
SUBDIR += knews
SUBDIR += leafnode
diff --git a/news/inn-current/Makefile b/news/inn-current/Makefile
index fdfbb8a7df17..e3ae88aa6e0f 100644
--- a/news/inn-current/Makefile
+++ b/news/inn-current/Makefile
@@ -1,26 +1,31 @@
# New ports collection makefile for: inn
-# Date created: 20 Oct 1994 (1.4), 18 Dec 1996 (1.5.1), 14 Feb 1999 (2.2)
-# Whom: torstenb
+# Date created: 2003
+# Whom: clement
#
# $FreeBSD$
#
PORTNAME= inn
-PORTVERSION= 2.4.0
-PORTREVISION= 3
+PORTVERSION= ${SNAPSHOT}
CATEGORIES= news ipv6
-MASTER_SITES= ${MASTER_SITE_ISC}
-MASTER_SITE_SUBDIR= inn
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= clement
+PKGNAMESUFFIX= -${BRANCH}
+DISTNAME= ${PORTNAME}-${BRANCH:U}-${SNAPSHOT}
-MAINTAINER= sheepkiller@cultdeadsheep.org
+MAINTAINER= clement@FreeBSD.org
COMMENT= InterNetNews -- the Internet meets Netnews
+BRANCH= current
+SNAPSHOT= 20040118
+
NO_LATEST_LINK= yes
USE_GMAKE= yes
USE_PERL5= yes
+USE_REINPLACE= yes
USE_OPENSSL= yes
-CONFLICTS= inn-*
+CONFLICTS= inn-2.4* inn-stable-*
.if exists(/var/news) && !defined(PACKAGE_BUILDING)
INN_NEWSSPOOL?=/var/news
@@ -38,14 +43,27 @@ CONFIGURE_ARGS+= --mandir=${PREFIX}/man \
--with-spool-dir=${INN_NEWSSPOOL} \
--with-log-dir=${INN_NEWSLOG} \
--with-perl \
- --with-tmp-path=${INN_NEWSSPOOL}/tmp \
- --with-openssl=${OPENSSLBASE} \
- --enable-ipv6
+ --with-tmp-dir=${INN_NEWSSPOOL}/tmp \
+ --with-openssl=${OPENSSLBASE}
+
+.if !defined(WITHOUT_IPV6)
+CONFIGURE_ARGS+= --enable-ipv6
+.endif
.if defined(WITH_BERKELEYDB)
-# We don't support other versions for the moment.
-CONFIGURE_ARGS+= --with-berkeleydb
-LIB_DEPENDS+= db4:${PORTSDIR}/databases/db4
+CONFIGURE_ARGS+= --with-berkeleydb=${LOCABASE}
+. 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)
@@ -54,7 +72,6 @@ CONFIGURE_ARGS+= --with-python
.endif
.if defined(WITH_TCL)
-USE_REINPLACE= yes
CONFIGURE_ARGS+= --with-tcl=${LOCALBASE}
BUILD_DEPENDS+= ${LOCALBASE}/include/tcl8.3/tcl.h:${PORTSDIR}/lang/tcl83
.endif
@@ -84,13 +101,12 @@ 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 startinnfeed.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 \
@@ -102,7 +118,7 @@ MAN5= active.5 active.times.5 buffindexed.conf.5 control.ctl.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 \
+ 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 \
@@ -113,6 +129,7 @@ MAN8= actsync.8 actsyncd.8 archive.8 auth_smb.8 batcher.8 buffchan.8 \
.include <bsd.port.pre.mk>
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
@@ -147,5 +164,9 @@ post-install:
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."
.include <bsd.port.post.mk>
diff --git a/news/inn-current/distinfo b/news/inn-current/distinfo
index df9d0b77c60a..11d831991f7f 100644
--- a/news/inn-current/distinfo
+++ b/news/inn-current/distinfo
@@ -1 +1 @@
-MD5 (inn-2.4.0.tar.gz) = 629c445b7c7fe2a01257b883abb7bddf
+MD5 (inn-CURRENT-20040118.tar.gz) = b1c986626a3aa9e184b3630e5c587d76
diff --git a/news/inn-current/files/patch-configure b/news/inn-current/files/patch-configure
index 64ff492b9865..752d1c658b79 100644
--- a/news/inn-current/files/patch-configure
+++ b/news/inn-current/files/patch-configure
@@ -1,15 +1,56 @@
---- configure.orig Mon Sep 22 11:31:16 2003
-+++ configure Mon Sep 22 11:32:15 2003
-@@ -5828,9 +5828,9 @@
- fi
- if test x"$BERKELEY_DB_DIR" = xyes ; then
- for v in 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"
-+ if test -d "${LOCALBASE}/include/$v" ; then
-+ BERKELEY_DB_LDFLAGS="-L${LOCALBASE}/lib"
-+ BERKELEY_DB_CFLAGS="-I${LOCALBASE}/include/$v"
- BERKELEY_DB_LIB="-l$v"
- echo "$ac_t""FreeBSD locations" 1>&6
- break
+--- 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
+
+- 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
+- if test -d "/usr/local/$version" ; then
+- DB_DIR=/usr/local/$version
+- break
+- fi
+- done
+- fi
+-
+- if test x"$DB_DIR" = xyes ; then
+- for version in 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
+- break
+- fi
+- done
+- if test x"$DB_LIBS" = x ; then
+- for version in 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
+- 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
+- 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
+- fi
+
+ cat >>confdefs.h <<\_ACEOF
+ #define USE_BERKELEY_DB 1
diff --git a/news/inn-current/pkg-descr b/news/inn-current/pkg-descr
index 3ac36756d06b..86e93a92a321 100644
--- a/news/inn-current/pkg-descr
+++ b/news/inn-current/pkg-descr
@@ -2,5 +2,7 @@ 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-plist b/news/inn-current/pkg-plist
index 143ce112bda5..65c7530e9efd 100644
--- a/news/inn-current/pkg-plist
+++ b/news/inn-current/pkg-plist
@@ -10,6 +10,7 @@ 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
@@ -45,11 +46,11 @@ 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/inndstart
news/bin/innfeed
news/bin/innmail
news/bin/innreport
@@ -96,7 +97,6 @@ news/bin/shrinkfile
news/bin/signcontrol
news/bin/simpleftp
news/bin/sm
-news/bin/startinnfeed
news/bin/tally.control
news/bin/tdx-util
news/bin/writelog
@@ -115,6 +115,7 @@ 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
@@ -128,82 +129,56 @@ news/doc/hook-tcl
news/doc/sample-control
@unexec if cmp -s %D/news/etc/actsync.cfg %D/news/etc/actsync.cfg.dist; then rm -f %D/news/etc/actsync.cfg ; fi
news/etc/actsync.cfg.dist
-@exec [ -f %B/actsync.cfg ] || cp -f %B/%f %B/actsync.cfg
@unexec if cmp -s %D/news/etc/actsync.ign %D/news/etc/actsync.ign.dist; then rm -f %D/news/etc/actsync.ign ; fi
news/etc/actsync.ign.dist
-@exec [ -f %B/actsync.ign ] || cp -f %B/%f %B/actsync.ign
@unexec if cmp -s %D/news/etc/buffindexed.conf %D/news/etc/buffindexed.conf.dist; then rm -f %D/news/etc/buffindexed.conf ; fi
news/etc/buffindexed.conf.dist
-@exec [ -f %B/buffindexed.conf ] || cp -f %B%/%f %B/buffindexed.conf
@unexec if cmp -s %D/news/etc/control.ctl %D/news/etc/control.ctl.dist; then rm -f %D/news/etc/control.ctl ; fi
news/etc/control.ctl.dist
-@exec [ -f %B/control.ctl ] || cp -f %B/%f %B/control.ctl
@unexec if cmp -s %D/news/etc/cycbuff.conf %D/news/etc/cycbuff.conf.dist; then rm -f %D/news/etc/cycbuff.conf ; fi
news/etc/cycbuff.conf.dist
-@exec [ -f %B/cycbuff.conf ] || cp -f %B/%f %B/cycbuff.conf
@unexec if cmp -s %D/news/etc/distrib.pats %D/news/etc/distrib.pats.dist; then rm -f %D/news/etc/distrib.pats ; fi
news/etc/distrib.pats.dist
-@exec [ -f %B/distrib.pats ] || cp -f %B/%f %B/distrib.pats
@unexec if cmp -s %D/news/etc/expire.ctl %D/news/etc/expire.ctl.dist; then rm -f %D/news/etc/expire.ctl ; fi
news/etc/expire.ctl.dist
-@exec [ -f %B/expire.ctl ] || cp -f %B/%f %B/expire.ctl
@unexec if cmp -s %D/news/etc/incoming.conf %D/news/etc/incoming.conf.dist; then rm -f %D/news/etc/incoming.conf ; fi
news/etc/incoming.conf.dist
-@exec [ -f %B/incoming ] || cp -f %B/%f %B/incoming.conf
@unexec if cmp -s %D/news/etc/inn.conf %D/news/etc/inn.conf.dist; then rm -f %D/news/etc/inn.conf ; fi
news/etc/inn.conf.dist
-@exec [ -f %B/inn.conf ] || cp -f %B/%f %B/inn.conf
@unexec if cmp -s %D/news/etc/innfeed.conf %D/news/etc/innfeed.conf.dist; then rm -f %D/news/etc/innfeed.conf ; fi
news/etc/innfeed.conf.dist
-@exec [ -f %B/innfeed.conf.dist ] || cp -f %B/%f %B/innfeed.conf.dist
@unexec if cmp -s %D/news/etc/innreport.conf %D/news/etc/innreport.conf.dist; then rm -f %D/news/etc/innreport.conf ; fi
news/etc/innreport.conf.dist
-@exec [ -f %B/innreport.conf ] || cp -f %B/%f %B/innreport.conf
@unexec if cmp -s %D/news/etc/innwatch.ctl %D/news/etc/innwatch.ctl.dist; then rm -f %D/news/etc/innwatch.ctl ; fi
news/etc/innwatch.ctl.dist
-@exec [ -f %B/innwatch.ctl ] || cp -f %B/%f %B/innwatch.ctl
@unexec if cmp -s %D/news/etc/moderators %D/news/etc/moderators.dist; then rm -f %D/news/etc/moderators ; fi
news/etc/moderators.dist
-@exec [ -f %B/moderators ] || cp -f %B/%f %B/moderators
@unexec if cmp -s %D/news/etc/motd.news %D/news/etc/motd.news.dist; then rm -f %D/news/etc/motd.news ; fi
news/etc/motd.news.dist
-@exec [ -f %B/motd.news ] || cp -f %B/%f %B/motd.news
@unexec if cmp -s %D/news/etc/news2mail.cf %D/news/etc/news2mail.cf.dist; then rm -f %D/news/etc/news2mail.cf ; fi
news/etc/news2mail.cf.dist
-@exec [ -f %B/news2mail.cf ] || cp -f %B/%f %B/news2mail.cf
@unexec if cmp -s %D/news/etc/newsfeeds %D/news/etc/newsfeeds.dist; then rm -f %D/news/etc/newsfeeds ; fi
news/etc/newsfeeds.dist
-@exec [ -f %B/newsfeeds ] || cp -f %B/%f %B/newsfeeds
@unexec if cmp -s %D/news/etc/nnrpd.track %D/news/etc/nnrpd.track.dist; then rm -f %D/news/etc/nnrpd.track ; fi
news/etc/nnrpd.track.dist
-@exec [ -f %B/nnrpd.track ] || cp -f %B/%f %B/nnrpd.track
@unexec if cmp -s %D/news/etc/nntpsend.ctl %D/news/etc/nntpsend.ctl.dist; then rm -f %D/news/etc/nntpsend.ctl ; fi
news/etc/nntpsend.ctl.dist
-@exec [ -f %B/nntpsend.ctl ] || cp -f %B/%f %B/nntpsend.ctl
@unexec if cmp -s %D/news/etc/ovdb.conf %D/news/etc/ovdb.conf.dist; then rm -f %D/news/etc/ovdb.conf ; fi
news/etc/ovdb.conf.dist
-@exec [ -f %B/ovdb.conf ] || cp -f %B/%f %B/ovdb.conf
@unexec if cmp -s %D/news/etc/overview.fmt %D/news/etc/overview.fmt.dist; then rm -f %D/news/etc/overview.fmt ; fi
news/etc/overview.fmt.dist
-@exec [ -f %B/overview.fmt ] || cp -f %B/%f %B/overview.fmt
@unexec if cmp -s %D/news/etc/passwd.nntp %D/news/etc/passwd.nntp.dist; then rm -f %D/news/etc/passwd.nntp ; fi
news/etc/passwd.nntp.dist
-@exec [ -f %B/passwd.nntp ] || cp -f %B/%f %B/passwd.nntp
-@unexec if cmp -s %D/news/etc/radius.conf %D/news/etc/radius.conf.dist; then rm -f %D/news/etc/radius.conf ; fi
+@unexec if cmp -s %D/news/etc/radius.conf %D/news/etc/radius.conf.dist; then rm -f %D/news/etc/radius.conf ; fi
news/etc/radius.conf.dist
-@exec [ -f %B/radius.conf ] || cp -f %B/%f %B/radius.conf
@unexec if cmp -s %D/news/etc/readers.conf %D/news/etc/readers.conf.dist; then rm -f %D/news/etc/readers.conf; fi
news/etc/readers.conf.dist
-@exec [ -f %B/readers.conf ] || cp -f %B/%f %B/readers.conf
@unexec if cmp -s %D/news/etc/sasl.conf %D/news/etc/sasl.conf.dist; then rm -f %D/news/etc/sasl.conf ; fi
news/etc/sasl.conf.dist
-@exec [ -f %B/sasl.conf ] || cp -f %B/%f %B/sasl.conf
@unexec if cmp -s %D/news/etc/storage.conf %D/news/etc/storage.conf.dist; then rm -f %D/news/etc/storage.conf ; fi
news/etc/storage.conf.dist
-@exec [ -f %B/storage.conf ] || cp -f %B/%f %B/storage.conf
@unexec if cmp -s %D/news/etc/subscriptions %D/news/etc/subscriptions.dist; then rm -f %D/news/etc/subscriptions ; fi
news/etc/subscriptions.dist
-@exec [ -f %B/subscriptions ] || cp -f %B/%f %B/subscriptions
news/include/clibrary.h
news/include/conffile.h
news/include/config.h
@@ -211,6 +186,7 @@ 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
@@ -218,6 +194,9 @@ 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
@@ -264,7 +243,7 @@ news/lib/libstorage.a
@dirrm news/include
@unexec rmdir %D/news/etc 2>/dev/null || true
@dirrm news/doc
-@unexec rmdir %D/news/db 2>/dev/null || true
+@dirrm news/db
@dirrm news/bin/rnews.libexec
@dirrm news/bin/filter
@dirrm news/bin/control
@@ -272,4 +251,4 @@ news/lib/libstorage.a
@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)
+@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
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-24 06:23:20 +0000