diff -ruN /usr/ports/sysutils/bacula-server/Makefile bacula-server/Makefile --- /usr/ports/sysutils/bacula-server/Makefile 2009-12-19 23:13:14.000000000 +0000 +++ bacula-server/Makefile 2010-01-25 17:12:25.000000000 +0000 @@ -6,7 +6,7 @@ # PORTNAME= bacula -DISTVERSION= 3.0.3 +DISTVERSION= 5.0.0 CATEGORIES?= sysutils MASTER_SITES= SF/bacula/bacula/${PORTVERSION} @@ -60,7 +60,6 @@ --disable-conio \ --enable-batch-insert \ --with-plugindir=${LOCALBASE}/lib \ - --with-libdir=${PREFIX}lib/bacula \ --with-dump-email=root@localhost \ --with-job-email=root@localhost \ --with-db-name=bacula \ @@ -94,7 +93,6 @@ .if defined(WITH_CLIENT_ONLY) OPTIONS= WXCONSOLE "Build with wxGTK based GUI console: deprecated" off -OPTIONS+= GNOMECONSOLE "Build with GNOME based GUI console: deprecated" off OPTIONS+= SFDAEMON "Build with staticly compiled file daemon" off .elif defined(WITH_BAT) OPTIONS= @@ -108,13 +106,6 @@ OPTIONS+= NLS "Native Language Support via gettext utilities" on OPTIONS+= OPENSSL "Enable OpenSSL for encrypted communication" off -# Prepare if bgnome-console is selected this must be happen before -# include of bsd.port.pre.mk! -WANT_GNOME= yes -.if defined(WITH_GNOMECONSOLE) -USE_GNOME= libgnome gnomelibs libgnomeui -.endif - .if !defined(WITH_BAT) PLIST_SUB+= BACULA_DIR=${BACULA_DIR} .endif @@ -146,15 +137,6 @@ .else PLIST_SUB+= SFDAEMON="@comment " .endif -# Build bgnome-console -.if defined(WITH_GNOMECONSOLE) -CONFIGURE_ARGS+= --enable-gnome -PLIST_SUB+= GNOMECONS="" -.else -# We didn't need GTK (it's not possible to put WANT_GNOME in an .if statement!) -WITHOUT_GNOME= yes -PLIST_SUB+= GNOMECONS="@comment " -.endif # Build bwx-console .if defined(WITH_WXCONSOLE) USE_WX= 2.4 @@ -162,13 +144,10 @@ CONFIGURE_ENV+= WXCONFIG="${WX_CONFIG}" PLIST_SUB+= WXCONS="" .else -# We didn't need GTK (it's not possible to put WANT_GNOME in an .if statement!) -WITHOUT_GNOME= yes PLIST_SUB+= WXCONS="@comment " .endif .else # Server only Options -PLIST_SUB+= GNOMECONS="@comment " PLIST_SUB+= WXCONS="@comment " CONFFILES= sd dir .if defined(WITH_MYSQL) @@ -207,7 +186,7 @@ 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-bgnome-console.1 bacula-tray-monitor.1 bacula-bwxconsole.1 +MAN1=bsmtp.1 bacula-tray-monitor.1 bacula-bwxconsole.1 .endif .endif @@ -220,7 +199,6 @@ @${ECHO_MSG} "" @${ECHO_MSG} " WITH_CLIENT_ONLY=yes if you only want the file daemon." @${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." @${ECHO_MSG} " WITH_SFDAEMON=yes if you want staticly compiled file daemon (client)." @@ -292,14 +270,6 @@ ${ECHO_CMD} "etc/bwx-console.conf.sample" >> ${TMPPLIST}; \ fi .endif -.if defined(WITH_GNOMECONSOLE) - if [ -f ${PREFIX}/etc/bgnome-console.conf.new ]; then \ - ${ECHO_CMD} "etc/bgnome-console.conf.new" >> ${TMPPLIST}; \ - elif [ -f ${PREFIX}/etc/bgnome-console.conf ]; then \ - ${MV} ${PREFIX}/etc/bgnome-console.conf ${PREFIX}/etc/bgnome-console.conf.sample; \ - ${ECHO_CMD} "etc/bgnome-console.conf.sample" >> ${TMPPLIST}; \ - fi -.endif # ensure that users in the bacula group can run bconsole ${CHGRP} bacula ${PREFIX}/sbin/bconsole @@ -316,6 +286,8 @@ # 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 + ${CHGRP} bacula ${PREFIX}/etc/bacula-dir.conf.new + ${CHGRP} bacula ${PREFIX}/sbin/dbcheck .endif # Install leaves existing conf files untouched. Respect this here! diff -ruN /usr/ports/sysutils/bacula-server/distinfo bacula-server/distinfo --- /usr/ports/sysutils/bacula-server/distinfo 2009-10-30 09:40:36.000000000 +0000 +++ bacula-server/distinfo 2010-01-25 13:49:45.000000000 +0000 @@ -1,3 +1,3 @@ -MD5 (bacula-3.0.3.tar.gz) = feba58691b674b12056359d459ad6940 -SHA256 (bacula-3.0.3.tar.gz) = 3592cf532a3d34ac88afd3c9ada255d9c5b10259c216e5ff4293bba71441e966 -SIZE (bacula-3.0.3.tar.gz) = 3903085 +MD5 (bacula-5.0.0.tar.gz) = 68e008d2578a6d9a50af60439db17dcb +SHA256 (bacula-5.0.0.tar.gz) = 4c6344807769d1b6b61f9cbddc0a5dc1160c3eb51744b23c790fcb57947ac294 +SIZE (bacula-5.0.0.tar.gz) = 4075825 diff -ruN /usr/ports/sysutils/bacula-server/files/pkg-message.server.in bacula-server/files/pkg-message.server.in --- /usr/ports/sysutils/bacula-server/files/pkg-message.server.in 2009-08-14 20:00:36.000000000 +0000 +++ bacula-server/files/pkg-message.server.in 2010-01-25 17:27:06.000000000 +0000 @@ -55,8 +55,16 @@ IMPORTANT UPGRADE NOTES FOR THIS RELEASE: -- bacula-client and bacula-server do not need to be simultaneously -upgraded. +As always, both the Director and Storage daemon must be upgraded at +the same time, and on any given machine, you must run only one version +of Bacula. This means that on the Director and Storage daemon machines, +you *must* upgrade your File daemon as well. + +New database Catalog format in version 5.0.0 (3.1.9 or later). + +If upgrading to 5.x from < 5.x, you must run the update_bacula_tables +script. Afterwards, check the ownership on any new tables +and make sure they are consisten with existing tables. Read the ReleaseNotes for further information. diff -ruN /usr/ports/sysutils/bacula-server/pkg-plist bacula-server/pkg-plist --- /usr/ports/sysutils/bacula-server/pkg-plist 2009-08-14 20:00:36.000000000 +0000 +++ bacula-server/pkg-plist 2010-01-25 15:11:45.000000000 +0000 @@ -1,4 +1,3 @@ -lib/bpipe-fd.so lib/libbac.la lib/libbac.so lib/libbac.so.1 @@ -32,9 +31,10 @@ %%DATADIR%%/bacula-ctl-dir %%DATADIR%%/bacula-ctl-fd %%DATADIR%%/bacula-ctl-sd +%%DATADIR%%/bacula_config %%DATADIR%%/bconsole -%%DATADIR%%/btraceback.gdb %%DATADIR%%/btraceback.dbx +%%DATADIR%%/btraceback.gdb %%DATADIR%%/create_bacula_database %%DATADIR%%/create_%%DBTYPE%%_database %%DATADIR%%/delete_catalog_backup @@ -44,11 +44,11 @@ %%DATADIR%%/drop_%%DBTYPE%%_database %%DATADIR%%/drop_%%DBTYPE%%_tables %%DATADIR%%/dvd-handler -%%DATADIR%%/gconsole %%DATADIR%%/grant_bacula_privileges %%DATADIR%%/grant_%%DBTYPE%%_privileges %%DATADIR%%/make_bacula_tables %%DATADIR%%/make_catalog_backup +%%DATADIR%%/make_catalog_backup.pl %%DATADIR%%/make_%%DBTYPE%%_tables %%DATADIR%%/mtx-changer %%DATADIR%%/mtx-changer.conf diff -ruN /usr/ports/sysutils/bacula-server/pkg-plist.client bacula-server/pkg-plist.client --- /usr/ports/sysutils/bacula-server/pkg-plist.client 2009-10-11 13:36:08.000000000 +0000 +++ bacula-server/pkg-plist.client 2010-01-25 15:31:43.000000000 +0000 @@ -14,7 +14,6 @@ %%SFDAEMON%%sbin/static-bacula-fd sbin/bacula-fd sbin/bconsole -%%GNOMECONS%%sbin/gnome-console %%WXCONS%%sbin/bwx-console @unexec /usr/bin/killall badula-fd > /dev/null 2>&1 || true @exec mkdir -p %%BACULA_DIR%%