Request for Review - Upgrade Bacula 1.34.6 - 1.36.0

[Drew Tomlinson]

I was using Bacula 1.34.6 from the ports tree and had some problems with 
tape drive settings.  I asked for help on the bacula list and was 
directed to upgrade to 1.36.0.  Instead of waiting for 1.36.0 to 
"magically" appear in the ports tree, I decided to try and upgrade it 
myself. 

So with the help of Dan Langille, I gave it a shot.  The port seems to 
be working and I've tested with make description and portlint as 
described in the Porter's Handbook.  One thing I'm not sure of (among 
many) is that I set PORTREVISION=0 because that's how I interpreted the 
Handbook's instructions.  Yet portlint shows this error:

WARN: Makefile: new ports should not set PORTREVISION.

Basically to make the upgrade, I edited patch-scripts-Makefile.in to 
work with the new source.  Next, I deleted patch-src-wx-console as these 
changes were already included in the 1.36.0 source.

Anyway, I'm not an experienced coder so please carefully review the 
following patch and let me know where I've made mistakes.

Thanks,

Drew

--- BEGIN ---

diff -ruN /usr/ports/sysutils/bacula/Makefile bacula/Makefile
--- /usr/ports/sysutils/bacula/Makefile Thu Aug  5 12:26:48 2004
+++ bacula/Makefile     Sun Nov  7 08:22:07 2004
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=      bacula
-PORTVERSION=   1.34.6
-PORTREVISION=  2
+PORTVERSION=   1.36.0
+PORTREVISION=  0
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=    bacula
diff -ruN /usr/ports/sysutils/bacula/distinfo bacula/distinfo
--- /usr/ports/sysutils/bacula/distinfo Tue Aug  3 13:22:02 2004
+++ bacula/distinfo     Thu Nov  4 18:24:49 2004
@@ -1,2 +1,2 @@
-MD5 (bacula-1.34.6.tar.gz) = 9de593cb206df126a8e27774281c5bf6
-SIZE (bacula-1.34.6.tar.gz) = 4633962
+MD5 (bacula-1.36.0.tar.gz) = caa6b417b4fdd65caf714fb2baf5f385
+SIZE (bacula-1.36.0.tar.gz) = 6806740
diff -ruN /usr/ports/sysutils/bacula/files/patch-scripts-Makefile.in 
bacula/file
s/patch-scripts-Makefile.in
--- /usr/ports/sysutils/bacula/files/patch-scripts-Makefile.in  Tue Aug  
3 13:23
:05 2004
+++ bacula/files/patch-scripts-Makefile.in      Sat Nov  6 21:16:38 2004
@@ -1,34 +1,35 @@
-*** scripts/Makefile.in.orig   Wed Mar 31 00:54:17 2004
---- scripts/Makefile.in        Thu Apr  8 19:56:21 2004
+*** scripts/Makefile.in.orig   Sat Oct  9 05:16:54 2004
+--- scripts/Makefile.in        Sat Nov  6 21:03:33 2004
 ***************
 *** 32,46 ****
        $(MKDIR) $(DESTDIR)$(scriptdir)
-
+ 
   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)$(scriptdir)/bacula
-!      $(INSTALL_SCRIPT) fd $(DESTDIR)$(scriptdir)/fd
-!      $(INSTALL_SCRIPT) mtx-changer $(DESTDIR)$(scriptdir)/mtx-changer
+       $(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,46 ----
        $(MKDIR) $(DESTDIR)$(scriptdir)
-
+ 
   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) mtx-changer $(DESTDIR)$(scriptdir)/mtx-changer
+       $(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)
diff -ruN /usr/ports/sysutils/bacula/files/patch-src-wx-console 
bacula/files/pat
ch-src-wx-console
--- /usr/ports/sysutils/bacula/files/patch-src-wx-console       Sat Jul  
3 07:57
:20 2004
+++ bacula/files/patch-src-wx-console   Wed Dec 31 16:00:00 1969
@@ -1,31 +0,0 @@
-*** src/wx-console/wxbconfigpanel.cpp.orig     Mon May 31 18:30:40 2004
---- src/wx-console/wxbconfigpanel.cpp  Sat Jul  3 16:37:15 2004
-***************
-*** 88,100 ****
-  wxString wxbConfigParam::GetValue() {
-     switch (type) {
-     case text:
-!       return (statictext) ? statictext->GetLabel() : "";
-        break;
-     case modifiableText:
-!       return (textctrl) ? textctrl->GetValue() : "";     
-        break;
-     case choice:
-!       return (choicectrl) ? choicectrl->GetStringSelection() : "";
-        break;     
-     }
-     return "";
---- 88,100 ----
-  wxString wxbConfigParam::GetValue() {
-     switch (type) {
-     case text:
-!      return (statictext != NULL) ? statictext->GetLabel() : wxString("");
-        break;
-     case modifiableText:
-!       return (textctrl != NULL) ? textctrl->GetValue() : wxString("");
-        break;
-     case choice:
-!       return (choicectrl != NULL) ? choicectrl->GetStringSelection() 
: wxStri
ng("");
-        break;
-     }
-     return "";