summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjschauma <jschauma@pkgsrc.org>2004-04-12 14:41:03 +0000
committerjschauma <jschauma@pkgsrc.org>2004-04-12 14:41:03 +0000
commit32a24bd863be609d3c075db069b73e56dff2abf1 (patch)
treeb3e9815d6fc29ac6372fd8fde476846eaf97d9ad
parent4935581a4f3ff56549a4724d0af55eaa94e65dcb (diff)
downloadpkgsrc-32a24bd863be609d3c075db069b73e56dff2abf1.tar.gz
don't ``relativize'' -rpath - fixes build on Irix.
-rw-r--r--graphics/tiff/distinfo4
-rw-r--r--graphics/tiff/patches/patch-aa15
2 files changed, 10 insertions, 9 deletions
diff --git a/graphics/tiff/distinfo b/graphics/tiff/distinfo
index f678e86ff35..780bf3a0c4d 100644
--- a/graphics/tiff/distinfo
+++ b/graphics/tiff/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2004/03/22 17:05:17 wiz Exp $
+$NetBSD: distinfo,v 1.14 2004/04/12 14:41: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 @@ SHA1 (tiff-3.6.1/TIFFTechNote2.html) = bf202e0ded764f0f6b9cda673245dea4ebfaf73f
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) = 228fa627d820bce8f1767387e5b4dbdd8148fd52
+SHA1 (patch-aa) = f7e1947a088c519a87be89b464eebf362962aeab
SHA1 (patch-ab) = 186b597cb44768570d844d55a4f4358a89974633
SHA1 (patch-ac) = 754a02bb0561f8944fa1c870ab8dd6c1d6bf0c49
SHA1 (patch-ad) = 9c8c96d1f57902222541ba9b5f439c94d575d9eb
diff --git a/graphics/tiff/patches/patch-aa b/graphics/tiff/patches/patch-aa
index 38d268312ad..51c0373e85c 100644
--- a/graphics/tiff/patches/patch-aa
+++ b/graphics/tiff/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.12 2003/05/23 09:26:59 wiz Exp $
+$NetBSD: patch-aa,v 1.13 2004/04/12 14:41:03 jschauma Exp $
---- configure.orig Thu Nov 15 18:21:05 2001
-+++ configure
-@@ -59,7 +59,7 @@ LIBGL=auto # auto-enable build of SGI
+--- configure.orig Mon Apr 12 09:58:40 2004
++++ configure Mon Apr 12 10:01:34 2004
+@@ -59,7 +59,7 @@
LIBIMAGE=auto # auto-enable build of SGI -limage apps
: ${CC=} # name of C compiler to use
: ${CCOMPILER=} # full pathname of C compiler
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.12 2003/05/23 09:26:59 wiz Exp $
: ${ENVOPTS=} # CC opts for ANSI C compilation
: ${MAKE=make} # make to use
-@@ -487,7 +487,7 @@ EOF
+@@ -488,7 +488,7 @@
checkCompiler()
{
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.12 2003/05/23 09:26:59 wiz Exp $
if isGNU $compiler; then
ISGCC=yes
else
-@@ -513,7 +513,7 @@ checkCompiler()
+@@ -514,7 +514,7 @@
$RM dummy dummy.o
capture $compiler -o dummy ${C_ANSI} dummy.c && {
CC=$compiler;
@@ -29,10 +29,11 @@ $NetBSD: patch-aa,v 1.12 2003/05/23 09:26:59 wiz Exp $
test -z "${ENVOPTS-}" && ENVOPTS="${C_ANSI-}"
return 0
}
-@@ -1705,6 +1705,7 @@ relativize()
+@@ -1743,6 +1743,8 @@
-[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" ;;
esac