5 files changed, 47 insertions, 17 deletions

diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile
index b3721bf52299..1cf141eae423 100644
--- a/devel/pkg-config/Makefile
+++ b/devel/pkg-config/Makefile
@@ -6,30 +6,25 @@
 #
 
 PORTNAME=	pkgconfig
-PORTVERSION=	0.6.0
+PORTVERSION=	0.8.0
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	http://www.freedesktop.org/software/pkgconfig/releases/ \
+		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	gnome@FreeBSD.org
 
-BUILD_DEPENDS=	/nonexistent:${PORTSDIR}/devel/glib12:patch
-
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFILES=	glib-1.2.8/configure
 LIBTOOLFLAGS=	--disable-ltlibs \
 		--disable-shared
+MAKE_ENV=	PKGCONF_BUILD=yes
 
 PLIST_SUB=	LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
 
 MAN1=		pkg-config.1
 
-post-extract:
-	@${RM} -rf ${WRKSRC}/glib-1.2.8
-	@${CP} -R ${WRKDIRPREFIX}${.CURDIR}/../../devel/glib12/work/glib-1.2* \
-		${WRKSRC}/glib-1.2.8
-
 post-install:
 	${MKDIR} ${PREFIX}/libdata/pkgconfig
 
diff --git a/devel/pkg-config/distinfo b/devel/pkg-config/distinfo
index 96536dfda77a..5c9080f54d64 100644
--- a/devel/pkg-config/distinfo
+++ b/devel/pkg-config/distinfo
@@ -1 +1 @@
-MD5 (pkgconfig-0.6.0.tar.gz) = 7eb78b6bf2bedf621f084d946ee3d640
+MD5 (pkgconfig-0.8.0.tar.gz) = e110ee9635fbc0ec159c440c75876a96
diff --git a/devel/pkg-config/files/patch-glib-1.2.8::Makefile.in b/devel/pkg-config/files/patch-glib-1.2.8::Makefile.in
index 78c2a8d9545c..f789c923658a 100644
--- a/devel/pkg-config/files/patch-glib-1.2.8::Makefile.in
+++ b/devel/pkg-config/files/patch-glib-1.2.8::Makefile.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- glib-1.2.8/Makefile.in	2001/04/29 10:41:24	1.1
-+++ glib-1.2.8/Makefile.in	2001/04/29 10:42:12
-@@ -624,7 +624,7 @@
+--- glib-1.2.8/Makefile.in.orig	Thu Jul 12 03:45:31 2001
++++ glib-1.2.8/Makefile.in	Wed Aug  1 10:42:44 2001
+@@ -501,7 +501,7 @@
  
  install-am: all-am
  	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 -install: install-recursive
 +install:
- uninstall-am: uninstall-libLTLIBRARIES uninstall-binSCRIPTS \
- 		uninstall-configincludeDATA uninstall-m4dataDATA \
- 		uninstall-pkgconfigDATA uninstall-glibincludeHEADERS
+ uninstall-am:
+ uninstall: uninstall-recursive
+ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) \
diff --git a/devel/pkg-config/files/patch-parse.c b/devel/pkg-config/files/patch-parse.c
new file mode 100644
index 000000000000..b591663c5709
--- /dev/null
+++ b/devel/pkg-config/files/patch-parse.c
@@ -0,0 +1,34 @@
+
+$FreeBSD$
+
+--- parse.c	2001/08/01 07:24:17	1.1
++++ parse.c	2001/08/01 07:25:02
+@@ -952,9 +952,9 @@
+     {
+       char *output;
+ 
+-      debug_spew ("Calling glib-config\n");
++      debug_spew ("Calling glib12-config\n");
+       
+-      pkg->version = backticks ("glib-config --version");
++      pkg->version = backticks ("glib12-config --version");
+       if (pkg->version == NULL)
+         {
+           g_free (pkg);
+@@ -965,12 +965,12 @@
+       pkg->key = g_strdup ("glib");
+       pkg->description = g_strdup ("C Utility Library");
+ 
+-      output = backticks ("glib-config --libs");
+-      parse_libs (pkg, output, "glib-config");
++      output = backticks ("glib12-config --libs");
++      parse_libs (pkg, output, "glib12-config");
+       g_free (output);
+ 
+-      output = backticks ("glib-config --cflags");
+-      parse_cflags (pkg, output, "glib-config");
++      output = backticks ("glib12-config --cflags");
++      parse_cflags (pkg, output, "glib12-config");
+       g_free (output);
+ 
+       return pkg;
diff --git a/devel/pkg-config/pkg-descr b/devel/pkg-config/pkg-descr
index 283b288796f8..f61c1700ec07 100644
--- a/devel/pkg-config/pkg-descr
+++ b/devel/pkg-config/pkg-descr
@@ -15,4 +15,5 @@ multiple versions simultaneously, it must give each version its own name (for
 example, GTK 1.2 might have the package name "gtk+" while GTK 2.0 has
 "gtk+-2.0").
 
-WWW: http://pkgconfig.sourceforge.net
+WWW: http://www.freedesktop.org/software/pkgconfig/
+     http://pkgconfig.sourceforge.net