Date: Wed, 22 Oct 2003 22:10:33 +0200 From: Clement Laforet <sheepkiller@cultdeadsheep.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Clement Laforet <sheepkiller@cultdeadsheep.org> Subject: ports/58395: [maintainer patch] news/inn-stable: update to 20031022 and misc fixes and improvements Message-ID: <20031022201105.E408E43FAF@mx1.FreeBSD.org> Resent-Message-ID: <200310222020.h9MKKEL5067443@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 58395
>Category: ports
>Synopsis: [maintainer patch] news/inn-stable: update to 20031022 and misc fixes and improvements
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Oct 22 13:20:13 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Clement Laforet
>Release: FreeBSD 5.1-CURRENT i386
>Organization:
cotds.org
>Environment:
System: FreeBSD lucifer.cultdeadsheep.org 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Mon Sep 22 08:20:10 CEST 2003 clement@lucifer.cultdeadsheep.org:/usr/obj/usr/src/sys/LUCIFER i386
>Description:
Changelog:
- Update to 20031022 snapshot
- set correctly inn tmpdir [PR 57859: thanks to G. Paul Ziemba" <p-fbsd-bugs@treehouse.napa.ca.us>]
- fix PKG_PREFIX for pkg-install, now post install script knows correct prefix
- add support for db41, db4, db3 in ovdb.
>How-To-Repeat:
N/A.
>Fix:
Index: inn-stable/Makefile
===================================================================
RCS file: /WORK/REPO/ports/news/inn-stable/Makefile,v
retrieving revision 1.100
diff -u -r1.100 Makefile
--- inn-stable/Makefile 28 Sep 2003 15:31:49 -0000 1.100
+++ inn-stable/Makefile 22 Oct 2003 17:11:13 -0000
@@ -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 @@
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 @@
--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_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 @@
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 ; \
Index: inn-stable/distinfo
===================================================================
RCS file: /WORK/REPO/ports/news/inn-stable/distinfo,v
retrieving revision 1.49
diff -u -r1.49 distinfo
--- inn-stable/distinfo 26 Sep 2003 06:38:42 -0000 1.49
+++ inn-stable/distinfo 22 Oct 2003 17:07:56 -0000
@@ -1 +1 @@
-MD5 (inn-STABLE-20030922.tar.gz) = 1a174f08c6b67850805fc9ec59d45054
+MD5 (inn-STABLE-20031022.tar.gz) = 1ab0470e2ccc327d75eab774252c456c
Index: inn-stable/files/patch-configure
===================================================================
RCS file: /WORK/REPO/ports/news/inn-stable/files/patch-configure,v
retrieving revision 1.1
diff -u -r1.1 patch-configure
--- inn-stable/files/patch-configure 26 Sep 2003 06:38:42 -0000 1.1
+++ inn-stable/files/patch-configure 22 Oct 2003 17:07:56 -0000
@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031022201105.E408E43FAF>