svn commit: r493840 - head/devel/dbus

[Tijl Coosemans]

On Mon, 25 Feb 2019 07:06:22 +0000 (UTC) Koop Mast <kwm at FreeBSD.org>
wrote:
> Author: kwm
> Date: Mon Feb 25 07:06:21 2019
> New Revision: 493840
> URL: https://svnweb.freebsd.org/changeset/ports/493840
> 
> Log:
>   Update dbus to 1.12.12.
>   
>   Remove machine-id copy code, it done it job.
> 
> Modified:
>   head/devel/dbus/Makefile
>   head/devel/dbus/distinfo
>   head/devel/dbus/pkg-plist
> 
> Modified: head/devel/dbus/pkg-plist
> ==============================================================================
> --- head/devel/dbus/pkg-plist	Mon Feb 25 07:04:49 2019	(r493839)
> +++ head/devel/dbus/pkg-plist	Mon Feb 25 07:06:21 2019	(r493840)
> @@ -7,8 +7,8 @@ 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
> + at sample %%ETCDIR%%-1/session.conf.sample
> + at 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
> @@ -42,11 +44,13 @@ libdata/pkgconfig/dbus-1.pc
>  %%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

Maybe define ETCDIR and DATADIR in the Makefile to include this "-1":

DATADIR=${PREFIX}/share/${PORTNAME}-1
ETCDIR= ${PREFIX}/etc/${PORTNAME}-1