Index: Makefile
===================================================================
--- Makefile	(revision 363671)
+++ Makefile	(working copy)
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	bacula
-DISTVERSION=	5.2.12
-PORTREVISION?=	6
+DISTVERSION=	7.0.4
+PORTREVISION?=	1
 CATEGORIES?=	sysutils
 MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
 PKGNAMEPREFIX?=	#
@@ -12,8 +12,10 @@
 MAINTAINER=	dan@langille.org
 COMMENT?=	Network backup solution (server)
 
-USES+=		libtool:keepla
+USES+=		libtool:oldver
 
+CONFLICTS_BUILD=	bacula-*-5.2.12_3
+
 LIB_DEPENDS+=	liblzo2.so:${PORTSDIR}/archivers/lzo2
 
 USERS=		bacula
@@ -31,10 +33,6 @@
 OPTIONS_DEFAULT?=	NLS OPENSSL PGSQL
 MTX_DESC=		Install mtx for control of autochanger devices
 
-OPENSSL_USE=	OPENSSL=yes
-OPENSSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
-OPENSSL_CONFIGURE_OFF=	--with-openssl="no"
-
 .if ${PKGNAMESUFFIX} == "-client" || ${PKGNAMESUFFIX} == "-server"  #Till end of the file
 
 PYTHON_USE=		PYTHON=yes
@@ -66,6 +64,7 @@
 		--with-db-name=bacula \
 		--with-sbin-perm=755 \
 		--with-db-user=bacula \
+		--with-logdir=/var/log \
 		--with-baseport=9101
 
 .if defined(WITH_CLIENT_ONLY)
@@ -111,11 +110,11 @@
 # Server default database
 
 MYSQL_CONFIGURE_ON=	--with-mysql=yes
-MYSQL_USE=	MYSQL=yes
+MYSQL_USE=		MYSQL=yes
 SQLITE3_CONFIGURE_ON=	--with-sqlite3=yes
 SQLITE3_LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
 PGSQL_CONFIGURE_ON=	--with-postgresql=yes
-PGSQL_USES=	pgsql
+PGSQL_USES=		pgsql
 
 MTX_RUN_DEPENDS=	${LOCALBASE}/sbin/mtx:${PORTSDIR}/misc/mtx
 
@@ -131,42 +130,21 @@
 SUB_LIST+=		REQ_MYSQL="" REQ_PGSQL=postgresql
 .endif
 PLIST_SUB+=		DBTYPE=${DBTYPE}
-
 .endif
 
-.if defined(WITH_CLIENT_ONLY)
-MP8+=	bacula-fd.8 bconsole.8
-.else
-MP8+=	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
-MP1+=	bsmtp.1 bacula-tray-monitor.1 bacula-bwxconsole.1
-.endif
-
 MAKE_ENV+=	MAN8="${MP8}" MAN1="${MP1}"
 
 post-patch:
+	@${ECHO_MSG} "@${REINPLACE_CMD}"
+	@${ECHO_MSG} stuff: ${PORTVERSION:R:R}
+	@${ECHO_MSG} stuff: "${WRKSRC}/src/cats/Makefile.in"
+	@${REINPLACE_CMD} -e 's|%%LIB_RELEASE%%|${PORTVERSION:R:R}|' ${WRKSRC}/src/cats/Makefile.in ${WRKSRC}/src/findlib/Makefile.in ${WRKSRC}/src/lib/Makefile.in
 #	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
+	@${REINPLACE_CMD} -e 's|$$(ECHO)|echo|g' ${WRKSRC}/src/filed/Makefile.in ${WRKSRC}/src/console/Makefile.in
 #	Default bconsole.conf is in ${ETCDIR}
 	@${REINPLACE_CMD} -e 's|./bconsole.conf|${ETCDIR}/bconsole.conf|g' ${WRKSRC}/src/console/console.c
-	@${REINPLACE_CMD} -e 's|^MAN8 =|MAN8 ?=|g' -e 's|^MAN1 =|MAN1 ?=|g' ${WRKSRC}/manpages/Makefile.in
-.if defined(WITH_CLIENT_ONLY)
-# 	In client port only install startup script out of script dir (see below post-install)
-# 	Dont mkdir ${PREFIX}/share/bacula cause it's empty
-	@${REINPLACE_CMD} -e 's|^\(fd_subdirs = .*\)scripts\(.*\)|\1\2|g' ${WRKSRC}/Makefile.in
-	${REINPLACE_CMD} -e 's|\(.*$${MKDIR} $${DESTDIR}$${scriptdir}\)|#\1|g' ${WRKSRC}/Makefile.in
-.else
-#	In server port don't install filed
-	@${REINPLACE_CMD} -e '/^fd_subdirs = /s|src/filed||' -e 's|src/console||' \
-		-e 's|src/lib||' -e 's|src/findlib||' -e 's|@FD_PLUGIN_DIR@||' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|../lib/|$$(LOCALBASE)/lib/|g' -e 's|../findlib/|$$(LOCALBASE)/lib/|g' ${WRKSRC}/src/dird/Makefile.in \
-		${WRKSRC}/src/stored/Makefile.in ${WRKSRC}/src/tools/Makefile.in
-	@${REINPLACE_CMD} -e 's|fd_plugins.h|filed/fd_plugins.h|g' -e 's|dir_plugins.h|dird/dir_plugins.h|g' -e 's|stored.h|stored/stored.h|g' \
-		${WRKSRC}/src/tools/bpluginfo.c
-.endif
 
 pre-install:
 	${MKDIR} ${STAGEDIR}${BACULA_DIR}
@@ -174,10 +152,10 @@
 .if !target(post-install)
 post-install:
 .if defined(WITH_CLIENT_ONLY)
-	${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${STAGEDIR}${ETCDIR}/bconsole.conf.sample
+	${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${STAGEDIR}${ETCDIR}/bconsole.conf.sample;
 .else
 	${INSTALL_SCRIPT} ${FILESDIR}/chio-bacula ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_DATA} ${FILESDIR}/bacula-barcodes ${STAGEDIR}${ETCDIR}/bacula-barcodes.sample
+	${INSTALL_DATA} ${FILESDIR}/bacula-barcodes ${STAGEDIR}${ETCDIR}/bacula-barcodes.samples
 	${CHMOD} o+x ${STAGEDIR}${PREFIX}/sbin/bsmtp
 .endif
 	for na in ${CONFFILES}; do \
Index: Makefile.common
===================================================================
--- Makefile.common	(revision 363671)
+++ Makefile.common	(working copy)
@@ -1,27 +1,36 @@
-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
+PLIST=	${WRKDIR}/pkg-plist
 
-post-build:
+pre-everything::
+.if ${PKGNAMESUFFIX} == "-bat"
+	@${ECHO_MSG} "===> Building bat the GUI interface for Bacula."
+.endif
 .if ${PKGNAMEPREFIX} == "nagios-check_"
-	${MAKE_CMD} -C ${WRKSRC}/examples/nagios/check_bacula
+	@${ECHO_MSG} "===> Building nagios check only."
 .endif
+.if ${PKGNAMESUFFIX} == "-client-static"
+	@${ECHO_MSG} "===> Building static version of fd."
+.endif
 
-do-install:
+post-patch:
+
+pre-install:
+	@${RM} -f ${PLIST}
 .if ${PKGNAMESUFFIX} == "-bat"
-# Install config files and preserve existing ones
-	${MKDIR} ${STAGEDIR}${ETCDIR}
-	${INSTALL_SCRIPT}  ${WRKSRC}/src/qt-console/bat.conf ${STAGEDIR}${PREFIX}/etc/bacula/bat.conf.sample
-	${INSTALL_MAN}     ${WRKSRC}/manpages/bat.1          ${STAGEDIR}${PREFIX}/man/man1/
-	${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/bat ${STAGEDIR}${PREFIX}/sbin
+	${MKDIR} ${STAGEDIR}/usr/local/etc/bacula
+	${CP} ${WRKSRC}/src/qt-console/bat ${STAGEDIR}/usr/local/sbin/bat
+	${CP} ${WRKSRC}/src/qt-console/bat.conf ${STAGEDIR}${ETCDIR}/bat.conf.sample
+	@${ECHO_CMD} "etc/bacula/bat.conf.sample" >> ${PLIST}
+	@${ECHO_CMD} "sbin/bat" >> ${PLIST}
 .endif
 .if ${PKGNAMEPREFIX} == "nagios-check_"
-	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nagios
-	${INSTALL_PROGRAM} ${WRKSRC}/examples/nagios/check_bacula/check_bacula \
-	${STAGEDIR}${PREFIX}/libexec/nagios
+	@${ECHO_CMD} "libexec/nagios/check_bacula" >> ${PLIST}
+	@${ECHO_CMD} "@dirrmtry libexec/nagios" >> ${PLIST}
 .endif
 .if ${PKGNAMESUFFIX} == "-client-static"
-	${INSTALL_PROGRAM} ${WRKSRC}/src/filed/static-bacula-fd ${STAGEDIR}${PREFIX}/sbin/bacula-fd-static
-	${INSTALL_PROGRAM} ${WRKSRC}/src/console/static-bconsole ${STAGEDIR}${PREFIX}/sbin/bconsole-static
+	${CP} ${WRKSRC}/src/console/static-bconsole ${STAGEDIR}/usr/local/sbin/bconsole-static
+	${CP} ${WRKSRC}/src/filed/static-bacula-fd ${STAGEDIR}/usr/local/sbin/bacula-fd-static
+	@${ECHO_CMD} "sbin/bacula-fd-static" >> ${PLIST}
+	@${ECHO_CMD} "sbin/bconsole-static" >> ${PLIST}
 .endif
+
+do-install:
Index: distinfo
===================================================================
--- distinfo	(revision 363671)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (bacula-5.2.12.tar.gz) = 360435634e28881b3fedb0dc1901b9c9be1895ce1e39c9737262b25f44513887
-SIZE (bacula-5.2.12.tar.gz) = 4147847
+SHA256 (bacula-7.0.4.tar.gz) = ebf802b843a95f6526e82dd181dff7cd7dc7d1fdc55cec8636e0fe3af69acf7e 
+SIZE (bacula-7.0.4.tar.gz) = 3596569 
Index: files/patch-src__cats__Makefile.in
===================================================================
--- files/patch-src__cats__Makefile.in	(revision 363671)
+++ files/patch-src__cats__Makefile.in	(working copy)
@@ -5,29 +5,29 @@
  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)
++	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACSQL_LOBJS) -export-dynamic -rpath $(libdir) -version-info %%LIB_RELEASE%%
  
  libbaccats.la: Makefile cats_dummy.lo
  	@echo "Making $@ ..."
 -	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ cats_dummy.lo -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE)
-+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ cats_dummy.lo -export-dynamic -rpath $(libdir) -version-info $(LIBBACCATS_LT_RELEASE:S/./:/g:S/12/0/g)
++	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ cats_dummy.lo -export-dynamic -rpath $(libdir) -version-info %%LIB_RELEASE%%
  
  libbaccats-mysql.la: Makefile $(MYSQL_LOBJS)
  	@echo "Making $@ ..."
 -	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(MYSQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \
-+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(MYSQL_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACCATS_LT_RELEASE:S/./:/g:S/12/0/g) \
++	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(MYSQL_LOBJS) -export-dynamic -rpath $(libdir) -version-info %%LIB_RELEASE%% \
  							   -soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(MYSQL_LIBS)
  
  libbaccats-postgresql.la: Makefile $(POSTGRESQL_LOBJS)
  	@echo "Making $@ ..."
 -	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(POSTGRESQL_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \
-+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(POSTGRESQL_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACCATS_LT_RELEASE:S/./:/g:S/12/0/g) \
++	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(POSTGRESQL_LOBJS) -export-dynamic -rpath $(libdir) -version-info %%LIB_RELEASE%% \
  							   -soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(POSTGRESQL_LIBS)
  
  libbaccats-sqlite3.la: Makefile $(SQLITE_LOBJS)
  	@echo "Making $@ ..."
 -	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(SQLITE_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCATS_LT_RELEASE) \
-+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(SQLITE_LOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACCATS_LT_RELEASE:S/./:/g:S/12/0/g) \
++	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(SQLITE_LOBJS) -export-dynamic -rpath $(libdir) -version-info %%LIB_RELEASE%% \
  							   -soname libbaccats-$(LIBBACCATS_LT_RELEASE).so $(SQLITE_LIBS)
  
  #libbaccats-ingres.la: Makefile $(INGRES_LOBJS)
@@ -36,7 +36,7 @@
  	    $(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)
++	./install-default-backend @DEFAULT_DB_TYPE@ %%LIB_RELEASE%% $(DESTDIR)$(libdir)
  
  libtool-uninstall:
  	$(LIBTOOL_UNINSTALL) $(RMF) $(DESTDIR)$(libdir)/libbacsql.la
Index: files/patch-src__cats__install-default-backend.in
===================================================================
--- files/patch-src__cats__install-default-backend.in	(revision 363671)
+++ files/patch-src__cats__install-default-backend.in	(working copy)
@@ -1,10 +1,14 @@
---- 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 @@
+--- src/cats/install-default-backend.in	2014-06-03 08:28:41.000000000 +0000
++++ src/cats/install-default-backend.in	2014-08-03 19:20:21.085513249 +0000
+@@ -38,11 +38,15 @@
     exit 1
  fi
  
 -if [ -f ${install_dir}/libbaccats-${default_backend}-${library_version}${SHLIB_EXT} ]; then
++echo STUFF
++echo "CHECKING FOR ${install_dir}/libbaccats-${default_backend}${SHLIB_EXT}.${library_version}"
++echo THINGS
++
 +if [ -f ${install_dir}/libbaccats-${default_backend}${SHLIB_EXT}.${library_version} ]; then
     #
     # Create a default catalog library pointing to one of the shared libs.
@@ -14,12 +18,12 @@
  
     #
     # Create a relative symlink to the default backend
-@@ -34,7 +34,7 @@
+@@ -50,7 +54,7 @@
     # always work.
     #
     ln -s libbaccats-${default_backend}${SHLIB_EXT} \
--         ${install_dir}/libbaccats-${library_version}${SHLIB_EXT}
-+         ${install_dir}/libbaccats${SHLIB_EXT}.${library_version}
+-	 ${install_dir}/libbaccats-${library_version}${SHLIB_EXT}
++	 ${install_dir}/libbaccats${SHLIB_EXT}.${library_version}
  fi
  
  exit 0
Index: files/patch-src__dird__Makefile.in
===================================================================
--- files/patch-src__dird__Makefile.in	(revision 363671)
+++ files/patch-src__dird__Makefile.in	(working copy)
@@ -1,28 +1,30 @@
---- 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) \
+--- src/dird/Makefile.in	2014-06-03 08:28:41.000000000 +0000
++++ src/dird/Makefile.in	2014-07-31 15:30:20.250513717 +0000
+@@ -64,14 +64,14 @@
+ 	    ../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) \
  	    ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
  	@echo "Linking $@ ..."
 -	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
 +	$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats -L../findlib $(WLDFLAGS) $(LDFLAGS) -o $@ $(SVROBJS) \
- 	      -lbacfind -lbacsql -lbaccats -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \
+ 	      -lbacfind -lbacsql -lbaccats -lbaccfg -lbac -lm $(DLIB) $(DB_LIBS) $(LIBS) \
  	      $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
  
  static-bacula-dir:  Makefile $(SVROBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
- 		   ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../cats/libbacsql$(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) \
+ 	      -lbacfind -lbacsql -lbaccats -lbaccfg -lbac -lm $(DLIB) $(DB_LIBS) $(LIBS) \
  	      $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
  	strip $@
-@@ -141,7 +141,7 @@
+--- src/dird/Makefile.in	2014-06-03 08:28:41.000000000 +0000
++++ src/dird/Makefile.in	2014-07-31 15:30:20.250513717 +0000
+@@ -137,7 +137,7 @@
  depend:
  	@$(MV) Makefile Makefile.bak
  	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
 -	@$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
 +	@echo "# DO NOT DELETE: nice dependency list follows" >> Makefile
- 	@$(CXX) -S -M $(CPPFLAGS) $(XINC) $(PYTHON_INC) -I$(srcdir) -I$(basedir) *.c >> Makefile
+ 	@$(CXX) -S -M $(CPPFLAGS) $(XINC) -I$(srcdir) -I$(basedir) *.c >> Makefile
  	@if test -f Makefile ; then \
  	    $(RMF) Makefile.bak; \
Index: files/patch-src__filed__Makefile.in
===================================================================
--- files/patch-src__filed__Makefile.in	(revision 363671)
+++ files/patch-src__filed__Makefile.in	(working copy)
@@ -1,10 +1,10 @@
---- src/filed/Makefile.in	2012-06-28 09:52:03.000000000 -0500
-+++ src/filed/Makefile.in	2012-08-09 15:04:48.000000000 -0500
-@@ -102,7 +102,7 @@
- static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
+--- src/filed/Makefile.in	2014-06-03 08:28:41.000000000 +0000
++++ src/filed/Makefile.in	2014-07-31 15:32:42.943996352 +0000
+@@ -95,7 +95,7 @@
+ static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
  	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
- 	   $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(LIBS) \
--	   $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS)
+ 	   $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
+-	   $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
 +	   $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS:S/.so/.a/g) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS)
  	strip $@
  
Index: files/patch-src__findlib__Makefile.in
===================================================================
--- files/patch-src__findlib__Makefile.in	(revision 363671)
+++ files/patch-src__findlib__Makefile.in	(working copy)
@@ -5,7 +5,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)
++	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -version-info %%LIB_RELEASE%%
  
  Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
  	cd $(topdir) \
Index: files/patch-src__lib__Makefile.in
===================================================================
--- files/patch-src__lib__Makefile.in	(revision 363671)
+++ files/patch-src__lib__Makefile.in	(working copy)
@@ -5,7 +5,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)
++	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -version-info %%LIB_RELEASE%% $(WRAPLIBS) $(CAP_LIBS) $(ZLIBS) $(OPENSSL_LIBS) $(LIBS) $(DLLIBS)
  
  libbaccfg.a: $(LIBBACCFG_OBJS) 
  	@echo "Making $@ ..."
@@ -14,25 +14,16 @@
  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)
++	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -version-info %%LIB_RELEASE%% $(OPENSSL_LIBS) $(LIBS)
  
  libbacpy.a: $(LIBBACPY_OBJS) 
  	@echo "Making $@ ..."
-@@ -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 @@
+@@ -242,7 +242,7 @@
  depend:
  	@$(MV) Makefile Makefile.bak
  	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
 -	@$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
 +	@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; \
+ 	@for src in $(LIBBAC_SRCS) $(LIBBACCFG_SRCS); do \
+ 	    $(CXX) -S -M -MT `basename $$src .c`$(DEFAULT_OBJECT_TYPE) $(CPPFLAGS) $(XINC) -I$(srcdir) -I$(basedir) $$src >> Makefile; \
  	done
Index: files/patch-src__stored__Makefile.in
===================================================================
--- files/patch-src__stored__Makefile.in	(revision 363671)
+++ files/patch-src__stored__Makefile.in	(working copy)
@@ -1,18 +1,18 @@
 --- 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 @@
+@@ -111,12 +111,12 @@
  
- bacula-sd: Makefile $(SDOBJS) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
+ bacula-sd: Makefile $(SDOBJS) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
  	@echo "Linking $@ ..."
 -	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -o $@ $(SDOBJS) $(ZLIBS) \
 +	$(LIBTOOL_LINK) $(CXX) -L../lib $(WLDFLAGS) $(LDFLAGS) -o $@ $(SDOBJS) $(ZLIBS) \
- 	   -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \
+ 	   -lbaccfg -lbac -lm $(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)
+ static-bacula-sd: Makefile $(SDOBJS) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
 -	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -o $@ $(SDOBJS) $(ZLIBS) \
 +	$(LIBTOOL_LINK) $(CXX) -static -L../lib $(WLDFLAGS) $(LDFLAGS) -o $@ $(SDOBJS) $(ZLIBS) \
- 	   -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \
+ 	   -lbaccfg -lbac -lm $(DLIB) $(LIBS) $(WRAPLIBS) \
  	$(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
  	strip $@
 @@ -111,7 +111,7 @@
@@ -37,8 +37,8 @@
  
  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) \
+-	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZO_LIBS) \
++	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) -L../lib -L../findlib $(LDFLAGS) -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZO_LIBS) \
  	   -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
  
  bscan.o: bscan.c
@@ -60,12 +60,12 @@
  	   -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
  
  Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
-@@ -215,7 +215,7 @@
+@@ -231,7 +231,7 @@
  depend:
  	@$(MV) Makefile Makefile.bak
  	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
 -	@$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
 +	@echo "# DO NOT DELETE: nice dependency list follows" >> Makefile
- 	@$(CXX) -S -M $(CPPFLAGS) $(XINC) $(PYTHON_INC) -I$(srcdir) -I$(basedir) *.c >> Makefile
+ 	@$(CXX) -S -M $(CPPFLAGS) $(XINC) -I$(srcdir) -I$(basedir) *.c >> Makefile
  	@if test -f Makefile ; then \
  	    $(RMF) Makefile.bak; \
Index: files/patch-src__tools__Makefile.in
===================================================================
--- files/patch-src__tools__Makefile.in	(revision 363671)
+++ files/patch-src__tools__Makefile.in	(working copy)
@@ -88,12 +88,12 @@
  
  Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
  	cd $(topdir) \
-@@ -184,7 +184,7 @@
+@@ -193,7 +193,7 @@
  depend:
  	@$(MV) Makefile Makefile.bak
  	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
 -	@$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
 +	@echo "# DO NOT DELETE: nice dependency list follows" >> Makefile
- 	@$(CXX) -S -M $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) *.c >> Makefile
+ 	@$(CXX) -S -M $(CPPFLAGS) -I$(srcdir) -I$(basedir) *.c >> Makefile
  	@if test -f Makefile ; then \
  	    $(RMF) Makefile.bak; \
Index: files/pkg-deinstall.server.in
===================================================================
--- files/pkg-deinstall.server.in	(revision 0)
+++ files/pkg-deinstall.server.in	(working copy)
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+PATH=/bin:/usr/bin:/usr/sbin
+
+# Note how to delete UID/GID
+USER=%%BACULA_USER%%
+GROUP=%%BACULA_GROUP%%
+UID=%%BACULA_UID%%
+GID=%%BACULA_UID%%
+BACULA_DIR=%%BACULA_DIR%%
+
+TMPFILE=/tmp/services-$RANDOM-$$
+
+case "$2" in
+"DEINSTALL")
+	# Delete entries in /etc/services
+        sed -e '/# Bacula port start/,/# Bacule port end/{' \
+            -e 'd' \
+            -e '}' /etc/services > $TMPFILE
+        mv -f $TMPFILE /etc/services
+
+	if [ -d ${BACULA_DIR} ]; then
+	    rmdir ${BACULA_DIR};
+	fi
+	if [ -d ${BACULA_DIR} ]; then
+	    echo "Check if ${BACULA_DIR} is empty and delete it to permanently remove the bacula port."
+	fi
+
+	if pw usershow "${USER}" 2>/dev/null 1>&2; then
+	    echo "To delete Bacula user permanently, use 'pw userdel ${USER}'"
+	    echo "To delete Bacula group permanently, use 'pw groupdel ${GROUP}'"
+	fi
+        ;;
+esac

Property changes on: files/pkg-deinstall.server.in
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: files/pkg-install.server.in
===================================================================
--- files/pkg-install.server.in	(revision 0)
+++ files/pkg-install.server.in	(working copy)
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+PATH=/bin:/usr/bin:/usr/sbin
+
+# Always add lines in /etc/services
+grep -q "bacula-dir" /etc/services
+if [ "$?" != "0" ]; then
+    echo "# Bacula port start
+bacula-dir      9101/tcp   #Bacula director daemon
+bacula-fd       9102/tcp   #Bacula file daemon
+bacula-sd       9103/tcp   #Bacula storage daemon
+# Bacula port end" >> /etc/services
+fi

Property changes on: files/pkg-install.server.in
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 363671)
+++ pkg-plist	(working copy)
@@ -1,35 +1,12 @@
-@sample %%ETCDIR%%/bacula-barcodes.sample
-@group bacula
-@sample %%ETCDIR%%/bacula-dir.conf.sample
-@group wheel
-@sample %%ETCDIR%%/bacula-sd.conf.sample
 lib/libbaccats.la
 lib/libbaccats.so
-lib/libbaccats.so.5
-lib/libbaccats.so.5.0.2
+lib/libbaccats.so.%%MAJOR%%
 lib/libbaccats-%%DBTYPE%%.la
 lib/libbaccats-%%DBTYPE%%.so
-lib/libbaccats-%%DBTYPE%%.so.5
-lib/libbaccats-%%DBTYPE%%.so.5.0.2
+lib/libbaccats-%%DBTYPE%%.so.%%MAJOR%%
 lib/libbacsql.la
 lib/libbacsql.so
-lib/libbacsql.so.5
-lib/libbacsql.so.5.0.2
-man/man1/bacula-bwxconsole.1.gz
-man/man1/bacula-tray-monitor.1.gz
-man/man1/bsmtp.1.gz
-man/man8/bacula-dir.8.gz
-man/man8/bacula-sd.8.gz
-man/man8/bacula.8.gz
-man/man8/bcopy.8.gz
-man/man8/bextract.8.gz
-man/man8/bls.8.gz
-man/man8/bregex.8.gz
-man/man8/bscan.8.gz
-man/man8/btape.8.gz
-man/man8/btraceback.8.gz
-man/man8/bwild.8.gz
-man/man8/dbcheck.8.gz
+lib/libbacsql.so.%%MAJOR%%
 sbin/bacula
 sbin/bacula-dir
 sbin/bacula-sd
@@ -38,14 +15,16 @@
 sbin/bls
 sbin/bregex
 sbin/bscan
+@mode 755
 sbin/bsmtp
+@mode
 sbin/btape
 sbin/btraceback
 sbin/bwild
 sbin/chio-bacula
-@group bacula
 sbin/dbcheck
 @owner bacula
+@group bacula
 %%DATADIR%%/bacula
 %%DATADIR%%/bacula-ctl-dir
 %%DATADIR%%/bacula-ctl-fd
@@ -75,5 +54,18 @@
 %%DATADIR%%/query.sql
 %%DATADIR%%/update_bacula_tables
 %%DATADIR%%/update_%%DBTYPE%%_tables
-@owner root
-@group wheel
+@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
Index: pkg-plist.client
===================================================================
--- pkg-plist.client	(revision 363671)
+++ pkg-plist.client	(working copy)
@@ -1,31 +1,15 @@
-@sample %%ETCDIR%%/bacula-fd.conf.sample
-@group bacula
-@sample %%ETCDIR%%/bconsole.conf.sample
-@group wheel
 lib/libbac.la
 lib/libbac.so
-lib/libbac.so.5
-lib/libbac.so.5.0.2
+lib/libbac.so.%%MAJOR%%
 lib/libbaccfg.la
 lib/libbaccfg.so
-lib/libbaccfg.so.5
-lib/libbaccfg.so.5.0.2
+lib/libbaccfg.so.%%MAJOR%%
 lib/libbacfind.la
 lib/libbacfind.so
-lib/libbacfind.so.5
-lib/libbacfind.so.5.0.2
-lib/libbacpy.la
-lib/libbacpy.so
-lib/libbacpy.so.5
-lib/libbacpy.so.5.0.2
+lib/libbacfind.so.%%MAJOR%%
 lib/bpipe-fd.so
-man/man8/bacula-fd.8.gz
-man/man8/bconsole.8.gz
 sbin/bacula-fd
-@group bacula
 sbin/bconsole
-@group wheel
 @exec mkdir -p %%BACULA_DIR%%
 @dirrmtry %%BACULA_DIR%%
 @dirrmtry share/bacula
-@dirrmtry %%ETCDIR%%