[Midnightbsd-cvs] mports [23612] trunk/devel/dbus: update dbus

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Mon Jul 16 18:05:52 EDT 2018 

Revision: 23612
          http://svnweb.midnightbsd.org/mports/?rev=23612
Author:   laffer1
Date:     2018-07-16 18:05:51 -0400 (Mon, 16 Jul 2018)
Log Message:
-----------
update dbus

Modified Paths:
--------------
    trunk/devel/dbus/Makefile
    trunk/devel/dbus/distinfo
    trunk/devel/dbus/files/dbus.in
    trunk/devel/dbus/pkg-plist

Removed Paths:
-------------
    trunk/devel/dbus/files/patch-bus__session.conf.in
    trunk/devel/dbus/files/patch-bus__system.conf.in
    trunk/devel/dbus/files/patch-doc_Makefile.in
    trunk/devel/dbus/pkg-deinstall
    trunk/devel/dbus/pkg-install

Modified: trunk/devel/dbus/Makefile
===================================================================
--- trunk/devel/dbus/Makefile	2018-07-15 20:42:23 UTC (rev 23611)
+++ trunk/devel/dbus/Makefile	2018-07-16 22:05:51 UTC (rev 23612)
@@ -1,8 +1,8 @@
 # $MidnightBSD$
 
 PORTNAME=	dbus
-PORTVERSION=	1.8.20
-PORTREVISION=	2
+PORTVERSION=	1.10.16
+PORTREVISION=	0
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/
 
@@ -11,27 +11,25 @@
 
 LICENSE=	gpl2
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
-USE_GNOME=	# empty but we need it for USE_GNOME_SUBR
-USES=		cpe gmake libtool pathfix
+PORTSCOUT=	limitw:1,even
+
+USES=		cpe gmake libtool localbase pathfix python:build shebangfix
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=--localstatedir=/var \
-	        --with-test-socket-dir=${WRKDIR} \
-		--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
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ARGS=	--with-test-socket-dir=${WRKDIR} \
+		--disable-doxygen-docs \
+		--disable-selinux \
+		--disable-apparmor \
+		--disable-systemd
 INSTALL_TARGET=	install-strip
+SHEBANG_FILES=	tools/GetAllMatchRules.py
 
 CPE_VENDOR=	d-bus_project
 CPE_PRODUCT=	d-bus
 
 USE_RC_SUBR=	dbus
-USE_GNOME_SUBR=	yes
 
 USERS=		messagebus
 GROUPS=		messagebus
@@ -38,12 +36,13 @@
 
 PLIST_SUB=	VERSION="1.0" GROUPS=${GROUPS}
 
+OPTIONS_DEFINE=	EXAMPLES MANPAGES X11
+OPTIONS_DEFAULT=MANPAGES X11
 OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	MANPAGES X11
-OPTIONS_DEFAULT=MANPAGES X11
 X11_DESC=	Support X11 Desktop Environments
 
-MANPAGES_BUILD_DEPENDS=	xmlto:${PORTSDIR}/textproc/xmlto
+MANPAGES_CONFIGURE_ENV=	XMLTO=${LOCALBASE}/bin/minixmlto
+MANPAGES_BUILD_DEPENDS=	minixmlto:textproc/minixmlto
 MANPAGES_CONFIGURE_ENABLE=	xml-docs
 X11_USE=	xorg=ice,sm,x11
 X11_CONFIGURE_WITH=	x
@@ -51,20 +50,11 @@
 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.xml.in \
-		${WRKSRC}/dbus/Makefile.in \
-		${WRKSRC}/tools/Makefile.in
-	@${REINPLACE_CMD} '/^SUBDIRS/,/^$$/ s|test||g' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|THREAD_LIBS -lrt|THREAD_LIBS|g ; \
-		s|dummy man2html|dummy man2html_disable|g' \
-			${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|install-data-am: install-data-local|install-data-am:|g' \
-		${WRKSRC}/tools/Makefile.in
+	@${REINPLACE_CMD} '/^SUBDIRS =/s|test||' ${WRKSRC}/Makefile.in
 
 post-install:
-	${MKDIR} ${PREFIX}/etc/dbus-1/system.d
-	${MKDIR} ${PREFIX}/share/dbus-1/services
-	${MKDIR} ${PREFIX}/share/dbus-1/interfaces
+	${MKDIR} ${EXAMPLESDIR}
+	${MV} ${DOCSDIR}/examples/* ${EXAMPLESDIR}
+	${RM} -r ${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: trunk/devel/dbus/distinfo
===================================================================
--- trunk/devel/dbus/distinfo	2018-07-15 20:42:23 UTC (rev 23611)
+++ trunk/devel/dbus/distinfo	2018-07-16 22:05:51 UTC (rev 23612)
@@ -1,2 +1,3 @@
-SHA256 (dbus-1.8.20.tar.gz) = 5c4fbf4c64621c96e871da91d2b729a5b00536e116d3c4612a469d924b1b703a
-SIZE (dbus-1.8.20.tar.gz) = 1871722
+TIMESTAMP = 1531763946
+SHA256 (dbus-1.10.16.tar.gz) = a7b0ba6ea3e8d0e08afec5e3030d0245614268276620c536726f8fa6e5c43388
+SIZE (dbus-1.10.16.tar.gz) = 1986063

Modified: trunk/devel/dbus/files/dbus.in
===================================================================
--- trunk/devel/dbus/files/dbus.in	2018-07-15 20:42:23 UTC (rev 23611)
+++ trunk/devel/dbus/files/dbus.in	2018-07-16 22:05:51 UTC (rev 23612)
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $MidnightBSD$
+# $MidnightBSD: head/devel/dbus/files/dbus.in 431498 2017-01-14 22:48:49Z tijl $
 #
 # PROVIDE: dbus
 # REQUIRE: DAEMON ldconfig
@@ -11,16 +11,14 @@
 #
 
 . /etc/rc.subr
-. %%GNOME_SUBR%%
 
-dbus_enable=${dbus_enable-${gnome_enable}}
-dbus_flags=${dbus_flags-"--system"}
+: ${dbus_enable=${gnome_enable-NO}} ${dbus_flags="--system"}
 
 name=dbus
 rcvar=dbus_enable
 
 command="%%PREFIX%%/bin/dbus-daemon"
-pidfile="/var/run/dbus/${name}.pid"
+pidfile="/var/run/dbus/pid"
 
 start_precmd="dbus_prestart"
 stop_postcmd="dbus_poststop"
@@ -27,19 +25,17 @@
 
 dbus_prestart()
 {
-    if [ ! -d /var/db/dbus ]; then
-        mkdir -p /var/db/dbus
-    fi
     %%PREFIX%%/bin/dbus-uuidgen --ensure
-
-    mkdir -p $(dirname $pidfile)
+    mkdir -p /var/run/dbus
 }
 
 dbus_poststop()
 {
     rm -f $pidfile
+# The following two lines may be removed after 2018-01-01
+    rm -f /var/db/dbus/machine-id
+    [ ! -d /var/db/dbus ] || rmdir /var/db/dbus
 }
 
-
 load_rc_config ${name}
 run_rc_command "$1"

Deleted: trunk/devel/dbus/files/patch-bus__session.conf.in
===================================================================
--- trunk/devel/dbus/files/patch-bus__session.conf.in	2018-07-15 20:42:23 UTC (rev 23611)
+++ trunk/devel/dbus/files/patch-bus__session.conf.in	2018-07-16 22:05:51 UTC (rev 23612)
@@ -1,10 +0,0 @@
---- ./bus/session.conf.in.orig	2010-03-23 22:01:27.000000000 +0300
-+++ ./bus/session.conf.in	2010-09-01 19:47:37.427994122 +0400
-@@ -32,6 +32,7 @@
-   <!-- This is included last so local configuration can override what's 
-        in this standard file -->
-   <include ignore_missing="yes">session-local.conf</include>
-+  <include ignore_missing="yes">session-kde4.conf</include>
- 
-   <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include>
- 

Deleted: trunk/devel/dbus/files/patch-bus__system.conf.in
===================================================================
--- trunk/devel/dbus/files/patch-bus__system.conf.in	2018-07-15 20:42:23 UTC (rev 23611)
+++ trunk/devel/dbus/files/patch-bus__system.conf.in	2018-07-16 22:05:51 UTC (rev 23612)
@@ -1,10 +0,0 @@
---- ./bus/system.conf.in.orig	2009-07-11 02:27:40.000000000 +0400
-+++ ./bus/system.conf.in	2010-09-01 19:47:19.745313755 +0400
-@@ -77,6 +77,7 @@
-   <!-- This is included last so local configuration can override what's 
-        in this standard file -->
-   <include ignore_missing="yes">system-local.conf</include>
-+  <include ignore_missing="yes">system-kde4.conf</include>
- 
-   <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include>
- 

Deleted: trunk/devel/dbus/files/patch-doc_Makefile.in
===================================================================
--- trunk/devel/dbus/files/patch-doc_Makefile.in	2018-07-15 20:42:23 UTC (rev 23611)
+++ trunk/devel/dbus/files/patch-doc_Makefile.in	2018-07-16 22:05:51 UTC (rev 23612)
@@ -1,13 +0,0 @@
---- doc/Makefile.in.orig	2011-08-14 11:28:23.000000000 +0200
-+++ doc/Makefile.in	2011-08-14 11:28:47.000000000 +0200
-@@ -604,8 +604,8 @@ info: info-am
- 
- info-am:
- 
--install-data-am: install-data-local install-dist_docDATA \
--	install-dist_htmlDATA install-htmlDATA install-man
-+install-data-am: install-data-local \
-+	install-man
- 
- install-dvi: install-dvi-am
- 

Deleted: trunk/devel/dbus/pkg-deinstall
===================================================================
--- trunk/devel/dbus/pkg-deinstall	2018-07-15 20:42:23 UTC (rev 23611)
+++ trunk/devel/dbus/pkg-deinstall	2018-07-16 22:05:51 UTC (rev 23612)
@@ -1,14 +0,0 @@
-#!/bin/sh
-#
-# $MidnightBSD$
-
-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

Deleted: trunk/devel/dbus/pkg-install
===================================================================
--- trunk/devel/dbus/pkg-install	2018-07-15 20:42:23 UTC (rev 23611)
+++ trunk/devel/dbus/pkg-install	2018-07-16 22:05:51 UTC (rev 23612)
@@ -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
-	${PKG_PREFIX}/bin/dbus-uuidgen --ensure
-	exit 0
-	;;
-esac

Modified: trunk/devel/dbus/pkg-plist
===================================================================
--- trunk/devel/dbus/pkg-plist	2018-07-15 20:42:23 UTC (rev 23611)
+++ trunk/devel/dbus/pkg-plist	2018-07-16 22:05:51 UTC (rev 23612)
@@ -4,6 +4,8 @@
 bin/dbus-monitor
 bin/dbus-run-session
 bin/dbus-send
+bin/dbus-test-tool
+bin/dbus-update-activation-environment
 bin/dbus-uuidgen
 etc/dbus-1/session.conf
 etc/dbus-1/system.conf
@@ -28,9 +30,9 @@
 lib/libdbus-1.a
 lib/libdbus-1.so
 lib/libdbus-1.so.3
-lib/libdbus-1.so.3.8.13
+lib/libdbus-1.so.3.14.10
 libdata/pkgconfig/dbus-1.pc
-libexec/dbus-daemon-launch-helper
+@(,%%GROUPS%%,4750) libexec/dbus-daemon-launch-helper
 %%MANPAGES%%man/man1/dbus-cleanup-sockets.1.gz
 %%MANPAGES%%man/man1/dbus-daemon.1.gz
 %%MANPAGES%%man/man1/dbus-launch.1.gz
@@ -37,15 +39,19 @@
 %%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-test-tool.1.gz
+%%MANPAGES%%man/man1/dbus-update-activation-environment.1.gz
 %%MANPAGES%%man/man1/dbus-uuidgen.1.gz
- at exec ln -sf /var/lib/dbus /var/db/dbus/
+share/dbus-1/session.conf
+share/dbus-1/system.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/GetAllMatchRules.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-session-disable-stats.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-system-enable-stats.conf
 @dir share/dbus-1/system-services
 @dir share/dbus-1/services
- at dir share/dbus-1/interfaces
- at dir include/dbus-%%VERSION%%/include/dbus
- at dir include/dbus-%%VERSION%%/include
- at dir include/dbus-%%VERSION%%/dbus
- at dir include/dbus-%%VERSION%%
- at dir etc/dbus-1/session.d
- at dir etc/dbus-1
- at dir etc/dbus-1/system.d
+ at dir share/dbus-1/session.d
+ at dir share/dbus-1/system.d
+ at dir /var/lib/dbus
+ at dir /var/lib
+ at dir /var/run/dbus
+ at postexec [ -f /var/lib/dbus/machine-id -o ! -f /var/db/dbus/machine-id ] || cp -p /var/db/dbus/machine-id /var/lib/dbus/

More information about the Midnightbsd-cvs mailing list