diff options
| -rw-r--r-- | editors/emacs22-nox11/Makefile | 6 | ||||
| -rw-r--r-- | editors/emacs22/Makefile | 6 | ||||
| -rw-r--r-- | editors/emacs22/Makefile.common | 4 |
3 files changed, 9 insertions, 7 deletions
diff --git a/editors/emacs22-nox11/Makefile b/editors/emacs22-nox11/Makefile index f99caf8b109..9d7c39c59bb 100644 --- a/editors/emacs22-nox11/Makefile +++ b/editors/emacs22-nox11/Makefile @@ -1,7 +1,9 @@ -# $NetBSD: Makefile,v 1.8 2013/02/17 08:01:50 dholland Exp $ +# $NetBSD: Makefile,v 1.9 2013/02/24 01:25:30 dholland Exp $ PKGNAME= ${DISTNAME:S/emacs/emacs22/:S/-/-nox11-/} -PKGREVISION= 3 +PKGREVISION= 4 + +CONFLICTS+= emacs22-[0-9]* FILESDIR= ${.CURDIR}/../../editors/emacs22/files PATCHDIR= ${.CURDIR}/../../editors/emacs22/patches diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile index ee65d72668a..3a9464ae685 100644 --- a/editors/emacs22/Makefile +++ b/editors/emacs22/Makefile @@ -1,5 +1,7 @@ -# $NetBSD: Makefile,v 1.36 2013/02/17 08:01:50 dholland Exp $ +# $NetBSD: Makefile,v 1.37 2013/02/24 01:25:30 dholland Exp $ -PKGREVISION= 26 +PKGREVISION= 27 + +CONFLICTS+= emacs22-nox11-[0-9]* .include "../../editors/emacs22/Makefile.common" diff --git a/editors/emacs22/Makefile.common b/editors/emacs22/Makefile.common index 8e7fbf60e12..a0b07eb1710 100644 --- a/editors/emacs22/Makefile.common +++ b/editors/emacs22/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2013/02/23 23:53:18 dholland Exp $ +# $NetBSD: Makefile.common,v 1.3 2013/02/24 01:25:30 dholland Exp $ # # used by editors/emacs22/Makefile # used by editors/emacs22-nox11/Makefile @@ -15,8 +15,6 @@ HOMEPAGE= http://www.gnu.org/software/emacs/emacs.html LICENSE= gnu-gpl-v3 CONFLICTS+= elisp-manual-[0-9]* -CONFLICTS+= emacs-[0-9]* -CONFLICTS+= emacs-nox11-[0-9]* CONFLICTS+= mule-[0-9]* USE_TOOLS+= gmake gzip mktemp:run perl:run pkg-config |