Fix installation under RedHat and Slackware by always installing all possible

start-up scripts.  This also makes all installations consistent regardless of
the underlying OS.

Bump PKGREVISION to 1.

5 files changed, 42 insertions, 8 deletions

diff --git a/sysutils/dbus/MESSAGE b/sysutils/dbus/MESSAGE
new file mode 100644
index 00000000000..8d229e88e6a
--- /dev/null
+++ b/sysutils/dbus/MESSAGE
@@ -0,0 +1,17 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2006/12/17 15:39:33 jmmv Exp $
+
+You should enable the dbus system-wide daemon for correct operation.  You
+can do this by using one of the three start-up scripts installed by the
+package.  Use:
+
+* ${PREFIX}/share/examples/rc.d/dbus:
+  if you are using NetBSD's and pkgsrc's rc.subr start-up framework.
+
+* ${PREFIX}/share/examples/rc.d/messagebus.redhat:
+  if you are using a Red-Hat based system (such as Fedora Core).
+
+* ${PREFIX}/share/examples/rc.d/rc.messagebus.slackware:
+  if you are using a Slackware-like system.
+
+===========================================================================
diff --git a/sysutils/dbus/Makefile b/sysutils/dbus/Makefile
index f2ce7be418d..828fe5808c0 100644
--- a/sysutils/dbus/Makefile
+++ b/sysutils/dbus/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2006/12/15 19:06:00 drochner Exp $
+# $NetBSD: Makefile,v 1.21 2006/12/17 15:39:33 jmmv Exp $
 #
 
 DISTNAME=	dbus-1.0.2
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/
 
diff --git a/sysutils/dbus/PLIST b/sysutils/dbus/PLIST
index 2803daddaa8..7fe65ba366f 100644
--- a/sysutils/dbus/PLIST
+++ b/sysutils/dbus/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2006/12/15 19:06:00 drochner Exp $
+@comment $NetBSD: PLIST,v 1.9 2006/12/17 15:39:33 jmmv Exp $
 bin/dbus-cleanup-sockets
 bin/dbus-daemon
 bin/dbus-launch
@@ -33,6 +33,8 @@ man/man1/dbus-uuidgen.1
 share/examples/dbus/session.conf
 share/examples/dbus/system.conf
 share/examples/rc.d/dbus
+share/examples/rc.d/messagebus.redhat
+share/examples/rc.d/rc.messagebus.slackware
 @dirrm share/examples/dbus
 @exec ${MKDIR} %D/share/dbus-1/services
 @dirrm share/dbus-1/services
diff --git a/sysutils/dbus/distinfo b/sysutils/dbus/distinfo
index ec4eb2cc5a8..d08f2e8a21f 100644
--- a/sysutils/dbus/distinfo
+++ b/sysutils/dbus/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.15 2006/12/15 19:06:00 drochner Exp $
+$NetBSD: distinfo,v 1.16 2006/12/17 15:39:33 jmmv Exp $
 
 SHA1 (dbus-1.0.2.tar.gz) = 2870efd6ea0b5b0d14e52195f560238a74bb1e0e
 RMD160 (dbus-1.0.2.tar.gz) = d5eddfb058c4c026d4a9f091ad90abcc6e54861a
 Size (dbus-1.0.2.tar.gz) = 1400278 bytes
-SHA1 (patch-aa) = 4d66a0083384448dc89fefe00eb82eeb3aaf13b1
+SHA1 (patch-aa) = 71c903a268e8ece66c39f48937c9544b7c82d1b3
 SHA1 (patch-ac) = eae0564535d36cb0082dd2e66d74fea808800d4e
 SHA1 (patch-ag) = 469993db97a74da50c61449454c02c8a7c69e7bd
diff --git a/sysutils/dbus/patches/patch-aa b/sysutils/dbus/patches/patch-aa
index 99847d4feff..4ca16e49453 100644
--- a/sysutils/dbus/patches/patch-aa
+++ b/sysutils/dbus/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2006/11/13 15:16:20 drochner Exp $
+$NetBSD: patch-aa,v 1.6 2006/12/17 15:39:33 jmmv Exp $
 
---- bus/Makefile.in.orig	2006-10-14 19:27:58.000000000 +0200
+--- bus/Makefile.in.orig	2006-12-12 20:41:47.000000000 +0100
 +++ bus/Makefile.in
-@@ -303,11 +303,11 @@ target_alias = @target_alias@
+@@ -305,11 +305,11 @@ target_alias = @target_alias@
  target_cpu = @target_cpu@
  target_os = @target_os@
  target_vendor = @target_vendor@
@@ -17,7 +17,21 @@ $NetBSD: patch-aa,v 1.5 2006/11/13 15:16:20 drochner Exp $
  
  EFENCE = 
  CONFIG_IN_FILES = \
-@@ -856,8 +856,6 @@ install-data-hook:
+@@ -390,6 +390,13 @@ SCRIPT_IN_FILES = messagebus.in \
+ @DBUS_INIT_SCRIPTS_SLACKWARE_TRUE@initd_SCRIPTS = \
+ @DBUS_INIT_SCRIPTS_SLACKWARE_TRUE@	rc.messagebus
+ 
++initddir = $(datadir)/examples/rc.d
++initd_SCRIPTS = messagebus.redhat rc.messagebus.slackware
++messagebus.redhat: messagebus
++	cp messagebus messagebus.redhat
++rc.messagebus.slackware: rc.messagebus
++	cp rc.messagebus rc.messagebus.slackware
++
+ MAN_IN_FILES = dbus-daemon.1.in
+ man_MANS = dbus-daemon.1
+ 
+@@ -858,8 +865,6 @@ install-data-hook:
  		chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \
  	fi
  	$(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)