Attachment #144232 for bug #191311




# Created by: Dmitry Sivachenko <demon@FreeBSD.org>
# $FreeBSD: head/sysutils/bacula-server/Makefile 359586 2014-06-27 17:21:06Z miwi $

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

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

LIB_DEPENDS+=	lzo2:${PORTSDIR}/archivers/lzo2

GNU_CONFIGURE=	yes

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

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

UNIQUENAME?=	${PORTNAME}${PKGNAMESUFFIX}


GNU_CONFIGURE=	yes
USE_LDCONFIG=	yes

USES=		libtool

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

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

NO_STAGE=	yes
.include <bsd.port.options.mk>

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

.endif

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


SUB_FILES+=	pkg-install.server pkg-deinstall.server pkg-message.server
.endif

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

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

.if defined(WITH_CLIENT_ONLY)

CONFFILES=	fd
CONFIGURE_ARGS+=	--enable-client-only

PKGDEINSTALL=	${FILESDIR}/pkg-deinstall.client
PKGINSTALL=	${FILESDIR}/pkg-install.client
.else
# Server only Options
CONFFILES=		sd dir

SUB_LIST+=		REQ_MYSQL=mysql REQ_PGSQL=""
.elif ${PORT_OPTIONS:MSQLITE3}
CONFIGURE_ARGS+=	--with-sqlite3=yes
LIB_DEPENDS+=		sqlite3:${PORTSDIR}/databases/sqlite3
DBTYPE=			sqlite3
.else
USE_PGSQL=		yes

SUB_LIST+=		REQ_MYSQL="" REQ_PGSQL=postgresql
.endif
PLIST_SUB+=		DBTYPE=${DBTYPE}
# Install mtx
.if ${PORT_OPTIONS:MMTX}
RUN_DEPENDS+=		${LOCALBASE}/sbin/mtx:${PORTSDIR}/misc/mtx
.endif

CONFIGURE_ARGS+=	--with-openssl="no"
.endif

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

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

pre-everything::

	@${REINPLACE_CMD} -e 's|$$(ECHO)|echo|g' ${WRKSRC}/src/filed/Makefile.in \
		${WRKSRC}/src/console/Makefile.in
#	Default bconsole.conf is in ${ETCDIR}
	@${REINPLACE_CMD} -e 's|./bconsole.conf|${ETCDIR}/bconsole.conf|g' ${WRKSRC}/src/console/console.c
	@${REINPLACE_CMD} -e 's|^MAN8 =|MAN8 ?=|g' -e 's|^MAN1 =|MAN1 ?=|g' ${WRKSRC}/manpages/Makefile.in
.if defined(WITH_CLIENT_ONLY)
# 	In client port only install startup script out of script dir (see below post-install)
# 	Dont mkdir ${PREFIX}/share/bacula cause it's empty
	@${REINPLACE_CMD} -e 's|^\(fd_subdirs = .*\)scripts\(.*\)|\1\2|g' ${WRKSRC}/Makefile.in
	${REINPLACE_CMD} -e 's|\(.*$${MKDIR} $${DESTDIR}$${scriptdir}\)|#\1|g' ${WRKSRC}/Makefile.in
.else
#	In server port don't install filed
	@${REINPLACE_CMD} -e '/^fd_subdirs = /s|src/filed||' -e 's|src/console||' \
		-e 's|src/lib||' -e 's|src/findlib||' -e 's|@FD_PLUGIN_DIR@||' ${WRKSRC}/Makefile.in
	@${REINPLACE_CMD} -e 's|../lib/|$$(LOCALBASE)/lib/|g' -e 's|../findlib/|$$(LOCALBASE)/lib/|g' ${WRKSRC}/src/dird/Makefile.in \
		${WRKSRC}/src/stored/Makefile.in ${WRKSRC}/src/tools/Makefile.in
	@${REINPLACE_CMD} -e 's|fd_plugins.h|filed/fd_plugins.h|g' -e 's|dir_plugins.h|dird/dir_plugins.h|g' -e 's|stored.h|stored/stored.h|g' \
		${WRKSRC}/src/tools/bpluginfo.c
.endif

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

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


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

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

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

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

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

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

	${CHGRP} wheel ${PREFIX}/etc

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




# Created by: Dmitry Sivachenko <demon@FreeBSD.org>
# $FreeBSD: head/sysutils/bacula-server/Makefile 327772 2013-09-20 23:05:58Z bapt $

PORTNAME=	bacula
DISTVERSION=	7.0.4
PORTREVISION?=	3
CATEGORIES?=	sysutils
MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
PKGNAMEPREFIX?=	#
PKGNAMESUFFIX?=	-server

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

LIB_DEPENDS+=	lzo2:${PORTSDIR}/archivers/lzo2

UNIQUENAME?=	${PORTNAME}${PKGNAMESUFFIX}

USERS=		bacula
GROUPS=		${USERS}

PLIST_SUB+=	MAJOR=${PORTVERSION:R:R}

GNU_CONFIGURE=	yes


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

NO_STAGE=	yes
.include <bsd.port.options.mk>

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

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

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

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

MANCOMPRESSED=	yes
CONFIGURE_ARGS+=--with-tcp-wrappers=/usr/lib \
		--enable-smartalloc \
		--sysconfdir=${ETCDIR} \
		--with-working-dir=${BACULA_DIR} \
		--with-scriptdir=${PREFIX}/share/${PORTNAME} \
		--with-readline=yes \
		--disable-conio \
		--enable-batch-insert \
		--with-plugindir=${PREFIX}/lib \
		--with-dump-email=root@localhost \
		--with-job-email=root@localhost \
		--with-db-name=bacula \
		--with-sbin-perm=755 \
		--with-db-user=bacula \
		--with-baseport=9101

.if defined(WITH_CLIENT_ONLY)
CONFIGURE_ARGS+=--with-fd-user=root \
		--with-fd-group=wheel
.else
CONFIGURE_ARGS+=--with-dir-user=${BACULA_USER} \
		--with-dir-group=${BACULA_GROUP} \
		--with-sd-user=${BACULA_USER} \
		--with-sd-group=operator
.endif

# The user/group IDs below are registered, see
# http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/book.html#DADS-UID
#
BACULA_USER?=	bacula
BACULA_GROUP?=	${BACULA_USER}
BACULA_UID?=	910
BACULA_GID?=	${BACULA_UID}
BACULA_DIR?=	/var/db/bacula

PLIST_SUB+=	BACULA_DIR=${BACULA_DIR}

SUB_LIST=	BACULA_USER=${BACULA_USER} \
		BACULA_GROUP=${BACULA_GROUP} \
		BACULA_UID=${BACULA_UID} \
		BACULA_GID=${BACULA_GID} \
		BACULA_DIR=${BACULA_DIR}

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

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

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

PKGDEINSTALL=	${FILESDIR}/pkg-deinstall.client
PKGINSTALL=	${FILESDIR}/pkg-install.client
.else
# Server only Options
CONFFILES=		sd dir
# Server default database
.if ${PORT_OPTIONS:MMYSQL}
CONFIGURE_ARGS+=	--with-mysql=yes
USE_MYSQL=		yes
DBTYPE=			mysql
SUB_LIST+=		REQ_MYSQL=mysql REQ_PGSQL=""
.elif ${PORT_OPTIONS:MSQLITE3}
CONFIGURE_ARGS+=	--with-sqlite3=yes
LIB_DEPENDS+=		sqlite3:${PORTSDIR}/databases/sqlite3
DBTYPE=			sqlite3
.else
USE_PGSQL=		yes
CONFIGURE_ARGS+=	--with-postgresql=yes
DBTYPE=			postgresql
SUB_LIST+=		REQ_MYSQL="" REQ_PGSQL=postgresql
.endif
PLIST_SUB+=		DBTYPE=${DBTYPE}
# Install mtx
.if ${PORT_OPTIONS:MMTX}
RUN_DEPENDS+=		${LOCALBASE}/sbin/mtx:${PORTSDIR}/misc/mtx
.endif
.endif

.if ${PORT_OPTIONS:MOPENSSL}
.include "${PORTSDIR}/Mk/bsd.openssl.mk"
CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
.else
CONFIGURE_ARGS+=	--with-openssl="no"
.endif

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

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

pre-everything::
.if !defined(WITH_CLIENT_ONLY)
	@${ECHO_MSG} "You may use the following build options (or make config):"
	@${ECHO_MSG} ""
	@${ECHO_MSG} "  WITH_CLIENT_ONLY=yes	if you only want the file daemon."
	@${ECHO_MSG} "  WITH_MTX=yes		if you want to use mtx instead of chio for autochanger control."
	@${ECHO_MSG} "  WITH_PYTHON=yes		Enable Python scripting in the director."
	@${ECHO_MSG} "  WITH_SQLITE3=yes  	if you want SQLite-3 as the database (not recommended)."
.if ! ${PORT_OPTIONS:MMYSQL} && ! ${PORT_OPTIONS:MPGSQL}
	@${ECHO_MSG} "  WITH_MYSQL=yes  	if you want MySQL as the database."
	@${ECHO_MSG} "  WITH_PGSQL=yes		if you want PostgreSQL as the database."
	@${ECHO_MSG} ""
	@${ECHO_MSG} "The default DB is PostgreSQL!"
.endif
	@${ECHO_MSG} "  WITH_OPENSSL=yes  	Enable OpenSSL for encrypted communication."
	@${ECHO_MSG} ""
	@${ECHO_MSG} "===> Using ${DBTYPE} as the bacula database."
	@${ECHO_MSG} ""
.endif

post-patch:
#	This port does not install docs.  See bacula-docs for that
	${REINPLACE_CMD} -e '/docdir/d' ${WRKSRC}/Makefile.in
#	Change $(ECHO) to echo in some Makefile.in files
	@${REINPLACE_CMD} -e 's|$$(ECHO)|echo|g' ${WRKSRC}/src/filed/Makefile.in \
		${WRKSRC}/src/console/Makefile.in
#	Default bconsole.conf is in ${ETCDIR}
	@${REINPLACE_CMD} -e 's|./bconsole.conf|${ETCDIR}/bconsole.conf|g' ${WRKSRC}/src/console/console.c
	@${REINPLACE_CMD} -e 's|^MAN8 =|MAN8 ?=|g' -e 's|^MAN1 =|MAN1 ?=|g' ${WRKSRC}/manpages/Makefile.in
.if defined(WITH_CLIENT_ONLY)
# 	In client port only install startup script out of script dir (see below post-install)
# 	Dont mkdir ${PREFIX}/share/bacula cause it's empty
	@${REINPLACE_CMD} -e 's|^\(fd_subdirs = .*\)scripts\(.*\)|\1\2|g' ${WRKSRC}/Makefile.in
	${REINPLACE_CMD} -e 's|\(.*$${MKDIR} $${DESTDIR}$${scriptdir}\)|#\1|g' ${WRKSRC}/Makefile.in
.else
#	In server port don't install filed
	@${REINPLACE_CMD} -e '/^fd_subdirs = /s|src/filed||' -e 's|src/console||' \
		-e 's|src/lib||' -e 's|src/findlib||' -e 's|@FD_PLUGIN_DIR@||' ${WRKSRC}/Makefile.in
	@${REINPLACE_CMD} -e 's|../lib/|$$(LOCALBASE)/lib/|g' -e 's|../findlib/|$$(LOCALBASE)/lib/|g' ${WRKSRC}/src/dird/Makefile.in \
		${WRKSRC}/src/stored/Makefile.in ${WRKSRC}/src/tools/Makefile.in
	@${REINPLACE_CMD} -e 's|fd_plugins.h|filed/fd_plugins.h|g' -e 's|dir_plugins.h|dird/dir_plugins.h|g' -e 's|stored.h|stored/stored.h|g' \
		${WRKSRC}/src/tools/bpluginfo.c
.endif

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

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

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

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

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

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

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

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

	${CHGRP} wheel ${PREFIX}/etc

	@${CAT} ${PKGMESSAGE}
.endif
.endif
.include "${MASTERDIR}/Makefile.common"
.include <bsd.port.mk>

Lines 1-5 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
3	pre-everything::	12	pre-everything::
4	.if ${PKGNAMESUFFIX} == "-bat"	13	.if ${PKGNAMESUFFIX} == "-bat"
5	@${ECHO_MSG} "===> Building bat the GUI interface for Bacula."	14	@${ECHO_MSG} "===> Building bat the GUI interface for Bacula."
Lines 12-17 Link Here
12	.endif	21	.endif
13		22
14	post-patch:	23	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
		28	post-build:
		29	.if ${PKGNAMEPREFIX} == "nagios-check_"
		30	${MAKE} -C ${WRKSRC}/examples/nagios/check_bacula
		31	.endif
15		32
16	pre-install:	33	pre-install:
17	@${RM} -f ${PLIST}	34	@${RM} -f ${PLIST}
Lines 29-31 Link Here
29	.endif	46	.endif
30		47
31	do-install:	48	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-2 Link Here

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




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

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

Line 0 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%%.so.%%MAJOR%%
lib/libbacsql.la
lib/libbacsql.so
lib/libbacsql.so.%%MAJOR%%
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

Lines 1-9 Link Here

(-)bacula-server/pkg-plist.client (-3 / +9 lines)
		1	lib/libbac.la
1	lib/libbac.so	2	lib/libbac.so
2	lib/libbac-7.0.4.so	3	lib/libbac.so.%%MAJOR%%
		4	lib/libbaccfg.la
3	lib/libbaccfg.so	5	lib/libbaccfg.so
4	lib/libbaccfg-7.0.4.so	6	lib/libbaccfg.so.%%MAJOR%%
		7	lib/libbacfind.la
5	lib/libbacfind.so	8	lib/libbacfind.so
6	lib/libbacfind-7.0.4.so	9	lib/libbacfind.so.%%MAJOR%%
		10	lib/libbacpy.la
		11	lib/libbacpy.so
		12	lib/libbacpy.so.%%MAJOR%%
7	lib/bpipe-fd.so	13	lib/bpipe-fd.so
8	sbin/bacula-fd	14	sbin/bacula-fd
9	sbin/bconsole	15	sbin/bconsole

Return to bug 191311

Lines 1-9 Link Here

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

Lines 1-278 Link Here

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

Line 0 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

Line 0 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

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

Line 0 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

Line 0 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

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

Line 0 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-9 Link Here

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