diff options
| author | adamw <adamw@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-07-07 02:18:22 +0800 |
|---|---|---|
| committer | adamw <adamw@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-07-07 02:18:22 +0800 |
| commit | 790914a7725a0edb8fd11e7a0efb2046ea724107 (patch) | |
| tree | 0f624a6cc205a20eea29734a3da774d0a3bffd49 /devel/pkg-config/files | |
| parent | 21e293856041ac179054ee21656d8cb04a6410ff (diff) | |
| download | marcuscom-ports-790914a7725a0edb8fd11e7a0efb2046ea724107.tar marcuscom-ports-790914a7725a0edb8fd11e7a0efb2046ea724107.tar.gz marcuscom-ports-790914a7725a0edb8fd11e7a0efb2046ea724107.tar.bz2 marcuscom-ports-790914a7725a0edb8fd11e7a0efb2046ea724107.tar.lz marcuscom-ports-790914a7725a0edb8fd11e7a0efb2046ea724107.tar.xz marcuscom-ports-790914a7725a0edb8fd11e7a0efb2046ea724107.tar.zst marcuscom-ports-790914a7725a0edb8fd11e7a0efb2046ea724107.zip | |
Add pkg-config at 0.18.1.
I'm adding it here rather than into the FreeBSD CVS repo because during
the last pkg-config update, there were some breakages. Also, there is
some handling for potentially different --libs output, so it's best that
it percolate here for a while. It's probably safe to wait and merge along
with the gnome-2.12 update.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4192 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/pkg-config/files')
| -rw-r--r-- | devel/pkg-config/files/patch-Makefile.in | 11 | ||||
| -rw-r--r-- | devel/pkg-config/files/patch-glib-1.2.8::Makefile.in | 10 | ||||
| -rw-r--r-- | devel/pkg-config/files/patch-parse.c | 34 |
3 files changed, 55 insertions, 0 deletions
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..1f8fc6d91 --- /dev/null +++ b/devel/pkg-config/files/patch-parse.c @@ -0,0 +1,34 @@ + +$FreeBSD: ports/devel/pkgconfig/files/patch-parse.c,v 1.1 2001/08/01 17:46:50 sobomax Exp $ + +--- 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; |