Sun Mar 24 15:15:09 2013 UTC ()
Remove another wrong CONFLICTS. sigh


(dholland)
diff -r1.4 -r1.5 pkgsrc/editors/emacs24/Makefile.common
cvs diff -r1.4 -r1.5 pkgsrc/editors/emacs24/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/editors/emacs24/Attic/Makefile.common 2013/03/15 22:44:59 1.4
+++ pkgsrc/editors/emacs24/Attic/Makefile.common 2013/03/24 15:15:09 1.5
@@ -1,33 +1,31 @@ @@ -1,33 +1,31 @@
1# $NetBSD: Makefile.common,v 1.4 2013/03/15 22:44:59 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.5 2013/03/24 15:15:09 dholland Exp $
2# 2#
3# used by editors/emacs24/Makefile 3# used by editors/emacs24/Makefile
4# used by editors/emacs24-nox11/Makefile 4# used by editors/emacs24-nox11/Makefile
5 5
6DISTNAME= emacs-${EMACS_VERSION} 6DISTNAME= emacs-${EMACS_VERSION}
7PKGNAME?= ${DISTNAME:S/emacs/emacs24/} 7PKGNAME?= ${DISTNAME:S/emacs/emacs24/}
8CATEGORIES= editors 8CATEGORIES= editors
9MASTER_SITES= ${MASTER_SITE_GNU:=emacs/} 9MASTER_SITES= ${MASTER_SITE_GNU:=emacs/}
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.gnu.org/software/emacs/emacs.html 12HOMEPAGE= http://www.gnu.org/software/emacs/emacs.html
13COMMENT= GNU editing macros (editor) 13COMMENT= GNU editing macros (editor)
14LICENSE= gnu-gpl-v3 14LICENSE= gnu-gpl-v3
15 15
16WRKSRC= ${WRKDIR}/${DISTNAME:S/b$//} 16WRKSRC= ${WRKDIR}/${DISTNAME:S/b$//}
17MAKE_JOBS_SAFE= no 17MAKE_JOBS_SAFE= no
18 18
19CONFLICTS+= emacs-nox11-[0-9]* 
20 
21GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
22INFO_FILES= yes 20INFO_FILES= yes
23USE_TOOLS+= autoconf automake gmake makeinfo gzip 21USE_TOOLS+= autoconf automake gmake makeinfo gzip
24 22
25CONFIGURE_ARGS+= --srcdir=${WRKSRC} 23CONFIGURE_ARGS+= --srcdir=${WRKSRC}
26CONFIGURE_ARGS+= --localstatedir=${VARBASE} 24CONFIGURE_ARGS+= --localstatedir=${VARBASE}
27CONFIGURE_ENV+= GAMEOWN=${GAMES_USER} 25CONFIGURE_ENV+= GAMEOWN=${GAMES_USER}
28 26
29SETGIDGAME= yes 27SETGIDGAME= yes
30 28
31BUILD_DEFS+= VARBASE 29BUILD_DEFS+= VARBASE
32BUILD_DEFS+= GAMEDATAMODE 30BUILD_DEFS+= GAMEDATAMODE
33PLIST_SRC+= ../../editors/emacs24/PLIST 31PLIST_SRC+= ../../editors/emacs24/PLIST