Move the dvd-handler python script from libexec/bacula to share/examples/bacula

to quiet CHECK_INTERPRETER (I don't want to add python as a dependency for that
one script).  Bump PKGREVISION for bacula and bacula-clientonly.

5 files changed, 31 insertions, 5 deletions

diff --git a/sysutils/bacula-clientonly/Makefile b/sysutils/bacula-clientonly/Makefile
index d193b79b0c2..701c05e9608 100644
--- a/sysutils/bacula-clientonly/Makefile
+++ b/sysutils/bacula-clientonly/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2008/01/04 14:32:50 ghen Exp $
+# $NetBSD: Makefile,v 1.8 2008/01/08 16:52:20 ghen Exp $
 
 PKGNAME=		${DISTNAME:S/-/-clientonly-/}
+PKGREVISION=		1
 COMMENT=		The Network Backup Solution (client only)
 
 CONFLICTS=		bacula-[0-9]* bacula-client-[0-9]*
@@ -28,4 +29,7 @@ RCD_SCRIPTS=		bacula-fd
 
 PLIST_SRC+=		${.CURDIR}/../../sysutils/bacula/PLIST.common_end
 
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/scripts/dvd-handler ${DESTDIR}${EXAMPLESDIR}
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/bacula/Makefile b/sysutils/bacula/Makefile
index be5958b830b..15036dc319b 100644
--- a/sysutils/bacula/Makefile
+++ b/sysutils/bacula/Makefile
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2008/01/04 14:32:49 ghen Exp $
+# $NetBSD: Makefile,v 1.23 2008/01/08 16:52:20 ghen Exp $
+
+PKGREVISION=		1
 
 CONFLICTS+=		bacula-client-[0-9]* bacula-clientonly-[0-9]*
 
@@ -33,4 +35,7 @@ RCD_SCRIPTS=		bacula bacula-dir bacula-sd bacula-fd
 
 PLIST_SRC+=		PLIST.common_end
 
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/scripts/dvd-handler ${DESTDIR}${EXAMPLESDIR}
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/bacula/PLIST.common b/sysutils/bacula/PLIST.common
index 78bbb415430..c09d2ec95f0 100644
--- a/sysutils/bacula/PLIST.common
+++ b/sysutils/bacula/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.4 2007/09/07 15:15:34 ghen Exp $
+@comment $NetBSD: PLIST.common,v 1.5 2008/01/08 16:52:20 ghen Exp $
 libexec/bacula/bacula
 libexec/bacula/bacula-ctl-dir
 libexec/bacula/bacula-ctl-fd
@@ -7,7 +7,6 @@ libexec/bacula/bconsole
 libexec/bacula/btraceback.dbx
 libexec/bacula/btraceback.gdb
 libexec/bacula/disk-changer
-libexec/bacula/dvd-handler
 libexec/bacula/gconsole
 libexec/bacula/mtx-changer
 libexec/bacula/startmysql
@@ -34,4 +33,5 @@ sbin/bconsole
 sbin/btraceback
 share/examples/bacula/bacula-fd.conf
 share/examples/bacula/bconsole.conf
+share/examples/bacula/dvd-handler
 share/examples/rc.d/bacula-fd
diff --git a/sysutils/bacula/distinfo b/sysutils/bacula/distinfo
index 85641b12f73..dc8514b39bc 100644
--- a/sysutils/bacula/distinfo
+++ b/sysutils/bacula/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2007/09/20 13:40:18 ghen Exp $
+$NetBSD: distinfo,v 1.27 2008/01/08 16:52:20 ghen Exp $
 
 SHA1 (bacula-2.2.4.tar.gz) = 1fd8e75f231fb3a811696c05ea3c0c719c75289a
 RMD160 (bacula-2.2.4.tar.gz) = 5005d5566f55a8feb8a7efa610cd60a3d92383af
@@ -11,3 +11,4 @@ SHA1 (patch-ag) = a2734446ac79380692dd5a2647928919c9b2f2b8
 SHA1 (patch-ah) = 83b156ac18b64d19ea0022103c50c431f3b86b87
 SHA1 (patch-ai) = 499a164fcf9e4fc466b691f91203b4293dcee7eb
 SHA1 (patch-aj) = df5eba3c80d36ecc26c6acb1566a4411c308b2f0
+SHA1 (patch-am) = 0b5b81543eb66ad191d94b59c986561e492a069d
diff --git a/sysutils/bacula/patches/patch-am b/sysutils/bacula/patches/patch-am
new file mode 100644
index 00000000000..9fa21512a4f
--- /dev/null
+++ b/sysutils/bacula/patches/patch-am
@@ -0,0 +1,16 @@
+$NetBSD: patch-am,v 1.1 2008/01/08 16:52:20 ghen Exp $
+
+--- scripts/Makefile.in.orig	2007-04-18 19:06:43.000000000 +0200
++++ scripts/Makefile.in
+@@ -51,11 +51,6 @@ install: installdirs
+ 	   $(MV) -f ${DESTDIR}${scriptdir}/disk-changer ${DESTDIR}${scriptdir}/disk-changer.old; \
+ 	fi
+ 	$(INSTALL_SCRIPT) disk-changer $(DESTDIR)$(scriptdir)/disk-changer
+-	@if  test -f ${DESTDIR}${scriptdir}/dvd-handler; then \
+-	   echo "  ==> Saving existing dvd-handler to dvd-handler.old"; \
+-	   $(MV) -f ${DESTDIR}${scriptdir}/dvd-handler ${DESTDIR}${scriptdir}/dvd-handler.old; \
+-	fi
+-	$(INSTALL_SCRIPT) dvd-handler $(DESTDIR)$(scriptdir)/dvd-handler
+ 	$(INSTALL_DATA)   btraceback.gdb $(DESTDIR)$(scriptdir)/btraceback.gdb
+ 	$(INSTALL_DATA)   btraceback.dbx $(DESTDIR)$(scriptdir)/btraceback.dbx
+ 	chmod 0644 $(DESTDIR)$(scriptdir)/btraceback.gdb \