[pkgsrc/trunk]: pkgsrc/graphics/tiff When ``relativize''-ing CFLAGS, don't su...

[jschauma <jschauma%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f00267994746
branches:  trunk
changeset: 480301:f00267994746
user:      jschauma <jschauma%pkgsrc.org@localhost>
date:      Sun Sep 05 16:49:03 2004 +0000

description:
When ``relativize''-ing CFLAGS, don't substitute anything that begins
with a '-' as '../-', as this is basically guaranteed to be wrong.

Examples:  -n32 or -64 for IRIX ABI would be substituted as '../-64',
which of course breaks the package.  Other possible CFLAGS would
have the same result.

diffstat:

 graphics/tiff/distinfo         |  4 ++--
 graphics/tiff/patches/patch-aa |  5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (42 lines):

diff -r fc91b39df1ea -r f00267994746 graphics/tiff/distinfo
--- a/graphics/tiff/distinfo    Sun Sep 05 14:26:02 2004 +0000
+++ b/graphics/tiff/distinfo    Sun Sep 05 16:49:03 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2004/04/27 22:38:51 tv Exp $
+$NetBSD: distinfo,v 1.17 2004/09/05 16:49:03 jschauma Exp $
 
 SHA1 (tiff-3.6.1/tiff-v3.6.1.tar.gz) = f7817145d8756152cc341804df6477f37ef93c38
 Size (tiff-3.6.1/tiff-v3.6.1.tar.gz) = 1072165 bytes
@@ -6,7 +6,7 @@
 Size (tiff-3.6.1/TIFFTechNote2.html) = 35698 bytes
 SHA1 (tiff-3.6.1/libtiff-lzw-compression-kit-1.5.tar.gz) = 97d103ca8595cf6759fc6c52f4199be4b02b95b0
 Size (tiff-3.6.1/libtiff-lzw-compression-kit-1.5.tar.gz) = 9646 bytes
-SHA1 (patch-aa) = f7e1947a088c519a87be89b464eebf362962aeab
+SHA1 (patch-aa) = b3f0850bd47805f54e44e8160baf237fd511e0a5
 SHA1 (patch-ab) = 186b597cb44768570d844d55a4f4358a89974633
 SHA1 (patch-ac) = 754a02bb0561f8944fa1c870ab8dd6c1d6bf0c49
 SHA1 (patch-ad) = b48c93d29d5ff39079b6d320c5e67d9c1cdde8c7
diff -r fc91b39df1ea -r f00267994746 graphics/tiff/patches/patch-aa
--- a/graphics/tiff/patches/patch-aa    Sun Sep 05 14:26:02 2004 +0000
+++ b/graphics/tiff/patches/patch-aa    Sun Sep 05 16:49:03 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.13 2004/04/12 14:41:03 jschauma Exp $
+$NetBSD: patch-aa,v 1.14 2004/09/05 16:49:03 jschauma Exp $
 
 --- configure.orig     Mon Apr 12 09:58:40 2004
 +++ configure  Mon Apr 12 10:01:34 2004
@@ -29,12 +29,13 @@
        test -z "${ENVOPTS-}"   && ENVOPTS="${C_ANSI-}"
        return 0
      }
-@@ -1743,6 +1743,8 @@
+@@ -1743,6 +1743,9 @@
            -[LR]/*)    echo "$i" ;;
            -L*)        echo "$i" | sed 's;^-L;-L../;' ;;
            -R*)        echo "$i" | sed 's;^-R;-R../;' ;;
 +          -rpath*)    echo "$i" ;;
 +          -W*)        echo "$i" ;;
++          -*)         echo "$i" ;;
            *)          echo "../$i" ;;
            esac
        done) | tr '\012' ' '