Import of pkgsrc-2015Q1

sysutils/dbus/Makefile

@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.65 2013/11/03 16:09:03 wiz Exp $
+# $NetBSD: Makefile,v 1.81 2015/02/17 13:48:24 wiz Exp $
 
-DISTNAME=	dbus-1.6.18
+DISTNAME=	dbus-1.8.16
 CATEGORIES=	sysutils
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/
 
@@ -10,7 +10,8 @@ COMMENT=	Message bus system
 LICENSE=	gnu-gpl-v2
 
 CONFLICTS+=	dbus-glib<0.71
-CONFLICTS+=	py*-dbus<0.71
+CONFLICTS+=	py26-dbus<0.71
+CONFLICTS+=	py27-dbus<0.71
 
 GNU_CONFIGURE=		YES
 USE_TOOLS+=		gmake msgfmt pkg-config
@@ -23,31 +24,32 @@ BUILD_DEFS+=		VARBASE
 OWN_DIRS_PERMS+=	${VARBASE}/db/dbus ${DBUS_USER} ${DBUS_GROUP} 0755
 SPECIAL_PERMS+=		libexec/dbus-daemon-launch-helper ${REAL_ROOT_USER} ${DBUS_GROUP} 4511
 
-.include "../../mk/bsd.prefs.mk"
+SMF_METHODS=	dbus
+SMF_NAME=	dbus
 
-# Disable man2html detection forcibly
-CONFIGURE_ENV+=		ac_cv_path_MAN2HTML=
+MESSAGE_SRC+=	MESSAGE
+
+.include "../../mk/bsd.prefs.mk"
 
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
-#CONFIGURE_ARGS+=	--enable-embedded-tests
-
-#CFLAGS.NetBSD+=		-D_NETBSD_SOURCE
 
 CONFIGURE_ARGS_GROUPS=	enable disable with without
 
 .if ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+= --with-session-socket-dir=/tmp
+# Prevent the configure script from picking up a per-user tmp
+# directory. See the commit message on revision 1.35
+CONFIGURE_ARGS.with+=	session-socket-dir=/tmp
 .endif
 
-CONFIGURE_ARGS.Linux=	abstract-sockets dnotify selinux
+CONFIGURE_ARGS.Linux=	abstract-sockets selinux
 CONFIGURE_ARGS.docs=	doxygen-docs xml-docs
 
 CONFIGURE_ARGS.without+=	init-scripts
-CONFIGURE_ARGS.disable=		ansi gcov
+CONFIGURE_ARGS.disable+=	ansi
 CONFIGURE_ARGS.disable+=	console-owner-file
 CONFIGURE_ARGS.disable+=	${CONFIGURE_ARGS.docs}
-CONFIGURE_ARGS.enable=		checks static
+CONFIGURE_ARGS.enable+=		checks static
 ###
 ### XXX the spawn test hangs, and some of these tests may be bogus
 ###
@@ -56,9 +58,8 @@ CONFIGURE_ARGS.enable=		checks static
 #TEST_TARGET=			check
 #.endif
 
-CONFIGURE_ARGS.with=	dbus-user=${DBUS_USER}
+CONFIGURE_ARGS.with+=	dbus-user=${DBUS_USER}
 CONFIGURE_ARGS.with+=	test-socket-dir=${WRKDIR:Q}
-CONFIGURE_ARGS.with+=	xml=expat
 
 PTHREAD_AUTO_VARS=	yes
 
@@ -69,7 +70,7 @@ CONFIGURE_ARGS.disable+=\
 			${CONFIGURE_ARGS.Linux}
 .endif
 
-PLIST_VARS+=    	linux
+PLIST_VARS+=    	linux launchd
 
 CONFIGURE_ARGS+=\
 	${CONFIGURE_ARGS_GROUPS:@.g.@			\
@@ -111,14 +112,6 @@ BUILDLINK_TRANSFORM+=	rm:-lrt
 
 .include "options.mk"
 
-.if ${OPSYS} == "Linux"
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/bus/rc.messagebus \
-		${DESTDIR}${PREFIX}/share/examples/rc.d/rc.messagebus.slackware
-	${INSTALL_DATA} ${WRKSRC}/bus/messagebus \
-		${DESTDIR}${PREFIX}/share/examples/rc.d/messagebus.redhat
-.endif
-
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"