pkg/36166: emacs build fails on i386/Darwin (patch incl.)

[Tom Yu <tlyu%MIT.EDU@localhost>]

        Note: There was a bad value `sw' for the field `Class'.
        It was set to the default value of `sw-bug'.

>Number:         36166
>Category:       pkg
>Synopsis:       emacs build fails on i386/Darwin (patch incl.)
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue Apr 17 23:15:00 +0000 2007
>Originator:     Tom Yu
>Release:        pkgsrc trunk ~ 20070407
>Organization:

>Environment:
System: Darwin jacobs-ladder.dyn.mit.edu 8.9.1 Darwin Kernel Version 8.9.1: Thu 
Feb 22 20:55:00 PST 2007; root:xnu-792.18.15~1/RELEASE_I386 i386 i386
Architecture: i386
>Description:
        [This is a re-send via e-mail due to the web form apparently
        eating my previous attempt.]

        Attempting to build editors/emacs on an Intel Mac fails due to
        the configure script's lack of knowledge about Intel machines
        running Darwin.  Educating the configure script results in a
        later build failure when attempting to create an undumpable
        emacs.

>How-To-Repeat:
        Attempt to build editors/emacs on a (Intel) MacBook Pro
        running Mac OS X 10.4.9.
>Fix:
        Teach configure script to recognize i386-apple-darwin*; mark
        i386/Darwin as being unable to dump.  Proposed patch below:

Index: editors/emacs/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/editors/emacs/distinfo,v
retrieving revision 1.33
diff -u -r1.33 distinfo
--- editors/emacs/distinfo      24 Mar 2007 01:30:50 -0000      1.33
+++ editors/emacs/distinfo      17 Apr 2007 22:27:36 -0000
@@ -4,13 +4,14 @@
 RMD160 (emacs-21.4a.tar.gz) = c312e739935b56d08783bbfe97992297a363cb8a
 Size (emacs-21.4a.tar.gz) = 20403483 bytes
 SHA1 (patch-aa) = fee6fe91fb9a2f75300903cc5c6e023bb8de6be5
-SHA1 (patch-ab) = 9304a3fe06ab5bcdad4401fd570a1794b7da818f
+SHA1 (patch-ab) = 8658a6718aaf1d0c2565a2cf7fdaa5896ad0d7b7
 SHA1 (patch-ac) = a2de7619fece50cb42b0e23b1651b5bf742ff69a
 SHA1 (patch-ad) = 39a11bc214ae3d2f9d634c30b196a46d473ab92f
 SHA1 (patch-ae) = e2b66b23efb90608470aef5ebd0c75e27bcd6b55
 SHA1 (patch-af) = 821e0c3cce819ce11f393ce5f498f13d652e4d94
 SHA1 (patch-ag) = 3d64c0d53e3a8a737eeb04a6080a92a826b73620
 SHA1 (patch-ah) = 6cd1b122b370ee7110e096088a132cd420356714
+SHA1 (patch-ai) = 5edd796ab19852df4fd5a5c20a58d1bedc06997d
 SHA1 (patch-aj) = 7f28335b3da583e5cef9e527cd1f9d4b0d92faa7
 SHA1 (patch-ak) = c37ecdcb1e0b0211b15baa7100dd43eab3f0830b
 SHA1 (patch-am) = 7109d3a5cf1470e11e33abe97297cde24cf0ec91
Index: editors/emacs/patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/editors/emacs/patches/patch-ab,v
retrieving revision 1.23
diff -u -r1.23 patch-ab
--- editors/emacs/patches/patch-ab      6 Jun 2006 16:23:17 -0000       1.23
+++ editors/emacs/patches/patch-ab      17 Apr 2007 22:27:36 -0000
@@ -1,8 +1,8 @@
 $NetBSD: patch-ab,v 1.23 2006/06/06 16:23:17 minskim Exp $
 
---- configure.orig     2003-03-18 14:19:12.000000000 +0000
+--- configure.orig     2003-03-18 09:19:12.000000000 -0500
 +++ configure
-@@ -822,9 +822,15 @@ case "${canonical}" in
+@@ -822,9 +822,17 @@ case "${canonical}" in
        sparc*-*-netbsd*)       machine=sparc ;;
        vax-*-netbsd*)  machine=vax ;;
        arm-*-netbsd*)  machine=arm ;;
@@ -15,10 +15,12 @@
 +  ## Darwin / Mac OS X
 +  powerpc-apple-darwin* )
 +    machine=powermac opsys=darwin ;;
++  i386-apple-darwin* )
++    machine=intel386 opsys=darwin ;;
    ## OpenBSD ports
    *-*-openbsd* )
      opsys=openbsd
-@@ -909,6 +915,10 @@ case "${canonical}" in
+@@ -909,6 +917,10 @@ case "${canonical}" in
      machine=macppc opsys=gnu-linux
    ;;
  
@@ -29,7 +31,7 @@
    ## Altos 3068
    m68*-altos-sysv* )
      machine=altos opsys=usg5-2
-@@ -1659,6 +1669,7 @@ case "${canonical}" in
+@@ -1659,6 +1671,7 @@ case "${canonical}" in
        *-sysv4.2uw* )          opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
        *-386bsd* )             opsys=386bsd ;;
        *-freebsd* )            opsys=freebsd ;;
@@ -37,7 +39,7 @@
        *-nextstep* )             opsys=nextstep ;;
        ## Otherwise, we'll fall through to the generic opsys code at the 
bottom.
      esac
-@@ -9124,6 +9135,22 @@ EOF
+@@ -9124,6 +9137,22 @@ EOF
  fi
  
  
Index: editors/emacs/patches/patch-ai
===================================================================
RCS file: editors/emacs/patches/patch-ai
diff -N editors/emacs/patches/patch-ai
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ editors/emacs/patches/patch-ai      17 Apr 2007 22:27:36 -0000
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/m/intel386.h.orig      1997-08-30 03:18:39.000000000 -0400
++++ src/m/intel386.h
+@@ -239,3 +239,7 @@ NOTE-END */
+ 
+ #define SEGMENT_MASK ((SEGMENT_SIZE)-1)
+ #endif
++
++#ifdef MAC_OSX
++#define CANNOT_DUMP
++#endif