diff options
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/bacula-gnome-console/PLIST | 6 | ||||
| -rw-r--r-- | sysutils/bacula-wx-console/PLIST | 6 | ||||
| -rw-r--r-- | sysutils/bacula/MESSAGE | 6 | ||||
| -rw-r--r-- | sysutils/bacula/Makefile.common | 4 | ||||
| -rw-r--r-- | sysutils/bacula/PLIST.common | 7 | ||||
| -rw-r--r-- | sysutils/bacula/distinfo | 12 | ||||
| -rw-r--r-- | sysutils/bacula/patches/patch-ag | 16 | ||||
| -rw-r--r-- | sysutils/bacula/patches/patch-ah | 14 |
8 files changed, 36 insertions, 35 deletions
diff --git a/sysutils/bacula-gnome-console/PLIST b/sysutils/bacula-gnome-console/PLIST index f6f5502b38f..f7c598a2dc1 100644 --- a/sysutils/bacula-gnome-console/PLIST +++ b/sysutils/bacula-gnome-console/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2006/02/03 08:20:54 ghen Exp $ -sbin/gnome-console -share/examples/bacula/gnome-console.conf +@comment $NetBSD: PLIST,v 1.2 2007/09/07 15:15:35 ghen Exp $ +sbin/bgnome-console +share/examples/bacula/bgnome-console.conf @unexec ${RMDIR} %D/share/examples/bacula 2>/dev/null || ${TRUE} diff --git a/sysutils/bacula-wx-console/PLIST b/sysutils/bacula-wx-console/PLIST index 0264978637b..2c73254fa37 100644 --- a/sysutils/bacula-wx-console/PLIST +++ b/sysutils/bacula-wx-console/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2006/02/03 08:21:14 ghen Exp $ -sbin/wx-console -share/examples/bacula/wx-console.conf +@comment $NetBSD: PLIST,v 1.2 2007/09/07 15:15:35 ghen Exp $ +sbin/bwx-console +share/examples/bacula/bwx-console.conf @unexec ${RMDIR} %D/share/examples/bacula 2>/dev/null || ${TRUE} diff --git a/sysutils/bacula/MESSAGE b/sysutils/bacula/MESSAGE index 5923daf02c3..857d256ab60 100644 --- a/sysutils/bacula/MESSAGE +++ b/sysutils/bacula/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.3 2007/01/04 12:29:26 ghen Exp $ +$NetBSD: MESSAGE,v 1.4 2007/09/07 15:15:34 ghen Exp $ You can find some useful scripts to create, update and drop the necessary databases, privileges and tables in ${PREFIX}/libexec/bacula/. @@ -10,8 +10,8 @@ ${PREFIX}/libexec/bacula/update_bacula_tables script. Later updates will not require upgrading the database again. The director and storage daemon systems must be upgraded simultaneously, -but you should be able to use a 1.38.x file daemon with a version 2.0.0 -director and storage daemon if you do not use any of the new features. +but you should be able to use an older file daemon with a newer director +and storage daemon if you do not use any of the new features. Please read the full ${PKGNAME_NOREV} release notes for other important remarks. diff --git a/sysutils/bacula/Makefile.common b/sysutils/bacula/Makefile.common index 0bcaf7eb55d..dea1d468341 100644 --- a/sysutils/bacula/Makefile.common +++ b/sysutils/bacula/Makefile.common @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.common,v 1.39 2007/07/04 20:55:00 jlam Exp $ +# $NetBSD: Makefile.common,v 1.40 2007/09/07 15:15:34 ghen Exp $ -DISTNAME= bacula-2.0.3 +DISTNAME= bacula-2.2.2 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bacula/} diff --git a/sysutils/bacula/PLIST.common b/sysutils/bacula/PLIST.common index bde87d66c94..78bbb415430 100644 --- a/sysutils/bacula/PLIST.common +++ b/sysutils/bacula/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.3 2007/01/04 12:29:26 ghen Exp $ +@comment $NetBSD: PLIST.common,v 1.4 2007/09/07 15:15:34 ghen Exp $ libexec/bacula/bacula libexec/bacula/bacula-ctl-dir libexec/bacula/bacula-ctl-fd @@ -12,9 +12,10 @@ libexec/bacula/gconsole libexec/bacula/mtx-changer libexec/bacula/startmysql libexec/bacula/stopmysql -man/man1/bacula-console-gnome.1 +man/man1/bacula-bgnome-console.1 +man/man1/bacula-bwxconsole.1 man/man1/bacula-tray-monitor.1 -man/man1/bacula-wxconsole.1 +man/man1/bat.1 man/man1/bsmtp.1 man/man8/bacula-dir.8 man/man8/bacula-fd.8 diff --git a/sysutils/bacula/distinfo b/sysutils/bacula/distinfo index 213f7b785b0..751122f0637 100644 --- a/sysutils/bacula/distinfo +++ b/sysutils/bacula/distinfo @@ -1,13 +1,13 @@ -$NetBSD: distinfo,v 1.23 2007/04/16 16:10:42 ghen Exp $ +$NetBSD: distinfo,v 1.24 2007/09/07 15:15:34 ghen Exp $ -SHA1 (bacula-2.0.3.tar.gz) = ef58c91243bd819e0ac278b91aeae16639d6c8ce -RMD160 (bacula-2.0.3.tar.gz) = f632885b052f188d2b986c098167009353f32bb3 -Size (bacula-2.0.3.tar.gz) = 2527956 bytes +SHA1 (bacula-2.2.2.tar.gz) = 736355d21bfde9ffbf0d95ae1fa1ce4c54d22a49 +RMD160 (bacula-2.2.2.tar.gz) = 393b1d724e351c41ed2bd9303f9237819d88a778 +Size (bacula-2.2.2.tar.gz) = 3011811 bytes SHA1 (patch-aa) = c1e5ec7c3e78c125b9fbaba97190ead10adbc599 SHA1 (patch-ac) = 585f8a00fe7c0e6e8e4c0b91a0bd32bd2fb81c81 SHA1 (patch-ae) = 69db6d396bd1654b3065d693c5ea2c0afbb8bc61 SHA1 (patch-af) = 6ecbac39c156c81f30ba53b565f55ab5e876b3e0 -SHA1 (patch-ag) = 9e54b2bb207e9ea82326e48b8548ad03bf71fb8d -SHA1 (patch-ah) = f084238634be75e6122bb4ec8c14ed68e24bddb4 +SHA1 (patch-ag) = a2734446ac79380692dd5a2647928919c9b2f2b8 +SHA1 (patch-ah) = 83b156ac18b64d19ea0022103c50c431f3b86b87 SHA1 (patch-ai) = 499a164fcf9e4fc466b691f91203b4293dcee7eb SHA1 (patch-aj) = df5eba3c80d36ecc26c6acb1566a4411c308b2f0 diff --git a/sysutils/bacula/patches/patch-ag b/sysutils/bacula/patches/patch-ag index 84f3d911477..89073bb7b6d 100644 --- a/sysutils/bacula/patches/patch-ag +++ b/sysutils/bacula/patches/patch-ag @@ -1,11 +1,11 @@ -$NetBSD: patch-ag,v 1.3 2005/12/08 01:04:45 wiz Exp $ +$NetBSD: patch-ag,v 1.4 2007/09/07 15:15:35 ghen Exp $ ---- src/gnome2-console/Makefile.in.orig 2004-09-24 14:30:32.000000000 +0200 +--- src/gnome2-console/Makefile.in.orig 2007-06-14 18:54:30.000000000 +0200 +++ src/gnome2-console/Makefile.in -@@ -95,14 +95,14 @@ devclean: realclean - install: all - $(INSTALL_PROGRAM) gnome-console $(DESTDIR)$(sbindir)/gnome-console - @srcconf=gnome-console.conf; \ +@@ -103,14 +103,14 @@ install: all + fi + $(INSTALL_PROGRAM) bgnome-console $(DESTDIR)$(sbindir)/bgnome-console + @srcconf=bgnome-console.conf; \ - if test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \ + if test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \ destconf=$$srcconf.new; \ @@ -17,6 +17,6 @@ $NetBSD: patch-ag,v 1.3 2005/12/08 01:04:45 wiz Exp $ - ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf + echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \ + ${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf - if test -f static-gnome-console; then \ - $(INSTALL_PROGRAM) static-gnome-console $(DESTDIR)$(sbindir)/static-gnome-console; \ + if test -f static-bgnome-console; then \ + $(INSTALL_PROGRAM) static-bgnome-console $(DESTDIR)$(sbindir)/static-bgnome-console; \ fi diff --git a/sysutils/bacula/patches/patch-ah b/sysutils/bacula/patches/patch-ah index 7e3b8f2200d..f7b3d7f3567 100644 --- a/sysutils/bacula/patches/patch-ah +++ b/sysutils/bacula/patches/patch-ah @@ -1,11 +1,11 @@ -$NetBSD: patch-ah,v 1.3 2005/12/08 01:04:45 wiz Exp $ +$NetBSD: patch-ah,v 1.4 2007/09/07 15:15:35 ghen Exp $ ---- src/wx-console/Makefile.in.orig 2005-04-26 17:04:27.000000000 +0200 +--- src/wx-console/Makefile.in.orig 2007-05-27 11:34:40.000000000 +0200 +++ src/wx-console/Makefile.in -@@ -105,14 +105,14 @@ Makefile: $(srcdir)/Makefile.in $(topdir - install: all - $(INSTALL_PROGRAM) wx-console $(DESTDIR)$(sbindir)/wx-console - @srcconf=wx-console.conf; \ +@@ -111,14 +111,14 @@ install: all + fi + $(INSTALL_PROGRAM) bwx-console $(DESTDIR)$(sbindir)/bwx-console + @srcconf=bwx-console.conf; \ - if test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \ + if test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \ destconf=$$srcconf.new; \ @@ -19,4 +19,4 @@ $NetBSD: patch-ah,v 1.3 2005/12/08 01:04:45 wiz Exp $ + ${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf uninstall: - (cd $(DESTDIR)$(sbindir); $(RMF) wx-console) + (cd $(DESTDIR)$(sbindir); $(RMF) bwx-console) |