- Update to 2.1.12

PR:		113438
Submitted by:	Dan Langille <dan@langille.org> (maintainer)

9 files changed, 130 insertions, 105 deletions

diff --git a/sysutils/bacula-server-devel/Makefile b/sysutils/bacula-server-devel/Makefile
index 0fa0f3f..6313483 100644
--- a/sysutils/bacula-server-devel/Makefile
+++ b/sysutils/bacula-server-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bacula
-DISTVERSION=	1.39.34
+DISTVERSION=	2.1.12
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	bacula
@@ -18,10 +18,13 @@ COMMENT?=	The network backup solution (server) - DEVELOPMENT Version
 CONFLICTS=	bacula-server-[0-9]* bacula-client-[0-9]*
 
 UNIQUENAME?=${PORTNAME}${PKGNAMESUFFIX}
+USE_RC_SUBR?=	bacula-dir bacula-sd
 
-USE_RC_SUBR?=	bacula-dir.sh bacula-sd.sh
-
-SUB_FILES+=	pkg-message
+.if defined(WITH_CLIENT_ONLY)
+SUB_FILES+=	pkg-message.client
+.else
+SUB_FILES+=	pkg-message.server
+.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
@@ -53,8 +56,6 @@ CONFIGURE_ENV+=	CPPFLAGS="-I/usr/include/readline -I${LOCALBASE}/include" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
-ALL_OPTIONS=	CLIENT_ONLY WXCONSOLE GNOMECONSOLE SQLITE3 MYSQL POSTGRESQL MTX OPENSSL DOCS
-
 .for opt in ${ALL_OPTIONS}
 .if defined(WITH_${opt})
 BATCH=	yes
@@ -68,12 +69,12 @@ IS_INTERACTIVE=	yes
 .if defined(WITH_CLIENT_ONLY)
 OPTIONS+=	WXCONSOLE "Build with wxGTK based GUI console" off
 OPTIONS+=	GNOMECONSOLE "Build with GNOME based GUI console" off
-OPTIONS+=	DOCS "Install documention" off
 .else
 OPTIONS=	SQLITE3 "Use SqLite-3 database instead of SqLite-2" off
 OPTIONS+=	MYSQL "Use MySQL database instead of SqLite" off
 OPTIONS+=	POSTGRESQL "Use PostgreSQL database instead of SqLite" off
 OPTIONS+=	MTX "Install mtx for control of autochanger devices" off
+OPTIONS+=	AUTOSETEOT "Enable auto seteotmodel" off
 .endif
 
 OPTIONS+=	NLS "Native Language Support via gettext utilities" on
@@ -90,20 +91,11 @@ PLIST_SUB+=	BACULA_DIR=${BACULA_DIR}
 
 .include <bsd.port.pre.mk>
 
-#DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz
-#.if defined(WITH_DOCS)
-#DISTFILES+=	${PORTNAME}-docs-${PORTVERSION}.tar.gz
-#.endif
-
-.if defined(WITH_DOCS)
-PORTDOCS=	ReleaseNotes bacula.pdf developers.pdf kernstodo manual bacula-web
-.endif
-
 .if defined(WITH_NLS)
 USE_GETTEXT=	yes
 CONFIGURE_ARGS+=	--enable-nls
 .else
-CONFIGURE_ARGS+=	--disable-nls   
+CONFIGURE_ARGS+=	--disable-nls
 .endif
 
 # Client only or full server version
@@ -150,7 +142,7 @@ DBTYPE=			postgresql
 SUB_LIST+=		REQ_MYSQL="" REQ_PGSQL=postgresql
 .elif defined(WITH_SQLITE3)
 CONFIGURE_ARGS+=	--with-sqlite3=yes
-LIB_DEPENDS+=		sqlite3:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS+=		sqlite3-threads>=0:${PORTSDIR}/databases/sqlite3-threads
 DBTYPE=			sqlite3
 .else
 CONFIGURE_ARGS+=	--with-sqlite=yes
@@ -172,7 +164,7 @@ CONFIGURE_ARGS+=	--with-openssl
 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
-MAN1=bsmtp.1 bacula-console-gnome.1 bacula-tray-monitor.1 bacula-wxconsole.1
+MAN1=bsmtp.1 bat.1
 .endif
 MAKE_ARGS+=	-E MAN8 -E MAN1
 MAKE_ENV+=	MAN8="${MAN8}" MAN1="${MAN1}"
@@ -199,8 +191,10 @@ pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "The default DB is SQLite-2!"
 .endif
-	@${ECHO_MSG} "  WITH_DOCS=yes  		if you want the documentation installed."
 	@${ECHO_MSG} "  WITH_OPENSSL=yes  	Enable OpenSSL for encrypted communication."
+.if !defined(WITH_AUTOSETEOT)
+	@${ECHO_MSG} "  WITH_AUTOSETEOT=yes  	Enable auto seteotmodel (especially useful with TWO EOF = no.)"
+.endif
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "===> Using ${DBTYPE} as the bacula database."
 	@${ECHO_MSG} ""
@@ -220,6 +214,9 @@ post-patch:
 #	In server port don't install filed
 	@${REINPLACE_CMD} -e '/^fd_subdirs = /s|src/filed||' -e 's|src/console||' ${WRKSRC}/Makefile.in
 .endif
+.if defined(WITH_AUTOSETEOT)
+	@cd ${WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/eotmodel-src-stored-dev.c.patch
+.endif
 
 pre-install:
 	if [ ! -d "${BACULA_DIR}" ]; then \
@@ -264,19 +261,6 @@ post-install:
 	fi
 .endif
 
-# Documentation is only installed in -client port
-.if !defined(NOPORTDOCS) && defined(WITH_DOCS)
-	for na in manual bacula-web; do \
-		${MKDIR} ${DOCSDIR}/$$na ;\
-		cd ${WRKDIR}/${PORTNAME}-docs-${PORTVERSION} && ${FIND} $$na | \
-			${CPIO} -pdm -L -R root:wheel ${DOCSDIR}; \
-	done
-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${PORTVERSION}/ReleaseNotes ${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-docs-${PORTVERSION}/manual/bacula.pdf ${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-docs-${PORTVERSION}/developers/developers.pdf ${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${PORTVERSION}/kernstodo ${DOCSDIR}
-.endif
-
 #	ensure that users in the bacula group can run bconsole
 	${CHGRP} bacula ${PREFIX}/sbin/bconsole
 .else
@@ -304,60 +288,6 @@ post-install:
 		fi; \
 	done
 
-# Inform user after install about important things ....
-	@${ECHO_MSG} "*********************************************************************"
-	@${ECHO_MSG} "NOTE:"
-	@${ECHO_MSG} "Sample files are installed in ${PREFIX}/etc:"
-	@${ECHO_MSG} "  bconsole.conf.sample, bacula-barcodes.sample, bacula-fd.conf.sample"
-.if !defined(WITH_CLIENT_ONLY)
-	@${ECHO_MSG} "  bacula-sd.conf.sample, bacula-dir.conf.sample"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "An auto-changer manipulation script based on FreeBSDs"
-	@${ECHO_MSG} "chio command is included and installed at"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "  ${PREFIX}/sbin/chio-bacula"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Please have a look at it if you want to use an"
-	@${ECHO_MSG} "autochanger. You have to configure the usage in"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "  ${PREFIX}/etc/bacula-dir.conf"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Take care of correct permissions for changer and"
-	@${ECHO_MSG} "tape device (e.g. /dev/ch0 and /dev/n[r]sa0) i.e."
-	@${ECHO_MSG} "they must be accessible by user bacula."
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Due to lack of some features in the FreeBSD tape driver"
-	@${ECHO_MSG} "implementation you MUST add some OS dependent options to"
-	@${ECHO_MSG} "the bacula-sd.conf file:"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "  Hardware End of Medium = no;"
-	@${ECHO_MSG} "  Backward Space Record = no;"
-	@${ECHO_MSG} "  Backward Space File = no;"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "With 2 filemarks at EOT (see man mt):"
-	@${ECHO_MSG} "  Fast Forward Space File = no;"
-	@${ECHO_MSG} "  BSF at EOM = yes;"
-	@${ECHO_MSG} "  TWO EOF = yes;"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "With 1 filemarks at EOT (see man mt):"
-	@${ECHO_MSG} "  Fast Forward Space File = yes;"
-	@${ECHO_MSG} "  BSF at EOM = no;"
-	@${ECHO_MSG} "  TWO EOF = no;"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "NOTE: YOU CAN SWITCH EOT model ONLY when starting"
-	@${ECHO_MSG} "      from scratch with EMPTY tapes!!!!"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "It is also important that all the scripts accessed"
-	@${ECHO_MSG} "by RunBeforeJob and RunAfterJob can be executed by"
-	@${ECHO_MSG} "the user bacula."
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "For USB support read the bacula manual!! It could be necessary"
-	@${ECHO_MSG} "to configure/compile a new kernel!"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Look at ${PREFIX}/share/bacula/update_bacula_tables for"
-	@${ECHO_MSG} "database update procedure. Details can be found in the"
-	@${ECHO_MSG} "ReleaseNotes"
-.endif
-	@${ECHO_MSG} "*********************************************************************"
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/bacula-server-devel/distinfo b/sysutils/bacula-server-devel/distinfo
index 6c11cd6..1b75f42 100644
--- a/sysutils/bacula-server-devel/distinfo
+++ b/sysutils/bacula-server-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (bacula-1.39.34.tar.gz) = 872e2570a7616e1734128869312030e0
-SHA256 (bacula-1.39.34.tar.gz) = a848fe27113ea713beb79dd21c7c382458fb4cb4b5c5e2f4868e459b5605a050
-SIZE (bacula-1.39.34.tar.gz) = 2487005
+MD5 (bacula-2.1.12.tar.gz) = c0fcb9a38462ee9a2e47fe550a60fcc6
+SHA256 (bacula-2.1.12.tar.gz) = 4cf59985aa2847ba95fc05fd938c655ff191be3c60d28ed8f5c24eb62b045d83
+SIZE (bacula-2.1.12.tar.gz) = 2867285
diff --git a/sysutils/bacula-server-devel/files/bacula-dir.sh.in b/sysutils/bacula-server-devel/files/bacula-dir.in
index b91a06e..5739a30 100644
--- a/sysutils/bacula-server-devel/files/bacula-dir.sh.in
+++ b/sysutils/bacula-server-devel/files/bacula-dir.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/sysutils/bacula-server-devel/files/Attic/bacula-dir.sh.in,v 1.3 2006-09-09 20:17:39 itetcu Exp $
+# $FreeBSD$
 #
 # PROVIDE: utility
 # REQUIRE: DAEMON %%REQ_MYSQL%% %%REQ_PGSQL%%
diff --git a/sysutils/bacula-server-devel/files/bacula-fd.sh.in b/sysutils/bacula-server-devel/files/bacula-fd.in
index 46c4226..e974c8b 100644
--- a/sysutils/bacula-server-devel/files/bacula-fd.sh.in
+++ b/sysutils/bacula-server-devel/files/bacula-fd.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/sysutils/bacula-server-devel/files/Attic/bacula-fd.sh.in,v 1.2 2006-09-09 20:17:39 itetcu Exp $
+# $FreeBSD$
 #
 # PROVIDE: utility
 # REQUIRE: DAEMON
@@ -18,14 +18,14 @@
 
 name="bacula_fd"
 rcvar=${name}_enable
-command=/usr/local/sbin/bacula-fd
+command=%%PREFIX%%/sbin/bacula-fd
 
 load_rc_config $name
 
 pidfile="${bacula_fd_pidfile}"
 
 : ${bacula_fd_enable="NO"}
-: ${bacula_fd_flags=" -u root -g wheel -v -c /usr/local/etc/bacula-fd.conf"}
+: ${bacula_fd_flags=" -u root -g wheel -v -c %%PREFIX%%/etc/bacula-fd.conf"}
 : ${bacula_fd_pidfile="/var/run/bacula-fd.9102.pid"}
 
 run_rc_command "$1"
diff --git a/sysutils/bacula-server-devel/files/bacula-sd.conf.in b/sysutils/bacula-server-devel/files/bacula-sd.conf.in
new file mode 100644
index 0000000..9c3bbaf
--- /dev/null
+++ b/sysutils/bacula-server-devel/files/bacula-sd.conf.in
@@ -0,0 +1,20 @@
+--- src/stored/bacula-sd.conf.in.org	Tue Feb 13 18:56:09 2007
++++ src/stored/bacula-sd.conf.in	Tue Feb 13 18:56:16 2007
+@@ -152,6 +152,7 @@
+  #Device {
+  #  Name = "DVD-Writer"
+  #  Media Type = DVD
++#  Device Type = DVD
+  #  Archive Device = /dev/hdc
+  #  LabelMedia = yes;                   # lets Bacula label unlabeled media
+  #  Random Access = Yes;
+@@ -162,7 +163,9 @@
+  #  RequiresMount = yes;
+  #  MountPoint = /mnt/cdrom;
+  #  MountCommand = "/bin/mount -t iso9660 -o ro %a %m";
++#  MountCommand = "/sbin/mount -t cd9660 -o ro %a %m";     # FreeBSD
+  #  UnmountCommand = "/bin/umount %m";
++#  UnmountCommand = "/sbin/umount %m";                     # FreeBSD
+  #  SpoolDirectory = /tmp/backup;
+  #  WritePartCommand = "/etc/bacula/dvd-handler %a write %e %v"
+  #  FreeSpaceCommand = "/etc/bacula/dvd-handler %a free"
diff --git a/sysutils/bacula-server-devel/files/bacula-sd.sh.in b/sysutils/bacula-server-devel/files/bacula-sd.in
index c4dddc1..3288a3e 100644
--- a/sysutils/bacula-server-devel/files/bacula-sd.sh.in
+++ b/sysutils/bacula-server-devel/files/bacula-sd.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/sysutils/bacula-server-devel/files/Attic/bacula-sd.sh.in,v 1.3 2006-09-09 20:17:39 itetcu Exp $
+# $FreeBSD$
 #
 # PROVIDE: utility
 # REQUIRE: DAEMON
@@ -18,14 +18,14 @@
 
 name="bacula_sd"
 rcvar=`set_rcvar`
-command=/usr/local/sbin/bacula-sd
+command=%%PREFIX%%/sbin/bacula-sd
 
 load_rc_config $name
 
 pidfile="${bacula_sd_pidfile}"
 
 : ${bacula_sd_enable="NO"}
-: ${bacula_sd_flags=" -u bacula -g bacula -v -c /usr/local/etc/bacula-sd.conf"}
+: ${bacula_sd_flags=" -u bacula -g bacula -v -c %%PREFIX%%/etc/bacula-sd.conf"}
 : ${bacula_sd_pidfile="/var/run/bacula-sd.9103.pid"}
 
 run_rc_command "$1"
diff --git a/sysutils/bacula-server-devel/files/eotmodel-src-stored-dev.c.patch b/sysutils/bacula-server-devel/files/eotmodel-src-stored-dev.c.patch
new file mode 100644
index 0000000..9479683
--- /dev/null
+++ b/sysutils/bacula-server-devel/files/eotmodel-src-stored-dev.c.patch
@@ -0,0 +1,10 @@
+Index: src/stored/dev.c
+@@ -2368,7 +2368,7 @@
+       }
+    }
+ /* Turn this on later when fully tested */
+-#if defined(xxxMTIOCSETEOTMODEL) 
++#if defined(MTIOCSETEOTMODEL) 
+    uint32_t neof;
+    if (dev->has_cap(CAP_TWOEOF)) {
+       neof = 2;
diff --git a/sysutils/bacula-server-devel/files/pkg-message.in b/sysutils/bacula-server-devel/files/pkg-message.client.in
index 90be917..bb9c496 100644
--- a/sysutils/bacula-server-devel/files/pkg-message.in
+++ b/sysutils/bacula-server-devel/files/pkg-message.client.in
@@ -1,11 +1,14 @@
 ################################################################################
+
+NOTE:
+Sample files are installed in ${PREFIX}/etc:
+bconsole.conf.sample, bacula-barcodes.sample, bacula-fd.conf.sample
+
   Please read this file:
 
 	%%DOCSDIR%%/ReleaseNotes
 
-  for the upgrade procedure!
-
-  IF YOU IGNORE THIS you may !! LOSE DATA !!
+  as installed by docs port for the upgrade procedure.
 
 IMPORTANT UPGRADE NOTES:
 
@@ -17,8 +20,4 @@ IMPORTANT UPGRADE NOTES:
 
 Read the ReleaseNotes for further information.
 
-  Please note that bacula-server no longer installs the client
-  and that the documentation can be optionally installed with the
-  client port (sysutils/bacula-client).
-
 ################################################################################
diff --git a/sysutils/bacula-server-devel/files/pkg-message.server.in b/sysutils/bacula-server-devel/files/pkg-message.server.in
new file mode 100644
index 0000000..cf74238
--- /dev/null
+++ b/sysutils/bacula-server-devel/files/pkg-message.server.in
@@ -0,0 +1,66 @@
+################################################################################
+NOTE:
+
+An auto-changer manipulation script based on FreeBSDs
+chio command is included and installed at
+
+  ${PREFIX}/sbin/chio-bacula
+
+Please have a look at it if you want to use an
+autochanger. You have to configure the usage in
+
+  ${PREFIX}/etc/bacula-dir.conf
+
+Take care of correct permissions for changer and
+tape device (e.g. /dev/ch0 and /dev/n[r]sa0) i.e.
+they must be accessible by user bacula.
+
+Due to lack of some features in the FreeBSD tape driver
+implementation you MUST add some OS dependent options to
+the bacula-sd.conf file:
+
+  Hardware End of Medium = no;
+  Backward Space Record  = no;
+  Backward Space File    = no;
+
+With 2 filemarks at EOT (see man mt):
+  Fast Forward Space File = no;
+  BSF at EOM = yes;
+  TWO EOF    = yes;
+
+With 1 filemarks at EOT (see man mt):
+  Fast Forward Space File = yes;
+  BSF at EOM = no;
+  TWO EOF   = no;
+
+NOTE: YOU CAN SWITCH EOT model ONLY when starting
+      from scratch with EMPTY tapes.
+
+It is also important that all the scripts accessed
+by RunBeforeJob and RunAfterJob will be executed by
+the user bacula.  Check your permissions.
+
+For USB support read the bacula manual. It could be necessary
+to configure/compile a new kernel.
+
+Look at ${PREFIX}/share/bacula/update_bacula_tables for
+database update procedure. Details can be found in the
+ReleaseNotes
+
+  Please read this file:
+
+	%%DOCSDIR%%/ReleaseNotes
+
+  as installed by docs port for the upgrade procedure.
+
+IMPORTANT UPGRADE NOTES FOR THIS RELEASE:
+
+- A database upgrade is required.
+- Your Director and SD must be simultaneously upgraded.
+- The "Accept Any Volume" directive has been removed.
+
+- Lots of new features
+
+Read the ReleaseNotes for further information.
+
+################################################################################