o) Fix Install Problem

o) Update note in Makefile about special FreeBSD options
   for the storage daemon.

5 files changed, 30 insertions, 155 deletions

diff --git a/sysutils/bacula-server/Makefile b/sysutils/bacula-server/Makefile
index 8cae04eeb2f4..237270f505bc 100644
--- a/sysutils/bacula-server/Makefile
+++ b/sysutils/bacula-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bacula
 PORTVERSION=	1.34.6
-#PORTREVISION=	1
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	bacula
@@ -216,7 +216,7 @@ post-install:
 	@${ECHO_MSG} "  ${PREFIX}/sbin/chio-bacula"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Please have a look at it if you want to use an"
-	@${ECHO_MSG} "auto-changer. You have to configure the usage in"
+	@${ECHO_MSG} "autochanger. You have to configure the usage in"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "  ${PREFIX}/etc/bacula-dir.conf"
 	@${ECHO_MSG} ""
@@ -228,11 +228,22 @@ post-install:
 	@${ECHO_MSG} "implementation you MUST add some OS dependent options to"
 	@${ECHO_MSG} "the bacula-sd.conf file:"
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "  Backward Space Record = no;"
 	@${ECHO_MSG} "  Hardware End of Medium = no;"
+	@${ECHO_MSG} "  Backward Space Record = no;"
+	@${ECHO_MSG} "  Backward Space File = no;"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "With 2 filemart at EOT (see man mt):"
 	@${ECHO_MSG} "  Fast Forward Space File = no;"
 	@${ECHO_MSG} "  BSF at EOM = yes;"
-	@${ECHO_MSG} "  TWOEOF = yes;"
+	@${ECHO_MSG} "  TWO EOF = yes;"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "With 1 filemart at EOT (see man mt):"
+	@${ECHO_MSG} "  Fast Forward Space File = yes;"
+	@${ECHO_MSG} "  BSF at EOM = no;"
+	@${ECHO_MSG} "  TWO EOF = no;"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "NOTE: YOU CAN SWITCH EOT model ONLY when starting"
+	@${ECHO_MSG} "      from scratch with EMPTY tapes!!!!"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "It is also important that all the scripts accessed"
 	@${ECHO_MSG} "by RunBeforeJob and RunAfterJob can be executed by"
diff --git a/sysutils/bacula-server/files/patch-src-cats-Makefile.in b/sysutils/bacula-server/files/patch-src-cats-Makefile.in
deleted file mode 100644
index 545ba4e8c928..000000000000
--- a/sysutils/bacula-server/files/patch-src-cats-Makefile.in
+++ /dev/null
@@ -1,49 +0,0 @@
-*** src/cats/Makefile.in.orig	Thu Apr  8 19:58:05 2004
---- src/cats/Makefile.in	Thu Apr  8 20:02:12 2004
-***************
-*** 91,112 ****
-  	(cd $(srcdir); $(RMF) Makefile)
-  
-  install:
-! 	$(INSTALL_SCRIPT) create_@DB_NAME@_database $(DESTDIR)$(scriptdir)/create_@DB_NAME@_database
-! 	$(INSTALL_SCRIPT) update_@DB_NAME@_tables $(DESTDIR)$(scriptdir)/update_@DB_NAME@_tables
-! 	$(INSTALL_SCRIPT) make_@DB_NAME@_tables $(DESTDIR)$(scriptdir)/make_@DB_NAME@_tables
-! 	$(INSTALL_SCRIPT) grant_@DB_NAME@_privileges $(DESTDIR)$(scriptdir)/grant_@DB_NAME@_privileges
-! 	$(INSTALL_SCRIPT) drop_@DB_NAME@_tables $(DESTDIR)$(scriptdir)/drop_@DB_NAME@_tables
-! 	$(INSTALL_SCRIPT) drop_@DB_NAME@_database $(DESTDIR)$(scriptdir)/drop_@DB_NAME@_database
-! 
-! 	$(INSTALL_SCRIPT) create_bacula_database $(DESTDIR)$(scriptdir)/create_bacula_database
-! 	$(INSTALL_SCRIPT) update_bacula_tables $(DESTDIR)$(scriptdir)/update_bacula_tables
-! 	$(INSTALL_SCRIPT) make_bacula_tables $(DESTDIR)$(scriptdir)/make_bacula_tables
-! 	$(INSTALL_SCRIPT) grant_bacula_privileges $(DESTDIR)$(scriptdir)/grant_bacula_privileges
-! 	$(INSTALL_SCRIPT) drop_bacula_tables $(DESTDIR)$(scriptdir)/drop_bacula_tables
-! 	$(INSTALL_SCRIPT) drop_bacula_database $(DESTDIR)$(scriptdir)/drop_bacula_database
-  
-! 	$(INSTALL_SCRIPT) make_catalog_backup $(DESTDIR)$(scriptdir)/make_catalog_backup  
-! 	$(INSTALL_SCRIPT) delete_catalog_backup $(DESTDIR)$(scriptdir)/delete_catalog_backup  
-  
-  uninstall:
-  	(cd $(DESTDIR)$(scriptdir); $(RMF) create_@DB_NAME@_database)
---- 91,112 ----
-  	(cd $(srcdir); $(RMF) Makefile)
-  
-  install:
-! 	$(INSTALL_SCRIPT) create_@DB_NAME@_database $(DESTDIR)$(datadir)/bacula/create_@DB_NAME@_database
-! 	$(INSTALL_SCRIPT) update_@DB_NAME@_tables $(DESTDIR)$(datadir)/bacula/update_@DB_NAME@_tables
-! 	$(INSTALL_SCRIPT) make_@DB_NAME@_tables $(DESTDIR)$(datadir)/bacula//make_@DB_NAME@_tables
-! 	$(INSTALL_SCRIPT) grant_@DB_NAME@_privileges $(DESTDIR)$(datadir)/bacula/grant_@DB_NAME@_privileges
-! 	$(INSTALL_SCRIPT) drop_@DB_NAME@_tables $(DESTDIR)$(datadir)/bacula/drop_@DB_NAME@_tables
-! 	$(INSTALL_SCRIPT) drop_@DB_NAME@_database $(DESTDIR)$(datadir)/bacula/drop_@DB_NAME@_database
-! 
-! 	$(INSTALL_SCRIPT) create_bacula_database $(DESTDIR)$(datadir)/bacula/create_bacula_database
-! 	$(INSTALL_SCRIPT) update_bacula_tables $$(DESTDIR)$(datadir)/bacula/update_bacula_tables
-! 	$(INSTALL_SCRIPT) make_bacula_tables $(DESTDIR)$(datadir)/bacula/make_bacula_tables
-! 	$(INSTALL_SCRIPT) grant_bacula_privileges $(DESTDIR)$(datadir)/bacula/grant_bacula_privileges
-! 	$(INSTALL_SCRIPT) drop_bacula_tables $(DESTDIR)$(datadir)/bacula/drop_bacula_tables
-! 	$(INSTALL_SCRIPT) drop_bacula_database $(DESTDIR)$(datadir)/bacula/drop_bacula_database
-  
-! 	$(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)$(scriptdir); $(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
deleted file mode 100644
index 545ba4e8c928..000000000000
--- a/sysutils/bacula-server/files/patch-src__cats__Makefile.in
+++ /dev/null
@@ -1,49 +0,0 @@
-*** src/cats/Makefile.in.orig	Thu Apr  8 19:58:05 2004
---- src/cats/Makefile.in	Thu Apr  8 20:02:12 2004
-***************
-*** 91,112 ****
-  	(cd $(srcdir); $(RMF) Makefile)
-  
-  install:
-! 	$(INSTALL_SCRIPT) create_@DB_NAME@_database $(DESTDIR)$(scriptdir)/create_@DB_NAME@_database
-! 	$(INSTALL_SCRIPT) update_@DB_NAME@_tables $(DESTDIR)$(scriptdir)/update_@DB_NAME@_tables
-! 	$(INSTALL_SCRIPT) make_@DB_NAME@_tables $(DESTDIR)$(scriptdir)/make_@DB_NAME@_tables
-! 	$(INSTALL_SCRIPT) grant_@DB_NAME@_privileges $(DESTDIR)$(scriptdir)/grant_@DB_NAME@_privileges
-! 	$(INSTALL_SCRIPT) drop_@DB_NAME@_tables $(DESTDIR)$(scriptdir)/drop_@DB_NAME@_tables
-! 	$(INSTALL_SCRIPT) drop_@DB_NAME@_database $(DESTDIR)$(scriptdir)/drop_@DB_NAME@_database
-! 
-! 	$(INSTALL_SCRIPT) create_bacula_database $(DESTDIR)$(scriptdir)/create_bacula_database
-! 	$(INSTALL_SCRIPT) update_bacula_tables $(DESTDIR)$(scriptdir)/update_bacula_tables
-! 	$(INSTALL_SCRIPT) make_bacula_tables $(DESTDIR)$(scriptdir)/make_bacula_tables
-! 	$(INSTALL_SCRIPT) grant_bacula_privileges $(DESTDIR)$(scriptdir)/grant_bacula_privileges
-! 	$(INSTALL_SCRIPT) drop_bacula_tables $(DESTDIR)$(scriptdir)/drop_bacula_tables
-! 	$(INSTALL_SCRIPT) drop_bacula_database $(DESTDIR)$(scriptdir)/drop_bacula_database
-  
-! 	$(INSTALL_SCRIPT) make_catalog_backup $(DESTDIR)$(scriptdir)/make_catalog_backup  
-! 	$(INSTALL_SCRIPT) delete_catalog_backup $(DESTDIR)$(scriptdir)/delete_catalog_backup  
-  
-  uninstall:
-  	(cd $(DESTDIR)$(scriptdir); $(RMF) create_@DB_NAME@_database)
---- 91,112 ----
-  	(cd $(srcdir); $(RMF) Makefile)
-  
-  install:
-! 	$(INSTALL_SCRIPT) create_@DB_NAME@_database $(DESTDIR)$(datadir)/bacula/create_@DB_NAME@_database
-! 	$(INSTALL_SCRIPT) update_@DB_NAME@_tables $(DESTDIR)$(datadir)/bacula/update_@DB_NAME@_tables
-! 	$(INSTALL_SCRIPT) make_@DB_NAME@_tables $(DESTDIR)$(datadir)/bacula//make_@DB_NAME@_tables
-! 	$(INSTALL_SCRIPT) grant_@DB_NAME@_privileges $(DESTDIR)$(datadir)/bacula/grant_@DB_NAME@_privileges
-! 	$(INSTALL_SCRIPT) drop_@DB_NAME@_tables $(DESTDIR)$(datadir)/bacula/drop_@DB_NAME@_tables
-! 	$(INSTALL_SCRIPT) drop_@DB_NAME@_database $(DESTDIR)$(datadir)/bacula/drop_@DB_NAME@_database
-! 
-! 	$(INSTALL_SCRIPT) create_bacula_database $(DESTDIR)$(datadir)/bacula/create_bacula_database
-! 	$(INSTALL_SCRIPT) update_bacula_tables $$(DESTDIR)$(datadir)/bacula/update_bacula_tables
-! 	$(INSTALL_SCRIPT) make_bacula_tables $(DESTDIR)$(datadir)/bacula/make_bacula_tables
-! 	$(INSTALL_SCRIPT) grant_bacula_privileges $(DESTDIR)$(datadir)/bacula/grant_bacula_privileges
-! 	$(INSTALL_SCRIPT) drop_bacula_tables $(DESTDIR)$(datadir)/bacula/drop_bacula_tables
-! 	$(INSTALL_SCRIPT) drop_bacula_database $(DESTDIR)$(datadir)/bacula/drop_bacula_database
-  
-! 	$(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)$(scriptdir); $(RMF) create_@DB_NAME@_database)
diff --git a/sysutils/bacula/Makefile b/sysutils/bacula/Makefile
index 8cae04eeb2f4..237270f505bc 100644
--- a/sysutils/bacula/Makefile
+++ b/sysutils/bacula/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bacula
 PORTVERSION=	1.34.6
-#PORTREVISION=	1
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	bacula
@@ -216,7 +216,7 @@ post-install:
 	@${ECHO_MSG} "  ${PREFIX}/sbin/chio-bacula"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Please have a look at it if you want to use an"
-	@${ECHO_MSG} "auto-changer. You have to configure the usage in"
+	@${ECHO_MSG} "autochanger. You have to configure the usage in"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "  ${PREFIX}/etc/bacula-dir.conf"
 	@${ECHO_MSG} ""
@@ -228,11 +228,22 @@ post-install:
 	@${ECHO_MSG} "implementation you MUST add some OS dependent options to"
 	@${ECHO_MSG} "the bacula-sd.conf file:"
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "  Backward Space Record = no;"
 	@${ECHO_MSG} "  Hardware End of Medium = no;"
+	@${ECHO_MSG} "  Backward Space Record = no;"
+	@${ECHO_MSG} "  Backward Space File = no;"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "With 2 filemart at EOT (see man mt):"
 	@${ECHO_MSG} "  Fast Forward Space File = no;"
 	@${ECHO_MSG} "  BSF at EOM = yes;"
-	@${ECHO_MSG} "  TWOEOF = yes;"
+	@${ECHO_MSG} "  TWO EOF = yes;"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "With 1 filemart at EOT (see man mt):"
+	@${ECHO_MSG} "  Fast Forward Space File = yes;"
+	@${ECHO_MSG} "  BSF at EOM = no;"
+	@${ECHO_MSG} "  TWO EOF = no;"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "NOTE: YOU CAN SWITCH EOT model ONLY when starting"
+	@${ECHO_MSG} "      from scratch with EMPTY tapes!!!!"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "It is also important that all the scripts accessed"
 	@${ECHO_MSG} "by RunBeforeJob and RunAfterJob can be executed by"
diff --git a/sysutils/bacula/files/patch-src-cats-Makefile.in b/sysutils/bacula/files/patch-src-cats-Makefile.in
deleted file mode 100644
index 545ba4e8c928..000000000000
--- a/sysutils/bacula/files/patch-src-cats-Makefile.in
+++ /dev/null
@@ -1,49 +0,0 @@
-*** src/cats/Makefile.in.orig	Thu Apr  8 19:58:05 2004
---- src/cats/Makefile.in	Thu Apr  8 20:02:12 2004
-***************
-*** 91,112 ****
-  	(cd $(srcdir); $(RMF) Makefile)
-  
-  install:
-! 	$(INSTALL_SCRIPT) create_@DB_NAME@_database $(DESTDIR)$(scriptdir)/create_@DB_NAME@_database
-! 	$(INSTALL_SCRIPT) update_@DB_NAME@_tables $(DESTDIR)$(scriptdir)/update_@DB_NAME@_tables
-! 	$(INSTALL_SCRIPT) make_@DB_NAME@_tables $(DESTDIR)$(scriptdir)/make_@DB_NAME@_tables
-! 	$(INSTALL_SCRIPT) grant_@DB_NAME@_privileges $(DESTDIR)$(scriptdir)/grant_@DB_NAME@_privileges
-! 	$(INSTALL_SCRIPT) drop_@DB_NAME@_tables $(DESTDIR)$(scriptdir)/drop_@DB_NAME@_tables
-! 	$(INSTALL_SCRIPT) drop_@DB_NAME@_database $(DESTDIR)$(scriptdir)/drop_@DB_NAME@_database
-! 
-! 	$(INSTALL_SCRIPT) create_bacula_database $(DESTDIR)$(scriptdir)/create_bacula_database
-! 	$(INSTALL_SCRIPT) update_bacula_tables $(DESTDIR)$(scriptdir)/update_bacula_tables
-! 	$(INSTALL_SCRIPT) make_bacula_tables $(DESTDIR)$(scriptdir)/make_bacula_tables
-! 	$(INSTALL_SCRIPT) grant_bacula_privileges $(DESTDIR)$(scriptdir)/grant_bacula_privileges
-! 	$(INSTALL_SCRIPT) drop_bacula_tables $(DESTDIR)$(scriptdir)/drop_bacula_tables
-! 	$(INSTALL_SCRIPT) drop_bacula_database $(DESTDIR)$(scriptdir)/drop_bacula_database
-  
-! 	$(INSTALL_SCRIPT) make_catalog_backup $(DESTDIR)$(scriptdir)/make_catalog_backup  
-! 	$(INSTALL_SCRIPT) delete_catalog_backup $(DESTDIR)$(scriptdir)/delete_catalog_backup  
-  
-  uninstall:
-  	(cd $(DESTDIR)$(scriptdir); $(RMF) create_@DB_NAME@_database)
---- 91,112 ----
-  	(cd $(srcdir); $(RMF) Makefile)
-  
-  install:
-! 	$(INSTALL_SCRIPT) create_@DB_NAME@_database $(DESTDIR)$(datadir)/bacula/create_@DB_NAME@_database
-! 	$(INSTALL_SCRIPT) update_@DB_NAME@_tables $(DESTDIR)$(datadir)/bacula/update_@DB_NAME@_tables
-! 	$(INSTALL_SCRIPT) make_@DB_NAME@_tables $(DESTDIR)$(datadir)/bacula//make_@DB_NAME@_tables
-! 	$(INSTALL_SCRIPT) grant_@DB_NAME@_privileges $(DESTDIR)$(datadir)/bacula/grant_@DB_NAME@_privileges
-! 	$(INSTALL_SCRIPT) drop_@DB_NAME@_tables $(DESTDIR)$(datadir)/bacula/drop_@DB_NAME@_tables
-! 	$(INSTALL_SCRIPT) drop_@DB_NAME@_database $(DESTDIR)$(datadir)/bacula/drop_@DB_NAME@_database
-! 
-! 	$(INSTALL_SCRIPT) create_bacula_database $(DESTDIR)$(datadir)/bacula/create_bacula_database
-! 	$(INSTALL_SCRIPT) update_bacula_tables $$(DESTDIR)$(datadir)/bacula/update_bacula_tables
-! 	$(INSTALL_SCRIPT) make_bacula_tables $(DESTDIR)$(datadir)/bacula/make_bacula_tables
-! 	$(INSTALL_SCRIPT) grant_bacula_privileges $(DESTDIR)$(datadir)/bacula/grant_bacula_privileges
-! 	$(INSTALL_SCRIPT) drop_bacula_tables $(DESTDIR)$(datadir)/bacula/drop_bacula_tables
-! 	$(INSTALL_SCRIPT) drop_bacula_database $(DESTDIR)$(datadir)/bacula/drop_bacula_database
-  
-! 	$(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)$(scriptdir); $(RMF) create_@DB_NAME@_database)