Date: Tue, 13 Nov 2012 02:50:02 GMT From: Dan Langille <dan@langille.org> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/170773: sysutils/bacula-server overlaps with sysutils/backula-client with pkgng Message-ID: <201211130250.qAD2o2xq066448@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/170773; it has been noted by GNATS.
From: Dan Langille <dan@langille.org>
To: Rolf Grossmann <rg@progtech.net>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/170773: sysutils/bacula-server overlaps with sysutils/backula-client with pkgng
Date: Mon, 12 Nov 2012 21:39:03 -0500
--Apple-Mail=_21AD4FB2-2F91-4DEA-BB46-926F1C135DAF
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
charset=iso-8859-1
The attached patch seems to work fine for me. I hope it works fine.
--Apple-Mail=_21AD4FB2-2F91-4DEA-BB46-926F1C135DAF
Content-Disposition: attachment;
filename=bacula-patch
Content-Type: application/octet-stream;
x-unix-mode=0644;
name="bacula-patch"
Content-Transfer-Encoding: 7bit
diff -ruN /usr/ports/sysutils/bacula-bat/Makefile bacula-bat/Makefile
--- /usr/ports/sysutils/bacula-bat/Makefile 2012-06-06 06:44:23.000000000 +0000
+++ bacula-bat/Makefile 2012-09-30 00:30:57.000000000 +0000
@@ -2,18 +2,19 @@
# Date created: 18 Sep 2007
# Whom: Dan Langille <dan@langille.org>
#
-# $FreeBSD: ports/sysutils/bacula-bat/Makefile,v 1.16 2012/06/06 06:44:23 miwi Exp $
+# $FreeBSD: ports/sysutils/bacula-bat/Makefile,v 1.14 2012/01/04 08:20:50 scheidell Exp $
#
PORTNAME= bacula
-PORTREVISION= 2
PKGNAMESUFFIX= -bat
COMMENT= The network backup solution (GUI)
-LIB_DEPENDS+= qwt.5:${PORTSDIR}/x11-toolkits/qwt5
+LIB_DEPENDS+= qwt.5:${PORTSDIR}/x11-toolkits/qwt5 \
+ bac.5:${PORTSDIR}/sysutils/bacula-client
-USE_QT4= qmake_build uic_build moc_build rcc_build
+USE_QT_VER= 4
+QT_COMPONENTS= qmake_build uic_build moc_build rcc_build
WITH_BAT= yes
MAN1= bat.1
@@ -22,56 +23,12 @@
MASTERDIR= ${.CURDIR}/../../sysutils/bacula-server
-PLIST= ${.CURDIR}/pkg-plist
+CONFIGURE_ARGS+= --enable-bat \
+ --with-qwt=${LOCALBASE}/lib \
+ --disable-build-dird \
+ --disable-build-stored \
+ --enable-client-only
-CONFIGURE_ARGS+=--enable-bat \
- --with-qwt=${LOCALBASE}/lib \
- --disable-build-dird \
- --disable-build-stored \
- --enable-client-only
-
-OPTIONS+= OPENSSL "Enable OpenSSL for encrypted communication" on
+OPTIONS= OPENSSL "Enable OpenSSL for encrypted communication" on
.include "${MASTERDIR}/Makefile"
-.include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_OPENSSL)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
-CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE}
-.else
-CONFIGURE_ARGS+= --with-openssl="no"
-.endif
-
-.if exists(${LOCALBASE}/lib/libbac.so.${PORTVERSION:R:R}) && exists(${LOCALBASE}/lib/libbaccfg.so.${PORTVERSION:R:R})
-LIB_DEPENDS+= bac.${PORTVERSION:R:R}:${PORTSDIR}/sysutils/bacula-client
-PLIST_SUB+= INDEP="@comment "
-
-.elif exists(${LOCALBASE}/lib/libbac.so.1) || exists(${LOCALBASE}/lib/libbaccfg.so.1)
-# To prevent build with old libraries
-IGNORE= please update sysutils/bacula-client first
-
-.else
-WITH_LIBS= YES
-PLIST_SUB+= INDEP=""
-.endif
-
-pre-everything::
- @${ECHO_MSG} "===> Building bat the GUI interface for Bacula."
-
-do-install:
- # Install config files and preserve existing ones
- ${INSTALL_SCRIPT} ${WRKSRC}/src/qt-console/bat.conf ${PREFIX}/etc/bat.conf.sample
- ${INSTALL_MAN} ${WRKSRC}/manpages/bat.1 ${PREFIX}/man/man1/
-.if defined(WITH_LIBS)
- ${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/.libs/bat ${PREFIX}/sbin
- ${INSTALL_PROGRAM} ${WRKSRC}/src/lib/.libs/libbac.so.${PORTVERSION:R:R} \
- ${PREFIX}/lib
- ${INSTALL_PROGRAM} ${WRKSRC}/src/lib/.libs/libbaccfg.so.${PORTVERSION:R:R} \
- ${PREFIX}/lib
- ${INSTALL_PROGRAM} ${WRKSRC}/src/findlib/.libs/libbacfind.so.${PORTVERSION:R:R} \
- ${PREFIX}/lib
-.else
- ${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/bat ${PREFIX}/sbin
-.endif
-
-.include <bsd.port.post.mk>
diff -ruN /usr/ports/sysutils/bacula-client/Makefile bacula-client/Makefile
--- /usr/ports/sysutils/bacula-client/Makefile 2009-08-14 20:02:52.000000000 +0000
+++ bacula-client/Makefile 2012-09-30 00:30:57.000000000 +0000
@@ -1,14 +1,17 @@
-
# $FreeBSD: ports/sysutils/bacula-client/Makefile,v 1.5 2009/08/14 20:02:52 wxs Exp $
PORTNAME= bacula
-PKGNAMESUFFIX= -client
+PKGNAMESUFFIX= -client
-MASTERDIR= ${.CURDIR}/../bacula-server
COMMENT= The network backup solution (client)
-PLIST= ${PKGDIR}/pkg-plist.client
-WITH_CLIENT_ONLY= yes
+WITH_CLIENT_ONLY=yes
USE_RC_SUBR= bacula-fd
+PLIST= ${PKGDIR}/pkg-plist.client
+MASTERDIR= ${.CURDIR}/../../sysutils/bacula-server
+
+OPTIONS= NLS "Native Language Support via gettext utilities" on \
+ OPENSSL "Enable OpenSSL for encrypted communication" on
+
.include "${MASTERDIR}/Makefile"
diff -ruN /usr/ports/sysutils/bacula-client-static/Makefile bacula-client-static/Makefile
--- /usr/ports/sysutils/bacula-client-static/Makefile 1970-01-01 00:00:00.000000000 +0000
+++ bacula-client-static/Makefile 2012-09-30 00:30:57.000000000 +0000
@@ -0,0 +1,20 @@
+# $FreeBSD: ports/sysutils/bacula-client/Makefile,v 1.5 2009/08/14 20:02:52 wxs Exp $
+
+PORTNAME= bacula
+PKGNAMESUFFIX= -client-static
+
+COMMENT= The network backup solution (client static)
+
+MASTERDIR= ${.CURDIR}/../../sysutils/bacula-server
+
+OPTIONS= NLS "Native Language Support via gettext utilities" on \
+ OPENSSL "Enable OpenSSL for encrypted communication" on
+
+CONFIGURE_ARGS+= --enable-client-only \
+ --enable-static-fd \
+ --enable-static-cons \
+ --disable-libtool \
+ --disable-build-dird \
+ --disable-build-stored
+
+.include "${MASTERDIR}/Makefile"
diff -ruN /usr/ports/sysutils/bacula-docs/Makefile bacula-docs/Makefile
--- /usr/ports/sysutils/bacula-docs/Makefile 2012-09-14 20:31:57.000000000 +0000
+++ bacula-docs/Makefile 2012-09-30 00:30:57.000000000 +0000
@@ -2,7 +2,7 @@
# Date created: 4 January 2006
# Whom: Dan Langille <dan@langille.org>
#
-# $FreeBSD: ports/sysutils/bacula-docs/Makefile,v 1.25 2012/09/14 20:31:57 rm Exp $
+# $FreeBSD: ports/sysutils/bacula-docs/Makefile,v 1.22 2011/12/12 21:11:47 pawel Exp $
#
PORTNAME= bacula
@@ -10,7 +10,7 @@
CATEGORIES= sysutils
MASTER_SITES= SF
PKGNAMESUFFIX= -docs
-DISTFILES= ${PORTNAME}-docs-${PORTVERSION}.tar.bz2 ${PORTNAME}-${PORTVERSION}.tar.gz
+DISTFILES= ${PORTNAME}-docs-${PORTVERSION}.tar.bz2
MAINTAINER= dan@langille.org
COMMENT= The Bacula document set
@@ -21,7 +21,7 @@
UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX}
-PORTDOCS= *
+PORTDOCS= *.pdf
.ifdef NOPORTDOCS
IGNORE= consists of only documentation, please undef NOPORTDOCS and try again
@@ -29,11 +29,6 @@
do-install:
${MKDIR} ${DOCSDIR}
-
- ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${PORTVERSION}/ReleaseNotes \
- ${WRKDIR}/${PORTNAME}-${PORTVERSION}/kernstodo \
- ${DOCSDIR}/
-
${FIND} ${WRKDIR}/${PORTNAME}-docs-${PORTVERSION}/manuals/en \
-name "*.pdf" -exec ${INSTALL_DATA} {} ${DOCSDIR}/ \;
diff -ruN /usr/ports/sysutils/bacula-docs/distinfo bacula-docs/distinfo
--- /usr/ports/sysutils/bacula-docs/distinfo 2012-09-14 20:31:57.000000000 +0000
+++ bacula-docs/distinfo 2012-09-30 00:30:57.000000000 +0000
@@ -1,4 +1,2 @@
SHA256 (bacula-docs-5.2.12.tar.bz2) = 0cb61dbb1224786521286ce2b828d6b802908efc32ef7220db2e3e35530b7876
SIZE (bacula-docs-5.2.12.tar.bz2) = 41968688
-SHA256 (bacula-5.2.12.tar.gz) = 360435634e28881b3fedb0dc1901b9c9be1895ce1e39c9737262b25f44513887
-SIZE (bacula-5.2.12.tar.gz) = 4147847
diff -ruN /usr/ports/sysutils/bacula-server/Makefile bacula-server/Makefile
--- /usr/ports/sysutils/bacula-server/Makefile 2012-09-14 20:31:57.000000000 +0000
+++ bacula-server/Makefile 2012-10-27 18:08:41.000000000 +0000
@@ -2,13 +2,16 @@
# Date created: 24 February 2003
# Whom: Dmitry Sivachenko <demon@FreeBSD.org>
#
-# $FreeBSD: ports/sysutils/bacula-server/Makefile,v 1.137 2012/09/14 20:31:57 rm Exp $
+# $FreeBSD: ports/sysutils/bacula-server/Makefile,v 1.131 2011/12/12 21:11:47 pawel Exp $
#
PORTNAME= bacula
DISTVERSION= 5.2.12
+PORTREVISION?= 0
CATEGORIES?= sysutils
MASTER_SITES= SF/bacula/bacula/${PORTVERSION}
+PKGNAMEPREFIX?= #
+PKGNAMESUFFIX?= -server
MAINTAINER= dan@langille.org
COMMENT?= The network backup solution (server)
@@ -22,26 +25,27 @@
PLIST_SUB+= MAJOR=${PORTVERSION:R:R}
-USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
CPPFLAGS+= -I/usr/include/readline -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
-.if !defined(WITH_BAT) && !defined(WITH_NAGIOS_CHECK_ONLY) #Till end of the file
-PKGNAMESUFFIX?= -server
+OPTIONS?= SQLITE3 "Use SQLite-3 database" off \
+ MYSQL "Use MySQL database" off \
+ POSTGRESQL "Use PostgreSQL database" on \
+ MTX "Install mtx for control of autochanger devices" off \
+ NLS "Native Language Support via gettext utilities" on \
+ OPENSSL "Enable OpenSSL for encrypted communication" on
+
+.include <bsd.port.pre.mk>
-PORTDOCS= VERIFYING \
- technotes \
- ChangeLog \
- README \
- ReleaseNotes \
- LICENSE \
- INSTALL
+.if ${PKGNAMESUFFIX} == "-client" || ${PKGNAMESUFFIX} == "-server" #Till end of the file
.if !defined(WITH_CLIENT_ONLY)
+LIB_DEPENDS+= bac.5:${PORTSDIR}/sysutils/bacula-client
USE_RC_SUBR?= bacula-dir bacula-sd
.endif
@@ -51,18 +55,15 @@
SUB_FILES+= pkg-install.server pkg-deinstall.server pkg-message.server
.endif
-#
MANCOMPRESSED= yes
CONFIGURE_ARGS+=--with-tcp-wrappers=/usr/lib \
--enable-smartalloc \
--with-working-dir=${BACULA_DIR} \
--with-scriptdir=${PREFIX}/share/${PORTNAME} \
- --docdir=${DOCSDIR} \
- --htmldir=${DOCSDIR} \
--with-readline=yes \
--disable-conio \
--enable-batch-insert \
- --with-plugindir=${LOCALBASE}/lib \
+ --with-plugindir=${PREFIX}/lib \
--with-dump-email=root@localhost \
--with-job-email=root@localhost \
--with-db-name=bacula \
@@ -80,18 +81,6 @@
--with-sd-group=operator
.endif
-.if defined(WITH_CLIENT_ONLY)
-OPTIONS= WXCONSOLE "Build with wxGTK based GUI console: deprecated" off
-OPTIONS+= SFDAEMON "Build with staticly compiled file daemon" off
-.else
-OPTIONS= SQLITE3 "Use SQLite-3 database" off
-OPTIONS+= MYSQL "Use MySQL database" off
-OPTIONS+= POSTGRESQL "Use PostgreSQL database" off
-OPTIONS+= MTX "Install mtx for control of autochanger devices" off
-.endif
-OPTIONS+= NLS "Native Language Support via gettext utilities" on
-OPTIONS+= OPENSSL "Enable OpenSSL for encrypted communication" on
-
# The user/group IDs below are registered, see
# http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/book.html#DADS-UID
#
@@ -109,8 +98,6 @@
BACULA_GID=${BACULA_GID} \
BACULA_DIR=${BACULA_DIR}
-.include <bsd.port.pre.mk>
-
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
CONFIGURE_ARGS+= --enable-nls
@@ -125,33 +112,12 @@
# Client only or full server version
.if defined(WITH_CLIENT_ONLY)
CONFFILES= fd
-# --disable-xattr is temporary to allow build with 8-current
-CONFIGURE_ARGS+= --enable-client-only --disable-xattr
+CONFIGURE_ARGS+= --enable-client-only
+
PKGDEINSTALL= ${FILESDIR}/pkg-deinstall.client
PKGINSTALL= ${FILESDIR}/pkg-install.client
-# Build a static fd binary.
-.if defined(WITH_SFDAEMON)
-CONFIGURE_ARGS+= --enable-static-fd
-CONFIGURE_ARGS+= --disable-libtool
-PLIST_SUB+= SFDAEMON=""
-PLIST_SUB+= NOSF="@comment "
-.else
-PLIST_SUB+= SFDAEMON="@comment "
-PLIST_SUB+= NOSF=""
-.endif
-#Build bwx-console is deprecated use bacula-bat instead
-.if defined(WITH_WXCONSOLE)
-IGNORE= please use sysutils/bacula-bat instead of wxconsole
-USE_WX= 2.4
-CONFIGURE_ARGS+= --enable-bwx-console
-CONFIGURE_ENV+= WXCONFIG="${WX_CONFIG}"
-PLIST_SUB+= WXCONS=""
-.else
-PLIST_SUB+= WXCONS="@comment "
-.endif
.else
# Server only Options
-PLIST_SUB+= WXCONS="@comment "
CONFFILES= sd dir
# Server default database
.if defined(WITH_MYSQL)
@@ -184,21 +150,20 @@
.endif
.if defined(WITH_CLIENT_ONLY)
-MAN8= bacula-fd.8 bconsole.8
-EXTRA_PATCHES+= ${FILESDIR}/extra__manpages__Makefile.in
+MAN8+= bacula-fd.8 bconsole.8
.else
-MAN1= bat.1 bsmtp.1 bacula-tray-monitor.1 bacula-bwxconsole.1
-MAN8= bacula.8 bacula-dir.8 bacula-fd.8 bacula-sd.8 bconsole.8 \
- bcopy.8 bextract.8 bls.8 bregex.8 bscan.8 btape.8 \
- btraceback.8 bwild.8 dbcheck.8
+MAN8+= bacula.8 bacula-dir.8 bacula-sd.8 bcopy.8 bextract.8 bls.8 bscan.8 btape.8 \
+ btraceback.8 dbcheck.8 bwild.8 bregex.8
+MAN1+= bsmtp.1 bacula-tray-monitor.1 bacula-bwxconsole.1
.endif
+MAKE_ENV+= MAN8="${MAN8}" MAN1="${MAN1}"
+
pre-everything::
.if !defined(WITH_CLIENT_ONLY)
@${ECHO_MSG} "You may use the following build options (or make config):"
@${ECHO_MSG} ""
@${ECHO_MSG} " WITH_CLIENT_ONLY=yes if you only want the file daemon."
-# @${ECHO_MSG} " WITH_WXCONSOLE=yes if you only want a wxGTK based GUI console."
@${ECHO_MSG} " WITH_MTX=yes if you want to use mtx instead of chio for autochanger control."
@${ECHO_MSG} " WITH_SQLITE3=yes if you want SQLite-3 as the database (not recommended)."
.if !defined(WITH_MYSQL) && !defined(WITH_POSTGRESQL)
@@ -211,19 +176,17 @@
@${ECHO_MSG} ""
@${ECHO_MSG} "===> Using ${DBTYPE} as the bacula database."
@${ECHO_MSG} ""
-.else
- @${ECHO_MSG} "You may use the following build options (or make config):"
- @${ECHO_MSG} " WITH_SFDAEMON=yes if you want staticly compiled file daemon (client)."
- @${ECHO_MSG} "===> Building file daemon only."
.endif
post-patch:
-# Respect NOPORTDOCS
-.if defined(NOPORTDOCS)
+# this port does not install docs. See bacula-docs for that
${REINPLACE_CMD} -e '/docdir/d' ${WRKSRC}/Makefile.in
-.endif
+# Change $(ECHO) to echo in some Makefile.in files
+ @${REINPLACE_CMD} -e 's|$$(ECHO)|echo|g' ${WRKSRC}/src/filed/Makefile.in \
+ ${WRKSRC}/src/console/Makefile.in
# Default bconsole.conf is ${PREFIX}/etc
@${REINPLACE_CMD} -e 's|./bconsole.conf|${PREFIX}/etc/bconsole.conf|g' ${WRKSRC}/src/console/console.c
+ @${REINPLACE_CMD} -e 's|^MAN8 =|MAN8 ?=|g' -e 's|^MAN1 =|MAN1 ?=|g' ${WRKSRC}/manpages/Makefile.in
.if defined(WITH_CLIENT_ONLY)
# In client port only install startup script out of script dir (see below post-install)
# Dont mkdir ${PREFIX}/share/bacula cause it's empty
@@ -231,7 +194,12 @@
${REINPLACE_CMD} -e 's|\(.*$${MKDIR} $${DESTDIR}$${scriptdir}\)|#\1|g' ${WRKSRC}/Makefile.in
.else
# In server port don't install filed
- @${REINPLACE_CMD} -e '/^fd_subdirs = /s|src/filed||' -e 's|src/console||' ${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} -e '/^fd_subdirs = /s|src/filed||' -e 's|src/console||' \
+ -e 's|src/lib||' -e 's|src/findlib||' -e 's|@FD_PLUGIN_DIR@||' ${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} -e 's|../lib/|$$(LOCALBASE)/lib/|g' -e 's|../findlib/|$$(LOCALBASE)/lib/|g' ${WRKSRC}/src/dird/Makefile.in \
+ ${WRKSRC}/src/stored/Makefile.in ${WRKSRC}/src/tools/Makefile.in
+ @${REINPLACE_CMD} -e 's|fd_plugins.h|filed/fd_plugins.h|g' -e 's|dir_plugins.h|dird/dir_plugins.h|g' -e 's|stored.h|stored/stored.h|g' \
+ ${WRKSRC}/src/tools/bpluginfo.c
.endif
.if !target(pre-install)
@@ -263,14 +231,6 @@
${CHGRP} bacula ${PREFIX}/etc/bconsole.conf.sample; \
${ECHO_CMD} "etc/bconsole.conf.sample" >> ${TMPPLIST}; \
fi
-.if defined(WITH_WXCONSOLE)
- if [ -f ${PREFIX}/etc/bwx-console.conf.new ]; then \
- ${ECHO_CMD} "etc/bwx-console.conf.new" >> ${TMPPLIST}; \
- elif [ -f ${PREFIX}/etc/bwx-console.conf ]; then \
- ${MV} ${PREFIX}/etc/bwx-console.conf ${PREFIX}/etc/bwx-console.conf.sample; \
- ${ECHO_CMD} "etc/bwx-console.conf.sample" >> ${TMPPLIST}; \
- fi
-.endif
# ensure that users in the bacula group can run bconsole
${CHGRP} bacula ${PREFIX}/sbin/bconsole
@@ -308,10 +268,9 @@
fi; \
done
- ${CHGRP} wheel ${PREFIX}/etc
-
@${CAT} ${PKGMESSAGE}
.endif
-
+.else
+.include "${MASTERDIR}/Makefile.common"
+.endif # -client and -server are defined
.include <bsd.port.post.mk>
-.endif # if !defined(WITH_BAT) && !defined(WITH_NAGIOS_CHECK_ONLY)
diff -ruN /usr/ports/sysutils/bacula-server/Makefile.common bacula-server/Makefile.common
--- /usr/ports/sysutils/bacula-server/Makefile.common 1970-01-01 00:00:00.000000000 +0000
+++ bacula-server/Makefile.common 2012-09-30 00:40:56.000000000 +0000
@@ -0,0 +1,63 @@
+PLIST= ${WRKDIR}/pkg-plist
+
+.if ${PKGNAMESUFFIX} == "-bat"
+.if defined(WITH_OPENSSL)
+.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE}
+.else
+CONFIGURE_ARGS+= --with-openssl="no"
+.endif
+.endif
+
+pre-everything::
+.if ${PKGNAMESUFFIX} == "-bat"
+ @${ECHO_MSG} "===> Building bat the GUI interface for Bacula."
+.endif
+.if ${PKGNAMEPREFIX} == "nagios-check_"
+ @${ECHO_MSG} "===> Building nagios check only."
+.endif
+.if ${PKGNAMESUFFIX} == "-client-static"
+ @${ECHO_MSG} "===> Building static version of fd."
+.endif
+
+post-patch:
+# Change $(ECHO) to echo in some Makefile.in files
+ @${REINPLACE_CMD} -e 's|$$(ECHO)|echo|g' ${WRKSRC}/src/filed/Makefile.in \
+ ${WRKSRC}/src/console/Makefile.in
+
+post-build:
+.if ${PKGNAMEPREFIX} == "nagios-check_"
+ ${MAKE} -C ${WRKSRC}/examples/nagios/check_bacula
+.endif
+
+pre-install:
+ @${RM} -f ${PLIST}
+.if ${PKGNAMESUFFIX} == "-bat"
+ @${ECHO_CMD} "etc/bat.conf.sample" >> ${PLIST}
+ @${ECHO_CMD} "sbin/bat" >> ${PLIST}
+.endif
+.if ${PKGNAMEPREFIX} == "nagios-check_"
+ @${ECHO_CMD} "libexec/nagios/check_bacula" >> ${PLIST}
+ @${ECHO_CMD} "@dirrmtry libexec/nagios" >> ${PLIST}
+.endif
+.if ${PKGNAMESUFFIX} == "-client-static"
+ @${ECHO_CMD} "sbin/bacula-fd-static" >> ${PLIST}
+ @${ECHO_CMD} "sbin/bconsole-static" >> ${PLIST}
+.endif
+
+do-install:
+.if ${PKGNAMESUFFIX} == "-bat"
+# Install config files and preserve existing ones
+ ${INSTALL_SCRIPT} ${WRKSRC}/src/qt-console/bat.conf ${PREFIX}/etc/bat.conf.sample
+ ${INSTALL_MAN} ${WRKSRC}/manpages/bat.1 ${PREFIX}/man/man1/
+ ${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/bat ${PREFIX}/sbin
+.endif
+.if ${PKGNAMEPREFIX} == "nagios-check_"
+ @${MKDIR} ${PREFIX}/libexec/nagios
+ ${INSTALL_PROGRAM} ${WRKSRC}/examples/nagios/check_bacula/check_bacula \
+ ${PREFIX}/libexec/nagios
+.endif
+.if ${PKGNAMESUFFIX} == "-client-static"
+ ${INSTALL_PROGRAM} ${WRKSRC}/src/filed/static-bacula-fd ${PREFIX}/sbin/bacula-fd-static
+ ${INSTALL_PROGRAM} ${WRKSRC}/src/console/static-bconsole ${PREFIX}/sbin/bconsole-static
+.endif
diff -ruN /usr/ports/sysutils/bacula-server/files/bacula-dir.in bacula-server/files/bacula-dir.in
--- /usr/ports/sysutils/bacula-server/files/bacula-dir.in 2012-01-14 08:56:57.000000000 +0000
+++ bacula-server/files/bacula-dir.in 2012-09-30 00:40:56.000000000 +0000
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: ports/sysutils/bacula-server/files/bacula-dir.in,v 1.5 2012/01/14 08:56:57 dougb Exp $
+# $FreeBSD: ports/sysutils/bacula-server/files/bacula-dir.in,v 1.4 2010/03/27 00:14:52 dougb Exp $
#
# PROVIDE: bacula_dir
# REQUIRE: DAEMON %%REQ_MYSQL%% %%REQ_PGSQL%%
@@ -17,7 +17,7 @@
. /etc/rc.subr
name="bacula_dir"
-rcvar=bacula_dir_enable
+rcvar=${name}_enable
command=%%PREFIX%%/sbin/bacula-dir
load_rc_config $name
diff -ruN /usr/ports/sysutils/bacula-server/files/bacula-fd.in bacula-server/files/bacula-fd.in
--- /usr/ports/sysutils/bacula-server/files/bacula-fd.in 2012-01-14 08:56:57.000000000 +0000
+++ bacula-server/files/bacula-fd.in 2012-09-30 00:40:56.000000000 +0000
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: ports/sysutils/bacula-server/files/bacula-fd.in,v 1.7 2012/01/14 08:56:57 dougb Exp $
+# $FreeBSD: ports/sysutils/bacula-server/files/bacula-fd.in,v 1.6 2010/03/27 00:14:52 dougb Exp $
#
# PROVIDE: bacula_fd
# REQUIRE: DAEMON
@@ -17,7 +17,7 @@
. /etc/rc.subr
name="bacula_fd"
-rcvar=bacula_fd_enable
+rcvar=${name}_enable
command=%%PREFIX%%/sbin/bacula-fd
load_rc_config $name
diff -ruN /usr/ports/sysutils/bacula-server/files/bacula-sd.in bacula-server/files/bacula-sd.in
--- /usr/ports/sysutils/bacula-server/files/bacula-sd.in 2012-01-14 08:56:57.000000000 +0000
+++ bacula-server/files/bacula-sd.in 2012-09-30 00:40:56.000000000 +0000
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: ports/sysutils/bacula-server/files/bacula-sd.in,v 1.6 2012/01/14 08:56:57 dougb Exp $
+# $FreeBSD: ports/sysutils/bacula-server/files/bacula-sd.in,v 1.5 2010/03/27 00:14:52 dougb Exp $
#
# PROVIDE: bacula_sd
# REQUIRE: DAEMON
@@ -17,7 +17,7 @@
. /etc/rc.subr
name="bacula_sd"
-rcvar=bacula_sd_enable
+rcvar=`set_rcvar`
command=%%PREFIX%%/sbin/bacula-sd
load_rc_config $name
diff -ruN /usr/ports/sysutils/bacula-server/files/extra__manpages__Makefile.in bacula-server/files/extra__manpages__Makefile.in
--- /usr/ports/sysutils/bacula-server/files/extra__manpages__Makefile.in 2011-12-12 21:11:48.000000000 +0000
+++ bacula-server/files/extra__manpages__Makefile.in 1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
---- manpages/Makefile.in.orig 2011-11-26 18:08:12.000000000 +0400
-+++ manpages/Makefile.in 2011-12-02 23:19:42.000000000 +0400
-@@ -4,12 +4,8 @@
-
- .PHONY: dummy
-
--MAN8 = bacula.8 bacula-dir.8 bacula-fd.8 bacula-sd.8 \
-- bconsole.8 bcopy.8 bextract.8 bls.8 bscan.8 btape.8 \
-- btraceback.8 dbcheck.8 bwild.8 bregex.8
-+MAN8 = bacula-fd.8 bconsole.8
-
--MAN1 = bacula-tray-monitor.1 bacula-bwxconsole.1 bsmtp.1 bat.1
--
- # bacula-bgnome-console.1
-
- all:
diff -ruN /usr/ports/sysutils/bacula-server/files/patch-src__cats__Makefile.in bacula-server/files/patch-src__cats__Makefile.in
--- /usr/ports/sysutils/bacula-server/files/patch-src__cats__Makefile.in 2012-07-29 19:13:53.000000000 +0000
+++ bacula-server/files/patch-src__cats__Makefile.in 2012-09-30 00:40:56.000000000 +0000
@@ -1,33 +1,51 @@
---- src/cats/Makefile.in~ 2012-06-28 14:52:03.000000000 +0000
-+++ src/cats/Makefile.in 2012-07-27 14:40:29.000000000 +0000
+--- src/cats/Makefile.in 2012-06-28 09:52:03.000000000 -0500
++++ src/cats/Makefile.in 2012-08-09 15:30:19.000000000 -0500
@@ -142,25 +142,25 @@
libbacsql.la: Makefile $(LIBBACSQL_LOBJS)
@echo "Making $@ ..."
- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACSQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACSQL_LT_RELEASE) $(DB_LIBS)
-+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACSQL_LOBJS) -export-dynamic -rpath $(libdir) -version-info 5 $(DB_LIBS)
++ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACSQL_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACSQL_LT_RELEASE:S/./:/g:S/12/0/g)
libbaccats.la: Makefile cats_dummy.lo
@echo "Making $@ ..."
- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ cats_dummy.lo -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE)
-+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ cats_dummy.lo -export-dynamic -rpath $(libdir) -version-info 5
++ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ cats_dummy.lo -export-dynamic -rpath $(libdir) -version-info $(LIBBACCATS_LT_RELEASE:S/./:/g:S/12/0/g)
libbaccats-mysql.la: Makefile $(MYSQL_LOBJS)
@echo "Making $@ ..."
- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(MYSQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \
-+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(MYSQL_LOBJS) -export-dynamic -rpath $(libdir) -version-info 5 \
++ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(MYSQL_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACCATS_LT_RELEASE:S/./:/g:S/12/0/g) \
-soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(MYSQL_LIBS)
libbaccats-postgresql.la: Makefile $(POSTGRESQL_LOBJS)
@echo "Making $@ ..."
- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(POSTGRESQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \
-+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(POSTGRESQL_LOBJS) -export-dynamic -rpath $(libdir) -version-info 5 \
++ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(POSTGRESQL_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACCATS_LT_RELEASE:S/./:/g:S/12/0/g) \
-soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(POSTGRESQL_LIBS)
libbaccats-sqlite3.la: Makefile $(SQLITE_LOBJS)
@echo "Making $@ ..."
- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(SQLITE_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \
-+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(SQLITE_LOBJS) -export-dynamic -rpath $(libdir) -version-info 5 \
++ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(SQLITE_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACCATS_LT_RELEASE:S/./:/g:S/12/0/g) \
-soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(SQLITE_LIBS)
#libbaccats-ingres.la: Makefile $(INGRES_LOBJS)
+@@ -237,7 +237,7 @@
+ for db_type in @DB_BACKENDS@; do \
+ $(LIBTOOL_INSTALL_FINISH) $(INSTALL_LIB) libbaccats-$${db_type}.la $(DESTDIR)$(libdir); \
+ done
+- ./install-default-backend @DEFAULT_DB_TYPE@ $(LIBBACCATS_LT_RELEASE) $(DESTDIR)$(libdir)
++ ./install-default-backend @DEFAULT_DB_TYPE@ 5 $(DESTDIR)$(libdir)
+
+ libtool-uninstall:
+ $(LIBTOOL_UNINSTALL) $(RMF) $(DESTDIR)$(libdir)/libbacsql.la
+@@ -323,7 +323,7 @@
+ depend:
+ @$(MV) Makefile Makefile.bak
+ @$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
+- @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
++ @echo "# DO NOT DELETE: nice dependency list follows" >> Makefile
+ @for src in $(LIBBACSQL_SRCS); do \
+ $(CXX) -S -M -MT `basename $$src .c`$(DEFAULT_OBJECT_TYPE) $(CPPFLAGS) $(XINC) $(DEFS) -I$(srcdir) -I$(basedir) $$src >> Makefile; \
+ done
diff -ruN /usr/ports/sysutils/bacula-server/files/patch-src__cats__install-default-backend.in bacula-server/files/patch-src__cats__install-default-backend.in
--- /usr/ports/sysutils/bacula-server/files/patch-src__cats__install-default-backend.in 2012-03-01 22:49:26.000000000 +0000
+++ bacula-server/files/patch-src__cats__install-default-backend.in 2012-09-30 00:40:56.000000000 +0000
@@ -1,26 +1,25 @@
---- src/cats/install-default-backend.in.orig 2012-02-21 16:59:33.000000000 +0100
-+++ src/cats/install-default-backend.in 2012-02-22 19:23:12.041489960 +0100
-@@ -22,19 +22,19 @@
+--- src/cats/install-default-backend.in 2012-03-31 23:39:38.000000000 -0500
++++ src/cats/install-default-backend.in 2012-03-31 23:40:56.000000000 -0500
+@@ -22,11 +22,11 @@
exit 1
fi
-if [ -f ${install_dir}/libbaccats-${default_backend}-${library_version}${SHLIB_EXT} ]; then
-+if [ -f ${install_dir}/libbaccats-${default_backend}${SHLIB_EXT}.5 ]; then
++if [ -f ${install_dir}/libbaccats-${default_backend}${SHLIB_EXT}.${library_version} ]; then
#
# Create a default catalog library pointing to one of the shared libs.
#
- rm -f ${install_dir}/libbaccats-${library_version}${SHLIB_EXT}
-+ rm -f ${install_dir}/libbaccats${SHLIB_EXT}.5
++ rm -f ${install_dir}/libbaccats${SHLIB_EXT}.${library_version}
#
# Create a relative symlink to the default backend
- # As all backends are in the same directory anyhow this should
+@@ -34,7 +34,7 @@
# always work.
#
-- ln -s libbaccats-${default_backend}${SHLIB_EXT} \
+ ln -s libbaccats-${default_backend}${SHLIB_EXT} \
- ${install_dir}/libbaccats-${library_version}${SHLIB_EXT}
-+ ln -s libbaccats-${default_backend}${SHLIB_EXT}.5 \
-+ ${install_dir}/libbaccats${SHLIB_EXT}.5
++ ${install_dir}/libbaccats${SHLIB_EXT}.${library_version}
fi
exit 0
diff -ruN /usr/ports/sysutils/bacula-server/files/patch-src__console__Makefile.in bacula-server/files/patch-src__console__Makefile.in
--- /usr/ports/sysutils/bacula-server/files/patch-src__console__Makefile.in 1970-01-01 00:00:00.000000000 +0000
+++ bacula-server/files/patch-src__console__Makefile.in 2012-09-30 00:40:56.000000000 +0000
@@ -0,0 +1,11 @@
+--- src/console/Makefile.in 2012-03-24 15:10:18.000000000 -0500
++++ src/console/Makefile.in 2012-03-24 15:10:35.000000000 -0500
+@@ -53,7 +53,7 @@
+
+ static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
+ $(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
+- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
++ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS:S/.so/.a/g) \
+ $(OPENSSL_LIBS)
+ strip $@
+
diff -ruN /usr/ports/sysutils/bacula-server/files/patch-src__dird__Makefile.in bacula-server/files/patch-src__dird__Makefile.in
--- /usr/ports/sysutils/bacula-server/files/patch-src__dird__Makefile.in 1970-01-01 00:00:00.000000000 +0000
+++ bacula-server/files/patch-src__dird__Makefile.in 2012-09-30 00:40:56.000000000 +0000
@@ -0,0 +1,28 @@
+--- src/dird/Makefile.in 2011-11-26 09:08:12.000000000 -0500
++++ src/dird/Makefile.in 2011-12-02 13:15:46.000000000 -0500
+@@ -68,14 +68,14 @@
+ ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) \
+ ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
+ @echo "Linking $@ ..."
+- $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
++ $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats -L../findlib $(WLDFLAGS) $(LDFLAGS) -o $@ $(SVROBJS) \
+ -lbacfind -lbacsql -lbaccats -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \
+ $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
+
+ static-bacula-dir: Makefile $(SVROBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
+ ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) \
+ ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
+- $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
++ $(LIBTOOL_LINK) $(CXX) -static -L../lib -L../cats -L../findlib $(WLDFLAGS) $(LDFLAGS) -o $@ $(SVROBJS) \
+ -lbacfind -lbacsql -lbaccats -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \
+ $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
+ strip $@
+@@ -141,7 +141,7 @@
+ depend:
+ @$(MV) Makefile Makefile.bak
+ @$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
+- @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
++ @echo "# DO NOT DELETE: nice dependency list follows" >> Makefile
+ @$(CXX) -S -M $(CPPFLAGS) $(XINC) $(PYTHON_INC) -I$(srcdir) -I$(basedir) *.c >> Makefile
+ @if test -f Makefile ; then \
+ $(RMF) Makefile.bak; \
diff -ruN /usr/ports/sysutils/bacula-server/files/patch-src__filed__Makefile.in bacula-server/files/patch-src__filed__Makefile.in
--- /usr/ports/sysutils/bacula-server/files/patch-src__filed__Makefile.in 1970-01-01 00:00:00.000000000 +0000
+++ bacula-server/files/patch-src__filed__Makefile.in 2012-09-30 00:40:56.000000000 +0000
@@ -0,0 +1,11 @@
+--- src/filed/Makefile.in 2012-06-28 09:52:03.000000000 -0500
++++ src/filed/Makefile.in 2012-08-09 15:04:48.000000000 -0500
+@@ -102,7 +102,7 @@
+ static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
+ $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
+ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(LIBS) \
+- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS)
++ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS:S/.so/.a/g) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS)
+ strip $@
+
+ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
diff -ruN /usr/ports/sysutils/bacula-server/files/patch-src__findlib__Makefile.in bacula-server/files/patch-src__findlib__Makefile.in
--- /usr/ports/sysutils/bacula-server/files/patch-src__findlib__Makefile.in 2011-12-12 21:11:48.000000000 +0000
+++ bacula-server/files/patch-src__findlib__Makefile.in 2012-09-30 00:40:56.000000000 +0000
@@ -1,11 +1,20 @@
---- ./src/findlib/Makefile.in.orig 2011-11-26 18:08:12.000000000 +0400
-+++ ./src/findlib/Makefile.in 2011-12-03 13:08:11.000000000 +0400
+--- src/findlib/Makefile.in 2011-11-26 09:08:12.000000000 -0500
++++ src/findlib/Makefile.in 2011-12-02 13:02:46.000000000 -0500
@@ -57,7 +57,7 @@
libbacfind.la: Makefile $(LIBBACFIND_LOBJS)
@echo "Making $@ ..."
- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACFIND_LT_RELEASE)
-+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -version-info 5
++ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACFIND_LT_RELEASE:S/./:/g:S/12/0/g)
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
cd $(topdir) \
+@@ -112,7 +112,7 @@
+ depend:
+ @$(MV) Makefile Makefile.bak
+ @$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
+- @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
++ @echo "# DO NOT DELETE: nice dependency list follows" >> Makefile
+ @for src in $(LIBBACFIND_SRCS); do \
+ $(CXX) -S -M -MT `basename $$src .c`$(DEFAULT_OBJECT_TYPE) $(CPPFLAGS) $(XINC) -I$(srcdir) -I$(basedir) $$src >> Makefile; \
+ done
diff -ruN /usr/ports/sysutils/bacula-server/files/patch-src__lib__Makefile.in bacula-server/files/patch-src__lib__Makefile.in
--- /usr/ports/sysutils/bacula-server/files/patch-src__lib__Makefile.in 2012-07-29 19:13:53.000000000 +0000
+++ bacula-server/files/patch-src__lib__Makefile.in 2012-09-30 00:40:56.000000000 +0000
@@ -1,11 +1,11 @@
---- ./src/lib/Makefile.in.orig 2011-11-26 18:08:12.000000000 +0400
-+++ ./src/lib/Makefile.in 2011-12-03 13:08:11.000000000 +0400
+--- src/lib/Makefile.in 2012-06-28 09:52:03.000000000 -0500
++++ src/lib/Makefile.in 2012-08-09 15:08:16.000000000 -0500
@@ -120,7 +120,7 @@
libbac.la: Makefile $(LIBBAC_LOBJS)
@echo "Making $@ ..."
- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBAC_LT_RELEASE) $(WRAPLIBS) $(CAP_LIBS) $(ZLIBS) $(OPENSSL_LIBS) $(LIBS) $(DLLIBS)
-+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -version-info 5 $(WRAPLIBS) $(CAP_LIBS) $(ZLIBS) $(OPENSSL_LIBS) $(LIBS)
++ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBAC_LT_RELEASE:S/./:/g:S/12/0/g) $(WRAPLIBS) $(CAP_LIBS) $(ZLIBS) $(OPENSSL_LIBS) $(LIBS) $(DLLIBS)
libbaccfg.a: $(LIBBACCFG_OBJS)
@echo "Making $@ ..."
@@ -14,7 +14,7 @@
libbaccfg.la: Makefile $(LIBBACCFG_LOBJS)
@echo "Making $@ ..."
- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCFG_LT_RELEASE) $(OPENSSL_LIBS) $(LIBS)
-+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -version-info 5 $(OPENSSL_LIBS) $(LIBS)
++ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACCFG_LT_RELEASE:S/./:/g:S/12/0/g) $(OPENSSL_LIBS) $(LIBS)
libbacpy.a: $(LIBBACPY_OBJS)
@echo "Making $@ ..."
@@ -23,7 +23,16 @@
libbacpy.la: Makefile $(LIBBACPY_LOBJS)
@echo "Making $@ ..."
- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACPY_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACPY_LT_RELEASE) $(PYTHON_LIBS) $(OPENSSL_LIBS) $(LIBS)
-+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACPY_LOBJS) -export-dynamic -rpath $(libdir) -version-info 5 $(PYTHON_LIBS) $(OPENSSL_LIBS) $(LIBS)
++ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACPY_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACPY_LT_RELEASE:S/./:/g:S/12/0/g) $(PYTHON_LIBS) $(OPENSSL_LIBS) $(LIBS)
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
cd $(topdir) \
+@@ -267,7 +267,7 @@
+ depend:
+ @$(MV) Makefile Makefile.bak
+ @$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
+- @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
++ @echo "# DO NOT DELETE: nice dependency list follows" >> Makefile
+ @for src in $(LIBBAC_SRCS) $(LIBBACCFG_SRCS) $(LIBBACPY_SRCS); do \
+ $(CXX) -S -M -MT `basename $$src .c`$(DEFAULT_OBJECT_TYPE) $(CPPFLAGS) $(XINC) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $$src >> Makefile; \
+ done
diff -ruN /usr/ports/sysutils/bacula-server/files/patch-src__stored__Makefile.in bacula-server/files/patch-src__stored__Makefile.in
--- /usr/ports/sysutils/bacula-server/files/patch-src__stored__Makefile.in 1970-01-01 00:00:00.000000000 +0000
+++ bacula-server/files/patch-src__stored__Makefile.in 2012-09-30 00:40:56.000000000 +0000
@@ -0,0 +1,71 @@
+--- src/stored/Makefile.in 2011-11-26 09:08:12.000000000 -0500
++++ src/stored/Makefile.in 2011-12-02 13:20:38.000000000 -0500
+@@ -95,12 +95,12 @@
+
+ bacula-sd: Makefile $(SDOBJS) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
+ @echo "Linking $@ ..."
+- $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -o $@ $(SDOBJS) $(ZLIBS) \
++ $(LIBTOOL_LINK) $(CXX) -L../lib $(WLDFLAGS) $(LDFLAGS) -o $@ $(SDOBJS) $(ZLIBS) \
+ -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \
+ $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
+
+ static-bacula-sd: Makefile $(SDOBJS) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
+- $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -o $@ $(SDOBJS) $(ZLIBS) \
++ $(LIBTOOL_LINK) $(CXX) -static -L../lib $(WLDFLAGS) $(LDFLAGS) -o $@ $(SDOBJS) $(ZLIBS) \
+ -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \
+ $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
+ strip $@
+@@ -111,7 +111,7 @@
+ -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+
+ btape: Makefile $(TAPEOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
+- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -o $@ $(TAPEOBJS) \
++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) -L../lib $(LDFLAGS) -o $@ $(TAPEOBJS) \
+ -lbaccfg -lbac $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+
+ bls.o: bls.c
+@@ -121,7 +121,7 @@
+
+ bls: Makefile $(BLSOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
+ @echo "Compiling $<"
+- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \
++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) -L../lib -L../findlib $(LDFLAGS) -o $@ $(BLSOBJS) $(DLIB) \
+ -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+
+ bextract.o: bextract.c
+@@ -131,7 +131,7 @@
+
+ bextract: Makefile $(BEXTOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
+ @echo "Compiling $<"
+- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZOLIBS) \
++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) -L../lib -L../findlib $(LDFLAGS) -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZOLIBS) \
+ -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+
+ bscan.o: bscan.c
+@@ -141,7 +141,7 @@
+
+ bscan: Makefile $(SCNOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
+ ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE)
+- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \
++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) -L../lib -L../cats -L../findlib $(LDFLAGS) -o $@ $(SCNOBJS) \
+ -lbacsql -lbaccats $(DB_LIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+
+ bcopy.o: bcopy.c
+@@ -150,7 +150,7 @@
+ -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+
+ bcopy: Makefile $(COPYOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
+- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -o $@ $(COPYOBJS) \
++ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) -L../lib $(LDFLAGS) -o $@ $(COPYOBJS) \
+ -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+
+ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
+@@ -215,7 +215,7 @@
+ depend:
+ @$(MV) Makefile Makefile.bak
+ @$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
+- @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
++ @echo "# DO NOT DELETE: nice dependency list follows" >> Makefile
+ @$(CXX) -S -M $(CPPFLAGS) $(XINC) $(PYTHON_INC) -I$(srcdir) -I$(basedir) *.c >> Makefile
+ @if test -f Makefile ; then \
+ $(RMF) Makefile.bak; \
diff -ruN /usr/ports/sysutils/bacula-server/files/patch-src__tools__Makefile.in bacula-server/files/patch-src__tools__Makefile.in
--- /usr/ports/sysutils/bacula-server/files/patch-src__tools__Makefile.in 1970-01-01 00:00:00.000000000 +0000
+++ bacula-server/files/patch-src__tools__Makefile.in 2012-09-30 00:40:56.000000000 +0000
@@ -0,0 +1,99 @@
+--- src/tools/Makefile.in 2011-11-26 09:08:12.000000000 -0500
++++ src/tools/Makefile.in 2011-12-02 13:26:44.000000000 -0500
+@@ -58,22 +58,22 @@
+ @echo " "
+
+ bsmtp: Makefile bsmtp.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
+- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bsmtp.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
++ $(LIBTOOL_LINK) $(CXX) -L../lib $(LDFLAGS) -o $@ bsmtp.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+
+ bregtest: Makefile bregtest.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
+- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bregtest.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
++ $(LIBTOOL_LINK) $(CXX) -L../lib $(LDFLAGS) -o $@ bregtest.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+
+ dbcheck: Makefile dbcheck.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
+ ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) $(DIRCONFOBJS)
+- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../cats -o $@ dbcheck.o $(DIRCONFOBJS) \
++ $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) -o $@ dbcheck.o $(DIRCONFOBJS) \
+ -lbaccats -lbacsql -lbaccfg -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+
+ fstype: Makefile fstype.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
+- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ fstype.o -lbacfind -lbac -lm \
++ $(LIBTOOL_LINK) $(CXX) -L../lib -L../findlib $(LDFLAGS) -o $@ fstype.o -lbacfind -lbac -lm \
+ $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+
+ drivetype: Makefile drivetype.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
+- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ drivetype.o -lbacfind -lbac -lm \
++ $(LIBTOOL_LINK) $(CXX) -L../lib -L../findlib $(LDFLAGS) -o $@ drivetype.o -lbacfind -lbac -lm \
+ $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+
+ dird_conf.o: ../dird/dird_conf.c
+@@ -87,34 +87,34 @@
+
+ testfind: Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
+ ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) $(FINDOBJS)
+- $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -o $@ $(FINDOBJS) -L. -L../lib -L../findlib \
++ $(LIBTOOL_LINK) $(CXX) -g -o $@ $(FINDOBJS) -L. -L../lib -L../findlib $(LDFLAGS) \
+ $(DLIB) -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+
+ testls: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) testls.o
+- $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L. -L../lib -L../findlib -o $@ testls.o \
++ $(LIBTOOL_LINK) $(CXX) -g -L. -L../lib -L../findlib $(LDFLAGS) -o $@ testls.o \
+ $(DLIB) -lbacfind -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+
+ bregex: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) bregex.o
+- $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L. -L../lib -o $@ bregex.o \
++ $(LIBTOOL_LINK) $(CXX) -g -L. -L../lib $(LDFLAGS) -o $@ bregex.o \
+ $(DLIB) -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+
+ bwild: Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) bwild.o
+- $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L. -L../lib -o $@ bwild.o \
++ $(LIBTOOL_LINK) $(CXX) -g -L. -L../lib $(LDFLAGS) -o $@ bwild.o \
+ $(DLIB) -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+
+ bbatch: Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) \
+ ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) bbatch.o
+- $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -o $@ bbatch.o \
++ $(LIBTOOL_LINK) $(CXX) -g -L../cats -L. -L../lib $(LDFLAGS) -o $@ bbatch.o \
+ -lbaccats -lbacsql -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+
+ bvfs_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) \
+ ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) bvfs_test.o
+- $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -L../findlib -o $@ bvfs_test.o \
++ $(LIBTOOL_LINK) $(CXX) -g -L../cats -L. -L../lib -L../findlib $(LDFLAGS) -o $@ bvfs_test.o \
+ -lbaccats -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+
+ ing_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) \
+ ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) ing_test.o
+- $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -L../findlib -o $@ ing_test.o \
++ $(LIBTOOL_LINK) $(CXX) -g -L../cats -L. -L../lib -L../findlib $(LDFLAGS) -o $@ ing_test.o \
+ -lbaccats -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+
+ cats_test.o: cats_test.c
+@@ -122,7 +122,7 @@
+ $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+
+ cats_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) cats_test.o
+- $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -L../findlib -o $@ cats_test.o \
++ $(LIBTOOL_LINK) $(CXX) -g -L../cats -L. -L../lib -L../findlib $(LDFLAGS) -o $@ cats_test.o \
+ -lbaccats -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+
+ gigaslam.o: gigaslam.c
+@@ -132,7 +132,7 @@
+ $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -o $@ gigaslam.o
+
+ grow: Makefile grow.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
+- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ grow.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
++ $(LIBTOOL_LINK) $(CXX) -L../lib $(LDFLAGS) -o $@ grow.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+
+ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
+ cd $(topdir) \
+@@ -184,7 +184,7 @@
+ depend:
+ @$(MV) Makefile Makefile.bak
+ @$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
+- @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
++ @echo "# DO NOT DELETE: nice dependency list follows" >> Makefile
+ @$(CXX) -S -M $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) *.c >> Makefile
+ @if test -f Makefile ; then \
+ $(RMF) Makefile.bak; \
diff -ruN /usr/ports/sysutils/bacula-server/files/pkg-message.server.in bacula-server/files/pkg-message.server.in
--- /usr/ports/sysutils/bacula-server/files/pkg-message.server.in 2010-07-17 01:00:47.000000000 +0000
+++ bacula-server/files/pkg-message.server.in 2012-09-30 00:40:56.000000000 +0000
@@ -1,4 +1,12 @@
-################################################################################
+###############################################################################
+
+bacula server was installed
+
+1) Important information about new version of bacula can be found in the
+ ReleaseNotes.
+
+ %%DOCSDIR%%/ReleaseNotes
+
NOTE:
An auto-changer manipulation script based on FreeBSDs
@@ -53,35 +61,7 @@
as installed by docs port for the upgrade procedure.
-IMPORTANT UPGRADE NOTES FOR THIS RELEASE:
-
-As always, both the Director and Storage daemon must be upgraded at
-the same time, and on any given machine, you must run only one version
-of Bacula. This means that on the Director and Storage daemon machines,
-you *must* upgrade your File daemon as well.
-
-New database Catalog format in version 5.0.2 (3.1.9 or later).
-
-If upgrading to 5.x from < 5.x, you must run the update_bacula_tables
-script. Afterwards, check the ownership on any new tables
-and make sure they are consisten with existing tables.
-
-!!!!!!!!!!!!!!! NOTE FOR 5.0.0 USERS !!!!!!!!!!!!!!!!!!!!
-The Allow Duplicate Jobs directive has been significantly-
-reworked, and the default value has changed. See below.
-
-Truncate On Purge has been totally rewritten. See the new
-features section of the manual.
-
-When Volume Poll Interval is set in the SD DEVICE configuration,
-(default 5 mins), after a certain number of polling tries (approx
-10) polling will stop and the operator will be asked to
-resolve the problem. Previously there was no limit, and an
-error message could be produced at each poll attempt.
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-Read the ReleaseNotes for further information.
-
If you are using sqlite you need to run the make_sqlite_tables script as
the bacula user. Do this using 'sudo su -m bacula'.
+
################################################################################
diff -ruN /usr/ports/sysutils/bacula-server/pkg-plist bacula-server/pkg-plist
--- /usr/ports/sysutils/bacula-server/pkg-plist 2011-12-12 21:11:47.000000000 +0000
+++ bacula-server/pkg-plist 2012-09-30 00:40:56.000000000 +0000
@@ -1,25 +1,12 @@
-lib/libbac.la
-lib/libbac.so
-lib/libbac.so.%%MAJOR%%
-lib/libbaccats-%%DBTYPE%%.la
-lib/libbaccats-%%DBTYPE%%.so
-lib/libbaccats-%%DBTYPE%%.so.%%MAJOR%%
lib/libbaccats.la
lib/libbaccats.so
lib/libbaccats.so.%%MAJOR%%
-lib/libbaccfg.la
-lib/libbaccfg.so
-lib/libbaccfg.so.%%MAJOR%%
-lib/libbacfind.la
-lib/libbacfind.so
-lib/libbacfind.so.%%MAJOR%%
-lib/libbacpy.la
-lib/libbacpy.so
-lib/libbacpy.so.%%MAJOR%%
+lib/libbaccats-%%DBTYPE%%.la
+lib/libbaccats-%%DBTYPE%%.so
+lib/libbaccats-%%DBTYPE%%.so.%%MAJOR%%
lib/libbacsql.la
lib/libbacsql.so
lib/libbacsql.so.%%MAJOR%%
-lib/bpipe-fd.so
sbin/bacula
sbin/bacula-dir
sbin/bacula-sd
diff -ruN /usr/ports/sysutils/bacula-server/pkg-plist.client bacula-server/pkg-plist.client
--- /usr/ports/sysutils/bacula-server/pkg-plist.client 2010-07-17 01:00:46.000000000 +0000
+++ bacula-server/pkg-plist.client 2012-09-30 00:40:56.000000000 +0000
@@ -1,21 +1,19 @@
-%%NOSF%%lib/libbac.la
-%%NOSF%%lib/libbac.so
-%%NOSF%%lib/libbac.so.%%MAJOR%%
-%%NOSF%%lib/libbaccfg.la
-%%NOSF%%lib/libbaccfg.so
-%%NOSF%%lib/libbaccfg.so.%%MAJOR%%
-%%NOSF%%lib/libbacfind.la
-%%NOSF%%lib/libbacfind.so
-%%NOSF%%lib/libbacfind.so.%%MAJOR%%
-%%NOSF%%lib/libbacpy.la
-%%NOSF%%lib/libbacpy.so
-%%NOSF%%lib/libbacpy.so.%%MAJOR%%
-%%NOSF%%lib/bpipe-fd.so
-%%SFDAEMON%%sbin/static-bacula-fd
+lib/libbac.la
+lib/libbac.so
+lib/libbac.so.%%MAJOR%%
+lib/libbaccfg.la
+lib/libbaccfg.so
+lib/libbaccfg.so.%%MAJOR%%
+lib/libbacfind.la
+lib/libbacfind.so
+lib/libbacfind.so.%%MAJOR%%
+lib/libbacpy.la
+lib/libbacpy.so
+lib/libbacpy.so.%%MAJOR%%
+lib/bpipe-fd.so
sbin/bacula-fd
sbin/bconsole
-%%WXCONS%%sbin/bwx-console
-@unexec /usr/bin/killall badula-fd > /dev/null 2>&1 || true
+@unexec /usr/bin/killall bacula-fd > /dev/null 2>&1 || true
@exec mkdir -p %%BACULA_DIR%%
@dirrmtry %%BACULA_DIR%%
-@dirrm share/bacula
+@dirrmtry share/bacula
diff -ruN /usr/ports/net-mgmt/nagios-check_bacula/Makefile nagios-check_bacula/Makefile
--- /usr/ports/net-mgmt/nagios-check_bacula/Makefile 2010-07-17 01:00:47.000000000 +0000
+++ nagios-check_bacula/Makefile 2012-09-30 00:31:55.000000000 +0000
@@ -6,49 +6,26 @@
#
PORTNAME= bacula
-PKGNAMEPREFIX= nagios-check_
CATEGORIES= net-mgmt
-UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}
+PKGNAMEPREFIX= nagios-check_
+PKGNAMESUFFIX= #
MAINTAINER= freebsd@troback.com
COMMENT= Nagios plugin for Bacula
+LIB_DEPENDS+= bac.5:${PORTSDIR}/sysutils/bacula-client
+
+UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}
+
WITH_NAGIOS_CHECK_ONLY= yes
MASTERDIR= ${.CURDIR}/../../sysutils/bacula-server
-PLIST= ${.CURDIR}/pkg-plist
-CONFIGURE_ARGS= --enable-client-only \
+CONFIGURE_ARGS+=--enable-client-only \
--disable-build-dird \
--disable-build-stored \
--disable-nls \
--disable-xatt
-.include "${MASTERDIR}/Makefile"
-
-.include <bsd.port.pre.mk>
+OPTIONS= #
-.if exists(${LOCALBASE}/lib/libbac.so.${PORTVERSION:R:R})
-LIB_DEPENDS+= bac.${PORTVERSION:R:R}:${PORTSDIR}/sysutils/bacula-client
-WITHOUT_LIBBAC= YES
-PLIST_SUB+= INDEP="@comment "
-.else
-PLIST_SUB+= INDEP=""
-.endif
-
-pre-everything::
- @${ECHO_MSG} "===> Building nagios check only."
-
-post-build:
- ${MAKE} -C ${WRKSRC}/examples/nagios/check_bacula
-
-do-install:
- @${MKDIR} ${PREFIX}/libexec/nagios
- ${INSTALL_PROGRAM} ${WRKSRC}/examples/nagios/check_bacula/.libs/check_bacula \
- ${PREFIX}/libexec/nagios
-.if !defined(WITHOUT_LIBBAC)
- @${ECHO_MSG} "===> Installing libbac.so.${PORTVERSION:R:R} "
- ${INSTALL_PROGRAM} ${WRKSRC}/src/lib/.libs/libbac.so.${PORTVERSION:R:R} \
- ${PREFIX}/lib
-.endif
-
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff -ruN /usr/ports/net-mgmt/nagios-check_bacula/pkg-plist nagios-check_bacula/pkg-plist
--- /usr/ports/net-mgmt/nagios-check_bacula/pkg-plist 2010-07-17 01:00:47.000000000 +0000
+++ nagios-check_bacula/pkg-plist 1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-libexec/nagios/check_bacula
-%%INDEP%%lib/libbac.so.%%MAJOR%%
-@dirrmtry libexec/nagios
--Apple-Mail=_21AD4FB2-2F91-4DEA-BB46-926F1C135DAF
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
charset=iso-8859-1
--
Dan Langille - http://langille.org
--Apple-Mail=_21AD4FB2-2F91-4DEA-BB46-926F1C135DAF--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211130250.qAD2o2xq066448>