--d6Gm4EdcadzBjdND
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Tue, Sep 04, 2007 at 10:55:34AM -0500, Peter Eisch wrote:
> I recall seeing the notice that the former maintainer of the package is
> no longer in a place to keep the release found in pkgsrc fresh.  It seems
> to be a wee bit complicated of a package for a n00b maintainer to raise a
> hand.  If there were tender guidance I might be of use though.


I updated bacula to the recent 2.2.2 release, but as said I can no longer
test its functionality.  If you could build and test with the attached diff
I can commit it.

	Geert


--d6Gm4EdcadzBjdND
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="bacula-2.2.2.diff"

Index: bacula/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/bacula/Makefile.common,v
retrieving revision 1.39
diff -u -r1.39 Makefile.common
--- bacula/Makefile.common	4 Jul 2007 20:55:00 -0000	1.39
+++ bacula/Makefile.common	6 Sep 2007 12:41:32 -0000
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile.common,v 1.39 2007/07/04 20:55:00 jlam Exp $
 
-DISTNAME=		bacula-2.0.3
+DISTNAME=		bacula-2.2.2
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=bacula/}
 
Index: bacula/PLIST.common
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/bacula/PLIST.common,v
retrieving revision 1.3
diff -u -r1.3 PLIST.common
--- bacula/PLIST.common	4 Jan 2007 12:29:26 -0000	1.3
+++ bacula/PLIST.common	6 Sep 2007 12:41:32 -0000
@@ -12,9 +12,10 @@
 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
Index: bacula/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/bacula/distinfo,v
retrieving revision 1.23
diff -u -r1.23 distinfo
--- bacula/distinfo	16 Apr 2007 16:10:42 -0000	1.23
+++ bacula/distinfo	6 Sep 2007 12:41:32 -0000
@@ -1,13 +1,13 @@
 $NetBSD: distinfo,v 1.23 2007/04/16 16:10:42 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
Index: bacula/patches/patch-ag
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/bacula/patches/patch-ag,v
retrieving revision 1.3
diff -u -r1.3 patch-ag
--- bacula/patches/patch-ag	8 Dec 2005 01:04:45 -0000	1.3
+++ bacula/patches/patch-ag	6 Sep 2007 12:41:32 -0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-ag,v 1.3 2005/12/08 01:04:45 wiz Exp $
+$NetBSD$
 
---- 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 @@
 -	${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 
Index: bacula/patches/patch-ah
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/bacula/patches/patch-ah,v
retrieving revision 1.3
diff -u -r1.3 patch-ah
--- bacula/patches/patch-ah	8 Dec 2005 01:04:45 -0000	1.3
+++ bacula/patches/patch-ah	6 Sep 2007 12:41:32 -0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-ah,v 1.3 2005/12/08 01:04:45 wiz Exp $
+$NetBSD$
 
---- 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 @@
 +	${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf
  
  uninstall:
- 	(cd $(DESTDIR)$(sbindir); $(RMF) wx-console)
+ 	(cd $(DESTDIR)$(sbindir); $(RMF) bwx-console)
Index: bacula-gnome-console/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/bacula-gnome-console/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- bacula-gnome-console/PLIST	3 Feb 2006 08:20:54 -0000	1.1.1.1
+++ bacula-gnome-console/PLIST	6 Sep 2007 12:41:32 -0000
@@ -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
+sbin/bgnome-console
+share/examples/bacula/bgnome-console.conf
 @unexec ${RMDIR} %D/share/examples/bacula 2>/dev/null || ${TRUE}
Index: bacula-wx-console/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/bacula-wx-console/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- bacula-wx-console/PLIST	3 Feb 2006 08:21:14 -0000	1.1.1.1
+++ bacula-wx-console/PLIST	6 Sep 2007 12:41:32 -0000
@@ -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
+sbin/bwx-console
+share/examples/bacula/bwx-console.conf
 @unexec ${RMDIR} %D/share/examples/bacula 2>/dev/null || ${TRUE}

--d6Gm4EdcadzBjdND--