Tue Dec 6 17:12:09 2011 UTC ()
Update emacs-snapshot to 24.0.92.20111206.

Changes:
        * calendar/appt.el (appt-add): Rewrite the interactive-spec to avoid
        overly zealous deletion of trailing whitespace.
        * progmodes/prolog.el (prolog-find-value-by-system): Avoid error when
        there's no inferior buffer (bug#10196).
        * net/tramp-sh.el (tramp-maybe-open-connection): Handle user
        interrupt.  (Bug#10187)
        * info.el (Info-search): Display "end of manual" when Isearch
        reaches the end of single-file Info manual.  (Bug#9918)
        * isearch.el (isearch-message-prefix): Run the input method part
        of the prompt through bidi-string-mark-left-to-right.  (Bug#10183)
        * vc/diff-mode.el (diff-find-file-name): Make `read-file-name'
        aware of remote file names.  (Bug#10124)


(minskim)
diff -r1.40 -r1.41 pkgsrc/editors/emacs-snapshot/Makefile.common
diff -r1.44 -r1.45 pkgsrc/editors/emacs-snapshot/distinfo
diff -r1.9 -r1.10 pkgsrc/editors/emacs-snapshot/version.mk
diff -r1.1 -r0 pkgsrc/editors/emacs-snapshot/patches/patch-lib-src_emacsclient.c
cvs diff -r1.40 -r1.41 pkgsrc/editors/emacs-snapshot/Attic/Makefile.common (switch to unified diff)

--- pkgsrc/editors/emacs-snapshot/Attic/Makefile.common 2011/11/30 04:29:09 1.40
+++ pkgsrc/editors/emacs-snapshot/Attic/Makefile.common 2011/12/06 17:12:09 1.41
@@ -1,82 +1,82 @@ @@ -1,82 +1,82 @@
1# $NetBSD: Makefile.common,v 1.40 2011/11/30 04:29:09 minskim Exp $ 1# $NetBSD: Makefile.common,v 1.41 2011/12/06 17:12:09 minskim Exp $
2 2
3DISTNAME= emacs-snapshot_20111128.orig 3DISTNAME= emacs-snapshot_20111206.orig
4PKGNAME= ${DISTNAME:S/snapshot_/${EMACS_VERSION}./:S/.orig//} 4PKGNAME= ${DISTNAME:S/snapshot_/${EMACS_VERSION}./:S/.orig//}
5CATEGORIES= editors 5CATEGORIES= editors
6MASTER_SITES= http://emacs.naquadah.org/unstable/ 6MASTER_SITES= http://emacs.naquadah.org/unstable/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= minskim@NetBSD.org 9MAINTAINER= minskim@NetBSD.org
10HOMEPAGE= http://www.gnu.org/software/emacs/emacs.html 10HOMEPAGE= http://www.gnu.org/software/emacs/emacs.html
11COMMENT= GNU editing macros (development version) 11COMMENT= GNU editing macros (development version)
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15SETGIDGAME= yes 15SETGIDGAME= yes
16MAKE_JOBS_SAFE= no 16MAKE_JOBS_SAFE= no
17 17
18CONFLICTS+= emacs-nox11-[0-9]* 18CONFLICTS+= emacs-nox11-[0-9]*
19 19
20GNU_CONFIGURE= yes 20GNU_CONFIGURE= yes
21INFO_FILES= yes 21INFO_FILES= yes
22USE_TOOLS+= automake autoconf gmake makeinfo gzip 22USE_TOOLS+= automake autoconf gmake makeinfo gzip
23WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/:S/.orig//} 23WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/:S/.orig//}
24 24
25AUTOCONF_REQUIRED= 2.6.5 25AUTOCONF_REQUIRED= 2.6.5
26CONFIGURE_ARGS+= --srcdir=${WRKSRC} 26CONFIGURE_ARGS+= --srcdir=${WRKSRC}
27CONFIGURE_ARGS+= --localstatedir=${VARBASE} 27CONFIGURE_ARGS+= --localstatedir=${VARBASE}
28CONFIGURE_ARGS+= --with-gameuser=${GAMEOWN} 28CONFIGURE_ARGS+= --with-gameuser=${GAMEOWN}
29 29
30BUILD_DEFS+= VARBASE 30BUILD_DEFS+= VARBASE
31BUILD_DEFS+= GAMES_USER GAMES_GROUP GAMEDATAMODE 31BUILD_DEFS+= GAMES_USER GAMES_GROUP GAMEDATAMODE
32PLIST_SRC+= ../../editors/emacs-snapshot/PLIST 32PLIST_SRC+= ../../editors/emacs-snapshot/PLIST
33 33
34.include "../../editors/emacs-snapshot/version.mk" 34.include "../../editors/emacs-snapshot/version.mk"
35 35
36BUILD_TARGET= bootstrap 36BUILD_TARGET= bootstrap
37EMACS_VERSION= ${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}.${_EMACS_VERSION_MICRO} 37EMACS_VERSION= ${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}.${_EMACS_VERSION_MICRO}
38PLIST_SUBST+= EMACS_VERSION=${EMACS_VERSION} 38PLIST_SUBST+= EMACS_VERSION=${EMACS_VERSION}
39 39
40REPLACE_PERL= lib-src/grep-changelog 40REPLACE_PERL= lib-src/grep-changelog
41CHECK_INTERPRETER_SKIP= bin/grep-changelog 41CHECK_INTERPRETER_SKIP= bin/grep-changelog
42 42
43MAKE_DIRS_PERMS+= ${VARBASE}/games/emacs ${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE} 43MAKE_DIRS_PERMS+= ${VARBASE}/games/emacs ${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
44CONF_FILES_PERMS+= /dev/null ${VARBASE}/games/emacs/snake-scores \ 44CONF_FILES_PERMS+= /dev/null ${VARBASE}/games/emacs/snake-scores \
45 ${GAMES_USER} ${GAMES_GROUP} ${GAMEDATAMODE} 45 ${GAMES_USER} ${GAMES_GROUP} ${GAMEDATAMODE}
46CONF_FILES_PERMS+= /dev/null ${VARBASE}/games/emacs/tetris-scores \ 46CONF_FILES_PERMS+= /dev/null ${VARBASE}/games/emacs/tetris-scores \
47 ${GAMES_USER} ${GAMES_GROUP} ${GAMEDATAMODE} 47 ${GAMES_USER} ${GAMES_GROUP} ${GAMEDATAMODE}
48SPECIAL_PERMS+= libexec/emacs/${EMACS_VERSION}/${MACHINE_GNU_PLATFORM}/update-game-score ${SETGID_GAMES_PERMS} 48SPECIAL_PERMS+= libexec/emacs/${EMACS_VERSION}/${MACHINE_GNU_PLATFORM}/update-game-score ${SETGID_GAMES_PERMS}
49 49
50# build PATH in the dumped emacs is not a problem 50# build PATH in the dumped emacs is not a problem
51CHECK_WRKREF_SKIP+= bin/emacs 51CHECK_WRKREF_SKIP+= bin/emacs
52CHECK_WRKREF_SKIP+= bin/emacs-${EMACS_VERSION} 52CHECK_WRKREF_SKIP+= bin/emacs-${EMACS_VERSION}
53 53
54.include "../../mk/bsd.prefs.mk" 54.include "../../mk/bsd.prefs.mk"
55 55
56.if (${OPSYS} == "DragonFly") && exists(/usr/lib/crtn.o) 56.if (${OPSYS} == "DragonFly") && exists(/usr/lib/crtn.o)
57CPPFLAGS+= -DDFLY_CRT_USRLIB 57CPPFLAGS+= -DDFLY_CRT_USRLIB
58.endif 58.endif
59 59
60.if ${OPSYS} == "NetBSD" && exists(/usr/lib/crti.o) 60.if ${OPSYS} == "NetBSD" && exists(/usr/lib/crti.o)
61CONFIGURE_ARGS+= --with-crt-dir=/usr/lib 61CONFIGURE_ARGS+= --with-crt-dir=/usr/lib
62.endif 62.endif
63 63
64.if ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" || ${OPSYS} == "OpenBSD" 64.if ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" || ${OPSYS} == "OpenBSD"
65.include "../../mk/curses.buildlink3.mk" 65.include "../../mk/curses.buildlink3.mk"
66.else 66.else
67.include "../../mk/termcap.buildlink3.mk" 67.include "../../mk/termcap.buildlink3.mk"
68.endif 68.endif
69 69
70.include "../../mk/oss.buildlink3.mk" 70.include "../../mk/oss.buildlink3.mk"
71 71
72PRINT_PLIST_AWK+= { gsub(/${EMACS_VERSION}/, "$${EMACS_VERSION}"); \ 72PRINT_PLIST_AWK+= { gsub(/${EMACS_VERSION}/, "$${EMACS_VERSION}"); \
73 gsub(/${MACHINE_GNU_PLATFORM}/, "$${MACHINE_GNU_PLATFORM}"); \ 73 gsub(/${MACHINE_GNU_PLATFORM}/, "$${MACHINE_GNU_PLATFORM}"); \
74 print; next; } 74 print; next; }
75 75
76post-extract: 76post-extract:
77 cp ${.CURDIR}/../../editors/emacs/files/site-init.el ${WRKSRC}/lisp 77 cp ${.CURDIR}/../../editors/emacs/files/site-init.el ${WRKSRC}/lisp
78 cp ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s 78 cp ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s
79 ${CHMOD} -R go-w ${WRKSRC} 79 ${CHMOD} -R go-w ${WRKSRC}
80 80
81pre-configure: 81pre-configure:
82 cd ${WRKSRC} && ./autogen.sh 82 cd ${WRKSRC} && ./autogen.sh
cvs diff -r1.44 -r1.45 pkgsrc/editors/emacs-snapshot/distinfo (switch to unified diff)

--- pkgsrc/editors/emacs-snapshot/distinfo 2011/11/30 04:29:09 1.44
+++ pkgsrc/editors/emacs-snapshot/distinfo 2011/12/06 17:12:09 1.45
@@ -1,11 +1,10 @@ @@ -1,11 +1,10 @@
1$NetBSD: distinfo,v 1.44 2011/11/30 04:29:09 minskim Exp $ 1$NetBSD: distinfo,v 1.45 2011/12/06 17:12:09 minskim Exp $
2 2
3SHA1 (emacs-snapshot_20111128.orig.tar.xz) = 3dfef9d7bab6472e77ad2bb727f4e2b38a41cfca 3SHA1 (emacs-snapshot_20111206.orig.tar.xz) = c9694ce2570097879f602c2c313a32aae71c9e3e
4RMD160 (emacs-snapshot_20111128.orig.tar.xz) = b0d462a2de32346f50c7a317ac59aaceefad3cc5 4RMD160 (emacs-snapshot_20111206.orig.tar.xz) = 765f43dcac9f012d23834195a2312d63c97bbdc4
5Size (emacs-snapshot_20111128.orig.tar.xz) = 23300368 bytes 5Size (emacs-snapshot_20111206.orig.tar.xz) = 23310260 bytes
6SHA1 (patch-aa) = ecec22478b7e10ea0ed1818043761858b237b545 6SHA1 (patch-aa) = ecec22478b7e10ea0ed1818043761858b237b545
7SHA1 (patch-ac) = 7792cd247bcc40eafb4ec28f98bd0d2d9bd4b0c3 7SHA1 (patch-ac) = 7792cd247bcc40eafb4ec28f98bd0d2d9bd4b0c3
8SHA1 (patch-ad) = b8faf958f7ab3effd6c8dbcbf51fe70ddb2ecdae 8SHA1 (patch-ad) = b8faf958f7ab3effd6c8dbcbf51fe70ddb2ecdae
9SHA1 (patch-ae) = 2dfe31015550feeaa47955136d3bbe2aa6790095 9SHA1 (patch-ae) = 2dfe31015550feeaa47955136d3bbe2aa6790095
10SHA1 (patch-ag) = 2fc1d3fd953e595eb0ed1f3f5289a70a754e1aed 10SHA1 (patch-ag) = 2fc1d3fd953e595eb0ed1f3f5289a70a754e1aed
11SHA1 (patch-lib-src_emacsclient.c) = 4cdfecb23cb3475c5100f818dcbd9e7aeb863e2d 
cvs diff -r1.9 -r1.10 pkgsrc/editors/emacs-snapshot/version.mk (switch to unified diff)

--- pkgsrc/editors/emacs-snapshot/version.mk 2011/11/05 17:46:10 1.9
+++ pkgsrc/editors/emacs-snapshot/version.mk 2011/12/06 17:12:09 1.10
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1# $NetBSD: version.mk,v 1.9 2011/11/05 17:46:10 minskim Exp $ 1# $NetBSD: version.mk,v 1.10 2011/12/06 17:12:09 minskim Exp $
2 2
3_EMACS_FLAVOR= emacs 3_EMACS_FLAVOR= emacs
4_EMACS_REQD= emacs>=23 4_EMACS_REQD= emacs>=23
5_EMACS_PKGDEP.base= 5_EMACS_PKGDEP.base=
6_EMACS_PKGDEP.leim= 6_EMACS_PKGDEP.leim=
7 7
8_EMACS_VERSION_MAJOR= 24 8_EMACS_VERSION_MAJOR= 24
9_EMACS_VERSION_MINOR= 0 9_EMACS_VERSION_MINOR= 0
10_EMACS_VERSION_MICRO= 91 10_EMACS_VERSION_MICRO= 92
File Deleted: pkgsrc/editors/emacs-snapshot/patches/Attic/patch-lib-src_emacsclient.c