summaryrefslogtreecommitdiff
path: root/editors/emacs/Makefile
diff options
context:
space:
mode:
authorminskim <minskim@pkgsrc.org>2012-02-19 17:44:35 +0000
committerminskim <minskim@pkgsrc.org>2012-02-19 17:44:35 +0000
commit5922e87168af7b03dbccdb40e75d469cf491e3f1 (patch)
tree485eaee87cb1b4f395afcfae6f42f51937260f96 /editors/emacs/Makefile
parent519e4435d212fcae632172b59279bec741f2a590 (diff)
downloadpkgsrc-5922e87168af7b03dbccdb40e75d469cf491e3f1.tar.gz
Update emacs to 23.4.
Emacs 23.4 mainly fixes a security flaw in EDE (CVE-2012-0035), which was already fixed in emacs-23.3nb1 in pkgsrc.
Diffstat (limited to 'editors/emacs/Makefile')
-rw-r--r--editors/emacs/Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 981a9185bf5..b42d7f28ac5 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.141 2012/02/06 12:39:59 wiz Exp $
-
-PKGREVISION= 2
+# $NetBSD: Makefile,v 1.142 2012/02/19 17:44:35 minskim Exp $
CONFLICTS+= emacs-nox11-[0-9]*