summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2008-08-11 03:14:17 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2008-08-11 03:14:17 +0800
commit3377d11038f903ddb904b3344579dd763e6defab (patch)
tree0f4fa14e3c41a8451abcaf28da4402765ae36e34
parentd1300aeebb3054f05f837001129f4819b7d4d08d (diff)
downloadmarcuscom-ports-3377d11038f903ddb904b3344579dd763e6defab.tar
marcuscom-ports-3377d11038f903ddb904b3344579dd763e6defab.tar.gz
marcuscom-ports-3377d11038f903ddb904b3344579dd763e6defab.tar.bz2
marcuscom-ports-3377d11038f903ddb904b3344579dd763e6defab.tar.lz
marcuscom-ports-3377d11038f903ddb904b3344579dd763e6defab.tar.xz
marcuscom-ports-3377d11038f903ddb904b3344579dd763e6defab.tar.zst
marcuscom-ports-3377d11038f903ddb904b3344579dd763e6defab.zip
Update to 1.2.3. This will probably be merged to ports early, but deserves
a little shake out here first. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11273 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--devel/dbus/Makefile67
-rw-r--r--devel/dbus/distinfo3
-rw-r--r--devel/dbus/files/dbus.in40
-rw-r--r--devel/dbus/files/patch-bus_Makefile.in20
-rw-r--r--devel/dbus/files/patch-dbus-1.pc.in9
-rw-r--r--devel/dbus/files/patch-dbus_Makefile.in11
-rw-r--r--devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c84
-rw-r--r--devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c11
-rw-r--r--devel/dbus/pkg-descr8
-rw-r--r--devel/dbus/pkg-install41
-rw-r--r--devel/dbus/pkg-plist54
11 files changed, 348 insertions, 0 deletions
diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
new file mode 100644
index 000000000..0e779b184
--- /dev/null
+++ b/devel/dbus/Makefile
@@ -0,0 +1,67 @@
+# New ports collection makefile for: D-BUS
+# Date Created: 22 June 2004
+# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD: ports/devel/dbus/Makefile,v 1.71 2008/04/21 06:25:05 marcus Exp $
+#
+
+PORTNAME= dbus
+PORTVERSION?= 1.2.3
+PORTREVISION?= 0
+CATEGORIES= devel gnome
+MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= A message bus system for inter-application communication
+
+LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
+
+USE_GNOME?= gnomehack gnometarget libxml2 ltverhack
+USE_GMAKE= yes
+USE_AUTOTOOLS= libtool:15
+USE_LDCONFIG= yes
+CONFIGURE_ARGS=--localstatedir=/var \
+ --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=/var/tmp \
+ --disable-doxygen-docs \
+ --disable-xml-docs
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
+ PTHREAD_LIBS="${PTHREAD_LIBS}"
+
+.if !defined(DBUS_SLAVE)
+USE_RC_SUBR= dbus
+USE_GNOME_SUBR= yes
+
+PLIST_SUB= VERSION="1.0"
+
+MAN1= dbus-cleanup-sockets.1 dbus-daemon.1 dbus-launch.1 \
+ dbus-monitor.1 dbus-send.1 dbus-uuidgen.1
+
+.if !defined(WITHOUT_X11)
+USE_XORG= x11
+.else
+CONFIGURE_ARGS+=--without-x
+.endif
+.endif
+
+.include <bsd.port.pre.mk>
+
+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}/dbus/Makefile.in \
+ ${WRKSRC}/tools/Makefile.in
+
+.if !defined(DBUS_SLAVE)
+post-install:
+.if !defined(PACKAGE_BUILDING)
+ @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+.endif
+ ${MKDIR} ${PREFIX}/share/dbus-1/interfaces
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/dbus/distinfo b/devel/dbus/distinfo
new file mode 100644
index 000000000..825df21b6
--- /dev/null
+++ b/devel/dbus/distinfo
@@ -0,0 +1,3 @@
+MD5 (dbus-1.2.3.tar.gz) = f71641385768e99361bd298568207cee
+SHA256 (dbus-1.2.3.tar.gz) = 16ffaa4a8758f115cf02c78962b0849ed4d802872420fd460c433a9cd580ed1a
+SIZE (dbus-1.2.3.tar.gz) = 1564475
diff --git a/devel/dbus/files/dbus.in b/devel/dbus/files/dbus.in
new file mode 100644
index 000000000..61707718d
--- /dev/null
+++ b/devel/dbus/files/dbus.in
@@ -0,0 +1,40 @@
+#!/bin/sh
+#
+# $FreeBSD: ports/devel/dbus/files/dbus.in,v 1.12 2008/03/24 03:49:35 marcus Exp $
+#
+# PROVIDE: dbus
+# REQUIRE: DAEMON
+#
+# Add the following lines to /etc/rc.conf to enable the D-BUS messaging system:
+#
+# dbus_enable="YES"
+#
+
+. %%RC_SUBR%%
+. %%GNOME_SUBR%%
+
+dbus_enable=${dbus_enable-${gnome_enable}}
+dbus_flags=${dbus_flags-"--system"}
+
+name=dbus
+rcvar=`set_rcvar`
+
+command="%%PREFIX%%/bin/dbus-daemon"
+pidfile="/var/run/dbus/${name}.pid"
+
+start_precmd="dbus_prestart"
+stop_postcmd="dbus_poststop"
+
+dbus_prestart()
+{
+ mkdir -p $(dirname $pidfile)
+}
+
+dbus_poststop()
+{
+ rm -f $pidfile
+}
+
+
+load_rc_config ${name}
+run_rc_command "$1"
diff --git a/devel/dbus/files/patch-bus_Makefile.in b/devel/dbus/files/patch-bus_Makefile.in
new file mode 100644
index 000000000..b55c5dc79
--- /dev/null
+++ b/devel/dbus/files/patch-bus_Makefile.in
@@ -0,0 +1,20 @@
+--- bus/Makefile.in.orig 2008-01-22 14:45:58.000000000 -0500
++++ bus/Makefile.in 2008-01-22 15:24:26.000000000 -0500
+@@ -412,7 +412,7 @@ target_vendor = @target_vendor@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ configdir = $(sysconfdir)/dbus-1
+-INCLUDES = -I$(top_srcdir) $(DBUS_BUS_CFLAGS) @PIE_CFLAGS@ \
++INCLUDES = -I$(top_srcdir) $(DBUS_BUS_CFLAGS) \
+ -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \
+ -DDAEMON_NAME=\"dbus-daemon\" -DDBUS_COMPILATION
+
+@@ -476,7 +476,7 @@ dbus_daemon_LDADD = \
+ $(DBUS_BUS_LIBS) \
+ $(top_builddir)/dbus/libdbus-convenience.la
+
+-dbus_daemon_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ @PIE_LDFLAGS@
++dbus_daemon_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
+ LAUNCH_HELPER_SOURCES = \
+ $(XML_SOURCES) \
+ config-parser-common.c \
diff --git a/devel/dbus/files/patch-dbus-1.pc.in b/devel/dbus/files/patch-dbus-1.pc.in
new file mode 100644
index 000000000..44c97a29e
--- /dev/null
+++ b/devel/dbus/files/patch-dbus-1.pc.in
@@ -0,0 +1,9 @@
+--- dbus-1.pc.in.orig Mon Nov 6 02:55:38 2006
++++ dbus-1.pc.in Mon Nov 6 02:55:57 2006
+@@ -10,5 +10,5 @@ Name: dbus
+ Description: Free desktop message bus
+ Version: @VERSION@
+ Libs: -L${libdir} -ldbus-1 @DBUS_CLIENT_LIBS@
+-Cflags: -I${includedir}/dbus-1.0 -I${libdir}/dbus-1.0/include
++Cflags: -I${includedir}/dbus-1.0 -I${includedir}/dbus-1.0/include
+
diff --git a/devel/dbus/files/patch-dbus_Makefile.in b/devel/dbus/files/patch-dbus_Makefile.in
new file mode 100644
index 000000000..42a58caed
--- /dev/null
+++ b/devel/dbus/files/patch-dbus_Makefile.in
@@ -0,0 +1,11 @@
+--- dbus/Makefile.in.orig Fri Jan 21 19:43:46 2005
++++ dbus/Makefile.in Fri Jan 21 19:44:43 2005
+@@ -360,7 +360,7 @@
+ @HAVE_GLIB_TRUE@ $(DBUS_GLIB_BUILT_INCLUDES)
+
+ dbusincludedir = $(includedir)/dbus-1.0/dbus
+-dbusarchincludedir = $(libdir)/dbus-1.0/include/dbus
++dbusarchincludedir = $(includedir)/dbus-1.0/include/dbus
+ lib_LTLIBRARIES = libdbus-1.la
+ dbusinclude_HEADERS = \
+ dbus.h \
diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c b/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c
new file mode 100644
index 000000000..6e7915079
--- /dev/null
+++ b/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c
@@ -0,0 +1,84 @@
+--- dbus/dbus-sysdeps-unix.c.orig 2008-08-06 13:00:29.000000000 -0400
++++ dbus/dbus-sysdeps-unix.c 2008-08-10 15:04:32.000000000 -0400
+@@ -1041,9 +1041,9 @@ write_credentials_byte (int
+ int bytes_written;
+ char buf[1] = { '\0' };
+ #if defined(HAVE_CMSGCRED)
+- struct {
++ union {
+ struct cmsghdr hdr;
+- struct cmsgcred cred;
++ char cred[CMSG_SPACE (sizeof (struct cmsgcred))];
+ } cmsg;
+ struct iovec iov;
+ struct msghdr msg;
+@@ -1054,10 +1054,10 @@ write_credentials_byte (int
+ msg.msg_iov = &iov;
+ msg.msg_iovlen = 1;
+
+- msg.msg_control = &cmsg;
+- msg.msg_controllen = sizeof (cmsg);
++ msg.msg_control = (caddr_t) &cmsg;
++ msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred));
+ memset (&cmsg, 0, sizeof (cmsg));
+- cmsg.hdr.cmsg_len = sizeof (cmsg);
++ cmsg.hdr.cmsg_len = CMSG_LEN (sizeof (struct cmsgcred));
+ cmsg.hdr.cmsg_level = SOL_SOCKET;
+ cmsg.hdr.cmsg_type = SCM_CREDS;
+ #endif
+@@ -1133,9 +1133,9 @@ _dbus_read_credentials_socket (int
+ pid_read = DBUS_PID_UNSET;
+
+ #ifdef HAVE_CMSGCRED
+- struct {
++ union {
+ struct cmsghdr hdr;
+- struct cmsgcred cred;
++ char cred[CMSG_SPACE (sizeof (struct cmsgcred))];
+ } cmsg;
+
+ #elif defined(LOCAL_CREDS)
+@@ -1172,8 +1172,8 @@ _dbus_read_credentials_socket (int
+
+ #if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)
+ memset (&cmsg, 0, sizeof (cmsg));
+- msg.msg_control = &cmsg;
+- msg.msg_controllen = sizeof (cmsg);
++ msg.msg_control = (caddr_t) &cmsg;
++ msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred));
+ #endif
+
+ again:
+@@ -1211,7 +1211,8 @@ _dbus_read_credentials_socket (int
+ }
+
+ #if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)
+- if (cmsg.hdr.cmsg_len < sizeof (cmsg) || cmsg.hdr.cmsg_type != SCM_CREDS)
++ if (cmsg.hdr.cmsg_len < CMSG_LEN (sizeof (struct cmsgcred))
++ || cmsg.hdr.cmsg_type != SCM_CREDS)
+ {
+ dbus_set_error (error, DBUS_ERROR_FAILED,
+ "Message from recvmsg() was not SCM_CREDS");
+@@ -1238,8 +1239,11 @@ _dbus_read_credentials_socket (int
+ cr_len, (int) sizeof (cr), _dbus_strerror (errno));
+ }
+ #elif defined(HAVE_CMSGCRED)
+- pid_read = cmsg.cred.cmcred_pid;
+- uid_read = cmsg.cred.cmcred_euid;
++ struct cmsgcred *cred;
++
++ cred = (struct cmsgcred *) CMSG_DATA (&cmsg);
++ pid_read = cred->cmcred_pid;
++ uid_read = cred->cmcred_euid;
+ #elif defined(LOCAL_CREDS)
+ pid_read = DBUS_PID_UNSET;
+ uid_read = cmsg.cred.sc_uid;
+@@ -1493,7 +1497,7 @@ fill_user_info (DBusUserInfo *info
+ /* retrieve maximum needed size for buf */
+ buflen = sysconf (_SC_GETPW_R_SIZE_MAX);
+
+- if (buflen <= 0)
++ if ((long) buflen <= 0)
+ buflen = 1024;
+
+ result = -1;
diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c b/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c
new file mode 100644
index 000000000..026e4d2c8
--- /dev/null
+++ b/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c
@@ -0,0 +1,11 @@
+--- dbus/dbus-sysdeps-util-unix.c.orig 2008-08-10 15:04:41.000000000 -0400
++++ dbus/dbus-sysdeps-util-unix.c 2008-08-10 15:05:16.000000000 -0400
+@@ -836,7 +836,7 @@ fill_group_info (DBusGroupInfo *info,
+ /* retrieve maximum needed size for buf */
+ buflen = sysconf (_SC_GETGR_R_SIZE_MAX);
+
+- if (buflen <= 0)
++ if ((long) buflen <= 0)
+ buflen = 1024;
+
+ result = -1;
diff --git a/devel/dbus/pkg-descr b/devel/dbus/pkg-descr
new file mode 100644
index 000000000..2a1c3cc0a
--- /dev/null
+++ b/devel/dbus/pkg-descr
@@ -0,0 +1,8 @@
+D-BUS supplies both a system daemon (for events such as "new hardware device
+added" or "printer queue changed") and a per-user-login-session daemon (for
+general IPC needs among user applications). Also, the message bus is built on
+top of a general one-to-one message passing framework, which can be used by
+any two apps to communicate directly (without going through the message bus
+daemon).
+
+WWW: http://www.freedesktop.org/Software/dbus
diff --git a/devel/dbus/pkg-install b/devel/dbus/pkg-install
new file mode 100644
index 000000000..4ed46afa7
--- /dev/null
+++ b/devel/dbus/pkg-install
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+case $2 in
+POST-INSTALL)
+ USER=messagebus
+ GROUP=${USER}
+ UID=556
+ GID=${UID}
+ PW=/usr/sbin/pw
+
+ if ${PW} group show "${GROUP}" 2>/dev/null; then
+ echo "You already have a group \"${GROUP}\", so I will use it."
+ else
+ if ${PW} groupadd ${GROUP} -g ${GID}; then
+ echo "Added group \"${GROUP}\"."
+ else
+ echo "Adding group \"${GROUP}\" failed..."
+ exit 1
+ fi
+ fi
+
+ if ${PW} user show "${USER}" 2>/dev/null; then
+ echo "You already have a user \"${USER}\", so I will use it."
+ else
+ if ${PW} useradd ${USER} -u ${UID} -g ${GROUP} -h - \
+ -d "/nonexistent" -s /sbin/nologin -c "D-BUS Daemon User"
+ then
+ echo "Added user \"${USER}\"."
+ else
+ echo "Adding user \"${USER}\" failed..."
+ exit 1
+ fi
+ fi
+
+ /usr/bin/install -d -o ${USER} -g ${GROUP} /var/run/dbus
+ /usr/bin/install -d -o ${USER} -g ${GROUP} /var/db/dbus
+ /usr/bin/chgrp ${GROUP} ${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
new file mode 100644
index 000000000..3bbf8b3c9
--- /dev/null
+++ b/devel/dbus/pkg-plist
@@ -0,0 +1,54 @@
+bin/dbus-cleanup-sockets
+bin/dbus-daemon
+bin/dbus-launch
+bin/dbus-monitor
+bin/dbus-send
+bin/dbus-uuidgen
+etc/dbus-1/session.conf
+etc/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
+include/dbus-%%VERSION%%/dbus/dbus-errors.h
+include/dbus-%%VERSION%%/dbus/dbus-macros.h
+include/dbus-%%VERSION%%/dbus/dbus-memory.h
+include/dbus-%%VERSION%%/dbus/dbus-message.h
+include/dbus-%%VERSION%%/dbus/dbus-misc.h
+include/dbus-%%VERSION%%/dbus/dbus-pending-call.h
+include/dbus-%%VERSION%%/dbus/dbus-protocol.h
+include/dbus-%%VERSION%%/dbus/dbus-server.h
+include/dbus-%%VERSION%%/dbus/dbus-shared.h
+include/dbus-%%VERSION%%/dbus/dbus-signature.h
+include/dbus-%%VERSION%%/dbus/dbus-threads.h
+include/dbus-%%VERSION%%/dbus/dbus-types.h
+include/dbus-%%VERSION%%/dbus/dbus.h
+include/dbus-%%VERSION%%/include/dbus/dbus-arch-deps.h
+lib/libdbus-1.a
+lib/libdbus-1.la
+lib/libdbus-1.so
+lib/libdbus-1.so.3
+libdata/pkgconfig/dbus-1.pc
+libexec/dbus-daemon-launch-helper
+@exec mkdir -p %D/libexec/dbus-1
+@exec mkdir -p %D/etc/dbus-1/system.d
+@exec mkdir -p %D/share/dbus-1/interfaces
+@exec mkdir -p %D/share/dbus-1/services
+@exec mkdir -p %D/share/dbus-1/system-services
+@exec mkdir -p %D/etc/dbus-1/session.d
+@dirrmtry share/dbus-1/system-services
+@dirrmtry share/dbus-1/services
+@dirrmtry share/dbus-1/interfaces
+@dirrmtry share/dbus-1
+@dirrmtry libexec/dbus-1
+@dirrm include/dbus-%%VERSION%%/include/dbus
+@dirrm include/dbus-%%VERSION%%/include
+@dirrm include/dbus-%%VERSION%%/dbus
+@dirrm include/dbus-%%VERSION%%
+@dirrm etc/dbus-1/system.d
+@dirrm etc/dbus-1/session.d
+@dirrm etc/dbus-1
+@unexec rm -f /var/run/dbus/dbus.pid
+@unexec rm -f /var/run/dbus/dbus.pipe
+@unexec rmdir /var/run/dbus 2>/dev/null || true
+@unexec rm -f /var/db/dbus/machine-id
+@unexec rmdir /var/db/dbus 2>/dev/null || true