 @@ -1,56 +1,56 @@
-$NetBSD: distinfo,v 1.26 2013/07/05 13:46:13 ryoon Exp $
+$NetBSD: distinfo,v 1.27 2013/07/05 13:47:02 ryoon Exp $
 SHA1 (emacs-20.7-mule-4.1b-elc.tar.gz) = 3894fb2b81bb326545f6ccc3bf0a8405c23004ff
 RMD160 (emacs-20.7-mule-4.1b-elc.tar.gz) = c675b31dafaa4321a453af9d87eddf051ee71b1f
 Size (emacs-20.7-mule-4.1b-elc.tar.gz) = 70474 bytes
 SHA1 (emacs-20.7-mule-4.1b.patch) = 2c5538198a4d032a9e987d810fe5c26407d968eb
 RMD160 (emacs-20.7-mule-4.1b.patch) = ffb90549dad55edef3042a2d68fd29d78b9cb500
 Size (emacs-20.7-mule-4.1b.patch) = 79729 bytes
 SHA1 (emacs-20.7.tar.gz) = ef0168b927fb633bc9b14e2249431f26ff8b8452
 RMD160 (emacs-20.7.tar.gz) = f3b8ea8d6f6ad52ccdd7ca74c84e87a7409fc270
 Size (emacs-20.7.tar.gz) = 15043428 bytes
 SHA1 (emacs20-jumbo-patch-20121210.gz) = 8a403fafe381178e7a982f68e9878f9d4746203f
 RMD160 (emacs20-jumbo-patch-20121210.gz) = d5e74b66bcbb517477a720ce3b4ba393d06fb3bb
 Size (emacs20-jumbo-patch-20121210.gz) = 2252 bytes
 SHA1 (emacs20-xim-20000713.diff) = 5bed39e7b8a52941f77088529566aaa3bcf06670
 RMD160 (emacs20-xim-20000713.diff) = 5887a4d43ee92e8cad65d6412c9ecbce08e781da
 Size (emacs20-xim-20000713.diff) = 21296 bytes
 SHA1 (patch-aa) = 3b3fd76c058a0a46e0458338ce4c2327a238fb3d
-SHA1 (patch-ab) = 8d44e22ef5486669a35cb14082b5cec90853299b
+SHA1 (patch-ab) = 64ab9316db91b429234ec651e8574aedd2f92ca9
 SHA1 (patch-ac) = abf5971279a8d875504be4c17b8d36cb8cc24885
 SHA1 (patch-ad) = dd21028a6360ccfb442ecced4c67717f60ea78a6
 SHA1 (patch-ae) = 465c7aff1fbb23d08ff8100993041291a9502f34
 SHA1 (patch-af) = e7e65a2df5d55bf5bfa9dd8155b906882f620cca
 SHA1 (patch-ag) = 14469c8907ea09395031594e7e0d0fe967b915d9
 SHA1 (patch-ah) = 669ce7d4d2d9d15f423b94a996c0aa92b8a0d455
 SHA1 (patch-ai) = e75ca87ba6bad1eab37cfbc99753d368fb95565d
 SHA1 (patch-aj) = 6da7cd5925eafbfdcca14d29ae5d851e8099f256
 SHA1 (patch-ak) = 24da025fe031da0e8f2eace8c2dd10acf7f7c82c
 SHA1 (patch-al) = 0459e7a206bbb5f0e591111d2ed3cde97038a2ec
 SHA1 (patch-am) = 12667ef175d1108aa3d207d92eba0f20de9d6ae3
 SHA1 (patch-ao) = bd9808c0b8026508699ebb55db8bc766bd54e193
 SHA1 (patch-ax) = 572eed7ad29d0b2a2e82e53c1acdfab39c12b1b2
 SHA1 (patch-ay) = bc91b0759ce0b3f3c1be542c043748472cb8d8fc
 SHA1 (patch-az) = 643f927b726d825238b14cd6a4b70e3a0722104e
 SHA1 (patch-ba) = 9832a8c5afecc1f0b0805c78142afa62a31bc24f
 SHA1 (patch-bb) = 2b5df93c18a2baabed0d2a878242e1fa30647167
 SHA1 (patch-bc) = ce6240227e8a7af506c908e0c199e17ce73d7f27
 SHA1 (patch-bd) = 01c4490ec36fec09148bcb9c76ba6c8de509c346
 SHA1 (patch-bf) = 089ac290cbbe5c060e5300ea3ffacf8cb5ab5254
 SHA1 (patch-bg) = bf979ed89e0d8d29bd411711a69d74cd139d8fa8
 SHA1 (patch-bh) = f59b14cc43d5977a5d80d5d1ab4e246df394d86a
 SHA1 (patch-bi) = d97512603b313ee730687e3b5680d45002ade51c
 SHA1 (patch-bj) = 6dba88723ee632b67fcf6a2dd2918e69034837e2
 SHA1 (patch-bl) = f2cd03713d7cdb6cb41119569031249d7d708b13
 SHA1 (patch-bm) = 2f00f63120a90477c6f5c63ac6ca23fc508b9e54
 SHA1 (patch-bp) = 7b9ad94ac9d09fbb2173fdd3efd04faa0a668a91
 SHA1 (patch-br) = c14d33970609c65a22944514bc5b133d024b062e
 SHA1 (patch-bs) = d588828d66a4aa1f18a7df74bb1527e45b9c9d2a
 SHA1 (patch-bt) = 29c8049c6dcd780190774173a1c64c7009685c92
 SHA1 (patch-bx) = 27713e1812240f9ed137aa793cbb5a4fa2cad33b
 SHA1 (patch-ca) = e9c9929ea5f16ac9f4bec09f2bf8e4e28578702d
 SHA1 (patch-cc) = 2b474603b922383b6d239e7e2e14f144bd52df6b
 SHA1 (patch-cd) = 22b29708e0730275984dc2d8e7a304932d6b66fb
 SHA1 (patch-ce) = df4d2a5639a72d2c719662496f17db35686f4ac2
 SHA1 (patch-cf) = 1b5b83eb02872414fd7ca29c344c0560feaf1b7e
 SHA1 (patch-cg) = b2bd4cbff399922e44ad54459255ffb1d61e1bd4

 @@ -1,270 +1,273 @@
-$NetBSD: patch-ab,v 1.6 2013/07/05 13:46:13 ryoon Exp $
+$NetBSD: patch-ab,v 1.7 2013/07/05 13:47:02 ryoon Exp $
 Caution: the extra cpp checking (the three hunks containing "Should be
 one line") is manually hacked and not reflected in configure.in; do
 not regenerate configure with autoconf without merging it. This
 checking is required because somewhere between gcc 4.1 and 4.5 cpp
 started doing regrettable things with backslash-escaped newlines.
 * Fix build on NetBSD 6.99.23, gcc -E -traditional-cpp with native X
   results syntax error. Use -traditional-cpp for Makefile generation only.
 --- configure.orig	2000-06-12 20:05:56.000000000 +0000
 +++ configure
 @@ -20,6 +20,8 @@ ac_help="$ac_help
  ac_help="$ac_help
    --with-x-toolkit=KIT    use an X toolkit (KIT = yes/lucid/athena/motif/no)"
  ac_help="$ac_help
 +  --with-ipv6             support IPv6 stack"
 +ac_help="$ac_help
    --with-x                use the X Window System"
  # Initialize some variables set by options.
 @@ -584,6 +586,12 @@ Currently, \`yes', \`athena' and \`lucid
  fi
 +# Check whether --with-ipv6 or --without-ipv6 was given.
 +if test "${with_ipv6+set}" = set; then
 +  withval="$with_ipv6"
 +  :
 +fi
++
  #### Make srcdir absolute, if it isn't already.  It's important to
  #### avoid running the path through pwd unnecessary, since pwd can
 @@ -712,15 +720,20 @@ case "${canonical}" in
      opsys=netbsd
      case "${canonical}" in
        alpha*-*-netbsd*)	machine=alpha ;;
 +      hppa*-*-netbsd*)	machine=hp800 ;;
        i[3456]86-*-netbsd*) machine=intel386 ;;
        m68k-*-netbsd*)
  			# This is somewhat bogus.
  			machine=hp9000s300 ;;
 -      powerpc-apple-netbsd*) machine=macppc ;;
        mips-*-netbsd*)	machine=pmax ;;
 +      mipsel-*-netbsd*)	machine=pmax ;;
 +      mipsev-*-netbsd*)	machine=mips ;;		# HF: what else?
        ns32k-*-netbsd*)	machine=ns32000 ;;
 -      sparc-*-netbsd*)	machine=sparc ;;
 +      powerpc-*-netbsd*) machine=macppc ;;
 +      sparc*-*-netbsd*)	machine=sparc ;;
        vax-*-netbsd*)	machine=vax ;;
 +      arm*-*-netbsd*)	machine=arm ;;
 +      x86_64-*-netbsd*)	machine=amd64 ;;
      esac
    ;;
 @@ -1519,6 +1532,7 @@ case "${canonical}" in
        *-sysv4.2uw* )	  	opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
        *-386bsd* )	        opsys=386bsd ;;
        *-freebsd* )	        opsys=freebsd ;;
 +      *-dragonfly* )		opsys=dragonfly ;;
        *-nextstep* )             opsys=nextstep ;;
        ## Otherwise, we'll fall through to the generic opsys code at the bottom.
      esac
 @@ -1916,15 +1930,20 @@ else
    CPP="${CC-cc} -E"
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp.
 +  # And, gcc 4.5? and up does not preserve escaped newlines, which is
 +  # fatal for preprocessing makefiles.
    cat > conftest.$ac_ext <<EOF
  #line 1921 "configure"
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
 +Should be one line.
  EOF
 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 +ac_try="$ac_cpp conftest.$ac_ext >conftest2.out 2>conftest.out"
  { (eval echo configure:1927: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"; \
 +    grep -L "Should  *be one line" conftest2.out \
 +    `
  if test -z "$ac_err"; then
+   :
  else
 @@ -1932,16 +1951,19 @@ else
    echo "configure: failed program was:" >&5
    cat conftest.$ac_ext >&5
    rm -rf conftest*
 -  CPP="${CC-cc} -E -traditional-cpp"
 +  CPP="${CC-cc} -E"
    cat > conftest.$ac_ext <<EOF
  #line 1938 "configure"
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
 +Should be one line.
  EOF
 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 +ac_try="$ac_cpp conftest.$ac_ext >conftest2.out 2>conftest.out"
  { (eval echo configure:1944: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"; \
 +    grep -L "Should  *be one line" conftest2.out \
 +    `
  if test -z "$ac_err"; then
+   :
  else
 @@ -1955,10 +1977,13 @@ else
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
 +Should be one line.
  EOF
 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 +ac_try="$ac_cpp conftest.$ac_ext >conftest2.out 2>conftest.out"
  { (eval echo configure:1961: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"; \
 +    grep -L "Should  *be one line" conftest2.out \
 +    `
  if test -z "$ac_err"; then
+   :
  else
 @@ -3823,6 +3848,53 @@ else
    echo "$ac_t""no" 1>&6
  fi
 +  if test x$HAVE_X11XTR6 = xyes; then
 +    LIBS="$LIBS -lXpm"
 +    echo $ac_n "checking for XawPixmapsInitialize in -lXaw""... $ac_c" 1>&6
 +echo "configure:3842: checking for XawPixmapsInitialize in -lXaw" >&5
 +ac_lib_var=`echo Xaw'_'XawPixmapsInitialize | sed 'y%./+-%__p_%'`
 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
 +  echo $ac_n "(cached) $ac_c" 1>&6
 +else
 +  ac_save_LIBS="$LIBS"
 +LIBS="-lXaw  $LIBS"
 +cat > conftest.$ac_ext <<EOF
 +#line 3850 "configure"
 +#include "confdefs.h"
 +/* Override any gcc2 internal prototype to avoid an error.  */
 +/* We use char because int might match the return type of a gcc2
 +    builtin and then its argument prototype would still apply.  */
 +char XawPixmapsInitialize();
++
 +int main() {
 +XawPixmapsInitialize()
 +; return 0; }
 +EOF
 +if { (eval echo configure:3861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 +  rm -rf conftest*
 +  eval "ac_cv_lib_$ac_lib_var=yes"
 +else
 +  echo "configure: failed program was:" >&5
 +  cat conftest.$ac_ext >&5
 +  rm -rf conftest*
 +  eval "ac_cv_lib_$ac_lib_var=no"
 +fi
 +rm -f conftest*
 +LIBS="$ac_save_LIBS"
++
 +fi
 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
 +  echo "$ac_t""yes" 1>&6
 +   LIBXPM="-lXpm"
 +else
 +  echo "$ac_t""no" 1>&6
 + LIBXPM=""
 +fi
++
 +  else
 +    LIBXPM=""
 +  fi
++
    LIBS="$OLDLIBS"
  fi
 @@ -4906,6 +4978,64 @@ EOF
  fi
 +if test "x$with_ipv6" = xyes; then
 +  for ac_func in getaddrinfo
 +do
 +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 +echo "configure:4973: 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 4978 "configure"
 +#include "confdefs.h"
 +/* System header to define __stub macros and hopefully few prototypes,
 +    which can conflict with char $ac_func(); below.  */
 +#include <assert.h>
 +/* Override any gcc2 internal prototype to avoid an error.  */
 +/* We use char because int might match the return type of a gcc2
 +    builtin and then its argument prototype would still apply.  */
 +char $ac_func();
++
 +int main() {
++
 +/* The GNU C library defines this for functions which it implements
 +    to always fail with ENOSYS.  Some functions are actually named
 +    something starting with __ and the normal name is an alias.  */
 +#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 +choke me
 +#else
 +$ac_func();
 +#endif
++
 +; return 0; }
 +EOF
 +if { (eval echo configure:5001: \"$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
 +  echo "configure: failed program was:" >&5
 +  cat conftest.$ac_ext >&5
 +  rm -rf conftest*
 +  eval "ac_cv_func_$ac_func=no"
 +fi
 +rm -f conftest*
 +fi
++
 +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
 +  echo "$ac_t""yes" 1>&6
 +    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
 +  cat >> confdefs.h <<EOF
 +#define $ac_tr_func 1
 +EOF
++
 +else
 +  echo "$ac_t""no" 1>&6
 +fi
 +done
++
 +fi
++
  # Set up the CFLAGS for real compilation, so we can substitute it.
  CFLAGS="$REAL_CFLAGS"
 @@ -5211,6 +5345,7 @@ s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
  s%@INSTALL_DATA@%$INSTALL_DATA%g
  s%@YACC@%$YACC%g
  s%@SET_MAKE@%$SET_MAKE%g
 +s%@LIBXPM@%$LIBXPM%g
  s%@ALLOCA@%$ALLOCA%g
  s%@version@%$version%g
  s%@configuration@%$configuration%g
 @@ -5480,7 +5615,7 @@ echo creating lib-src/Makefile
    sed -e '1,/start of cpp stuff/d'\
        -e 's@/\*\*/#\(.*\)$@/* \1 */@' \
        < Makefile.c > junk.c
 -  $CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \
 +  $CPP -traditional-cpp $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \
        sed -e 's/^ /	/' -e '/^#/d' -e '/^[ 	]*$/d' > junk2.c
    cat junk1.c junk2.c > Makefile.new
    rm -f junk.c junk1.c junk2.c
 @@ -5496,7 +5631,7 @@ echo creating src/Makefile
    sed -e '1,/start of cpp stuff/d'\
        -e 's@/\*\*/#\(.*\)$@/* \1 */@' \
        < Makefile.c > junk.c
 -  $CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \
 +  $CPP -traditional-cpp $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \
        sed -e 's/^ /	/' -e '/^#/d' -e '/^[ 	]*$/d' > junk2.c
    cat junk1.c junk2.c > Makefile.new
    rm -f junk.c junk1.c junk2.c