cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 0.94 and make it work.

Browse Source 
Sessionwide dbus tested with gaim; systemwide bus untested but at least it
starts up without dumping core.
This commit is contained in:
alek 2006-11-07 10:40:19 +00:00
parent 4c41dbe1c1
commit afa58596de
9 changed files with 88 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
x11/dbus/Makefile
View File

@ -1,30 +1,40 @@
# $OpenBSD: Makefile,v 1.2 2006/09/20 12:22:07 bernd Exp $
# $OpenBSD: Makefile,v 1.3 2006/11/07 10:40:19 alek Exp $
DISTNAME= dbus-0.92
COMMENT= "message system"
DISTNAME= dbus-0.94
SHARED_LIBS += dbus-1 5.0 # .5.0
CATEGORIES= x11
HOMEPAGE= http://dbus.freedesktop.org/
MASTER_SITES= http://dbus.freedesktop.org/releases/
# GPL
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
WANTLIB= ICE X11 SM c pthread
MASTER_SITES= ${HOMEPAGE}releases/dbus/
BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig
LIB_DEPENDS= expat.>=6::textproc/expat
SEPARATE_BUILD= simple
PKGNAME= ${DISTNAME}p0
SHARED_LIBS= dbus-1 3.0
# GPL
PERMIT_DISTFILES_CDROM?= Yes
PERMIT_DISTFILES_FTP?= Yes
PERMIT_PACKAGE_CDROM?= Yes
PERMIT_PACKAGE_FTP?= Yes
WANTLIB= ICE X11 SM c
LIB_DEPENDS= expat.>=6::textproc/expat
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= LDFLAGS=-L${LOCALBASE}/lib \
CPPFLAGS=-I${LOCALBASE}/include
CFLAGS="${CFLAGS} -I${LOCALBASE}/include -pthread"
CONFIGURE_ARGS= --localstatedir=/var \
--with-dbus-user=_dbus \
--with-xml=expat
# Tests are disabled as they change the final dbus binaries
#CONFIGURE_ARGS= --enable-tests
#CONFIGURE_ARGS= --enable-verbose-mode
USE_LIBTOOL= Yes
FAKE_FLAGS= sysconfdir=${TRUEPREFIX}/share/sample/dbus DESTDIR=${WRKINST}
FAKE_FLAGS= sysconfdir=${TRUEPREFIX}/share/examples/dbus \
DESTDIR=${WRKINST}
.include <bsd.port.mk>

8
x11/dbus/distinfo
View File

@ -1,4 +1,4 @@
MD5 (dbus-0.92.tar.gz) = ea2be58c80a80631ba5b3c92cffd335c
RMD160 (dbus-0.92.tar.gz) = 23de0396bf5565c02e2e710bebd95ad5de1832a8
SHA1 (dbus-0.92.tar.gz) = 37edf2fd6c471b086261462b8b8d3dd2656e1bb4
SIZE (dbus-0.92.tar.gz) = 1388345
MD5 (dbus-0.94.tar.gz) = 85653cafbcfc7edfbad9639459758ed3
RMD160 (dbus-0.94.tar.gz) = 7e79dfe0d04016b802b72968c2c46d7766f806ed
SHA1 (dbus-0.94.tar.gz) = 8be9629cb950d33da76243d4b7af4ec3d77c152e
SIZE (dbus-0.94.tar.gz) = 1372266

13
x11/dbus/patches/patch-bus_bus_c Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-bus_bus_c,v 1.1 2006/11/07 10:40:19 alek Exp $
--- bus/bus.c.orig Mon Nov 6 01:22:54 2006
+++ bus/bus.c Mon Nov 6 01:23:26 2006
@@ -517,7 +517,8 @@ process_config_postinit (BusContext
/* Watch all conf directories */
_dbus_list_foreach (bus_config_parser_get_conf_dirs (parser),
(DBusForeachFunction) bus_watch_directory,
- NULL);
+ bus_context_get_loop (context));
+
return TRUE;
}

11
x11/dbus/patches/patch-dbus-1_pc_in Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-dbus-1_pc_in,v 1.1 2006/11/07 10:40:19 alek Exp $
--- dbus-1.pc.in.orig Mon Nov 6 02:57:09 2006
+++ dbus-1.pc.in Mon Nov 6 02:58:50 2006
@@ -9,6 +9,6 @@ session_bus_services_dir=@EXPANDED_DATAD
Name: dbus
Description: Free desktop message bus
Version: @VERSION@
-Libs: -L${libdir} -ldbus-1
+Libs: -L${libdir} -ldbus-1 -pthread
Cflags: -I${includedir}/dbus-1.0 -I${libdir}/dbus-1.0/include

12
x11/dbus/patches/patch-test_Makefile_am
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-test_Makefile_am,v 1.1.1.1 2006/09/19 18:10:14 espie Exp $
--- test/Makefile.am.orig Mon Aug 21 20:13:46 2006
+++ test/Makefile.am Mon Aug 21 20:14:08 2006
@@ -91,7 +91,7 @@ TESTDIRS= \
data/equiv-config-files/entities/basic.d
-FIND_TESTS=find -name "*.message" -o -name "*.message-raw" -o -name "*.auth-script" -o -name "*.sha1" -o -name "*.txt" -o -name "*.conf" -o -name "*.service"
+FIND_TESTS=find . -name "*.message" -o -name "*.message-raw" -o -name "*.auth-script" -o -name "*.sha1" -o -name "*.txt" -o -name "*.conf" -o -name "*.service"
dist-hook:
for D in $(TESTDIRS); do \

12
x11/dbus/patches/patch-test_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-test_Makefile_in,v 1.1.1.1 2006/09/19 18:10:14 espie Exp $
--- test/Makefile.in.orig Mon Aug 21 20:20:12 2006
+++ test/Makefile.in Mon Aug 21 20:20:22 2006
@@ -365,7 +365,7 @@ TESTDIRS = \
data/equiv-config-files/entities \
data/equiv-config-files/entities/basic.d
-FIND_TESTS = find -name "*.message" -o -name "*.message-raw" -o -name "*.auth-script" -o -name "*.sha1" -o -name "*.txt" -o -name "*.conf" -o -name "*.service"
+FIND_TESTS = find . -name "*.message" -o -name "*.message-raw" -o -name "*.auth-script" -o -name "*.sha1" -o -name "*.txt" -o -name "*.conf" -o -name "*.service"
all: all-recursive
.SUFFIXES:

15
x11/dbus/pkg/MESSAGE Normal file
View File

@ -0,0 +1,15 @@
To finish installation of dbus package you should run the following
command as a user root:
# dbus-uuidgen --ensure
To start systemwide message dbus daemon whenever the machine boots,
add the following lines to /etc/rc.local:
if [ -x ${PREFIX}/bin/dbus-daemon ]; then
mkdir -p /var/run/dbus
chmod 0755 /var/run/dbus
chown _dbus:_dbus /var/run/dbus
${PREFIX}/bin/dbus-daemon --system
fi

26
x11/dbus/pkg/PLIST
View File

@ -1,10 +1,13 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2006/09/19 18:10:14 espie Exp $
@comment $OpenBSD: PLIST,v 1.2 2006/11/07 10:40:19 alek Exp $
@newgroup _dbus:572
@newuser _dbus:572:_dbus:daemon:dbus user:/nonexistent:/sbin/nologin
%%SHARED%%
bin/dbus-cleanup-sockets
bin/dbus-daemon
bin/dbus-launch
bin/dbus-monitor
bin/dbus-send
bin/dbus-uuidgen
include/dbus-1.0/
include/dbus-1.0/dbus/
include/dbus-1.0/dbus/dbus-address.h
@ -35,18 +38,21 @@ lib/pkgconfig/dbus-1.pc
@man man/man1/dbus-launch.1
@man man/man1/dbus-monitor.1
@man man/man1/dbus-send.1
@man man/man1/dbus-uuidgen.1
share/dbus-1/
share/dbus-1/services/
share/sample/
share/sample/dbus/
share/examples/dbus/
share/examples/dbus/dbus-1/
@sample ${SYSCONFDIR}/dbus-1/
share/sample/dbus/dbus-1/
share/sample/dbus/dbus-1/session.conf
share/examples/dbus/dbus-1/session.conf
@sample ${SYSCONFDIR}/dbus-1/session.conf
share/sample/dbus/dbus-1/system.conf
share/examples/dbus/dbus-1/system.conf
@sample ${SYSCONFDIR}/dbus-1/system.conf
share/sample/dbus/dbus-1/system.d/
share/examples/dbus/dbus-1/system.d/
@sample ${SYSCONFDIR}/dbus-1/system.d/
var/
var/run/
var/run/dbus/
@owner _dbus
@group _dbus
@mode 0750
@sample /var/run/dbus/
@unexec rm -f /var/run/dbus/*
@unexec rm -f ${SYSCONFDIR}/dbus-1/machine-id

2
x11/dbus/pkg/UNMESSAGE Normal file
View File

@ -0,0 +1,2 @@
You should remove all dbus related lines from /etc/rc.local,
if any were added.