Attachment #177826 for bug #215174

View | Details | Raw Unified | Return to bug 215174
Collapse All | Expand All





PORTNAME=	dbus
PORTVERSION=	1.10.12
PORTREVISION=	1
CATEGORIES=	devel gnome
MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/



PORTSCOUT=	limitw:1,even

USE_GNOME=	# empty but we need it for USE_GNOME_SUBR
USES=		cpe gmake libtool localbase pathfix
GNU_CONFIGURE=	yes
USE_LDCONFIG=	yes
CONFIGURE_ARGS=	--with-test-socket-dir=${WRKDIR} \
		--with-test-socket-dir=${WRKDIR} \
		--with-system-pid-file=/var/run/dbus/dbus.pid \
		--with-system-socket=/var/run/dbus/system_bus_socket \
		--with-session-socket-dir=/tmp \
		--disable-doxygen-docs \
		--disable-selinux \
		--disable-apparmor \

CPE_PRODUCT=	d-bus

USE_RC_SUBR=	dbus
USE_GNOME_SUBR=	yes

USERS=		messagebus
GROUPS=		messagebus

PLIST_SUB=	VERSION="1.0" GROUPS=${GROUPS}

OPTIONS_DEFINE=	EXAMPLES MANPAGES X11
OPTIONS_DEFINE=	MANPAGES X11
OPTIONS_DEFAULT=MANPAGES X11
OPTIONS_SUB=	yes
X11_DESC=	Support X11 Desktop Environments

MANPAGES_CONFIGURE_ENV=	XMLTO=${LOCALBASE}/bin/minixmlto

post-patch:
	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
		${WRKSRC}/dbus/dbus-sysdeps-unix.c
	@${REINPLACE_CMD} '/^SUBDIRS =/s|test||' ${WRKSRC}/Makefile.in
		${WRKSRC}/doc/dbus-uuidgen.1.xml.in \
		${WRKSRC}/dbus/Makefile.in \
		${WRKSRC}/tools/Makefile.in
	@${REINPLACE_CMD} '/^SUBDIRS/,/^$$/ s|test||g' ${WRKSRC}/Makefile.in

post-install:
	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
	${MV} ${STAGEDIR}${DOCSDIR}/examples/* ${STAGEDIR}${EXAMPLESDIR}
	${RM} -r ${STAGEDIR}${DOCSDIR}
	@${RMDIR} ${STAGEDIR}/var/lib/dbus ${STAGEDIR}/var/lib

.include <bsd.port.mk>




#

. /etc/rc.subr
. %%GNOME_SUBR%%

: ${dbus_enable=${gnome_enable-NO}} ${dbus_flags="--system"}
dbus_flags=${dbus_flags-"--system"}

name=dbus
rcvar=dbus_enable

command="%%PREFIX%%/bin/dbus-daemon"
pidfile="/var/run/dbus/pid"

start_precmd="dbus_prestart"
stop_postcmd="dbus_poststop"

dbus_prestart()
{
    if [ ! -d /var/db/dbus ]; then
        mkdir -p /var/db/dbus
    fi
    %%PREFIX%%/bin/dbus-uuidgen --ensure

    mkdir -p $(dirname $pidfile)
}

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
}


load_rc_config ${name}
run_rc_command "$1"




--- doc/Makefile.in.orig	2011-08-14 11:28:23.000000000 +0200
+++ doc/Makefile.in	2011-08-14 11:28:47.000000000 +0200
@@ -604,8 +604,8 @@ info: info-am
 
 info-am:
 
-install-data-am: install-data-local install-dist_docDATA \
-	install-dist_htmlDATA install-htmlDATA install-man
+install-data-am: install-data-local \
+	install-man
 
 install-dvi: install-dvi-am
 




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

lib/libdbus-1.so.3.14.8
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

%%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/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/

Return to bug 215174

Lines 3-8 Link Here

(-)devel/dbus/Makefile (-18 / +8 lines)
3		3
4	PORTNAME= dbus	4	PORTNAME= dbus
5	PORTVERSION= 1.10.12	5	PORTVERSION= 1.10.12
		6	PORTREVISION= 1
6	CATEGORIES= devel gnome	7	CATEGORIES= devel gnome
7	MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/	8	MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/
8		9
Lines 15-29 LIB_DEPENDS= libexpat.so:textproc/expat2 Link Here
15		16
16	PORTSCOUT= limitw:1,even	17	PORTSCOUT= limitw:1,even
17		18
18	USE_GNOME= # empty but we need it for USE_GNOME_SUBR
19	USES= cpe gmake libtool localbase pathfix	19	USES= cpe gmake libtool localbase pathfix
20	GNU_CONFIGURE= yes	20	GNU_CONFIGURE= yes
21	USE_LDCONFIG= yes	21	USE_LDCONFIG= yes
22	CONFIGURE_ARGS= --localstatedir=/var \	22	CONFIGURE_ARGS= --with-test-socket-dir=${WRKDIR} \
23	--with-test-socket-dir=${WRKDIR} \
24	--with-system-pid-file=/var/run/dbus/dbus.pid \
25	--with-system-socket=/var/run/dbus/system_bus_socket \
26	--with-session-socket-dir=/tmp \
27	--disable-doxygen-docs \	23	--disable-doxygen-docs \
28	--disable-selinux \	24	--disable-selinux \
29	--disable-apparmor \	25	--disable-apparmor \
Lines 34-49 CPE_VENDOR= d-bus_project Link Here
34	CPE_PRODUCT= d-bus	30	CPE_PRODUCT= d-bus
35		31
36	USE_RC_SUBR= dbus	32	USE_RC_SUBR= dbus
37	USE_GNOME_SUBR= yes
38		33
39	USERS= messagebus	34	USERS= messagebus
40	GROUPS= messagebus	35	GROUPS= messagebus
41		36
42	PLIST_SUB= VERSION="1.0" GROUPS=${GROUPS}	37	PLIST_SUB= VERSION="1.0" GROUPS=${GROUPS}
43		38
44	OPTIONS_SUB= yes	39	OPTIONS_DEFINE= EXAMPLES MANPAGES X11
45	OPTIONS_DEFINE= MANPAGES X11
46	OPTIONS_DEFAULT=MANPAGES X11	40	OPTIONS_DEFAULT=MANPAGES X11
		41	OPTIONS_SUB= yes
47	X11_DESC= Support X11 Desktop Environments	42	X11_DESC= Support X11 Desktop Environments
48		43
49	MANPAGES_CONFIGURE_ENV= XMLTO=${LOCALBASE}/bin/minixmlto	44	MANPAGES_CONFIGURE_ENV= XMLTO=${LOCALBASE}/bin/minixmlto
Lines 55-70 X11_CONFIGURE_WITH= x Link Here
55	post-patch:	50	post-patch:
56	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|g' \	51	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|g' \
57	${WRKSRC}/dbus/dbus-sysdeps-unix.c	52	${WRKSRC}/dbus/dbus-sysdeps-unix.c
58	@${REINPLACE_CMD} -e 's\|/lib/dbus/machine-id\|/db/dbus/machine-id\|g' \	53	@${REINPLACE_CMD} '/^SUBDIRS =/s\|test\|\|' ${WRKSRC}/Makefile.in
59	${WRKSRC}/doc/dbus-uuidgen.1.xml.in \
60	${WRKSRC}/dbus/Makefile.in \
61	${WRKSRC}/tools/Makefile.in
62	@${REINPLACE_CMD} '/^SUBDIRS/,/^$$/ s\|test\|\|g' ${WRKSRC}/Makefile.in
63		54
64	post-install:	55	post-install:
65	@${MKDIR} ${STAGEDIR}${PREFIX}/share/dbus-1/interfaces	56	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
66	@${MKDIR} ${STAGEDIR}/var/run/dbus	57	${MV} ${STAGEDIR}${DOCSDIR}/examples/* ${STAGEDIR}${EXAMPLESDIR}
67	@${MKDIR} ${STAGEDIR}/var/db/dbus	58	${RM} -r ${STAGEDIR}${DOCSDIR}
68	@${RMDIR} ${STAGEDIR}/var/lib/dbus ${STAGEDIR}/var/lib
69		59
70	.include <bsd.port.mk>	60	.include <bsd.port.mk>

Lines 11-45 Link Here

(-)devel/dbus/files/dbus.in (-10 / +5 lines)
11	#	11	#
12		12
13	. /etc/rc.subr	13	. /etc/rc.subr
14	. %%GNOME_SUBR%%
15		14
16	dbus_enable=${dbus_enable-${gnome_enable}}	15	: ${dbus_enable=${gnome_enable-NO}} ${dbus_flags="--system"}
17	dbus_flags=${dbus_flags-"--system"}
18		16
19	name=dbus	17	name=dbus
20	rcvar=dbus_enable	18	rcvar=dbus_enable
21		19
22	command="%%PREFIX%%/bin/dbus-daemon"	20	command="%%PREFIX%%/bin/dbus-daemon"
23	pidfile="/var/run/dbus/${name}.pid"	21	pidfile="/var/run/dbus/pid"
24		22
25	start_precmd="dbus_prestart"	23	start_precmd="dbus_prestart"
26	stop_postcmd="dbus_poststop"	24	stop_postcmd="dbus_poststop"
27		25
28	dbus_prestart()	26	dbus_prestart()
29	{	27	{
30	if [ ! -d /var/db/dbus ]; then
31	mkdir -p /var/db/dbus
32	fi
33	%%PREFIX%%/bin/dbus-uuidgen --ensure	28	%%PREFIX%%/bin/dbus-uuidgen --ensure
34
35	mkdir -p $(dirname $pidfile)
36	}	29	}
37		30
38	dbus_poststop()	31	dbus_poststop()
39	{	32	{
40	rm -f $pidfile	33	rm -f $pidfile
		34	# The following two lines may be removed after 2018-01-01
		35	rm -f /var/db/dbus/machine-id
		36	[ ! -d /var/db/dbus ] \|\| rmdir /var/db/dbus
41	}	37	}
42		38
43
44	load_rc_config ${name}	39	load_rc_config ${name}
45	run_rc_command "$1"	40	run_rc_command "$1"

Lines 1-13 Link Here

(-)devel/dbus/files/patch-doc_Makefile.in (-13 lines)
1	--- doc/Makefile.in.orig 2011-08-14 11:28:23.000000000 +0200
2	+++ doc/Makefile.in 2011-08-14 11:28:47.000000000 +0200
3	@@ -604,8 +604,8 @@ info: info-am
4
5	info-am:
6
7	-install-data-am: install-data-local install-dist_docDATA \
8	- install-dist_htmlDATA install-htmlDATA install-man
9	+install-data-am: install-data-local \
10	+ install-man
11
12	install-dvi: install-dvi-am
13

Lines 9-16 bin/dbus-update-activation-environment Link Here

(-)devel/dbus/pkg-plist (-7 / +9 lines)
9	bin/dbus-uuidgen	9	bin/dbus-uuidgen
10	etc/dbus-1/session.conf	10	etc/dbus-1/session.conf
11	etc/dbus-1/system.conf	11	etc/dbus-1/system.conf
12	share/dbus-1/session.conf
13	share/dbus-1/system.conf
14	include/dbus-%%VERSION%%/dbus/dbus-address.h	12	include/dbus-%%VERSION%%/dbus/dbus-address.h
15	include/dbus-%%VERSION%%/dbus/dbus-bus.h	13	include/dbus-%%VERSION%%/dbus/dbus-bus.h
16	include/dbus-%%VERSION%%/dbus/dbus-connection.h	14	include/dbus-%%VERSION%%/dbus/dbus-connection.h
Lines 35-43 lib/libdbus-1.so.3 Link Here
35	lib/libdbus-1.so.3.14.8	33	lib/libdbus-1.so.3.14.8
36	libdata/pkgconfig/dbus-1.pc	34	libdata/pkgconfig/dbus-1.pc
37	@(,%%GROUPS%%,4750) libexec/dbus-daemon-launch-helper	35	@(,%%GROUPS%%,4750) libexec/dbus-daemon-launch-helper
38	share/doc/dbus/examples/GetAllMatchRules.py
39	share/doc/dbus/examples/example-session-disable-stats.conf
40	share/doc/dbus/examples/example-system-enable-stats.conf
41	%%MANPAGES%%man/man1/dbus-cleanup-sockets.1.gz	36	%%MANPAGES%%man/man1/dbus-cleanup-sockets.1.gz
42	%%MANPAGES%%man/man1/dbus-daemon.1.gz	37	%%MANPAGES%%man/man1/dbus-daemon.1.gz
43	%%MANPAGES%%man/man1/dbus-launch.1.gz	38	%%MANPAGES%%man/man1/dbus-launch.1.gz
Lines 47-56 share/doc/dbus/examples/example-system-e Link Here
47	%%MANPAGES%%man/man1/dbus-test-tool.1.gz	42	%%MANPAGES%%man/man1/dbus-test-tool.1.gz
48	%%MANPAGES%%man/man1/dbus-update-activation-environment.1.gz	43	%%MANPAGES%%man/man1/dbus-update-activation-environment.1.gz
49	%%MANPAGES%%man/man1/dbus-uuidgen.1.gz	44	%%MANPAGES%%man/man1/dbus-uuidgen.1.gz
		45	share/dbus-1/session.conf
		46	share/dbus-1/system.conf
		47	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/GetAllMatchRules.py
		48	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-session-disable-stats.conf
		49	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-system-enable-stats.conf
50	@dir share/dbus-1/system-services	50	@dir share/dbus-1/system-services
51	@dir share/dbus-1/interfaces
52	@dir share/dbus-1/services	51	@dir share/dbus-1/services
53	@dir share/dbus-1/session.d	52	@dir share/dbus-1/session.d
54	@dir share/dbus-1/system.d	53	@dir share/dbus-1/system.d
55	@dir /var/db/dbus	54	@dir /var/lib/dbus
		55	@dir /var/lib
56	@dir /var/run/dbus	56	@dir /var/run/dbus
		57	@comment The following line may be removed after 2018-01-01
		58	@postexec [ -f /var/lib/dbus/machine-id -o ! -f /var/db/dbus/machine-id ] \|\| cp -p /var/db/dbus/machine-id /var/lib/dbus/