From 3bdff89e888119b93badf931aac54cb76007e77b Mon Sep 17 00:00:00 2001 From: shell Date: Tue, 19 Feb 2002 05:04:55 +0000 Subject: [PATCH] Updated to pkgconfig-0.10.0 - Regen patch - use distinfo - bump need_version --- devel/pkgconfig/Makefile | 6 ++--- devel/pkgconfig/distinfo | 3 +++ devel/pkgconfig/files/md5 | 3 --- devel/pkgconfig/patches/patch-ltmain_sh | 35 +++++++++++++------------ 4 files changed, 24 insertions(+), 23 deletions(-) create mode 100644 devel/pkgconfig/distinfo delete mode 100644 devel/pkgconfig/files/md5 diff --git a/devel/pkgconfig/Makefile b/devel/pkgconfig/Makefile index 79d24dda8af..6598e203ce7 100644 --- a/devel/pkgconfig/Makefile +++ b/devel/pkgconfig/Makefile @@ -1,12 +1,12 @@ -# $OpenBSD: Makefile,v 1.3 2001/12/09 04:19:26 pvalchev Exp $ +# $OpenBSD: Makefile,v 1.4 2002/02/19 05:04:55 shell Exp $ COMMENT= "tool for managing library compile/link flags" -VERSION= 0.8.0 +VERSION= 0.10.0 DISTNAME= pkgconfig-${VERSION} CATEGORIES= devel -NEED_VERSION= 1.482 +NEED_VERSION= 1.504 HOMEPAGE= http://www.freedesktop.org/software/pkgconfig/ diff --git a/devel/pkgconfig/distinfo b/devel/pkgconfig/distinfo new file mode 100644 index 00000000000..07a2b5858e3 --- /dev/null +++ b/devel/pkgconfig/distinfo @@ -0,0 +1,3 @@ +MD5 (pkgconfig-0.10.0.tar.gz) = 8cf9270cee9a8d85ef977f9ac6fec927 +RMD160 (pkgconfig-0.10.0.tar.gz) = 56c4086a9aff4022027f644dbd9e7163cd8b5fda +SHA1 (pkgconfig-0.10.0.tar.gz) = 8af30c761e42a8d3329d67f39e2d36512c763f41 diff --git a/devel/pkgconfig/files/md5 b/devel/pkgconfig/files/md5 deleted file mode 100644 index ddcc1cc93b8..00000000000 --- a/devel/pkgconfig/files/md5 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (pkgconfig-0.8.0.tar.gz) = e110ee9635fbc0ec159c440c75876a96 -RMD160 (pkgconfig-0.8.0.tar.gz) = 1de701eedee6d9d777a5d8ed431eb6381d059615 -SHA1 (pkgconfig-0.8.0.tar.gz) = b750e4bab6c9ec9a8a2ac4cb2311d97314d56b0d diff --git a/devel/pkgconfig/patches/patch-ltmain_sh b/devel/pkgconfig/patches/patch-ltmain_sh index bf8db1876b0..9679f949e2b 100644 --- a/devel/pkgconfig/patches/patch-ltmain_sh +++ b/devel/pkgconfig/patches/patch-ltmain_sh @@ -1,7 +1,7 @@ -$OpenBSD: patch-ltmain_sh,v 1.1.1.1 2001/10/24 17:08:38 shell Exp $ ---- ltmain.sh.orig Wed Oct 10 18:23:40 2001 -+++ ltmain.sh Wed Oct 10 18:25:37 2001 -@@ -757,6 +757,7 @@ +$OpenBSD: patch-ltmain_sh,v 1.2 2002/02/19 05:04:55 shell Exp $ +--- ltmain.sh.orig Tue Feb 19 12:52:28 2002 ++++ ltmain.sh Tue Feb 19 12:58:48 2002 +@@ -745,6 +745,7 @@ linker_flags= dllsearchpath= lib_search_path=`pwd` @@ -9,7 +9,7 @@ $OpenBSD: patch-ltmain_sh,v 1.1.1.1 2001/10/24 17:08:38 shell Exp $ avoid_version=no dlfiles= -@@ -887,6 +888,11 @@ +@@ -875,6 +876,11 @@ prev= continue ;; @@ -21,18 +21,19 @@ $OpenBSD: patch-ltmain_sh,v 1.1.1.1 2001/10/24 17:08:38 shell Exp $ release) release="-$arg" prev= -@@ -987,6 +993,10 @@ - fi +@@ -976,6 +982,11 @@ continue ;; + + -inst-prefix-dir) + prev=inst_prefix + continue + ;; - ++ # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* # so, if we see these flags be careful not to treat them like -L -@@ -1091,6 +1101,17 @@ + -L[A-Z][A-Z]*:*) +@@ -1068,6 +1079,17 @@ -o) prev=output ;; @@ -50,27 +51,27 @@ $OpenBSD: patch-ltmain_sh,v 1.1.1.1 2001/10/24 17:08:38 shell Exp $ -release) prev=release continue -@@ -1868,6 +1889,7 @@ +@@ -1845,6 +1867,7 @@ - if test $linkmode = prog || test "$mode" = relink; then + if test "$linkmode" = prog || test "$mode" = relink; then add_shlibpath= + add_prefix_dir= add_dir= add= # Finalize command for both is simple: just hardcode it. -@@ -1888,10 +1910,20 @@ +@@ -1865,10 +1888,20 @@ add="-l$name" fi + if test -n "$inst_prefix_dir"; then + case "$libdir" in + [\\/]*) -+ add_prefix_dir="-L$inst_prefix_dir$libdir" ++ add_prefix_dir="-L$inst_prefix_dir$libdir" + ;; + esac + fi + - if test $linkmode = prog; then + if test "$linkmode" = prog; then + test -n "$add_prefix_dir" && finalize_deplibs="$finalize_deplibs $add_prefix_dir" test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" test -n "$add" && finalize_deplibs="$add $finalize_deplibs" @@ -79,7 +80,7 @@ $OpenBSD: patch-ltmain_sh,v 1.1.1.1 2001/10/24 17:08:38 shell Exp $ test -n "$add_dir" && deplibs="$add_dir $deplibs" test -n "$add" && deplibs="$add $deplibs" fi -@@ -3858,7 +3890,7 @@ +@@ -3823,7 +3856,7 @@ fi done # Quote the link command for shipping. @@ -88,7 +89,7 @@ $OpenBSD: patch-ltmain_sh,v 1.1.1.1 2001/10/24 17:08:38 shell Exp $ relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` # Only create the output if not a dry run. -@@ -4159,6 +4191,23 @@ +@@ -4124,6 +4157,23 @@ dir="$dir$objdir" if test -n "$relink_command"; then @@ -112,7 +113,7 @@ $OpenBSD: patch-ltmain_sh,v 1.1.1.1 2001/10/24 17:08:38 shell Exp $ $echo "$modename: warning: relinking \`$file'" 1>&2 $show "$relink_command" if $run eval "$relink_command"; then : -@@ -4446,40 +4495,6 @@ +@@ -4412,40 +4462,6 @@ # Exit here if they wanted silent mode. test "$show" = ":" && exit 0