Update dbus to 1.8.20.

Remove two patches, and do what upstream intended it to be.

5 files changed, 5 insertions, 24 deletions

diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index b5971a4fbdd6..ea507149aff3 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dbus
-PORTVERSION=	1.8.16
+PORTVERSION=	1.8.20
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/
 
diff --git a/devel/dbus/distinfo b/devel/dbus/distinfo
index 1b6cebe854ea..eb0095153056 100644
--- a/devel/dbus/distinfo
+++ b/devel/dbus/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dbus-1.8.16.tar.gz) = 7f795268efd343ff0498786acb35097564390d40b1b6158daf1b4f742b522b07
-SIZE (dbus-1.8.16.tar.gz) = 1866436
+SHA256 (dbus-1.8.20.tar.gz) = 5c4fbf4c64621c96e871da91d2b729a5b00536e116d3c4612a469d924b1b703a
+SIZE (dbus-1.8.20.tar.gz) = 1871722
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 997f3869b305..000000000000
--- a/devel/dbus/files/patch-dbus-1.pc.in
+++ /dev/null
@@ -1,8 +0,0 @@
---- dbus-1.pc.in.orig	2012-06-05 13:17:45.000000000 +0200
-+++ dbus-1.pc.in	2012-06-18 00:26:56.000000000 +0200
-@@ -14,4 +14,4 @@
- Version: @VERSION@
- Libs: -L${libdir} -ldbus-1
- Libs.private: @LIBDBUS_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 42a58caed2d5..000000000000
--- 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/pkg-plist b/devel/dbus/pkg-plist
index f2578ec5aebe..3c6a0abb52d9 100644
--- a/devel/dbus/pkg-plist
+++ b/devel/dbus/pkg-plist
@@ -24,11 +24,11 @@ include/dbus-%%VERSION%%/dbus/dbus-syntax.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/dbus-%%VERSION%%/include/dbus/dbus-arch-deps.h
 lib/libdbus-1.a
 lib/libdbus-1.so
 lib/libdbus-1.so.3
-lib/libdbus-1.so.3.8.11
+lib/libdbus-1.so.3.8.13
 libdata/pkgconfig/dbus-1.pc
 @(,%%GROUPS%%,4750) libexec/dbus-daemon-launch-helper
 %%MANPAGES%%man/man1/dbus-cleanup-sockets.1.gz