update news/inn-stable:

  - update to 20030922 snapshot
  - get back to "date-based" PORTVERSION
  - Now config files are not removed
  - add many knobs
  - Use USE_OPENSSL hook

PR:		57158
Submitted by:	Clement Laforet <sheepkiller@cultdeadsheep.org> (maintainer)

1 files changed, 47 insertions, 11 deletions

diff --git a/news/inn-stable/Makefile b/news/inn-stable/Makefile
index 029cbdef70c9..fa83b38d2f97 100644
--- a/news/inn-stable/Makefile
+++ b/news/inn-stable/Makefile
@@ -6,26 +6,26 @@
 #
 
 PORTNAME=	inn
-PORTVERSION=	2.4.20030731
-#SNAPSHOT=	20030731
+PORTVERSION=	${SNAPSHOT}
 CATEGORIES=	news ipv6
-MASTER_SITES=	${MASTER_SITE_ISC}
-MASTER_SITE_SUBDIR=	inn
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.[0-9]*$/.0/}
-
-PATCH_SITES=	http://sheepkiller.nerim.net/ports/${PORTNAME}/ \
+MASTER_SITES=	http://sheepkiller.nerim.net/ports/${PORTNAME}/ \
 		http://www.cultdeadsheep.org/FreeBSD/ports/download/distfiles/
-PATCHFILES=	inn-patch-2.4_to_${PORTVERSION:C/2\.4\.//}-snap.gz
-PATCH_DIST_STRIP=-p1
+PKGNAMESUFFIX=	-${BRANCH}
+DISTNAME=	${PORTNAME}-${BRANCH:U}-${SNAPSHOT}
 
 MAINTAINER=	sheepkiller@cultdeadsheep.org
 COMMENT=	InterNetNews -- the Internet meets Netnews
 
+BRANCH=		stable
+SNAPSHOT=	20030922
+
 NO_LATEST_LINK=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_OPENSSL=	yes
 
+CONFLICTS=	inn*
+
 .if exists(/var/news) && !defined(PACKAGE_BUILDING)
 INN_NEWSSPOOL?=/var/news
 .elif exists(/var/spool/news) && !defined(PACKAGE_BUILDING)
@@ -36,20 +36,46 @@ INN_NEWSSPOOL?=${PREFIX}/news/spool
 INN_NEWSLOG?=/var/log/news
 
 HAS_CONFIGURE=		yes
+CONFIGURE_ENV+=		LOCALBASE=${LOCALBASE}
 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 \
+			--with-openssl=${OPENSSLBASE} \
 			--enable-ipv6
 
+.if defined(WITH_BERKELEYDB)
+# We don't support other versions for the moment.
+CONFIGURE_ARGS+=	--with-berkeleydb
+LIB_DEPENDS+=		db41:${PORTSDIR}/databases/db41
+.endif
+
 .if defined(WITH_PYTHON)
 USE_PYTHON=		YES
 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
+
+.if defined (WITH_MAXSOCKET)
+CONFIGURE_ARGS+=	--with-max-sockets=${WITH_MAXSOCKET}
+.endif
+
+.if defined(WITH_KEYWORDS)
+CONFIGURE_ARGS+=	--enable-keywords
+.endif
+
+.if defined(WITH_SASL)
+CONFIGURE_ARGS+=	--with-sasl=${LOCALBASE}
+LIB_DEPENDS+=		sasl2:${PORTSDIR}/security/cyrus-sasl2
+.endif
+
 .if defined(WITH_TAGGED_HASH)
 CONFIGURE_ARGS+=	--enable-tagged-hash
 DBZ_FILES=		dir pag
@@ -62,6 +88,7 @@ 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
 
@@ -87,6 +114,14 @@ 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
 
+.include <bsd.port.pre.mk>
+
+post-patch:
+.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
+.endif
+
 post-install:
 	${MKDIR} ${INN_NEWSSPOOL}
 .if !defined(NOPORTDOCS)
@@ -103,6 +138,7 @@ post-install:
 	    s+!!PREFIX!!+${PREFIX}+g && ${CHMOD} +x ${PREFIX}/etc/rc.d/innd.sh
 	@${CHOWN} root:news ${PREFIX}/news/bin/auth/passwd/ckpasswd
 	@${CHMOD} 4755 ${PREFIX}/news/bin/auth/passwd/ckpasswd
+	@PKG_PREFIX=${PKG_PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} CHECK-CONF
 	@(if [ ! -f ${PREFIX}/news/db/history ] ; then \
 	    ${ECHO} 'Creating empty history database...' ; \
 	    cd ${PREFIX}/news/db ; \
@@ -116,4 +152,4 @@ post-install:
 	fi)
 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>