Add three optional GUIs to bacula.

Also, stop the package from compressing the man pages.
From Geert Hendrickx in private mail.

8 files changed, 107 insertions, 26 deletions

diff --git a/sysutils/bacula/patches/patch-aa b/sysutils/bacula/patches/patch-aa
index 090409884ee..4dca4267995 100644
--- a/sysutils/bacula/patches/patch-aa
+++ b/sysutils/bacula/patches/patch-aa
@@ -1,22 +1,22 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/11/06 16:17:38 mjl Exp $
+$NetBSD: patch-aa,v 1.2 2005/12/08 01:04:45 wiz Exp $
 
---- src/dird/Makefile.in.orig	2004-09-24 14:30:13.000000000 +0200
-+++ src/dird/Makefile.in	2004-11-06 15:52:17.000000000 +0100
-@@ -98,14 +98,9 @@
+--- src/dird/Makefile.in.orig	2005-09-28 21:24:56.000000000 +0200
++++ src/dird/Makefile.in
+@@ -110,14 +110,14 @@ devclean: realclean
  install: all
  	$(INSTALL_PROGRAM) bacula-dir $(DESTDIR)$(sbindir)/bacula-dir
  	@srcconf=bacula-dir.conf; \
 -	   if  test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
--	      destconf=$$srcconf.new; \
--	      echo "  ==> Found existing $$srcconf, installing new conf file as $$destconf"; \
--	   else \
--	      destconf=$$srcconf; \
--	   fi; \
++	   if  test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \
+ 	      destconf=$$srcconf.new; \
+ 	      echo "  ==> Found existing $$srcconf, installing new conf file as $$destconf"; \
+ 	   else \
+ 	      destconf=$$srcconf; \
+ 	   fi; \
 -	   echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
 -	   ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
-+	   destconf=$$srcconf; \
-+	   echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${prefix}/share/examples/bacula/$$destconf"; \
-+	   ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${prefix}/share/examples/bacula/$$destconf
++	   echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \
++	   ${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf
  	@if  test -f ${DESTDIR}${scriptdir}/query.sql; then \
  	   echo "  ==> Saving existing query.sql to query.sql.old"; \
  	   $(MV) -f ${DESTDIR}${scriptdir}/query.sql ${DESTDIR}${scriptdir}/query.sql.old; \
diff --git a/sysutils/bacula/patches/patch-ac b/sysutils/bacula/patches/patch-ac
index 1ec3f37a0ba..0e45c6547bb 100644
--- a/sysutils/bacula/patches/patch-ac
+++ b/sysutils/bacula/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/11/06 16:17:38 mjl Exp $
+$NetBSD: patch-ac,v 1.2 2005/12/08 01:04:45 wiz Exp $
 
 --- src/console/Makefile.in.orig	2004-06-20 15:43:02.000000000 +0400
 +++ src/console/Makefile.in
@@ -7,23 +7,23 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/11/06 16:17:38 mjl Exp $
  	$(INSTALL_PROGRAM) bconsole $(DESTDIR)$(sbindir)/bconsole
  	@srcconf=bconsole.conf; \
 -	if  test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
-+	if  test -f ${DESTDIR}${prefix}/share/examples/bacula/$$srcconf; then \
++	if  test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \
  	   destconf=$$srcconf.new; \
  	   echo "  ==> Found existing $$srcconf, installing new conf file as $$destconf"; \
  	else \
  	   destconf=$$srcconf; \
 -	   if  test -f ${DESTDIR}${sysconfdir}/console.conf; then \
-+	   if  test -f ${DESTDIR}${prefix}/share/examples/bacula/console.conf; then \
++	   if  test -f ${DESTDIR}%%EXAMPLESDIR%%/console.conf; then \
  	      echo "Existing console.conf moved to bconsole.conf"; \
 -	      @$(MV) ${DESTDIR}${sysconfdir}/console.conf ${DESTDIR}${sysconfdir}/bconsole.conf; \
-+	      @$(MV) ${DESTDIR}${prefix}/share/examples/bacula/console.conf ${DESTDIR}${prefix}/share/examples/bacula/bconsole.conf; \
++	      @$(MV) ${DESTDIR}%%EXAMPLESDIR%%/console.conf ${DESTDIR}%%EXAMPLESDIR%%/bconsole.conf; \
  	      destconf=$$srcconf.new; \
  	   fi; \
  	fi; \
 -	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
 -	${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
-+	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${prefix}/share/examples/bacula/$$destconf"; \
-+	${INSTALL_CONFIG} $$srcconf ${DESTDIR}${prefix}/share/examples/bacula/$$destconf
++	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \
++	${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf
  	if test -f static-bconsole; then \
  	   $(INSTALL_PROGRAM) static-bconsole $(DESTDIR)$(sbindir)/static-bconsole; \
  	fi
diff --git a/sysutils/bacula/patches/patch-ae b/sysutils/bacula/patches/patch-ae
index 57dea2f95ee..9cd6822ce5a 100644
--- a/sysutils/bacula/patches/patch-ae
+++ b/sysutils/bacula/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1.1.1 2004/11/06 16:17:38 mjl Exp $
+$NetBSD: patch-ae,v 1.2 2005/12/08 01:04:45 wiz Exp $
 
 --- src/filed/Makefile.in.orig	2004-03-11 00:38:48.000000000 +0300
 +++ src/filed/Makefile.in
@@ -7,7 +7,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2004/11/06 16:17:38 mjl Exp $
  	$(INSTALL_PROGRAM) bacula-fd $(DESTDIR)$(sbindir)/bacula-fd 
  	@srcconf=bacula-fd.conf; \
 -	if  test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
-+	if  test -f ${DESTDIR}${prefix}/share/examples/bacula/$$srcconf; then \
++	if  test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \
  	   destconf=$$srcconf.new; \
  	   echo "  ==> Found existing $$srcconf, installing new conf file as $$destconf"; \
  	else \
@@ -15,8 +15,8 @@ $NetBSD: patch-ae,v 1.1.1.1 2004/11/06 16:17:38 mjl Exp $
  	fi; \
 -	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
 -	${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
-+	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${prefix}/share/examples/bacula/$$destconf"; \
-+	${INSTALL_CONFIG} $$srcconf ${DESTDIR}${prefix}/share/examples/bacula/$$destconf
++	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \
++	${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf
  	@if test -f static-bacula-fd; then \
  	   $(INSTALL_PROGRAM) static-bacula-fd $(DESTDIR)$(sbindir)/static-bacula-fd; \
  	fi
diff --git a/sysutils/bacula/patches/patch-af b/sysutils/bacula/patches/patch-af
index 5cf4b95ac33..a6e1704c91d 100644
--- a/sysutils/bacula/patches/patch-af
+++ b/sysutils/bacula/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1.1.1 2004/11/06 16:17:38 mjl Exp $
+$NetBSD: patch-af,v 1.2 2005/12/08 01:04:45 wiz Exp $
 
 --- src/stored/Makefile.in.orig	2004-06-20 15:43:04.000000000 +0400
 +++ src/stored/Makefile.in
@@ -7,7 +7,7 @@ $NetBSD: patch-af,v 1.1.1.1 2004/11/06 16:17:38 mjl Exp $
  	$(INSTALL_PROGRAM) btape $(DESTDIR)$(sbindir)/btape
  	@srcconf=bacula-sd.conf; \
 -	if  test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
-+	if  test -f ${DESTDIR}${prefix}/share/examples/bacula/$$srcconf; then \
++	if  test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \
  	   destconf=$$srcconf.new; \
  	   echo "  ==> Found existing $$srcconf, installing new conf file as $$destconf"; \
  	else \
@@ -15,8 +15,8 @@ $NetBSD: patch-af,v 1.1.1.1 2004/11/06 16:17:38 mjl Exp $
  	fi; \
 -	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
 -	${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
-+	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${prefix}/share/examples/bacula/$$destconf"; \
-+	${INSTALL_CONFIG} $$srcconf ${DESTDIR}${prefix}/share/examples/bacula/$$destconf
++	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \
++	${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf
  	@if test -f static-bacula-sd; then \
  	   $(INSTALL_PROGRAM) static-bacula-sd $(DESTDIR)$(sbindir)/static-bacula-sd; \
  	fi
diff --git a/sysutils/bacula/patches/patch-ag b/sysutils/bacula/patches/patch-ag
new file mode 100644
index 00000000000..84f3d911477
--- /dev/null
+++ b/sysutils/bacula/patches/patch-ag
@@ -0,0 +1,22 @@
+$NetBSD: patch-ag,v 1.3 2005/12/08 01:04:45 wiz Exp $
+
+--- src/gnome2-console/Makefile.in.orig	2004-09-24 14:30:32.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; \
+-	if  test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
++	if  test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \
+ 	   destconf=$$srcconf.new; \
+ 	   echo "  ==> Found existing $$srcconf, installing new conf file as $$destconf"; \
+ 	else \
+ 	   destconf=$$srcconf; \
+ 	fi; \
+-	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
+-	${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; \
+ 	fi 
diff --git a/sysutils/bacula/patches/patch-ah b/sysutils/bacula/patches/patch-ah
new file mode 100644
index 00000000000..7e3b8f2200d
--- /dev/null
+++ b/sysutils/bacula/patches/patch-ah
@@ -0,0 +1,22 @@
+$NetBSD: patch-ah,v 1.3 2005/12/08 01:04:45 wiz Exp $
+
+--- src/wx-console/Makefile.in.orig	2005-04-26 17:04:27.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; \
+-	if  test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
++	if  test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \
+ 	   destconf=$$srcconf.new; \
+ 	   echo "  ==> Found existing $$srcconf, installing new conf file as $$destconf"; \
+ 	else \
+ 	   destconf=$$srcconf; \
+ 	fi; \
+-	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
+-	${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
++	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \
++	${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf
+ 
+ uninstall:
+ 	(cd $(DESTDIR)$(sbindir); $(RMF) wx-console)
diff --git a/sysutils/bacula/patches/patch-ai b/sysutils/bacula/patches/patch-ai
new file mode 100644
index 00000000000..f0685e179c1
--- /dev/null
+++ b/sysutils/bacula/patches/patch-ai
@@ -0,0 +1,22 @@
+$NetBSD: patch-ai,v 1.3 2005/12/08 01:04:45 wiz Exp $
+
+--- src/tray-monitor/Makefile.in.orig	2005-04-26 17:04:25.000000000 +0200
++++ src/tray-monitor/Makefile.in
+@@ -71,14 +71,14 @@ devclean: realclean
+ install: all
+ 	$(INSTALL_PROGRAM) bacula-tray-monitor $(DESTDIR)$(sbindir)/bacula-tray-monitor
+ 	@srcconf=tray-monitor.conf; \
+-	if  test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
++	if  test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \
+ 	   destconf=$$srcconf.new; \
+ 	   echo "  ==> Found existing $$srcconf, installing new conf file as $$destconf"; \
+ 	else \
+ 	   destconf=$$srcconf; \
+ 	fi; \
+-	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
+-	${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
++	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \
++	${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf
+ 
+ uninstall:
+ 	(cd $(DESTDIR)$(sbindir); $(RMF) bacula-tray-monitor)
diff --git a/sysutils/bacula/patches/patch-aj b/sysutils/bacula/patches/patch-aj
new file mode 100644
index 00000000000..55550d79b7f
--- /dev/null
+++ b/sysutils/bacula/patches/patch-aj
@@ -0,0 +1,15 @@
+$NetBSD: patch-aj,v 1.3 2005/12/08 01:04:45 wiz Exp $
+
+--- scripts/Makefile.in.orig	2005-10-18 00:07:57.000000000 +0200
++++ scripts/Makefile.in
+@@ -51,9 +51,7 @@ install: installdirs
+ 	$(INSTALL_DATA)   btraceback.gdb $(DESTDIR)$(scriptdir)/btraceback.gdb
+ 	$(INSTALL_DATA)   btraceback.dbx $(DESTDIR)$(scriptdir)/btraceback.dbx
+ 	$(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback
+-	gzip <bacula.man >bacula.8.gz
+-	$(INSTALL_DATA)   bacula.8.gz $(DESTDIR)$(mandir)/bacula.8.gz
++	$(INSTALL_DATA)   bacula.man $(DESTDIR)$(mandir)/bacula.8
+-	@rm -f bacula.8.gz
+ 
+ 
+ uninstall: