diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile index 36256dcb943a..8eece14cefca 100644 --- a/devel/pkg-config/Makefile +++ b/devel/pkg-config/Makefile @@ -6,10 +6,10 @@ # PORTNAME= pkgconfig -PORTVERSION= 0.14.0 +PORTVERSION= 0.15.0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.14 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.15 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/devel/pkg-config/distinfo b/devel/pkg-config/distinfo index 19722b49ce11..0dbbf456a00b 100644 --- a/devel/pkg-config/distinfo +++ b/devel/pkg-config/distinfo @@ -1 +1 @@ -MD5 (gnome2/pkgconfig-0.14.0.tar.bz2) = 5db4b49565fe03b95181e15372084f36 +MD5 (gnome2/pkgconfig-0.15.0.tar.bz2) = 8e3f44717a76069fcc8fdae9c252369b diff --git a/devel/pkg-config/files/patch-pkg.c b/devel/pkg-config/files/patch-pkg.c index 4fa85372148d..f928ebc29910 100644 --- a/devel/pkg-config/files/patch-pkg.c +++ b/devel/pkg-config/files/patch-pkg.c @@ -1,6 +1,6 @@ ---- pkg.c.orig Thu Feb 7 14:32:13 2002 -+++ pkg.c Tue Mar 12 16:54:50 2002 -@@ -93,7 +93,7 @@ +--- pkg.c.orig Thu Jan 16 16:07:09 2003 ++++ pkg.c Wed Jan 22 18:11:41 2003 +@@ -113,7 +113,7 @@ * locations, ignoring duplicates */ static void @@ -9,7 +9,7 @@ { DIR *dir; struct dirent *dent; -@@ -113,7 +113,8 @@ +@@ -133,7 +133,8 @@ free (dirname_copy); if (!dir) { @@ -19,13 +19,14 @@ dirname, g_strerror (errno)); return; } -@@ -177,7 +178,9 @@ +@@ -202,7 +203,9 @@ path_positions = g_hash_table_new (g_str_hash, g_str_equal); g_slist_foreach (search_dirs, (GFunc)scan_dir, NULL); -- scan_dir (PKGLIBDIR); -+ scan_dir (PKGLIBDIR, (void *)0); +- scan_dir (pkglibdir); ++ scan_dir (pkglibdir, (void *)0); + scan_dir (XPKGLIBDIR, (void *)1); + scan_dir (LPKGLIBDIR, (void *)1); } } + diff --git a/devel/pkgconfig/Makefile b/devel/pkgconfig/Makefile index 36256dcb943a..8eece14cefca 100644 --- a/devel/pkgconfig/Makefile +++ b/devel/pkgconfig/Makefile @@ -6,10 +6,10 @@ # PORTNAME= pkgconfig -PORTVERSION= 0.14.0 +PORTVERSION= 0.15.0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.14 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.15 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/devel/pkgconfig/distinfo b/devel/pkgconfig/distinfo index 19722b49ce11..0dbbf456a00b 100644 --- a/devel/pkgconfig/distinfo +++ b/devel/pkgconfig/distinfo @@ -1 +1 @@ -MD5 (gnome2/pkgconfig-0.14.0.tar.bz2) = 5db4b49565fe03b95181e15372084f36 +MD5 (gnome2/pkgconfig-0.15.0.tar.bz2) = 8e3f44717a76069fcc8fdae9c252369b diff --git a/devel/pkgconfig/files/patch-pkg.c b/devel/pkgconfig/files/patch-pkg.c index 4fa85372148d..f928ebc29910 100644 --- a/devel/pkgconfig/files/patch-pkg.c +++ b/devel/pkgconfig/files/patch-pkg.c @@ -1,6 +1,6 @@ ---- pkg.c.orig Thu Feb 7 14:32:13 2002 -+++ pkg.c Tue Mar 12 16:54:50 2002 -@@ -93,7 +93,7 @@ +--- pkg.c.orig Thu Jan 16 16:07:09 2003 ++++ pkg.c Wed Jan 22 18:11:41 2003 +@@ -113,7 +113,7 @@ * locations, ignoring duplicates */ static void @@ -9,7 +9,7 @@ { DIR *dir; struct dirent *dent; -@@ -113,7 +113,8 @@ +@@ -133,7 +133,8 @@ free (dirname_copy); if (!dir) { @@ -19,13 +19,14 @@ dirname, g_strerror (errno)); return; } -@@ -177,7 +178,9 @@ +@@ -202,7 +203,9 @@ path_positions = g_hash_table_new (g_str_hash, g_str_equal); g_slist_foreach (search_dirs, (GFunc)scan_dir, NULL); -- scan_dir (PKGLIBDIR); -+ scan_dir (PKGLIBDIR, (void *)0); +- scan_dir (pkglibdir); ++ scan_dir (pkglibdir, (void *)0); + scan_dir (XPKGLIBDIR, (void *)1); + scan_dir (LPKGLIBDIR, (void *)1); } } +