Attachment #145161 for bug #191311





PORTNAME=	bacula
PKGNAMESUFFIX=	-bat
#PORTREVISION=	4

COMMENT=	Network backup solution (GUI)

LIB_DEPENDS+=	libqwt.so:${PORTSDIR}/x11-toolkits/qwt5 \
		libbac.so:${PORTSDIR}/sysutils/bacula-client

USES=		pkgconfig
USE_QT4=	qmake_build uic_build moc_build rcc_build
WITH_BAT=	yes

LIB_DEPENDS=	libqwt.so:${PORTSDIR}/x11-toolkits/qwt5 \
		libbac.so:${PORTSDIR}/sysutils/bacula-client


MAKE_ENV+=	MAKEOBJDIRPREFIX=/

MASTERDIR=	${.CURDIR}/../../sysutils/bacula-server





COMMENT=	Network backup solution (static client)

PLIST=		${.CURDIR}/pkg-plist
MASTERDIR=	${.CURDIR}/../../sysutils/bacula-server

PLIST_FILES=	sbin/bacula-fd-static \
		sbin/bconsole-static

OPTIONS_DEFINE=	NLS OPENSSL
OPTIONS_DEFAULT=NLS OPENSSL

LDFLAGS=-static

CONFIGURE_ARGS+=	--enable-client-only \
			--enable-static-fd \
			--enable-static-cons \




# $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)

CONFLICTS_BUILD=	bacula-*-5.2.12_3

GNU_CONFIGURE=	yes

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

.if ${PKGNAMESUFFIX} == "-server"
RUN_DEPENDS=	${LOCALBASE}/lib/libbac.so:${PORTSDIR}/sysutils/bacula-client \
		${LOCALBASE}/lib/libbacfg.so:${PORTSDIR}/sysutils/bacula-client \
		${LOCALBASE}/lib/libbacfind.so:${PORTSDIR}/sysutils/bacula-client	
.endif

UNIQUENAME?=	${PORTNAME}${PKGNAMESUFFIX}

USERS=		bacula
GROUPS=		${USERS}


GNU_CONFIGURE=	yes
USE_LDCONFIG=	yes

USES=		libtool

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

.include <bsd.port.options.mk>
OPENSSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
OPENSSL_CONFIGURE_OFF=	--with-openssl="no"

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

.if defined(WITH_PYTHON)
USE_PYTHON=		yes
CONFIGURE_ARGS+=	--with-python=yes
.endif

.if !defined(WITH_CLIENT_ONLY)
LIB_DEPENDS=	libbac.so:${PORTSDIR}/sysutils/bacula-client
USE_RC_SUBR?=	bacula-dir bacula-sd
.endif


.if defined(WITH_CLIENT_ONLY)
SUB_FILES+=	pkg-install.client pkg-deinstall.client pkg-message.client
.else
SUB_FILES+=	pkg-install.server pkg-deinstall.server pkg-message.server
.endif

MANCOMPRESSED=	yes
CONFIGURE_ARGS+=--with-tcp-wrappers=/usr/lib \
		--enable-smartalloc \
		--sysconfdir=${ETCDIR} \

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

.if defined(WITH_CLIENT_ONLY)

		BACULA_GID=${BACULA_GID} \
		BACULA_DIR=${BACULA_DIR}

.if ${PORT_OPTIONS:MNLS}
USES+=			gettext
CONFIGURE_ARGS+=	--enable-nls
.else
CONFIGURE_ARGS+=	--disable-nls
.endif

# overridden if client install
PKGDEINSTALL=	${FILESDIR}/pkg-deinstall.server
PKGINSTALL=	${FILESDIR}/pkg-install.server

# Client only or full server version
.if defined(WITH_CLIENT_ONLY)
CONFFILES=	fd
CONFIGURE_ARGS+=	--enable-client-only

PKGDEINSTALL=	${STAGEDIR}${FILESDIR}/pkg-deinstall.client
PKGINSTALL=	${STAGEDIR}${FILESDIR}/pkg-install.client
.else
# Server only Options
CONFFILES=		sd dir
# 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

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MMYSQL}
CONFIGURE_ARGS+=	--with-mysql=yes
USE_MYSQL=		yes
DBTYPE=			mysql
SUB_LIST+=		REQ_MYSQL=mysql REQ_PGSQL=""
.elif ${PORT_OPTIONS:MSQLITE3}
CONFIGURE_ARGS+=	--with-sqlite3=yes
LIB_DEPENDS=		libsqlite3.so:${PORTSDIR}/databases/sqlite3
DBTYPE=			sqlite3
.else
USE_PGSQL=		yes
CONFIGURE_ARGS+=	--with-postgresql=yes
DBTYPE=			postgresql
SUB_LIST+=		REQ_MYSQL="" REQ_PGSQL=postgresql
.endif
PLIST_SUB+=		DBTYPE=${DBTYPE}
## Install mtx
.if ${PORT_OPTIONS:MMTX}
RUN_DEPENDS+=		${LOCALBASE}/sbin/mtx:${PORTSDIR}/misc/mtx
.endif
.endif

.if ${PORT_OPTIONS:MOPENSSL}
.include "${PORTSDIR}/Mk/bsd.openssl.mk"
CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
.else
CONFIGURE_ARGS+=	--with-openssl="no"
	btape.8 btraceback.8 dbcheck.8 bwild.8 bregex.8
MP1+=	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_MTX=yes		if you want to use mtx instead of chio for autochanger control."
	@${ECHO_MSG} "  WITH_PYTHON=yes		Enable Python scripting in the director."
	@${ECHO_MSG} "  WITH_SQLITE3=yes  	if you want SQLite-3 as the database (not recommended)."
.if ! ${PORT_OPTIONS:MMYSQL} && ! ${PORT_OPTIONS:MPGSQL}
	@${ECHO_MSG} "  WITH_MYSQL=yes  	if you want MySQL as the database."
	@${ECHO_MSG} "  WITH_PGSQL=yes		if you want PostgreSQL as the database."
	@${ECHO_MSG} ""
	@${ECHO_MSG} "The default DB is PostgreSQL!"
.endif
	@${ECHO_MSG} "  WITH_OPENSSL=yes  	Enable OpenSSL for encrypted communication."
	@${ECHO_MSG} ""
	@${ECHO_MSG} "===> Using ${DBTYPE} as the bacula database."
	@${ECHO_MSG} ""
.endif

post-patch:
#	This port does not install docs.  See bacula-docs for that
	${REINPLACE_CMD} -e '/docdir/d' ${WRKSRC}/Makefile.in

	@${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|${STAGEDIR}${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

.if !target(pre-install)
pre-install:
	if [ ! -d "${STAGEDIR}${BACULA_DIR}" ]; then \
		${ECHO_CMD} "creating ${STAGEDIR}${BACULA_DIR}" ; \
		${MKDIR} ${STAGEDIR}${BACULA_DIR}; \
	else \
		${ECHO_CMD} "${STAGEDIR}${BACULA_DIR} already exists"; \
	fi

# 	Extend /etc/services and install UID/GID
	@ ${SETENV} PKG_PREFIX=${STAGEDIR}${PREFIX} \
		${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
.endif

.if !target(post-install)
post-install:
.if defined(WITH_CLIENT_ONLY)
# 	Extend only /etc/services
	@ ${SETENV} PKG_PREFIX=${STAGEDIR}${PREFIX} \
		${SH} ${PKGINSTALL} ${PORTNAME}
# 	Console stuff
	if [ -f ${STAGEDIR}${ETCDIR}/bconsole.conf.new ]; then \
#		${ECHO_CMD} "etc/bconsole.conf.new" >> ${TMPPLIST}; \
		${CHGRP} bacula ${STAGEDIR}${ETCDIR}/bconsole.conf.new; \
	elif [ -f ${STAGEDIR}${ETCDIR}/bconsole.conf ]; then \
		${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${STAGEDIR}${ETCDIR}/bconsole.conf.sample; \
		${CHGRP} bacula ${STAGEDIR}${ETCDIR}/bconsole.conf.sample; \
#		${ECHO_CMD} "etc/bacula/bconsole.conf.sample" >> ${TMPPLIST}; \
	fi

#	ensure that users in the bacula group can run bconsole
	${CHGRP} bacula ${STAGEDIR}${PREFIX}/sbin/bconsole
.else
# 	Install config files and preserve existing ones
	${INSTALL_SCRIPT} ${FILESDIR}/chio-bacula ${STAGEDIR}${PREFIX}/sbin
	if [ -f ${ETCDIR}/bacula-barcodes ]; then \
		${INSTALL_DATA} ${FILESDIR}/bacula-barcodes ${ETCDIR}/bacula-barcodes.new ; \
		${ECHO_CMD} "etc/bacula/bacula-barcodes.new" >> ${TMPPLIST}; \
	else \
		${INSTALL_DATA} ${FILESDIR}/bacula-barcodes ${STAGEDIR}${ETCDIR}/bacula-barcodes.samples ; \
		${ECHO_CMD} "etc/bacula/bacula-barcodes.samples" >> ${TMPPLIST}; \
	fi
#	Add configuration files directory to packing list
	${ECHO_CMD} "@unexec ${RMDIR} %D/etc/bacula 2>/dev/null || true" >> ${TMPPLIST}
	${CHOWN} -R bacula:bacula ${STAGEDIR}${PREFIX}/share/bacula

#	on a fresh install, the .new suffix is not used
	if [ -f ${STAGEDIR}${ETCDIR}/bacula-dir.conf.new ]; then \
		${CHGRP} bacula ${STAGEDIR}${ETCDIR}/bacula-dir.conf.new; \
	else \
		${CHGRP} bacula ${STAGEDIR}${ETCDIR}/bacula-dir.conf; \
	fi

	${CHGRP} bacula ${STAGEDIR}${PREFIX}/sbin/dbcheck

.endif
# 	Install leaves existing conf files untouched. Respect this here!
	for na in ${CONFFILES}; do \
		if [ -f ${STAGEDIR}${ETCDIR}/bacula-$$na.conf.new ]; then \
			${ECHO_CMD} "etc/bacula/bacula-$$na.conf.new" >> ${TMPPLIST}; \
		elif [ -f ${STAGEDIR}${ETCDIR}/bacula-$$na.conf ]; then \
			${MV} ${STAGEDIR}${ETCDIR}/bacula-$$na.conf ${STAGEDIR}${ETCDIR}/bacula-$$na.conf.sample; \
			${ECHO_CMD} "etc/bacula/bacula-$$na.conf.sample" >> ${TMPPLIST}; \
		fi; \
	done

#	Add configuration files directory to packing list
	${ECHO_CMD} "@unexec ${RMDIR} %D/etc/bacula 2>/dev/null || true" >> ${TMPPLIST}

	${CHGRP} wheel ${STAGEDIR}${PREFIX}/etc

.endif
.else
.include "${MASTERDIR}/Makefile.common"

Lines 1-27 Link Here

(-)bacula-server/Makefile.common (-17 / +26 lines)
1	post-patch:	1	PLIST= ${WRKDIR}/pkg-plist
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		2
6	post-build:	3	pre-everything::
		4	.if ${PKGNAMESUFFIX} == "-bat"
		5	@${ECHO_MSG} "===> Building bat the GUI interface for Bacula."
		6	.endif
7	.if ${PKGNAMEPREFIX} == "nagios-check_"	7	.if ${PKGNAMEPREFIX} == "nagios-check_"
8	${MAKE_CMD} -C ${WRKSRC}/examples/nagios/check_bacula	8	@${ECHO_MSG} "===> Building nagios check only."
9	.endif	9	.endif
		10	.if ${PKGNAMESUFFIX} == "-client-static"
		11	@${ECHO_MSG} "===> Building static version of fd."
		12	.endif
10		13
11	do-install:	14	post-patch:
		15
		16	pre-install:
		17	@${RM} -f ${PLIST}
12	.if ${PKGNAMESUFFIX} == "-bat"	18	.if ${PKGNAMESUFFIX} == "-bat"
13	# Install config files and preserve existing ones	19	${MKDIR} ${STAGEDIR}/usr/local/etc/bacula
14	${MKDIR} ${STAGEDIR}${ETCDIR}	20	${CP} ${WRKSRC}/src/qt-console/bat ${STAGEDIR}/usr/local/sbin/bat
15	${INSTALL_SCRIPT} ${WRKSRC}/src/qt-console/bat.conf ${STAGEDIR}${PREFIX}/etc/bacula/bat.conf.sample	21	${CP} ${WRKSRC}/src/qt-console/bat.conf ${STAGEDIR}${ETCDIR}/bat.conf.sample
16	${INSTALL_MAN} ${WRKSRC}/manpages/bat.1 ${STAGEDIR}${PREFIX}/man/man1/	22	@${ECHO_CMD} "etc/bacula/bat.conf.sample" >> ${PLIST}
17	${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/bat ${STAGEDIR}${PREFIX}/sbin	23	@${ECHO_CMD} "sbin/bat" >> ${PLIST}
18	.endif	24	.endif
19	.if ${PKGNAMEPREFIX} == "nagios-check_"	25	.if ${PKGNAMEPREFIX} == "nagios-check_"
20	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nagios	26	@${ECHO_CMD} "libexec/nagios/check_bacula" >> ${PLIST}
21	${INSTALL_PROGRAM} ${WRKSRC}/examples/nagios/check_bacula/check_bacula \	27	@${ECHO_CMD} "@dirrmtry libexec/nagios" >> ${PLIST}
22	${STAGEDIR}${PREFIX}/libexec/nagios
23	.endif	28	.endif
24	.if ${PKGNAMESUFFIX} == "-client-static"	29	.if ${PKGNAMESUFFIX} == "-client-static"
25	${INSTALL_PROGRAM} ${WRKSRC}/src/filed/static-bacula-fd ${STAGEDIR}${PREFIX}/sbin/bacula-fd-static	30	${CP} ${WRKSRC}/src/console/static-bconsole ${STAGEDIR}/usr/local/sbin/bconsole-static
26	${INSTALL_PROGRAM} ${WRKSRC}/src/console/static-bconsole ${STAGEDIR}${PREFIX}/sbin/bconsole-static	31	${CP} ${WRKSRC}/src/filed/static-bacula-fd ${STAGEDIR}/usr/local/sbin/bacula-fd-static
		32	@${ECHO_CMD} "sbin/bacula-fd-static" >> ${PLIST}
		33	@${ECHO_CMD} "sbin/bconsole-static" >> ${PLIST}
27	.endif	34	.endif
		35
		36	do-install:

Lines 1-2 Link Here

(-)bacula-server/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

Lines 1-5 Link Here

(-)bacula-server/files/patch-src__console__Makefile.in (-2 / +2 lines)
1	--- src/console/Makefile.in 2012-03-24 15:10:18.000000000 -0500	1	--- /var/ports/usr/ports.SVN/sysutils/bacula-client/work/bacula-7.0.4/src/console/Makefile.in~ 2014-06-03 08:28:41.000000000 +0000
2	+++ src/console/Makefile.in 2012-03-24 15:10:35.000000000 -0500	2	+++ /var/ports/usr/ports.SVN/sysutils/bacula-client/work/bacula-7.0.4/src/console/Makefile.in 2014-07-30 14:41:15.113512945 +0000
3	@@ -53,7 +53,7 @@	3	@@ -53,7 +53,7 @@
4		4
5	static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)	5	static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)




--- /var/ports/usr/ports.SVN/sysutils/bacula-client/work/bacula-7.0.4/src/dird/Makefile.in~	2014-06-03 08:28:41.000000000 +0000
+++ /var/ports/usr/ports.SVN/sysutils/bacula-client/work/bacula-7.0.4/src/dird/Makefile.in	2014-07-30 14:26:39.521514509 +0000
@@ -64,14 +64,14 @@
 	    ../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 -lbaccfg -lbac -lm $(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) \
 		   ../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 -lbaccfg -lbac -lm $(DLIB) $(DB_LIBS) $(LIBS) \
 	      $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
 	strip $@
@@ -137,7 +137,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) -I$(srcdir) -I$(basedir) *.c >> Makefile
 	@if test -f Makefile ; then \
 	    $(RMF) Makefile.bak; \

Lines 1-10 Link Here

(-)bacula-server/files/patch-src__filed__Makefile.in (-6 / +6 lines)
1	--- src/filed/Makefile.in 2012-06-28 09:52:03.000000000 -0500	1	--- /var/ports/usr/ports.SVN/sysutils/bacula-client/work/bacula-7.0.4/src/filed/Makefile.in~ 2014-06-03 08:28:41.000000000 +0000
2	+++ src/filed/Makefile.in 2012-08-09 15:04:48.000000000 -0500	2	+++ /var/ports/usr/ports.SVN/sysutils/bacula-client/work/bacula-7.0.4/src/filed/Makefile.in 2014-07-30 14:31:24.288512998 +0000
3	@@ -102,7 +102,7 @@	3	@@ -95,7 +95,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@	4	static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
5	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \	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) \	6	$(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
7	- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS)	7	- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
8	+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS:S/.so/.a/g) $(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 $@	9	strip $@
10		10




--- /var/ports/usr/ports.SVN/sysutils/bacula-client/work/bacula-7.0.4/src/lib/Makefile.in~	2014-06-03 08:28:41.000000000 +0000
+++ /var/ports/usr/ports.SVN/sysutils/bacula-client/work/bacula-7.0.4/src/lib/Makefile.in	2014-07-30 14:37:39.122515409 +0000
@@ -105,7 +105,7 @@
 
 libbac.la: Makefile $(LIBBAC_LOBJS)
 	@echo "Making $@ ..."

 
 libbaccfg.a: $(LIBBACCFG_OBJS) 
 	@echo "Making $@ ..."
@@ -114,7 +114,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) \
@@ -242,7 +242,7 @@
 depend:
 	@$(MV) Makefile Makefile.bak
 	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
-	@$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
+	
 	@for src in $(LIBBAC_SRCS) $(LIBBACCFG_SRCS); do \
 	    $(CXX) -S -M -MT `basename $$src .c`$(DEFAULT_OBJECT_TYPE) $(CPPFLAGS) $(XINC) -I$(srcdir) -I$(basedir) $$src >> Makefile; \
 	done




--- /var/ports/usr/ports.SVN/sysutils/bacula-client/work/bacula-7.0.4/src/stored/Makefile.in~	2014-06-03 08:28:41.000000000 +0000
+++ /var/ports/usr/ports.SVN/sysutils/bacula-client/work/bacula-7.0.4/src/stored/Makefile.in	2014-07-30 14:55:10.003512956 +0000
@@ -111,12 +111,12 @@
 
 bacula-sd: Makefile $(SDOBJS) ../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) \
 	   -lbaccfg -lbac -lm $(DLIB) $(LIBS) $(WRAPLIBS) \
 	$(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
 
 static-bacula-sd: Makefile $(SDOBJS) ../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) \
 	   -lbaccfg -lbac -lm $(DLIB) $(LIBS) $(WRAPLIBS) \
 	$(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
 	strip $@
@@ -127,7 +127,7 @@
 	   -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 
 btape: Makefile  $(TAPEOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)

 	   -lbaccfg -lbac $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 bls.o:	bls.c
@@ -137,7 +137,7 @@
 
 bls:	Makefile $(BLSOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
 	@echo "Compiling $<"

 	   -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 bextract.o: bextract.c
@@ -147,7 +147,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) $(LZO_LIBS) \
+	$(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
@@ -157,7 +157,7 @@
 
 bscan:	Makefile $(SCNOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
 	../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE)

 	   -lbacsql -lbaccats $(DB_LIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 bcopy.o: bcopy.c
@@ -166,7 +166,7 @@
 	   -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 
 bcopy:	Makefile $(COPYOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)

 	   -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
@@ -231,7 +231,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) -I$(srcdir) -I$(basedir) *.c >> Makefile
 	@if test -f Makefile ; then \
 	    $(RMF) Makefile.bak; \




--- /root/tmp/Makefile.in	2014-07-30 15:02:38.380512832 +0000
+++ /var/ports/usr/ports.SVN/sysutils/bacula-client/work/bacula-7.0.4/src/tools/Makefile.in	2014-06-03 08:28:41.000000000 +0000
@@ -54,22 +54,22 @@
 	@echo " "
 
 bsmtp: Makefile bsmtp.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)	    
-	$(LIBTOOL_LINK) $(CXX) -L../lib $(LDFLAGS) -o $@ bsmtp.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bsmtp.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 bregtest: Makefile bregtest.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)	   
-	$(LIBTOOL_LINK) $(CXX) -L../lib $(LDFLAGS) -o $@ bregtest.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -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) -L../lib -L../cats $(LDFLAGS) -o $@ dbcheck.o $(DIRCONFOBJS) \
+	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../cats -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) -L../lib -L../findlib $(LDFLAGS) -o $@ fstype.o -lbacfind -lbac -lm \
+	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -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) -L../lib -L../findlib $(LDFLAGS) -o $@ drivetype.o -lbacfind -lbac -lm \
+	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ drivetype.o -lbacfind -lbac -lm \
 	  $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 dird_conf.o: ../dird/dird_conf.c
@@ -90,34 +90,34 @@
 
 testfind: Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
 	  ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) $(FINDOBJS)
-	$(LIBTOOL_LINK) $(CXX) -g -o $@ $(FINDOBJS) -L. -L../lib -L../findlib $(LDFLAGS) \
+	$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -o $@ $(FINDOBJS) -L. -L../lib -L../findlib \
 	  $(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 -L. -L../lib -L../findlib $(LDFLAGS) -o $@ testls.o \
+	$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L. -L../lib -L../findlib -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 -L. -L../lib $(LDFLAGS) -o $@ bregex.o \
+	$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L. -L../lib -o $@ bregex.o \
 	  $(DLIB) -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 bwild:	Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) bwild.o
-	$(LIBTOOL_LINK) $(CXX) -g -L. -L../lib $(LDFLAGS) -o $@ bwild.o \
+	$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L. -L../lib -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 -L../cats -L. -L../lib $(LDFLAGS) -o $@ bbatch.o \
+	$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -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 -L../cats -L. -L../lib -L../findlib $(LDFLAGS) -o $@ bvfs_test.o  \
+	$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -L../findlib -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 -L../cats -L. -L../lib -L../findlib $(LDFLAGS) -o $@ ing_test.o  \
+	$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -L../findlib -o $@ ing_test.o  \
 	  -lbaccats -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 cats_test.o: cats_test.c
@@ -125,7 +125,7 @@
 	$(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -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 -L../cats -L. -L../lib -L../findlib $(LDFLAGS) -o $@ cats_test.o  \
+	$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -L../findlib -o $@ cats_test.o  \
 	  -lbaccats -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 gigaslam.o: gigaslam.c
@@ -135,13 +135,13 @@
 	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -o $@ gigaslam.o
 
 grow: Makefile grow.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
-	$(LIBTOOL_LINK) $(CXX) -L../lib $(LDFLAGS) -o $@ grow.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ grow.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 bpluginfo.o: bpluginfo.c
 	$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) -I../filed -I../dird -I../stored $(DINCLUDE) $(CFLAGS) $<
 
 bpluginfo: Makefile bpluginfo.o
-	$(LIBTOOL_LINK) $(CXX) -L../lib $(LDFLAGS) -o $@ bpluginfo.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bpluginfo.o -lbac $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
 	cd $(topdir) \
@@ -193,7 +193,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) -I$(srcdir) -I$(basedir) *.c >> Makefile
 	@if test -f Makefile ; then \
 	    $(RMF) Makefile.bak; \




@group bacula
@sample %%ETCDIR%%/bacula-dir.conf.sample
@group wheel
@sample %%ETCDIR%%/bacula-sd.conf.samplelib/libbaccats.so
lib/libbaccats.la
lib/libbaccats.so
lib/libbaccats.so.%%MAJOR%%
lib/libbaccats.so.5.0.2
lib/libbaccats-%%DBTYPE%%.la
lib/libbaccats-%%DBTYPE%%.so
lib/libbaccats-%%DBTYPE%%.so.%%MAJOR%%
lib/libbaccats-%%DBTYPE%%.so.5.0.2
lib/libbacsql.la
lib/libbacsql.so
lib/libbacsql.so.%%MAJOR%%
lib/libbacsql.so.5.0.2
man/man1/bacula-bwxconsole.1.gz
man/man1/bacula-tray-monitor.1.gz
man/man1/bsmtp.1.gz

sbin/bls
sbin/bregex
sbin/bscan
@mode 755
sbin/bsmtp
@mode
sbin/btape
sbin/btraceback
sbin/bwild

@group bacula
sbin/dbcheck
@owner bacula
@group bacula
%%DATADIR%%/bacula
%%DATADIR%%/bacula-ctl-dir
%%DATADIR%%/bacula-ctl-fd




@group wheel
lib/libbac.la
lib/libbac.so
lib/libbac.so.%%MAJOR%%
lib/libbac.so.5.0.2
lib/libbaccfg.la
lib/libbaccfg.so
lib/libbaccfg.so.%%MAJOR%%
lib/libbaccfg.so.5.0.2
lib/libbacfind.la
lib/libbacfind.so
lib/libbacfind.so.%%MAJOR%%
lib/libbacfind.so.5.0.2
lib/libbacpy.la
lib/libbacpy.so
lib/libbacpy.so.%%MAJOR%%
lib/libbacpy.so.5.0.2
lib/bpipe-fd.so
man/man8/bacula-fd.8.gz
man/man8/bconsole.8.gz

Return to bug 191311

Lines 3-20 Link Here

(-)bacula-bat/Makefile (-5 / +5 lines)
3		3
4	PORTNAME= bacula	4	PORTNAME= bacula
5	PKGNAMESUFFIX= -bat	5	PKGNAMESUFFIX= -bat
6	PORTREVISION= 5	6	#PORTREVISION= 4
7		7
8	COMMENT= Network backup solution (GUI)	8	COMMENT= Network backup solution (GUI)
9		9
10	LIB_DEPENDS+= libqwt.so:${PORTSDIR}/x11-toolkits/qwt5 \
11	libbac.so:${PORTSDIR}/sysutils/bacula-client
12
13	USES= pkgconfig	10	USES= pkgconfig
14	USE_QT4= qmake_build uic_build moc_build rcc_build	11	USE_QT4= qmake_build uic_build moc_build rcc_build
15	WITH_BAT= yes	12	WITH_BAT= yes
16		13
17	PLIST= ${.CURDIR}/pkg-plist	14	LIB_DEPENDS= libqwt.so:${PORTSDIR}/x11-toolkits/qwt5 \
		15	libbac.so:${PORTSDIR}/sysutils/bacula-client
		16
		17
18	MAKE_ENV+= MAKEOBJDIRPREFIX=/	18	MAKE_ENV+= MAKEOBJDIRPREFIX=/
19		19
20	MASTERDIR= ${.CURDIR}/../../sysutils/bacula-server	20	MASTERDIR= ${.CURDIR}/../../sysutils/bacula-server

Lines 5-19 Link Here

(-)bacula-client-static/Makefile (-3 / +2 lines)
5		5
6	COMMENT= Network backup solution (static client)	6	COMMENT= Network backup solution (static client)
7		7
8	PLIST= ${.CURDIR}/pkg-plist
9	MASTERDIR= ${.CURDIR}/../../sysutils/bacula-server	8	MASTERDIR= ${.CURDIR}/../../sysutils/bacula-server
10		9
11	PLIST_FILES= sbin/bacula-fd-static \
12	sbin/bconsole-static
13		10
14	OPTIONS_DEFINE= NLS OPENSSL	11	OPTIONS_DEFINE= NLS OPENSSL
15	OPTIONS_DEFAULT=NLS OPENSSL	12	OPTIONS_DEFAULT=NLS OPENSSL
16		13
		14	LDFLAGS=-static
		15
17	CONFIGURE_ARGS+= --enable-client-only \	16	CONFIGURE_ARGS+= --enable-client-only \
18	--enable-static-fd \	17	--enable-static-fd \
19	--enable-static-cons \	18	--enable-static-cons \

Lines 2-9 Link Here

(-)bacula-server/Makefile (-57 / +149 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-21 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	CONFLICTS_BUILD= bacula-*-5.2.12_3
16		16
17	LIB_DEPENDS+= liblzo2.so:${PORTSDIR}/archivers/lzo2	17	GNU_CONFIGURE= yes
18		18
		19	LIB_DEPENDS= liblzo2.so:${PORTSDIR}/archivers/lzo2
		20
		21	.if ${PKGNAMESUFFIX} == "-server"
		22	RUN_DEPENDS= ${LOCALBASE}/lib/libbac.so:${PORTSDIR}/sysutils/bacula-client \
		23	${LOCALBASE}/lib/libbacfg.so:${PORTSDIR}/sysutils/bacula-client \
		24	${LOCALBASE}/lib/libbacfind.so:${PORTSDIR}/sysutils/bacula-client
		25	.endif
		26
		27	UNIQUENAME?= ${PORTNAME}${PKGNAMESUFFIX}
		28
19	USERS= bacula	29	USERS= bacula
20	GROUPS= ${USERS}	30	GROUPS= ${USERS}
21		31
Lines 24-47 Link Here
24	GNU_CONFIGURE= yes	34	GNU_CONFIGURE= yes
25	USE_LDCONFIG= yes	35	USE_LDCONFIG= yes
26		36
		37	USES= libtool
		38
27	CPPFLAGS+= -I/usr/include/readline -I${LOCALBASE}/include	39	CPPFLAGS+= -I/usr/include/readline -I${LOCALBASE}/include
28	LDFLAGS+= -L${LOCALBASE}/lib	40	#LDFLAGS+= -L${LOCALBASE}/lib
29		41
30	OPTIONS_DEFINE?= SQLITE3 MYSQL PGSQL MTX PYTHON NLS OPENSSL	42	OPTIONS_DEFINE?= SQLITE3 MYSQL PGSQL MTX PYTHON NLS OPENSSL
31	OPTIONS_DEFAULT?= NLS OPENSSL PGSQL	43	OPTIONS_DEFAULT?= NLS OPENSSL PGSQL
32	MTX_DESC= Install mtx for control of autochanger devices	44	MTX_DESC= Install mtx for control of autochanger devices
33		45
34	OPENSSL_USE= OPENSSL=yes	46	.include <bsd.port.options.mk>
35	OPENSSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE}
36	OPENSSL_CONFIGURE_OFF= --with-openssl="no"
37		47
38	.if ${PKGNAMESUFFIX} == "-client" \|\| ${PKGNAMESUFFIX} == "-server" #Till end of the file	48	.if ${PKGNAMESUFFIX} == "-client" \|\| ${PKGNAMESUFFIX} == "-server" #Till end of the file
39		49
40	PYTHON_USE= PYTHON=yes	50	.if defined(WITH_PYTHON)
41	PYTHON_CONFIGURE_ON= --with-python=yes	51	USE_PYTHON= yes
		52	CONFIGURE_ARGS+= --with-python=yes
		53	.endif
42		54
43	.if !defined(WITH_CLIENT_ONLY)	55	.if !defined(WITH_CLIENT_ONLY)
44	LIB_DEPENDS+= libbac.so:${PORTSDIR}/sysutils/bacula-client	56	LIB_DEPENDS= libbac.so:${PORTSDIR}/sysutils/bacula-client
45	USE_RC_SUBR?= bacula-dir bacula-sd	57	USE_RC_SUBR?= bacula-dir bacula-sd
46	.endif	58	.endif
47		59
Lines 48-57 Link Here
48	.if defined(WITH_CLIENT_ONLY)	60	.if defined(WITH_CLIENT_ONLY)
49	SUB_FILES+= pkg-install.client pkg-deinstall.client pkg-message.client	61	SUB_FILES+= pkg-install.client pkg-deinstall.client pkg-message.client
50	.else	62	.else
51	SUB_FILES+= pkg-message.server	63	SUB_FILES+= pkg-install.server pkg-deinstall.server pkg-message.server
52	.endif	64	.endif
53		65
54	MANCOMPRESSED= yes
55	CONFIGURE_ARGS+=--with-tcp-wrappers=/usr/lib \	66	CONFIGURE_ARGS+=--with-tcp-wrappers=/usr/lib \
56	--enable-smartalloc \	67	--enable-smartalloc \
57	--sysconfdir=${ETCDIR} \	68	--sysconfdir=${ETCDIR} \
Lines 66-71 Link Here
66	--with-db-name=bacula \	77	--with-db-name=bacula \
67	--with-sbin-perm=755 \	78	--with-sbin-perm=755 \
68	--with-db-user=bacula \	79	--with-db-user=bacula \
		80	--with-logdir=/var/log \
69	--with-baseport=9101	81	--with-baseport=9101
70		82
71	.if defined(WITH_CLIENT_ONLY)	83	.if defined(WITH_CLIENT_ONLY)
Lines 95-149 Link Here
95	BACULA_GID=${BACULA_GID} \	107	BACULA_GID=${BACULA_GID} \
96	BACULA_DIR=${BACULA_DIR}	108	BACULA_DIR=${BACULA_DIR}
97		109
98	NLS_USES= gettext	110	.if ${PORT_OPTIONS:MNLS}
99	NLS_CONFIGURE_ENABLE= nls	111	USES+= gettext
		112	CONFIGURE_ARGS+= --enable-nls
		113	.else
		114	CONFIGURE_ARGS+= --disable-nls
		115	.endif
100		116
		117	# overridden if client install
		118	PKGDEINSTALL= ${FILESDIR}/pkg-deinstall.server
		119	PKGINSTALL= ${FILESDIR}/pkg-install.server
		120
101	# Client only or full server version	121	# Client only or full server version
102	.if defined(WITH_CLIENT_ONLY)	122	.if defined(WITH_CLIENT_ONLY)
103	CONFFILES= fd	123	CONFFILES= fd
104	CONFIGURE_ARGS+= --enable-client-only	124	CONFIGURE_ARGS+= --enable-client-only
105		125
106	PKGDEINSTALL= ${FILESDIR}/pkg-deinstall.client	126	PKGDEINSTALL= ${STAGEDIR}${FILESDIR}/pkg-deinstall.client
107	PKGINSTALL= ${FILESDIR}/pkg-install.client	127	PKGINSTALL= ${STAGEDIR}${FILESDIR}/pkg-install.client
108	.else	128	.else
109	# Server only Options	129	# Server only Options
110	CONFFILES= sd dir	130	CONFFILES= sd dir
111	# Server default database	131	# Server default database
112
113	MYSQL_CONFIGURE_ON= --with-mysql=yes
114	MYSQL_USE= MYSQL=yes
115	SQLITE3_CONFIGURE_ON= --with-sqlite3=yes
116	SQLITE3_LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3
117	PGSQL_CONFIGURE_ON= --with-postgresql=yes
118	PGSQL_USES= pgsql
119
120	MTX_RUN_DEPENDS= ${LOCALBASE}/sbin/mtx:${PORTSDIR}/misc/mtx
121
122	.include <bsd.port.options.mk>
123
124	.if ${PORT_OPTIONS:MMYSQL}	132	.if ${PORT_OPTIONS:MMYSQL}
		133	CONFIGURE_ARGS+= --with-mysql=yes
		134	USE_MYSQL= yes
125	DBTYPE= mysql	135	DBTYPE= mysql
126	SUB_LIST+= REQ_MYSQL=mysql REQ_PGSQL=""	136	SUB_LIST+= REQ_MYSQL=mysql REQ_PGSQL=""
127	.elif ${PORT_OPTIONS:MSQLITE3}	137	.elif ${PORT_OPTIONS:MSQLITE3}
		138	CONFIGURE_ARGS+= --with-sqlite3=yes
		139	LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3
128	DBTYPE= sqlite3	140	DBTYPE= sqlite3
129	.else	141	.else
		142	USE_PGSQL= yes
		143	CONFIGURE_ARGS+= --with-postgresql=yes
130	DBTYPE= postgresql	144	DBTYPE= postgresql
131	SUB_LIST+= REQ_MYSQL="" REQ_PGSQL=postgresql	145	SUB_LIST+= REQ_MYSQL="" REQ_PGSQL=postgresql
132	.endif	146	.endif
133	PLIST_SUB+= DBTYPE=${DBTYPE}	147	PLIST_SUB+= DBTYPE=${DBTYPE}
134		148	## Install mtx
		149	.if ${PORT_OPTIONS:MMTX}
		150	RUN_DEPENDS+= ${LOCALBASE}/sbin/mtx:${PORTSDIR}/misc/mtx
135	.endif	151	.endif
		152	.endif
136		153
137	.if defined(WITH_CLIENT_ONLY)	154	.if ${PORT_OPTIONS:MOPENSSL}
138	MP8+= bacula-fd.8 bconsole.8	155	.include "${PORTSDIR}/Mk/bsd.openssl.mk"
		156	CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE}
139	.else	157	.else
140	MP8+= bacula.8 bacula-dir.8 bacula-sd.8 bcopy.8 bextract.8 bls.8 bscan.8 \	158	CONFIGURE_ARGS+= --with-openssl="no"
141	btape.8 btraceback.8 dbcheck.8 bwild.8 bregex.8
142	MP1+= bsmtp.1 bacula-tray-monitor.1 bacula-bwxconsole.1
143	.endif	159	.endif
144		160
145	MAKE_ENV+= MAN8="${MP8}" MAN1="${MP1}"	161	MAKE_ENV+= MAN8="${MAN8}" MAN1="${MAN1}"
146		162
		163	pre-everything::
		164	.if !defined(WITH_CLIENT_ONLY)
		165	@${ECHO_MSG} "You may use the following build options (or make config):"
		166	@${ECHO_MSG} ""
		167	@${ECHO_MSG} " WITH_CLIENT_ONLY=yes if you only want the file daemon."
		168	@${ECHO_MSG} " WITH_MTX=yes if you want to use mtx instead of chio for autochanger control."
		169	@${ECHO_MSG} " WITH_PYTHON=yes Enable Python scripting in the director."
		170	@${ECHO_MSG} " WITH_SQLITE3=yes if you want SQLite-3 as the database (not recommended)."
		171	.if ! ${PORT_OPTIONS:MMYSQL} && ! ${PORT_OPTIONS:MPGSQL}
		172	@${ECHO_MSG} " WITH_MYSQL=yes if you want MySQL as the database."
		173	@${ECHO_MSG} " WITH_PGSQL=yes if you want PostgreSQL as the database."
		174	@${ECHO_MSG} ""
		175	@${ECHO_MSG} "The default DB is PostgreSQL!"
		176	.endif
		177	@${ECHO_MSG} " WITH_OPENSSL=yes Enable OpenSSL for encrypted communication."
		178	@${ECHO_MSG} ""
		179	@${ECHO_MSG} "===> Using ${DBTYPE} as the bacula database."
		180	@${ECHO_MSG} ""
		181	.endif
		182
147	post-patch:	183	post-patch:
148	# This port does not install docs. See bacula-docs for that	184	# This port does not install docs. See bacula-docs for that
149	${REINPLACE_CMD} -e '/docdir/d' ${WRKSRC}/Makefile.in	185	${REINPLACE_CMD} -e '/docdir/d' ${WRKSRC}/Makefile.in
Lines 151-188 Link Here
151	@${REINPLACE_CMD} -e 's\|$$(ECHO)\|echo\|g' ${WRKSRC}/src/filed/Makefile.in \	187	@${REINPLACE_CMD} -e 's\|$$(ECHO)\|echo\|g' ${WRKSRC}/src/filed/Makefile.in \
152	${WRKSRC}/src/console/Makefile.in	188	${WRKSRC}/src/console/Makefile.in
153	# Default bconsole.conf is in ${ETCDIR}	189	# Default bconsole.conf is in ${ETCDIR}
154	@${REINPLACE_CMD} -e 's\|./bconsole.conf\|${ETCDIR}/bconsole.conf\|g' ${WRKSRC}/src/console/console.c	190	@${REINPLACE_CMD} -e 's\|./bconsole.conf\|${STAGEDIR}${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	191	# @${REINPLACE_CMD} -e 's\|^MAN8 =\|MAN8 ?=\|g' -e 's\|^MAN1 =\|MAN1 ?=\|g' ${WRKSRC}/manpages/Makefile.in
156	.if defined(WITH_CLIENT_ONLY)	192	#.if defined(WITH_CLIENT_ONLY)
157	# In client port only install startup script out of script dir (see below post-install)	193	## 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	194	## Dont mkdir ${PREFIX}/share/bacula cause it's empty
159	@${REINPLACE_CMD} -e 's\|^\(fd_subdirs = .\)scripts\(.\)\|\1\2\|g' ${WRKSRC}/Makefile.in	195	# @${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	196	# ${REINPLACE_CMD} -e 's\|\(.*$${MKDIR} $${DESTDIR}$${scriptdir}\)\|#\1\|g' ${WRKSRC}/Makefile.in
161	.else	197	#.else
162	# In server port don't install filed	198	## In server port don't install filed
163	@${REINPLACE_CMD} -e '/^fd_subdirs = /s\|src/filed\|\|' -e 's\|src/console\|\|' \	199	# @${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	200	# -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 \	201	# @${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	202	# ${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' \	203	# @${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	204	# ${WRKSRC}/src/tools/bpluginfo.c
169	.endif	205	#.endif
170		206
		207	.if !target(pre-install)
171	pre-install:	208	pre-install:
172	${MKDIR} ${STAGEDIR}${BACULA_DIR}	209	if [ ! -d "${STAGEDIR}${BACULA_DIR}" ]; then \
		210	${ECHO_CMD} "creating ${STAGEDIR}${BACULA_DIR}" ; \
		211	${MKDIR} ${STAGEDIR}${BACULA_DIR}; \
		212	else \
		213	${ECHO_CMD} "${STAGEDIR}${BACULA_DIR} already exists"; \
		214	fi
173		215
		216	# Extend /etc/services and install UID/GID
		217	@ ${SETENV} PKG_PREFIX=${STAGEDIR}${PREFIX} \
		218	${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
		219	.endif
		220
174	.if !target(post-install)	221	.if !target(post-install)
175	post-install:	222	post-install:
176	.if defined(WITH_CLIENT_ONLY)	223	.if defined(WITH_CLIENT_ONLY)
177	${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${STAGEDIR}${ETCDIR}/bconsole.conf.sample	224	# Extend only /etc/services
		225	@ ${SETENV} PKG_PREFIX=${STAGEDIR}${PREFIX} \
		226	${SH} ${PKGINSTALL} ${PORTNAME}
		227	# Console stuff
		228	if [ -f ${STAGEDIR}${ETCDIR}/bconsole.conf.new ]; then \
		229	# ${ECHO_CMD} "etc/bconsole.conf.new" >> ${TMPPLIST}; \
		230	${CHGRP} bacula ${STAGEDIR}${ETCDIR}/bconsole.conf.new; \
		231	elif [ -f ${STAGEDIR}${ETCDIR}/bconsole.conf ]; then \
		232	${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${STAGEDIR}${ETCDIR}/bconsole.conf.sample; \
		233	${CHGRP} bacula ${STAGEDIR}${ETCDIR}/bconsole.conf.sample; \
		234	# ${ECHO_CMD} "etc/bacula/bconsole.conf.sample" >> ${TMPPLIST}; \
		235	fi
		236
		237	# ensure that users in the bacula group can run bconsole
		238	${CHGRP} bacula ${STAGEDIR}${PREFIX}/sbin/bconsole
178	.else	239	.else
		240	# Install config files and preserve existing ones
179	${INSTALL_SCRIPT} ${FILESDIR}/chio-bacula ${STAGEDIR}${PREFIX}/sbin	241	${INSTALL_SCRIPT} ${FILESDIR}/chio-bacula ${STAGEDIR}${PREFIX}/sbin
180	${INSTALL_DATA} ${FILESDIR}/bacula-barcodes ${STAGEDIR}${ETCDIR}/bacula-barcodes.sample	242	if [ -f ${ETCDIR}/bacula-barcodes ]; then \
181	${CHMOD} o+x ${STAGEDIR}${PREFIX}/sbin/bsmtp	243	${INSTALL_DATA} ${FILESDIR}/bacula-barcodes ${ETCDIR}/bacula-barcodes.new ; \
		244	${ECHO_CMD} "etc/bacula/bacula-barcodes.new" >> ${TMPPLIST}; \
		245	else \
		246	${INSTALL_DATA} ${FILESDIR}/bacula-barcodes ${STAGEDIR}${ETCDIR}/bacula-barcodes.samples ; \
		247	${ECHO_CMD} "etc/bacula/bacula-barcodes.samples" >> ${TMPPLIST}; \
		248	fi
		249	# Add configuration files directory to packing list
		250	${ECHO_CMD} "@unexec ${RMDIR} %D/etc/bacula 2>/dev/null \|\| true" >> ${TMPPLIST}
		251	${CHOWN} -R bacula:bacula ${STAGEDIR}${PREFIX}/share/bacula
		252
		253	# on a fresh install, the .new suffix is not used
		254	if [ -f ${STAGEDIR}${ETCDIR}/bacula-dir.conf.new ]; then \
		255	${CHGRP} bacula ${STAGEDIR}${ETCDIR}/bacula-dir.conf.new; \
		256	else \
		257	${CHGRP} bacula ${STAGEDIR}${ETCDIR}/bacula-dir.conf; \
		258	fi
		259
		260	${CHGRP} bacula ${STAGEDIR}${PREFIX}/sbin/dbcheck
		261
182	.endif	262	.endif
		263	# Install leaves existing conf files untouched. Respect this here!
183	for na in ${CONFFILES}; do \	264	for na in ${CONFFILES}; do \
184	${MV} ${STAGEDIR}${ETCDIR}/bacula-$$na.conf ${STAGEDIR}${ETCDIR}/bacula-$$na.conf.sample; \	265	if [ -f ${STAGEDIR}${ETCDIR}/bacula-$$na.conf.new ]; then \
		266	${ECHO_CMD} "etc/bacula/bacula-$$na.conf.new" >> ${TMPPLIST}; \
		267	elif [ -f ${STAGEDIR}${ETCDIR}/bacula-$$na.conf ]; then \
		268	${MV} ${STAGEDIR}${ETCDIR}/bacula-$$na.conf ${STAGEDIR}${ETCDIR}/bacula-$$na.conf.sample; \
		269	${ECHO_CMD} "etc/bacula/bacula-$$na.conf.sample" >> ${TMPPLIST}; \
		270	fi; \
185	done	271	done
		272
		273	# Add configuration files directory to packing list
		274	${ECHO_CMD} "@unexec ${RMDIR} %D/etc/bacula 2>/dev/null \|\| true" >> ${TMPPLIST}
		275
		276	${CHGRP} wheel ${STAGEDIR}${PREFIX}/etc
		277
186	.endif	278	.endif
187	.else	279	.else
188	.include "${MASTERDIR}/Makefile.common"	280	.include "${MASTERDIR}/Makefile.common"

Lines 1-28 Link Here

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

Lines 1-6 Link Here

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

Lines 1-21 Link Here

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

Lines 1-99 Link Here

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

Lines 2-20 Link Here

(-)bacula-server/pkg-plist (-7 / +7 lines)
2	@group bacula	2	@group bacula
3	@sample %%ETCDIR%%/bacula-dir.conf.sample	3	@sample %%ETCDIR%%/bacula-dir.conf.sample
4	@group wheel	4	@group wheel
5	@sample %%ETCDIR%%/bacula-sd.conf.sample	5	@sample %%ETCDIR%%/bacula-sd.conf.samplelib/libbaccats.so
6	lib/libbaccats.la	6	lib/libbaccats.la
7	lib/libbaccats.so	7	lib/libbaccats.so
8	lib/libbaccats.so.5	8	lib/libbaccats.so.%%MAJOR%%
9	lib/libbaccats.so.5.0.2
10	lib/libbaccats-%%DBTYPE%%.la	9	lib/libbaccats-%%DBTYPE%%.la
11	lib/libbaccats-%%DBTYPE%%.so	10	lib/libbaccats-%%DBTYPE%%.so
12	lib/libbaccats-%%DBTYPE%%.so.5	11	lib/libbaccats-%%DBTYPE%%.so.%%MAJOR%%
13	lib/libbaccats-%%DBTYPE%%.so.5.0.2
14	lib/libbacsql.la	12	lib/libbacsql.la
15	lib/libbacsql.so	13	lib/libbacsql.so
16	lib/libbacsql.so.5	14	lib/libbacsql.so.%%MAJOR%%
17	lib/libbacsql.so.5.0.2
18	man/man1/bacula-bwxconsole.1.gz	15	man/man1/bacula-bwxconsole.1.gz
19	man/man1/bacula-tray-monitor.1.gz	16	man/man1/bacula-tray-monitor.1.gz
20	man/man1/bsmtp.1.gz	17	man/man1/bsmtp.1.gz
Lines 38-44 Link Here
38	sbin/bls	35	sbin/bls
39	sbin/bregex	36	sbin/bregex
40	sbin/bscan	37	sbin/bscan
		38	@mode 755
41	sbin/bsmtp	39	sbin/bsmtp
		40	@mode
42	sbin/btape	41	sbin/btape
43	sbin/btraceback	42	sbin/btraceback
44	sbin/bwild	43	sbin/bwild
Lines 46-51 Link Here
46	@group bacula	45	@group bacula
47	sbin/dbcheck	46	sbin/dbcheck
48	@owner bacula	47	@owner bacula
		48	@group bacula
49	%%DATADIR%%/bacula	49	%%DATADIR%%/bacula
50	%%DATADIR%%/bacula-ctl-dir	50	%%DATADIR%%/bacula-ctl-dir
51	%%DATADIR%%/bacula-ctl-fd	51	%%DATADIR%%/bacula-ctl-fd

Lines 4-23 Link Here

(-)bacula-server/pkg-plist.client (-8 / +4 lines)
4	@group wheel	4	@group wheel
5	lib/libbac.la	5	lib/libbac.la
6	lib/libbac.so	6	lib/libbac.so
7	lib/libbac.so.5	7	lib/libbac.so.%%MAJOR%%
8	lib/libbac.so.5.0.2
9	lib/libbaccfg.la	8	lib/libbaccfg.la
10	lib/libbaccfg.so	9	lib/libbaccfg.so
11	lib/libbaccfg.so.5	10	lib/libbaccfg.so.%%MAJOR%%
12	lib/libbaccfg.so.5.0.2
13	lib/libbacfind.la	11	lib/libbacfind.la
14	lib/libbacfind.so	12	lib/libbacfind.so
15	lib/libbacfind.so.5	13	lib/libbacfind.so.%%MAJOR%%
16	lib/libbacfind.so.5.0.2
17	lib/libbacpy.la	14	lib/libbacpy.la
18	lib/libbacpy.so	15	lib/libbacpy.so
19	lib/libbacpy.so.5	16	lib/libbacpy.so.%%MAJOR%%
20	lib/libbacpy.so.5.0.2
21	lib/bpipe-fd.so	17	lib/bpipe-fd.so
22	man/man8/bacula-fd.8.gz	18	man/man8/bacula-fd.8.gz
23	man/man8/bconsole.8.gz	19	man/man8/bconsole.8.gz