Index: head/devel/dbus/Makefile =================================================================== --- head/devel/dbus/Makefile (revision 431186) +++ head/devel/dbus/Makefile (revision 431187) @@ -1,70 +1,60 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ PORTNAME= dbus PORTVERSION= 1.10.14 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/ MAINTAINER= gnome@FreeBSD.org COMMENT= Message bus system for inter-application communication LICENSE= GPLv2 LIB_DEPENDS= libexpat.so:textproc/expat2 PORTSCOUT= limitw:1,even -USE_GNOME= # empty but we need it for USE_GNOME_SUBR USES= cpe gmake libtool localbase pathfix 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 \ +CONFIGURE_ARGS= --with-test-socket-dir=${WRKDIR} \ --disable-doxygen-docs \ --disable-selinux \ --disable-apparmor \ --disable-systemd INSTALL_TARGET= install-strip CPE_VENDOR= d-bus_project CPE_PRODUCT= d-bus USE_RC_SUBR= dbus -USE_GNOME_SUBR= yes USERS= messagebus GROUPS= messagebus PLIST_SUB= VERSION="1.0" GROUPS=${GROUPS} -OPTIONS_SUB= yes -OPTIONS_DEFINE= MANPAGES X11 +OPTIONS_DEFINE= EXAMPLES MANPAGES X11 OPTIONS_DEFAULT=MANPAGES X11 +OPTIONS_SUB= yes X11_DESC= Support X11 Desktop Environments 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 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} '/^SUBDIRS =/s|test||' ${WRKSRC}/Makefile.in post-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/share/dbus-1/interfaces - @${MKDIR} ${STAGEDIR}/var/run/dbus - @${MKDIR} ${STAGEDIR}/var/db/dbus - @${RMDIR} ${STAGEDIR}/var/lib/dbus ${STAGEDIR}/var/lib + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${MV} ${STAGEDIR}${DOCSDIR}/examples/* ${STAGEDIR}${EXAMPLESDIR} + ${RM} -r ${STAGEDIR}${DOCSDIR} .include Index: head/devel/dbus/files/patch-doc_Makefile.in =================================================================== --- head/devel/dbus/files/patch-doc_Makefile.in (revision 431186) +++ head/devel/dbus/files/patch-doc_Makefile.in (nonexistent) @@ -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 - Property changes on: head/devel/dbus/files/patch-doc_Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/dbus/files/dbus.in =================================================================== --- head/devel/dbus/files/dbus.in (revision 431186) +++ head/devel/dbus/files/dbus.in (revision 431187) @@ -1,45 +1,40 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: dbus # REQUIRE: DAEMON ldconfig # # Add the following lines to /etc/rc.conf to enable the D-BUS messaging system: # # dbus_enable="YES" # . /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" dbus_prestart() { - if [ ! -d /var/db/dbus ]; then - mkdir -p /var/db/dbus - fi %%PREFIX%%/bin/dbus-uuidgen --ensure - - mkdir -p $(dirname $pidfile) } 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" Index: head/devel/dbus/pkg-plist =================================================================== --- head/devel/dbus/pkg-plist (revision 431186) +++ head/devel/dbus/pkg-plist (revision 431187) @@ -1,56 +1,58 @@ bin/dbus-cleanup-sockets bin/dbus-daemon bin/dbus-launch 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 -share/dbus-1/session.conf -share/dbus-1/system.conf include/dbus-%%VERSION%%/dbus/dbus-address.h include/dbus-%%VERSION%%/dbus/dbus-bus.h include/dbus-%%VERSION%%/dbus/dbus-connection.h include/dbus-%%VERSION%%/dbus/dbus-errors.h include/dbus-%%VERSION%%/dbus/dbus-macros.h include/dbus-%%VERSION%%/dbus/dbus-memory.h include/dbus-%%VERSION%%/dbus/dbus-message.h include/dbus-%%VERSION%%/dbus/dbus-misc.h include/dbus-%%VERSION%%/dbus/dbus-pending-call.h include/dbus-%%VERSION%%/dbus/dbus-protocol.h include/dbus-%%VERSION%%/dbus/dbus-server.h include/dbus-%%VERSION%%/dbus/dbus-shared.h include/dbus-%%VERSION%%/dbus/dbus-signature.h include/dbus-%%VERSION%%/dbus/dbus-syntax.h include/dbus-%%VERSION%%/dbus/dbus-threads.h include/dbus-%%VERSION%%/dbus/dbus-types.h include/dbus-%%VERSION%%/dbus/dbus.h lib/dbus-%%VERSION%%/include/dbus/dbus-arch-deps.h lib/libdbus-1.a lib/libdbus-1.so lib/libdbus-1.so.3 lib/libdbus-1.so.3.14.9 libdata/pkgconfig/dbus-1.pc @(,%%GROUPS%%,4750) libexec/dbus-daemon-launch-helper -share/doc/dbus/examples/GetAllMatchRules.py -share/doc/dbus/examples/example-session-disable-stats.conf -share/doc/dbus/examples/example-system-enable-stats.conf %%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-test-tool.1.gz %%MANPAGES%%man/man1/dbus-update-activation-environment.1.gz %%MANPAGES%%man/man1/dbus-uuidgen.1.gz +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/interfaces @dir share/dbus-1/services @dir share/dbus-1/session.d @dir share/dbus-1/system.d -@dir /var/db/dbus +@dir /var/lib/dbus +@dir /var/lib @dir /var/run/dbus +@comment The following line may be removed after 2018-01-01 +@postexec [ -f /var/lib/dbus/machine-id -o ! -f /var/db/dbus/machine-id ] || cp -p /var/db/dbus/machine-id /var/lib/dbus/