From 59d974c3b09f339ebcfeee958701c2c8e7d189e1 Mon Sep 17 00:00:00 2001
From: marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Sat, 19 Jan 2008 20:01:39 +0000
Subject: Add some missing directories to the plist, and remove X11BASE.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@10162 df743ca5-7f9a-e211-a948-0013205c9059
---
 devel/dbus/Makefile                       |  9 ++-------
 devel/dbus/files/patch-bus_system.conf.in | 10 ----------
 devel/dbus/pkg-plist                      | 10 ++++------
 3 files changed, 6 insertions(+), 23 deletions(-)
 delete mode 100644 devel/dbus/files/patch-bus_system.conf.in

diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index 34c64e41e..eb8cbf010 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dbus
 PORTVERSION?=	1.1.2
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/
 
@@ -48,10 +48,7 @@ USE_XLIB=	yes
 .include <bsd.port.pre.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|' \
-		${WRKSRC}/bus/system.conf.in
-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
-	    	s|/usr/X11R6|${X11BASE}|g' \
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/dbus/dbus-sysdeps-unix.c
 	@${REINPLACE_CMD} -e 's|/lib/dbus/machine-id|/db/dbus/machine-id|g' \
 		${WRKSRC}/dbus/Makefile.in \
@@ -62,8 +59,6 @@ post-install:
 .if !defined(PACKAGE_BUILDING)
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
-	${MKDIR} ${X11BASE}/etc/dbus-1/system.d
-	${MKDIR} ${X11BASE}/share/dbus-1/services
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/dbus/files/patch-bus_system.conf.in b/devel/dbus/files/patch-bus_system.conf.in
deleted file mode 100644
index cfb3f879e..000000000
--- a/devel/dbus/files/patch-bus_system.conf.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- bus/system.conf.in.orig	Wed May  3 02:08:16 2006
-+++ bus/system.conf.in	Wed May  3 02:09:58 2006
-@@ -52,6 +52,7 @@
-   <!-- Config files are placed here that among other things, punch 
-        holes in the above policy for specific services. -->
-   <includedir>system.d</includedir>
-+  <includedir>%%X11BASE%%/etc/dbus-1/system.d</includedir>
- 
-   <!-- This is included last so local configuration can override what's 
-        in this standard file -->
diff --git a/devel/dbus/pkg-plist b/devel/dbus/pkg-plist
index ba9a666f4..f0f163916 100644
--- a/devel/dbus/pkg-plist
+++ b/devel/dbus/pkg-plist
@@ -29,17 +29,15 @@ lib/libdbus-1.so
 lib/libdbus-1.so.3
 libdata/pkgconfig/dbus-1.pc
 libexec/dbus-daemon-launch-helper
+@exec mkdir -p %D/libexec/dbus-1
 @exec mkdir -p %D/etc/dbus-1/system.d
-@exec mkdir -p %%X11BASE%%/etc/dbus-1/system.d
 @exec mkdir -p %D/share/dbus-1/services
-@exec mkdir -p %%X11BASE%%/share/dbus-1/services
+@exec mkdir -p %D/share/dbus-1/system-services
 @exec mkdir -p %D/etc/dbus-1/session.d
+@dirrmtry share/dbus-1/system-services
 @dirrmtry share/dbus-1/services
 @dirrmtry share/dbus-1
-@unexec rmdir %%X11BASE%%/share/dbus-1/services 2>/dev/null || true
-@unexec rmdir %%X11BASE%%/share/dbus-1 2>/dev/null || true
-@unexec rmdir %%X11BASE%%/etc/dbus-1/system.d 2>/dev/null || true
-@unexec rmdir %%X11BASE%%/etc/dbus-1 2>/dev/null || true
+@dirrmtry libexec/dbus-1
 @dirrm include/dbus-%%VERSION%%/include/dbus
 @dirrm include/dbus-%%VERSION%%/include
 @dirrm include/dbus-%%VERSION%%/dbus
-- 
cgit v1.2.3