From 3bffd01fce2b14d2df5ff497044c96800d47db3a Mon Sep 17 00:00:00 2001 From: sobomax Date: Fri, 20 Jul 2001 12:01:15 +0000 Subject: Update to 0.6.0. --- devel/pkg-config/Makefile | 6 ++---- devel/pkg-config/distinfo | 2 +- devel/pkg-config/files/patch-ltmain.sh | 18 ++++++++++++++++++ devel/pkg-config/files/patch-pkg.c | 18 ++++++++---------- devel/pkg-config/pkg-plist | 1 + devel/pkgconfig/Makefile | 6 ++---- devel/pkgconfig/distinfo | 2 +- devel/pkgconfig/files/patch-ltmain.sh | 18 ++++++++++++++++++ devel/pkgconfig/files/patch-pkg.c | 18 ++++++++---------- devel/pkgconfig/pkg-plist | 1 + 10 files changed, 60 insertions(+), 30 deletions(-) create mode 100644 devel/pkg-config/files/patch-ltmain.sh create mode 100644 devel/pkgconfig/files/patch-ltmain.sh (limited to 'devel') diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile index c618e1ec5fab..b3721bf52299 100644 --- a/devel/pkg-config/Makefile +++ b/devel/pkg-config/Makefile @@ -6,8 +6,7 @@ # PORTNAME= pkgconfig -PORTVERSION= 0.5.0 -PORTREVISION= 2 +PORTVERSION= 0.6.0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -18,7 +17,7 @@ BUILD_DEPENDS= /nonexistent:${PORTSDIR}/devel/glib12:patch USE_GMAKE= yes USE_LIBTOOL= yes -LIBTOOLFILES= configure glib-1.2.8/configure +LIBTOOLFILES= glib-1.2.8/configure LIBTOOLFLAGS= --disable-ltlibs \ --disable-shared @@ -33,6 +32,5 @@ post-extract: post-install: ${MKDIR} ${PREFIX}/libdata/pkgconfig - ${INSTALL_MAN} ${WRKSRC}/pkg-config.1 ${PREFIX}/man/man1 .include diff --git a/devel/pkg-config/distinfo b/devel/pkg-config/distinfo index c29b00edb0e9..96536dfda77a 100644 --- a/devel/pkg-config/distinfo +++ b/devel/pkg-config/distinfo @@ -1 +1 @@ -MD5 (pkgconfig-0.5.0.tar.gz) = 84b14fbf4b5dbd8b35b2d8cde87aea11 +MD5 (pkgconfig-0.6.0.tar.gz) = 7eb78b6bf2bedf621f084d946ee3d640 diff --git a/devel/pkg-config/files/patch-ltmain.sh b/devel/pkg-config/files/patch-ltmain.sh new file mode 100644 index 000000000000..115ea71625a1 --- /dev/null +++ b/devel/pkg-config/files/patch-ltmain.sh @@ -0,0 +1,18 @@ + +$FreeBSD$ + +--- ltmain.sh 2001/07/11 11:45:26 1.1 ++++ ltmain.sh 2001/07/11 11:45:42 +@@ -4175,10 +4175,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if false; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/devel/pkg-config/files/patch-pkg.c b/devel/pkg-config/files/patch-pkg.c index 0286a5b739de..3bf9b3f766bf 100644 --- a/devel/pkg-config/files/patch-pkg.c +++ b/devel/pkg-config/files/patch-pkg.c @@ -1,9 +1,9 @@ $FreeBSD$ ---- pkg.c.orig Wed Jan 3 11:34:49 2001 -+++ pkg.c Tue May 15 11:48:04 2001 -@@ -40,7 +40,7 @@ +--- pkg.c.orig Mon May 28 16:02:53 2001 ++++ pkg.c Wed Jul 11 14:42:22 2001 +@@ -71,7 +71,7 @@ * locations, ignoring duplicates */ static void @@ -12,19 +12,17 @@ $FreeBSD$ { DIR *dir = opendir (dirname); struct dirent *dent; -@@ -51,8 +51,9 @@ +@@ -82,7 +82,8 @@ if (!dir) { -- fprintf (stderr, "Warning: cannot open directory '%s' in package search path: %s\n", -- dirname, g_strerror (errno)); +- debug_spew ("Cannot open directory '%s' in package search path: %s\n", + if (!quiet) -+ fprintf (stderr, "Warning: cannot open directory '%s' in package search path: %s\n", -+ dirname, g_strerror (errno)); ++ debug_spew ("Cannot open directory '%s' in package search path: %s\n", + dirname, g_strerror (errno)); return; } - -@@ -96,7 +97,9 @@ +@@ -141,7 +142,9 @@ locations = g_hash_table_new (g_str_hash, g_str_equal); g_slist_foreach (search_dirs, (GFunc)scan_dir, NULL); diff --git a/devel/pkg-config/pkg-plist b/devel/pkg-config/pkg-plist index 3161e023d6fd..95e761321f78 100644 --- a/devel/pkg-config/pkg-plist +++ b/devel/pkg-config/pkg-plist @@ -1,5 +1,6 @@ @exec mkdir -p %D/libdata/pkgconfig bin/pkg-config +share/aclocal/pkg.m4 @dirrm libdata/pkgconfig @unexec rmdir %%LOCALBASE%%/libdata/pkgconfig 2>/dev/null || true @unexec rmdir %%X11BASE%%/libdata/pkgconfig 2>/dev/null || true diff --git a/devel/pkgconfig/Makefile b/devel/pkgconfig/Makefile index c618e1ec5fab..b3721bf52299 100644 --- a/devel/pkgconfig/Makefile +++ b/devel/pkgconfig/Makefile @@ -6,8 +6,7 @@ # PORTNAME= pkgconfig -PORTVERSION= 0.5.0 -PORTREVISION= 2 +PORTVERSION= 0.6.0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -18,7 +17,7 @@ BUILD_DEPENDS= /nonexistent:${PORTSDIR}/devel/glib12:patch USE_GMAKE= yes USE_LIBTOOL= yes -LIBTOOLFILES= configure glib-1.2.8/configure +LIBTOOLFILES= glib-1.2.8/configure LIBTOOLFLAGS= --disable-ltlibs \ --disable-shared @@ -33,6 +32,5 @@ post-extract: post-install: ${MKDIR} ${PREFIX}/libdata/pkgconfig - ${INSTALL_MAN} ${WRKSRC}/pkg-config.1 ${PREFIX}/man/man1 .include diff --git a/devel/pkgconfig/distinfo b/devel/pkgconfig/distinfo index c29b00edb0e9..96536dfda77a 100644 --- a/devel/pkgconfig/distinfo +++ b/devel/pkgconfig/distinfo @@ -1 +1 @@ -MD5 (pkgconfig-0.5.0.tar.gz) = 84b14fbf4b5dbd8b35b2d8cde87aea11 +MD5 (pkgconfig-0.6.0.tar.gz) = 7eb78b6bf2bedf621f084d946ee3d640 diff --git a/devel/pkgconfig/files/patch-ltmain.sh b/devel/pkgconfig/files/patch-ltmain.sh new file mode 100644 index 000000000000..115ea71625a1 --- /dev/null +++ b/devel/pkgconfig/files/patch-ltmain.sh @@ -0,0 +1,18 @@ + +$FreeBSD$ + +--- ltmain.sh 2001/07/11 11:45:26 1.1 ++++ ltmain.sh 2001/07/11 11:45:42 +@@ -4175,10 +4175,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if false; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/devel/pkgconfig/files/patch-pkg.c b/devel/pkgconfig/files/patch-pkg.c index 0286a5b739de..3bf9b3f766bf 100644 --- a/devel/pkgconfig/files/patch-pkg.c +++ b/devel/pkgconfig/files/patch-pkg.c @@ -1,9 +1,9 @@ $FreeBSD$ ---- pkg.c.orig Wed Jan 3 11:34:49 2001 -+++ pkg.c Tue May 15 11:48:04 2001 -@@ -40,7 +40,7 @@ +--- pkg.c.orig Mon May 28 16:02:53 2001 ++++ pkg.c Wed Jul 11 14:42:22 2001 +@@ -71,7 +71,7 @@ * locations, ignoring duplicates */ static void @@ -12,19 +12,17 @@ $FreeBSD$ { DIR *dir = opendir (dirname); struct dirent *dent; -@@ -51,8 +51,9 @@ +@@ -82,7 +82,8 @@ if (!dir) { -- fprintf (stderr, "Warning: cannot open directory '%s' in package search path: %s\n", -- dirname, g_strerror (errno)); +- debug_spew ("Cannot open directory '%s' in package search path: %s\n", + if (!quiet) -+ fprintf (stderr, "Warning: cannot open directory '%s' in package search path: %s\n", -+ dirname, g_strerror (errno)); ++ debug_spew ("Cannot open directory '%s' in package search path: %s\n", + dirname, g_strerror (errno)); return; } - -@@ -96,7 +97,9 @@ +@@ -141,7 +142,9 @@ locations = g_hash_table_new (g_str_hash, g_str_equal); g_slist_foreach (search_dirs, (GFunc)scan_dir, NULL); diff --git a/devel/pkgconfig/pkg-plist b/devel/pkgconfig/pkg-plist index 3161e023d6fd..95e761321f78 100644 --- a/devel/pkgconfig/pkg-plist +++ b/devel/pkgconfig/pkg-plist @@ -1,5 +1,6 @@ @exec mkdir -p %D/libdata/pkgconfig bin/pkg-config +share/aclocal/pkg.m4 @dirrm libdata/pkgconfig @unexec rmdir %%LOCALBASE%%/libdata/pkgconfig 2>/dev/null || true @unexec rmdir %%X11BASE%%/libdata/pkgconfig 2>/dev/null || true -- cgit