6 files changed, 66 insertions, 56 deletions

diff --git a/sysutils/bacula-server/Makefile b/sysutils/bacula-server/Makefile
index 0374df6547ec..8a0898720495 100644
--- a/sysutils/bacula-server/Makefile
+++ b/sysutils/bacula-server/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	bacula
-PORTVERSION=	1.36.3
+PORTVERSION=	1.38.0
 #PORTREVISION=	0
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	bacula
 PKGNAMESUFFIX?=	-server
-DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz ${PORTNAME}-doc-${PORTVERSION}.tar.gz
+DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz ${PORTNAME}-docs-${PORTVERSION}.tar.gz
 
 MAINTAINER=	Lars.Koeller@Uni-Bielefeld.DE
 COMMENT?=	The network backup solution (server)
@@ -42,7 +42,7 @@ CONFIGURE_ENV+=	CPPFLAGS="-I/usr/include/readline -I${LOCALBASE}/include" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
-ALL_OPTIONS=	CLIENT_ONLY WXCONSOLE GNOMECONSOLE MYSQL POSTGRESQL MTX
+ALL_OPTIONS=	CLIENT_ONLY WXCONSOLE GNOMECONSOLE SQLITE3 MYSQL POSTGRESQL MTX OPENSSL
 
 .for opt in ${ALL_OPTIONS}
 .if defined(WITH_${opt})
@@ -58,11 +58,14 @@ IS_INTERACTIVE=	yes
 OPTIONS+=	WXCONSOLE "Build with wxGTK based GUI console" off
 OPTIONS+=	GNOMECONSOLE "Build with GNOME based GUI console" off
 .else
-OPTIONS=	MYSQL "Use MySQL database instead of SqLite" off
+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
 .endif
 
+OPTIONS+=	OPENSSL "Enable OpenSSL for encrypted communication" off
+
 # Prepare if gnome-console is selected this must be happen before
 # include of bsd.port.pre.mk!
 WANT_GNOME=	yes
@@ -70,15 +73,15 @@ WANT_GNOME=	yes
 USE_GNOME=	libgnome
 .endif
 
-.include <bsd.port.pre.mk>
-
 PLIST_SUB+=	BACULA_DIR=${BACULA_DIR}
 
+.include <bsd.port.pre.mk>
+
 # Client only or full server version
 .if defined(WITH_CLIENT_ONLY)
 CONFFILES=	fd
 CONFIGURE_ARGS+=	--enable-client-only
-PORTDOCS=	ReleaseNotes bacula.pdf developers.pdf kernstodo html-manual web-manual
+PORTDOCS=	ReleaseNotes bacula.pdf developers.pdf kernstodo manual bacula-web
 PKGDEINSTALL=	${PKGDIR}/pkg-deinstall.client
 PKGINSTALL=	${PKGDIR}/pkg-install.client
 # Build gnome-console
@@ -114,6 +117,10 @@ DBTYPE=			mysql
 USE_PGSQL=		yes
 CONFIGURE_ARGS+=	--with-postgresql=yes
 DBTYPE=			postgresql
+.elif defined(WITH_SQLITE3)
+CONFIGURE_ARGS+=	--with-sqlite3=yes
+LIB_DEPENDS+=		sqlite.3:${PORTSDIR}/databases/sqlite3
+DBTYPE=			sqlite
 .else
 CONFIGURE_ARGS+=	--with-sqlite=yes
 LIB_DEPENDS+=		sqlite.2:${PORTSDIR}/databases/sqlite2
@@ -126,6 +133,14 @@ RUN_DEPENDS+=		${LOCALBASE}/sbin/mtx:${PORTSDIR}/misc/mtx
 .endif
 .endif
 
+.if defined(WITH_OPENSSL)
+CONFIGURE_ARGS+=	--with-openssl
+.endif
+
+.if defined(WITH_CLIENT_ONLY)
+MAN8=bacula.8
+.endif
+
 pre-everything::
 .if !defined(WITH_CLIENT_ONLY)
 	@${ECHO_MSG} "=======> ATTENTION <======="
@@ -139,6 +154,7 @@ pre-everything::
 	@${ECHO_MSG} "  WITH_WXCONSOLE=yes	if you only want a wxGTK based GUI console."
 	@${ECHO_MSG} "  WITH_GNOMECONSOLE=yes	if you only want a GNOME based GUI console."
 	@${ECHO_MSG} "  WITH_MTX=yes		if you want to use mtx instead of chio for autochanger control."
+	@${ECHO_MSG} "  WITH_SQLITE3=yes  	if you want SqLite-3 instead of SqLite-2 as the database."
 .if !defined(WITH_MYSQL) && !defined(WITH_POSTGRESQL)
 	@${ECHO_MSG} "  WITH_MYSQL=yes  	if you want MySQL instead of SqLite as the database."
 	@${ECHO_MSG} "  WITH_POSTGRESQL=yes	if you want PostgreSQL instead of SqLite as the database."
@@ -202,17 +218,23 @@ post-install:
 		${ECHO_CMD} "etc/gnome-console.conf.sample" >> ${TMPPLIST}; \
 	fi
 .endif
+
+#	@${CHMOD} a+x ${WRKSRC}/scripts/bacula.man
+.if defined(WITH_CLIENT_ONLY)
+	${INSTALL_MAN} ${WRKSRC}/scripts/bacula.man ${PREFIX}/man/man8/bacula.8
+.endif
+
 # Documentaion is only installed in -client port
 .if !defined(NOPORTDOCS)
-	for na in html-manual web-manual; do \
+	for na in manual bacula-web; do \
 		${MKDIR} ${DOCSDIR}/$$na ;\
-		cd ${WRKDIR}/${PORTNAME}-doc-${PORTVERSION} && ${FIND} $$na | \
+		cd ${WRKDIR}/${PORTNAME}-docs-${PORTVERSION} && ${FIND} $$na | \
 			${CPIO} -pdm -L -R root:wheel ${DOCSDIR}; \
 	done
-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-doc-${PORTVERSION}/ReleaseNotes ${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-doc-${PORTVERSION}/bacula.pdf ${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-doc-${PORTVERSION}/developers.pdf ${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-doc-${PORTVERSION}/kernstodo ${DOCSDIR}
+	${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
 .else
 # 	Extend /etc/services and install UID/GID
diff --git a/sysutils/bacula-server/distinfo b/sysutils/bacula-server/distinfo
index 7c1b2b9b6c78..9b8317a3f4c4 100644
--- a/sysutils/bacula-server/distinfo
+++ b/sysutils/bacula-server/distinfo
@@ -1,4 +1,4 @@
-MD5 (bacula-1.36.3.tar.gz) = 9499d6277b8673ae7c24dcdbf89ee026
-SIZE (bacula-1.36.3.tar.gz) = 11153154
-MD5 (bacula-doc-1.36.3.tar.gz) = db08859bc193e777c76bcbf5e60f0c7e
-SIZE (bacula-doc-1.36.3.tar.gz) = 4506465
+MD5 (bacula-1.38.0.tar.gz) = 872f5b86404e5c9b47bd56b9ffcb107c
+SIZE (bacula-1.38.0.tar.gz) = 1847955
+MD5 (bacula-docs-1.38.0.tar.gz) = b8b10ca59a23c132cf4658c55103b85e
+SIZE (bacula-docs-1.38.0.tar.gz) = 22003257
diff --git a/sysutils/bacula-server/files/patch-autoconf-Make.common.in b/sysutils/bacula-server/files/patch-autoconf-Make.common.in
deleted file mode 100644
index ca86ad0ebff5..000000000000
--- a/sysutils/bacula-server/files/patch-autoconf-Make.common.in
+++ /dev/null
@@ -1,19 +0,0 @@
-*** autoconf/Make.common.in.orig	Sat Jun 19 23:16:06 2004
---- autoconf/Make.common.in	Sun Jun 27 18:38:11 2004
-***************
-*** 43,49 ****
-  RANLIB = @RANLIB@
-  INSTALL = @INSTALL@
-  # add the -s to the following in PRODUCTION mode
-! INSTALL_PROGRAM = @INSTALL@ -m @SBINPERM@
-  INSTALL_DATA = @INSTALL@ -m 644
-  INSTALL_SCRIPT = @INSTALL@ -m @SBINPERM@
-  INSTALL_CONFIG = @INSTALL@ -m 640
---- 44,50 ----
-  RANLIB = @RANLIB@
-  INSTALL = @INSTALL@
-  # add the -s to the following in PRODUCTION mode
-! INSTALL_PROGRAM = @INSTALL@ -s -m @SBINPERM@
-  INSTALL_DATA = @INSTALL@ -m 644
-  INSTALL_SCRIPT = @INSTALL@ -m @SBINPERM@
-  INSTALL_CONFIG = @INSTALL@ -m 640
diff --git a/sysutils/bacula-server/files/patch-configure b/sysutils/bacula-server/files/patch-configure
index dcec3abe1f50..f370488bbc48 100644
--- a/sysutils/bacula-server/files/patch-configure
+++ b/sysutils/bacula-server/files/patch-configure
@@ -1,7 +1,7 @@
 *** configure.org	Sun Mar  6 16:46:54 2005
 --- configure	Sun Mar  6 16:49:20 2005
 ***************
-*** 21037,21044 ****
+*** 29490,29497 ****
   	DISTVER=`uname -a |awk '{print $3}'`
   	VER=`echo $DISTVER | cut -c 1`
   	if test x$VER = x4 ; then
diff --git a/sysutils/bacula-server/files/patch-scripts-Makefile.in b/sysutils/bacula-server/files/patch-scripts-Makefile.in
index f5e2cee7d1b3..2e337232867c 100644
--- a/sysutils/bacula-server/files/patch-scripts-Makefile.in
+++ b/sysutils/bacula-server/files/patch-scripts-Makefile.in
@@ -1,8 +1,8 @@
-*** scripts/Makefile.in.orig	Wed Nov 17 23:48:21 2004
---- scripts/Makefile.in	Sun Nov 28 15:00:56 2004
+*** scripts/Makefile.in.orig	Sun Nov 13 17:48:12 2005
+--- scripts/Makefile.in	Sun Nov 13 17:48:25 2005
 ***************
-*** 32,50 ****
-  	$(MKDIR) $(DESTDIR)$(scriptdir)
+*** 33,43 ****
+  	$(MKDIR) $(DESTDIR)$(mandir)
   
   install: installdirs
 ! 	$(INSTALL_SCRIPT) startmysql $(DESTDIR)$(scriptdir)/startmysql
@@ -13,31 +13,36 @@
   	@if  test -f ${DESTDIR}${scriptdir}/mtx-changer; then \
   	   echo "  ==> Saving existing mtx-changer to mtx-changer.old"; \
   	   $(MV) -f ${DESTDIR}${scriptdir}/mtx-changer ${DESTDIR}${scriptdir}/mtx-changer.old; \
-  	fi
-  	$(INSTALL_SCRIPT) mtx-changer $(DESTDIR)$(scriptdir)/mtx-changer
-! 	$(INSTALL_DATA)   btraceback.gdb $(DESTDIR)$(scriptdir)/btraceback.gdb
-! 	$(INSTALL_DATA)   btraceback.dbx $(DESTDIR)$(scriptdir)/btraceback.dbx
-! 	$(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback
-  
-  uninstall:
-  	(cd $(DESTDIR)$(scriptdir); $(RMF) startmysql)
---- 32,50 ----
-  	$(MKDIR) $(DESTDIR)$(scriptdir)
+--- 33,43 ----
+  	$(MKDIR) $(DESTDIR)$(mandir)
   
   install: installdirs
 ! #	$(INSTALL_SCRIPT) startmysql $(DESTDIR)$(scriptdir)/startmysql
 ! #	$(INSTALL_SCRIPT) stopmysql $(DESTDIR)$(scriptdir)/stopmysql
 ! #	$(INSTALL_SCRIPT) bconsole $(DESTDIR)$(scriptdir)/bconsole
 ! #	$(INSTALL_SCRIPT) gconsole $(DESTDIR)$(scriptdir)/gconsole
-! 	$(INSTALL_SCRIPT) bacula $(DESTDIR)$(sysconfdir)/rc.d/bacula.sh.sample
+! 	$(INSTALL_SCRIPT) bacula (DESTDIR)$(sysconfdir)/rc.d/z-bacula.sh.sample
   	@if  test -f ${DESTDIR}${scriptdir}/mtx-changer; then \
   	   echo "  ==> Saving existing mtx-changer to mtx-changer.old"; \
   	   $(MV) -f ${DESTDIR}${scriptdir}/mtx-changer ${DESTDIR}${scriptdir}/mtx-changer.old; \
+***************
+*** 48,56 ****
+  	   $(MV) -f ${DESTDIR}${scriptdir}/dvd-handler ${DESTDIR}${scriptdir}/dvd-handler.old; \
   	fi
-  	$(INSTALL_SCRIPT) mtx-changer $(DESTDIR)$(scriptdir)/mtx-changer
+  	$(INSTALL_SCRIPT) dvd-handler $(DESTDIR)$(scriptdir)/dvd-handler
+! 	$(INSTALL_DATA)   btraceback.gdb $(DESTDIR)$(scriptdir)/btraceback.gdb
+! 	$(INSTALL_DATA)   btraceback.dbx $(DESTDIR)$(scriptdir)/btraceback.dbx
+! 	$(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback
+  	gzip <bacula.man >bacula.8.gz
+  	$(INSTALL_DATA)   bacula.8.gz $(DESTDIR)$(mandir)/bacula.8.gz
+  	@rm -f bacula.8.gz
+--- 48,56 ----
+  	   $(MV) -f ${DESTDIR}${scriptdir}/dvd-handler ${DESTDIR}${scriptdir}/dvd-handler.old; \
+  	fi
+  	$(INSTALL_SCRIPT) dvd-handler $(DESTDIR)$(scriptdir)/dvd-handler
 ! #	$(INSTALL_DATA)   btraceback.gdb $(DESTDIR)$(scriptdir)/btraceback.gdb
 ! #	$(INSTALL_DATA)   btraceback.dbx $(DESTDIR)$(scriptdir)/btraceback.dbx
 ! #	$(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback
-  
-  uninstall:
-  	(cd $(DESTDIR)$(scriptdir); $(RMF) startmysql)
+  	gzip <bacula.man >bacula.8.gz
+  	$(INSTALL_DATA)   bacula.8.gz $(DESTDIR)$(mandir)/bacula.8.gz
+  	@rm -f bacula.8.gz
diff --git a/sysutils/bacula-server/pkg-plist b/sysutils/bacula-server/pkg-plist
index 4ec3aae67a80..cd0e1b0b24f1 100644
--- a/sysutils/bacula-server/pkg-plist
+++ b/sysutils/bacula-server/pkg-plist
@@ -28,6 +28,8 @@ sbin/bsmtp
 %%DATADIR%%/update_%%DBTYPE%%_tables
 %%DATADIR%%/delete_catalog_backup
 %%DATADIR%%/make_catalog_backup
+%%DATADIR%%/dvd-handler
+
 @dirrm %%DATADIR%%
 @unexec /usr/bin/killall badula-sd > /dev/null 2>&1 || true
 @unexec /usr/bin/killall bacula-dir > /dev/null 2>&1 || true