summaryrefslogtreecommitdiffstats
path: root/devel
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2006-10-09 10:31:46 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2006-10-09 10:31:46 +0800
commitafd74a02a91ab6d1ccb5a54ebf1f8b54b9293a7a (patch)
tree43d8fa0dd813ce22cd5cb34cda0fff8c6929501f /devel
parent0f437eb962957b88d12efa382073ed39f199d792 (diff)
downloadmarcuscom-ports-afd74a02a91ab6d1ccb5a54ebf1f8b54b9293a7a.tar
marcuscom-ports-afd74a02a91ab6d1ccb5a54ebf1f8b54b9293a7a.tar.gz
marcuscom-ports-afd74a02a91ab6d1ccb5a54ebf1f8b54b9293a7a.tar.bz2
marcuscom-ports-afd74a02a91ab6d1ccb5a54ebf1f8b54b9293a7a.tar.lz
marcuscom-ports-afd74a02a91ab6d1ccb5a54ebf1f8b54b9293a7a.tar.xz
marcuscom-ports-afd74a02a91ab6d1ccb5a54ebf1f8b54b9293a7a.tar.zst
marcuscom-ports-afd74a02a91ab6d1ccb5a54ebf1f8b54b9293a7a.zip
Restore the DBUS_SLAVE checks to fix dbus-sharp.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7679 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel')
-rw-r--r--devel/dbus-sharp/Makefile4
-rw-r--r--devel/dbus/Makefile5
2 files changed, 7 insertions, 2 deletions
diff --git a/devel/dbus-sharp/Makefile b/devel/dbus-sharp/Makefile
index 9eeb8f9e7..e36f063ea 100644
--- a/devel/dbus-sharp/Makefile
+++ b/devel/dbus-sharp/Makefile
@@ -3,11 +3,11 @@
# Whom: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
#
# $FreeBSD$
-# $Id: Makefile,v 1.3 2006-10-07 17:10:05 marcus Exp $
+# $Id: Makefile,v 1.4 2006-10-09 02:31:46 marcus Exp $
#
PORTVERSION= 0.62
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= devel gnome
PKGNAMESUFFIX= -sharp
diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index 027f43933..92b639634 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -32,12 +32,14 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
+.if !defined(DBUS_SLAVE)
USE_RC_SUBR= dbus
PLIST_SUB= VERSION="1.0"
MAN1= dbus-cleanup-sockets.1 dbus-daemon.1 dbus-launch.1 \
dbus-monitor.1 dbus-send.1
+.endif
.include <bsd.port.pre.mk>
@@ -46,6 +48,7 @@ post-patch:
${WRKSRC}/bus/session.conf.in \
${WRKSRC}/bus/system.conf.in
+.if !defined(DBUS_SLAVE)
pre-su-install:
@for i in 15 9 ; do \
if [ -f /var/run/dbus/dbus.pid ]; then \
@@ -64,4 +67,6 @@ post-install:
${MKDIR} ${X11BASE}/etc/dbus-1/system.d
${MKDIR} ${X11BASE}/share/dbus-1/services
+.endif
+
.include <bsd.port.post.mk>