From aa553493c56c769f4289ee46e0c88daa95583c16 Mon Sep 17 00:00:00 2001 From: shattered Date: Tue, 25 Jan 2011 22:22:13 +0000 Subject: Remove patch hunks that disable --recheck in GNU configure scripts. These were generated, apparently, by mk/configure/gnu-configure.mk (configure-scripts-override target). --- graphics/freetype-lib/distinfo | 4 ++-- graphics/freetype-lib/patches/patch-ttf2pk-af | 11 +---------- mbone/vic/distinfo | 4 ++-- mbone/vic/patches/patch-ay | 11 +---------- multimedia/ogle_gui/distinfo | 4 ++-- multimedia/ogle_gui/patches/patch-aa | 11 +---------- net/nagios-plugins/distinfo | 4 ++-- net/nagios-plugins/patches/patch-ab | 13 +------------ net/ns/distinfo | 4 ++-- net/ns/patches/patch-af | 11 +---------- shells/scsh/distinfo | 4 ++-- shells/scsh/patches/patch-ac | 11 +---------- sysutils/strace/distinfo | 4 ++-- sysutils/strace/patches/patch-af | 11 +---------- textproc/jade/distinfo | 4 ++-- textproc/jade/patches/patch-aa | 13 +------------ 16 files changed, 24 insertions(+), 100 deletions(-) diff --git a/graphics/freetype-lib/distinfo b/graphics/freetype-lib/distinfo index cfef73cb572..1149347fafb 100644 --- a/graphics/freetype-lib/distinfo +++ b/graphics/freetype-lib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2009/08/11 15:26:22 taca Exp $ +$NetBSD: distinfo,v 1.12 2011/01/25 22:22:13 shattered Exp $ SHA1 (freetype1_1.4pre.20030402.orig.tar.gz) = 595d526813e63400b56a5993caa3e2ea18f2f92c RMD160 (freetype1_1.4pre.20030402.orig.tar.gz) = 9db8891cfb348faeb5387fba0b92dcae54cfed7c @@ -12,7 +12,7 @@ SHA1 (patch-ttf2pk-ab) = 64816d93a0b3f1d38a3dcd9c051433165aa0f1c3 SHA1 (patch-ttf2pk-ac) = 6e80f39b704dcbf06bc25cbc23c3a1ca5f978e74 SHA1 (patch-ttf2pk-ad) = 0a4119f58af75cf338766b734ba16f0fc0f061ae SHA1 (patch-ttf2pk-ae) = 8671f5eb1bdc5bf956083cb87eeaa9a15baf2f91 -SHA1 (patch-ttf2pk-af) = 8a47cd019ad3ae3c503f20818e0a06c91312e858 +SHA1 (patch-ttf2pk-af) = 17320edc3ad49f1025c0a6a635e7e66977b5e383 SHA1 (patch-ttf2pk-ag) = 010e74ab520c804b98209e28fc633a4a7e322e12 SHA1 (patch-ttf2pk-ah) = 1681256ca085350a2913082aba2940558f95ed8d SHA1 (patch-ttf2pk-ai) = 06d81f0da124be3056a90ec62ebad0b04eb34324 diff --git a/graphics/freetype-lib/patches/patch-ttf2pk-af b/graphics/freetype-lib/patches/patch-ttf2pk-af index 74ceccc8aa3..e2d847e17e4 100644 --- a/graphics/freetype-lib/patches/patch-ttf2pk-af +++ b/graphics/freetype-lib/patches/patch-ttf2pk-af @@ -1,4 +1,4 @@ -$NetBSD: patch-ttf2pk-af,v 1.1 2006/06/17 19:41:32 minskim Exp $ +$NetBSD: patch-ttf2pk-af,v 1.2 2011/01/25 22:22:13 shattered Exp $ --- contrib/ttf2pk/configure.orig 2002-11-15 01:41:24.000000000 -0800 +++ contrib/ttf2pk/configure @@ -30,12 +30,3 @@ $NetBSD: patch-ttf2pk-af,v 1.1 2006/06/17 19:41:32 minskim Exp $ if test "x$CC" = xgcc; then -@@ -3812,6 +3809,8 @@ do - _ACEOF - cat >>$CONFIG_STATUS <<_ACEOF - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) -+ # Avoid regenerating for rechecks on pkgsrc -+ exit 0 - echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion" - exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;; - _ACEOF diff --git a/mbone/vic/distinfo b/mbone/vic/distinfo index 0d9bc844807..18f2834021f 100644 --- a/mbone/vic/distinfo +++ b/mbone/vic/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2010/03/03 14:30:13 is Exp $ +$NetBSD: distinfo,v 1.15 2011/01/25 22:22:13 shattered Exp $ SHA1 (vic-2.8_ov511p0.diff.gz) = 780116733fb52058429ca7d006667e13623d008e RMD160 (vic-2.8_ov511p0.diff.gz) = 26a9c80697f3fe2650b2ed76875b9a51dd1a01d9 @@ -30,7 +30,7 @@ SHA1 (patch-au) = 46f3bee25bc2d9b983d29022ec3a86966ca07bbe SHA1 (patch-av) = 8811a912a1f166a5576ce0efdb1284941b62fa16 SHA1 (patch-aw) = 735e7cda5f1cabe312decdcf992258ac8a895f63 SHA1 (patch-ax) = 9f7ab611dc426a4f317b46803dbca218be903b10 -SHA1 (patch-ay) = c3622d5170c12ea0a0c32010ca04469b5f392201 +SHA1 (patch-ay) = adff6b6f21dc9756580322d79d215caf22f36862 SHA1 (patch-az) = dabc8adce970fda55127e6667b250b5fa5d09bdb SHA1 (patch-ba) = f982dae92237ec416cc01ced042cdfe18a57ce8d SHA1 (patch-bb) = cc92e2e1fd7d4c084f899977a2453d4622d0d461 diff --git a/mbone/vic/patches/patch-ay b/mbone/vic/patches/patch-ay index 71bd7204004..b42693e02f8 100644 --- a/mbone/vic/patches/patch-ay +++ b/mbone/vic/patches/patch-ay @@ -1,4 +1,4 @@ -$NetBSD: patch-ay,v 1.3 2010/01/25 21:14:45 is Exp $ +$NetBSD: patch-ay,v 1.4 2011/01/25 22:22:13 shattered Exp $ --- configure.orig 1996-06-24 00:59:45.000000000 +0000 +++ configure @@ -388,12 +388,3 @@ $NetBSD: patch-ay,v 1.3 2010/01/25 21:14:45 is Exp $ ;; *-*-hpux*) V_CCOPT="-O" -@@ -2347,6 +2289,8 @@ for ac_option - do - case "\$ac_option" in - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) -+ : Avoid regenerating within pkgsrc -+ exit 0 - echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" - exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; - -version | --version | --versio | --versi | --vers | --ver | --ve | --v) diff --git a/multimedia/ogle_gui/distinfo b/multimedia/ogle_gui/distinfo index aea35c93def..4a3c2bc8fee 100644 --- a/multimedia/ogle_gui/distinfo +++ b/multimedia/ogle_gui/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.4 2006/03/13 17:32:25 joerg Exp $ +$NetBSD: distinfo,v 1.5 2011/01/25 22:22:13 shattered Exp $ SHA1 (ogle_gui-0.9.2.tar.gz) = 0d73ec30852b9cd2a9714b5088f6ab6deecf097d RMD160 (ogle_gui-0.9.2.tar.gz) = a08906940019c0ced828a15b6c220b594a006a3f Size (ogle_gui-0.9.2.tar.gz) = 396673 bytes -SHA1 (patch-aa) = 27d7480d43d8c01e76ab109d438e1dc53d69e0a2 +SHA1 (patch-aa) = bb2abb026ffee34d70519d887cdbbbf13f84651a SHA1 (patch-ab) = 05916e5699a6e43f70a27a0b048b95989c4a4c69 SHA1 (patch-ac) = 2aa173ace19f55d56d9d996b74db2dd59e4e0ef2 SHA1 (patch-ad) = 2b1f900258cb5bee8d64ae4d9a0346cfe3681711 diff --git a/multimedia/ogle_gui/patches/patch-aa b/multimedia/ogle_gui/patches/patch-aa index 534a3eb1b65..53f64c9364b 100644 --- a/multimedia/ogle_gui/patches/patch-aa +++ b/multimedia/ogle_gui/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2006/03/13 17:32:26 joerg Exp $ +$NetBSD: patch-aa,v 1.3 2011/01/25 22:22:13 shattered Exp $ --- configure.orig 2003-11-05 22:02:32.000000000 +0000 +++ configure @@ -37,12 +37,3 @@ $NetBSD: patch-aa,v 1.2 2006/03/13 17:32:26 joerg Exp $ else echo "$as_me:$LINENO: checking for pthread_create" >&5 echo $ECHO_N "checking for pthread_create... $ECHO_C" >&6 -@@ -12808,6 +12808,8 @@ do - _ACEOF - cat >>$CONFIG_STATUS <<_ACEOF - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) -+ # Avoid regenerating for rechecks on pkgsrc -+ exit 0 - echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion" - exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;; - _ACEOF diff --git a/net/nagios-plugins/distinfo b/net/nagios-plugins/distinfo index 81d4b637b06..6c2cc048c7d 100644 --- a/net/nagios-plugins/distinfo +++ b/net/nagios-plugins/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.9 2009/12/15 18:59:54 bouyer Exp $ +$NetBSD: distinfo,v 1.10 2011/01/25 22:22:14 shattered Exp $ SHA1 (nagios-plugins-1.4.14.tar.gz) = b9998231f992c92b9370b62f15ac80323042f22c RMD160 (nagios-plugins-1.4.14.tar.gz) = f4e1768d84474fc4fa2b59a52efe320c7cbefb3a Size (nagios-plugins-1.4.14.tar.gz) = 1950729 bytes -SHA1 (patch-ab) = 0932ae4b165aee175f1bf268d369e71b53c54b8e +SHA1 (patch-ab) = 063bd2785d707e1daf21cbd17af04ac02cb3b224 SHA1 (patch-ad) = edd4b7312f21b7bea1b8e74d7739de684aa266ad SHA1 (patch-ae) = 0b850f7e35ceceb32597e15b2c7de10abe99a5ba SHA1 (patch-af) = 62d8c6aee75a0cefd06af98f88033f13c109fbe0 diff --git a/net/nagios-plugins/patches/patch-ab b/net/nagios-plugins/patches/patch-ab index 87b66fe033d..651587e14b3 100644 --- a/net/nagios-plugins/patches/patch-ab +++ b/net/nagios-plugins/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.5 2009/12/15 18:59:54 bouyer Exp $ +$NetBSD: patch-ab,v 1.6 2011/01/25 22:22:14 shattered Exp $ --- configure.orig 2009-09-16 10:38:03.000000000 +0200 +++ configure 2009-12-15 17:29:32.000000000 +0100 @@ -92,14 +92,3 @@ $NetBSD: patch-ab,v 1.5 2009/12/15 18:59:54 bouyer Exp $ EXTRAS="$EXTRAS check_nt" elif test -f ../plugins/check_nt.c ; then EXTRAS="$EXTRAS check_nt" -@@ -56260,6 +56260,10 @@ - case $ac_option in - # Handling of the options. - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) -+ : Avoid regenerating within pkgsrc -+ exit 0 -+ : Avoid regenerating within pkgsrc -+ exit 0 - ac_cs_recheck=: ;; - --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - echo "$ac_cs_version"; exit ;; diff --git a/net/ns/distinfo b/net/ns/distinfo index 8226a5c3e70..bc0d5e16f15 100644 --- a/net/ns/distinfo +++ b/net/ns/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2008/09/18 04:48:12 minskim Exp $ +$NetBSD: distinfo,v 1.14 2011/01/25 22:22:14 shattered Exp $ SHA1 (ns-2.33.tar.gz) = 0efd6aed45b504fcf3f125b0be00a60b87516a03 RMD160 (ns-2.33.tar.gz) = 54326b8ff4e63c0a9712c517c7ad4d9327a41d39 @@ -7,7 +7,7 @@ SHA1 (patch-aa) = 3b25eab34d7bdad7d370cea8450eb3c09c18c640 SHA1 (patch-ab) = 7c93e4540faa1b16a9e40bd063ffce510f5bc063 SHA1 (patch-ad) = 5f35152de976c2195dcff20abbe8610321dd9969 SHA1 (patch-ae) = c971d28448ae1b495119e3ec2c8de185468b9be2 -SHA1 (patch-af) = ca18b019fc5f3c9aaeb2f8085c73eb7a0afad047 +SHA1 (patch-af) = 3fece1ae7ec5ad01429224ec83a3b4df4f3083c8 SHA1 (patch-ah) = 51c36d73309d135f89f7d2362835052b304b88bd SHA1 (patch-ai) = b75f36f986ca7c833769de09e6e79f6b87c5564a SHA1 (patch-aj) = 533fa4f1bd1f8bf83882ed5ed2717511283d5ddc diff --git a/net/ns/patches/patch-af b/net/ns/patches/patch-af index eb50dedc3b5..46885179c9b 100644 --- a/net/ns/patches/patch-af +++ b/net/ns/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.8 2008/09/18 04:48:12 minskim Exp $ +$NetBSD: patch-af,v 1.9 2011/01/25 22:22:14 shattered Exp $ --- configure.orig 2008-03-31 19:00:25.000000000 -0700 +++ configure @@ -29,12 +29,3 @@ $NetBSD: patch-af,v 1.8 2008/09/18 04:48:12 minskim Exp $ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then -@@ -11052,6 +11052,8 @@ do - _ACEOF - cat >>$CONFIG_STATUS <<\_ACEOF - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) -+ : Avoid regenerating within pkgsrc -+ exit 0 - ac_cs_recheck=: ;; - --version | --vers* | -V ) - echo "$ac_cs_version"; exit 0 ;; diff --git a/shells/scsh/distinfo b/shells/scsh/distinfo index f3f24cbaafc..146cbf894e9 100644 --- a/shells/scsh/distinfo +++ b/shells/scsh/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.12 2007/02/25 01:38:30 yyamano Exp $ +$NetBSD: distinfo,v 1.13 2011/01/25 22:22:14 shattered Exp $ SHA1 (scsh-0.6.7.tar.gz) = a1eaf0d0593e14914824898a0c3ec166429affd7 RMD160 (scsh-0.6.7.tar.gz) = f017c5a157cd1a3ad5daeaecba43ce84784c7e51 Size (scsh-0.6.7.tar.gz) = 4367439 bytes SHA1 (patch-aa) = 2826391983edc5e1dc2720426bf75e1f37921092 SHA1 (patch-ab) = e796b61e4cc1c6e29f8fa0bf78a1204cb0e79cfc -SHA1 (patch-ac) = c436620e407d2bab6ecdb11393aa7d9da1ebc1bc +SHA1 (patch-ac) = a410fae673574d465591b75d14be1909cd19337a SHA1 (patch-ad) = 46825c2742f8c3f41ce6300411841fde6fa63de0 SHA1 (patch-ae) = 3838934816cf23f1975d15f3dfd3ce8fae10ee40 SHA1 (patch-af) = faddb025c3bada2d321b693217104dc986a8a90f diff --git a/shells/scsh/patches/patch-ac b/shells/scsh/patches/patch-ac index e9427ca25c9..a86742e78d3 100644 --- a/shells/scsh/patches/patch-ac +++ b/shells/scsh/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.7 2007/02/25 01:39:01 yyamano Exp $ +$NetBSD: patch-ac,v 1.8 2011/01/25 22:22:15 shattered Exp $ --- configure.orig 2006-04-20 17:17:03.000000000 +0900 +++ configure @@ -38,12 +38,3 @@ $NetBSD: patch-ac,v 1.7 2007/02/25 01:39:01 yyamano Exp $ dir=bsd echo "$as_me:$LINENO: checking for ELF" >&5 -@@ -8601,6 +8626,8 @@ do - _ACEOF - cat >>$CONFIG_STATUS <<\_ACEOF - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) -+ : Avoid regenerating within pkgsrc -+ exit 0 - ac_cs_recheck=: ;; - --version | --vers* | -V ) - echo "$ac_cs_version"; exit 0 ;; diff --git a/sysutils/strace/distinfo b/sysutils/strace/distinfo index b58d9da21db..54aaf22fe76 100644 --- a/sysutils/strace/distinfo +++ b/sysutils/strace/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2009/12/29 22:03:41 spz Exp $ +$NetBSD: distinfo,v 1.15 2011/01/25 22:22:15 shattered Exp $ SHA1 (strace-4.5.15.tar.bz2) = a6bd153eeb1a25a50bb5a1d92887a4911ec9ad48 RMD160 (strace-4.5.15.tar.bz2) = 0c6aaa8820a0985d89b21a5da9578b27435c8906 @@ -8,7 +8,7 @@ SHA1 (patch-ab) = 50367d9b603465148df29f468a29c8617b874edb SHA1 (patch-ac) = 8af13f7db2812538a4d34ddf6e15f679c92b4776 SHA1 (patch-ad) = 091b7a2b555d3e5c8d2c4f338b929c7792ea5b0b SHA1 (patch-ae) = f10bdf45432bc9a09f33f4fd94009bf9ed097a7f -SHA1 (patch-af) = 5e12fe5d4087275e889a49a63ce4d0e0b565b5d8 +SHA1 (patch-af) = 6cc8ea3dddff21d99b9b92e7535a4524a2a15a75 SHA1 (patch-ag) = 3368bd7a2fca807cc093090c6a1a9e2d3c81bfb0 SHA1 (patch-ah) = 72d6fd1cd92c22b5215f87fcf268fd375b3f7803 SHA1 (patch-ai) = 01430e21dd0e6d2e19f93fab8846a3464ee5e7a0 diff --git a/sysutils/strace/patches/patch-af b/sysutils/strace/patches/patch-af index d74d6f28374..51787a2db6f 100644 --- a/sysutils/strace/patches/patch-af +++ b/sysutils/strace/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.2 2007/04/27 19:45:01 christos Exp $ +$NetBSD: patch-af,v 1.3 2011/01/25 22:22:15 shattered Exp $ --- configure.orig 2006-01-12 06:20:14.000000000 -0500 +++ configure 2007-04-27 11:31:55.000000000 -0400 @@ -84,15 +84,6 @@ $NetBSD: patch-af,v 1.2 2007/04/27 19:45:01 christos Exp $ if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -@@ -8898,6 +8950,8 @@ - _ACEOF - cat >>$CONFIG_STATUS <<\_ACEOF - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) -+ : Avoid regenerating within pkgsrc -+ exit 0 - ac_cs_recheck=: ;; - --version | --vers* | -V ) - echo "$ac_cs_version"; exit 0 ;; @@ -9104,6 +9158,10 @@ s,@SVR4_FALSE@,$SVR4_FALSE,;t t s,@FREEBSD_TRUE@,$FREEBSD_TRUE,;t t diff --git a/textproc/jade/distinfo b/textproc/jade/distinfo index d241a2ac814..c3a3b10ac6f 100644 --- a/textproc/jade/distinfo +++ b/textproc/jade/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2008/03/15 20:29:35 joerg Exp $ +$NetBSD: distinfo,v 1.15 2011/01/25 22:22:15 shattered Exp $ SHA1 (jade-1.2.1.tar.gz) = 4326e73b7f0b865515e1bb90c622a8b2aa6ecd06 RMD160 (jade-1.2.1.tar.gz) = 615ebcc1b17a284d60a7976f13649a0ea78aa58d @@ -6,7 +6,7 @@ Size (jade-1.2.1.tar.gz) = 1092062 bytes SHA1 (jade_1.2.1-18.diff.gz) = b3d00e797239d061ef6063b44e9d3e14055da940 RMD160 (jade_1.2.1-18.diff.gz) = c2e9dc256b0c95a6c5e43142537e40b92ebe1df3 Size (jade_1.2.1-18.diff.gz) = 121329 bytes -SHA1 (patch-aa) = b24b6fba1e52428d0d93d0235d92f2397113fa78 +SHA1 (patch-aa) = 65c8f88d6b61851c1c5b1a4da52378bf7330677f SHA1 (patch-ab) = 1742175ec89ea8e796b4e874a488225850cf78e1 SHA1 (patch-ac) = c96ca44b40bbcc9c588dfe40045f4d386e32998d SHA1 (patch-ad) = 7d3ef2dfc7d0a2b0f7b040d1fa36c9f17143647d diff --git a/textproc/jade/patches/patch-aa b/textproc/jade/patches/patch-aa index c9180283dc6..2ba77bb296d 100644 --- a/textproc/jade/patches/patch-aa +++ b/textproc/jade/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2006/01/20 11:36:18 jmmv Exp $ +$NetBSD: patch-aa,v 1.4 2011/01/25 22:22:16 shattered Exp $ --- configure.orig 2006-01-19 21:35:56.000000000 +0100 +++ configure @@ -57,14 +57,3 @@ $NetBSD: patch-aa,v 1.3 2006/01/20 11:36:18 jmmv Exp $ # Check whether --enable-http or --disable-http was given. if test "${enable_http+set}" = set; then enableval="$enable_http" -@@ -2609,6 +2630,10 @@ for ac_option - do - case "\$ac_option" in - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) -+ # Avoid regenerating for rechecks on pkgsrc -+ exit 0 -+ # Avoid regenerating for rechecks on pkgsrc -+ exit 0 - echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" - exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; - -version | --version | --versio | --versi | --vers | --ver | --ve | --v) -- cgit v1.2.3