summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authordholland <dholland@pkgsrc.org>2013-02-17 06:18:01 +0000
committerdholland <dholland@pkgsrc.org>2013-02-17 06:18:01 +0000
commit89ff074efa530de7aeb6fa070698de7b4a9c9d53 (patch)
tree3fc02b0a1e74607a5670cbb6fe1563df96b16aa2 /editors
parentb89b2e0d97138536f41c86d626df76cfbf52969d (diff)
downloadpkgsrc-89ff074efa530de7aeb6fa070698de7b4a9c9d53.tar.gz
Insert ${_EMACS_VERSION_MAJOR} in PKGNAME.
While here, fix wrong (emacs23-era) pattern in version.mk. Caution: The distfile appears to have vanished, so I can't build this package and it may not work.
Diffstat (limited to 'editors')
-rw-r--r--editors/emacs-snapshot/Makefile4
-rw-r--r--editors/emacs-snapshot/Makefile.common5
-rw-r--r--editors/emacs-snapshot/version.mk5
3 files changed, 8 insertions, 6 deletions
diff --git a/editors/emacs-snapshot/Makefile b/editors/emacs-snapshot/Makefile
index ee79a196db6..80b76e7f956 100644
--- a/editors/emacs-snapshot/Makefile
+++ b/editors/emacs-snapshot/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.37 2013/02/16 11:20:54 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2013/02/17 06:18:01 dholland Exp $
-CONFLICTS+= emacs-nox11-[0-9]*
+CONFLICTS+= emacs${_EMACS_VERSION_MAJOR}-nox11-[0-9]*
.include "../../editors/emacs-snapshot/Makefile.common"
diff --git a/editors/emacs-snapshot/Makefile.common b/editors/emacs-snapshot/Makefile.common
index 8f5c23a6260..668ab3d62f4 100644
--- a/editors/emacs-snapshot/Makefile.common
+++ b/editors/emacs-snapshot/Makefile.common
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.common,v 1.54 2013/02/12 04:47:31 minskim Exp $
+# $NetBSD: Makefile.common,v 1.55 2013/02/17 06:18:01 dholland Exp $
DISTNAME= emacs-snapshot_20130207.orig
-PKGNAME= ${DISTNAME:S/snapshot_/${EMACS_VERSION}./:S/.orig//}
+SNAPDATE= ${DISTNAME:S/emacs-snapshot_//:S/.orig//}
+PKGNAME= emacs${_EMACS_VERSION_MAJOR}-${EMACS_VERSION}.${SNAPDATE}
CATEGORIES= editors
MASTER_SITES= http://emacs.naquadah.org/unstable/
EXTRACT_SUFX= .tar.xz
diff --git a/editors/emacs-snapshot/version.mk b/editors/emacs-snapshot/version.mk
index 928e83d81bb..53ca0739d3b 100644
--- a/editors/emacs-snapshot/version.mk
+++ b/editors/emacs-snapshot/version.mk
@@ -1,7 +1,8 @@
-# $NetBSD: version.mk,v 1.13 2013/02/12 04:47:31 minskim Exp $
+# $NetBSD: version.mk,v 1.14 2013/02/17 06:18:01 dholland Exp $
_EMACS_FLAVOR= emacs
-_EMACS_REQD= emacs>=23
+#_EMACS_REQD= emacs25>=25
+_EMACS_REQD= emacs24>=24.3
_EMACS_PKGDEP.base=
_EMACS_PKGDEP.leim=