Update to 1.8.0.

Drop libxml2 depend we don't need it.
Drop pkg-[de]install script for plist @mode,@group.
Use new OPTIONS handlers.
Add MANPAGES option.

5 files changed, 34 insertions, 55 deletions

diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index d5d96924ee22..e6b3176e8f97 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -3,8 +3,7 @@
 #   $MCom: ports/devel/dbus/Makefile,v 1.58 2013/02/15 15:06:49 kwm Exp $
 
 PORTNAME=	dbus
-PORTVERSION=	1.6.18
-PORTREVISION=	2
+PORTVERSION=	1.8.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/
 
@@ -15,7 +14,7 @@ LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
 
 PORTSCOUT=	limitw:1,even
 
-USE_GNOME=	libxml2
+USE_GNOME=	# empty but we need it for USE_GNOME_SUBR
 USES=		gmake libtool:keepla pathfix
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
@@ -24,10 +23,10 @@ CONFIGURE_ARGS=--localstatedir=/var \
 		--with-system-pid-file=/var/run/dbus/dbus.pid \
 		--with-system-socket=/var/run/dbus/system_bus_socket \
 		--with-session-socket-dir=/tmp \
-		--disable-doxygen-docs \
-		--disable-xml-docs
+		--disable-doxygen-docs
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 
 USE_RC_SUBR=	dbus
 USE_GNOME_SUBR=	yes
@@ -35,25 +34,23 @@ USE_GNOME_SUBR=	yes
 USERS=		messagebus
 GROUPS=		messagebus
 
-PLIST_SUB=	VERSION="1.0"
+PLIST_SUB=	VERSION="1.0" GROUPS=${GROUPS}
 
-OPTIONS_DEFINE=	X11
-OPTIONS_DEFAULT=X11
+OPTIONS_SUB=	yes
+OPTIONS_DEFINE=	MANPAGES X11
+OPTIONS_DEFAULT=MANPAGES X11
 X11_DESC=	Support X11 Desktop Environments
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MX11}
-USE_XORG=	ice sm x11
-.else
-CONFIGURE_ARGS+=--without-x
-.endif
+MANPAGES_BUILD_DEPENDS=	xmlto:${PORTSDIR}/textproc/xmlto
+MANPAGES_CONFIGURE_ENABLE=	xml-docs
+X11_USE=	xorg=ice,sm,x11
+X11_CONFIGURE_WITH=	x
 
 post-patch:
 	@${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}/doc/dbus-uuidgen.1 \
+		${WRKSRC}/doc/dbus-uuidgen.1.xml.in \
 		${WRKSRC}/dbus/Makefile.in \
 		${WRKSRC}/tools/Makefile.in
 	@${REINPLACE_CMD} '/^SUBDIRS/,/^$$/ s|test||g' ${WRKSRC}/Makefile.in
@@ -65,6 +62,7 @@ post-patch:
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/dbus-1/interfaces
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libdbus-1.so.3
+	@${MKDIR} ${STAGEDIR}/var/run/dbus
+	@${MKDIR} ${STAGEDIR}/var/db/dbus
 
 .include <bsd.port.mk>
diff --git a/devel/dbus/distinfo b/devel/dbus/distinfo
index bc71da71aee1..61f8f77c230c 100644
--- a/devel/dbus/distinfo
+++ b/devel/dbus/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dbus-1.6.18.tar.gz) = 7085a0895a9eb11a952394cdbea6d8b4358e17cb991fed0e8fb85e2b9e686dcd
-SIZE (dbus-1.6.18.tar.gz) = 1916553
+SHA256 (dbus-1.8.0.tar.gz) = 769f8c7282b535ccbe610f63a5f14137a5549834b0b0c8a783e90891b8d70b13
+SIZE (dbus-1.8.0.tar.gz) = 1860965
diff --git a/devel/dbus/pkg-deinstall b/devel/dbus/pkg-deinstall
deleted file mode 100644
index bac2f366b6c1..000000000000
--- a/devel/dbus/pkg-deinstall
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-case $2 in
-DEINSTALL)
-	echo ""
-	echo "To really remove the dbus port, please remove the following"
-	echo "directories and the content manualy:"
-	echo ""
-	echo "/var/run/dbus and /var/db/dbus"
-	echo ""
-	;;
-esac
diff --git a/devel/dbus/pkg-install b/devel/dbus/pkg-install
deleted file mode 100644
index bab0e17a39b5..000000000000
--- a/devel/dbus/pkg-install
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-case $2 in
-POST-INSTALL)
-	USER=messagebus
-	GROUP=${USER}
-
-	/usr/bin/install -d -o ${USER} -g ${GROUP} /var/run/dbus
-	/usr/bin/install -d -o ${USER} -g ${GROUP} /var/db/dbus
-	/usr/bin/chgrp ${GROUP} ${PKG_PREFIX}/libexec/dbus-daemon-launch-helper
-	/bin/chmod 4750 ${PKG_PREFIX}/libexec/dbus-daemon-launch-helper
-	exit 0
-	;;
-esac
diff --git a/devel/dbus/pkg-plist b/devel/dbus/pkg-plist
index a6cfa9c8840a..d488ffd52113 100644
--- a/devel/dbus/pkg-plist
+++ b/devel/dbus/pkg-plist
@@ -2,6 +2,7 @@ bin/dbus-cleanup-sockets
 bin/dbus-daemon
 bin/dbus-launch
 bin/dbus-monitor
+bin/dbus-run-session
 bin/dbus-send
 bin/dbus-uuidgen
 etc/dbus-1/session.conf
@@ -28,15 +29,20 @@ lib/libdbus-1.a
 lib/libdbus-1.la
 lib/libdbus-1.so
 lib/libdbus-1.so.3
-lib/libdbus-1.so.3.7.6
+lib/libdbus-1.so.3.8.3
 libdata/pkgconfig/dbus-1.pc
+@group %%GROUPS%%
+@mode 4750
 libexec/dbus-daemon-launch-helper
-man/man1/dbus-cleanup-sockets.1.gz
-man/man1/dbus-daemon.1.gz
-man/man1/dbus-launch.1.gz
-man/man1/dbus-monitor.1.gz
-man/man1/dbus-send.1.gz
-man/man1/dbus-uuidgen.1.gz
+@group
+@mode
+%%MANPAGES%%man/man1/dbus-cleanup-sockets.1.gz
+%%MANPAGES%%man/man1/dbus-daemon.1.gz
+%%MANPAGES%%man/man1/dbus-launch.1.gz
+%%MANPAGES%%man/man1/dbus-monitor.1.gz
+%%MANPAGES%%man/man1/dbus-run-session.1.gz
+%%MANPAGES%%man/man1/dbus-send.1.gz
+%%MANPAGES%%man/man1/dbus-uuidgen.1.gz
 @exec mkdir -p %D/etc/dbus-1/system.d
 @exec mkdir -p %D/share/dbus-1/interfaces
 @exec mkdir -p %D/share/dbus-1/services
@@ -53,3 +59,7 @@ man/man1/dbus-uuidgen.1.gz
 @dirrm etc/dbus-1/system.d
 @dirrm etc/dbus-1/session.d
 @dirrm etc/dbus-1
+@cwd /
+@dirrmtry /var/db/dbus
+@dirrmtry /var/run/dbus
+@cwd