diff options
| -rw-r--r-- | editors/emacs-nox11/Makefile | 4 | ||||
| -rw-r--r-- | editors/emacs/Makefile | 4 | ||||
| -rw-r--r-- | editors/emacs/Makefile.common | 6 | ||||
| -rw-r--r-- | editors/emacs/distinfo | 3 | ||||
| -rw-r--r-- | editors/emacs/patches/patch-ba | 13 |
5 files changed, 24 insertions, 6 deletions
diff --git a/editors/emacs-nox11/Makefile b/editors/emacs-nox11/Makefile index 29368dda7ce..a4265394b94 100644 --- a/editors/emacs-nox11/Makefile +++ b/editors/emacs-nox11/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.21 2006/04/05 22:22:16 markd Exp $ +# $NetBSD: Makefile,v 1.22 2006/05/15 11:48:13 markd Exp $ DISTNAME= emacs-${EMACSVERSION}a PKGNAME= emacs-nox11-${EMACSVERSION}a -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= editors COMMENT= GNU editing macros (editor) - non X11 version diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index 6d35cc98c05..8ee9a38a8f5 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.94 2006/04/17 13:46:22 wiz Exp $ +# $NetBSD: Makefile,v 1.95 2006/05/15 11:48:12 markd Exp $ DISTNAME= emacs-${EMACSVERSION}a -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= editors COMMENT= GNU editing macros (editor) diff --git a/editors/emacs/Makefile.common b/editors/emacs/Makefile.common index 78556a522e9..d9f9e05e181 100644 --- a/editors/emacs/Makefile.common +++ b/editors/emacs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2006/03/30 03:44:43 jlam Exp $ +# $NetBSD: Makefile.common,v 1.8 2006/05/15 11:48:12 markd Exp $ MASTER_SITES= ${MASTER_SITE_GNU:=emacs/} MAINTAINER= markd@NetBSD.org @@ -70,6 +70,10 @@ post-extract: ${CP} ${FILESDIR}/unexmacosx.c ${WRKSRC}/src ${CP} ${FILESDIR}/sh3el.h ${WRKSRC}/src/m +# for patch-ba +post-build: + (cd ${WRKSRC}/lisp; ${MAKE_PROGRAM} sort.elc) + pre-install: @${FIND} ${WRKSRC} -type f -name "*.orig" -print | ${XARGS} ${RM} -f diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo index 97a59e1c010..05d8579822f 100644 --- a/editors/emacs/distinfo +++ b/editors/emacs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.27 2006/04/05 22:22:16 markd Exp $ +$NetBSD: distinfo,v 1.28 2006/05/15 11:48:12 markd Exp $ SHA1 (emacs-21.4a.tar.gz) = cdb33731180fe4a912838af805dd35e3f55394d4 RMD160 (emacs-21.4a.tar.gz) = c312e739935b56d08783bbfe97992297a363cb8a @@ -23,5 +23,6 @@ SHA1 (patch-at) = bdd1bf7eea72a0b81677817d9b36cddaa07a189c SHA1 (patch-au) = e5d90961b4d78c37dec196097a16e0b6ac22e3bb SHA1 (patch-av) = 9b6ea439df406a55310e2ca1af45ed56f1663263 SHA1 (patch-az) = 43753accb1b9ffc2c63e638c31236b8e4880080b +SHA1 (patch-ba) = ae05985ce8cabffdfbfb84905e1d6b0de7690b25 SHA1 (patch-bg) = 567ccce83e2b6d898a87f20763d5ff4b19c30deb SHA1 (patch-xx) = cf1cb21e0bd96202622ff54e39d202bdae78c942 diff --git a/editors/emacs/patches/patch-ba b/editors/emacs/patches/patch-ba new file mode 100644 index 00000000000..f1e616cbb56 --- /dev/null +++ b/editors/emacs/patches/patch-ba @@ -0,0 +1,13 @@ +$NetBSD: patch-ba,v 1.4 2006/05/15 11:48:13 markd Exp $ + +--- lisp/sort.el.orig 2001-07-16 04:15:34.000000000 +1200 ++++ lisp/sort.el +@@ -493,7 +493,7 @@ Use \\[untabify] to convert tabs to spac + ;; Use the sort utility if we can; it is 4 times as fast. + ;; Do not use it if there are any properties in the region, + ;; since the sort utility would lose the properties. +- (let ((sort-args (list (if reverse "-rt\n" "-t\n") ++ (let ((sort-args (list (if reverse "-rt\t" "-t\t") + (concat "+0." (int-to-string col-start)) + (concat "-0." (int-to-string col-end))))) + (when sort-fold-case |