Tue May 6 02:34:39 2008 UTC ()
Seems my sources were slightly out of date and DOC-22.1.2 problem had
been solved a different way.  Back out it's addition to the PLIST.


(jnemeth)
diff -r1.111 -r1.112 pkgsrc/editors/emacs/Makefile
diff -r1.16 -r1.17 pkgsrc/editors/emacs/PLIST

cvs diff -r1.111 -r1.112 pkgsrc/editors/emacs/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/emacs/Makefile 2008/05/05 15:04:15 1.111
+++ pkgsrc/editors/emacs/Makefile 2008/05/06 02:34:39 1.112
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.111 2008/05/05 15:04:15 jnemeth Exp $ 1# $NetBSD: Makefile,v 1.112 2008/05/06 02:34:39 jnemeth Exp $
2 2
3PKGNAME?= ${DISTNAME} 3PKGNAME?= ${DISTNAME}
4COMMENT?= GNU editing macros (editor) 4COMMENT?= GNU editing macros (editor)
5 5
6DISTNAME= emacs-22.1 6DISTNAME= emacs-22.1
7PKGREVISION= 5 7PKGREVISION= 4
8CATEGORIES= editors 8CATEGORIES= editors
9MASTER_SITES= ${MASTER_SITE_GNU:=emacs/} 9MASTER_SITES= ${MASTER_SITE_GNU:=emacs/}
10 10
11MAINTAINER= markd@NetBSD.org 11MAINTAINER= markd@NetBSD.org
12HOMEPAGE= http://www.gnu.org/software/emacs/emacs.html 12HOMEPAGE= http://www.gnu.org/software/emacs/emacs.html
13 13
14CONFLICTS+= elisp-manual-[0-9]* 14CONFLICTS+= elisp-manual-[0-9]*
15CONFLICTS+= emacs-[0-9]* 15CONFLICTS+= emacs-[0-9]*
16CONFLICTS+= emacs-nox11-[0-9]* 16CONFLICTS+= emacs-nox11-[0-9]*
17CONFLICTS+= mule-[0-9]* 17CONFLICTS+= mule-[0-9]*
18 18
19PKG_DESTDIR_SUPPORT= user-destdir 19PKG_DESTDIR_SUPPORT= user-destdir
20 20

cvs diff -r1.16 -r1.17 pkgsrc/editors/emacs/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/editors/emacs/Attic/PLIST 2008/05/05 15:04:15 1.16
+++ pkgsrc/editors/emacs/Attic/PLIST 2008/05/06 02:34:39 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.16 2008/05/05 15:04:15 jnemeth Exp $ 1@comment $NetBSD: PLIST,v 1.17 2008/05/06 02:34:39 jnemeth Exp $
2bin/emacs-b2m 2bin/emacs-b2m
3bin/emacs-ctags 3bin/emacs-ctags
4bin/emacs-ebrowse 4bin/emacs-ebrowse
5bin/emacs 5bin/emacs
6bin/emacs-${PKGVERSION} 6bin/emacs-${PKGVERSION}
7bin/emacsclient 7bin/emacsclient
8bin/emacs-etags 8bin/emacs-etags
9bin/emacs-grep-changelog 9bin/emacs-grep-changelog
10bin/emacs-rcs-checkin 10bin/emacs-rcs-checkin
11info/ada-mode 11info/ada-mode
12info/autotype 12info/autotype
13info/calc 13info/calc
14info/calc-1 14info/calc-1
@@ -93,27 +93,26 @@ libexec/emacs/${PKGVERSION}/${MACHINE_GN @@ -93,27 +93,26 @@ libexec/emacs/${PKGVERSION}/${MACHINE_GN
93libexec/emacs/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/vcdiff 93libexec/emacs/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/vcdiff
94man/man1/emacs-ctags.1 94man/man1/emacs-ctags.1
95man/man1/emacs.1 95man/man1/emacs.1
96man/man1/emacsclient.1 96man/man1/emacsclient.1
97man/man1/emacs-etags.1 97man/man1/emacs-etags.1
98share/emacs/${PKGVERSION}/etc/BABYL 98share/emacs/${PKGVERSION}/etc/BABYL
99share/emacs/${PKGVERSION}/etc/CENSORSHIP 99share/emacs/${PKGVERSION}/etc/CENSORSHIP
100share/emacs/${PKGVERSION}/etc/COOKIES 100share/emacs/${PKGVERSION}/etc/COOKIES
101share/emacs/${PKGVERSION}/etc/COPYING 101share/emacs/${PKGVERSION}/etc/COPYING
102share/emacs/${PKGVERSION}/etc/DEBUG 102share/emacs/${PKGVERSION}/etc/DEBUG
103share/emacs/${PKGVERSION}/etc/DEVEL.HUMOR 103share/emacs/${PKGVERSION}/etc/DEVEL.HUMOR
104share/emacs/${PKGVERSION}/etc/DISTRIB 104share/emacs/${PKGVERSION}/etc/DISTRIB
105share/emacs/${PKGVERSION}/etc/DOC-${PKGVERSION}.1 105share/emacs/${PKGVERSION}/etc/DOC-${PKGVERSION}.1
106share/emacs/${PKGVERSION}/etc/DOC-${PKGVERSION}.2 
107share/emacs/${PKGVERSION}/etc/ERC-NEWS 106share/emacs/${PKGVERSION}/etc/ERC-NEWS
108share/emacs/${PKGVERSION}/etc/ETAGS.EBNF 107share/emacs/${PKGVERSION}/etc/ETAGS.EBNF
109share/emacs/${PKGVERSION}/etc/ETAGS.README 108share/emacs/${PKGVERSION}/etc/ETAGS.README
110share/emacs/${PKGVERSION}/etc/FTP 109share/emacs/${PKGVERSION}/etc/FTP
111share/emacs/${PKGVERSION}/etc/GNU 110share/emacs/${PKGVERSION}/etc/GNU
112share/emacs/${PKGVERSION}/etc/GNUS-NEWS 111share/emacs/${PKGVERSION}/etc/GNUS-NEWS
113share/emacs/${PKGVERSION}/etc/HELLO 112share/emacs/${PKGVERSION}/etc/HELLO
114share/emacs/${PKGVERSION}/etc/INTERVIEW 113share/emacs/${PKGVERSION}/etc/INTERVIEW
115share/emacs/${PKGVERSION}/etc/JOKES 114share/emacs/${PKGVERSION}/etc/JOKES
116share/emacs/${PKGVERSION}/etc/LINUX-GNU 115share/emacs/${PKGVERSION}/etc/LINUX-GNU
117share/emacs/${PKGVERSION}/etc/MACHINES 116share/emacs/${PKGVERSION}/etc/MACHINES
118share/emacs/${PKGVERSION}/etc/MAILINGLISTS 117share/emacs/${PKGVERSION}/etc/MAILINGLISTS
119share/emacs/${PKGVERSION}/etc/MH-E-NEWS 118share/emacs/${PKGVERSION}/etc/MH-E-NEWS