Sun Feb 24 01:25:31 2013 UTC ()
Remove some more wrong CONFLICTS.
(dholland)
diff -r1.36 -r1.37 pkgsrc/editors/emacs22/Makefile
diff -r1.2 -r1.3 pkgsrc/editors/emacs22/Makefile.common
diff -r1.8 -r1.9 pkgsrc/editors/emacs22-nox11/Makefile
--- pkgsrc/editors/emacs22/Attic/Makefile 2013/02/17 08:01:50 1.36
+++ pkgsrc/editors/emacs22/Attic/Makefile 2013/02/24 01:25:30 1.37
@@ -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"
--- pkgsrc/editors/emacs22/Attic/Makefile.common 2013/02/23 23:53:18 1.2
+++ pkgsrc/editors/emacs22/Attic/Makefile.common 2013/02/24 01:25:30 1.3
@@ -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 @@
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
--- pkgsrc/editors/emacs22-nox11/Attic/Makefile 2013/02/17 08:01:50 1.8
+++ pkgsrc/editors/emacs22-nox11/Attic/Makefile 2013/02/24 01:25:30 1.9
@@ -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