diff --git a/devel/pkgconfig/Makefile b/devel/pkgconfig/Makefile
index c96f8f00dbd..ed1004e241b 100644
--- a/devel/pkgconfig/Makefile
+++ b/devel/pkgconfig/Makefile
@@ -1,16 +1,16 @@
-# $OpenBSD: Makefile,v 1.24 2007/09/16 02:53:11 merdely Exp $
+# $OpenBSD: Makefile,v 1.25 2008/10/25 16:44:56 jasper Exp $
 
 COMMENT=		tool for managing library compile/link flags
 
 IGNORE=			Replaced with BSD clone in OpenBSD 4.1
-VERSION=		0.19
+VERSION=		0.23
 DISTNAME=		pkg-config-${VERSION}
-PKGNAME=		pkgconfig-${VERSION}p2
+PKGNAME=		pkgconfig-${VERSION}
 CATEGORIES=		devel
 
 HOMEPAGE=		http://www.freedesktop.org/software/pkgconfig/
-MASTER_SITES=		${HOMEPAGE}releases/ \
-			${MASTER_SITE_GNOME:=sources/pkg-config/0.19/}
+MASTER_SITES=		${HOMEPAGE}/releases/ \
+			${MASTER_SITE_GNOME:=sources/pkg-config/0.23/}
 
 CONFIGURE_ARGS+=	--with-pc_path=${LOCALBASE}/lib/pkgconfig:${X11BASE}/lib/pkgconfig
 
@@ -19,9 +19,16 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		c
+WANTLIB=		c pcre
 USE_LIBTOOL=		Yes
 
+MODULES=		devel/gettext
+
+LIB_DEPENDS=		glib-2.0::devel/glib2
+
 CONFIGURE_STYLE=	gnu
+# This pkg-config has just become a reference application. So it's safe to depend
+# on glib2 (which does depend on pkg-config. But that's the version from base.)
+CONFIGURE_ARGS+=	--with-installed-glib
 
 .include <bsd.port.mk>
diff --git a/devel/pkgconfig/distinfo b/devel/pkgconfig/distinfo
index d62ba4a2c90..e90bbec8492 100644
--- a/devel/pkgconfig/distinfo
+++ b/devel/pkgconfig/distinfo
@@ -1,5 +1,5 @@
-MD5 (pkg-config-0.19.tar.gz) = JfEG0syCoAE/W9yJh11XkA==
-RMD160 (pkg-config-0.19.tar.gz) = MDVQBMCf6UfcPPjxFZ8GiSTQ16I=
-SHA1 (pkg-config-0.19.tar.gz) = sJ+kPcxE/g243xxJlKj/nqs3FmY=
-SHA256 (pkg-config-0.19.tar.gz) = J1Ut4ErNUwAbqIR4IwkaAzh1GFDj49M976WUqpEgn+E=
-SIZE (pkg-config-0.19.tar.gz) = 968790
+MD5 (pkg-config-0.23.tar.gz) = 2SKoh4K2REHQZUdjL9hXRA==
+RMD160 (pkg-config-0.23.tar.gz) = CqVWVDDWCTGZF6wsj/6qXkpQlIk=
+SHA1 (pkg-config-0.23.tar.gz) = tZ3d1rUyC9dMD3SzM5YYoycJayo=
+SHA256 (pkg-config-0.23.tar.gz) = CKDgctagVBmlgSTbhk8GheaslucbKHW/FawScU6YO1M=
+SIZE (pkg-config-0.23.tar.gz) = 1032839
diff --git a/devel/pkgconfig/patches/patch-configure b/devel/pkgconfig/patches/patch-configure
deleted file mode 100644
index 96c45709abf..00000000000
--- a/devel/pkgconfig/patches/patch-configure
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-configure,v 1.2 2005/10/05 08:50:21 espie Exp $
---- configure.orig	Sat Jul 16 12:23:36 2005
-+++ configure	Tue Sep 20 23:36:23 2005
-@@ -7227,7 +7227,7 @@ if test -z "$aix_libpath"; then aix_libp
-       else
-        case $host_os in
- 	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
--	   archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+	   archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $compiler_flags'
- 	   hardcode_libdir_flag_spec='-R$libdir'
- 	   ;;
- 	 *)
diff --git a/devel/pkgconfig/patches/patch-pkg_c b/devel/pkgconfig/patches/patch-pkg_c
index d940f1f9a37..7930ffd0060 100644
--- a/devel/pkgconfig/patches/patch-pkg_c
+++ b/devel/pkgconfig/patches/patch-pkg_c
@@ -1,8 +1,8 @@
-$OpenBSD: patch-pkg_c,v 1.6 2005/10/05 08:50:21 espie Exp $
---- pkg.c.orig	Fri Jul 15 10:20:20 2005
-+++ pkg.c	Tue Sep 20 23:34:22 2005
-@@ -372,7 +372,55 @@ get_package (const char *name)
-   return internal_get_package (name, TRUE, TRUE);
+$OpenBSD: patch-pkg_c,v 1.7 2008/10/25 16:44:56 jasper Exp $
+--- pkg.c.orig	Wed Jan 16 22:59:49 2008
++++ pkg.c	Sat Oct 25 16:53:23 2008
+@@ -393,7 +393,55 @@ get_package_quiet (const char *name)
+   return internal_get_package (name, FALSE, TRUE);
  }
  
 +/*
@@ -57,7 +57,7 @@ $OpenBSD: patch-pkg_c,v 1.6 2005/10/05 08:50:21 espie Exp $
  string_list_strip_duplicates (GSList *list)
  {
    GHashTable *table;
-@@ -965,6 +1013,8 @@ get_merged_from_back (Package *pkg, GetL
+@@ -979,6 +1027,8 @@ get_merged (Package *pkg, GetListFunc func, gboolean i
  
    g_slist_free (dups_list);
    
diff --git a/devel/pkgconfig/pkg/PLIST b/devel/pkgconfig/pkg/PLIST
index f8f307fc18d..8a04968db64 100644
--- a/devel/pkgconfig/pkg/PLIST
+++ b/devel/pkgconfig/pkg/PLIST
@@ -1,5 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.5 2006/12/01 16:30:42 espie Exp $
-bin/pkg-config
+@comment $OpenBSD: PLIST,v 1.6 2008/10/25 16:44:56 jasper Exp $
+@bin bin/pkg-config
 @man man/man1/pkg-config.1
 @comment share/aclocal/
 @comment share/aclocal/pkg.m4