Attachment #144070 for bug #191311

Lines 14-18 Link Here

(-)bacula-client/Makefile (-1 lines)
14	OPTIONS_DEFINE= NLS OPENSSL PYTHON	14	OPTIONS_DEFINE= NLS OPENSSL PYTHON
15	OPTIONS_DEFAULT=NLS OPENSSL	15	OPTIONS_DEFAULT=NLS OPENSSL
16		16
17	NO_STAGE= yes
18	.include "${MASTERDIR}/Makefile"	17	.include "${MASTERDIR}/Makefile"

Lines 17-21 Link Here

(-)bacula-client-static/Makefile (-1 lines)
17	--disable-build-dird \	17	--disable-build-dird \
18	--disable-build-stored	18	--disable-build-stored
19		19
20	NO_STAGE= yes
21	.include "${MASTERDIR}/Makefile"	20	.include "${MASTERDIR}/Makefile"

Lines 2-9 Link Here

(-)bacula-server/Makefile (-61 / +54 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?= 3	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	LIB_DEPENDS+= lzo2:${PORTSDIR}/archivers/lzo2	15	CONFLICTS_BUILD= bacula-*-5.2.12_3
16		16
		17	GNU_CONFIGURE= yes
		18
		19	LIB_DEPENDS= lzo2.so:${PORTSDIR}/archivers/lzo2
		20
17	UNIQUENAME?= ${PORTNAME}${PKGNAMESUFFIX}	21	UNIQUENAME?= ${PORTNAME}${PKGNAMESUFFIX}
18		22
19	USERS= bacula	23	USERS= bacula
Lines 24-37 Link Here
24	GNU_CONFIGURE= yes	28	GNU_CONFIGURE= yes
25	USE_LDCONFIG= yes	29	USE_LDCONFIG= yes
26		30
		31	USES= libtool
		32
27	CPPFLAGS+= -I/usr/include/readline -I${LOCALBASE}/include	33	CPPFLAGS+= -I/usr/include/readline -I${LOCALBASE}/include
28	LDFLAGS+= -L${LOCALBASE}/lib	34	#LDFLAGS+= -L${LOCALBASE}/lib
29		35
30	OPTIONS_DEFINE?= SQLITE3 MYSQL PGSQL MTX PYTHON NLS OPENSSL	36	OPTIONS_DEFINE?= SQLITE3 MYSQL PGSQL MTX PYTHON NLS OPENSSL
31	OPTIONS_DEFAULT?= NLS OPENSSL PGSQL	37	OPTIONS_DEFAULT?= NLS OPENSSL PGSQL
32	MTX_DESC= Install mtx for control of autochanger devices	38	MTX_DESC= Install mtx for control of autochanger devices
33		39
34	NO_STAGE= yes
35	.include <bsd.port.options.mk>	40	.include <bsd.port.options.mk>
36		41
37	.if ${PKGNAMESUFFIX} == "-client" \|\| ${PKGNAMESUFFIX} == "-server" #Till end of the file	42	.if ${PKGNAMESUFFIX} == "-client" \|\| ${PKGNAMESUFFIX} == "-server" #Till end of the file
Lines 42-48 Link Here
42	.endif	47	.endif
43		48
44	.if !defined(WITH_CLIENT_ONLY)	49	.if !defined(WITH_CLIENT_ONLY)
45	LIB_DEPENDS+= bac:${PORTSDIR}/sysutils/bacula-client	50	LIB_DEPENDS= libbac.so:${PORTSDIR}/sysutils/bacula-client
46	USE_RC_SUBR?= bacula-dir bacula-sd	51	USE_RC_SUBR?= bacula-dir bacula-sd
47	.endif	52	.endif
48		53
Lines 52-58 Link Here
52	SUB_FILES+= pkg-install.server pkg-deinstall.server pkg-message.server	57	SUB_FILES+= pkg-install.server pkg-deinstall.server pkg-message.server
53	.endif	58	.endif
54		59
55	MANCOMPRESSED= yes
56	CONFIGURE_ARGS+=--with-tcp-wrappers=/usr/lib \	60	CONFIGURE_ARGS+=--with-tcp-wrappers=/usr/lib \
57	--enable-smartalloc \	61	--enable-smartalloc \
58	--sysconfdir=${ETCDIR} \	62	--sysconfdir=${ETCDIR} \
Lines 112-119 Link Here
112	CONFFILES= fd	116	CONFFILES= fd
113	CONFIGURE_ARGS+= --enable-client-only	117	CONFIGURE_ARGS+= --enable-client-only
114		118
115	PKGDEINSTALL= ${FILESDIR}/pkg-deinstall.client	119	PKGDEINSTALL= ${STAGEDIR}${FILESDIR}/pkg-deinstall.client
116	PKGINSTALL= ${FILESDIR}/pkg-install.client	120	PKGINSTALL= ${STAGEDIR}${FILESDIR}/pkg-install.client
117	.else	121	.else
118	# Server only Options	122	# Server only Options
119	CONFFILES= sd dir	123	CONFFILES= sd dir
Lines 125-131 Link Here
125	SUB_LIST+= REQ_MYSQL=mysql REQ_PGSQL=""	129	SUB_LIST+= REQ_MYSQL=mysql REQ_PGSQL=""
126	.elif ${PORT_OPTIONS:MSQLITE3}	130	.elif ${PORT_OPTIONS:MSQLITE3}
127	CONFIGURE_ARGS+= --with-sqlite3=yes	131	CONFIGURE_ARGS+= --with-sqlite3=yes
128	LIB_DEPENDS+= sqlite3:${PORTSDIR}/databases/sqlite3	132	LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3
129	DBTYPE= sqlite3	133	DBTYPE= sqlite3
130	.else	134	.else
131	USE_PGSQL= yes	135	USE_PGSQL= yes
Lines 134-140 Link Here
134	SUB_LIST+= REQ_MYSQL="" REQ_PGSQL=postgresql	138	SUB_LIST+= REQ_MYSQL="" REQ_PGSQL=postgresql
135	.endif	139	.endif
136	PLIST_SUB+= DBTYPE=${DBTYPE}	140	PLIST_SUB+= DBTYPE=${DBTYPE}
137	# Install mtx	141	## Install mtx
138	.if ${PORT_OPTIONS:MMTX}	142	.if ${PORT_OPTIONS:MMTX}
139	RUN_DEPENDS+= ${LOCALBASE}/sbin/mtx:${PORTSDIR}/misc/mtx	143	RUN_DEPENDS+= ${LOCALBASE}/sbin/mtx:${PORTSDIR}/misc/mtx
140	.endif	144	.endif
Lines 147-160 Link Here
147	CONFIGURE_ARGS+= --with-openssl="no"	151	CONFIGURE_ARGS+= --with-openssl="no"
148	.endif	152	.endif
149		153
150	.if defined(WITH_CLIENT_ONLY)
151	MAN8+= bacula-fd.8 bconsole.8
152	.else
153	MAN8+= bacula.8 bacula-dir.8 bacula-sd.8 bcopy.8 bextract.8 bls.8 bscan.8 \
154	btape.8 btraceback.8 dbcheck.8 bwild.8 bregex.8
155	MAN1+= bsmtp.1 bacula-tray-monitor.1 bacula-bwxconsole.1
156	.endif
157
158	MAKE_ENV+= MAN8="${MAN8}" MAN1="${MAN1}"	154	MAKE_ENV+= MAN8="${MAN8}" MAN1="${MAN1}"
159		155
160	pre-everything::	156	pre-everything::
Lines 184-217 Link Here
184	@${REINPLACE_CMD} -e 's\|$$(ECHO)\|echo\|g' ${WRKSRC}/src/filed/Makefile.in \	180	@${REINPLACE_CMD} -e 's\|$$(ECHO)\|echo\|g' ${WRKSRC}/src/filed/Makefile.in \
185	${WRKSRC}/src/console/Makefile.in	181	${WRKSRC}/src/console/Makefile.in
186	# Default bconsole.conf is in ${ETCDIR}	182	# Default bconsole.conf is in ${ETCDIR}
187	@${REINPLACE_CMD} -e 's\|./bconsole.conf\|${ETCDIR}/bconsole.conf\|g' ${WRKSRC}/src/console/console.c	183	@${REINPLACE_CMD} -e 's\|./bconsole.conf\|${STAGEDIR}${ETCDIR}/bconsole.conf\|g' ${WRKSRC}/src/console/console.c
188	@${REINPLACE_CMD} -e 's\|^MAN8 =\|MAN8 ?=\|g' -e 's\|^MAN1 =\|MAN1 ?=\|g' ${WRKSRC}/manpages/Makefile.in	184	# @${REINPLACE_CMD} -e 's\|^MAN8 =\|MAN8 ?=\|g' -e 's\|^MAN1 =\|MAN1 ?=\|g' ${WRKSRC}/manpages/Makefile.in
189	.if defined(WITH_CLIENT_ONLY)	185	#.if defined(WITH_CLIENT_ONLY)
190	# In client port only install startup script out of script dir (see below post-install)	186	## In client port only install startup script out of script dir (see below post-install)
191	# Dont mkdir ${PREFIX}/share/bacula cause it's empty	187	## Dont mkdir ${PREFIX}/share/bacula cause it's empty
192	@${REINPLACE_CMD} -e 's\|^$fd_subdirs = .$scripts$.$\|\1\2\|g' ${WRKSRC}/Makefile.in	188	# @${REINPLACE_CMD} -e 's\|^$fd_subdirs = .$scripts$.$\|\1\2\|g' ${WRKSRC}/Makefile.in
193	${REINPLACE_CMD} -e 's\|$.*$${MKDIR} $${DESTDIR}$${scriptdir}$\|#\1\|g' ${WRKSRC}/Makefile.in	189	# ${REINPLACE_CMD} -e 's\|$.*$${MKDIR} $${DESTDIR}$${scriptdir}$\|#\1\|g' ${WRKSRC}/Makefile.in
194	.else	190	#.else
195	# In server port don't install filed	191	## In server port don't install filed
196	@${REINPLACE_CMD} -e '/^fd_subdirs = /s\|src/filed\|\|' -e 's\|src/console\|\|' \	192	# @${REINPLACE_CMD} -e '/^fd_subdirs = /s\|src/filed\|\|' -e 's\|src/console\|\|' \
197	-e 's\|src/lib\|\|' -e 's\|src/findlib\|\|' -e 's\|@FD_PLUGIN_DIR@\|\|' ${WRKSRC}/Makefile.in	193	# -e 's\|src/lib\|\|' -e 's\|src/findlib\|\|' -e 's\|@FD_PLUGIN_DIR@\|\|' ${WRKSRC}/Makefile.in
198	@${REINPLACE_CMD} -e 's\|../lib/\|$$(LOCALBASE)/lib/\|g' -e 's\|../findlib/\|$$(LOCALBASE)/lib/\|g' ${WRKSRC}/src/dird/Makefile.in \	194	# @${REINPLACE_CMD} -e 's\|../lib/\|$$(LOCALBASE)/lib/\|g' -e 's\|../findlib/\|$$(LOCALBASE)/lib/\|g' ${WRKSRC}/src/dird/Makefile.in \
199	${WRKSRC}/src/stored/Makefile.in ${WRKSRC}/src/tools/Makefile.in	195	# ${WRKSRC}/src/stored/Makefile.in ${WRKSRC}/src/tools/Makefile.in
200	@${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' \	196	# @${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' \
201	${WRKSRC}/src/tools/bpluginfo.c	197	# ${WRKSRC}/src/tools/bpluginfo.c
202	.endif	198	#.endif
203		199
204	.if !target(pre-install)	200	.if !target(pre-install)
205	pre-install:	201	pre-install:
206	if [ ! -d "${BACULA_DIR}" ]; then \	202	if [ ! -d "${STAGEDIR}${BACULA_DIR}" ]; then \
207	${ECHO_CMD} "creating ${BACULA_DIR}" ; \	203	${ECHO_CMD} "creating ${STAGEDIR}${BACULA_DIR}" ; \
208	${MKDIR} ${BACULA_DIR}; \	204	${MKDIR} ${STAGEDIR}${BACULA_DIR}; \
209	else \	205	else \
210	${ECHO_CMD} "${BACULA_DIR} already exists"; \	206	${ECHO_CMD} "${STAGEDIR}${BACULA_DIR} already exists"; \
211	fi	207	fi
212		208
213	# Extend /etc/services and install UID/GID	209	# Extend /etc/services and install UID/GID
214	@ ${SETENV} PKG_PREFIX=${PREFIX} \	210	@ ${SETENV} PKG_PREFIX=${STAGEDIR}${PREFIX} \
215	${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL	211	${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
216	.endif	212	.endif
217		213
Lines 219-270 Link Here
219	post-install:	215	post-install:
220	.if defined(WITH_CLIENT_ONLY)	216	.if defined(WITH_CLIENT_ONLY)
221	# Extend only /etc/services	217	# Extend only /etc/services
222	@ ${SETENV} PKG_PREFIX=${PREFIX} \	218	@ ${SETENV} PKG_PREFIX=${STAGEDIR}${PREFIX} \
223	${SH} ${PKGINSTALL} ${PORTNAME}	219	${SH} ${PKGINSTALL} ${PORTNAME}
224	# Console stuff	220	# Console stuff
225	if [ -f ${ETCDIR}/bconsole.conf.new ]; then \	221	if [ -f ${STAGEDIR}${ETCDIR}/bconsole.conf.new ]; then \
226	${ECHO_CMD} "etc/bconsole.conf.new" >> ${TMPPLIST}; \	222	${ECHO_CMD} "etc/bconsole.conf.new" >> ${TMPPLIST}; \
227	${CHGRP} bacula ${ETCDIR}/bconsole.conf.new; \	223	${CHGRP} bacula ${STAGEDIR}${ETCDIR}/bconsole.conf.new; \
228	elif [ -f ${ETCDIR}/bconsole.conf ]; then \	224	elif [ -f ${STAGEDIR}${ETCDIR}/bconsole.conf ]; then \
229	${MV} ${ETCDIR}/bconsole.conf ${ETCDIR}/bconsole.conf.sample; \	225	${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${STAGEDIR}${ETCDIR}/bconsole.conf.sample; \
230	${CHGRP} bacula ${ETCDIR}/bconsole.conf.sample; \	226	${CHGRP} bacula ${STAGEDIR}${ETCDIR}/bconsole.conf.sample; \
231	${ECHO_CMD} "etc/bacula/bconsole.conf.sample" >> ${TMPPLIST}; \	227	${ECHO_CMD} "etc/bacula/bconsole.conf.sample" >> ${TMPPLIST}; \
232	fi	228	fi
233		229
234	# ensure that users in the bacula group can run bconsole	230	# ensure that users in the bacula group can run bconsole
235	${CHGRP} bacula ${PREFIX}/sbin/bconsole	231	${CHGRP} bacula ${STAGEDIR}${PREFIX}/sbin/bconsole
236	.else	232	.else
237	# Install config files and preserve existing ones	233	# Install config files and preserve existing ones
238	${INSTALL_SCRIPT} ${FILESDIR}/chio-bacula ${PREFIX}/sbin	234	${INSTALL_SCRIPT} ${FILESDIR}/chio-bacula ${STAGEDIR}${PREFIX}/sbin
239	if [ -f ${ETCDIR}/bacula-barcodes ]; then \	235	if [ -f ${ETCDIR}/bacula-barcodes ]; then \
240	${INSTALL_DATA} ${FILESDIR}/bacula-barcodes ${ETCDIR}/bacula-barcodes.new ; \	236	${INSTALL_DATA} ${FILESDIR}/bacula-barcodes ${ETCDIR}/bacula-barcodes.new ; \
241	${ECHO_CMD} "etc/bacula/bacula-barcodes.new" >> ${TMPPLIST}; \	237	${ECHO_CMD} "etc/bacula/bacula-barcodes.new" >> ${TMPPLIST}; \
242	else \	238	else \
243	${INSTALL_DATA} ${FILESDIR}/bacula-barcodes ${ETCDIR}/bacula-barcodes.samples ; \	239	${INSTALL_DATA} ${FILESDIR}/bacula-barcodes ${STAGEDIR}${ETCDIR}/bacula-barcodes.samples ; \
244	${ECHO_CMD} "etc/bacula/bacula-barcodes.samples" >> ${TMPPLIST}; \	240	${ECHO_CMD} "etc/bacula/bacula-barcodes.samples" >> ${TMPPLIST}; \
245	fi	241	fi
246	# Add configuration files directory to packing list	242	# Add configuration files directory to packing list
247	${ECHO_CMD} "@unexec ${RMDIR} %D/etc/bacula 2>/dev/null \|\| true" >> ${TMPPLIST}	243	${ECHO_CMD} "@unexec ${RMDIR} %D/etc/bacula 2>/dev/null \|\| true" >> ${TMPPLIST}
248	# chmod of bsmtp program so bacula can use it with dropped down permissions	244	${CHOWN} -R bacula:bacula ${STAGEDIR}${PREFIX}/share/bacula
249	${CHMOD} o+x ${PREFIX}/sbin/bsmtp
250	${CHOWN} -R bacula:bacula ${PREFIX}/share/bacula
251		245
252	# on a fresh install, the .new suffix is not used	246	# on a fresh install, the .new suffix is not used
253	if [ -f ${ETCDIR}/bacula-dir.conf.new ]; then \	247	if [ -f ${STAGEDIR}${ETCDIR}/bacula-dir.conf.new ]; then \
254	${CHGRP} bacula ${ETCDIR}/bacula-dir.conf.new; \	248	${CHGRP} bacula ${STAGEDIR}${ETCDIR}/bacula-dir.conf.new; \
255	else \	249	else \
256	${CHGRP} bacula ${ETCDIR}/bacula-dir.conf; \	250	${CHGRP} bacula ${STAGEDIR}${ETCDIR}/bacula-dir.conf; \
257	fi	251	fi
258		252
259	${CHGRP} bacula ${PREFIX}/sbin/dbcheck	253	${CHGRP} bacula ${STAGEDIR}${PREFIX}/sbin/dbcheck
260		254
261	.endif	255	.endif
262	# Install leaves existing conf files untouched. Respect this here!	256	# Install leaves existing conf files untouched. Respect this here!
263	for na in ${CONFFILES}; do \	257	for na in ${CONFFILES}; do \
264	if [ -f ${ETCDIR}/bacula-$$na.conf.new ]; then \	258	if [ -f ${STAGEDIR}${ETCDIR}/bacula-$$na.conf.new ]; then \
265	${ECHO_CMD} "etc/bacula/bacula-$$na.conf.new" >> ${TMPPLIST}; \	259	${ECHO_CMD} "etc/bacula/bacula-$$na.conf.new" >> ${TMPPLIST}; \
266	elif [ -f ${ETCDIR}/bacula-$$na.conf ]; then \	260	elif [ -f ${STAGEDIR}${ETCDIR}/bacula-$$na.conf ]; then \
267	${MV} ${ETCDIR}/bacula-$$na.conf ${ETCDIR}/bacula-$$na.conf.sample; \	261	${MV} ${STAGEDIR}${ETCDIR}/bacula-$$na.conf ${STAGEDIR}${ETCDIR}/bacula-$$na.conf.sample; \
268	${ECHO_CMD} "etc/bacula/bacula-$$na.conf.sample" >> ${TMPPLIST}; \	262	${ECHO_CMD} "etc/bacula/bacula-$$na.conf.sample" >> ${TMPPLIST}; \
269	fi; \	263	fi; \
270	done	264	done
Lines 272-280 Link Here
272	# Add configuration files directory to packing list	266	# Add configuration files directory to packing list
273	${ECHO_CMD} "@unexec ${RMDIR} %D/etc/bacula 2>/dev/null \|\| true" >> ${TMPPLIST}	267	${ECHO_CMD} "@unexec ${RMDIR} %D/etc/bacula 2>/dev/null \|\| true" >> ${TMPPLIST}
274		268
275	${CHGRP} wheel ${PREFIX}/etc	269	${CHGRP} wheel ${STAGEDIR}${PREFIX}/etc
276		270
277	@${CAT} ${PKGMESSAGE}
278	.endif	271	.endif
279	.else	272	.else
280	.include "${MASTERDIR}/Makefile.common"	273	.include "${MASTERDIR}/Makefile.common"




PLIST=	${WRKDIR}/pkg-plist

.if ${PKGNAMESUFFIX} == "-bat"
.if defined(WITH_OPENSSL)
.include "${PORTSDIR}/Mk/bsd.openssl.mk"
CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
.else
CONFIGURE_ARGS+=	--with-openssl="no"
.endif
.endif

pre-everything::
.if ${PKGNAMESUFFIX} == "-bat"
	@${ECHO_MSG} "===> Building bat the GUI interface for Bacula."

.endif

post-patch:
# Change $(ECHO) to echo in some Makefile.in files
	@${REINPLACE_CMD} -e 's|$$(ECHO)|echo|g' ${WRKSRC}/src/filed/Makefile.in \
		${WRKSRC}/src/console/Makefile.in

post-build:
.if ${PKGNAMEPREFIX} == "nagios-check_"
	${MAKE} -C ${WRKSRC}/examples/nagios/check_bacula
.endif

pre-install:
	@${RM} -f ${PLIST}
.if ${PKGNAMESUFFIX} == "-bat"

.endif

do-install:
.if ${PKGNAMESUFFIX} == "-bat"
# Install config files and preserve existing ones
	${INSTALL_SCRIPT}  ${WRKSRC}/src/qt-console/bat.conf ${PREFIX}/etc/bacula/bat.conf.sample
	${INSTALL_MAN}     ${WRKSRC}/manpages/bat.1          ${PREFIX}/man/man1/
	${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/bat ${PREFIX}/sbin
.endif
.if ${PKGNAMEPREFIX} == "nagios-check_"
	@${MKDIR} ${PREFIX}/libexec/nagios
	${INSTALL_PROGRAM} ${WRKSRC}/examples/nagios/check_bacula/check_bacula \
	${PREFIX}/libexec/nagios
.endif
.if ${PKGNAMESUFFIX} == "-client-static"
	${INSTALL_PROGRAM} ${WRKSRC}/src/filed/static-bacula-fd ${PREFIX}/sbin/bacula-fd-static
	${INSTALL_PROGRAM} ${WRKSRC}/src/console/static-bconsole ${PREFIX}/sbin/bconsole-static
.endif

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




--- src/cats/Makefile.in	2012-06-28 09:52:03.000000000 -0500
+++ src/cats/Makefile.in	2012-08-09 15:30:19.000000000 -0500
@@ -142,25 +142,25 @@
 
 libbacsql.la: Makefile $(LIBBACSQL_LOBJS)
 	@echo "Making $@ ..."	  
-	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACSQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACSQL_LT_RELEASE) $(DB_LIBS)
+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACSQL_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACSQL_LT_RELEASE:S/./:/g:S/12/0/g)
 
 libbaccats.la: Makefile cats_dummy.lo
 	@echo "Making $@ ..."
-	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ cats_dummy.lo -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE)
+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ cats_dummy.lo -export-dynamic -rpath $(libdir) -version-info $(LIBBACCATS_LT_RELEASE:S/./:/g:S/12/0/g)
 
 libbaccats-mysql.la: Makefile $(MYSQL_LOBJS)
 	@echo "Making $@ ..."
-	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(MYSQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \
+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(MYSQL_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACCATS_LT_RELEASE:S/./:/g:S/12/0/g) \
 							   -soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(MYSQL_LIBS)
 
 libbaccats-postgresql.la: Makefile $(POSTGRESQL_LOBJS)
 	@echo "Making $@ ..."
-	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(POSTGRESQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \
+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(POSTGRESQL_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACCATS_LT_RELEASE:S/./:/g:S/12/0/g) \
 							   -soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(POSTGRESQL_LIBS)
 
 libbaccats-sqlite3.la: Makefile $(SQLITE_LOBJS)
 	@echo "Making $@ ..."
-	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(SQLITE_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \
+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(SQLITE_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACCATS_LT_RELEASE:S/./:/g:S/12/0/g) \
 							   -soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(SQLITE_LIBS)
 
 #libbaccats-ingres.la: Makefile $(INGRES_LOBJS)
@@ -237,7 +237,7 @@
 	for db_type in @DB_BACKENDS@; do \
 	    $(LIBTOOL_INSTALL_FINISH) $(INSTALL_LIB) libbaccats-$${db_type}.la $(DESTDIR)$(libdir); \
 	done
-	./install-default-backend @DEFAULT_DB_TYPE@ $(LIBBACCATS_LT_RELEASE) $(DESTDIR)$(libdir)
+	./install-default-backend @DEFAULT_DB_TYPE@ 5 $(DESTDIR)$(libdir)
 
 libtool-uninstall:
 	$(LIBTOOL_UNINSTALL) $(RMF) $(DESTDIR)$(libdir)/libbacsql.la
@@ -323,7 +323,7 @@
 depend: 
 	@$(MV) Makefile Makefile.bak
 	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
-	@$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
+	@echo "# DO NOT DELETE: nice dependency list follows" >> Makefile
 	@for src in $(LIBBACSQL_SRCS); do \
 	    $(CXX) -S -M -MT `basename $$src .c`$(DEFAULT_OBJECT_TYPE) $(CPPFLAGS) $(XINC) $(DEFS) -I$(srcdir) -I$(basedir) $$src >> Makefile; \
 	done




--- src/cats/install-default-backend.in	2012-03-31 23:39:38.000000000 -0500
+++ src/cats/install-default-backend.in	2012-03-31 23:40:56.000000000 -0500
@@ -22,11 +22,11 @@
    exit 1
 fi
 
-if [ -f ${install_dir}/libbaccats-${default_backend}-${library_version}${SHLIB_EXT} ]; then
+if [ -f ${install_dir}/libbaccats-${default_backend}${SHLIB_EXT}.${library_version} ]; then
    #
    # Create a default catalog library pointing to one of the shared libs.
    #
-   rm -f ${install_dir}/libbaccats-${library_version}${SHLIB_EXT}
+   rm -f ${install_dir}/libbaccats${SHLIB_EXT}.${library_version}
 
    #
    # Create a relative symlink to the default backend
@@ -34,7 +34,7 @@
    # always work.
    #
    ln -s libbaccats-${default_backend}${SHLIB_EXT} \
-         ${install_dir}/libbaccats-${library_version}${SHLIB_EXT}
+         ${install_dir}/libbaccats${SHLIB_EXT}.${library_version}
 fi
 
 exit 0

Lines 1-11 Link Here

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




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

Lines 1-11 Link Here

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




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




--- src/lib/Makefile.in	2012-06-28 09:52:03.000000000 -0500
+++ src/lib/Makefile.in	2012-08-09 15:08:16.000000000 -0500
@@ -120,7 +120,7 @@
 
 libbac.la: Makefile $(LIBBAC_LOBJS)
 	@echo "Making $@ ..."
-	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBAC_LT_RELEASE) $(WRAPLIBS) $(CAP_LIBS) $(ZLIBS) $(OPENSSL_LIBS) $(LIBS) $(DLLIBS)
+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBAC_LT_RELEASE:S/./:/g:S/12/0/g) $(WRAPLIBS) $(CAP_LIBS) $(ZLIBS) $(OPENSSL_LIBS) $(LIBS) $(DLLIBS)
 
 libbaccfg.a: $(LIBBACCFG_OBJS) 
 	@echo "Making $@ ..."
@@ -129,7 +129,7 @@
 
 libbaccfg.la: Makefile $(LIBBACCFG_LOBJS) 
 	@echo "Making $@ ..."
-	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCFG_LT_RELEASE) $(OPENSSL_LIBS) $(LIBS)
+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACCFG_LT_RELEASE:S/./:/g:S/12/0/g) $(OPENSSL_LIBS) $(LIBS)
 
 libbacpy.a: $(LIBBACPY_OBJS) 
 	@echo "Making $@ ..."
@@ -138,7 +138,7 @@
 
 libbacpy.la: Makefile $(LIBBACPY_LOBJS) 
 	@echo "Making $@ ..."
-	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACPY_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACPY_LT_RELEASE) $(PYTHON_LIBS) $(OPENSSL_LIBS) $(LIBS)
+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACPY_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACPY_LT_RELEASE:S/./:/g:S/12/0/g) $(PYTHON_LIBS) $(OPENSSL_LIBS) $(LIBS)
 
 Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
 	cd $(topdir) \
@@ -267,7 +267,7 @@
 depend:
 	@$(MV) Makefile Makefile.bak
 	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
-	@$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
+	@echo "# DO NOT DELETE: nice dependency list follows" >> Makefile
 	@for src in $(LIBBAC_SRCS) $(LIBBACCFG_SRCS) $(LIBBACPY_SRCS); do \
 	    $(CXX) -S -M -MT `basename $$src .c`$(DEFAULT_OBJECT_TYPE) $(CPPFLAGS) $(XINC) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $$src >> Makefile; \
 	done




--- src/stored/Makefile.in	2011-11-26 09:08:12.000000000 -0500
+++ src/stored/Makefile.in	2011-12-02 13:20:38.000000000 -0500
@@ -95,12 +95,12 @@
 
 bacula-sd: Makefile $(SDOBJS) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
 	@echo "Linking $@ ..."
-	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -o $@ $(SDOBJS) $(ZLIBS) \
+	$(LIBTOOL_LINK) $(CXX) -L../lib $(WLDFLAGS) $(LDFLAGS) -o $@ $(SDOBJS) $(ZLIBS) \
 	   -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \
 	$(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
 
 static-bacula-sd: Makefile $(SDOBJS) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
-	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -o $@ $(SDOBJS) $(ZLIBS) \
+	$(LIBTOOL_LINK) $(CXX) -static -L../lib $(WLDFLAGS) $(LDFLAGS) -o $@ $(SDOBJS) $(ZLIBS) \
 	   -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \
 	$(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
 	strip $@
@@ -111,7 +111,7 @@
 	   -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 
 btape: Makefile  $(TAPEOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
-	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -o $@ $(TAPEOBJS) \
+	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) -L../lib $(LDFLAGS) -o $@ $(TAPEOBJS) \
 	   -lbaccfg -lbac $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 bls.o:	bls.c
@@ -121,7 +121,7 @@
 
 bls:	Makefile $(BLSOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
 	@echo "Compiling $<"
-	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \
+	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) -L../lib -L../findlib $(LDFLAGS) -o $@ $(BLSOBJS) $(DLIB) \
 	   -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 bextract.o: bextract.c
@@ -131,7 +131,7 @@
 
 bextract: Makefile $(BEXTOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
 	@echo "Compiling $<"
-	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZOLIBS) \
+	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) -L../lib -L../findlib $(LDFLAGS) -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZOLIBS) \
 	   -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 bscan.o: bscan.c
@@ -141,7 +141,7 @@
 
 bscan:	Makefile $(SCNOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
 	../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE)
-	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \
+	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) -L../lib -L../cats -L../findlib $(LDFLAGS) -o $@ $(SCNOBJS) \
 	   -lbacsql -lbaccats $(DB_LIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 bcopy.o: bcopy.c
@@ -150,7 +150,7 @@
 	   -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 
 bcopy:	Makefile $(COPYOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
-	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -o $@ $(COPYOBJS) \
+	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) -L../lib $(LDFLAGS) -o $@ $(COPYOBJS) \
 	   -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
@@ -215,7 +215,7 @@
 depend:
 	@$(MV) Makefile Makefile.bak
 	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
-	@$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
+	@echo "# DO NOT DELETE: nice dependency list follows" >> Makefile
 	@$(CXX) -S -M $(CPPFLAGS) $(XINC) $(PYTHON_INC) -I$(srcdir) -I$(basedir) *.c >> Makefile
 	@if test -f Makefile ; then \
 	    $(RMF) Makefile.bak; \




--- src/tools/Makefile.in	2011-11-26 09:08:12.000000000 -0500
+++ src/tools/Makefile.in	2011-12-02 13:26:44.000000000 -0500
@@ -58,22 +58,22 @@
 	@echo " "
 
 bsmtp: Makefile bsmtp.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)	    
-	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bsmtp.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+	$(LIBTOOL_LINK) $(CXX) -L../lib $(LDFLAGS) -o $@ bsmtp.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 bregtest: Makefile bregtest.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)	   
-	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ bregtest.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+	$(LIBTOOL_LINK) $(CXX) -L../lib $(LDFLAGS) -o $@ bregtest.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 dbcheck: Makefile dbcheck.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
 	 ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) $(DIRCONFOBJS)
-	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../cats -o $@ dbcheck.o $(DIRCONFOBJS) \
+	$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) -o $@ dbcheck.o $(DIRCONFOBJS) \
 	  -lbaccats -lbacsql -lbaccfg -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 fstype: Makefile fstype.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
-	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ fstype.o -lbacfind -lbac -lm \
+	$(LIBTOOL_LINK) $(CXX) -L../lib -L../findlib $(LDFLAGS) -o $@ fstype.o -lbacfind -lbac -lm \
 	  $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 drivetype: Makefile drivetype.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
-	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ drivetype.o -lbacfind -lbac -lm \
+	$(LIBTOOL_LINK) $(CXX) -L../lib -L../findlib $(LDFLAGS) -o $@ drivetype.o -lbacfind -lbac -lm \
 	  $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 dird_conf.o: ../dird/dird_conf.c
@@ -87,34 +87,34 @@
 
 testfind: Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
 	  ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) $(FINDOBJS)
-	$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -o $@ $(FINDOBJS) -L. -L../lib -L../findlib \
+	$(LIBTOOL_LINK) $(CXX) -g -o $@ $(FINDOBJS) -L. -L../lib -L../findlib $(LDFLAGS) \
 	  $(DLIB) -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 testls: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) testls.o
-	$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L. -L../lib -L../findlib -o $@ testls.o \
+	$(LIBTOOL_LINK) $(CXX) -g -L. -L../lib -L../findlib $(LDFLAGS) -o $@ testls.o \
 	  $(DLIB) -lbacfind -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 bregex: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) bregex.o
-	$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L. -L../lib -o $@ bregex.o \
+	$(LIBTOOL_LINK) $(CXX) -g -L. -L../lib $(LDFLAGS) -o $@ bregex.o \
 	  $(DLIB) -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 bwild:	Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) bwild.o
-	$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L. -L../lib -o $@ bwild.o \
+	$(LIBTOOL_LINK) $(CXX) -g -L. -L../lib $(LDFLAGS) -o $@ bwild.o \
 	  $(DLIB) -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 bbatch: Makefile ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) \
 	../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) bbatch.o
-	$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -o $@ bbatch.o \
+	$(LIBTOOL_LINK) $(CXX) -g -L../cats -L. -L../lib $(LDFLAGS) -o $@ bbatch.o \
 	  -lbaccats -lbacsql -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 bvfs_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) \
 	   ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) bvfs_test.o
-	$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -L../findlib -o $@ bvfs_test.o  \
+	$(LIBTOOL_LINK) $(CXX) -g -L../cats -L. -L../lib -L../findlib $(LDFLAGS) -o $@ bvfs_test.o  \
 	  -lbaccats -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 ing_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) \
 	  ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) ing_test.o
-	$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -L../findlib -o $@ ing_test.o  \
+	$(LIBTOOL_LINK) $(CXX) -g -L../cats -L. -L../lib -L../findlib $(LDFLAGS) -o $@ ing_test.o  \
 	  -lbaccats -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 cats_test.o: cats_test.c
@@ -122,7 +122,7 @@
 	$(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 
 cats_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) cats_test.o
-	$(LIBTOOL_LINK) $(CXX) -g $(LDFLAGS) -L../cats -L. -L../lib -L../findlib -o $@ cats_test.o  \
+	$(LIBTOOL_LINK) $(CXX) -g -L../cats -L. -L../lib -L../findlib $(LDFLAGS) -o $@ cats_test.o  \
 	  -lbaccats -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 gigaslam.o: gigaslam.c
@@ -132,7 +132,7 @@
 	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -o $@ gigaslam.o
 
 grow: Makefile grow.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
-	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ grow.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+	$(LIBTOOL_LINK) $(CXX) -L../lib $(LDFLAGS) -o $@ grow.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
 	cd $(topdir) \
@@ -184,7 +184,7 @@
 depend:
 	@$(MV) Makefile Makefile.bak
 	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
-	@$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
+	@echo "# DO NOT DELETE: nice dependency list follows" >> Makefile
 	@$(CXX) -S -M $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) *.c >> Makefile
 	@if test -f Makefile ; then \
 	    $(RMF) Makefile.bak; \




lib/libbaccats.la
lib/libbaccats.so
lib/libbaccats.so.%%MAJOR%%
lib/libbaccats-%%DBTYPE%%.la
lib/libbaccats-%%DBTYPE%%.so
lib/libbaccats-%%DBTYPE%%-7.0.4.so
lib/libbacsql.la
lib/libbacsql.so
lib/libbacsql-7.0.4.so
lib/libbaccats-7.0.4.so
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
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
@dirrm %%DATADIR%%
@unexec /usr/bin/killall bacula-sd  > /dev/null 2>&1 || true
@unexec /usr/bin/killall bacula-dir > /dev/null 2>&1 || true

Return to bug 191311

Lines 1-14 Link Here

(-)bacula-server/Makefile.common (-32 lines)
1	PLIST= ${WRKDIR}/pkg-plist	1	PLIST= ${WRKDIR}/pkg-plist
2		2
3	.if ${PKGNAMESUFFIX} == "-bat"
4	.if defined(WITH_OPENSSL)
5	.include "${PORTSDIR}/Mk/bsd.openssl.mk"
6	CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE}
7	.else
8	CONFIGURE_ARGS+= --with-openssl="no"
9	.endif
10	.endif
11
12	pre-everything::	3	pre-everything::
13	.if ${PKGNAMESUFFIX} == "-bat"	4	.if ${PKGNAMESUFFIX} == "-bat"
14	@${ECHO_MSG} "===> Building bat the GUI interface for Bacula."	5	@${ECHO_MSG} "===> Building bat the GUI interface for Bacula."
Lines 21-35 Link Here
21	.endif	12	.endif
22		13
23	post-patch:	14	post-patch:
24	# Change $(ECHO) to echo in some Makefile.in files
25	@${REINPLACE_CMD} -e 's\|$$(ECHO)\|echo\|g' ${WRKSRC}/src/filed/Makefile.in \
26	${WRKSRC}/src/console/Makefile.in
27		15
28	post-build:
29	.if ${PKGNAMEPREFIX} == "nagios-check_"
30	${MAKE} -C ${WRKSRC}/examples/nagios/check_bacula
31	.endif
32
33	pre-install:	16	pre-install:
34	@${RM} -f ${PLIST}	17	@${RM} -f ${PLIST}
35	.if ${PKGNAMESUFFIX} == "-bat"	18	.if ${PKGNAMESUFFIX} == "-bat"
Lines 46-63 Link Here
46	.endif	29	.endif
47		30
48	do-install:	31	do-install:
49	.if ${PKGNAMESUFFIX} == "-bat"
50	# Install config files and preserve existing ones
51	${INSTALL_SCRIPT} ${WRKSRC}/src/qt-console/bat.conf ${PREFIX}/etc/bacula/bat.conf.sample
52	${INSTALL_MAN} ${WRKSRC}/manpages/bat.1 ${PREFIX}/man/man1/
53	${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/bat ${PREFIX}/sbin
54	.endif
55	.if ${PKGNAMEPREFIX} == "nagios-check_"
56	@${MKDIR} ${PREFIX}/libexec/nagios
57	${INSTALL_PROGRAM} ${WRKSRC}/examples/nagios/check_bacula/check_bacula \
58	${PREFIX}/libexec/nagios
59	.endif
60	.if ${PKGNAMESUFFIX} == "-client-static"
61	${INSTALL_PROGRAM} ${WRKSRC}/src/filed/static-bacula-fd ${PREFIX}/sbin/bacula-fd-static
62	${INSTALL_PROGRAM} ${WRKSRC}/src/console/static-bconsole ${PREFIX}/sbin/bconsole-static
63	.endif

Lines 1-51 Link Here

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

Lines 1-25 Link Here

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

Lines 1-28 Link Here

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

Lines 1-20 Link Here

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

Lines 1-38 Link Here

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

Lines 1-71 Link Here

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

Lines 1-99 Link Here

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

Lines 1-12 Link Here

(-)bacula-server/pkg-plist (-6 / +22 lines)
1	lib/libbaccats.la
2	lib/libbaccats.so	1	lib/libbaccats.so
3	lib/libbaccats.so.%%MAJOR%%
4	lib/libbaccats-%%DBTYPE%%.la
5	lib/libbaccats-%%DBTYPE%%.so	2	lib/libbaccats-%%DBTYPE%%.so
6	lib/libbaccats-%%DBTYPE%%.so.%%MAJOR%%	3	lib/libbaccats-%%DBTYPE%%-7.0.4.so
7	lib/libbacsql.la
8	lib/libbacsql.so	4	lib/libbacsql.so
9	lib/libbacsql.so.%%MAJOR%%	5	lib/libbacsql-7.0.4.so
		6	lib/libbaccats-7.0.4.so
10	sbin/bacula	7	sbin/bacula
11	sbin/bacula-dir	8	sbin/bacula-dir
12	sbin/bacula-sd	9	sbin/bacula-sd
Lines 15-26 Link Here
15	sbin/bls	12	sbin/bls
16	sbin/bregex	13	sbin/bregex
17	sbin/bscan	14	sbin/bscan
		15	@mode 755
18	sbin/bsmtp	16	sbin/bsmtp
		17	@mode
19	sbin/btape	18	sbin/btape
20	sbin/btraceback	19	sbin/btraceback
21	sbin/bwild	20	sbin/bwild
22	sbin/chio-bacula	21	sbin/chio-bacula
23	sbin/dbcheck	22	sbin/dbcheck
		23	@owner bacula
		24	@group bacula
24	%%DATADIR%%/bacula	25	%%DATADIR%%/bacula
25	%%DATADIR%%/bacula-ctl-dir	26	%%DATADIR%%/bacula-ctl-dir
26	%%DATADIR%%/bacula-ctl-fd	27	%%DATADIR%%/bacula-ctl-fd
Lines 50-55 Link Here
50	%%DATADIR%%/query.sql	51	%%DATADIR%%/query.sql
51	%%DATADIR%%/update_bacula_tables	52	%%DATADIR%%/update_bacula_tables
52	%%DATADIR%%/update_%%DBTYPE%%_tables	53	%%DATADIR%%/update_%%DBTYPE%%_tables
		54	@owner
		55	@group
		56	man/man1/bsmtp.1.gz
		57	man/man8/bacula-dir.8.gz
		58	man/man8/bacula-sd.8.gz
		59	man/man8/bacula.8.gz
		60	man/man8/bcopy.8.gz
		61	man/man8/bextract.8.gz
		62	man/man8/bls.8.gz
		63	man/man8/bregex.8.gz
		64	man/man8/bscan.8.gz
		65	man/man8/btape.8.gz
		66	man/man8/btraceback.8.gz
		67	man/man8/bwild.8.gz
		68	man/man8/dbcheck.8.gz
53	@dirrm %%DATADIR%%	69	@dirrm %%DATADIR%%
54	@unexec /usr/bin/killall bacula-sd > /dev/null 2>&1 \|\| true	70	@unexec /usr/bin/killall bacula-sd > /dev/null 2>&1 \|\| true
55	@unexec /usr/bin/killall bacula-dir > /dev/null 2>&1 \|\| true	71	@unexec /usr/bin/killall bacula-dir > /dev/null 2>&1 \|\| true