4 files changed, 7 insertions, 93 deletions

diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index 39c8a33cf3f1..db3447fc0ebb 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -3,14 +3,14 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/devel/dbus/Makefile,v 1.34 2009/11/28 06:03:52 mezz Exp $
 #
 
 PORTNAME=	dbus
-PORTVERSION?=	1.2.4.6
+PORTVERSION?=	1.2.16
 PORTREVISION?=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/
-DISTNAME=	dbus-${PORTVERSION}permissive
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A message bus system for inter-application communication
@@ -59,6 +59,8 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/lib/dbus/machine-id|/db/dbus/machine-id|g' \
 		${WRKSRC}/dbus/Makefile.in \
 		${WRKSRC}/tools/Makefile.in
+	@${REINPLACE_CMD} -e 's|THREAD_LIBS -lrt|THREAD_LIBS|g' \
+		${WRKSRC}/configure
 
 .if !defined(DBUS_SLAVE)
 post-install:
diff --git a/devel/dbus/distinfo b/devel/dbus/distinfo
index c4e9b0edf4da..1623b43edf79 100644
--- a/devel/dbus/distinfo
+++ b/devel/dbus/distinfo
@@ -1,3 +1,3 @@
-MD5 (dbus-1.2.4.6permissive.tar.gz) = 1a158fe326b078d1377a977121888496
-SHA256 (dbus-1.2.4.6permissive.tar.gz) = a2da2c9da52be6de6c6f1e1c3c3f3a960992b0c82d47661606c11d7aef76f7b1
-SIZE (dbus-1.2.4.6permissive.tar.gz) = 1575270
+MD5 (dbus-1.2.16.tar.gz) = c7a47b851ebe02f6726b65b78d1b730b
+SHA256 (dbus-1.2.16.tar.gz) = 968a31c16a6c4bbbdb603cbaa3d60d6d19bc8ae30c0ed55d7f8c2e254413e4c8
+SIZE (dbus-1.2.16.tar.gz) = 1576209
diff --git a/devel/dbus/files/patch-configure b/devel/dbus/files/patch-configure
deleted file mode 100644
index 0161d4625f7d..000000000000
--- a/devel/dbus/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.orig	2009-01-13 07:43:11.194080000 +0000
-+++ configure	2009-01-13 07:43:26.270082000 +0000
-@@ -20956,10 +20956,6 @@ if test "x$GCC" = "xyes"; then
-   *[\ \	]-Wno-sign-compare[\ \	]*) ;;
-   *) CFLAGS="$CFLAGS -Wno-sign-compare" ;;
-   esac
--  case " $CFLAGS " in
--  *[\ \	]-Wno-pointer-sign[\ \	]*) ;;
--  *) CFLAGS="$CFLAGS -Wno-pointer-sign" ;;
--  esac
- 
-   # http://bugs.freedesktop.org/show_bug.cgi?id=19195
-   case " $CFLAGS " in
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 aa623c158889..000000000000
--- 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;