Date: Sat, 14 Jan 2017 23:58:16 +0100 From: Baptiste Daroussin <bapt@FreeBSD.org> To: Tijl Coosemans <tijl@FreeBSD.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r431187 - in head/devel/dbus: . files Message-ID: <20170114225816.zbx4lqxgof3zsfyq@ivaldir.etoilebsd.net> In-Reply-To: <201701111507.v0BF7sXr024443@repo.freebsd.org> References: <201701111507.v0BF7sXr024443@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--py66t3htkosgmk2o Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Jan 11, 2017 at 03:07:54PM +0000, Tijl Coosemans wrote: > Author: tijl > Date: Wed Jan 11 15:07:53 2017 > New Revision: 431187 > URL: https://svnweb.freebsd.org/changeset/ports/431187 >=20 > Log: > - Remove --localstatedir=3D/var, already added by bsd.port.mk. > - Use default locations for system pidfile, system socket and session > sockets so Linux programs can find these too. > - Adjust rc.d script to eliminate gnome-subr dependency. > - Move examples to EXAMPLESDIR and add EXAMPLES option. > - Move /var/db/dbus/machine-id to default /var/lib/dbus/machine-id so L= inux > programs can find this file. Add a postexec command to pkg-plist to = copy > this file to the new location on installation so the id is preserved.= The > old file cannot be removed from pkg-plist because currently running > processes might still need it. Remove the old file from the rc.d scr= ipt > instead. > - Sort pkg-plist. > =20 > PR: 215174 > Approved by: maintainer timeout (4 weeks) >=20 > Deleted: > head/devel/dbus/files/patch-doc_Makefile.in > Modified: > head/devel/dbus/Makefile > head/devel/dbus/files/dbus.in > head/devel/dbus/pkg-plist >=20 > Modified: head/devel/dbus/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/devel/dbus/Makefile Wed Jan 11 15:06:22 2017 (r431186) > +++ head/devel/dbus/Makefile Wed Jan 11 15:07:53 2017 (r431187) > @@ -3,6 +3,7 @@ > =20 > PORTNAME=3D dbus > PORTVERSION=3D 1.10.14 > +PORTREVISION=3D 1 > CATEGORIES=3D devel gnome > MASTER_SITES=3D http://dbus.freedesktop.org/releases/dbus/ > =20 > @@ -15,15 +16,10 @@ LIB_DEPENDS=3D libexpat.so:textproc/expat2 > =20 > PORTSCOUT=3D limitw:1,even > =20 > -USE_GNOME=3D # empty but we need it for USE_GNOME_SUBR > USES=3D cpe gmake libtool localbase pathfix > GNU_CONFIGURE=3D yes > USE_LDCONFIG=3D yes > -CONFIGURE_ARGS=3D --localstatedir=3D/var \ > - --with-test-socket-dir=3D${WRKDIR} \ > - --with-system-pid-file=3D/var/run/dbus/dbus.pid \ > - --with-system-socket=3D/var/run/dbus/system_bus_socket \ > - --with-session-socket-dir=3D/tmp \ > +CONFIGURE_ARGS=3D --with-test-socket-dir=3D${WRKDIR} \ > --disable-doxygen-docs \ > --disable-selinux \ > --disable-apparmor \ > @@ -34,16 +30,15 @@ CPE_VENDOR=3D d-bus_project > CPE_PRODUCT=3D d-bus > =20 > USE_RC_SUBR=3D dbus > -USE_GNOME_SUBR=3D yes > =20 > USERS=3D messagebus > GROUPS=3D messagebus > =20 > PLIST_SUB=3D VERSION=3D"1.0" GROUPS=3D${GROUPS} > =20 > -OPTIONS_SUB=3D yes > -OPTIONS_DEFINE=3D MANPAGES X11 > +OPTIONS_DEFINE=3D EXAMPLES MANPAGES X11 > OPTIONS_DEFAULT=3DMANPAGES X11 > +OPTIONS_SUB=3D yes > X11_DESC=3D Support X11 Desktop Environments > =20 > MANPAGES_CONFIGURE_ENV=3D XMLTO=3D${LOCALBASE}/bin/minixmlto > @@ -55,16 +50,11 @@ X11_CONFIGURE_WITH=3D 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 =3D/s|test||' ${WRKSRC}/Makefile.in > =20 > 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} > =20 > .include <bsd.port.mk> >=20 > Modified: head/devel/dbus/files/dbus.in > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/devel/dbus/files/dbus.in Wed Jan 11 15:06:22 2017 (r431186) > +++ head/devel/dbus/files/dbus.in Wed Jan 11 15:07:53 2017 (r431187) > @@ -11,35 +11,30 @@ > # > =20 > . /etc/rc.subr > -. %%GNOME_SUBR%% > =20 > -dbus_enable=3D${dbus_enable-${gnome_enable}} > -dbus_flags=3D${dbus_flags-"--system"} > +: ${dbus_enable=3D${gnome_enable-NO}} ${dbus_flags=3D"--system"} > =20 > name=3Ddbus > rcvar=3Ddbus_enable > =20 > command=3D"%%PREFIX%%/bin/dbus-daemon" > -pidfile=3D"/var/run/dbus/${name}.pid" > +pidfile=3D"/var/run/dbus/pid" > =20 > start_precmd=3D"dbus_prestart" > stop_postcmd=3D"dbus_poststop" > =20 > dbus_prestart() > { > - if [ ! -d /var/db/dbus ]; then > - mkdir -p /var/db/dbus > - fi > %%PREFIX%%/bin/dbus-uuidgen --ensure > - > - mkdir -p $(dirname $pidfile) > } > =20 > 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 > } > =20 > - > load_rc_config ${name} > run_rc_command "$1" >=20 > Modified: head/devel/dbus/pkg-plist > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/devel/dbus/pkg-plist Wed Jan 11 15:06:22 2017 (r431186) > +++ head/devel/dbus/pkg-plist Wed Jan 11 15:07:53 2017 (r431187) > @@ -9,8 +9,6 @@ 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 > @@ -35,9 +33,6 @@ 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 > @@ -47,10 +42,17 @@ share/doc/dbus/examples/example-system-e > %%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/ >=20 :( I would have prefered a symlink rather this but hey (on FreeBSD /var/db is = the right place in theory :)) Bapt --py66t3htkosgmk2o Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEgOTj3suS2urGXVU3Y4mL3PG3PloFAlh6rOoACgkQY4mL3PG3 PlpImg//TXOEL1sxmIXvZNSQdAaX1JnG2v8j8IecWKtpNckZIBrFK73sibWltNQN U+irlTL1pQrsbQtSlYA7x5mFCF5x/qzyikBJX32zxJy1J37UhsdM+H5PODiSdA5G rUUbfWLeS2SLqxenymZEboaNcRZ0nsLRMZUnz2bVgd+DKggrCghLk3gzFOsZgaHg Crysv2Y/kARU7jj2qi0s9BStew/81kjjGPd7Nkqmyydj5hr194FpF5Sb1Kk8WxkT o2v1Ek0Cba/iwjYB64uUH6ou6XloPwvkIX+maRQpCyQqMBToXv7O797jI5PI6pbD SbGeR6wJoYYTMKV+E4g/3sV3SyjOgNxBEfUaEUksNLDJFL19N0ewTYYAo6j9WvIX tmQnggzRKSk8Djle4yK4cGBj18R1LezniENWZr3i6rBYzD6pshQhs6DbBzZ92RYd 7+zW/wJfFMMuEvkgh10mX8X5YyXnGg8bOqPXjfja/ffrTB0VijKxV0/mibhLK4Dj HNtC+ti+zJPCkNjfkRoZMwQeQTlsToAGs3fbdxBjjiM33d+JlIkG7UACp5NVg8MG fy4bOH7G8RTwdngKKDQCOfYd3XIjm1Ui3Wdgjzskl6Toz9fY7WsO8ezI45lY8Tkw Lc8U2N/e4AMd1wbAm7PZJ5fdG5cRL8ybvcgsnb9L2LzwEgIC3s8= =1uf2 -----END PGP SIGNATURE----- --py66t3htkosgmk2o--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20170114225816.zbx4lqxgof3zsfyq>