svn commit: r347320 - in head/devel/dbus: . files

[Koop Mast]

Author: kwm
Date: Thu Mar  6 20:39:24 2014
New Revision: 347320
URL: http://svnweb.freebsd.org/changeset/ports/347320
QAT: https://qat.redports.org/buildarchive/r347320/

Log:
  Don't run dbus-uuidgen in post-install scripts. This has the effect that
  there will be no dangeling /var/db/dbus/machine-id on package install [1].
  Change the dbus start script to always call dbus-uuidgen --ensure. Which
  only generates /var/db/dbus/machine-id if it is not present.
  While here switch to USES=libtool.
  
  Reported by:	poudriere in strict mode via miwi@ [1]

Modified:
  head/devel/dbus/Makefile
  head/devel/dbus/files/dbus.in
  head/devel/dbus/pkg-install
  head/devel/dbus/pkg-plist

Modified: head/devel/dbus/Makefile
==============================================================================
--- head/devel/dbus/Makefile	Thu Mar  6 20:38:10 2014	(r347319)
+++ head/devel/dbus/Makefile	Thu Mar  6 20:39:24 2014	(r347320)
@@ -14,8 +14,8 @@ LIB_DEPENDS=	libexpat.so:${PORTSDIR}/tex
 
 PORTSCOUT=	limitw:1,even
 
-USE_GNOME=	libxml2 ltverhack
-USES=		gmake pathfix
+USE_GNOME=	libxml2
+USES=		gmake libtool pathfix
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=--localstatedir=/var \

Modified: head/devel/dbus/files/dbus.in
==============================================================================
--- head/devel/dbus/files/dbus.in	Thu Mar  6 20:38:10 2014	(r347319)
+++ head/devel/dbus/files/dbus.in	Thu Mar  6 20:39:24 2014	(r347320)
@@ -30,9 +30,7 @@ dbus_prestart()
     if [ ! -d /var/db/dbus ]; then
         mkdir -p /var/db/dbus
     fi
-    if [ ! -f /var/db/dbus/machine-id ]; then
-        %%PREFIX%%/bin/dbus-uuidgen > /var/db/dbus/machine-id
-    fi
+    %%PREFIX%%/bin/dbus-uuidgen --ensure
 
     mkdir -p $(dirname $pidfile)
 }

Modified: head/devel/dbus/pkg-install
==============================================================================
--- head/devel/dbus/pkg-install	Thu Mar  6 20:38:10 2014	(r347319)
+++ head/devel/dbus/pkg-install	Thu Mar  6 20:39:24 2014	(r347320)
@@ -9,7 +9,6 @@ POST-INSTALL)
 	/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
-	${PKG_PREFIX}/bin/dbus-uuidgen --ensure
 	exit 0
 	;;
 esac

Modified: head/devel/dbus/pkg-plist
==============================================================================
--- head/devel/dbus/pkg-plist	Thu Mar  6 20:38:10 2014	(r347319)
+++ head/devel/dbus/pkg-plist	Thu Mar  6 20:39:24 2014	(r347320)
@@ -28,6 +28,7 @@ lib/libdbus-1.a
 lib/libdbus-1.la
 lib/libdbus-1.so
 lib/libdbus-1.so.3
+lib/libdbus-1.so.3.7.6
 libdata/pkgconfig/dbus-1.pc
 libexec/dbus-daemon-launch-helper
 man/man1/dbus-cleanup-sockets.1.gz