summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authormef <mef@pkgsrc.org>2012-08-28 00:55:51 +0000
committermef <mef@pkgsrc.org>2012-08-28 00:55:51 +0000
commit004a09a7974cf1d9b912ee94ed99f88733f7a487 (patch)
tree5f1a3d1549eefe74811c2b1e99f0ee7d8721a4d3 /editors
parent8d5c13cf4522a872d2819c6f9cf098f185d1392c (diff)
downloadpkgsrc-004a09a7974cf1d9b912ee94ed99f88733f7a487.tar.gz
Bump 24.1 to 24.2 (emacs24 and emacs24-nox11)
(1) CVE-2012-3479 fixed on lisp/files.el patches/patch-lisp_files.el is removed. (2) From: ChangeLog ------- 2012-08-24 Chong Yidong <cyd@gnu.org> * Version 24.2 released. 2012-08-14 Ulrich Mueller <ulm@gentoo.org> * lib/gnulib.mk: * lib/stdio.in.h: * m4/stdio_h.m4: Do not assume that gets is defined (Bug#11873). 2012-06-21 Ulrich Mueller <ulm@gentoo.org> * configure.in: Use m/intel386.h for amd64 with x32 ABI. (Bug#11669) -------- Thanks wiz@
Diffstat (limited to 'editors')
-rw-r--r--editors/emacs24-nox11/Makefile3
-rw-r--r--editors/emacs24/Makefile3
-rw-r--r--editors/emacs24/distinfo9
-rw-r--r--editors/emacs24/version.mk4
4 files changed, 8 insertions, 11 deletions
diff --git a/editors/emacs24-nox11/Makefile b/editors/emacs24-nox11/Makefile
index 5fa73848294..a977d3aab67 100644
--- a/editors/emacs24-nox11/Makefile
+++ b/editors/emacs24-nox11/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2012/08/13 06:38:50 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2012/08/28 00:55:52 mef Exp $
PKGNAME= ${DISTNAME:S/-/-nox11-/}
-PKGREVISION= 2
CONFLICTS+= emacs-[0-9]*
diff --git a/editors/emacs24/Makefile b/editors/emacs24/Makefile
index 67fd05f1877..afe8d0f2647 100644
--- a/editors/emacs24/Makefile
+++ b/editors/emacs24/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2012/08/13 14:25:38 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2012/08/28 00:55:51 mef Exp $
CONFLICTS+= emacs-nox11-[0-9]*
.include "../../editors/emacs24/Makefile.common"
-PKGREVISION= 3
.include "options.mk"
diff --git a/editors/emacs24/distinfo b/editors/emacs24/distinfo
index 5db915eb100..0f427b0e7ee 100644
--- a/editors/emacs24/distinfo
+++ b/editors/emacs24/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.4 2012/08/13 06:38:50 wiz Exp $
+$NetBSD: distinfo,v 1.5 2012/08/28 00:55:52 mef Exp $
-SHA1 (emacs-24.1.tar.gz) = f064396724a27c83b79b2d890d188abebaa5975e
-RMD160 (emacs-24.1.tar.gz) = 0fed00042339f46b29449bd561d2f881d13d8d38
-Size (emacs-24.1.tar.gz) = 51473111 bytes
+SHA1 (emacs-24.2.tar.gz) = 5fc4fe7797f821f2021ac415a81f5f190c52c0b2
+RMD160 (emacs-24.2.tar.gz) = 26f6c2b671ed7f160875d62e47c89afec085110f
+Size (emacs-24.2.tar.gz) = 51471017 bytes
SHA1 (patch-aa) = dc41270debcdeba46056590ff99e72e79bd04729
SHA1 (patch-ab) = 3021afead5011aa864a2734eeb72136c36580fb2
SHA1 (patch-ad) = adc347ccd6edeb6e7ad96eeb98d6ee64176fb143
SHA1 (patch-ag) = 3e6ee4774189185af10eada9c935120491318313
-SHA1 (patch-lisp_files.el) = 9963e3b6485ae569818f64ab878c3eb46895333d
diff --git a/editors/emacs24/version.mk b/editors/emacs24/version.mk
index 15832034092..079429deb0d 100644
--- a/editors/emacs24/version.mk
+++ b/editors/emacs24/version.mk
@@ -1,7 +1,7 @@
-# $NetBSD: version.mk,v 1.1 2012/06/16 21:03:42 dholland Exp $
+# $NetBSD: version.mk,v 1.2 2012/08/28 00:55:52 mef Exp $
_EMACS_FLAVOR= emacs
_EMACS_REQD= emacs>=24.1<25
_EMACS_VERSION_MAJOR= 24
-_EMACS_VERSION_MINOR= 1
+_EMACS_VERSION_MINOR= 2