Update to 0.26

PR:	 	ports/160670
Submitted by:	conrads@cox.net


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16644 df743ca5-7f9a-e211-a948-0013205c9059

7 files changed, 92 insertions, 3 deletions

diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index 9b76ab02a..8ce2b6188 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -3,7 +3,7 @@
 #
 # $FreeBSD$
 #	$NetBSD: $
-#     $MCom: ports/Mk/bsd.gnome.mk,v 1.555 2011/09/17 11:17:47 kwm Exp $
+#     $MCom: ports/Mk/bsd.gnome.mk,v 1.556 2011/10/16 19:34:53 kwm Exp $
 #
 # Please view me with 4 column tabs!
 
@@ -259,7 +259,6 @@ pygtk_USE_GNOME_IMPL=	gnomelibs gdkpixbuf libglade
 
 _glib20_LIB_DEPENDS=	glib-2.0.0:${PORTSDIR}/devel/glib20
 _glib20_DETECT=		${LOCALBASE}/libdata/pkgconfig/glib-2.0.pc
-_glib20_USE_GNOME_IMPL=	pkgconfig
 
 glib20_RUN_DEPENDS=	${LOCALBASE}/lib/gio/modules/libgiofam.so:${PORTSDIR}/devel/gio-fam-backend
 glib20_DETECT=		${LOCALBASE}/lib/gio/modules/libgiofam.so
@@ -314,7 +313,6 @@ libglade2_USE_GNOME_IMPL=libxml2 gtk20
 
 libxml2_LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
 libxml2_DETECT=		${LOCALBASE}/libdata/pkgconfig/libxml-2.0.pc
-libxml2_USE_GNOME_IMPL=	pkgconfig
 
 libxslt_LIB_DEPENDS=	xslt.2:${PORTSDIR}/textproc/libxslt
 libxslt_DETECT=		${LOCALBASE}/libdata/pkgconfig/libxslt.pc
diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile
new file mode 100644
index 000000000..90a409175
--- /dev/null
+++ b/devel/pkg-config/Makefile
@@ -0,0 +1,39 @@
+# New ports collection makefile for:	pkgconfig
+# Date created:				30 April 2001
+# Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+#
+
+PORTNAME=	pkg-config
+PORTVERSION=	0.26
+CATEGORIES=	devel
+MASTER_SITES=	http://pkgconfig.freedesktop.org/releases/
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	A utility to retrieve information about installed libraries
+
+USE_CSTD=	gnu89
+USE_GNOME=	_glib20
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+
+MAN1=		pkg-config.1
+
+.include <bsd.port.pre.mk>
+
+PC_PATH=${PREFIX}/libdata/pkgconfig
+PC_PATH:=${PC_PATH}:${PREFIX}/lib/pkgconfig
+.if ${LOCALBASE} != ${PREFIX}
+PC_PATH:=	${PC_PATH}:${LOCALBASE}/libdata/pkgconfig
+PC_PATH:=	${PC_PATH}:${LOCALBASE}/lib/pkgconfig
+.endif
+
+CONFIGURE_ARGS=	--with-pc-path="${PC_PATH}"
+
+CONFIGURE_ENV=	GLIB_CFLAGS="-I${LOCALBASE}/include/glib-2.0" \
+		GLIB_LIBS="-L${LOCALBASE}/lib -lglib-2.0 -lintl"
+
+.include <bsd.port.post.mk>
diff --git a/devel/pkg-config/distinfo b/devel/pkg-config/distinfo
new file mode 100644
index 000000000..95f8030c6
--- /dev/null
+++ b/devel/pkg-config/distinfo
@@ -0,0 +1,2 @@
+SHA256 (gnome2/pkg-config-0.26.tar.gz) = 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af
+SIZE (gnome2/pkg-config-0.26.tar.gz) = 396399
diff --git a/devel/pkg-config/files/patch-Makefile.in b/devel/pkg-config/files/patch-Makefile.in
new file mode 100644
index 000000000..c100f5397
--- /dev/null
+++ b/devel/pkg-config/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- 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@
+ 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-parse.c b/devel/pkg-config/files/patch-parse.c
new file mode 100644
index 000000000..99a3ce964
--- /dev/null
+++ b/devel/pkg-config/files/patch-parse.c
@@ -0,0 +1,19 @@
+--- parse.c.orig	Sun Oct 16 13:09:39 2005
++++ parse.c	Sat Sep  2 14:09:44 2006
+@@ -707,6 +707,16 @@ static void _do_parse_libs (Package *pkg
+           i++;
+           g_free(framework);
+         }
++      else if ((strcmp("-Wl,--rpath",p) == 0 || strcmp("-Wl,-rpath",p) == 0) &&
++        i+1 < argc)
++        {
++          gchar *rpath = trim_string (argv[i+1]);
++
++          pkg->other_libs = g_slist_prepend (pkg->other_libs,
++                                             g_strconcat(arg, " ", rpath, NULL));
++          i++;
++          g_free(rpath);
++        }
+       else
+         {
+           if (*arg != '\0')
diff --git a/devel/pkg-config/pkg-descr b/devel/pkg-config/pkg-descr
new file mode 100644
index 000000000..6b95074cc
--- /dev/null
+++ b/devel/pkg-config/pkg-descr
@@ -0,0 +1,14 @@
+The pkg-config program is used to retrieve information about installed
+libraries in the system. It is typically used to compile and link against one
+or more libraries. It's more useful to the compilation process than to
+the end-user.
+
+pkg-config retrieves information about packages from special metadata files.
+These files are named after the package, with the extension .pc. By default,
+pkg-config looks for these files in the following directories:
+${PREFIX}/libdata/pkgconfig, ${PREFIX}/lib/pkgconfig,
+${LOCALBASE}/libdata/pkgconfig, and ${LOCALBASE}/lib/pkgconfig; it will also
+look in the list of directories specified by the PKG_CONFIG_PATH environment
+variable.
+
+WWW: http://pkgconfig.freedesktop.org/wiki/
diff --git a/devel/pkg-config/pkg-plist b/devel/pkg-config/pkg-plist
new file mode 100644
index 000000000..a79e00f7b
--- /dev/null
+++ b/devel/pkg-config/pkg-plist
@@ -0,0 +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