Add three optional GUIs to bacula.

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

20 files changed, 185 insertions, 58 deletions

diff --git a/sysutils/bacula-clientonly/Makefile b/sysutils/bacula-clientonly/Makefile
index 8a6bd27bbcd..23e4f91b9d3 100644
--- a/sysutils/bacula-clientonly/Makefile
+++ b/sysutils/bacula-clientonly/Makefile
@@ -1,14 +1,18 @@
-# $NetBSD: Makefile,v 1.3 2005/11/18 07:21:04 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/08 01:04:45 wiz Exp $
 
 PKGNAME=		${DISTNAME:S/-/-clientonly-/}
 COMMENT=		The Network Backup Solution (client only)
 
 CONFLICTS=		bacula-[0-9]* bacula-client-[0-9]*
 
+.include "options.mk"
+
 DISTINFO_FILE=		${.CURDIR}/../../sysutils/bacula/distinfo
 PATCHDIR=		${.CURDIR}/../../sysutils/bacula/patches
 FILESDIR=		${.CURDIR}/../../sysutils/bacula/files
 
+PLIST_SRC=		${.CURDIR}/../../sysutils/bacula/PLIST.common
+
 CONFIGURE_ARGS+=	--enable-client-only
 
 BUILD_DEFS+=		BACULA_GROUP
diff --git a/sysutils/bacula-clientonly/options.mk b/sysutils/bacula-clientonly/options.mk
new file mode 100644
index 00000000000..ccf44afddd2
--- /dev/null
+++ b/sysutils/bacula-clientonly/options.mk
@@ -0,0 +1,6 @@
+# $NetBSD: options.mk,v 1.1 2005/12/08 01:04:45 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.bacula
+PKG_SUPPORTED_OPTIONS=	gnome-console wx-console tray-monitor
+
+.include "../../mk/bsd.options.mk"
diff --git a/sysutils/bacula/Makefile b/sysutils/bacula/Makefile
index 88170d48fa2..a4af94b3175 100644
--- a/sysutils/bacula/Makefile
+++ b/sysutils/bacula/Makefile
@@ -1,9 +1,12 @@
-# $NetBSD: Makefile,v 1.10 2005/12/05 23:55:19 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/08 01:04:44 wiz Exp $
 
 CONFLICTS+=		bacula-client-[0-9]*
 
 .include "options.mk"
 
+PLIST_SRC=		PLIST.common
+PLIST_SRC+=		PLIST.server
+
 PLIST_SUBST+=		BACULA_DB=${BACULA_DB:Q}
 MESSAGE_SUBST+=		PREFIX=${PREFIX}
 MESSAGE_SUBST+=		PKGNAME_NOREV=${PKGNAME_NOREV}
diff --git a/sysutils/bacula/Makefile.common b/sysutils/bacula/Makefile.common
index a95cef6dedb..a492c5540ca 100644
--- a/sysutils/bacula/Makefile.common
+++ b/sysutils/bacula/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2005/12/05 23:55:19 rillig Exp $
+# $NetBSD: Makefile.common,v 1.20 2005/12/08 01:04:44 wiz Exp $
 
 DISTNAME=		bacula-1.38.1
 CATEGORIES=		sysutils
@@ -12,7 +12,6 @@ USE_LANGUAGES+=		c++
 USE_PKGLOCALEDIR=	yes
 USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
-MANCOMPRESSED=		yes
 
 BACULA_GROUP?=		bacula
 BACULA_DIR_USER?=	bacula-dir
@@ -30,6 +29,17 @@ FILES_SUBST+=		BACULA_GROUP=${BACULA_GROUP:Q}
 FILES_SUBST+=		BACULA_DIR_USER=${BACULA_DIR_USER:Q}
 FILES_SUBST+=		BACULA_SD_USER=${BACULA_SD_USER:Q}
 
+SUBST_CLASSES+=		egdir
+SUBST_STAGE.egdir=	post-patch
+SUBST_FILES.egdir=	src/dird/Makefile.in
+SUBST_FILES.egdir+=	src/console/Makefile.in
+SUBST_FILES.egdir+=	src/filed/Makefile.in
+SUBST_FILES.egdir+=	src/stored/Makefile.in
+SUBST_FILES.egdir+=	src/gnome2-console/Makefile.in
+SUBST_FILES.egdir+=	src/wx-console/Makefile.in
+SUBST_FILES.egdir+=	src/tray-monitor/Makefile.in
+SUBST_SED.egdir=	-e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g'
+
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--with-scriptdir=${PREFIX}/libexec/bacula
 CONFIGURE_ARGS+=	--with-sbin-perm=0755
@@ -44,6 +54,29 @@ PKG_GROUPS=		${BACULA_GROUP}
 CONFIGURE_ARGS+=	--enable-smartalloc
 .endif
 
+# keep these three blocks here as they are common to bacula and bacula-clientonly
+#
+# optional gnome-console
+.if !empty(PKG_OPTIONS:Mgnome-console)
+.include "../../devel/libgnomeui/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-gnome
+PLIST_SRC+=		${.CURDIR}/../../sysutils/bacula/PLIST.gnome-console
+.endif
+
+# optional wx-console
+.if !empty(PKG_OPTIONS:Mwx-console)
+.include "../../x11/wxGTK/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-wx-console
+PLIST_SRC+=		${.CURDIR}/../../sysutils/bacula/PLIST.wx-console
+.endif
+
+# optional tray-monitor
+.if !empty(PKG_OPTIONS:Mtray-monitor)
+.include "../../x11/gtk2/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-tray-monitor
+PLIST_SRC+=		${.CURDIR}/../../sysutils/bacula/PLIST.tray-monitor
+.endif
+
 PTHREAD_OPTS+=		require
 PTHREAD_AUTO_VARS=	yes
 
@@ -51,6 +84,8 @@ EXAMPLESDIR=		${PREFIX}/share/examples/bacula
 CONF_FILES+=		${EXAMPLESDIR}/bacula-fd.conf ${PKG_SYSCONFDIR}/bacula-fd.conf
 CONF_FILES+=		${EXAMPLESDIR}/bconsole.conf ${PKG_SYSCONFDIR}/bconsole.conf
 
+PLIST_SRC+=		${.CURDIR}/../../sysutils/bacula/PLIST.common_end
+
 pre-install:
 	${INSTALL_DATA_DIR} ${EXAMPLESDIR}
 
diff --git a/sysutils/bacula-clientonly/PLIST b/sysutils/bacula/PLIST.common
index 5767d2c18b9..f5f5ad2ab2e 100644
--- a/sysutils/bacula-clientonly/PLIST
+++ b/sysutils/bacula/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2005/11/11 21:34:03 wiz Exp $
+@comment $NetBSD: PLIST.common,v 1.1 2005/12/08 01:04:44 wiz Exp $
 libexec/bacula/bacula
 libexec/bacula/bconsole
 libexec/bacula/btraceback.dbx
@@ -15,5 +15,3 @@ sbin/btraceback
 share/examples/bacula/bacula-fd.conf
 share/examples/bacula/bconsole.conf
 share/examples/rc.d/bacula-fd
-@dirrm share/examples/bacula
-@dirrm libexec/bacula
diff --git a/sysutils/bacula/PLIST.common_end b/sysutils/bacula/PLIST.common_end
new file mode 100644
index 00000000000..1d22cdbfbba
--- /dev/null
+++ b/sysutils/bacula/PLIST.common_end
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.common_end,v 1.1 2005/12/08 01:04:44 wiz Exp $
+@dirrm share/examples/bacula
+@dirrm libexec/bacula
diff --git a/sysutils/bacula/PLIST.gnome-console b/sysutils/bacula/PLIST.gnome-console
new file mode 100644
index 00000000000..f1623a85d8e
--- /dev/null
+++ b/sysutils/bacula/PLIST.gnome-console
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.gnome-console,v 1.1 2005/12/08 01:04:44 wiz Exp $
+sbin/gnome-console
+share/examples/bacula/gnome-console.conf
diff --git a/sysutils/bacula/PLIST b/sysutils/bacula/PLIST.server
index c52926998fd..d28747ac12a 100644
--- a/sysutils/bacula/PLIST
+++ b/sysutils/bacula/PLIST.server
@@ -1,8 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2005/11/11 07:23:15 wiz Exp $
-libexec/bacula/bacula
-libexec/bacula/bconsole
-libexec/bacula/btraceback.dbx
-libexec/bacula/btraceback.gdb
+@comment $NetBSD: PLIST.server,v 1.1 2005/12/08 01:04:44 wiz Exp $
 libexec/bacula/create_${BACULA_DB}_database
 libexec/bacula/create_bacula_database
 libexec/bacula/delete_catalog_backup
@@ -10,39 +6,25 @@ libexec/bacula/drop_${BACULA_DB}_database
 libexec/bacula/drop_${BACULA_DB}_tables
 libexec/bacula/drop_bacula_database
 libexec/bacula/drop_bacula_tables
-libexec/bacula/dvd-handler
-libexec/bacula/gconsole
 libexec/bacula/grant_${BACULA_DB}_privileges
 libexec/bacula/grant_bacula_privileges
 libexec/bacula/make_${BACULA_DB}_tables
 libexec/bacula/make_bacula_tables
 libexec/bacula/make_catalog_backup
-libexec/bacula/mtx-changer
 libexec/bacula/query.sql
-libexec/bacula/startmysql
-libexec/bacula/stopmysql
 libexec/bacula/update_${BACULA_DB}_tables
 libexec/bacula/update_bacula_tables
-man/man8/bacula.8
 sbin/bacula-dir
-sbin/bacula-fd
 sbin/bacula-sd
-sbin/bconsole
 sbin/bcopy
 sbin/bextract
 sbin/bls
 sbin/bscan
 sbin/bsmtp
 sbin/btape
-sbin/btraceback
 sbin/dbcheck
 share/examples/bacula/bacula-dir.conf
-share/examples/bacula/bacula-fd.conf
 share/examples/bacula/bacula-sd.conf
-share/examples/bacula/bconsole.conf
 share/examples/rc.d/bacula
 share/examples/rc.d/bacula-dir
-share/examples/rc.d/bacula-fd
 share/examples/rc.d/bacula-sd
-@dirrm share/examples/bacula
-@dirrm libexec/bacula
diff --git a/sysutils/bacula/PLIST.tray-monitor b/sysutils/bacula/PLIST.tray-monitor
new file mode 100644
index 00000000000..6e1b8ebb1fa
--- /dev/null
+++ b/sysutils/bacula/PLIST.tray-monitor
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.tray-monitor,v 1.1 2005/12/08 01:04:44 wiz Exp $
+sbin/bacula-tray-monitor
+share/examples/bacula/tray-monitor.conf
diff --git a/sysutils/bacula/PLIST.wx-console b/sysutils/bacula/PLIST.wx-console
new file mode 100644
index 00000000000..45f451b2cde
--- /dev/null
+++ b/sysutils/bacula/PLIST.wx-console
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.wx-console,v 1.1 2005/12/08 01:04:44 wiz Exp $
+sbin/wx-console
+share/examples/bacula/wx-console.conf
diff --git a/sysutils/bacula/distinfo b/sysutils/bacula/distinfo
index ca7602aa80c..33492e43a87 100644
--- a/sysutils/bacula/distinfo
+++ b/sysutils/bacula/distinfo
@@ -1,9 +1,13 @@
-$NetBSD: distinfo,v 1.5 2005/11/22 18:35:25 wiz Exp $
+$NetBSD: distinfo,v 1.6 2005/12/08 01:04:44 wiz Exp $
 
 SHA1 (bacula-1.38.1.tar.gz) = 5fba6bab72d28f83adb4b71bd69359ebc11de28b
 RMD160 (bacula-1.38.1.tar.gz) = 3c8b970dac9916b8e62cfa0ab9a96bb00d937e16
 Size (bacula-1.38.1.tar.gz) = 1856508 bytes
-SHA1 (patch-aa) = 3369d0c37108f05828ea7c33b7aabc287e0213fd
-SHA1 (patch-ac) = 295dbf7fc6d1f5104b13d37a8ff32ea8580d4019
-SHA1 (patch-ae) = ad4b7d5cb83f021235c11504a034def897fffcac
-SHA1 (patch-af) = 926e74b83a09f4620672ffb8419d9ea22983d231
+SHA1 (patch-aa) = c1e5ec7c3e78c125b9fbaba97190ead10adbc599
+SHA1 (patch-ac) = 585f8a00fe7c0e6e8e4c0b91a0bd32bd2fb81c81
+SHA1 (patch-ae) = 69db6d396bd1654b3065d693c5ea2c0afbb8bc61
+SHA1 (patch-af) = 6ecbac39c156c81f30ba53b565f55ab5e876b3e0
+SHA1 (patch-ag) = 9e54b2bb207e9ea82326e48b8548ad03bf71fb8d
+SHA1 (patch-ah) = f084238634be75e6122bb4ec8c14ed68e24bddb4
+SHA1 (patch-ai) = 499a164fcf9e4fc466b691f91203b4293dcee7eb
+SHA1 (patch-aj) = e67651d317e474253dcf0d86665dda3b521fbb7e
diff --git a/sysutils/bacula/options.mk b/sysutils/bacula/options.mk
index 11a40efff0d..6de426f08d0 100644
--- a/sysutils/bacula/options.mk
+++ b/sysutils/bacula/options.mk
@@ -1,8 +1,10 @@
-# $NetBSD: options.mk,v 1.7 2005/12/05 23:55:19 rillig Exp $
+# $NetBSD: options.mk,v 1.8 2005/12/08 01:04:44 wiz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.bacula
 PKG_OPTIONS_REQUIRED_GROUPS=	database
 PKG_OPTIONS_GROUP.database=	catalog-sqlite catalog-sqlite3 catalog-pgsql catalog-mysql
+# keep this line in sync with sysutils/bacula-clientonly/options.mk:
+PKG_SUPPORTED_OPTIONS=		gnome-console wx-console tray-monitor
 PKG_SUGGESTED_OPTIONS=		catalog-sqlite
 
 .include "../../mk/bsd.options.mk"
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: