[pkgsrc/trunk]: pkgsrc/x11/gdm1 Simplify configure patching by removing large...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/798241def493
branches:  trunk
changeset: 477465:798241def493
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Sat Jul 03 10:22:38 2004 +0000

description:
Simplify configure patching by removing large (useless) chunks.  Also avoid
patching configure.in; the few changes in configure do not need to be done
by re-running autoconf.

diffstat:

 x11/gdm1/distinfo         |    5 +-
 x11/gdm1/patches/patch-aa |  855 +---------------------------------------------
 x11/gdm1/patches/patch-ag |   22 -
 3 files changed, 8 insertions(+), 874 deletions(-)

diffs (truncated from 919 to 300 lines):

diff -r b5af5dedb845 -r 798241def493 x11/gdm1/distinfo
--- a/x11/gdm1/distinfo Sat Jul 03 10:18:39 2004 +0000
+++ b/x11/gdm1/distinfo Sat Jul 03 10:22:38 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/01/20 13:33:08 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2004/07/03 10:22:38 jmmv Exp $
 
 SHA1 (gdm-2.2.0.tar.gz) = 135b424cc1493f92b500c4fe7d85e9ada57313e1
 Size (gdm-2.2.0.tar.gz) = 810976 bytes
@@ -6,12 +6,11 @@
 Size (Daemon.README) = 2191 bytes
 SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d
 Size (Daemon.png) = 15725 bytes
-SHA1 (patch-aa) = 53fed25b228d9c021b8134d4257ad86efbcd9055
+SHA1 (patch-aa) = e05abb384dba1ce0a8094687d15a6d8f3ed8f886
 SHA1 (patch-ab) = 944f67fd37460172b7b434ec5f3cc4ad31d3eff1
 SHA1 (patch-ac) = 32361628caef6cd0f1f50318a0b3f76249f6b76c
 SHA1 (patch-ae) = 1af3691044028dcf75b7eac9aa20563b7cc152d5
 SHA1 (patch-af) = b1e863e414de026e77eb0f24810d7aa811011c15
-SHA1 (patch-ag) = 8f3c68f79f6bbea798c6dbbd045ffd64a6abb720
 SHA1 (patch-ah) = c5f5d5456945a8a2e27c12a811e257195b67b93a
 SHA1 (patch-ai) = ae0181bc4b6f4c554b564744f410b7899dc8b7e6
 SHA1 (patch-ba) = 35e1ac11945b2e72270fcf2fb5be60e3168a48d9
diff -r b5af5dedb845 -r 798241def493 x11/gdm1/patches/patch-aa
--- a/x11/gdm1/patches/patch-aa Sat Jul 03 10:18:39 2004 +0000
+++ b/x11/gdm1/patches/patch-aa Sat Jul 03 10:22:38 2004 +0000
@@ -1,656 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/01/20 13:33:13 xtraeme Exp $
+$NetBSD: patch-aa,v 1.2 2004/07/03 10:22:38 jmmv Exp $
 
---- configure.orig     Tue Mar 13 01:23:59 2001
-+++ configure  Tue Oct 22 21:25:03 2002
-@@ -3008,14 +3008,18 @@
- 
- 
- 
-+
-+
-+
-+
- ALL_LINGUAS="az ca cs da de el es et fi fr ga gl hu it ja ko lt nl nn no pl pt_BR ro ru sk sl sv tr uk zh_CN.GB2312 zh_TW.Big5"
- echo $ac_n "checking for working const""... $ac_c" 1>&6
--echo "configure:3014: checking for working const" >&5
-+echo "configure:3018: checking for working const" >&5
- if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3019 "configure"
-+#line 3023 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -3064,7 +3068,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:3068: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_c_const=yes
- else
-@@ -3085,7 +3089,7 @@
- fi
- 
- echo $ac_n "checking for inline""... $ac_c" 1>&6
--echo "configure:3089: checking for inline" >&5
-+echo "configure:3093: checking for inline" >&5
- if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3092,7 +3096,7 @@
-   ac_cv_c_inline=no
- for ac_kw in inline __inline__ __inline; do
-   cat > conftest.$ac_ext <<EOF
--#line 3096 "configure"
-+#line 3100 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -3099,7 +3103,7 @@
- } $ac_kw foo() {
- ; return 0; }
- EOF
--if { (eval echo configure:3103: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3107: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_c_inline=$ac_kw; break
- else
-@@ -3125,12 +3129,12 @@
- esac
- 
- echo $ac_n "checking for off_t""... $ac_c" 1>&6
--echo "configure:3129: checking for off_t" >&5
-+echo "configure:3133: checking for off_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3134 "configure"
-+#line 3138 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -3158,12 +3162,12 @@
- fi
- 
- echo $ac_n "checking for size_t""... $ac_c" 1>&6
--echo "configure:3162: checking for size_t" >&5
-+echo "configure:3166: checking for size_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3167 "configure"
-+#line 3171 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -3193,12 +3197,12 @@
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments.  Useless!
- echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
--echo "configure:3197: checking for working alloca.h" >&5
-+echo "configure:3201: checking for working alloca.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3202 "configure"
-+#line 3206 "configure"
- #include "confdefs.h"
- #include <alloca.h>
- int main() {
-@@ -3205,7 +3209,7 @@
- char *p = alloca(2 * sizeof(int));
- ; return 0; }
- EOF
--if { (eval echo configure:3209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   ac_cv_header_alloca_h=yes
- else
-@@ -3226,12 +3230,12 @@
- fi
- 
- echo $ac_n "checking for alloca""... $ac_c" 1>&6
--echo "configure:3230: checking for alloca" >&5
-+echo "configure:3234: checking for alloca" >&5
- if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3235 "configure"
-+#line 3239 "configure"
- #include "confdefs.h"
- 
- #ifdef __GNUC__
-@@ -3259,7 +3263,7 @@
- char *p = (char *) alloca(1);
- ; return 0; }
- EOF
--if { (eval echo configure:3263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   ac_cv_func_alloca_works=yes
- else
-@@ -3291,12 +3295,12 @@
- 
- 
- echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
--echo "configure:3295: checking whether alloca needs Cray hooks" >&5
-+echo "configure:3299: checking whether alloca needs Cray hooks" >&5
- if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3300 "configure"
-+#line 3304 "configure"
- #include "confdefs.h"
- #if defined(CRAY) && ! defined(CRAY2)
- webecray
-@@ -3321,12 +3325,12 @@
- if test $ac_cv_os_cray = yes; then
- for ac_func in _getb67 GETB67 getb67; do
-   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:3325: checking for $ac_func" >&5
-+echo "configure:3329: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3330 "configure"
-+#line 3334 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -3349,7 +3353,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:3353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -3376,7 +3380,7 @@
- fi
- 
- echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
--echo "configure:3380: checking stack direction for C alloca" >&5
-+echo "configure:3384: checking stack direction for C alloca" >&5
- if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3384,7 +3388,7 @@
-   ac_cv_c_stack_direction=0
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3388 "configure"
-+#line 3392 "configure"
- #include "confdefs.h"
- find_stack_direction ()
- {
-@@ -3403,7 +3407,7 @@
-   exit (find_stack_direction() < 0);
- }
- EOF
--if { (eval echo configure:3407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:3411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   ac_cv_c_stack_direction=1
- else
-@@ -3428,17 +3432,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:3432: checking for $ac_hdr" >&5
-+echo "configure:3436: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3437 "configure"
-+#line 3441 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:3442: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:3446: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -3467,12 +3471,12 @@
- for ac_func in getpagesize
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:3471: checking for $ac_func" >&5
-+echo "configure:3475: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3476 "configure"
-+#line 3480 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -3495,7 +3499,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:3499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -3520,7 +3524,7 @@
- done
- 
- echo $ac_n "checking for working mmap""... $ac_c" 1>&6
--echo "configure:3524: checking for working mmap" >&5
-+echo "configure:3528: checking for working mmap" >&5
- if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3528,7 +3532,7 @@
-   ac_cv_func_mmap_fixed_mapped=no
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3532 "configure"
-+#line 3536 "configure"
- #include "confdefs.h"
- 
- /* Thanks to Mike Haertel and Jim Avera for this test.
-@@ -3668,7 +3672,7 @@
- }
- 
- EOF