summaryrefslogtreecommitdiff
path: root/sysutils/dbus
diff options
context:
space:
mode:
authorwiz <wiz>2008-11-21 21:27:36 +0000
committerwiz <wiz>2008-11-21 21:27:36 +0000
commit344bd0439d8d348bdcba91a3b8fcff0b70452f2f (patch)
tree4691af0b2647cff307253dc959b2709702e0808e /sysutils/dbus
parent52966457c183ce8c14b38b93800218fe01ed4a85 (diff)
downloadpkgsrc-344bd0439d8d348bdcba91a3b8fcff0b70452f2f.tar.gz
Avoid compiling in example directory path into executables.
Noted by jmcneill. Bump PKGREVISION.
Diffstat (limited to 'sysutils/dbus')
-rw-r--r--sysutils/dbus/Makefile4
-rw-r--r--sysutils/dbus/distinfo4
-rw-r--r--sysutils/dbus/patches/patch-aa14
3 files changed, 13 insertions, 9 deletions
diff --git a/sysutils/dbus/Makefile b/sysutils/dbus/Makefile
index 8ca239ea46f..bb9563970e0 100644
--- a/sysutils/dbus/Makefile
+++ b/sysutils/dbus/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2008/11/15 18:15:09 jmcneill Exp $
+# $NetBSD: Makefile,v 1.37 2008/11/21 21:27:36 wiz Exp $
DISTNAME= dbus-1.2.4
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/
diff --git a/sysutils/dbus/distinfo b/sysutils/dbus/distinfo
index 89b496f7c24..38c1e5a6fc5 100644
--- a/sysutils/dbus/distinfo
+++ b/sysutils/dbus/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.28 2008/11/15 03:59:10 chuck Exp $
+$NetBSD: distinfo,v 1.29 2008/11/21 21:27:36 wiz Exp $
SHA1 (dbus-1.2.4.tar.gz) = 913d796b79802b6ee6ca2b0ef59c670f3fd79774
RMD160 (dbus-1.2.4.tar.gz) = 0441eb8b668ed70250e484b02fe6a83c05c9a088
Size (dbus-1.2.4.tar.gz) = 1564370 bytes
-SHA1 (patch-aa) = e81529adf01e9e6153fc401c903bd4136d592192
+SHA1 (patch-aa) = 2486dfe8a9c80cf10e099ce20f60d14de84e8adb
SHA1 (patch-ab) = 773d4c8e6c3feed90e24eb563c6389c8592925a2
SHA1 (patch-ac) = afec419973f339e846dc109866148529f80998b3
SHA1 (patch-ag) = 999071b782982c12329025ea8e393bfed940b654
diff --git a/sysutils/dbus/patches/patch-aa b/sysutils/dbus/patches/patch-aa
index a4fd25d03be..8ddadbafb56 100644
--- a/sysutils/dbus/patches/patch-aa
+++ b/sysutils/dbus/patches/patch-aa
@@ -1,17 +1,21 @@
-$NetBSD: patch-aa,v 1.8 2008/09/24 11:37:31 taca Exp $
+$NetBSD: patch-aa,v 1.9 2008/11/21 21:27:36 wiz Exp $
---- bus/Makefile.in.orig 2008-08-07 04:43:39.000000000 +0900
+--- bus/Makefile.in.orig 2008-10-06 21:20:15.000000000 +0000
+++ bus/Makefile.in
-@@ -412,7 +412,7 @@ target_os = @target_os@
+@@ -412,9 +412,10 @@ target_os = @target_os@
target_vendor = @target_vendor@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-configdir = $(sysconfdir)/dbus-1
++etcconfigdir = $(sysconfdir)/dbus-1
+configdir = $(datadir)/examples/@PACKAGE@
INCLUDES = -I$(top_srcdir) $(DBUS_BUS_CFLAGS) @PIE_CFLAGS@ \
- -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \
+- -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \
++ -DDBUS_SYSTEM_CONFIG_FILE=\""$(etcconfigdir)/system.conf"\" \
-DDAEMON_NAME=\"dbus-daemon\" -DDBUS_COMPILATION
-@@ -1291,16 +1291,13 @@ install-data-hook:
+
+ EFENCE =
+@@ -1291,16 +1292,13 @@ install-data-hook:
chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \
fi
$(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)