ports/51969: [UPGRADE] bacula v1.30

Dan Langille dan at langille.org
Thu May 8 13:40:18 UTC 2003 

>Number:         51969
>Category:       ports
>Synopsis:       [UPGRADE] bacula v1.30
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu May 08 06:40:16 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Dan Langille
>Release:        FreeBSD 4.8-RC i386
>Organization:
The FreeBSD Diary
>Environment:
System: FreeBSD bast.unixathome.org 4.8-RC FreeBSD 4.8-RC #1: Fri Apr 4 08:18:56 EST 2003 dan at bast.unixathome.org:/usr/obj/usr/src/sys/BAST i386


	
>Description:
	
>How-To-Repeat:
	
>Fix:

	

--- bacula.diff begins here ---
diff -ruN /usr/ports/sysutils/bacula/Makefile /home/dan/ports/sysutils/bacula/Makefile
--- /usr/ports/sysutils/bacula/Makefile	Mon Feb 24 07:11:04 2003
+++ /home/dan/ports/sysutils/bacula/Makefile	Thu May  8 07:09:15 2003
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bacula
-PORTVERSION=	1.29
+PORTVERSION=	1.30
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	bacula
diff -ruN /usr/ports/sysutils/bacula/distinfo /home/dan/ports/sysutils/bacula/distinfo
--- /usr/ports/sysutils/bacula/distinfo	Mon Feb 24 07:11:04 2003
+++ /home/dan/ports/sysutils/bacula/distinfo	Thu May  8 07:11:12 2003
@@ -1 +1 @@
-MD5 (bacula-1.29.tar.gz) = 32ea08056be1a241534841f7a98e7895
+MD5 (bacula-1.30.tar.gz) = f384d8149b4f91367b45c6d0c2710149
\ No newline at end of file
diff -ruN /usr/ports/sysutils/bacula/files/patch-autoconf-Make.common.in /home/dan/ports/sysutils/bacula/files/patch-autoconf-Make.common.in
--- /usr/ports/sysutils/bacula/files/patch-autoconf-Make.common.in	Mon Feb 24 07:11:05 2003
+++ /home/dan/ports/sysutils/bacula/files/patch-autoconf-Make.common.in	Thu May  8 07:22:59 2003
@@ -1,19 +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@
+--- autoconf/Make.common.in	Sat Mar 29 13:25:04 2003
++++ autoconf/Make.common.in	Thu May  8 07:18:26 2003
+@@ -31,6 +31,7 @@
  sysconfdir = @sysconfdir@
+ scriptdir = @scriptdir@
  mandir = @mandir@/man1
 +datadir = @datadir@
  manext = 1
  
  # Tools & program stuff
-@@ -49,7 +50,7 @@
+@@ -50,7 +51,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_PROGRAM = @INSTALL@ -m 754
++INSTALL_PROGRAM = @INSTALL@ -s -m 754
  INSTALL_DATA = @INSTALL@ -m 644
- INSTALL_SCRIPT = @INSTALL@ -m 755
+ INSTALL_SCRIPT = @INSTALL@ -m 754
  INSTALL_CONFIG = @INSTALL@ -m 640
diff -ruN /usr/ports/sysutils/bacula/files/patch-configure /home/dan/ports/sysutils/bacula/files/patch-configure
--- /usr/ports/sysutils/bacula/files/patch-configure	Mon Feb 24 07:11:05 2003
+++ /home/dan/ports/sysutils/bacula/files/patch-configure	Thu May  8 07:27:25 2003
@@ -1,15 +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
+--- configure~	Thu May  8 07:23:27 2003
++++ configure	Thu May  8 07:26:21 2003
+@@ -4038,9 +4038,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 -ruN /usr/ports/sysutils/bacula/files/patch-scripts-Makefile.in /home/dan/ports/sysutils/bacula/files/patch-scripts-Makefile.in
--- /usr/ports/sysutils/bacula/files/patch-scripts-Makefile.in	Mon Feb 24 07:11:05 2003
+++ /home/dan/ports/sysutils/bacula/files/patch-scripts-Makefile.in	Thu May  8 07:35:36 2003
@@ -1,25 +1,27 @@
---- 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)
+--- scripts/Makefile.in~	Thu May  8 07:27:37 2003
++++ scripts/Makefile.in	Thu May  8 07:34:21 2003
+@@ -32,15 +32,15 @@
+ 	$(MKDIR) $(DESTDIR)$(scriptdir)
  
  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) startmysql $(DESTDIR)$(scriptdir)/startmysql
+-	$(INSTALL_SCRIPT) stopmysql $(DESTDIR)$(scriptdir)/stopmysql
+-	$(INSTALL_SCRIPT) console $(DESTDIR)$(scriptdir)/console
+-	$(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) 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) stopmysql $(DESTDIR)$(syscondir)/stopmysql
++#	$(INSTALL_SCRIPT) console $(DESTDIR)$(syscondir)/console
++#	$(INSTALL_SCRIPT) gconsole $(DESTDIR)$(syscondir)/gconsole
 +	$(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) mtx-changer $(DESTDIR)$(scriptdir)/mtx-changer
 +#	$(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback
 +#	$(INSTALL_DATA)   btraceback.gdb $(DESTDIR)$(sbindir)/btraceback.gdb
  
  uninstall:
- 	(cd $(DESTDIR)$(sysconfdir); $(RMF) startmysql)
+ 	(cd $(DESTDIR)$(scriptdir); $(RMF) startmysql)
diff -ruN /usr/ports/sysutils/bacula/files/patch-src-cats-Makefile.in /home/dan/ports/sysutils/bacula/files/patch-src-cats-Makefile.in
--- /usr/ports/sysutils/bacula/files/patch-src-cats-Makefile.in	Mon Feb 24 07:11:05 2003
+++ /home/dan/ports/sysutils/bacula/files/patch-src-cats-Makefile.in	Thu May  8 07:40:07 2003
@@ -1,5 +1,5 @@
---- src/cats/Makefile.in.orig	Fri Jan  3 22:09:11 2003
-+++ src/cats/Makefile.in	Mon Feb 24 14:07:35 2003
+--- src/cats/Makefile.in~	Mon Apr  7 13:06:05 2003
++++ src/cats/Makefile.in	Thu May  8 07:39:15 2003
 @@ -12,6 +12,7 @@
  thisdir = src/cats
  
@@ -8,17 +8,18 @@
  
  SQL_INC=@SQL_INCLUDE@
  
-@@ -70,13 +71,14 @@
+@@ -70,14 +71,14 @@
  	(cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS)
  
  install:
--	$(INSTALL_SCRIPT) create_ at DB_NAME@_database $(DESTDIR)$(sysconfdir)/create_ at DB_NAME@_database
--	$(INSTALL_SCRIPT) drop_ at DB_NAME@_tables $(DESTDIR)$(sysconfdir)/drop_ at DB_NAME@_tables
--	$(INSTALL_SCRIPT) make_ at DB_NAME@_tables $(DESTDIR)$(sysconfdir)/make_ at 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  
+-	$(INSTALL_SCRIPT) create_ at DB_NAME@_database $(DESTDIR)$(scriptdir)/create_ at DB_NAME@_database
+-	$(INSTALL_SCRIPT) drop_ at DB_NAME@_tables $(DESTDIR)$(scriptdir)/drop_ at DB_NAME@_tables
+-	$(INSTALL_SCRIPT) make_ at DB_NAME@_tables $(DESTDIR)$(scriptdir)/make_ at DB_NAME@_tables
+-	$(INSTALL_SCRIPT) drop_bacula_tables $(DESTDIR)$(scriptdir)/drop_bacula_tables
+-	$(INSTALL_SCRIPT) make_bacula_tables $(DESTDIR)$(scriptdir)/make_bacula_tables
+-	$(INSTALL_SCRIPT) make_catalog_backup $(DESTDIR)$(scriptdir)/make_catalog_backup  
+-	$(INSTALL_SCRIPT) delete_catalog_backup $(DESTDIR)$(scriptdir)/delete_catalog_backup  
+-	$(INSTALL_SCRIPT) grant_mysql_privileges $(DESTDIR)$(scriptdir)/grant_mysql_privileges	
 +	$(MKDIR) $(DESTDIR)$(datadir)/bacula
 +	$(INSTALL_SCRIPT) create_ at DB_NAME@_database $(DESTDIR)$(datadir)/bacula/create_ at DB_NAME@_database
 +	$(INSTALL_SCRIPT) drop_ at DB_NAME@_tables $(DESTDIR)$(datadir)/bacula/drop_ at DB_NAME@_tables
@@ -29,4 +30,4 @@
 +	$(INSTALL_SCRIPT) delete_catalog_backup $(DESTDIR)$(datadir)/bacula/delete_catalog_backup  
  
  uninstall:
- 	(cd $(DESTDIR)$(sysconfdir); $(RMF) create_ at DB_NAME@_database)
+ 	(cd $(DESTDIR)$(scriptdir); $(RMF) create_ at DB_NAME@_database)
--- bacula.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list