Update to 0.22

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

7 files changed, 133 insertions, 0 deletions

diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile
new file mode 100644
index 000000000..15f55e1ca
--- /dev/null
+++ b/devel/pkg-config/Makefile
@@ -0,0 +1,41 @@
+# New ports collection makefile for:	pkgconfig
+# Date created:				30 April 2001
+# Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/devel/pkgconfig/Makefile,v 1.6 2005/10/14 20:39:57 adamw Exp $
+#
+
+PORTNAME=	pkg-config
+PORTVERSION=	0.22
+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_GMAKE=	yes
+GNU_CONFIGURE=	yes
+USE_GNOME=	gnometarget
+
+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
+.if ${X11BASE} != ${PREFIX}
+PC_PATH:=	${PC_PATH}:${X11BASE}/libdata/pkgconfig
+PC_PATH:=	${PC_PATH}:${X11BASE}/lib/pkgconfig
+.endif
+
+CONFIGURE_ARGS=	--disable-threads \
+		--with-pc-path="${PC_PATH}" \
+		--mandir=${MANPREFIX}/man
+
+.include <bsd.port.post.mk>
diff --git a/devel/pkg-config/distinfo b/devel/pkg-config/distinfo
new file mode 100644
index 000000000..9e0e9994a
--- /dev/null
+++ b/devel/pkg-config/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/pkg-config-0.22.tar.gz) = fd5c547e9d66ba49bc735ccb8c791f2a
+SHA256 (gnome2/pkg-config-0.22.tar.gz) = 7e0761b47d604847006e7c6caa9b9cf044530a516ff84395450edcfa3c2febe6
+SIZE (gnome2/pkg-config-0.22.tar.gz) = 1006425
diff --git a/devel/pkg-config/files/patch-Makefile.in b/devel/pkg-config/files/patch-Makefile.in
new file mode 100644
index 000000000..2e7c1f405
--- /dev/null
+++ b/devel/pkg-config/files/patch-Makefile.in
@@ -0,0 +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@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
++pkglibdir = $(prefix)/libdata/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = .
+ 
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
new file mode 100644
index 000000000..330415ed6
--- /dev/null
+++ b/devel/pkg-config/files/patch-glib-1.2.8::Makefile.in
@@ -0,0 +1,10 @@
+--- glib-1.2.8/Makefile.in.orig	Tue Apr 12 13:51:56 2005
++++ glib-1.2.8/Makefile.in	Tue Apr 12 13:52:41 2005
+@@ -727,7 +727,6 @@
+ installdirs-am:
+ 
+ install: $(BUILT_SOURCES)
+-	$(MAKE) $(AM_MAKEFLAGS) install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+ uninstall: uninstall-recursive
diff --git a/devel/pkg-config/files/patch-parse.c b/devel/pkg-config/files/patch-parse.c
new file mode 100644
index 000000000..a51f5a965
--- /dev/null
+++ b/devel/pkg-config/files/patch-parse.c
@@ -0,0 +1,48 @@
+--- 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')
+@@ -1190,9 +1200,9 @@ get_compat_package (const char *name)
+     {
+       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);
+@@ -1203,12 +1213,12 @@ get_compat_package (const char *name)
+       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
new file mode 100644
index 000000000..cbf7c6b4a
--- /dev/null
+++ b/devel/pkg-config/pkg-descr
@@ -0,0 +1,15 @@
+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, ${LOCALBASE}/lib/pkgconfig,
+${X11BASE}/libdata/pkgconfig, and ${X11BASE}/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..5d6a4afdd
--- /dev/null
+++ b/devel/pkg-config/pkg-plist
@@ -0,0 +1,5 @@
+bin/pkg-config
+share/aclocal/pkg.m4
+@dirrmtry lib/pkgconfig
+@unexec rmdir %%LOCALBASE%%/lib/pkgconfig 2>/dev/null || true
+@unexec rmdir %%X11BASE%%/lib/pkgconfig 2>/dev/null || true