Attachment #145366 for bug #191311

Lines 2-9 Link Here

(-)Makefile (-37 / +15 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-19 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
Lines 31-40 Link Here
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-172 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)
138	MP8+= bacula-fd.8 bconsole.8
139	.else
140	MP8+= bacula.8 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
142	MP1+= bsmtp.1 bacula-tray-monitor.1 bacula-bwxconsole.1
143	.endif
144
145	MAKE_ENV+= MAN8="${MP8}" MAN1="${MP1}"	135	MAKE_ENV+= MAN8="${MP8}" MAN1="${MP1}"
146		136
147	post-patch:	137	post-patch:
		138	@${ECHO_MSG} "@${REINPLACE_CMD}"
		139	@${ECHO_MSG} stuff: ${PORTVERSION:R:R}
		140	@${ECHO_MSG} stuff: "${WRKSRC}/src/cats/Makefile.in"
		141	@${REINPLACE_CMD} -e 's\|%%LIB_RELEASE%%\|${PORTVERSION:R:R}\|' ${WRKSRC}/src/cats/Makefile.in ${WRKSRC}/src/findlib/Makefile.in ${WRKSRC}/src/lib/Makefile.in
148	# This port does not install docs. See bacula-docs for that	142	# This port does not install docs. See bacula-docs for that
149	${REINPLACE_CMD} -e '/docdir/d' ${WRKSRC}/Makefile.in	143	${REINPLACE_CMD} -e '/docdir/d' ${WRKSRC}/Makefile.in
150	# Change $(ECHO) to echo in some Makefile.in files	144	# Change $(ECHO) to echo in some Makefile.in files
151	@${REINPLACE_CMD} -e 's\|$$(ECHO)\|echo\|g' ${WRKSRC}/src/filed/Makefile.in \	145	@${REINPLACE_CMD} -e 's\|$$(ECHO)\|echo\|g' ${WRKSRC}/src/filed/Makefile.in ${WRKSRC}/src/console/Makefile.in
152	${WRKSRC}/src/console/Makefile.in
153	# Default bconsole.conf is in ${ETCDIR}	146	# Default bconsole.conf is in ${ETCDIR}
154	@${REINPLACE_CMD} -e 's\|./bconsole.conf\|${ETCDIR}/bconsole.conf\|g' ${WRKSRC}/src/console/console.c	147	@${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
156	.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
160	${REINPLACE_CMD} -e 's\|$.*$${MKDIR} $${DESTDIR}$${scriptdir}$\|#\1\|g' ${WRKSRC}/Makefile.in
161	.else
162	# In server port don't install filed
163	@${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
165	@${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
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' \
168	${WRKSRC}/src/tools/bpluginfo.c
169	.endif
170		148
171	pre-install:	149	pre-install:
172	${MKDIR} ${STAGEDIR}${BACULA_DIR}	150	${MKDIR} ${STAGEDIR}${BACULA_DIR}
Lines 174-183 Link Here
174	.if !target(post-install)	152	.if !target(post-install)
175	post-install:	153	post-install:
176	.if defined(WITH_CLIENT_ONLY)	154	.if defined(WITH_CLIENT_ONLY)
177	${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${STAGEDIR}${ETCDIR}/bconsole.conf.sample	155	${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${STAGEDIR}${ETCDIR}/bconsole.conf.sample;
178	.else	156	.else
179	${INSTALL_SCRIPT} ${FILESDIR}/chio-bacula ${STAGEDIR}${PREFIX}/sbin	157	${INSTALL_SCRIPT} ${FILESDIR}/chio-bacula ${STAGEDIR}${PREFIX}/sbin
180	${INSTALL_DATA} ${FILESDIR}/bacula-barcodes ${STAGEDIR}${ETCDIR}/bacula-barcodes.sample	158	${INSTALL_DATA} ${FILESDIR}/bacula-barcodes ${STAGEDIR}${ETCDIR}/bacula-barcodes.samples
181	${CHMOD} o+x ${STAGEDIR}${PREFIX}/sbin/bsmtp	159	${CHMOD} o+x ${STAGEDIR}${PREFIX}/sbin/bsmtp
182	.endif	160	.endif
183	for na in ${CONFFILES}; do \	161	for na in ${CONFFILES}; do \

Lines 1-27 Link Here

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

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




 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 %%LIB_RELEASE%%
 
 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 %%LIB_RELEASE%%
 
 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 %%LIB_RELEASE%% \
 							   -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 %%LIB_RELEASE%% \
 							   -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 %%LIB_RELEASE%% \
 							   -soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(SQLITE_LIBS)
 
 #libbaccats-ingres.la: Makefile $(INGRES_LOBJS)

 	    $(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@ %%LIB_RELEASE%% $(DESTDIR)$(libdir)
 
 libtool-uninstall:
 	$(LIBTOOL_UNINSTALL) $(RMF) $(DESTDIR)$(libdir)/libbacsql.la




--- src/cats/install-default-backend.in	2014-06-03 08:28:41.000000000 +0000
+++ src/cats/install-default-backend.in	2014-08-03 19:20:21.085513249 +0000
@@ -38,11 +38,15 @@
    exit 1
 fi
 
-if [ -f ${install_dir}/libbaccats-${default_backend}-${library_version}${SHLIB_EXT} ]; then
+echo STUFF
+echo "CHECKING FOR ${install_dir}/libbaccats-${default_backend}${SHLIB_EXT}.${library_version}"
+echo THINGS
+
+if [ -f ${install_dir}/libbaccats-${default_backend}${SHLIB_EXT}.${library_version} ]; then
    #
    # Create a default catalog library pointing to one of the shared libs.

 
    #
    # Create a relative symlink to the default backend
@@ -50,7 +54,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




--- src/dird/Makefile.in	2014-06-03 08:28:41.000000000 +0000
+++ src/dird/Makefile.in	2014-07-31 15:30:20.250513717 +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 $@
--- src/dird/Makefile.in	2014-06-03 08:28:41.000000000 +0000
+++ src/dird/Makefile.in	2014-07-31 15:30:20.250513717 +0000
@@ -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

(-)files/patch-src__filed__Makefile.in (-6 / +6 lines)
1	--- src/filed/Makefile.in 2012-06-28 09:52:03.000000000 -0500	1	--- 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	+++ src/filed/Makefile.in 2014-07-31 15:32:42.943996352 +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

Lines 5-11 Link Here

(-)files/patch-src__findlib__Makefile.in (-1 / +1 lines)
5	libbacfind.la: Makefile $(LIBBACFIND_LOBJS)	5	libbacfind.la: Makefile $(LIBBACFIND_LOBJS)
6	@echo "Making $@ ..."	6	@echo "Making $@ ..."
7	- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACFIND_LT_RELEASE)	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)	8	+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -version-info %%LIB_RELEASE%%
9		9
10	Makefile: $(srcdir)/Makefile.in $(topdir)/config.status	10	Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
11	cd $(topdir) \	11	cd $(topdir) \




 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 %%LIB_RELEASE%% $(WRAPLIBS) $(CAP_LIBS) $(ZLIBS) $(OPENSSL_LIBS) $(LIBS) $(DLLIBS)
 
 libbaccfg.a: $(LIBBACCFG_OBJS) 
 	@echo "Making $@ ..."

 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 %%LIB_RELEASE%% $(OPENSSL_LIBS) $(LIBS)
 
 libbacpy.a: $(LIBBACPY_OBJS) 
 	@echo "Making $@ ..."
@@ -242,7 +242,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); do \
 	    $(CXX) -S -M -MT `basename $$src .c`$(DEFAULT_OBJECT_TYPE) $(CPPFLAGS) $(XINC) -I$(srcdir) -I$(basedir) $$src >> Makefile; \
 	done




--- src/stored/Makefile.in	2011-11-26 09:08:12.000000000 -0500
+++ src/stored/Makefile.in	2011-12-02 13:20:38.000000000 -0500
@@ -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 $@
@@ -111,7 +111,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) $(LZO_LIBS) \
 	   -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 bscan.o: bscan.c

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




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




#!/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/,/# Bacule 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




#!/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




@sample %%ETCDIR%%/bacula-barcodes.sample
@group bacula
@sample %%ETCDIR%%/bacula-dir.conf.sample
@group wheel
@sample %%ETCDIR%%/bacula-sd.conf.sample
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
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
@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/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




@sample %%ETCDIR%%/bacula-fd.conf.sample
@group bacula
@sample %%ETCDIR%%/bconsole.conf.sample
@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.5
lib/libbacpy.so.5.0.2
lib/bpipe-fd.so
man/man8/bacula-fd.8.gz
man/man8/bconsole.8.gz
sbin/bacula-fd
@group bacula
sbin/bconsole
@group wheel
@exec mkdir -p %%BACULA_DIR%%
@dirrmtry %%BACULA_DIR%%
@dirrmtry share/bacula
@dirrmtry %%ETCDIR%%

Return to bug 191311

Lines 5-33 Link Here

(-)files/patch-src__cats__Makefile.in (-6 / +6 lines)
5	libbacsql.la: Makefile $(LIBBACSQL_LOBJS)	5	libbacsql.la: Makefile $(LIBBACSQL_LOBJS)
6	@echo "Making $@ ..."	6	@echo "Making $@ ..."
7	- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACSQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACSQL_LT_RELEASE) $(DB_LIBS)	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)	8	+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACSQL_LOBJS) -export-dynamic -rpath $(libdir) -version-info %%LIB_RELEASE%%
9		9
10	libbaccats.la: Makefile cats_dummy.lo	10	libbaccats.la: Makefile cats_dummy.lo
11	@echo "Making $@ ..."	11	@echo "Making $@ ..."
12	- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ cats_dummy.lo -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE)	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)	13	+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ cats_dummy.lo -export-dynamic -rpath $(libdir) -version-info %%LIB_RELEASE%%
14		14
15	libbaccats-mysql.la: Makefile $(MYSQL_LOBJS)	15	libbaccats-mysql.la: Makefile $(MYSQL_LOBJS)
16	@echo "Making $@ ..."	16	@echo "Making $@ ..."
17	- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(MYSQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \	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) \	18	+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(MYSQL_LOBJS) -export-dynamic -rpath $(libdir) -version-info %%LIB_RELEASE%% \
19	-soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(MYSQL_LIBS)	19	-soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(MYSQL_LIBS)
20		20
21	libbaccats-postgresql.la: Makefile $(POSTGRESQL_LOBJS)	21	libbaccats-postgresql.la: Makefile $(POSTGRESQL_LOBJS)
22	@echo "Making $@ ..."	22	@echo "Making $@ ..."
23	- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(POSTGRESQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \	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) \	24	+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(POSTGRESQL_LOBJS) -export-dynamic -rpath $(libdir) -version-info %%LIB_RELEASE%% \
25	-soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(POSTGRESQL_LIBS)	25	-soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(POSTGRESQL_LIBS)
26		26
27	libbaccats-sqlite3.la: Makefile $(SQLITE_LOBJS)	27	libbaccats-sqlite3.la: Makefile $(SQLITE_LOBJS)
28	@echo "Making $@ ..."	28	@echo "Making $@ ..."
29	- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(SQLITE_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \	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) \	30	+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(SQLITE_LOBJS) -export-dynamic -rpath $(libdir) -version-info %%LIB_RELEASE%% \
31	-soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(SQLITE_LIBS)	31	-soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(SQLITE_LIBS)
32		32
33	#libbaccats-ingres.la: Makefile $(INGRES_LOBJS)	33	#libbaccats-ingres.la: Makefile $(INGRES_LOBJS)
Lines 36-42 Link Here
36	$(LIBTOOL_INSTALL_FINISH) $(INSTALL_LIB) libbaccats-$${db_type}.la $(DESTDIR)$(libdir); \	36	$(LIBTOOL_INSTALL_FINISH) $(INSTALL_LIB) libbaccats-$${db_type}.la $(DESTDIR)$(libdir); \
37	done	37	done
38	- ./install-default-backend @DEFAULT_DB_TYPE@ $(LIBBACCATS_LT_RELEASE) $(DESTDIR)$(libdir)	38	- ./install-default-backend @DEFAULT_DB_TYPE@ $(LIBBACCATS_LT_RELEASE) $(DESTDIR)$(libdir)
39	+ ./install-default-backend @DEFAULT_DB_TYPE@ 5 $(DESTDIR)$(libdir)	39	+ ./install-default-backend @DEFAULT_DB_TYPE@ %%LIB_RELEASE%% $(DESTDIR)$(libdir)
40		40
41	libtool-uninstall:	41	libtool-uninstall:
42	$(LIBTOOL_UNINSTALL) $(RMF) $(DESTDIR)$(libdir)/libbacsql.la	42	$(LIBTOOL_UNINSTALL) $(RMF) $(DESTDIR)$(libdir)/libbacsql.la

Lines 1-10 Link Here

(-)files/patch-src__cats__install-default-backend.in (-6 / +10 lines)
1	--- src/cats/install-default-backend.in 2012-03-31 23:39:38.000000000 -0500	1	--- src/cats/install-default-backend.in 2014-06-03 08:28:41.000000000 +0000
2	+++ src/cats/install-default-backend.in 2012-03-31 23:40:56.000000000 -0500	2	+++ src/cats/install-default-backend.in 2014-08-03 19:20:21.085513249 +0000
3	@@ -22,11 +22,11 @@	3	@@ -38,11 +38,15 @@
4	exit 1	4	exit 1
5	fi	5	fi
6		6
7	-if [ -f ${install_dir}/libbaccats-${default_backend}-${library_version}${SHLIB_EXT} ]; then	7	-if [ -f ${install_dir}/libbaccats-${default_backend}-${library_version}${SHLIB_EXT} ]; then
		8	+echo STUFF
		9	+echo "CHECKING FOR ${install_dir}/libbaccats-${default_backend}${SHLIB_EXT}.${library_version}"
		10	+echo THINGS
		11	+
8	+if [ -f ${install_dir}/libbaccats-${default_backend}${SHLIB_EXT}.${library_version} ]; then	12	+if [ -f ${install_dir}/libbaccats-${default_backend}${SHLIB_EXT}.${library_version} ]; then
9	#	13	#
10	# Create a default catalog library pointing to one of the shared libs.	14	# Create a default catalog library pointing to one of the shared libs.
Lines 14-25 Link Here
14		18
15	#	19	#
16	# Create a relative symlink to the default backend	20	# Create a relative symlink to the default backend
17	@@ -34,7 +34,7 @@	21	@@ -50,7 +54,7 @@
18	# always work.	22	# always work.
19	#	23	#
20	ln -s libbaccats-${default_backend}${SHLIB_EXT} \	24	ln -s libbaccats-${default_backend}${SHLIB_EXT} \
21	- ${install_dir}/libbaccats-${library_version}${SHLIB_EXT}	25	- ${install_dir}/libbaccats-${library_version}${SHLIB_EXT}
22	+ ${install_dir}/libbaccats${SHLIB_EXT}.${library_version}	26	+ ${install_dir}/libbaccats${SHLIB_EXT}.${library_version}
23	fi	27	fi
24		28
25	exit 0	29	exit 0

Lines 1-28 Link Here

(-)files/patch-src__dird__Makefile.in (-9 / +11 lines)
1	--- src/dird/Makefile.in 2011-11-26 09:08:12.000000000 -0500	1	--- 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	+++ src/dird/Makefile.in 2014-07-31 15:30:20.250513717 +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	--- src/dird/Makefile.in 2014-06-03 08:28:41.000000000 +0000
		21	+++ src/dird/Makefile.in 2014-07-31 15:30:20.250513717 +0000
		22	@@ -137,7 +137,7 @@
21	depend:	23	depend:
22	@$(MV) Makefile Makefile.bak	24	@$(MV) Makefile Makefile.bak
23	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile	25	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
24	- @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile	26	- @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
25	+ @echo "# DO NOT DELETE: nice dependency list follows" >> Makefile	27	+ @echo "# DO NOT DELETE: nice dependency list follows" >> Makefile
26	@$(CXX) -S -M $(CPPFLAGS) $(XINC) $(PYTHON_INC) -I$(srcdir) -I$(basedir) *.c >> Makefile	28	@$(CXX) -S -M $(CPPFLAGS) $(XINC) -I$(srcdir) -I$(basedir) *.c >> Makefile
27	@if test -f Makefile ; then \	29	@if test -f Makefile ; then \
28	$(RMF) Makefile.bak; \	30	$(RMF) Makefile.bak; \

Lines 5-11 Link Here

(-)files/patch-src__lib__Makefile.in (-14 / +5 lines)
5	libbac.la: Makefile $(LIBBAC_LOBJS)	5	libbac.la: Makefile $(LIBBAC_LOBJS)
6	@echo "Making $@ ..."	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)	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)	8	+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -version-info %%LIB_RELEASE%% $(WRAPLIBS) $(CAP_LIBS) $(ZLIBS) $(OPENSSL_LIBS) $(LIBS) $(DLLIBS)
9		9
10	libbaccfg.a: $(LIBBACCFG_OBJS)	10	libbaccfg.a: $(LIBBACCFG_OBJS)
11	@echo "Making $@ ..."	11	@echo "Making $@ ..."
Lines 14-38 Link Here
14	libbaccfg.la: Makefile $(LIBBACCFG_LOBJS)	14	libbaccfg.la: Makefile $(LIBBACCFG_LOBJS)
15	@echo "Making $@ ..."	15	@echo "Making $@ ..."
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 %%LIB_RELEASE%% $(OPENSSL_LIBS) $(LIBS)
18		18
19	libbacpy.a: $(LIBBACPY_OBJS)	19	libbacpy.a: $(LIBBACPY_OBJS)
20	@echo "Making $@ ..."	20	@echo "Making $@ ..."
21	@@ -138,7 +138,7 @@	21	@@ -242,7 +242,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:	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	+ @echo "# DO NOT DELETE: nice dependency list follows" >> Makefile
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-18 Link Here

(-)files/patch-src__stored__Makefile.in (-9 / +9 lines)
1	--- src/stored/Makefile.in 2011-11-26 09:08:12.000000000 -0500	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	2	+++ src/stored/Makefile.in 2011-12-02 13:20:38.000000000 -0500
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	@@ -111,7 +111,7 @@
Lines 37-44 Link Here
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) $(LZO_LIBS) \
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
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 88-99 Link Here

(-)files/patch-src__tools__Makefile.in (-2 / +2 lines)
88		88
89	Makefile: $(srcdir)/Makefile.in $(topdir)/config.status	89	Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
90	cd $(topdir) \	90	cd $(topdir) \
91	@@ -184,7 +184,7 @@	91	@@ -193,7 +193,7 @@
92	depend:	92	depend:
93	@$(MV) Makefile Makefile.bak	93	@$(MV) Makefile Makefile.bak
94	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile	94	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
95	- @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile	95	- @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
96	+ @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	97	@$(CXX) -S -M $(CPPFLAGS) -I$(srcdir) -I$(basedir) *.c >> Makefile
98	@if test -f Makefile ; then \	98	@if test -f Makefile ; then \
99	$(RMF) Makefile.bak; \	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/,/# Bacule 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 1-35 Link Here

(-)pkg-plist (-29 / +21 lines)
1	@sample %%ETCDIR%%/bacula-barcodes.sample
2	@group bacula
3	@sample %%ETCDIR%%/bacula-dir.conf.sample
4	@group wheel
5	@sample %%ETCDIR%%/bacula-sd.conf.sample
6	lib/libbaccats.la	1	lib/libbaccats.la
7	lib/libbaccats.so	2	lib/libbaccats.so
8	lib/libbaccats.so.5	3	lib/libbaccats.so.%%MAJOR%%
9	lib/libbaccats.so.5.0.2
10	lib/libbaccats-%%DBTYPE%%.la	4	lib/libbaccats-%%DBTYPE%%.la
11	lib/libbaccats-%%DBTYPE%%.so	5	lib/libbaccats-%%DBTYPE%%.so
12	lib/libbaccats-%%DBTYPE%%.so.5	6	lib/libbaccats-%%DBTYPE%%.so.%%MAJOR%%
13	lib/libbaccats-%%DBTYPE%%.so.5.0.2
14	lib/libbacsql.la	7	lib/libbacsql.la
15	lib/libbacsql.so	8	lib/libbacsql.so
16	lib/libbacsql.so.5	9	lib/libbacsql.so.%%MAJOR%%
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
48	@owner bacula	26	@owner bacula
		27	@group bacula
49	%%DATADIR%%/bacula	28	%%DATADIR%%/bacula
50	%%DATADIR%%/bacula-ctl-dir	29	%%DATADIR%%/bacula-ctl-dir
51	%%DATADIR%%/bacula-ctl-fd	30	%%DATADIR%%/bacula-ctl-fd
Lines 75-79 Link Here
75	%%DATADIR%%/query.sql	54	%%DATADIR%%/query.sql
76	%%DATADIR%%/update_bacula_tables	55	%%DATADIR%%/update_bacula_tables
77	%%DATADIR%%/update_%%DBTYPE%%_tables	56	%%DATADIR%%/update_%%DBTYPE%%_tables
78	@owner root	57	@owner
79	@group wheel	58	@group
		59	man/man1/bsmtp.1.gz
		60	man/man8/bacula-dir.8.gz
		61	man/man8/bacula-sd.8.gz
		62	man/man8/bacula.8.gz
		63	man/man8/bcopy.8.gz
		64	man/man8/bextract.8.gz
		65	man/man8/bls.8.gz
		66	man/man8/bregex.8.gz
		67	man/man8/bscan.8.gz
		68	man/man8/btape.8.gz
		69	man/man8/btraceback.8.gz
		70	man/man8/bwild.8.gz
		71	man/man8/dbcheck.8.gz

Lines 1-31 Link Here

(-)pkg-plist.client (-19 / +3 lines)
1	@sample %%ETCDIR%%/bacula-fd.conf.sample
2	@group bacula
3	@sample %%ETCDIR%%/bconsole.conf.sample
4	@group wheel
5	lib/libbac.la	1	lib/libbac.la
6	lib/libbac.so	2	lib/libbac.so
7	lib/libbac.so.5	3	lib/libbac.so.%%MAJOR%%
8	lib/libbac.so.5.0.2
9	lib/libbaccfg.la	4	lib/libbaccfg.la
10	lib/libbaccfg.so	5	lib/libbaccfg.so
11	lib/libbaccfg.so.5	6	lib/libbaccfg.so.%%MAJOR%%
12	lib/libbaccfg.so.5.0.2
13	lib/libbacfind.la	7	lib/libbacfind.la
14	lib/libbacfind.so	8	lib/libbacfind.so
15	lib/libbacfind.so.5	9	lib/libbacfind.so.%%MAJOR%%
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
23	man/man8/bconsole.8.gz
24	sbin/bacula-fd	11	sbin/bacula-fd
25	@group bacula
26	sbin/bconsole	12	sbin/bconsole
27	@group wheel
28	@exec mkdir -p %%BACULA_DIR%%	13	@exec mkdir -p %%BACULA_DIR%%
29	@dirrmtry %%BACULA_DIR%%	14	@dirrmtry %%BACULA_DIR%%
30	@dirrmtry share/bacula	15	@dirrmtry share/bacula
31	@dirrmtry %%ETCDIR%%