Tweak this so it should configure (and then hopefully build) on PA-RISC

on NetBSD. Tangentially related to PR 35235.

3 files changed, 29 insertions, 15 deletions

diff --git a/editors/emacs20/distinfo b/editors/emacs20/distinfo
index 247904f6c24..a278216e83f 100644
--- a/editors/emacs20/distinfo
+++ b/editors/emacs20/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2012/03/05 03:50:44 dholland Exp $
+$NetBSD: distinfo,v 1.24 2012/03/05 07:29:36 dholland Exp $
 
 SHA1 (emacs-20.7-mule-4.1b-elc.tar.gz) = 3894fb2b81bb326545f6ccc3bf0a8405c23004ff
 RMD160 (emacs-20.7-mule-4.1b-elc.tar.gz) = c675b31dafaa4321a453af9d87eddf051ee71b1f
@@ -13,7 +13,7 @@ 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) = 2ef7b4d9c7a192ebd00efc85f94d8e7d116cf0b7
+SHA1 (patch-ab) = ef808bd29242e1a2471103d9b66cbec56a0368b9
 SHA1 (patch-ac) = abf5971279a8d875504be4c17b8d36cb8cc24885
 SHA1 (patch-ad) = dd21028a6360ccfb442ecced4c67717f60ea78a6
 SHA1 (patch-ae) = 465c7aff1fbb23d08ff8100993041291a9502f34
@@ -41,7 +41,7 @@ SHA1 (patch-bb) = 2b5df93c18a2baabed0d2a878242e1fa30647167
 SHA1 (patch-bc) = ce6240227e8a7af506c908e0c199e17ce73d7f27
 SHA1 (patch-bd) = 01c4490ec36fec09148bcb9c76ba6c8de509c346
 SHA1 (patch-bf) = 089ac290cbbe5c060e5300ea3ffacf8cb5ab5254
-SHA1 (patch-bg) = f76d459f0fbcadb0b7df4991c1d5d244accc0748
+SHA1 (patch-bg) = bf979ed89e0d8d29bd411711a69d74cd139d8fa8
 SHA1 (patch-bh) = f59b14cc43d5977a5d80d5d1ab4e246df394d86a
 SHA1 (patch-bi) = d97512603b313ee730687e3b5680d45002ade51c
 SHA1 (patch-bj) = 6dba88723ee632b67fcf6a2dd2918e69034837e2
diff --git a/editors/emacs20/patches/patch-ab b/editors/emacs20/patches/patch-ab
index 2e75c1a8c1f..d74b77063a8 100644
--- a/editors/emacs20/patches/patch-ab
+++ b/editors/emacs20/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.4 2011/12/01 04:05:41 dholland Exp $
+$NetBSD: patch-ab,v 1.5 2012/03/05 07:29:36 dholland Exp $
 
 Caution: the extra cpp checking (the three hunks containing "Should be
 one line") is manually hacked and not reflected in configure.in; do
@@ -30,9 +30,16 @@ started doing regrettable things with backslash-escaped newlines.
  
  #### Make srcdir absolute, if it isn't already.  It's important to
  #### avoid running the path through pwd unnecessary, since pwd can
-@@ -718,9 +726,14 @@ case "${canonical}" in
+@@ -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 ;;
+-      powerpc-apple-netbsd*) machine=macppc ;;
        mips-*-netbsd*)	machine=pmax ;;
 +      mipsel-*-netbsd*)	machine=pmax ;;
 +      mipsev-*-netbsd*)	machine=mips ;;		# HF: what else?
@@ -231,7 +238,7 @@ started doing regrettable things with backslash-escaped newlines.
  # Set up the CFLAGS for real compilation, so we can substitute it.
  CFLAGS="$REAL_CFLAGS"
  
-@@ -5211,6 +5346,7 @@ s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
+@@ -5211,6 +5344,7 @@ s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
  s%@INSTALL_DATA@%$INSTALL_DATA%g
  s%@YACC@%$YACC%g
  s%@SET_MAKE@%$SET_MAKE%g
diff --git a/editors/emacs20/patches/patch-bg b/editors/emacs20/patches/patch-bg
index 110f4cc8e6a..60c91f382bb 100644
--- a/editors/emacs20/patches/patch-bg
+++ b/editors/emacs20/patches/patch-bg
@@ -1,8 +1,8 @@
-$NetBSD: patch-bg,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+$NetBSD: patch-bg,v 1.2 2012/03/05 07:29:36 dholland Exp $
 
---- configure.in.orig	Mon Jun  5 17:42:49 2000
-+++ configure.in	Tue Oct 22 15:59:01 2002
-@@ -66,6 +66,8 @@
+--- configure.in.orig	2000-06-05 15:42:49.000000000 +0000
++++ configure.in
+@@ -66,6 +66,8 @@ Currently, \`yes', \`athena' and \`lucid
  	  esac
  	  with_x_toolkit=$val
  ])
@@ -11,9 +11,16 @@ $NetBSD: patch-bg,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  
  #### Make srcdir absolute, if it isn't already.  It's important to
  #### avoid running the path through pwd unnecessary, since pwd can
-@@ -158,9 +160,13 @@
+@@ -152,15 +154,19 @@ 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 ;;
+-      powerpc-apple-netbsd*) machine=macppc ;;
        mips-*-netbsd*)	machine=pmax ;;
 +      mipsel-*-netbsd*)	machine=pmax ;;
 +      mipsev-*-netbsd*)	machine=mips ;;		# HF: what else?
@@ -26,7 +33,7 @@ $NetBSD: patch-bg,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
      esac
    ;;
  
-@@ -1594,6 +1600,14 @@
+@@ -1594,6 +1600,14 @@ dnl tranle@intellicorp.com says libXmu.a
      LIBS="-lXt $LIBS"
    fi
    AC_CHECK_LIB(Xmu, XmuConvertStandardSelection)
@@ -41,7 +48,7 @@ $NetBSD: patch-bg,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    LIBS="$OLDLIBS"
  fi
  
-@@ -1747,6 +1761,10 @@
+@@ -1747,6 +1761,10 @@ if test -f /usr/lpp/X11/bin/smt.exp; the
    AC_DEFINE(HAVE_AIX_SMT_EXP)
  fi