pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

pkg/43415: [PATCH] editors/emacs-snapshot 24.0.50

>Number:         43415
>Category:       pkg
>Synopsis:       [PATCH] editors/emacs-snapshot 24.0.50
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          support
>Submitter-Id:   net
>Arrival-Date:   Fri Jun 04 14:10:01 +0000 2010
>Originator:     Makoto Fujiwara
>Release:        NetBSD 5.0_STABLE
>Organization:
KINU Corporation
>Environment:
System: NetBSD modena 5.0_STABLE NetBSD 5.0_STABLE (XEN3_DOM0) #0: Wed Apr 7 
02:17:52 UTC 2010 
builds%b8.netbsd.org@localhost:/home/builds/ab/netbsd-5/amd64/201004070000Z-obj/home/builds/ab/netbsd-5/src/sys/arch/amd64/compile/XEN3_DOM0
 amd64
Architecture: x86_64
Machine: amd64
>Description:
        emacs-24.0.50 is now available at upstream, bump the version.
        The Changes are found at work/emacs-24.0.50/etc/NEWS
>How-To-Repeat:
        cd pkgsrc/editors/emacs-snapshot
        make package
>Fix:
Index: Makefile
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/editors/emacs-snapshot/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile    19 Feb 2010 20:37:08 -0000      1.11
+++ Makefile    2 Jun 2010 22:53:08 -0000
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.11 2010/02/19 20:37:08 joerg Exp $
 
-PKGREVISION=   4
+#KGREVISION=
 CONFLICTS+=    emacs-nox11-[0-9]*
 
 .include "../../editors/emacs-snapshot/Makefile.common"
Index: Makefile.common
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/editors/emacs-snapshot/Makefile.common,v
retrieving revision 1.4
diff -u -r1.4 Makefile.common
--- Makefile.common     30 May 2010 12:29:12 -0000      1.4
+++ Makefile.common     2 Jun 2010 22:51:34 -0000
@@ -1,9 +1,11 @@
 # $NetBSD: Makefile.common,v 1.4 2010/05/30 12:29:12 joerg Exp $
+# used by editors/emacs-snapshot/Makefile
 
-DISTNAME=      emacs-snapshot_20100217.orig
+DISTNAME=      emacs-snapshot_20100524.orig
 PKGNAME=       ${DISTNAME:S/snapshot_/${EMACS_VERSION}./:S/.orig//}
 CATEGORIES=    editors
 MASTER_SITES=  http://emacs.orebokech.com/pool/main/e/emacs-snapshot/
+EXTRACT_SUFX=  .tar.lzma
 
 MAINTAINER=    minskim%NetBSD.org@localhost
 HOMEPAGE=      http://www.gnu.org/software/emacs/emacs.html
Index: PLIST
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/editors/emacs-snapshot/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- PLIST       19 Feb 2010 19:04:11 -0000      1.4
+++ PLIST       2 Jun 2010 16:23:04 -0000
@@ -63,10 +63,8 @@
 libexec/emacs/${EMACS_VERSION}/${MACHINE_GNU_PLATFORM}/hexl
 libexec/emacs/${EMACS_VERSION}/${MACHINE_GNU_PLATFORM}/movemail
 libexec/emacs/${EMACS_VERSION}/${MACHINE_GNU_PLATFORM}/profile
-libexec/emacs/${EMACS_VERSION}/${MACHINE_GNU_PLATFORM}/rcs2log
 libexec/emacs/${EMACS_VERSION}/${MACHINE_GNU_PLATFORM}/sorted-doc
 libexec/emacs/${EMACS_VERSION}/${MACHINE_GNU_PLATFORM}/update-game-score
-libexec/emacs/${EMACS_VERSION}/${MACHINE_GNU_PLATFORM}/vcdiff
 man/man1/b2m.1
 man/man1/ctags.1
 man/man1/ebrowse.1
@@ -108,6 +106,7 @@
 share/emacs/${EMACS_VERSION}/etc/NEWS.20
 share/emacs/${EMACS_VERSION}/etc/NEWS.21
 share/emacs/${EMACS_VERSION}/etc/NEWS.22
+share/emacs/${EMACS_VERSION}/etc/NEWS.23
 share/emacs/${EMACS_VERSION}/etc/NXML-NEWS
 share/emacs/${EMACS_VERSION}/etc/ORDERS
 share/emacs/${EMACS_VERSION}/etc/PROBLEMS
@@ -1376,6 +1375,8 @@
 share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/ia.elc
 share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/idle.el.gz
 share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/idle.elc
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/imenu.el.gz
+share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/imenu.elc
 share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/java.el.gz
 share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/java.elc
 share/emacs/${EMACS_VERSION}/lisp/cedet/semantic/lex-spp.el.gz
@@ -1498,8 +1499,6 @@
 share/emacs/${EMACS_VERSION}/lisp/comint.elc
 share/emacs/${EMACS_VERSION}/lisp/compare-w.el.gz
 share/emacs/${EMACS_VERSION}/lisp/compare-w.elc
-share/emacs/${EMACS_VERSION}/lisp/complete.el.gz
-share/emacs/${EMACS_VERSION}/lisp/complete.elc
 share/emacs/${EMACS_VERSION}/lisp/completion.el.gz
 share/emacs/${EMACS_VERSION}/lisp/completion.elc
 share/emacs/${EMACS_VERSION}/lisp/composite.el.gz
@@ -1557,6 +1556,8 @@
 share/emacs/${EMACS_VERSION}/lisp/dos-w32.elc
 share/emacs/${EMACS_VERSION}/lisp/double.el.gz
 share/emacs/${EMACS_VERSION}/lisp/double.elc
+share/emacs/${EMACS_VERSION}/lisp/dynamic-setting.el.gz
+share/emacs/${EMACS_VERSION}/lisp/dynamic-setting.elc
 share/emacs/${EMACS_VERSION}/lisp/ebuff-menu.el.gz
 share/emacs/${EMACS_VERSION}/lisp/ebuff-menu.elc
 share/emacs/${EMACS_VERSION}/lisp/echistory.el.gz
@@ -1711,6 +1712,8 @@
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/rx.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/shadow.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/shadow.elc
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/smie.el.gz
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/smie.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/sregex.el.gz
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/sregex.elc
 share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/syntax.el.gz
@@ -1971,8 +1974,6 @@
 share/emacs/${EMACS_VERSION}/lisp/font-core.elc
 share/emacs/${EMACS_VERSION}/lisp/font-lock.el.gz
 share/emacs/${EMACS_VERSION}/lisp/font-lock.elc
-share/emacs/${EMACS_VERSION}/lisp/font-setting.el.gz
-share/emacs/${EMACS_VERSION}/lisp/font-setting.elc
 share/emacs/${EMACS_VERSION}/lisp/format-spec.el.gz
 share/emacs/${EMACS_VERSION}/lisp/format-spec.elc
 share/emacs/${EMACS_VERSION}/lisp/format.el.gz
@@ -2707,6 +2708,8 @@
 share/emacs/${EMACS_VERSION}/lisp/net/sasl-ntlm.elc
 share/emacs/${EMACS_VERSION}/lisp/net/sasl.el.gz
 share/emacs/${EMACS_VERSION}/lisp/net/sasl.elc
+share/emacs/${EMACS_VERSION}/lisp/net/secrets.el.gz
+share/emacs/${EMACS_VERSION}/lisp/net/secrets.elc
 share/emacs/${EMACS_VERSION}/lisp/net/snmp-mode.el.gz
 share/emacs/${EMACS_VERSION}/lisp/net/snmp-mode.elc
 share/emacs/${EMACS_VERSION}/lisp/net/socks.el.gz
@@ -2800,6 +2803,8 @@
 share/emacs/${EMACS_VERSION}/lisp/nxml/xsd-regexp.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/awk-mode.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/awk-mode.elc
+share/emacs/${EMACS_VERSION}/lisp/obsolete/complete.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/complete.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/fast-lock.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/fast-lock.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/iso-acc.el.gz
@@ -2825,6 +2830,8 @@
 share/emacs/${EMACS_VERSION}/lisp/obsolete/rnews.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/rnewspost.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/rnewspost.elc
+share/emacs/${EMACS_VERSION}/lisp/obsolete/s-region.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/s-region.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/sc.el.gz
 share/emacs/${EMACS_VERSION}/lisp/obsolete/sc.elc
 share/emacs/${EMACS_VERSION}/lisp/obsolete/scribe.el.gz
@@ -2847,6 +2854,8 @@
 share/emacs/${EMACS_VERSION}/lisp/org/org-attach.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-bbdb.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-bbdb.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-beamer.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-beamer.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-bibtex.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-bibtex.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-clock.el.gz
@@ -2857,10 +2866,16 @@
 share/emacs/${EMACS_VERSION}/lisp/org/org-compat.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-crypt.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-crypt.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-ctags.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-ctags.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-datetree.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-datetree.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-docbook.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-docbook.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-docview.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-docview.elc
+share/emacs/${EMACS_VERSION}/lisp/org/org-entities.el.gz
+share/emacs/${EMACS_VERSION}/lisp/org/org-entities.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-exp-blocks.el.gz
 share/emacs/${EMACS_VERSION}/lisp/org/org-exp-blocks.elc
 share/emacs/${EMACS_VERSION}/lisp/org/org-exp.el.gz
@@ -3128,8 +3143,8 @@
 share/emacs/${EMACS_VERSION}/lisp/progmodes/flymake.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/fortran.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/fortran.elc
-share/emacs/${EMACS_VERSION}/lisp/progmodes/gdb-ui.el.gz
-share/emacs/${EMACS_VERSION}/lisp/progmodes/gdb-ui.elc
+share/emacs/${EMACS_VERSION}/lisp/progmodes/gdb-mi.el.gz
+share/emacs/${EMACS_VERSION}/lisp/progmodes/gdb-mi.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/glasses.el.gz
 share/emacs/${EMACS_VERSION}/lisp/progmodes/glasses.elc
 share/emacs/${EMACS_VERSION}/lisp/progmodes/grep.el.gz
@@ -3238,8 +3253,6 @@
 share/emacs/${EMACS_VERSION}/lisp/rot13.elc
 share/emacs/${EMACS_VERSION}/lisp/ruler-mode.el.gz
 share/emacs/${EMACS_VERSION}/lisp/ruler-mode.elc
-share/emacs/${EMACS_VERSION}/lisp/s-region.el.gz
-share/emacs/${EMACS_VERSION}/lisp/s-region.elc
 share/emacs/${EMACS_VERSION}/lisp/savehist.el.gz
 share/emacs/${EMACS_VERSION}/lisp/savehist.elc
 share/emacs/${EMACS_VERSION}/lisp/saveplace.el.gz
Index: distinfo
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/editors/emacs-snapshot/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- distinfo    21 Feb 2010 12:26:47 -0000      1.8
+++ distinfo    2 Jun 2010 15:54:23 -0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.8 2010/02/21 12:26:47 wiz Exp $
+$NetBSD$
 
-SHA1 (emacs-snapshot_20100217.orig.tar.gz) = 
835968ac4bcbd98c5d01e3f53b2d551433a5e44f
-RMD160 (emacs-snapshot_20100217.orig.tar.gz) = 
7dee7d4647c491ccbd43812548b9559731e75f46
-Size (emacs-snapshot_20100217.orig.tar.gz) = 30930810 bytes
-SHA1 (patch-ab) = 53fd489995efae908827d7a3de4811daf156fd0a
+SHA1 (emacs-snapshot_20100524.orig.tar.lzma) = 
9ffad6e164bc29882b0dea5913cc992fa51569b2
+RMD160 (emacs-snapshot_20100524.orig.tar.lzma) = 
8a0a817b860b4330ab967ffb3a00434b130f9e20
+Size (emacs-snapshot_20100524.orig.tar.lzma) = 22549193 bytes
+SHA1 (patch-aa) = b1628a4532bcebb7e56ff6332dd11ed04d73233b
+SHA1 (patch-ab) = 155d04c83f5c05e41c1492583bb0dd5a3ad4c967
 SHA1 (patch-ac) = 9378586aa9720beebf19b9d54e94ef4f08e50745
 SHA1 (patch-ag) = 14508236b1092c0ab4765b0a7064e3f9443ade5d
Index: version.mk
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/editors/emacs-snapshot/version.mk,v
retrieving revision 1.6
diff -u -r1.6 version.mk
--- version.mk  19 Feb 2010 19:04:11 -0000      1.6
+++ version.mk  2 Jun 2010 12:22:47 -0000
@@ -5,6 +5,6 @@
 _EMACS_PKGDEP.base=
 _EMACS_PKGDEP.leim=
 
-_EMACS_VERSION_MAJOR=  23
-_EMACS_VERSION_MINOR=  1
-_EMACS_VERSION_MICRO=  92
+_EMACS_VERSION_MAJOR=  24
+_EMACS_VERSION_MINOR=  0
+_EMACS_VERSION_MICRO=  50
Index: patches/patch-aa
===================================================================
RCS file: patches/patch-aa
diff -N patches/patch-aa
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-aa    2 Jun 2010 15:53:55 -0000
@@ -0,0 +1,39 @@
+$NetBSD$
+
+--- work/emacs-24.0.50/configure.in.orig       2010-05-24 20:43:27.000000000 
+0900
++++ configure.in       2010-06-03 00:50:48.000000000 +0900
+@@ -41,7 +41,7 @@
+ docdir='${datadir}/emacs/${version}/etc'
+ gamedir='${localstatedir}/games/emacs'
+ 
+-gameuser=games
++gameuser=${GAMEOWN}
+ 
+ dnl OPTION_DEFAULT_OFF(NAME, HELP-STRING)
+ dnl Create a new --with option that defaults to being disabled.
+@@ -403,6 +403,14 @@
+       amd64-*-freebsd*|x86_64-*-freebsd*) machine=amdx86-64 ;;
+     esac
+   ;;
++  ## DragonFly ports
++  *-*-dragonfly*)
++    opsys=dragonfly
++    case "${canonical}" in
++      i[3456]86-*-dragonfly*)     machine=intel386 ;;
++      amd64-*-dragonfly*|x86_64-*-dragonfly*) machine=amdx86-64 ;;
++    esac
++  ;;
+ 
+   ## FreeBSD kernel + glibc based userland
+   *-*-kfreebsd*gnu* )
+@@ -1535,9 +1543,9 @@
+   window_system=nextstep
+   with_xft=no
+   # set up packaging dirs
++  if test "${EN_NS_SELF_CONTAINED}" = yes; then
+   exec_prefix=${ns_appbindir}
+   libexecdir=${ns_appbindir}/libexec
+-  if test "${EN_NS_SELF_CONTAINED}" = yes; then
+      prefix=${ns_appresdir}
+   fi
+   ns_frag=$srcdir/src/ns.mk
Index: patches/patch-ab
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/editors/emacs-snapshot/patches/patch-ab,v
retrieving revision 1.2
diff -u -r1.2 patch-ab
--- patches/patch-ab    7 Jun 2009 20:12:06 -0000       1.2
+++ patches/patch-ab    2 Jun 2010 15:54:08 -0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2009/06/07 20:12:06 hasso Exp $
+$NetBSD$
 
---- configure.orig     2009-06-04 20:29:50 +0300
-+++ configure  2009-06-07 21:41:16 +0300
-@@ -1979,7 +1979,7 @@ archlibdir='${libexecdir}/emacs/${versio
+--- work/emacs-24.0.50/configure.orig  2010-05-24 20:43:30.000000000 +0900
++++ configure  2010-06-03 00:53:05.000000000 +0900
+@@ -2525,7 +2525,7 @@
  docdir='${datadir}/emacs/${version}/etc'
  gamedir='${localstatedir}/games/emacs'
  
@@ -11,10 +11,10 @@
  
  
  
-@@ -2529,6 +2529,15 @@ case "${canonical}" in
+@@ -3164,6 +3164,14 @@
+       amd64-*-freebsd*|x86_64-*-freebsd*) machine=amdx86-64 ;;
      esac
    ;;
- 
 +  ## DragonFly ports
 +  *-*-dragonfly*)
 +    opsys=dragonfly
@@ -23,19 +23,17 @@
 +      amd64-*-dragonfly*|x86_64-*-dragonfly*) machine=amdx86-64 ;;
 +    esac
 +  ;;
-+
+ 
    ## FreeBSD kernel + glibc based userland
    *-*-kfreebsd*gnu* )
-     opsys=gnu-kfreebsd
-@@ -9605,9 +9614,9 @@ if test "${HAVE_NS}" = yes; then
+@@ -7441,9 +7449,9 @@
    window_system=nextstep
    with_xft=no
    # set up packaging dirs
--  exec_prefix=${ns_appbindir}
--  libexecdir=${ns_appbindir}/libexec
-   if test "${EN_NS_SELF_CONTAINED}" = yes; then
-+     exec_prefix=${ns_appbindir}
-+     libexecdir=${ns_appbindir}/libexec
++  if test "${EN_NS_SELF_CONTAINED}" = yes; then
+   exec_prefix=${ns_appbindir}
+   libexecdir=${ns_appbindir}/libexec
+-  if test "${EN_NS_SELF_CONTAINED}" = yes; then
       prefix=${ns_appresdir}
    fi
- fi
+   ns_frag=$srcdir/src/ns.mk

>Unformatted:
 bump version from 23.1.92 to 24.0.50
Home | Main Index | Thread Index | Old Index