6 files changed, 136 insertions, 0 deletions

diff --git a/sysutils/bacula-server/files/patch-autoconf-Make.common.in b/sysutils/bacula-server/files/patch-autoconf-Make.common.in
new file mode 100644
index 000000000000..d2558dda2b60
--- /dev/null
+++ b/sysutils/bacula-server/files/patch-autoconf-Make.common.in
@@ -0,0 +1,19 @@
+--- autoconf/Make.common.in.orig	Thu Jan 23 23:28:18 2003
++++ autoconf/Make.common.in	Mon Feb 24 14:16:07 2003
+@@ -30,6 +30,7 @@
+ sbindir = @sbindir@
+ sysconfdir = @sysconfdir@
+ mandir = @mandir@/man1
++datadir = @datadir@
+ manext = 1
+ 
+ # Tools & program stuff
+@@ -49,7 +50,7 @@
+ RANLIB = @RANLIB@
+ INSTALL = @INSTALL@
+ # add the -s to the following in PRODUCTION mode
+-INSTALL_PROGRAM = @INSTALL@ -m 755
++INSTALL_PROGRAM = @INSTALL@ -s -m 755
+ INSTALL_DATA = @INSTALL@ -m 644
+ INSTALL_SCRIPT = @INSTALL@ -m 755
+ INSTALL_CONFIG = @INSTALL@ -m 640
diff --git a/sysutils/bacula-server/files/patch-configure b/sysutils/bacula-server/files/patch-configure
new file mode 100644
index 000000000000..f7b2bec4e6cd
--- /dev/null
+++ b/sysutils/bacula-server/files/patch-configure
@@ -0,0 +1,15 @@
+--- configure.orig	Mon Feb 24 12:03:22 2003
++++ configure	Mon Feb 24 12:04:31 2003
+@@ -3944,9 +3944,9 @@
+                    { echo "configure: error: Unable to find sqlite.h in standard locations" 1>&2; exit 1; }
+                 fi
+         else
+-                if test -f $withval/sqlite.h; then
+-                        SQLITE_INCDIR=$withval
+-                        SQLITE_LIBDIR=$withval
++                if test -f $withval/include/sqlite.h; then
++                        SQLITE_INCDIR=$withval/include
++                        SQLITE_LIBDIR=$withval/lib
+                         SQLITE_BINDIR=$withval
+                 else
+                    echo "$ac_t""no" 1>&6
diff --git a/sysutils/bacula-server/files/patch-scripts-Makefile.in b/sysutils/bacula-server/files/patch-scripts-Makefile.in
new file mode 100644
index 000000000000..c8b46955ea23
--- /dev/null
+++ b/sysutils/bacula-server/files/patch-scripts-Makefile.in
@@ -0,0 +1,25 @@
+--- scripts/Makefile.in.orig	Mon Feb 24 13:44:14 2003
++++ scripts/Makefile.in	Mon Feb 24 13:54:57 2003
+@@ -31,14 +31,14 @@
+ 	$(MKDIR) $(DESTDIR)$(sbindir)
+ 
+ install: installdirs
+-	$(INSTALL_SCRIPT) startmysql $(DESTDIR)$(sysconfdir)/startmysql
+-	$(INSTALL_SCRIPT) stopmysql $(DESTDIR)$(sysconfdir)/stopmysql
+-	$(INSTALL_SCRIPT) console $(DESTDIR)$(sysconfdir)/console
+-	$(INSTALL_SCRIPT) bacula $(DESTDIR)$(sysconfdir)/bacula
+-	$(INSTALL_SCRIPT) fd $(DESTDIR)$(sysconfdir)/fd
+-	$(INSTALL_SCRIPT) mtx-changer $(DESTDIR)$(sysconfdir)/mtx-changer
+-	$(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback
+-	$(INSTALL_DATA)   btraceback.gdb $(DESTDIR)$(sbindir)/btraceback.gdb
++#	$(INSTALL_SCRIPT) startmysql $(DESTDIR)$(sysconfdir)/startmysql
++#	$(INSTALL_SCRIPT) stopmysql $(DESTDIR)$(sysconfdir)/stopmysql
++#	$(INSTALL_SCRIPT) console $(DESTDIR)$(sysconfdir)/console
++	$(INSTALL_SCRIPT) bacula $(DESTDIR)$(sysconfdir)/rc.d/bacula.sh.sample
++	$(INSTALL_SCRIPT) fd $(DESTDIR)$(sysconfdir)/rc.d/fd.sh.sample
++#	$(INSTALL_SCRIPT) mtx-changer $(DESTDIR)$(sysconfdir)/mtx-changer
++#	$(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback
++#	$(INSTALL_DATA)   btraceback.gdb $(DESTDIR)$(sbindir)/btraceback.gdb
+ 
+ uninstall:
+ 	(cd $(DESTDIR)$(sysconfdir); $(RMF) startmysql)
diff --git a/sysutils/bacula-server/files/patch-scripts-fd.in b/sysutils/bacula-server/files/patch-scripts-fd.in
new file mode 100644
index 000000000000..783b842b4a88
--- /dev/null
+++ b/sysutils/bacula-server/files/patch-scripts-fd.in
@@ -0,0 +1,13 @@
+--- scripts/fd.in.orig	Mon Feb 24 13:49:20 2003
++++ scripts/fd.in	Mon Feb 24 13:49:59 2003
+@@ -135,8 +135,8 @@
+ 		    return 1
+ 	    fi
+     fi
+-    # See if /var/lock/subsys/$1 exists
+-    if [ -f /var/lock/subsys/$1 ]; then
++    # See if @subsysdir@/$1 exists
++    if [ -f @subsysdir@/$1 ]; then
+ 	    echo "$1 dead but subsys locked"
+ 	    return 2
+     fi
diff --git a/sysutils/bacula-server/files/patch-src-cats-Makefile.in b/sysutils/bacula-server/files/patch-src-cats-Makefile.in
new file mode 100644
index 000000000000..599be6680780
--- /dev/null
+++ b/sysutils/bacula-server/files/patch-src-cats-Makefile.in
@@ -0,0 +1,32 @@
+--- src/cats/Makefile.in.orig	Fri Jan  3 22:09:11 2003
++++ src/cats/Makefile.in	Mon Feb 24 14:07:35 2003
+@@ -12,6 +12,7 @@
+ thisdir = src/cats
+ 
+ DEBUG=@DEBUG@
++MKDIR=$(topdir)/autoconf/mkinstalldirs
+ 
+ SQL_INC=@SQL_INCLUDE@
+ 
+@@ -70,13 +71,14 @@
+ 	(cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS)
+ 
+ install:
+-	$(INSTALL_SCRIPT) create_@DB_NAME@_database $(DESTDIR)$(sysconfdir)/create_@DB_NAME@_database
+-	$(INSTALL_SCRIPT) drop_@DB_NAME@_tables $(DESTDIR)$(sysconfdir)/drop_@DB_NAME@_tables
+-	$(INSTALL_SCRIPT) make_@DB_NAME@_tables $(DESTDIR)$(sysconfdir)/make_@DB_NAME@_tables
+-	$(INSTALL_SCRIPT) drop_bacula_tables $(DESTDIR)$(sysconfdir)/drop_bacula_tables
+-	$(INSTALL_SCRIPT) make_bacula_tables $(DESTDIR)$(sysconfdir)/make_bacula_tables
+-	$(INSTALL_SCRIPT) make_catalog_backup $(DESTDIR)$(sysconfdir)/make_catalog_backup  
+-	$(INSTALL_SCRIPT) delete_catalog_backup $(DESTDIR)$(sysconfdir)/delete_catalog_backup  
++	$(MKDIR) $(DESTDIR)$(datadir)/bacula
++	$(INSTALL_SCRIPT) create_@DB_NAME@_database $(DESTDIR)$(datadir)/bacula/create_@DB_NAME@_database
++	$(INSTALL_SCRIPT) drop_@DB_NAME@_tables $(DESTDIR)$(datadir)/bacula/drop_@DB_NAME@_tables
++	$(INSTALL_SCRIPT) make_@DB_NAME@_tables $(DESTDIR)$(datadir)/bacula/make_@DB_NAME@_tables
++	$(INSTALL_SCRIPT) drop_bacula_tables $(DESTDIR)$(datadir)/bacula/drop_bacula_tables
++	$(INSTALL_SCRIPT) make_bacula_tables $(DESTDIR)$(datadir)/bacula/make_bacula_tables
++	$(INSTALL_SCRIPT) make_catalog_backup $(DESTDIR)$(datadir)/bacula/make_catalog_backup  
++	$(INSTALL_SCRIPT) delete_catalog_backup $(DESTDIR)$(datadir)/bacula/delete_catalog_backup  
+ 
+ uninstall:
+ 	(cd $(DESTDIR)$(sysconfdir); $(RMF) create_@DB_NAME@_database)
diff --git a/sysutils/bacula-server/files/patch-src__cats__Makefile.in b/sysutils/bacula-server/files/patch-src__cats__Makefile.in
new file mode 100644
index 000000000000..599be6680780
--- /dev/null
+++ b/sysutils/bacula-server/files/patch-src__cats__Makefile.in
@@ -0,0 +1,32 @@
+--- src/cats/Makefile.in.orig	Fri Jan  3 22:09:11 2003
++++ src/cats/Makefile.in	Mon Feb 24 14:07:35 2003
+@@ -12,6 +12,7 @@
+ thisdir = src/cats
+ 
+ DEBUG=@DEBUG@
++MKDIR=$(topdir)/autoconf/mkinstalldirs
+ 
+ SQL_INC=@SQL_INCLUDE@
+ 
+@@ -70,13 +71,14 @@
+ 	(cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS)
+ 
+ install:
+-	$(INSTALL_SCRIPT) create_@DB_NAME@_database $(DESTDIR)$(sysconfdir)/create_@DB_NAME@_database
+-	$(INSTALL_SCRIPT) drop_@DB_NAME@_tables $(DESTDIR)$(sysconfdir)/drop_@DB_NAME@_tables
+-	$(INSTALL_SCRIPT) make_@DB_NAME@_tables $(DESTDIR)$(sysconfdir)/make_@DB_NAME@_tables
+-	$(INSTALL_SCRIPT) drop_bacula_tables $(DESTDIR)$(sysconfdir)/drop_bacula_tables
+-	$(INSTALL_SCRIPT) make_bacula_tables $(DESTDIR)$(sysconfdir)/make_bacula_tables
+-	$(INSTALL_SCRIPT) make_catalog_backup $(DESTDIR)$(sysconfdir)/make_catalog_backup  
+-	$(INSTALL_SCRIPT) delete_catalog_backup $(DESTDIR)$(sysconfdir)/delete_catalog_backup  
++	$(MKDIR) $(DESTDIR)$(datadir)/bacula
++	$(INSTALL_SCRIPT) create_@DB_NAME@_database $(DESTDIR)$(datadir)/bacula/create_@DB_NAME@_database
++	$(INSTALL_SCRIPT) drop_@DB_NAME@_tables $(DESTDIR)$(datadir)/bacula/drop_@DB_NAME@_tables
++	$(INSTALL_SCRIPT) make_@DB_NAME@_tables $(DESTDIR)$(datadir)/bacula/make_@DB_NAME@_tables
++	$(INSTALL_SCRIPT) drop_bacula_tables $(DESTDIR)$(datadir)/bacula/drop_bacula_tables
++	$(INSTALL_SCRIPT) make_bacula_tables $(DESTDIR)$(datadir)/bacula/make_bacula_tables
++	$(INSTALL_SCRIPT) make_catalog_backup $(DESTDIR)$(datadir)/bacula/make_catalog_backup  
++	$(INSTALL_SCRIPT) delete_catalog_backup $(DESTDIR)$(datadir)/bacula/delete_catalog_backup  
+ 
+ uninstall:
+ 	(cd $(DESTDIR)$(sysconfdir); $(RMF) create_@DB_NAME@_database)