pkg/47901: [PATCH] editors/emacs-snapshot 20130603

[makoto%ki.nu@localhost]

>Number:         47901
>Category:       pkg
>Synopsis:       emacs-snapshot-20130603
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          support
>Submitter-Id:   net
>Arrival-Date:   Thu Jun 06 15:20:00 +0000 2013
>Originator:     Makoto Fujiwara (Atalk test)
>Release:        NetBSD 6.1
>Organization:
KINU Corporation
>Environment:
        
        
System: NetBSD m08 6.1 NetBSD 6.1 (GENERIC) amd64
Architecture: x86_64
Machine: amd64
>Description:
    (1) DISTFILE in MASTER_SITES are gone now, and new one appears
    (2) WCONTINUED macro undefined for now, add patch
    (3) src/ChangeLog has 132 lines from 2013-05-27
    Thanks
>How-To-Repeat:
        cd editors/emacs
        mv ../../distfiles/emacs-snapshot_201305* /tmp
        make clean && make package      
>Fix:

Index: editors/emacs-snapshot/Makefile
===================================================================
RCS file: /cvs/cvsroot/pkgsrc/editors/emacs-snapshot/Makefile,v
retrieving revision 1.42
diff -u -r1.42 Makefile
--- editors/emacs-snapshot/Makefile     6 Jun 2013 12:54:15 -0000       1.42
+++ editors/emacs-snapshot/Makefile     6 Jun 2013 14:34:06 -0000
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.42 2013/06/06 12:54:15 wiz Exp $
 
 CONFLICTS+=    emacs${_EMACS_VERSION_MAJOR}-nox11-[0-9]*
-PKGREVISION=   3
 
 .include "../../editors/emacs-snapshot/Makefile.common"
 
Index: editors/emacs-snapshot/Makefile.common
===================================================================
RCS file: /cvs/cvsroot/pkgsrc/editors/emacs-snapshot/Makefile.common,v
retrieving revision 1.59
diff -u -r1.59 Makefile.common
--- editors/emacs-snapshot/Makefile.common      31 May 2013 23:20:18 -0000      
1.59
+++ editors/emacs-snapshot/Makefile.common      6 Jun 2013 14:34:06 -0000
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile.common,v 1.59 2013/05/31 23:20:18 minskim Exp $
 
-DISTNAME=      emacs-snapshot_20130527.orig
+DISTNAME=      emacs-snapshot_20130603.orig
 SNAPDATE=      ${DISTNAME:S/emacs-snapshot_//:S/.orig//}
 PKGNAME=       emacs${_EMACS_VERSION_MAJOR}-${EMACS_VERSION}.${SNAPDATE}
 CATEGORIES=    editors
Index: editors/emacs-snapshot/PLIST
===================================================================
RCS file: /cvs/cvsroot/pkgsrc/editors/emacs-snapshot/PLIST,v
retrieving revision 1.31
diff -u -r1.31 PLIST
--- editors/emacs-snapshot/PLIST        31 May 2013 23:20:18 -0000      1.31
+++ editors/emacs-snapshot/PLIST        6 Jun 2013 14:34:06 -0000
@@ -1695,6 +1695,8 @@
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/edebug.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-base.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-base.elc
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-core.el.gz
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-core.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-custom.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-custom.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-datadebug.el.gz
Index: editors/emacs-snapshot/distinfo
===================================================================
RCS file: /cvs/cvsroot/pkgsrc/editors/emacs-snapshot/distinfo,v
retrieving revision 1.59
diff -u -r1.59 distinfo
--- editors/emacs-snapshot/distinfo     31 May 2013 23:20:18 -0000      1.59
+++ editors/emacs-snapshot/distinfo     6 Jun 2013 14:34:06 -0000
@@ -1,8 +1,9 @@
 $NetBSD: distinfo,v 1.59 2013/05/31 23:20:18 minskim Exp $
 
-SHA1 (emacs-snapshot_20130527.orig.tar.xz) = 
16b2d6352b902cd90198a30aac30d6f8aea79d39
-RMD160 (emacs-snapshot_20130527.orig.tar.xz) = 
658499886fe81e717f259673384dacba47e5b1cd
-Size (emacs-snapshot_20130527.orig.tar.xz) = 24196184 bytes
-SHA1 (patch-ad) = 61769812ed721e8d881a954983bbdbba01537104
+SHA1 (emacs-snapshot_20130603.orig.tar.xz) = 
72797c309a69e7e5a1b203028d4596582aa24231
+RMD160 (emacs-snapshot_20130603.orig.tar.xz) = 
5923ccaf7c4118992b889664f92d1609cbc84767
+Size (emacs-snapshot_20130603.orig.tar.xz) = 24213044 bytes
+SHA1 (patch-ad) = 5f08c9f954b57abae7707e47af273abcbc1cec87
 SHA1 (patch-ae) = 2dfe31015550feeaa47955136d3bbe2aa6790095
 SHA1 (patch-ag) = d7e0875965317b862fd65c42aba3b98c0548ca3e
+SHA1 (patch-src_process.c) = ae953cdac7fe6523b7579f800915f355053cc013
Index: editors/emacs-snapshot/patches/patch-src_process.c
===================================================================
RCS file: editors/emacs-snapshot/patches/patch-src_process.c
diff -N editors/emacs-snapshot/patches/patch-src_process.c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ editors/emacs-snapshot/patches/patch-src_process.c  6 Jun 2013 14:34:06 
-0000
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Avoid WCONTINUED is undefined. It would probably be the same as following
+part in in <sys/wait.h>:
++----
+| #define WALLSIG         0x00000008      /* wait for processes that exit
+|                                            with any signal, i.e. SIGCHLD
+|                                           and alternates */
++----
+
+--- src/process.c.orig 2013-06-06 21:19:28.000000000 +0900
++++ src/process.c      2013-06-06 21:20:14.000000000 +0900
+@@ -32,6 +32,11 @@ along with GNU Emacs.  If not, see <http
+ #include <fcntl.h>
+ 
+ #include "lisp.h"
++
++/* see include/sys/wait.h (and also emacsclient.c) */
++# ifndef WCONTINUED
++#  define WCONTINUED 8
++# endif
+ 
+ /* Only MS-DOS does not define `subprocesses'.  */
+ #ifdef subprocesses

>Unformatted: