Attachment #145475 for bug #191311




# $FreeBSD$

PORTNAME=	bacula
DISTVERSION=	7.0.4
PORTREVISION?=	1
CATEGORIES?=	sysutils
MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
PKGNAMEPREFIX?=	#

MAINTAINER=	dan@langille.org
COMMENT?=	Network backup solution (server)

USES+=		libtool:oldver

CONFLICTS_BUILD=	bacula-*-5.2.12_3

LIB_DEPENDS+=	liblzo2.so:${PORTSDIR}/archivers/lzo2

USERS=		bacula
GROUPS=		${USERS}

PLIST_SUB+=	LIB_VERSION=${PORTVERSION}

GNU_CONFIGURE=	yes
USE_LDCONFIG=	yes

CPPFLAGS+=	-I/usr/include/readline -I${LOCALBASE}/include
#LDFLAGS+=	-L${LOCALBASE}/lib

OPTIONS_DEFINE?=	SQLITE3 MYSQL PGSQL MTX PYTHON NLS OPENSSL
OPTIONS_DEFAULT?=	NLS OPENSSL PGSQL
MTX_DESC=		Install mtx for control of autochanger devices

OPENSSL_USE=	OPENSSL=yes
OPENSSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
OPENSSL_CONFIGURE_OFF=	--with-openssl="no"

.if ${PKGNAMESUFFIX} == "-client" || ${PKGNAMESUFFIX} == "-server"  #Till end of the file

PYTHON_USE=		PYTHON=yes

		--with-db-name=bacula \
		--with-sbin-perm=755 \
		--with-db-user=bacula \
		--with-logdir=/var/log \
		--with-baseport=9101

.if defined(WITH_CLIENT_ONLY)

# Server default database

MYSQL_CONFIGURE_ON=	--with-mysql=yes
MYSQL_USE=		MYSQL=yes
SQLITE3_CONFIGURE_ON=	--with-sqlite3=yes
SQLITE3_LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
PGSQL_CONFIGURE_ON=	--with-postgresql=yes
PGSQL_USES=		pgsql

MTX_RUN_DEPENDS=	${LOCALBASE}/sbin/mtx:${PORTSDIR}/misc/mtx


SUB_LIST+=		REQ_MYSQL="" REQ_PGSQL=postgresql
.endif
PLIST_SUB+=		DBTYPE=${DBTYPE}

.endif

.if defined(WITH_CLIENT_ONLY)
MP8+=	bacula.8 bacula-fd.8 bconsole.8
.else
MP8+=	bacula-dir.8 bacula-sd.8 bcopy.8 bextract.8 bls.8 bscan.8 \
	btape.8 btraceback.8 dbcheck.8 bwild.8 bregex.8
MP1+=	bsmtp.1 bacula-tray-monitor.1	
.endif

MAKE_ENV+=	MAN8="${MP8}" MAN1="${MP1}"

post-patch:
#	This port does not install docs.  See bacula-docs for that
	${REINPLACE_CMD} -e '/docdir/d' ${WRKSRC}/Makefile.in
#	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 in ${ETCDIR}
	@${REINPLACE_CMD} -e 's|./bconsole.conf|${ETCDIR}/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
	@${REINPLACE_CMD} -e 's|^\(fd_subdirs = .*\)scripts\(.*\)|\1\2|g' ${WRKSRC}/Makefile.in
	${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||' \
		-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

pre-install:

	${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${STAGEDIR}${ETCDIR}/bconsole.conf.sample
.else
	${INSTALL_SCRIPT} ${FILESDIR}/chio-bacula ${STAGEDIR}${PREFIX}/sbin
	${INSTALL_DATA} ${FILESDIR}/bacula-barcodes ${STAGEDIR}${ETCDIR}/bacula-barcodes.samples
	${CHMOD} o+x ${STAGEDIR}${PREFIX}/sbin/bsmtp
.endif
	for na in ${CONFFILES}; do \

.else
.include "${MASTERDIR}/Makefile.common"
.endif # -client and -server are defined

.include <bsd.port.mk>

Lines 1-8 Link Here

(-)Makefile.common (-6 / +1 lines)
1	post-patch:
2	# Change $(ECHO) to echo in some Makefile.in files
3	@${REINPLACE_CMD} -e 's\|$$(ECHO)\|echo\|g' ${WRKSRC}/src/filed/Makefile.in \
4	${WRKSRC}/src/console/Makefile.in
5
6	post-build:	1	post-build:
7	.if ${PKGNAMEPREFIX} == "nagios-check_"	2	.if ${PKGNAMEPREFIX} == "nagios-check_"
8	${MAKE_CMD} -C ${WRKSRC}/examples/nagios/check_bacula	3	${MAKE_CMD} -C ${WRKSRC}/examples/nagios/check_bacula
Lines 22-27 Link Here
22	${STAGEDIR}${PREFIX}/libexec/nagios	17	${STAGEDIR}${PREFIX}/libexec/nagios
23	.endif	18	.endif
24	.if ${PKGNAMESUFFIX} == "-client-static"	19	.if ${PKGNAMESUFFIX} == "-client-static"
25	${INSTALL_PROGRAM} ${WRKSRC}/src/filed/static-bacula-fd ${STAGEDIR}${PREFIX}/sbin/bacula-fd-static	20	${INSTALL_PROGRAM} ${WRKSRC}/src/filed/static-bacula-fd ${STAGEDIR}${PREFIX}/sbin/bacula-fd-static
26	${INSTALL_PROGRAM} ${WRKSRC}/src/console/static-bconsole ${STAGEDIR}${PREFIX}/sbin/bconsole-static	21	${INSTALL_PROGRAM} ${WRKSRC}/src/console/static-bconsole ${STAGEDIR}${PREFIX}/sbin/bconsole-static
27	.endif	22	.endif

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (bacula-5.2.12.tar.gz) = 360435634e28881b3fedb0dc1901b9c9be1895ce1e39c9737262b25f44513887	1	SHA256 (bacula-7.0.4.tar.gz) = ebf802b843a95f6526e82dd181dff7cd7dc7d1fdc55cec8636e0fe3af69acf7e
2	SIZE (bacula-5.2.12.tar.gz) = 4147847	2	SIZE (bacula-7.0.4.tar.gz) = 3596569




--- 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 $(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 $(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 $(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 $(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 $(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




--- 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}.${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}.${library_version}
 
    #
    # Create a relative symlink to the default backend
@@ -34,7 +34,7 @@
    # always work.
    #
    ln -s libbaccats-${default_backend}${SHLIB_EXT} \
-         ${install_dir}/libbaccats-${library_version}${SHLIB_EXT}
+         ${install_dir}/libbaccats${SHLIB_EXT}.${library_version}
 fi
 
 exit 0

Lines 1-11 Link Here

(-)files/patch-src__console__Makefile.in (-11 lines)
1	--- src/console/Makefile.in 2012-03-24 15:10:18.000000000 -0500
2	+++ src/console/Makefile.in 2012-03-24 15:10:35.000000000 -0500
3	@@ -53,7 +53,7 @@
4
5	static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
6	$(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
7	- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
8	+ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS:S/.so/.a/g) \
9	$(OPENSSL_LIBS)
10	strip $@
11




--- 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; \

Lines 1-11 Link Here

(-)files/patch-src__filed__Makefile.in (-11 lines)
1	--- src/filed/Makefile.in 2012-06-28 09:52:03.000000000 -0500
2	+++ src/filed/Makefile.in 2012-08-09 15:04:48.000000000 -0500
3	@@ -102,7 +102,7 @@
4	static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
5	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
6	$(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(LIBS) \
7	- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS)
8	+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS:S/.so/.a/g) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS)
9	strip $@
10
11	Makefile: $(srcdir)/Makefile.in $(topdir)/config.status




--- 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 $(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




--- 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 $(LIBBAC_LT_RELEASE:S/./:/g:S/12/0/g) $(WRAPLIBS) $(CAP_LIBS) $(ZLIBS) $(OPENSSL_LIBS) $(LIBS) $(DLLIBS)
 
 libbaccfg.a: $(LIBBACCFG_OBJS) 
 	@echo "Making $@ ..."
@@ -129,7 +129,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 $(LIBBACCFG_LT_RELEASE:S/./:/g:S/12/0/g) $(OPENSSL_LIBS) $(LIBS)
 
 libbacpy.a: $(LIBBACPY_OBJS) 
 	@echo "Making $@ ..."
@@ -138,7 +138,7 @@
 
 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 $(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

Lines 1-11 Link Here

(-)files/patch-src__qt-configle__bat.pro.in (-11 lines)
1	--- src/qt-console/bat.pro.in.orig 2012-09-13 10:51:19.000000000 +0200
2	+++ src/qt-console/bat.pro.in 2014-07-02 18:02:18.587979885 +0200
3	@@ -19,7 +19,7 @@
4	TARGET = bat
5	DEPENDPATH += .
6	INCLUDEPATH += .. . ./console ./restore ./select
7	-LIBS += -L../lib -lbaccfg -lbac -L../findlib -lbacfind @OPENSSL_LIBS@
8	+LIBS += -L../lib -lbaccfg -lbac -L../findlib -lbacfind @OPENSSL_LIBS@ -lintl
9	LIBTOOL_LINK = @QMAKE_LIBTOOL@ --silent --tag=CXX --mode=link
10	LIBTOOL_INSTALL = @QMAKE_LIBTOOL@ --silent --mode=install
11	QMAKE_LINK = $${LIBTOOL_LINK} $(CXX)




--- 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; \




--- 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; \

Lines 14-20 Link Here

(-)files/pkg-deinstall.client.in (-1 / +1 lines)
14	case "$2" in	14	case "$2" in
15	"DEINSTALL")	15	"DEINSTALL")
16	# Delete entries in /etc/services	16	# Delete entries in /etc/services
17	sed -e '/# Bacula port start/,/# Bacule port end/{' \	17	sed -e '/# Bacula port start/,/# Bacula port end/{' \
18	-e 'd' \	18	-e 'd' \
19	-e '}' /etc/services > $TMPFILE	19	-e '}' /etc/services > $TMPFILE
20	mv -f $TMPFILE /etc/services	20	mv -f $TMPFILE /etc/services




#!/bin/sh

PATH=/bin:/usr/bin:/usr/sbin

# Note how to delete UID/GID
USER=%%BACULA_USER%%
GROUP=%%BACULA_GROUP%%
UID=%%BACULA_UID%%
GID=%%BACULA_UID%%
BACULA_DIR=%%BACULA_DIR%%

TMPFILE=/tmp/services-$RANDOM-$$

case "$2" in
"DEINSTALL")
	# Delete entries in /etc/services
        sed -e '/# Bacula port start/,/# Bacula port end/{' \
            -e 'd' \
            -e '}' /etc/services > $TMPFILE
        mv -f $TMPFILE /etc/services

	if [ -d ${BACULA_DIR} ]; then
	    rmdir ${BACULA_DIR};
	fi
	if [ -d ${BACULA_DIR} ]; then
	    echo "Check if ${BACULA_DIR} is empty and delete it to permanently remove the bacula port."
	fi

	if pw usershow "${USER}" 2>/dev/null 1>&2; then
	    echo "To delete Bacula user permanently, use 'pw userdel ${USER}'"
	    echo "To delete Bacula group permanently, use 'pw groupdel ${GROUP}'"
	fi
        ;;
esac

Lines 9-13 Link Here

(-)files/pkg-install.client.in (-1 / +1 lines)
9	bacula-dir 9101/tcp #Bacula director daemon	9	bacula-dir 9101/tcp #Bacula director daemon
10	bacula-fd 9102/tcp #Bacula file daemon	10	bacula-fd 9102/tcp #Bacula file daemon
11	bacula-sd 9103/tcp #Bacula storage daemon	11	bacula-sd 9103/tcp #Bacula storage daemon
12	# Bacule port end" >> /etc/services	12	# Bacula port end" >> /etc/services
13	fi	13	fi




#!/bin/sh

PATH=/bin:/usr/bin:/usr/sbin

# Always add lines in /etc/services
grep -q "bacula-dir" /etc/services
if [ "$?" != "0" ]; then
    echo "# Bacula port start
bacula-dir      9101/tcp   #Bacula director daemon
bacula-fd       9102/tcp   #Bacula file daemon
bacula-sd       9103/tcp   #Bacula storage daemon
# Bacula port end" >> /etc/services
fi





NOTE:
Sample files are installed in %%PREFIX%%/etc/bacula:
bconsole.conf.sample, bacula-barcodes.sample, bacula-fd.conf.sample

  bconsole.conf.sample, bacula-fd.conf.sample

	%%DOCSDIR%%/ReleaseNotes

  as installed by docs port for the upgrade procedure.

Read the ReleaseNotes for further information.

################################################################################





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
chio command is included and installed at


database update procedure. Details can be found in the
ReleaseNotes

  Please read this file:

	%%DOCSDIR%%/ReleaseNotes

  as installed by docs port for the upgrade procedure.

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'.





lib/libbaccats-%%LIB_VERSION%%.so
@group bacula
@sample %%ETCDIR%%/bacula-dir.conf.sample
@group wheel
@sample %%ETCDIR%%/bacula-sd.conf.sample
lib/libbaccats.la
lib/libbaccats.so
lib/libbaccats-%%DBTYPE%%-%%LIB_VERSION%%.so
lib/libbaccats.so.5.0.2
lib/libbaccats-%%DBTYPE%%.la
lib/libbaccats-%%DBTYPE%%.so
lib/libbacsql-%%LIB_VERSION%%.so
lib/libbaccats-%%DBTYPE%%.so.5.0.2
lib/libbacsql.la
lib/libbacsql.so
lib/libbacsql.so.5
lib/libbacsql.so.5.0.2
man/man1/bacula-bwxconsole.1.gz
man/man1/bacula-tray-monitor.1.gz
man/man1/bsmtp.1.gz
man/man8/bacula-dir.8.gz
man/man8/bacula-sd.8.gz
man/man8/bacula.8.gz
man/man8/bcopy.8.gz
man/man8/bextract.8.gz
man/man8/bls.8.gz
man/man8/bregex.8.gz
man/man8/bscan.8.gz
man/man8/btape.8.gz
man/man8/btraceback.8.gz
man/man8/bwild.8.gz
man/man8/dbcheck.8.gz
sbin/bacula
sbin/bacula-dir
sbin/bacula-sd

sbin/bls
sbin/bregex
sbin/bscan
@mode 755
sbin/bsmtp
@mode
sbin/btape
sbin/btraceback
sbin/bwild
sbin/chio-bacula
@group bacula
sbin/dbcheck
@sample %%ETCDIR%%/bacula-barcodes.samples
@sample %%ETCDIR%%/bacula-dir.conf.sample
@sample %%ETCDIR%%/bacula-sd.conf.sample
@owner bacula
@group bacula
%%DATADIR%%/bacula
%%DATADIR%%/bacula-ctl-dir
%%DATADIR%%/bacula-ctl-fd

%%DATADIR%%/query.sql
%%DATADIR%%/update_bacula_tables
%%DATADIR%%/update_%%DBTYPE%%_tables
@owner
@group
man/man1/bacula-tray-monitor.1.gz
man/man1/bsmtp.1.gz
man/man8/bacula-dir.8.gz
man/man8/bacula-sd.8.gz
man/man8/bcopy.8.gz
man/man8/bextract.8.gz
man/man8/bls.8.gz
man/man8/bregex.8.gz
man/man8/bscan.8.gz
man/man8/btape.8.gz
man/man8/btraceback.8.gz
man/man8/bwild.8.gz
man/man8/dbcheck.8.gz




lib/libbac-%%LIB_VERSION%%.so
@group bacula
@sample %%ETCDIR%%/bconsole.conf.sample
@group wheel
lib/libbac.la
lib/libbac.so
lib/libbaccfg-%%LIB_VERSION%%.so
lib/libbac.so.5.0.2
lib/libbaccfg.la
lib/libbaccfg.so
lib/libbacfind-%%LIB_VERSION%%.so
lib/libbaccfg.so.5.0.2
lib/libbacfind.la
lib/libbacfind.so
lib/libbacfind.so.5
lib/libbacfind.so.5.0.2
lib/libbacpy.la
lib/libbacpy.so
lib/libbacpy.so.5
lib/libbacpy.so.5.0.2
lib/bpipe-fd.so
man/man8/bacula-fd.8.gz
man/man8/bacula.8.gz
man/man8/bconsole.8.gz
sbin/bacula-fd
@group bacula
sbin/bconsole
@sample %%ETCDIR%%/bacula-fd.conf.sample
@sample %%ETCDIR%%/bconsole.conf.sample
@exec mkdir -p %%BACULA_DIR%%
@dirrmtry %%BACULA_DIR%%
@dirrmtry %%ETCDIR%%
@dirrmtry share/bacula
@dirrmtry %%ETCDIR%%

Return to bug 191311

Lines 2-9 Link Here

(-)Makefile (-24 / +17 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= bacula	4	PORTNAME= bacula
5	DISTVERSION= 5.2.12	5	DISTVERSION= 7.0.4
6	PORTREVISION?= 6	6	PORTREVISION?= 1
7	CATEGORIES?= sysutils	7	CATEGORIES?= sysutils
8	MASTER_SITES= SF/bacula/bacula/${PORTVERSION}	8	MASTER_SITES= SF/bacula/bacula/${PORTVERSION}
9	PKGNAMEPREFIX?= #	9	PKGNAMEPREFIX?= #
Lines 12-40 Link Here
12	MAINTAINER= dan@langille.org	12	MAINTAINER= dan@langille.org
13	COMMENT?= Network backup solution (server)	13	COMMENT?= Network backup solution (server)
14		14
15	USES+= libtool:keepla	15	USES+= libtool:oldver
16		16
		17	CONFLICTS_BUILD= bacula-*-5.2.12_3
		18
17	LIB_DEPENDS+= liblzo2.so:${PORTSDIR}/archivers/lzo2	19	LIB_DEPENDS+= liblzo2.so:${PORTSDIR}/archivers/lzo2
18		20
19	USERS= bacula	21	USERS= bacula
20	GROUPS= ${USERS}	22	GROUPS= ${USERS}
21		23
22	PLIST_SUB+= MAJOR=${PORTVERSION:R:R}	24	PLIST_SUB+= LIB_VERSION=${PORTVERSION}
23		25
24	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes
25	USE_LDCONFIG= yes	27	USE_LDCONFIG= yes
26		28
27	CPPFLAGS+= -I/usr/include/readline -I${LOCALBASE}/include	29	CPPFLAGS+= -I/usr/include/readline -I${LOCALBASE}/include
28	LDFLAGS+= -L${LOCALBASE}/lib	30	#LDFLAGS+= -L${LOCALBASE}/lib
29		31
30	OPTIONS_DEFINE?= SQLITE3 MYSQL PGSQL MTX PYTHON NLS OPENSSL	32	OPTIONS_DEFINE?= SQLITE3 MYSQL PGSQL MTX PYTHON NLS OPENSSL
31	OPTIONS_DEFAULT?= NLS OPENSSL PGSQL	33	OPTIONS_DEFAULT?= NLS OPENSSL PGSQL
32	MTX_DESC= Install mtx for control of autochanger devices	34	MTX_DESC= Install mtx for control of autochanger devices
33		35
34	OPENSSL_USE= OPENSSL=yes
35	OPENSSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE}
36	OPENSSL_CONFIGURE_OFF= --with-openssl="no"
37
38	.if ${PKGNAMESUFFIX} == "-client" \|\| ${PKGNAMESUFFIX} == "-server" #Till end of the file	36	.if ${PKGNAMESUFFIX} == "-client" \|\| ${PKGNAMESUFFIX} == "-server" #Till end of the file
39		37
40	PYTHON_USE= PYTHON=yes	38	PYTHON_USE= PYTHON=yes
Lines 66-71 Link Here
66	--with-db-name=bacula \	64	--with-db-name=bacula \
67	--with-sbin-perm=755 \	65	--with-sbin-perm=755 \
68	--with-db-user=bacula \	66	--with-db-user=bacula \
		67	--with-logdir=/var/log \
69	--with-baseport=9101	68	--with-baseport=9101
70		69
71	.if defined(WITH_CLIENT_ONLY)	70	.if defined(WITH_CLIENT_ONLY)
Lines 111-121 Link Here
111	# Server default database	110	# Server default database
112		111
113	MYSQL_CONFIGURE_ON= --with-mysql=yes	112	MYSQL_CONFIGURE_ON= --with-mysql=yes
114	MYSQL_USE= MYSQL=yes	113	MYSQL_USE= MYSQL=yes
115	SQLITE3_CONFIGURE_ON= --with-sqlite3=yes	114	SQLITE3_CONFIGURE_ON= --with-sqlite3=yes
116	SQLITE3_LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3	115	SQLITE3_LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3
117	PGSQL_CONFIGURE_ON= --with-postgresql=yes	116	PGSQL_CONFIGURE_ON= --with-postgresql=yes
118	PGSQL_USES= pgsql	117	PGSQL_USES= pgsql
119		118
120	MTX_RUN_DEPENDS= ${LOCALBASE}/sbin/mtx:${PORTSDIR}/misc/mtx	119	MTX_RUN_DEPENDS= ${LOCALBASE}/sbin/mtx:${PORTSDIR}/misc/mtx
121		120
Lines 131-171 Link Here
131	SUB_LIST+= REQ_MYSQL="" REQ_PGSQL=postgresql	130	SUB_LIST+= REQ_MYSQL="" REQ_PGSQL=postgresql
132	.endif	131	.endif
133	PLIST_SUB+= DBTYPE=${DBTYPE}	132	PLIST_SUB+= DBTYPE=${DBTYPE}
134
135	.endif	133	.endif
136		134
137	.if defined(WITH_CLIENT_ONLY)	135	.if defined(WITH_CLIENT_ONLY)
138	MP8+= bacula-fd.8 bconsole.8	136	MP8+= bacula.8 bacula-fd.8 bconsole.8
139	.else	137	.else
140	MP8+= bacula.8 bacula-dir.8 bacula-sd.8 bcopy.8 bextract.8 bls.8 bscan.8 \	138	MP8+= bacula-dir.8 bacula-sd.8 bcopy.8 bextract.8 bls.8 bscan.8 \
141	btape.8 btraceback.8 dbcheck.8 bwild.8 bregex.8	139	btape.8 btraceback.8 dbcheck.8 bwild.8 bregex.8
142	MP1+= bsmtp.1 bacula-tray-monitor.1 bacula-bwxconsole.1	140	MP1+= bsmtp.1 bacula-tray-monitor.1
143	.endif	141	.endif
144		142
145	MAKE_ENV+= MAN8="${MP8}" MAN1="${MP1}"	143	MAKE_ENV+= MAN8="${MP8}" MAN1="${MP1}"
146		144
147	post-patch:	145	post-patch:
148	# This port does not install docs. See bacula-docs for that
149	${REINPLACE_CMD} -e '/docdir/d' ${WRKSRC}/Makefile.in	146	${REINPLACE_CMD} -e '/docdir/d' ${WRKSRC}/Makefile.in
150	# Change $(ECHO) to echo in some Makefile.in files
151	@${REINPLACE_CMD} -e 's\|$$(ECHO)\|echo\|g' ${WRKSRC}/src/filed/Makefile.in \	147	@${REINPLACE_CMD} -e 's\|$$(ECHO)\|echo\|g' ${WRKSRC}/src/filed/Makefile.in \
152	${WRKSRC}/src/console/Makefile.in	148	${WRKSRC}/src/console/Makefile.in
153	# Default bconsole.conf is in ${ETCDIR}
154	@${REINPLACE_CMD} -e 's\|./bconsole.conf\|${ETCDIR}/bconsole.conf\|g' ${WRKSRC}/src/console/console.c	149	@${REINPLACE_CMD} -e 's\|./bconsole.conf\|${ETCDIR}/bconsole.conf\|g' ${WRKSRC}/src/console/console.c
155	@${REINPLACE_CMD} -e 's\|^MAN8 =\|MAN8 ?=\|g' -e 's\|^MAN1 =\|MAN1 ?=\|g' ${WRKSRC}/manpages/Makefile.in	150	@${REINPLACE_CMD} -e 's\|^MAN8 =\|MAN8 ?=\|g' -e 's\|^MAN1 =\|MAN1 ?=\|g' ${WRKSRC}/manpages/Makefile.in
156	.if defined(WITH_CLIENT_ONLY)	151	.if defined(WITH_CLIENT_ONLY)
157	# In client port only install startup script out of script dir (see below post-install)
158	# Dont mkdir ${PREFIX}/share/bacula cause it's empty
159	@${REINPLACE_CMD} -e 's\|^\(fd_subdirs = .\)scripts\(.\)\|\1\2\|g' ${WRKSRC}/Makefile.in	152	@${REINPLACE_CMD} -e 's\|^\(fd_subdirs = .\)scripts\(.\)\|\1\2\|g' ${WRKSRC}/Makefile.in
160	${REINPLACE_CMD} -e 's\|\(.*$${MKDIR} $${DESTDIR}$${scriptdir}\)\|#\1\|g' ${WRKSRC}/Makefile.in	153	${REINPLACE_CMD} -e 's\|\(.*$${MKDIR} $${DESTDIR}$${scriptdir}\)\|#\1\|g' ${WRKSRC}/Makefile.in
161	.else	154	.else
162	# In server port don't install filed
163	@${REINPLACE_CMD} -e '/^fd_subdirs = /s\|src/filed\|\|' -e 's\|src/console\|\|' \	155	@${REINPLACE_CMD} -e '/^fd_subdirs = /s\|src/filed\|\|' -e 's\|src/console\|\|' \
164	-e 's\|src/lib\|\|' -e 's\|src/findlib\|\|' -e 's\|@FD_PLUGIN_DIR@\|\|' ${WRKSRC}/Makefile.in	156	-e 's\|src/lib\|\|' -e 's\|src/findlib\|\|' -e 's\|@FD_PLUGIN_DIR@\|\|' ${WRKSRC}/Makefile.in
165	@${REINPLACE_CMD} -e 's\|../lib/\|$$(LOCALBASE)/lib/\|g' -e 's\|../findlib/\|$$(LOCALBASE)/lib/\|g' ${WRKSRC}/src/dird/Makefile.in \	157	@${REINPLACE_CMD} -e 's\|../lib/\|$$(LOCALBASE)/lib/\|g' -e 's\|../findlib/\|$$(LOCALBASE)/lib/\|g' ${WRKSRC}/src/dird/Makefile.in \
166	${WRKSRC}/src/stored/Makefile.in ${WRKSRC}/src/tools/Makefile.in	158	${WRKSRC}/src/stored/Makefile.in ${WRKSRC}/src/tools/Makefile.in
167	@${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' \	159	# @${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' \
168	${WRKSRC}/src/tools/bpluginfo.c	160	# ${WRKSRC}/src/tools/bpluginfo.c
169	.endif	161	.endif
170		162
171	pre-install:	163	pre-install:
Lines 177-183 Link Here
177	${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${STAGEDIR}${ETCDIR}/bconsole.conf.sample	169	${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${STAGEDIR}${ETCDIR}/bconsole.conf.sample
178	.else	170	.else
179	${INSTALL_SCRIPT} ${FILESDIR}/chio-bacula ${STAGEDIR}${PREFIX}/sbin	171	${INSTALL_SCRIPT} ${FILESDIR}/chio-bacula ${STAGEDIR}${PREFIX}/sbin
180	${INSTALL_DATA} ${FILESDIR}/bacula-barcodes ${STAGEDIR}${ETCDIR}/bacula-barcodes.sample	172	${INSTALL_DATA} ${FILESDIR}/bacula-barcodes ${STAGEDIR}${ETCDIR}/bacula-barcodes.samples
181	${CHMOD} o+x ${STAGEDIR}${PREFIX}/sbin/bsmtp	173	${CHMOD} o+x ${STAGEDIR}${PREFIX}/sbin/bsmtp
182	.endif	174	.endif
183	for na in ${CONFFILES}; do \	175	for na in ${CONFFILES}; do \
Lines 187-190 Link Here
187	.else	179	.else
188	.include "${MASTERDIR}/Makefile.common"	180	.include "${MASTERDIR}/Makefile.common"
189	.endif # -client and -server are defined	181	.endif # -client and -server are defined
		182
190	.include <bsd.port.mk>	183	.include <bsd.port.mk>

Lines 1-51 Link Here

(-)files/patch-src__cats__Makefile.in (-51 lines)
1	--- src/cats/Makefile.in 2012-06-28 09:52:03.000000000 -0500
2	+++ src/cats/Makefile.in 2012-08-09 15:30:19.000000000 -0500
3	@@ -142,25 +142,25 @@
4
5	libbacsql.la: Makefile $(LIBBACSQL_LOBJS)
6	@echo "Making $@ ..."
7	- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACSQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACSQL_LT_RELEASE) $(DB_LIBS)
8	+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACSQL_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACSQL_LT_RELEASE:S/./:/g:S/12/0/g)
9
10	libbaccats.la: Makefile cats_dummy.lo
11	@echo "Making $@ ..."
12	- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ cats_dummy.lo -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE)
13	+ $(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)
14
15	libbaccats-mysql.la: Makefile $(MYSQL_LOBJS)
16	@echo "Making $@ ..."
17	- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(MYSQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \
18	+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(MYSQL_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACCATS_LT_RELEASE:S/./:/g:S/12/0/g) \
19	-soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(MYSQL_LIBS)
20
21	libbaccats-postgresql.la: Makefile $(POSTGRESQL_LOBJS)
22	@echo "Making $@ ..."
23	- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(POSTGRESQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \
24	+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(POSTGRESQL_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACCATS_LT_RELEASE:S/./:/g:S/12/0/g) \
25	-soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(POSTGRESQL_LIBS)
26
27	libbaccats-sqlite3.la: Makefile $(SQLITE_LOBJS)
28	@echo "Making $@ ..."
29	- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(SQLITE_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \
30	+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(SQLITE_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACCATS_LT_RELEASE:S/./:/g:S/12/0/g) \
31	-soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(SQLITE_LIBS)
32
33	#libbaccats-ingres.la: Makefile $(INGRES_LOBJS)
34	@@ -237,7 +237,7 @@
35	for db_type in @DB_BACKENDS@; do \
36	$(LIBTOOL_INSTALL_FINISH) $(INSTALL_LIB) libbaccats-$${db_type}.la $(DESTDIR)$(libdir); \
37	done
38	- ./install-default-backend @DEFAULT_DB_TYPE@ $(LIBBACCATS_LT_RELEASE) $(DESTDIR)$(libdir)
39	+ ./install-default-backend @DEFAULT_DB_TYPE@ 5 $(DESTDIR)$(libdir)
40
41	libtool-uninstall:
42	$(LIBTOOL_UNINSTALL) $(RMF) $(DESTDIR)$(libdir)/libbacsql.la
43	@@ -323,7 +323,7 @@
44	depend:
45	@$(MV) Makefile Makefile.bak
46	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
47	- @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
48	+ @echo "# DO NOT DELETE: nice dependency list follows" >> Makefile
49	@for src in $(LIBBACSQL_SRCS); do \
50	$(CXX) -S -M -MT `basename $$src .c`$(DEFAULT_OBJECT_TYPE) $(CPPFLAGS) $(XINC) $(DEFS) -I$(srcdir) -I$(basedir) $$src >> Makefile; \
51	done

Lines 1-25 Link Here

(-)files/patch-src__cats__install-default-backend.in (-25 lines)
1	--- src/cats/install-default-backend.in 2012-03-31 23:39:38.000000000 -0500
2	+++ src/cats/install-default-backend.in 2012-03-31 23:40:56.000000000 -0500
3	@@ -22,11 +22,11 @@
4	exit 1
5	fi
6
7	-if [ -f ${install_dir}/libbaccats-${default_backend}-${library_version}${SHLIB_EXT} ]; then
8	+if [ -f ${install_dir}/libbaccats-${default_backend}${SHLIB_EXT}.${library_version} ]; then
9	#
10	# Create a default catalog library pointing to one of the shared libs.
11	#
12	- rm -f ${install_dir}/libbaccats-${library_version}${SHLIB_EXT}
13	+ rm -f ${install_dir}/libbaccats${SHLIB_EXT}.${library_version}
14
15	#
16	# Create a relative symlink to the default backend
17	@@ -34,7 +34,7 @@
18	# always work.
19	#
20	ln -s libbaccats-${default_backend}${SHLIB_EXT} \
21	- ${install_dir}/libbaccats-${library_version}${SHLIB_EXT}
22	+ ${install_dir}/libbaccats${SHLIB_EXT}.${library_version}
23	fi
24
25	exit 0

Lines 1-28 Link Here

(-)files/patch-src__dird__Makefile.in (-28 lines)
1	--- src/dird/Makefile.in 2011-11-26 09:08:12.000000000 -0500
2	+++ src/dird/Makefile.in 2011-12-02 13:15:46.000000000 -0500
3	@@ -68,14 +68,14 @@
4	../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) \
5	../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
6	@echo "Linking $@ ..."
7	- $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
8	+ $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats -L../findlib $(WLDFLAGS) $(LDFLAGS) -o $@ $(SVROBJS) \
9	-lbacfind -lbacsql -lbaccats -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \
10	$(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
11
12	static-bacula-dir: Makefile $(SVROBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
13	../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) \
14	../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
15	- $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
16	+ $(LIBTOOL_LINK) $(CXX) -static -L../lib -L../cats -L../findlib $(WLDFLAGS) $(LDFLAGS) -o $@ $(SVROBJS) \
17	-lbacfind -lbacsql -lbaccats -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \
18	$(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
19	strip $@
20	@@ -141,7 +141,7 @@
21	depend:
22	@$(MV) Makefile Makefile.bak
23	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
24	- @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
25	+ @echo "# DO NOT DELETE: nice dependency list follows" >> Makefile
26	@$(CXX) -S -M $(CPPFLAGS) $(XINC) $(PYTHON_INC) -I$(srcdir) -I$(basedir) *.c >> Makefile
27	@if test -f Makefile ; then \
28	$(RMF) Makefile.bak; \

Lines 1-20 Link Here

(-)files/patch-src__findlib__Makefile.in (-20 lines)
1	--- src/findlib/Makefile.in 2011-11-26 09:08:12.000000000 -0500
2	+++ src/findlib/Makefile.in 2011-12-02 13:02:46.000000000 -0500
3	@@ -57,7 +57,7 @@
4
5	libbacfind.la: Makefile $(LIBBACFIND_LOBJS)
6	@echo "Making $@ ..."
7	- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACFIND_LT_RELEASE)
8	+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACFIND_LT_RELEASE:S/./:/g:S/12/0/g)
9
10	Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
11	cd $(topdir) \
12	@@ -112,7 +112,7 @@
13	depend:
14	@$(MV) Makefile Makefile.bak
15	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
16	- @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
17	+ @echo "# DO NOT DELETE: nice dependency list follows" >> Makefile
18	@for src in $(LIBBACFIND_SRCS); do \
19	$(CXX) -S -M -MT `basename $$src .c`$(DEFAULT_OBJECT_TYPE) $(CPPFLAGS) $(XINC) -I$(srcdir) -I$(basedir) $$src >> Makefile; \
20	done

Lines 1-38 Link Here

(-)files/patch-src__lib__Makefile.in (-38 lines)
1	--- src/lib/Makefile.in 2012-06-28 09:52:03.000000000 -0500
2	+++ src/lib/Makefile.in 2012-08-09 15:08:16.000000000 -0500
3	@@ -120,7 +120,7 @@
4
5	libbac.la: Makefile $(LIBBAC_LOBJS)
6	@echo "Making $@ ..."
7	- $(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)
8	+ $(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)
9
10	libbaccfg.a: $(LIBBACCFG_OBJS)
11	@echo "Making $@ ..."
12	@@ -129,7 +129,7 @@
13
14	libbaccfg.la: Makefile $(LIBBACCFG_LOBJS)
15	@echo "Making $@ ..."
16	- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCFG_LT_RELEASE) $(OPENSSL_LIBS) $(LIBS)
17	+ $(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)
18
19	libbacpy.a: $(LIBBACPY_OBJS)
20	@echo "Making $@ ..."
21	@@ -138,7 +138,7 @@
22
23	libbacpy.la: Makefile $(LIBBACPY_LOBJS)
24	@echo "Making $@ ..."
25	- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACPY_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACPY_LT_RELEASE) $(PYTHON_LIBS) $(OPENSSL_LIBS) $(LIBS)
26	+ $(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)
27
28	Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
29	cd $(topdir) \
30	@@ -267,7 +267,7 @@
31	depend:
32	@$(MV) Makefile Makefile.bak
33	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
34	- @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
35	+ @echo "# DO NOT DELETE: nice dependency list follows" >> Makefile
36	@for src in $(LIBBAC_SRCS) $(LIBBACCFG_SRCS) $(LIBBACPY_SRCS); do \
37	$(CXX) -S -M -MT `basename $$src .c`$(DEFAULT_OBJECT_TYPE) $(CPPFLAGS) $(XINC) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $$src >> Makefile; \
38	done

Lines 1-71 Link Here

(-)files/patch-src__stored__Makefile.in (-71 lines)
1	--- src/stored/Makefile.in 2011-11-26 09:08:12.000000000 -0500
2	+++ src/stored/Makefile.in 2011-12-02 13:20:38.000000000 -0500
3	@@ -95,12 +95,12 @@
4
5	bacula-sd: Makefile $(SDOBJS) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
6	@echo "Linking $@ ..."
7	- $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -o $@ $(SDOBJS) $(ZLIBS) \
8	+ $(LIBTOOL_LINK) $(CXX) -L../lib $(WLDFLAGS) $(LDFLAGS) -o $@ $(SDOBJS) $(ZLIBS) \
9	-lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \
10	$(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
11
12	static-bacula-sd: Makefile $(SDOBJS) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
13	- $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -o $@ $(SDOBJS) $(ZLIBS) \
14	+ $(LIBTOOL_LINK) $(CXX) -static -L../lib $(WLDFLAGS) $(LDFLAGS) -o $@ $(SDOBJS) $(ZLIBS) \
15	-lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \
16	$(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
17	strip $@
18	@@ -111,7 +111,7 @@
19	-I$(basedir) $(DINCLUDE) $(CFLAGS) $<
20
21	btape: Makefile $(TAPEOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
22	- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -o $@ $(TAPEOBJS) \
23	+ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) -L../lib $(LDFLAGS) -o $@ $(TAPEOBJS) \
24	-lbaccfg -lbac $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
25
26	bls.o: bls.c
27	@@ -121,7 +121,7 @@
28
29	bls: Makefile $(BLSOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
30	@echo "Compiling $<"
31	- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \
32	+ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) -L../lib -L../findlib $(LDFLAGS) -o $@ $(BLSOBJS) $(DLIB) \
33	-lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
34
35	bextract.o: bextract.c
36	@@ -131,7 +131,7 @@
37
38	bextract: Makefile $(BEXTOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
39	@echo "Compiling $<"
40	- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZOLIBS) \
41	+ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) -L../lib -L../findlib $(LDFLAGS) -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZOLIBS) \
42	-lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
43
44	bscan.o: bscan.c
45	@@ -141,7 +141,7 @@
46
47	bscan: Makefile $(SCNOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
48	../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE)
49	- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \
50	+ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) -L../lib -L../cats -L../findlib $(LDFLAGS) -o $@ $(SCNOBJS) \
51	-lbacsql -lbaccats $(DB_LIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
52
53	bcopy.o: bcopy.c
54	@@ -150,7 +150,7 @@
55	-I$(basedir) $(DINCLUDE) $(CFLAGS) $<
56
57	bcopy: Makefile $(COPYOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
58	- $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -o $@ $(COPYOBJS) \
59	+ $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) -L../lib $(LDFLAGS) -o $@ $(COPYOBJS) \
60	-lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
61
62	Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
63	@@ -215,7 +215,7 @@
64	depend:
65	@$(MV) Makefile Makefile.bak
66	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
67	- @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
68	+ @echo "# DO NOT DELETE: nice dependency list follows" >> Makefile
69	@$(CXX) -S -M $(CPPFLAGS) $(XINC) $(PYTHON_INC) -I$(srcdir) -I$(basedir) *.c >> Makefile
70	@if test -f Makefile ; then \
71	$(RMF) Makefile.bak; \

Lines 1-99 Link Here

(-)files/patch-src__tools__Makefile.in (-99 lines)
1	--- src/tools/Makefile.in 2011-11-26 09:08:12.000000000 -0500
2	+++ src/tools/Makefile.in 2011-12-02 13:26:44.000000000 -0500
3	@@ -58,22 +58,22 @@
4	@echo " "
5
6	bsmtp: Makefile bsmtp.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
7	- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bsmtp.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
8	+ $(LIBTOOL_LINK) $(CXX) -L../lib $(LDFLAGS) -o $@ bsmtp.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
9
10	bregtest: Makefile bregtest.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
11	- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bregtest.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
12	+ $(LIBTOOL_LINK) $(CXX) -L../lib $(LDFLAGS) -o $@ bregtest.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
13
14	dbcheck: Makefile dbcheck.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
15	../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) $(DIRCONFOBJS)
16	- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../cats -o $@ dbcheck.o $(DIRCONFOBJS) \
17	+ $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) -o $@ dbcheck.o $(DIRCONFOBJS) \
18	-lbaccats -lbacsql -lbaccfg -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
19
20	fstype: Makefile fstype.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
21	- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ fstype.o -lbacfind -lbac -lm \
22	+ $(LIBTOOL_LINK) $(CXX) -L../lib -L../findlib $(LDFLAGS) -o $@ fstype.o -lbacfind -lbac -lm \
23	$(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
24
25	drivetype: Makefile drivetype.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
26	- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ drivetype.o -lbacfind -lbac -lm \
27	+ $(LIBTOOL_LINK) $(CXX) -L../lib -L../findlib $(LDFLAGS) -o $@ drivetype.o -lbacfind -lbac -lm \
28	$(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
29
30	dird_conf.o: ../dird/dird_conf.c
31	@@ -87,34 +87,34 @@
32
33	testfind: Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
34	../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) $(FINDOBJS)
35	- $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -o $@ $(FINDOBJS) -L. -L../lib -L../findlib \
36	+ $(LIBTOOL_LINK) $(CXX) -g -o $@ $(FINDOBJS) -L. -L../lib -L../findlib $(LDFLAGS) \
37	$(DLIB) -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
38
39	testls: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) testls.o
40	- $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L. -L../lib -L../findlib -o $@ testls.o \
41	+ $(LIBTOOL_LINK) $(CXX) -g -L. -L../lib -L../findlib $(LDFLAGS) -o $@ testls.o \
42	$(DLIB) -lbacfind -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
43
44	bregex: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) bregex.o
45	- $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L. -L../lib -o $@ bregex.o \
46	+ $(LIBTOOL_LINK) $(CXX) -g -L. -L../lib $(LDFLAGS) -o $@ bregex.o \
47	$(DLIB) -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
48
49	bwild: Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) bwild.o
50	- $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L. -L../lib -o $@ bwild.o \
51	+ $(LIBTOOL_LINK) $(CXX) -g -L. -L../lib $(LDFLAGS) -o $@ bwild.o \
52	$(DLIB) -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
53
54	bbatch: Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) \
55	../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) bbatch.o
56	- $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -o $@ bbatch.o \
57	+ $(LIBTOOL_LINK) $(CXX) -g -L../cats -L. -L../lib $(LDFLAGS) -o $@ bbatch.o \
58	-lbaccats -lbacsql -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
59
60	bvfs_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) \
61	../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) bvfs_test.o
62	- $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -L../findlib -o $@ bvfs_test.o \
63	+ $(LIBTOOL_LINK) $(CXX) -g -L../cats -L. -L../lib -L../findlib $(LDFLAGS) -o $@ bvfs_test.o \
64	-lbaccats -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
65
66	ing_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) \
67	../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) ing_test.o
68	- $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -L../findlib -o $@ ing_test.o \
69	+ $(LIBTOOL_LINK) $(CXX) -g -L../cats -L. -L../lib -L../findlib $(LDFLAGS) -o $@ ing_test.o \
70	-lbaccats -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
71
72	cats_test.o: cats_test.c
73	@@ -122,7 +122,7 @@
74	$(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
75
76	cats_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) cats_test.o
77	- $(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -L../findlib -o $@ cats_test.o \
78	+ $(LIBTOOL_LINK) $(CXX) -g -L../cats -L. -L../lib -L../findlib $(LDFLAGS) -o $@ cats_test.o \
79	-lbaccats -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
80
81	gigaslam.o: gigaslam.c
82	@@ -132,7 +132,7 @@
83	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -o $@ gigaslam.o
84
85	grow: Makefile grow.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
86	- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ grow.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
87	+ $(LIBTOOL_LINK) $(CXX) -L../lib $(LDFLAGS) -o $@ grow.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
88
89	Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
90	cd $(topdir) \
91	@@ -184,7 +184,7 @@
92	depend:
93	@$(MV) Makefile Makefile.bak
94	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
95	- @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
96	+ @echo "# DO NOT DELETE: nice dependency list follows" >> Makefile
97	@$(CXX) -S -M $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) *.c >> Makefile
98	@if test -f Makefile ; then \
99	$(RMF) Makefile.bak; \

Line 0 Link Here

(-)files/pkg-deinstall.server.in (+34 lines)
	1	#!/bin/sh
	2
	3	PATH=/bin:/usr/bin:/usr/sbin
	4
	5	# Note how to delete UID/GID
	6	USER=%%BACULA_USER%%
	7	GROUP=%%BACULA_GROUP%%
	8	UID=%%BACULA_UID%%
	9	GID=%%BACULA_UID%%
	10	BACULA_DIR=%%BACULA_DIR%%
	11
	12	TMPFILE=/tmp/services-$RANDOM-$$
	13
	14	case "$2" in
	15	"DEINSTALL")
	16	# Delete entries in /etc/services
	17	sed -e '/# Bacula port start/,/# Bacula port end/{' \
	18	-e 'd' \
	19	-e '}' /etc/services > $TMPFILE
	20	mv -f $TMPFILE /etc/services
	21
	22	if [ -d ${BACULA_DIR} ]; then
	23	rmdir ${BACULA_DIR};
	24	fi
	25	if [ -d ${BACULA_DIR} ]; then
	26	echo "Check if ${BACULA_DIR} is empty and delete it to permanently remove the bacula port."
	27	fi
	28
	29	if pw usershow "${USER}" 2>/dev/null 1>&2; then
	30	echo "To delete Bacula user permanently, use 'pw userdel ${USER}'"
	31	echo "To delete Bacula group permanently, use 'pw groupdel ${GROUP}'"
	32	fi
	33	;;
	34	esac

Line 0 Link Here

(-)files/pkg-install.server.in (+13 lines)
	1	#!/bin/sh
	2
	3	PATH=/bin:/usr/bin:/usr/sbin
	4
	5	# Always add lines in /etc/services
	6	grep -q "bacula-dir" /etc/services
	7	if [ "$?" != "0" ]; then
	8	echo "# Bacula port start
	9	bacula-dir 9101/tcp #Bacula director daemon
	10	bacula-fd 9102/tcp #Bacula file daemon
	11	bacula-sd 9103/tcp #Bacula storage daemon
	12	# Bacula port end" >> /etc/services
	13	fi

Lines 2-15 Link Here

(-)files/pkg-message.client.in (-8 / +1 lines)
2		2
3	NOTE:	3	NOTE:
4	Sample files are installed in %%PREFIX%%/etc/bacula:	4	Sample files are installed in %%PREFIX%%/etc/bacula:
5	bconsole.conf.sample, bacula-barcodes.sample, bacula-fd.conf.sample
6		5
7	Please read this file:	6	bconsole.conf.sample, bacula-fd.conf.sample
8		7
9	%%DOCSDIR%%/ReleaseNotes
10
11	as installed by docs port for the upgrade procedure.
12
13	Read the ReleaseNotes for further information.
14
15	################################################################################	8	################################################################################

Lines 2-14 Link Here

(-)files/pkg-message.server.in (-13 lines)
2		2
3	bacula server was installed	3	bacula server was installed
4		4
5	1) Important information about new version of bacula can be found in the
6	ReleaseNotes.
7
8	%%DOCSDIR%%/ReleaseNotes
9
10	NOTE:
11
12	An auto-changer manipulation script based on FreeBSDs	5	An auto-changer manipulation script based on FreeBSDs
13	chio command is included and installed at	6	chio command is included and installed at
14		7
Lines 55-66 Link Here
55	database update procedure. Details can be found in the	48	database update procedure. Details can be found in the
56	ReleaseNotes	49	ReleaseNotes
57		50
58	Please read this file:
59
60	%%DOCSDIR%%/ReleaseNotes
61
62	as installed by docs port for the upgrade procedure.
63
64	If you are using sqlite you need to run the make_sqlite_tables script as	51	If you are using sqlite you need to run the make_sqlite_tables script as
65	the bacula user. Do this using 'sudo su -m bacula'.	52	the bacula user. Do this using 'sudo su -m bacula'.
66		53

Lines 1-35 Link Here

(-)pkg-plist (-29 / +24 lines)
1	@sample %%ETCDIR%%/bacula-barcodes.sample	1	lib/libbaccats-%%LIB_VERSION%%.so
2	@group bacula
3	@sample %%ETCDIR%%/bacula-dir.conf.sample
4	@group wheel
5	@sample %%ETCDIR%%/bacula-sd.conf.sample
6	lib/libbaccats.la	2	lib/libbaccats.la
7	lib/libbaccats.so	3	lib/libbaccats.so
8	lib/libbaccats.so.5	4	lib/libbaccats-%%DBTYPE%%-%%LIB_VERSION%%.so
9	lib/libbaccats.so.5.0.2
10	lib/libbaccats-%%DBTYPE%%.la	5	lib/libbaccats-%%DBTYPE%%.la
11	lib/libbaccats-%%DBTYPE%%.so	6	lib/libbaccats-%%DBTYPE%%.so
12	lib/libbaccats-%%DBTYPE%%.so.5	7	lib/libbacsql-%%LIB_VERSION%%.so
13	lib/libbaccats-%%DBTYPE%%.so.5.0.2
14	lib/libbacsql.la	8	lib/libbacsql.la
15	lib/libbacsql.so	9	lib/libbacsql.so
16	lib/libbacsql.so.5
17	lib/libbacsql.so.5.0.2
18	man/man1/bacula-bwxconsole.1.gz
19	man/man1/bacula-tray-monitor.1.gz
20	man/man1/bsmtp.1.gz
21	man/man8/bacula-dir.8.gz
22	man/man8/bacula-sd.8.gz
23	man/man8/bacula.8.gz
24	man/man8/bcopy.8.gz
25	man/man8/bextract.8.gz
26	man/man8/bls.8.gz
27	man/man8/bregex.8.gz
28	man/man8/bscan.8.gz
29	man/man8/btape.8.gz
30	man/man8/btraceback.8.gz
31	man/man8/bwild.8.gz
32	man/man8/dbcheck.8.gz
33	sbin/bacula	10	sbin/bacula
34	sbin/bacula-dir	11	sbin/bacula-dir
35	sbin/bacula-sd	12	sbin/bacula-sd
Lines 38-51 Link Here
38	sbin/bls	15	sbin/bls
39	sbin/bregex	16	sbin/bregex
40	sbin/bscan	17	sbin/bscan
		18	@mode 755
41	sbin/bsmtp	19	sbin/bsmtp
		20	@mode
42	sbin/btape	21	sbin/btape
43	sbin/btraceback	22	sbin/btraceback
44	sbin/bwild	23	sbin/bwild
45	sbin/chio-bacula	24	sbin/chio-bacula
46	@group bacula
47	sbin/dbcheck	25	sbin/dbcheck
		26	@sample %%ETCDIR%%/bacula-barcodes.samples
		27	@sample %%ETCDIR%%/bacula-dir.conf.sample
		28	@sample %%ETCDIR%%/bacula-sd.conf.sample
48	@owner bacula	29	@owner bacula
		30	@group bacula
49	%%DATADIR%%/bacula	31	%%DATADIR%%/bacula
50	%%DATADIR%%/bacula-ctl-dir	32	%%DATADIR%%/bacula-ctl-dir
51	%%DATADIR%%/bacula-ctl-fd	33	%%DATADIR%%/bacula-ctl-fd
Lines 75-79 Link Here
75	%%DATADIR%%/query.sql	57	%%DATADIR%%/query.sql
76	%%DATADIR%%/update_bacula_tables	58	%%DATADIR%%/update_bacula_tables
77	%%DATADIR%%/update_%%DBTYPE%%_tables	59	%%DATADIR%%/update_%%DBTYPE%%_tables
78	@owner root	60	@owner
79	@group wheel	61	@group
		62	man/man1/bacula-tray-monitor.1.gz
		63	man/man1/bsmtp.1.gz
		64	man/man8/bacula-dir.8.gz
		65	man/man8/bacula-sd.8.gz
		66	man/man8/bcopy.8.gz
		67	man/man8/bextract.8.gz
		68	man/man8/bls.8.gz
		69	man/man8/bregex.8.gz
		70	man/man8/bscan.8.gz
		71	man/man8/btape.8.gz
		72	man/man8/btraceback.8.gz
		73	man/man8/bwild.8.gz
		74	man/man8/dbcheck.8.gz

Lines 1-31 Link Here

(-)pkg-plist.client (-17 / +7 lines)
1	@sample %%ETCDIR%%/bacula-fd.conf.sample	1	lib/libbac-%%LIB_VERSION%%.so
2	@group bacula
3	@sample %%ETCDIR%%/bconsole.conf.sample
4	@group wheel
5	lib/libbac.la	2	lib/libbac.la
6	lib/libbac.so	3	lib/libbac.so
7	lib/libbac.so.5	4	lib/libbaccfg-%%LIB_VERSION%%.so
8	lib/libbac.so.5.0.2
9	lib/libbaccfg.la	5	lib/libbaccfg.la
10	lib/libbaccfg.so	6	lib/libbaccfg.so
11	lib/libbaccfg.so.5	7	lib/libbacfind-%%LIB_VERSION%%.so
12	lib/libbaccfg.so.5.0.2
13	lib/libbacfind.la	8	lib/libbacfind.la
14	lib/libbacfind.so	9	lib/libbacfind.so
15	lib/libbacfind.so.5
16	lib/libbacfind.so.5.0.2
17	lib/libbacpy.la
18	lib/libbacpy.so
19	lib/libbacpy.so.5
20	lib/libbacpy.so.5.0.2
21	lib/bpipe-fd.so	10	lib/bpipe-fd.so
22	man/man8/bacula-fd.8.gz	11	man/man8/bacula-fd.8.gz
		12	man/man8/bacula.8.gz
23	man/man8/bconsole.8.gz	13	man/man8/bconsole.8.gz
24	sbin/bacula-fd	14	sbin/bacula-fd
25	@group bacula
26	sbin/bconsole	15	sbin/bconsole
27	@group wheel	16	@sample %%ETCDIR%%/bacula-fd.conf.sample
		17	@sample %%ETCDIR%%/bconsole.conf.sample
28	@exec mkdir -p %%BACULA_DIR%%	18	@exec mkdir -p %%BACULA_DIR%%
29	@dirrmtry %%BACULA_DIR%%	19	@dirrmtry %%BACULA_DIR%%
		20	@dirrmtry %%ETCDIR%%
30	@dirrmtry share/bacula	21	@dirrmtry share/bacula
31	@dirrmtry %%ETCDIR%%