mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-23 09:10:43 +00:00
Code Issues Releases Activity

Changelog:

Browse Source 
- 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 db4, db3 in ovdb.
Note for users:
inn 2.4.0 DOESN'T SUPPORT db4.1. If you want to use db4.1, use inn-stable
instead.
PR:	ports/58394
Submitted by:	Clement Laforet <sheepkiller@cultdeadsheep.org> (maintainer)
This commit is contained in:
Mark Linimon 2003-11-21 04:53:39 +00:00
parent 0ec456277c
commit 9c9ed0af71
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=94608
2 changed files with 54 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
news/inn/Makefile
View File

@ -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_GMAKE= yes
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 @@ 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+= 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 @@ 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 ; \

49
news/inn/files/patch-configure
View File

@ -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