From a2904a90b738d55ffe516d2272b16a3bba204c6c Mon Sep 17 00:00:00 2001 From: minskim Date: Sat, 4 May 2013 03:24:18 +0000 Subject: Update emacs-snapshot to 24.3.50.20130427. Based on patches provided by Makoto Fujiwara in PR 47657. Notable changes: - Merge in all changes up to version 24.3 release. - Switch encodings of tutorials to UTF-8. - Release MH-E version 8.5. - Optimize the code for reading UTF-8 files. - File synchronization fixes. - Merge octave-mod.el and octave-inf.el into octave.el with some cleanups. - New faster Imenu implementation. --- editors/emacs-snapshot/Makefile | 4 +-- editors/emacs-snapshot/Makefile.common | 5 ++-- editors/emacs-snapshot/PLIST | 50 ++++++--------------------------- editors/emacs-snapshot/distinfo | 9 +++--- editors/emacs-snapshot/patches/patch-aa | 42 --------------------------- 5 files changed, 16 insertions(+), 94 deletions(-) delete mode 100644 editors/emacs-snapshot/patches/patch-aa (limited to 'editors/emacs-snapshot') diff --git a/editors/emacs-snapshot/Makefile b/editors/emacs-snapshot/Makefile index 80b76e7f956..fd91473cf54 100644 --- a/editors/emacs-snapshot/Makefile +++ b/editors/emacs-snapshot/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.38 2013/02/17 06:18:01 dholland Exp $ +# $NetBSD: Makefile,v 1.39 2013/05/04 03:24:18 minskim Exp $ CONFLICTS+= emacs${_EMACS_VERSION_MAJOR}-nox11-[0-9]* .include "../../editors/emacs-snapshot/Makefile.common" -PKGREVISION= 1 - .include "options.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" diff --git a/editors/emacs-snapshot/Makefile.common b/editors/emacs-snapshot/Makefile.common index fb646ee1372..e960a3130d8 100644 --- a/editors/emacs-snapshot/Makefile.common +++ b/editors/emacs-snapshot/Makefile.common @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.common,v 1.56 2013/03/05 17:38:31 dholland Exp $ +# $NetBSD: Makefile.common,v 1.57 2013/05/04 03:24:18 minskim Exp $ -DISTNAME= emacs-snapshot_20130207.orig +DISTNAME= emacs-snapshot_20130427.orig SNAPDATE= ${DISTNAME:S/emacs-snapshot_//:S/.orig//} PKGNAME= emacs${_EMACS_VERSION_MAJOR}-${EMACS_VERSION}.${SNAPDATE} CATEGORIES= editors @@ -77,7 +77,6 @@ post-extract: cp ${.CURDIR}/../../editors/emacs23/files/site-init.el ${WRKSRC}/lisp cp ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s ${CHMOD} -R go-w ${WRKSRC} - ${CHMOD} ugo+rx ${WRKSRC}/leim/ja-dic ${WRKSRC}/leim/quail pre-configure: cd ${WRKSRC} && ./autogen.sh diff --git a/editors/emacs-snapshot/PLIST b/editors/emacs-snapshot/PLIST index 7d667eaeb5d..55482ac849e 100644 --- a/editors/emacs-snapshot/PLIST +++ b/editors/emacs-snapshot/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.29 2013/02/12 04:47:31 minskim Exp $ +@comment $NetBSD: PLIST,v 1.30 2013/05/04 03:24:18 minskim Exp $ bin/ctags bin/ebrowse bin/emacs @@ -450,48 +450,14 @@ share/emacs/${EMACS_VERSION}/etc/images/help.xpm share/emacs/${EMACS_VERSION}/etc/images/home.pbm share/emacs/${EMACS_VERSION}/etc/images/home.xpm share/emacs/${EMACS_VERSION}/etc/images/icons/README -share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/closed.png -share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/closed.xpm -share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/empty.png -share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/empty.xpm -share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/end-connector.png -share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/end-connector.xpm -share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/extender-connector.png -share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/extender-connector.xpm -share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/leaf.png -share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/leaf.xpm share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/locked-encrypted.png share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/locked-encrypted.xpm -share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/mid-connector.png -share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/mid-connector.xpm -share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/opened.png -share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/opened.xpm -share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/skip-descender.png -share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/skip-descender.xpm -share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/through-descender.png -share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/through-descender.xpm share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/unlocked-encrypted.png share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/dark-bg/unlocked-encrypted.xpm -share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/closed.png -share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/closed.xpm -share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/empty.png -share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/empty.xpm -share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/end-connector.png -share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/end-connector.xpm -share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/extender-connector.png -share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/extender-connector.xpm share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/leaf.png share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/leaf.xpm share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/locked-encrypted.png share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/locked-encrypted.xpm -share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/mid-connector.png -share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/mid-connector.xpm -share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/opened.png -share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/opened.xpm -share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/skip-descender.png -share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/skip-descender.xpm -share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/through-descender.png -share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/through-descender.xpm share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.png share/emacs/${EMACS_VERSION}/etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.xpm share/emacs/${EMACS_VERSION}/etc/images/icons/hicolor/128x128/apps/emacs.png @@ -1983,6 +1949,8 @@ share/emacs/${EMACS_VERSION}/lisp/eshell/em-smart.el.gz share/emacs/${EMACS_VERSION}/lisp/eshell/em-smart.elc share/emacs/${EMACS_VERSION}/lisp/eshell/em-term.el.gz share/emacs/${EMACS_VERSION}/lisp/eshell/em-term.elc +share/emacs/${EMACS_VERSION}/lisp/eshell/em-tramp.el.gz +share/emacs/${EMACS_VERSION}/lisp/eshell/em-tramp.elc share/emacs/${EMACS_VERSION}/lisp/eshell/em-unix.el.gz share/emacs/${EMACS_VERSION}/lisp/eshell/em-unix.elc share/emacs/${EMACS_VERSION}/lisp/eshell/em-xtra.el.gz @@ -2970,6 +2938,8 @@ share/emacs/${EMACS_VERSION}/lisp/obsolete/terminal.el.gz share/emacs/${EMACS_VERSION}/lisp/obsolete/terminal.elc share/emacs/${EMACS_VERSION}/lisp/obsolete/vc-mcvs.el.gz share/emacs/${EMACS_VERSION}/lisp/obsolete/vc-mcvs.elc +share/emacs/${EMACS_VERSION}/lisp/obsolete/yow.el.gz +share/emacs/${EMACS_VERSION}/lisp/obsolete/yow.elc share/emacs/${EMACS_VERSION}/lisp/org/ob-C.el.gz share/emacs/${EMACS_VERSION}/lisp/org/ob-C.elc share/emacs/${EMACS_VERSION}/lisp/org/ob-R.el.gz @@ -3209,6 +3179,8 @@ share/emacs/${EMACS_VERSION}/lisp/pcmpl-rpm.el.gz share/emacs/${EMACS_VERSION}/lisp/pcmpl-rpm.elc share/emacs/${EMACS_VERSION}/lisp/pcmpl-unix.el.gz share/emacs/${EMACS_VERSION}/lisp/pcmpl-unix.elc +share/emacs/${EMACS_VERSION}/lisp/pcmpl-x.el.gz +share/emacs/${EMACS_VERSION}/lisp/pcmpl-x.elc share/emacs/${EMACS_VERSION}/lisp/pcomplete.el.gz share/emacs/${EMACS_VERSION}/lisp/pcomplete.elc share/emacs/${EMACS_VERSION}/lisp/play/5x5.el.gz @@ -3263,8 +3235,6 @@ share/emacs/${EMACS_VERSION}/lisp/play/studly.el.gz share/emacs/${EMACS_VERSION}/lisp/play/studly.elc share/emacs/${EMACS_VERSION}/lisp/play/tetris.el.gz share/emacs/${EMACS_VERSION}/lisp/play/tetris.elc -share/emacs/${EMACS_VERSION}/lisp/play/yow.el.gz -share/emacs/${EMACS_VERSION}/lisp/play/yow.elc share/emacs/${EMACS_VERSION}/lisp/play/zone.el.gz share/emacs/${EMACS_VERSION}/lisp/play/zone.elc share/emacs/${EMACS_VERSION}/lisp/printing.el.gz @@ -3403,10 +3373,8 @@ share/emacs/${EMACS_VERSION}/lisp/progmodes/mixal-mode.el.gz share/emacs/${EMACS_VERSION}/lisp/progmodes/mixal-mode.elc share/emacs/${EMACS_VERSION}/lisp/progmodes/modula2.el.gz share/emacs/${EMACS_VERSION}/lisp/progmodes/modula2.elc -share/emacs/${EMACS_VERSION}/lisp/progmodes/octave-inf.el.gz -share/emacs/${EMACS_VERSION}/lisp/progmodes/octave-inf.elc -share/emacs/${EMACS_VERSION}/lisp/progmodes/octave-mod.el.gz -share/emacs/${EMACS_VERSION}/lisp/progmodes/octave-mod.elc +share/emacs/${EMACS_VERSION}/lisp/progmodes/octave.el.gz +share/emacs/${EMACS_VERSION}/lisp/progmodes/octave.elc share/emacs/${EMACS_VERSION}/lisp/progmodes/opascal.el.gz share/emacs/${EMACS_VERSION}/lisp/progmodes/opascal.elc share/emacs/${EMACS_VERSION}/lisp/progmodes/pascal.el.gz diff --git a/editors/emacs-snapshot/distinfo b/editors/emacs-snapshot/distinfo index 4d5d97ebe6e..38e7390207f 100644 --- a/editors/emacs-snapshot/distinfo +++ b/editors/emacs-snapshot/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.56 2013/02/12 04:47:31 minskim Exp $ +$NetBSD: distinfo,v 1.57 2013/05/04 03:24:18 minskim Exp $ -SHA1 (emacs-snapshot_20130207.orig.tar.xz) = dcf272866f5cb0d66d96e3774728497a4e976561 -RMD160 (emacs-snapshot_20130207.orig.tar.xz) = 93e61813ddf5383d9f28bf72037424f97458bc37 -Size (emacs-snapshot_20130207.orig.tar.xz) = 24269140 bytes -SHA1 (patch-aa) = 9050d1ab70667c75fa422b07b7c07f7bd5034ce3 +SHA1 (emacs-snapshot_20130427.orig.tar.xz) = d303287ff0e0686f927d156786e1484b7d1f4fe0 +RMD160 (emacs-snapshot_20130427.orig.tar.xz) = 39d33b903fc86a93480eee9456008a3b335410fd +Size (emacs-snapshot_20130427.orig.tar.xz) = 24131864 bytes SHA1 (patch-ad) = 5c2e132d64fddd900db762afee8086ff4f2d71da SHA1 (patch-ae) = 2dfe31015550feeaa47955136d3bbe2aa6790095 SHA1 (patch-ag) = d7e0875965317b862fd65c42aba3b98c0548ca3e diff --git a/editors/emacs-snapshot/patches/patch-aa b/editors/emacs-snapshot/patches/patch-aa deleted file mode 100644 index d48d5d37fd5..00000000000 --- a/editors/emacs-snapshot/patches/patch-aa +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-aa,v 1.5 2013/02/12 04:47:31 minskim Exp $ - -Add DragonFly configuration. - ---- configure.ac.orig 2013-02-07 14:39:42.000000000 +0000 -+++ configure.ac -@@ -428,6 +428,15 @@ case "${canonical}" in - opsys=gnu-linux - ;; - -+ ## DragonFly ports -+ *-*-dragonfly*) -+ opsys=dragonfly -+ case "${canonical}" in -+ i[3456]86-*-dragonfly*) machine=intel386 ;; -+ amd64-*-dragonfly*|x86_64-*-dragonfly*) machine=amdx86-64 ;; -+ esac -+ ;; -+ - ## FreeBSD ports - *-*-freebsd* ) - opsys=freebsd -@@ -1014,6 +1023,8 @@ case "$opsys" in - - freebsd) LIBS_SYSTEM="-lutil" ;; - -+ dragonfly) LIBS_SYSTEM="-ltermlib" ;; -+ - hpux*) LIBS_SYSTEM="-l:libdld.sl" ;; - - sol2*) LIBS_SYSTEM="-lsocket -lnsl" ;; -@@ -1071,6 +1082,10 @@ case $opsys in - LIB_STANDARD=-lc - START_FILES='pre-crt0.o $(CRT_DIR)/crt0.o' - ;; -+ dragonfly ) -+ LIB_STANDARD=-lc -+ START_FILES='$(CRT_DIR)/crt1.o' -+ ;; - dnl NB this may be adjusted below. - netbsd | openbsd ) - LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtend.o' -- cgit v1.2.3