ports/58394: [maintainer patch] news/inn: Misc fixes and improvements
Clement Laforet
sheepkiller at cultdeadsheep.org
Wed Oct 22 20:23:56 UTC 2003
>Number: 58394
>Category: ports
>Synopsis: [maintainer patch] news/inn: 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 at lucifer.cultdeadsheep.org:/usr/obj/usr/src/sys/LUCIFER i386
>Description:
Changelog:
- set correctly inn tmpdir [PR 57859: thanks to G. Paul Ziemba" <p-fbsd-bugs at treehouse.napa.ca.us>]
- fix PKG_PREFIX for pkg-install, now post install script knows correct prefix
- add support for db4, db3 in ovdb.
Note for users:
inn 2.4.0 DOESN'T SUPPORT db4.1. If you want to use db4.1 uses inn-stable instead.
>How-To-Repeat:
N/A.
>Fix:
Index: inn/Makefile
===================================================================
RCS file: /WORK/REPO/ports/news/inn/Makefile,v
retrieving revision 1.63
diff -u -r1.63 Makefile
--- inn/Makefile 28 Sep 2003 15:30:53 -0000 1.63
+++ inn/Makefile 22 Oct 2003 19:54:35 -0000
@@ -20,7 +20,7 @@
USE_PERL5= yes
USE_OPENSSL= yes
-CONFLICTS= inn-*
+CONFLICTS= inn-stable-* inn-current
.if exists(/var/news) && !defined(PACKAGE_BUILDING)
INN_NEWSSPOOL?=/var/news
@@ -38,14 +38,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+= db4:${PORTSDIR}/databases/db4
+. if !defined(WITH_BDB_VER)
+WITH_BDB_VER= 4
+. endif
+. if (${WITH_BDB_VER} == 3) || (${WITH_BDB_VER} == 4)
+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)
@@ -134,7 +144,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/files/patch-configure
===================================================================
RCS file: /WORK/REPO/ports/news/inn/files/patch-configure,v
retrieving revision 1.1
diff -u -r1.1 patch-configure
--- inn/files/patch-configure 26 Sep 2003 06:32:40 -0000 1.1
+++ inn/files/patch-configure 22 Oct 2003 19:54:35 -0000
@@ -1,15 +1,42 @@
---- configure.orig Mon Sep 22 11:31:16 2003
-+++ configure Mon Sep 22 11:32:15 2003
-@@ -5828,9 +5828,9 @@
+--- configure.orig Fri May 9 06:25:27 2003
++++ configure Wed Oct 22 19:16:35 2003
+@@ -5826,36 +5826,9 @@
+ done
+ done
fi
- if test x"$BERKELEY_DB_DIR" = xyes ; then
- for v in db4 db3 db2 ; do
+- 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
+- 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 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_LDFLAGS="-L$BERKELEY_DB_DIR/lib"
++ 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:
More information about the freebsd-ports-bugs
mailing list