Date: Wed, 22 Oct 2003 13:30:18 -0700 (PDT) From: Clement Laforet <sheepkiller@cultdeadsheep.org> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/58394: [maintainer patch] news/inn: Misc fixes and improvements Message-ID: <200310222030.h9MKUIl1069155@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/58394; it has been noted by GNATS. From: Clement Laforet <sheepkiller@cultdeadsheep.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: Re: ports/58394: [maintainer patch] news/inn: Misc fixes and improvements Date: Wed, 22 Oct 2003 22:27:46 +0200 I forgot to bump portrevision :-) Here's the correct patch. 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 20:26:53 -0000 @@ -7,7 +7,7 @@ PORTNAME= inn PORTVERSION= 2.4.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= news ipv6 MASTER_SITES= ${MASTER_SITE_ISC} MASTER_SITE_SUBDIR= inn @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200310222030.h9MKUIl1069155>