summaryrefslogtreecommitdiff
path: root/editors/emacs-snapshot/Makefile
diff options
context:
space:
mode:
authormef <mef@pkgsrc.org>2015-06-14 15:46:21 +0000
committermef <mef@pkgsrc.org>2015-06-14 15:46:21 +0000
commit5a29041ea31b0b7e6e634b725b7a6d55557dd2a8 (patch)
tree6704cd77587bfd546337bd34ea414314897d234b /editors/emacs-snapshot/Makefile
parentf381acf41b7d48eaf696339a184fbd21c7843b42 (diff)
downloadpkgsrc-5a29041ea31b0b7e6e634b725b7a6d55557dd2a8.tar.gz
Update from 20140101 to 20150415(22).
prev version: emacs24-24.3.50.20140101nb10 current version: emacs25-25.0.50.2015041522 (upstream) Upstream changes are too many to list here. Year and 3 month between them. But it includes (at least) - the changes from emacs24 to emacs25 (This may require adding emacs25 on EMACS_VERSIONS_ACCEPTED in some packages) (pkgsrc) - (Makefile.common) sequence now resembles (wip)/emacs-current/Makefile - (Makefile) Add missing send-pr.el setup (at /usr/share/gnats) in site-init.el - (files/site-init.el) Copied from editors/emacs24 - Drop patch-ae: "if [ $# == 0 ]; then" ( == -> =) patch-configure.ac: ksh bad substitution problem patch-src_image.c: Fix build with giflib 5.1. - (options.mk) * configuration now resembles (wip)/emacs-current/options.mk * Add options xaw3d and xml (also in PKG_SUGGESTED_OPTIONS) * Correction typo on CONFIGURE_ARGS on --without-imagemagic(k)
Diffstat (limited to 'editors/emacs-snapshot/Makefile')
-rw-r--r--editors/emacs-snapshot/Makefile5
1 files changed, 1 insertions, 4 deletions
diff --git a/editors/emacs-snapshot/Makefile b/editors/emacs-snapshot/Makefile
index 8318e06b5dd..ec5f7382dc4 100644
--- a/editors/emacs-snapshot/Makefile
+++ b/editors/emacs-snapshot/Makefile
@@ -1,7 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2015/04/25 14:20:41 tnn Exp $
-
-PKGREVISION= 10
-CONFLICTS+= emacs${_EMACS_VERSION_MAJOR}-nox11-[0-9]*
+# $NetBSD: Makefile,v 1.58 2015/06/14 15:46:21 mef Exp $
.include "../../editors/emacs-snapshot/Makefile.common"