3 files changed, 54 insertions, 20 deletions

diff --git a/news/inn-stable/Makefile b/news/inn-stable/Makefile
index e506814a0df0..d58cf5fbe0ed 100644
--- a/news/inn-stable/Makefile
+++ b/news/inn-stable/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	inn
 PORTVERSION=	${SNAPSHOT}
-PORTREVISION=	1
 CATEGORIES=	news ipv6
 MASTER_SITES=	http://sheepkiller.nerim.net/ports/${PORTNAME}/ \
 		http://www.cultdeadsheep.org/FreeBSD/ports/download/distfiles/
@@ -18,14 +17,14 @@ MAINTAINER=	sheepkiller@cultdeadsheep.org
 COMMENT=	InterNetNews -- the Internet meets Netnews
 
 BRANCH=		stable
-SNAPSHOT=	20030922
+SNAPSHOT=	20031022
 
 NO_LATEST_LINK=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_OPENSSL=	yes
 
-CONFLICTS=	inn*
+CONFLICTS=	inn-2.4.0* inn-current-*
 
 .if exists(/var/news) && !defined(PACKAGE_BUILDING)
 INN_NEWSSPOOL?=/var/news
@@ -43,14 +42,24 @@ CONFIGURE_ARGS+=	--mandir=${PREFIX}/man \
 			--with-spool-dir=${INN_NEWSSPOOL} \
 			--with-log-dir=${INN_NEWSLOG} \
 			--with-perl \
-			--with-tmp-path=${INN_NEWSSPOOL}/tmp \
+			--with-tmp-dir=${INN_NEWSSPOOL}/tmp \
 			--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
+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)
@@ -89,7 +98,6 @@ 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
 
@@ -139,7 +147,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
+	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} CHECK-CONF
 	@(if [ ! -f ${PREFIX}/news/db/history ] ; then \
 	    ${ECHO} 'Creating empty history database...' ; \
 	    cd ${PREFIX}/news/db ; \
diff --git a/news/inn-stable/distinfo b/news/inn-stable/distinfo
index 855f067fb742..100cbc155ab9 100644
--- a/news/inn-stable/distinfo
+++ b/news/inn-stable/distinfo
@@ -1 +1 @@
-MD5 (inn-STABLE-20030922.tar.gz) = 1a174f08c6b67850805fc9ec59d45054
+MD5 (inn-STABLE-20031022.tar.gz) = 1ab0470e2ccc327d75eab774252c456c
diff --git a/news/inn-stable/files/patch-configure b/news/inn-stable/files/patch-configure
index 5b94084067cc..efc64a5cee58 100644
--- a/news/inn-stable/files/patch-configure
+++ b/news/inn-stable/files/patch-configure
@@ -1,15 +1,41 @@
 --- configure.orig	Tue Sep  2 06:39:30 2003
-+++ configure	Mon Sep 22 11:34:06 2003
-@@ -5828,9 +5828,9 @@
++++ configure	Wed Oct 22 15:23:46 2003
+@@ -5826,36 +5826,9 @@
+ 	    done
+         done
      fi
-     if test x"$BERKELEY_DB_DIR" = xyes ; then
-         for v in db41 db4 db3 db2 ; do
+-    if test x"$BERKELEY_DB_DIR" = xyes ; then
+-        for v in 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"
-+            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
+-                BERKELEY_DB_LIB="-l$v"
+-                echo "$ac_t""FreeBSD locations" 1>&6
+-                break
+-            fi
+-        done
+-        if test x"$BERKELEY_DB_LIB" = x ; then
+-            for v in db41 db4 db3 db2 ; do
+-                if test -d "/usr/include/$v" ; then
+-                    BERKELEY_DB_CFLAGS="-I/usr/include/$v"
+-                    BERKELEY_DB_LIB="-l$v"
+-                    echo "$ac_t""Linux locations" 1>&6
+-                    break
+-                fi
+-            done
+-            if test x"$BERKELEY_DB_LIB" = x ; then        
+-                BERKELEY_DB_LIB=-ldb
+-                echo "$ac_t""trying -ldb" 1>&6
+-            fi
+-        fi
+-    else
+         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_CFLAGS="-I$BERKELEY_DB_DIR/include/${DB_VER}"
++        BERKELEY_DB_LIB="-l${DB_VER}"
+     cat >> confdefs.h <<\EOF
+ #define USE_BERKELEY_DB 1
+ EOF