summaryrefslogtreecommitdiffstats
path: root/devel/dbus/files
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2009-01-12 01:51:34 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2009-01-12 01:51:34 +0800
commit2f836c64a2940e1460834c4085ba6d418001bf17 (patch)
tree81909a3bce2caf57600151b32c8dcb1e7735c28c /devel/dbus/files
parent262752d178a4a70c9cd941f23ee5052d0e8968d9 (diff)
downloadmarcuscom-ports-2f836c64a2940e1460834c4085ba6d418001bf17.tar
marcuscom-ports-2f836c64a2940e1460834c4085ba6d418001bf17.tar.gz
marcuscom-ports-2f836c64a2940e1460834c4085ba6d418001bf17.tar.bz2
marcuscom-ports-2f836c64a2940e1460834c4085ba6d418001bf17.tar.lz
marcuscom-ports-2f836c64a2940e1460834c4085ba6d418001bf17.tar.xz
marcuscom-ports-2f836c64a2940e1460834c4085ba6d418001bf17.tar.zst
marcuscom-ports-2f836c64a2940e1460834c4085ba6d418001bf17.zip
Remove these ports now that they have been merged into the FreeBSD ports
tree. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11869 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/dbus/files')
-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.c75
-rw-r--r--devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c10
6 files changed, 0 insertions, 165 deletions
diff --git a/devel/dbus/files/dbus.in b/devel/dbus/files/dbus.in
deleted file mode 100644
index 59ef29ec7..000000000
--- a/devel/dbus/files/dbus.in
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# 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
deleted file mode 100644
index b55c5dc79..000000000
--- a/devel/dbus/files/patch-bus_Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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
deleted file mode 100644
index 44c97a29e..000000000
--- a/devel/dbus/files/patch-dbus-1.pc.in
+++ /dev/null
@@ -1,9 +0,0 @@
---- 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
deleted file mode 100644
index 42a58caed..000000000
--- a/devel/dbus/files/patch-dbus_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index aa623c158..000000000
--- a/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c
+++ /dev/null
@@ -1,75 +0,0 @@
---- 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;
diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c b/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c
deleted file mode 100644
index cdf6eaf07..000000000
--- a/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- dbus/dbus-sysdeps-util-unix.c.orig 2008-12-21 14:51:17.000000000 -0500
-+++ dbus/dbus-sysdeps-util-unix.c 2008-12-21 14:51:37.000000000 -0500
-@@ -38,6 +38,7 @@
- #include <stdio.h>
- #include <errno.h>
- #include <fcntl.h>
-+#include <syslog.h>
- #include <sys/stat.h>
- #include <grp.h>
- #include <sys/socket.h>