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 (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 (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,88 +1,86 @@ @@ -1,88 +1,86 @@
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}
33CONFIGURE_ENV+= GAMEOWN=${GAMEOWN:Q} 31CONFIGURE_ENV+= GAMEOWN=${GAMEOWN:Q}
34 32
35BUILD_DEFS+= VARBASE 33BUILD_DEFS+= VARBASE
36BUILD_DEFS+= GAMEDATAMODE 34BUILD_DEFS+= GAMEDATAMODE
37 35
38# build PATH in the dumped emacs is not a problem 36# build PATH in the dumped emacs is not a problem
39CHECK_WRKREF_SKIP+= bin/emacs 37CHECK_WRKREF_SKIP+= bin/emacs
40CHECK_WRKREF_SKIP+= bin/emacs-[0-9]* 38CHECK_WRKREF_SKIP+= bin/emacs-[0-9]*
41 39
42REPLACE_PERL= lib-src/grep-changelog 40REPLACE_PERL= lib-src/grep-changelog
43 41
44SUBST_CLASSES+= test_equal 42SUBST_CLASSES+= test_equal
45SUBST_STAGE.test_equal= pre-configure 43SUBST_STAGE.test_equal= pre-configure
46SUBST_MESSAGE.test_equal= Fixing bashisms in test(1) usage. 44SUBST_MESSAGE.test_equal= Fixing bashisms in test(1) usage.
47SUBST_FILES.test_equal= mac/make-package 45SUBST_FILES.test_equal= mac/make-package
48SUBST_SED.test_equal= -e 's/ == / = /g' 46SUBST_SED.test_equal= -e 's/ == / = /g'
49 47
50MAKE_DIRS_PERMS+= ${VARBASE}/games/emacs \ 48MAKE_DIRS_PERMS+= ${VARBASE}/games/emacs \
51 ${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE:Q} 49 ${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE:Q}
52CONF_FILES_PERMS+= /dev/null ${VARBASE}/games/emacs/snake-scores \ 50CONF_FILES_PERMS+= /dev/null ${VARBASE}/games/emacs/snake-scores \
53 ${GAMES_USER} ${GAMES_GROUP} ${GAMEDATAMODE:Q} 51 ${GAMES_USER} ${GAMES_GROUP} ${GAMEDATAMODE:Q}
54CONF_FILES_PERMS+= /dev/null ${VARBASE}/games/emacs/tetris-scores \ 52CONF_FILES_PERMS+= /dev/null ${VARBASE}/games/emacs/tetris-scores \
55 ${GAMES_USER} ${GAMES_GROUP} ${GAMEDATAMODE:Q} 53 ${GAMES_USER} ${GAMES_GROUP} ${GAMEDATAMODE:Q}
56SPECIAL_PERMS+= libexec/emacs/${PKGVERSION_NOREV}/${MACHINE_GNU_PLATFORM}/update-game-score ${SETGID_GAMES_PERMS} 54SPECIAL_PERMS+= libexec/emacs/${PKGVERSION_NOREV}/${MACHINE_GNU_PLATFORM}/update-game-score ${SETGID_GAMES_PERMS}
57 55
58.if (${OPSYS} == "DragonFly") && exists(/usr/lib/crtn.o) 56.if (${OPSYS} == "DragonFly") && exists(/usr/lib/crtn.o)
59CPPFLAGS+= -DDFLY_CRT_USRLIB 57CPPFLAGS+= -DDFLY_CRT_USRLIB
60.endif 58.endif
61 59
62.include "../../mk/compiler.mk" 60.include "../../mk/compiler.mk"
63 61
64# "emacs" uses the C pre-processor to generate makefiles. The C pre-processor 62# "emacs" uses the C pre-processor to generate makefiles. The C pre-processor
65# of newer GCC version is designed to break this by purpose. We work around 63# of newer GCC version is designed to break this by purpose. We work around
66# that using the traditional mode to generate makefiles.  64# that using the traditional mode to generate makefiles.
67.if !empty(CC_VERSION:Mgcc-[4-9].*) 65.if !empty(CC_VERSION:Mgcc-[4-9].*)
68CPP+= -P 66CPP+= -P
69CONFIGURE_ENV+= CPP=${CPP:Q} 67CONFIGURE_ENV+= CPP=${CPP:Q}
70.endif 68.endif
71 69
72post-extract: 70post-extract:
73 cp ${FILESDIR}/site-init.el ${WRKSRC}/lisp 71 cp ${FILESDIR}/site-init.el ${WRKSRC}/lisp
74 cp ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s 72 cp ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s
75 ${CHMOD} -R go-w ${WRKSRC} 73 ${CHMOD} -R go-w ${WRKSRC}
76 74
77# These dirs are installed by tar-copy and can sometimes come out mode 75# These dirs are installed by tar-copy and can sometimes come out mode
78# 754, which if PKG_DEVELOPER is set causes the build to fail. 76# 754, which if PKG_DEVELOPER is set causes the build to fail.
79post-install: 77post-install:
80.for file in leim leim/ja-dic leim/quail 78.for file in leim leim/ja-dic leim/quail
81 ${CHMOD} 755 ${DESTDIR}${PREFIX}/share/emacs/${PKGVERSION_NOREV}/${file} 79 ${CHMOD} 755 ${DESTDIR}${PREFIX}/share/emacs/${PKGVERSION_NOREV}/${file}
82.endfor 80.endfor
83 81
84 82
85.include "../../mk/oss.buildlink3.mk" 83.include "../../mk/oss.buildlink3.mk"
86.include "../../mk/termcap.buildlink3.mk" 84.include "../../mk/termcap.buildlink3.mk"
87 85
88.include "../../mk/bsd.pkg.mk" 86.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/editors/emacs22-nox11/Attic/Makefile (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"