diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2014-03-06 20:39:24 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2014-03-06 20:39:24 +0000 |
| commit | c6022ea918d840dbc1209a4106c9ab6920bc4e06 (patch) | |
| tree | 3de69f605e4f699f260c3e1ff99cc814545611b9 /devel/dbus | |
| parent | Mark BROKEN: Does not build (diff) | |
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]
Notes
Notes:
svn path=/head/; revision=347320
Diffstat (limited to 'devel/dbus')
| -rw-r--r-- | devel/dbus/Makefile | 4 | ||||
| -rw-r--r-- | devel/dbus/files/dbus.in | 4 | ||||
| -rw-r--r-- | devel/dbus/pkg-install | 1 | ||||
| -rw-r--r-- | devel/dbus/pkg-plist | 1 |
4 files changed, 4 insertions, 6 deletions
diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile index 37e25f717bbe..8845ae64f32a 100644 --- a/devel/dbus/Makefile +++ b/devel/dbus/Makefile @@ -14,8 +14,8 @@ LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 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 \ diff --git a/devel/dbus/files/dbus.in b/devel/dbus/files/dbus.in index 6a2b772c8cd9..f575c79b8005 100644 --- a/devel/dbus/files/dbus.in +++ b/devel/dbus/files/dbus.in @@ -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) } diff --git a/devel/dbus/pkg-install b/devel/dbus/pkg-install index afc675e07ce6..bab0e17a39b5 100644 --- a/devel/dbus/pkg-install +++ b/devel/dbus/pkg-install @@ -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 diff --git a/devel/dbus/pkg-plist b/devel/dbus/pkg-plist index a467b6a29e71..a6cfa9c8840a 100644 --- a/devel/dbus/pkg-plist +++ b/devel/dbus/pkg-plist @@ -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 |