diff options
| author | marcus <marcus@FreeBSD.org> | 2005-04-14 04:07:11 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2005-04-14 04:07:11 +0800 |
| commit | 3d65073d8a5489a61308743842bea661035bb07e (patch) | |
| tree | 8ceac0fda586c96990605cb093836de397e495b0 /devel/pkgconfig | |
| parent | f90212246b3b6d55a5dfe114efd4b1476cd30646 (diff) | |
| download | freebsd-ports-gnome-3d65073d8a5489a61308743842bea661035bb07e.tar.gz freebsd-ports-gnome-3d65073d8a5489a61308743842bea661035bb07e.tar.zst freebsd-ports-gnome-3d65073d8a5489a61308743842bea661035bb07e.zip | |
* Use gnometarget
* Fix an infinite loop when duplicate components' libs are requested [1]
Obtained from: Freedesktop.org CVS [1]
Diffstat (limited to 'devel/pkgconfig')
| -rw-r--r-- | devel/pkgconfig/Makefile | 2 | ||||
| -rw-r--r-- | devel/pkgconfig/files/patch-pkg.c | 37 |
2 files changed, 20 insertions, 19 deletions
diff --git a/devel/pkgconfig/Makefile b/devel/pkgconfig/Makefile index c838deced61d..2d66dccc9565 100644 --- a/devel/pkgconfig/Makefile +++ b/devel/pkgconfig/Makefile @@ -7,6 +7,7 @@ PORTNAME= pkgconfig PORTVERSION= 0.17.1 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://pkgconfig.freedesktop.org/releases/ DIST_SUBDIR= gnome2 @@ -16,6 +17,7 @@ COMMENT= A utility to retrieve information about installed libraries USE_GMAKE= yes USE_LIBTOOL_VER=15 +USE_GNOME= gnometarget LIBTOOLFILES= glib-1.2.8/configure LIBTOOLFLAGS= --disable-ltlibs \ --disable-shared diff --git a/devel/pkgconfig/files/patch-pkg.c b/devel/pkgconfig/files/patch-pkg.c index 79606e24f0a8..8e10f2143951 100644 --- a/devel/pkgconfig/files/patch-pkg.c +++ b/devel/pkgconfig/files/patch-pkg.c @@ -1,21 +1,20 @@ ---- pkg.c.orig Tue Apr 12 07:08:13 2005 -+++ pkg.c Tue Apr 12 13:55:42 2005 -@@ -128,7 +128,7 @@ name_ends_in_uninstalled (const char *st - * locations, ignoring duplicates - */ - static void --scan_dir (const char *dirname) -+scan_dir (const char *dirname, void *quiet) - { - DIR *dir; - struct dirent *dent; -@@ -148,7 +148,8 @@ scan_dir (const char *dirname) - free (dirname_copy); - if (!dir) +--- pkg.c.orig Wed Apr 13 16:04:58 2005 ++++ pkg.c Wed Apr 13 16:05:33 2005 +@@ -1024,7 +1024,7 @@ + tmp = pkgs; + while (tmp != NULL) { -- debug_spew ("Cannot open directory '%s' in package search path: %s\n", -+ if (!quiet) -+ debug_spew ("Cannot open directory '%s' in package search path: %s\n", - dirname, g_strerror (errno)); - return; +- dups_list = g_slist_concat (dups_list, get_l_libs(tmp->data)); ++ dups_list = g_slist_concat (dups_list, g_slist_copy(get_l_libs(tmp->data))); + tmp = tmp->next; } + +@@ -1067,7 +1067,7 @@ + tmp = pkgs; + while (tmp != NULL) + { +- dups_list = g_slist_concat (dups_list, get_L_libs(tmp->data)); ++ dups_list = g_slist_concat (dups_list, g_slist_copy(get_L_libs(tmp->data))); + tmp = tmp->next; + } + |