Sat Feb 23 23:32:20 2013 UTC ()
Fix fatal problem with the emacs-nox11 meta-package, which I guess I
didn't notice because I didn't build enough combinations, or something.


(dholland)
diff -r1.38 -r1.39 pkgsrc/editors/emacs/Makefile.common
cvs diff -r1.38 -r1.39 pkgsrc/editors/emacs/Makefile.common (expand / switch to unified diff)

--- pkgsrc/editors/emacs/Makefile.common 2013/02/17 07:36:09 1.38
+++ pkgsrc/editors/emacs/Makefile.common 2013/02/23 23:32:19 1.39
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.38 2013/02/17 07:36:09 dholland Exp $ 1# $NetBSD: Makefile.common,v 1.39 2013/02/23 23:32:19 dholland Exp $
2# 2#
3# used by editors/emacs/Makefile 3# used by editors/emacs/Makefile
4# used by editors/emacs-nox11/Makefile 4# used by editors/emacs-nox11/Makefile
5 5
6CATEGORIES= editors 6CATEGORIES= editors
7MASTER_SITES= # empty 7MASTER_SITES= # empty
8DISTFILES= # empty 8DISTFILES= # empty
9 9
10MAINTAINER= dholland@NetBSD.org 10MAINTAINER= dholland@NetBSD.org
11COMMENT= Meta-package for installing the preferred Emacs version 11COMMENT= Meta-package for installing the preferred Emacs version
12 12
13META_PACKAGE= yes 13META_PACKAGE= yes
14 14
@@ -35,27 +35,27 @@ MY_EMACS_TYPE:= emacs20 @@ -35,27 +35,27 @@ MY_EMACS_TYPE:= emacs20
35 35
36.if !empty(MY_EMACS_TYPE:Mxemacs*) 36.if !empty(MY_EMACS_TYPE:Mxemacs*)
37PKG_FAIL_REASON+= "EMACS_TYPE is xemacs." 37PKG_FAIL_REASON+= "EMACS_TYPE is xemacs."
38# (Set this to avoid crashing out below.) 38# (Set this to avoid crashing out below.)
39EMACS_PKGDIR= ../../editors/xemacs 39EMACS_PKGDIR= ../../editors/xemacs
40.elif ${MY_EMACS_TYPE} == "emacs25" 40.elif ${MY_EMACS_TYPE} == "emacs25"
41EMACS_PKGDIR= ../../editors/emacs-snapshot 41EMACS_PKGDIR= ../../editors/emacs-snapshot
42.elif !empty(MY_EMACS_TYPE:M*nox) 42.elif !empty(MY_EMACS_TYPE:M*nox)
43EMACS_PKGDIR= ../../editors/${EMACS_BASE_TYPE}-nox11 43EMACS_PKGDIR= ../../editors/${EMACS_BASE_TYPE}-nox11
44.else 44.else
45EMACS_PKGDIR= ../../editors/${EMACS_BASE_TYPE} 45EMACS_PKGDIR= ../../editors/${EMACS_BASE_TYPE}
46.endif 46.endif
47 47
48DEPENDS+= ${EMACS_BASE_TYPE}>=${EMACS_MAJOR}:${EMACS_PKGDIR} 48DEPENDS+= ${MY_EMACS_TYPE}>=${EMACS_MAJOR}:${EMACS_PKGDIR}
49 49
50# 50#
51# 2. Now it gets gross. Before this meta-package was introduced, the 51# 2. Now it gets gross. Before this meta-package was introduced, the
52# emacs packages all had PKGNAME set to "emacs". Now the meta-package 52# emacs packages all had PKGNAME set to "emacs". Now the meta-package
53# is called "emacs" and the emacs packages themselves have the emacs 53# is called "emacs" and the emacs packages themselves have the emacs
54# major version in them. But in order to make updates work properly, 54# major version in them. But in order to make updates work properly,
55# the version of the package called "emacs" cannot go down. We need to 55# the version of the package called "emacs" cannot go down. We need to
56# set MY_EMACS_VERSION accordingly. The following were the versions at 56# set MY_EMACS_VERSION accordingly. The following were the versions at
57# the time the renaming was done: 57# the time the renaming was done:
58# emacs20 20.7nb16 58# emacs20 20.7nb16
59# emacs21 21.4anb26 59# emacs21 21.4anb26
60# emacs21-nox11 21.4anb13 60# emacs21-nox11 21.4anb13
61# emacs22 22.3nb26 61# emacs22 22.3nb26