[Box Backup-commit] COMMIT r2078 - in box/james/FreeBSD: . files

[boxbackup-dev@fluffy.co.uk]

Author: jamesog
Date: 2008-01-29 19:40:16 +0000 (Tue, 29 Jan 2008)
New Revision: 2078

Removed:
   box/james/FreeBSD/files/patch-configdir
Modified:
   box/james/FreeBSD/Makefile
Log:
Update FreeBSD port for pending 0.11 release:

 * Remove PREFIX patch for configdir
 * Allow user to set CONFIGDIR if they have config files in a non-standard location
 * Mark BDB as being client-only



Modified: box/james/FreeBSD/Makefile
===================================================================
--- box/james/FreeBSD/Makefile	2008-01-29 09:16:40 UTC (rev 2077)
+++ box/james/FreeBSD/Makefile	2008-01-29 19:40:16 UTC (rev 2078)
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	boxbackup
-PORTVERSION=	0.10
-PORTREVISION=	1
+PORTVERSION=	0.11
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=${PORTNAME}
@@ -23,17 +22,22 @@
 USE_AUTOTOOLS=	autoconf:261 aclocal:19 autoheader:261
 ACLOCAL_ARGS+=	-I ${WRKSRC}/infrastructure/m4
 
+# CONFDIR may be overridden if you keep /etc files somewhere other than
+# $PREFIX/etc
+CONFDIR?=	${PREFIX}/etc
+CONFIGURE_ARGS+=--sysconfdir=${CONFDIR}
+
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 OPTIONS=	CLIENT "Install the bbackupd client" On \
 		SERVER "Install the bbstored server" On \
-		BDB "Enable Berkeley DB" On \
+		BDB "Enable Berkeley DB (client only)" On \
 		GNUREADLINE "Enable the use of GNU readline" Off \
 		TESTS  "Allows use of a 'test' target to run tests" Off
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_BDB)
+.if defined(WITH_BDB) && defined(WITH_CLIENT)
 USE_BDB=	42+
 CONFIGURE_ARGS+=--with-bdb-lib=${BDB_LIB_DIR} \
 		--with-bdb-headers=${BDB_INCLUDE_DIR}

Deleted: box/james/FreeBSD/files/patch-configdir
===================================================================
--- box/james/FreeBSD/files/patch-configdir	2008-01-29 09:16:40 UTC (rev 2077)
+++ box/james/FreeBSD/files/patch-configdir	2008-01-29 19:40:16 UTC (rev 2078)
@@ -1,16 +0,0 @@
-Index: configure.ac
-===================================================================
---- configure.ac	(revision 2007)
-+++ configure.ac	(working copy)
-@@ -268,9 +268,11 @@
- test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
- bindir_expanded=`eval "echo $bindir"`
- bindir_expanded=`eval "echo $bindir_expanded"`
-+box_configdir=`eval "echo ${sysconfdir}/box"`
- prefix=$saved_prefix
- exec_prefix=$saved_exec_prefix
- AC_SUBST([bindir_expanded])
-+AC_DEFINE_UNQUOTED([BOX_CONFIGDIR], ["$box_configdir"], [Location of config files (e.g. PREFIX/etc)])
- 
- 
- ### Output files