From owner-svn-ports-all@FreeBSD.ORG Thu Mar 6 20:39:25 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E9643CB8; Thu, 6 Mar 2014 20:39:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BC4FC8AC; Thu, 6 Mar 2014 20:39:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s26KdPOC090561; Thu, 6 Mar 2014 20:39:25 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s26KdOju090557; Thu, 6 Mar 2014 20:39:24 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201403062039.s26KdOju090557@svn.freebsd.org> From: Koop Mast Date: Thu, 6 Mar 2014 20:39:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r347320 - in head/devel/dbus: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Mar 2014 20:39:26 -0000 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