diff options
| author | agc <agc> | 1999-11-19 11:53:00 +0000 |
|---|---|---|
| committer | agc <agc> | 1999-11-19 11:53:00 +0000 |
| commit | 2ae50a6c26f390d5c1bdc8e39c819997a00d86ce (patch) | |
| tree | dc5e2e646f577f02dfaefd4ef094611d72e7e280 /graphics/ImageMagick | |
| parent | 8e2805930c64b783caab8f3d70d8222500cef62e (diff) | |
| download | pkgsrc-2ae50a6c26f390d5c1bdc8e39c819997a00d86ce.tar.gz | |
Remove fuzz from patch.
Diffstat (limited to 'graphics/ImageMagick')
| -rw-r--r-- | graphics/ImageMagick/Makefile | 4 | ||||
| -rw-r--r-- | graphics/ImageMagick/files/patch-sum | 4 | ||||
| -rw-r--r-- | graphics/ImageMagick/patches/patch-aa | 16 |
3 files changed, 13 insertions, 11 deletions
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index 8da8f5a0e6b..faaf03f8088 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 1999/10/08 21:12:48 jlam Exp $ +# $NetBSD: Makefile,v 1.52 1999/11/19 11:53:00 agc Exp $ DISTNAME= ImageMagick-4.2.9 CATEGORIES= graphics @@ -18,6 +18,8 @@ USE_LIBTOOL= yes USE_X11= yes GNU_CONFIGURE= yes +PATCH_FUZZ_FACTOR=2 + # Avoid compiler bug on "arm32" .if (${MACHINE_ARCH} == arm32) CFLAGS= -O diff --git a/graphics/ImageMagick/files/patch-sum b/graphics/ImageMagick/files/patch-sum index dd9f5081306..06d9ec0c6f6 100644 --- a/graphics/ImageMagick/files/patch-sum +++ b/graphics/ImageMagick/files/patch-sum @@ -1,3 +1,3 @@ -$NetBSD: patch-sum,v 1.1 1999/07/09 13:51:05 agc Exp $ +$NetBSD: patch-sum,v 1.2 1999/11/19 11:53:01 agc Exp $ -MD5 (patch-aa) = 68f57c1ffef3f9da75d82aca9d358d5b +MD5 (patch-aa) = 986b81b5b304380b027eb03963fc24c6 diff --git a/graphics/ImageMagick/patches/patch-aa b/graphics/ImageMagick/patches/patch-aa index 7065e14c035..2036da41347 100644 --- a/graphics/ImageMagick/patches/patch-aa +++ b/graphics/ImageMagick/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.10 1999/04/25 18:46:30 tv Exp $ +$NetBSD: patch-aa,v 1.11 1999/11/19 11:53:01 agc Exp $ ---- configure.orig Sun Apr 25 07:17:03 1999 -+++ configure Sun Apr 25 07:23:45 1999 -@@ -2133,7 +2133,7 @@ +--- configure.orig Thu Sep 9 01:10:48 1999 ++++ configure Fri Nov 19 11:26:56 1999 +@@ -2238,7 +2238,7 @@ fi rm -f confcache @@ -10,8 +10,8 @@ $NetBSD: patch-aa,v 1.10 1999/04/25 18:46:30 tv Exp $ +if false; then # Actually configure libtool. ac_aux_dir is where install-sh is found. CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ - LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \ -@@ -2141,6 +2141,7 @@ + LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ +@@ -2247,6 +2247,7 @@ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } @@ -19,7 +19,7 @@ $NetBSD: patch-aa,v 1.10 1999/04/25 18:46:30 tv Exp $ # Reload cache, that may have been modified by ltconfig if test -r "$cache_file"; then -@@ -2151,7 +2152,7 @@ +@@ -2257,7 +2258,7 @@ > $cache_file fi @@ -28,7 +28,7 @@ $NetBSD: patch-aa,v 1.10 1999/04/25 18:46:30 tv Exp $ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh" -@@ -2176,7 +2177,7 @@ +@@ -2282,7 +2283,7 @@ then libtool_build_static_libs='yes' fi |