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
cvs diff -r1.36 -r1.37 pkgsrc/editors/emacs22/Attic/Makefile (expand / switch to unified diff)

--- 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 @@ @@ -1,5 +1,7 @@
1# $NetBSD: Makefile,v 1.36 2013/02/17 08:01:50 dholland Exp $ 1# $NetBSD: Makefile,v 1.37 2013/02/24 01:25:30 dholland Exp $
2 2
3PKGREVISION= 26 3PKGREVISION= 27
 4
 5CONFLICTS+= emacs22-nox11-[0-9]*
4 6
5.include "../../editors/emacs22/Makefile.common" 7.include "../../editors/emacs22/Makefile.common"
cvs diff -r1.2 -r1.3 pkgsrc/editors/emacs22/Attic/Makefile.common (expand / switch to unified diff)

--- 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,32 +1,30 @@ @@ -1,32 +1,30 @@
1# $NetBSD: Makefile.common,v 1.2 2013/02/23 23:53:18 dholland Exp $ 1# $NetBSD: Makefile.common,v 1.3 2013/02/24 01:25:30 dholland Exp $
2# 2#
3# used by editors/emacs22/Makefile 3# used by editors/emacs22/Makefile
4# used by editors/emacs22-nox11/Makefile 4# used by editors/emacs22-nox11/Makefile
5 5
6COMMENT?= GNU editing macros (editor) 6COMMENT?= GNU editing macros (editor)
7 7
8DISTNAME= emacs-22.3 8DISTNAME= emacs-22.3
9PKGNAME?= ${DISTNAME:S/emacs/emacs22/} 9PKGNAME?= ${DISTNAME:S/emacs/emacs22/}
10CATEGORIES= editors 10CATEGORIES= editors
11MASTER_SITES= ${MASTER_SITE_GNU:=emacs/} 11MASTER_SITES= ${MASTER_SITE_GNU:=emacs/}
12 12
13MAINTAINER= pkgsrc-users@NetBSD.org 13MAINTAINER= pkgsrc-users@NetBSD.org
14HOMEPAGE= http://www.gnu.org/software/emacs/emacs.html 14HOMEPAGE= http://www.gnu.org/software/emacs/emacs.html
15LICENSE= gnu-gpl-v3 15LICENSE= gnu-gpl-v3
16 16
17CONFLICTS+= elisp-manual-[0-9]* 17CONFLICTS+= elisp-manual-[0-9]*
18CONFLICTS+= emacs-[0-9]* 
19CONFLICTS+= emacs-nox11-[0-9]* 
20CONFLICTS+= mule-[0-9]* 18CONFLICTS+= mule-[0-9]*
21 19
22USE_TOOLS+= gmake gzip mktemp:run perl:run pkg-config 20USE_TOOLS+= gmake gzip mktemp:run perl:run pkg-config
23GNU_CONFIGURE= yes 21GNU_CONFIGURE= yes
24INFO_FILES= yes 22INFO_FILES= yes
25 23
26SETGIDGAME= yes 24SETGIDGAME= yes
27 25
28.include "options.mk" 26.include "options.mk"
29 27
30MAKEFLAGS+= EMACSLOADPATH=${WRKSRC}/lisp 28MAKEFLAGS+= EMACSLOADPATH=${WRKSRC}/lisp
31 29
32CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} 30CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
cvs diff -r1.8 -r1.9 pkgsrc/editors/emacs22-nox11/Attic/Makefile (expand / switch to unified diff)

--- 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,17 +1,19 @@ @@ -1,17 +1,19 @@
1# $NetBSD: Makefile,v 1.8 2013/02/17 08:01:50 dholland Exp $ 1# $NetBSD: Makefile,v 1.9 2013/02/24 01:25:30 dholland Exp $
2 2
3PKGNAME= ${DISTNAME:S/emacs/emacs22/:S/-/-nox11-/} 3PKGNAME= ${DISTNAME:S/emacs/emacs22/:S/-/-nox11-/}
4PKGREVISION= 3 4PKGREVISION= 4
 5
 6CONFLICTS+= emacs22-[0-9]*
5 7
6FILESDIR= ${.CURDIR}/../../editors/emacs22/files 8FILESDIR= ${.CURDIR}/../../editors/emacs22/files
7PATCHDIR= ${.CURDIR}/../../editors/emacs22/patches 9PATCHDIR= ${.CURDIR}/../../editors/emacs22/patches
8PKGDIR= ${.CURDIR}/../../editors/emacs22 10PKGDIR= ${.CURDIR}/../../editors/emacs22
9 11
10# This needs to be set before including bsd.prefs.mk. 12# This needs to be set before including bsd.prefs.mk.
11SETGIDGAME= yes 13SETGIDGAME= yes
12 14
13.include "../../mk/bsd.prefs.mk" 15.include "../../mk/bsd.prefs.mk"
14 16
15PKG_OPTIONS.emacs+= -x11 -gtk -motif -xaw 17PKG_OPTIONS.emacs+= -x11 -gtk -motif -xaw
16 18
17.include "../../editors/emacs22/Makefile.common" 19.include "../../editors/emacs22/Makefile.common"