5 files changed, 13 insertions, 26 deletions

diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile
index eaed17f2a0cf..f2687c9284e2 100644
--- a/devel/pkg-config/Makefile
+++ b/devel/pkg-config/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	pkg-config
-PORTVERSION=	0.23
-PORTREVISION=	1
+PORTVERSION=	0.25
 CATEGORIES=	devel
 MASTER_SITES=	http://pkgconfig.freedesktop.org/releases/
 DIST_SUBDIR=	gnome2
diff --git a/devel/pkg-config/distinfo b/devel/pkg-config/distinfo
index 459710f196c9..fd6f45bce60b 100644
--- a/devel/pkg-config/distinfo
+++ b/devel/pkg-config/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pkg-config-0.23.tar.gz) = d922a88782b64441d06547632fd85744
-SHA256 (gnome2/pkg-config-0.23.tar.gz) = 08a0e072d6a05419a58124db864f0685e6ac96e71b2875bf15ac12714e983b53
-SIZE (gnome2/pkg-config-0.23.tar.gz) = 1032839
+MD5 (gnome2/pkg-config-0.25.tar.gz) = a3270bab3f4b69b7dc6dbdacbcae9745
+SHA256 (gnome2/pkg-config-0.25.tar.gz) = 3ba691ee2431f32ccb8efa131e59bf23e37f122dc66791309023ca6dcefcd10e
+SIZE (gnome2/pkg-config-0.25.tar.gz) = 988899
diff --git a/devel/pkg-config/files/patch-Makefile.in b/devel/pkg-config/files/patch-Makefile.in
index 2e7c1f405751..c100f5397734 100644
--- a/devel/pkg-config/files/patch-Makefile.in
+++ b/devel/pkg-config/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Tue Apr 12 13:47:14 2005
-+++ Makefile.in	Tue Apr 12 13:48:21 2005
-@@ -18,7 +18,7 @@
- top_srcdir = @top_srcdir@
+--- Makefile.in.orig	2010-05-28 11:55:55.000000000 -0400
++++ Makefile.in	2010-07-24 14:52:26.000000000 -0400
+@@ -19,7 +19,7 @@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
 +pkglibdir = $(prefix)/libdata/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = .
- 
+ pkglibexecdir = $(libexecdir)/@PACKAGE@
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
diff --git a/devel/pkg-config/files/patch-pkg.c b/devel/pkg-config/files/patch-pkg.c
deleted file mode 100644
index 48315feb9589..000000000000
--- a/devel/pkg-config/files/patch-pkg.c
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur pkg-config-0.23-old/pkg.c pkg-config-0.23-new/pkg.c
---- pkg-config-0.23-old/pkg.c	2008-01-16 13:59:49.000000000 -0800
-+++ pkg.c	2008-01-22 15:00:55.000000000 -0800
-@@ -483,6 +483,10 @@
- 	      g_string_append (str, pcsysrootdir);
- 	      g_string_append (str, tmpstr+2);
- 	    }
-+          else 
-+	    {
-+	      g_string_append (str, tmpstr);
-+	    }
- 	}
-       else 
- 	{
diff --git a/devel/pkg-config/pkg-plist b/devel/pkg-config/pkg-plist
index 273b374e6606..a79e00f7b271 100644
--- a/devel/pkg-config/pkg-plist
+++ b/devel/pkg-config/pkg-plist
@@ -1,4 +1,6 @@
 bin/pkg-config
 share/aclocal/pkg.m4
+%%DOCSDIR%%/pkg-config-guide.html
+@dirrm %%DOCSDIR%%
 @dirrmtry lib/pkgconfig
 @unexec rmdir %%LOCALBASE%%/lib/pkgconfig 2>/dev/null || true