diff options
| author | dholland <dholland> | 2013-02-17 06:07:25 +0000 |
|---|---|---|
| committer | dholland <dholland> | 2013-02-17 06:07:25 +0000 |
| commit | 3d1044349dd350897adf303517aa765327208c7b (patch) | |
| tree | bf59689bcf3ead81ad61d0223f06b24854eaae50 /editors | |
| parent | 1969ccdf1c81ec16628742443076896898110cbe (diff) | |
| download | pkgsrc-3d1044349dd350897adf303517aa765327208c7b.tar.gz | |
Change PKGNAME from emacs-24.2 to emacs24-24.2.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/emacs24/Makefile | 4 | ||||
| -rw-r--r-- | editors/emacs24/Makefile.common | 5 | ||||
| -rw-r--r-- | editors/emacs24/version.mk | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/editors/emacs24/Makefile b/editors/emacs24/Makefile index 74398b376d4..c8a874afb09 100644 --- a/editors/emacs24/Makefile +++ b/editors/emacs24/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2013/02/16 11:20:54 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2013/02/17 06:07:25 dholland Exp $ PKGREVISION= 6 -CONFLICTS+= emacs-nox11-[0-9]* +CONFLICTS+= emacs24-nox11-[0-9]* .include "../../editors/emacs24/Makefile.common" diff --git a/editors/emacs24/Makefile.common b/editors/emacs24/Makefile.common index 8c051bd14f5..10970181093 100644 --- a/editors/emacs24/Makefile.common +++ b/editors/emacs24/Makefile.common @@ -1,9 +1,10 @@ -# $NetBSD: Makefile.common,v 1.2 2012/10/03 11:43:33 asau Exp $ +# $NetBSD: Makefile.common,v 1.3 2013/02/17 06:07:25 dholland Exp $ # # used by editors/emacs24/Makefile # used by editors/emacs24-nox11/Makefile DISTNAME= emacs-${EMACS_VERSION} +PKGNAME?= ${DISTNAME:S/emacs/emacs24/} CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_GNU:=emacs/} @@ -72,7 +73,7 @@ CPPFLAGS+= -DTERMINFO .include "../../mk/oss.buildlink3.mk" post-extract: - cp ${.CURDIR}/../../editors/emacs/files/site-init.el ${WRKSRC}/lisp + cp ${.CURDIR}/../../editors/emacs23/files/site-init.el ${WRKSRC}/lisp cp ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s ${CHMOD} -R go-w ${WRKSRC} ${CHMOD} ugo+rx ${WRKSRC}/leim/ja-dic ${WRKSRC}/leim/quail diff --git a/editors/emacs24/version.mk b/editors/emacs24/version.mk index 079429deb0d..4b6db3fb4be 100644 --- a/editors/emacs24/version.mk +++ b/editors/emacs24/version.mk @@ -1,7 +1,7 @@ -# $NetBSD: version.mk,v 1.2 2012/08/28 00:55:52 mef Exp $ +# $NetBSD: version.mk,v 1.3 2013/02/17 06:07:25 dholland Exp $ _EMACS_FLAVOR= emacs -_EMACS_REQD= emacs>=24.1<25 +_EMACS_REQD= emacs24>=24.1<25 _EMACS_VERSION_MAJOR= 24 _EMACS_VERSION_MINOR= 2 |