summaryrefslogtreecommitdiff
path: root/editors/emacs23
diff options
context:
space:
mode:
Diffstat (limited to 'editors/emacs23')
-rw-r--r--editors/emacs23/Makefile4
-rw-r--r--editors/emacs23/Makefile.common4
2 files changed, 3 insertions, 5 deletions
diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile
index 7731db664b3..adc456d599c 100644
--- a/editors/emacs23/Makefile
+++ b/editors/emacs23/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2013/02/17 04:59:41 dholland Exp $
+# $NetBSD: Makefile,v 1.2 2013/02/23 23:46:37 dholland Exp $
CONFLICTS+= emacs23-nox11-[0-9]*
.include "../../editors/emacs23/Makefile.common"
-PKGREVISION= 12
+PKGREVISION= 13
.include "options.mk"
diff --git a/editors/emacs23/Makefile.common b/editors/emacs23/Makefile.common
index e3a4e4f67cb..5faa242cb16 100644
--- a/editors/emacs23/Makefile.common
+++ b/editors/emacs23/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2013/02/17 04:59:41 dholland Exp $
+# $NetBSD: Makefile.common,v 1.2 2013/02/23 23:46:37 dholland Exp $
#
# used by editors/emacs23/Makefile
# used by editors/emacs23-nox11/Makefile
@@ -16,8 +16,6 @@ LICENSE= gnu-gpl-v3
WRKSRC= ${WRKDIR}/${DISTNAME:S/b$//}
MAKE_JOBS_SAFE= no
-CONFLICTS+= emacs-nox11-[0-9]*
-
GNU_CONFIGURE= yes
INFO_FILES= yes
USE_TOOLS+= gmake makeinfo gzip