Index: head/devel/dbus/Makefile =================================================================== --- head/devel/dbus/Makefile (revision 493839) +++ head/devel/dbus/Makefile (revision 493840) @@ -1,61 +1,64 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ PORTNAME= dbus -PORTVERSION= 1.10.16 -PORTREVISION= 1 +PORTVERSION= 1.12.12 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 -USES= cpe gmake libtool localbase pathfix python:build shebangfix +USES= cpe gmake libtool localbase pkgconfig python:build shebangfix GNU_CONFIGURE= yes USE_LDCONFIG= yes 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 USERS= messagebus GROUPS= messagebus PLIST_SUB= VERSION="1.0" GROUPS=${GROUPS} 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} '/^SUBDIRS =/s|test||' ${WRKSRC}/Makefile.in post-install: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${MV} ${STAGEDIR}${DOCSDIR}/examples/* ${STAGEDIR}${EXAMPLESDIR} ${RM} -r ${STAGEDIR}${DOCSDIR} +.for file in session.conf system.conf + @cd ${STAGEDIR}${ETCDIR}-1/ && \ + ${MV} ${file} ${file}.sample +.endfor .include Index: head/devel/dbus/distinfo =================================================================== --- head/devel/dbus/distinfo (revision 493839) +++ head/devel/dbus/distinfo (revision 493840) @@ -1,3 +1,3 @@ -TIMESTAMP = 1491087035 -SHA256 (dbus-1.10.16.tar.gz) = a7b0ba6ea3e8d0e08afec5e3030d0245614268276620c536726f8fa6e5c43388 -SIZE (dbus-1.10.16.tar.gz) = 1986063 +TIMESTAMP = 1551020450 +SHA256 (dbus-1.12.12.tar.gz) = 9546f226011a1e5d9d77245fe5549ef25af4694053189d624d0d6ac127ecf5f8 +SIZE (dbus-1.12.12.tar.gz) = 2077301 Index: head/devel/dbus/pkg-plist =================================================================== --- head/devel/dbus/pkg-plist (revision 493839) +++ head/devel/dbus/pkg-plist (revision 493840) @@ -1,58 +1,60 @@ 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 +@sample %%ETCDIR%%-1/session.conf.sample +@sample %%ETCDIR%%-1/system.conf.sample 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/cmake/DBus1/DBus1Config.cmake +lib/cmake/DBus1/DBus1ConfigVersion.cmake 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.10 +lib/libdbus-1.so.3.19.9 libdata/pkgconfig/dbus-1.pc @(,%%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 %%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 +%%DATADIR%%-1/session.conf +%%DATADIR%%-1/system.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/GetAllMatchRules.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-session-disable-stats.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-system-enable-stats.conf +share/xml/dbus-1/busconfig.dtd +share/xml/dbus-1/introspect.dtd @dir share/dbus-1/system-services @dir share/dbus-1/services @dir share/dbus-1/session.d @dir share/dbus-1/system.d @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/