share/emacs/site-lisp now exists by default -- don't try to remove it.

Bump PKGREVISION for the PLIST change.

24 files changed, 36 insertions, 54 deletions

diff --git a/chat/zephyr-mode/Makefile b/chat/zephyr-mode/Makefile
index a988cad36f1..0c0159fae9b 100644
--- a/chat/zephyr-mode/Makefile
+++ b/chat/zephyr-mode/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2006/10/04 20:50:47 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/20 19:04:10 wiz Exp $
 #
 
 DISTNAME=	zephyr-mode-2.5.20
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	chat net
 MASTER_SITES=	http://www.cs.cmu.edu/People/dkindred/zephyr-mode/
 
diff --git a/chat/zephyr-mode/PLIST b/chat/zephyr-mode/PLIST
index 57bc350b7c6..168b9325f9e 100644
--- a/chat/zephyr-mode/PLIST
+++ b/chat/zephyr-mode/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/12/30 17:41:35 sommerfeld Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/02/20 19:04:10 wiz Exp $
 share/emacs/site-lisp/zephyr-mode/gnus-url.el
 share/emacs/site-lisp/zephyr-mode/hot-link.el
 share/emacs/site-lisp/zephyr-mode/hot-url.el
@@ -13,4 +13,3 @@ share/emacs/site-lisp/zephyr-mode/zephyr-url.el
 share/emacs/site-lisp/zephyr-mode/zephyr.el
 share/emacs/site-lisp/zephyr-mode/zlocate-finger.el
 @dirrm share/emacs/site-lisp/zephyr-mode
-@dirrm share/emacs/site-lisp
diff --git a/devel/ftnchek/Makefile b/devel/ftnchek/Makefile
index 47b9ac34cec..24377f098cb 100644
--- a/devel/ftnchek/Makefile
+++ b/devel/ftnchek/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2006/03/04 21:29:15 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2007/02/20 19:04:11 wiz Exp $
 
 DISTNAME=	ftnchek-3.2.2
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.dsm.fordham.edu/~ftnchek/download/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/ftnchek/PLIST b/devel/ftnchek/PLIST
index 2d1f7b83558..6feb2ba7df6 100644
--- a/devel/ftnchek/PLIST
+++ b/devel/ftnchek/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/06/29 22:24:33 jtb Exp $
+@comment $NetBSD: PLIST,v 1.5 2007/02/20 19:04:11 wiz Exp $
 bin/dcl2inc
 bin/ftnchek
 libexec/ftnchek/dcl2inc.awk
@@ -72,7 +72,6 @@ share/doc/ftnchek/html/wordsize.html
 share/doc/ftnchek/html/wrap.html
 share/doc/ftnchek/macro-doc.txt
 share/emacs/site-lisp/ftnchek.el
-@unexec ${RMDIR} %D/share/emacs/site-lisp 2>/dev/null || ${TRUE}
 @dirrm share/doc/ftnchek/html
 @dirrm share/doc/ftnchek
 @dirrm libexec/ftnchek
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index b0b11471a6c..76cffa887c5 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.101 2007/01/25 20:59:15 markd Exp $
+# $NetBSD: Makefile,v 1.102 2007/02/20 19:04:11 wiz Exp $
 
 DISTNAME=	emacs-${EMACSVERSION}a
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	editors
 COMMENT=	GNU editing macros (editor)
 
diff --git a/editors/emacs/PLIST b/editors/emacs/PLIST
index a553490cda9..6336e7ad136 100644
--- a/editors/emacs/PLIST
+++ b/editors/emacs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2006/05/13 10:21:17 rillig Exp $
+@comment $NetBSD: PLIST,v 1.14 2007/02/20 19:04:11 wiz Exp $
 bin/emacs
 bin/emacs-${EMACSVERSION}
 bin/emacs-b2m
@@ -1768,7 +1768,6 @@ share/emacs/${EMACSVERSION}/lisp/xt-mouse.el
 share/emacs/${EMACSVERSION}/lisp/xt-mouse.elc
 share/emacs/${EMACSVERSION}/site-lisp/subdirs.el
 share/emacs/site-lisp/subdirs.el
-@unexec ${RMDIR} %D/share/emacs/site-lisp 2>/dev/null || ${TRUE}
 @dirrm share/emacs/${EMACSVERSION}/site-lisp
 @dirrm share/emacs/${EMACSVERSION}/lisp/toolbar
 @dirrm share/emacs/${EMACSVERSION}/lisp/textmodes
diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile
index 3ad7578e0b3..98cc0d0743b 100644
--- a/editors/emacs20/Makefile
+++ b/editors/emacs20/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2006/12/06 15:03:49 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2007/02/20 19:04:11 wiz Exp $
 
 DISTNAME=	emacs-20.7
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GNU:=emacs/} \
 		${MASTER_SITE_LOCAL}
diff --git a/editors/emacs20/PLIST b/editors/emacs20/PLIST
index 26e55601d63..bfd642848c4 100644
--- a/editors/emacs20/PLIST
+++ b/editors/emacs20/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2006/04/14 23:24:46 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2007/02/20 19:04:12 wiz Exp $
 bin/emacs
 bin/emacs-${PKGVERSION}
 bin/emacs-b2m
@@ -1294,7 +1294,6 @@ share/emacs/${PKGVERSION}/lisp/zone-mode.elc
 share/emacs/${PKGVERSION}/site-lisp/subdirs.el
 @dirrm share/emacs/${PKGVERSION}/site-lisp
 share/emacs/site-lisp/subdirs.el
-@unexec ${RMDIR} %D/share/emacs/site-lisp 2>/dev/null || ${TRUE}
 @exec ${MKDIR} %D/share/emacs/${PKGVERSION}/leim
 @dirrm share/emacs/${PKGVERSION}/leim
 @dirrm share/emacs/${PKGVERSION}
diff --git a/lang/gforth/Makefile b/lang/gforth/Makefile
index 13e20233fde..bf3d8916ad8 100644
--- a/lang/gforth/Makefile
+++ b/lang/gforth/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2006/04/04 18:07:16 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2007/02/20 19:04:12 wiz Exp $
 
 DISTNAME=		gforth-0.6.2
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_GNU:=gforth/}
 MASTER_SITES+=		http://www.complang.tuwien.ac.at/forth/gforth/
diff --git a/lang/gforth/PLIST b/lang/gforth/PLIST
index 58d380d74de..90d4a4e4818 100644
--- a/lang/gforth/PLIST
+++ b/lang/gforth/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2006/04/04 17:16:28 jlam Exp $
+@comment $NetBSD: PLIST,v 1.9 2007/02/20 19:04:13 wiz Exp $
 bin/gforth
 bin/${PKGNAME}
 bin/gforth-fast
@@ -228,7 +228,5 @@ share/gforth/site-forth/siteinit.fs
 @dirrm lib/gforth/${PKGVERSION}
 @unexec ${RMDIR} %D/share/gforth/site-forth 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/share/gforth 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/emacs/site-lisp 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/emacs 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/lib/gforth/site-forth 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/lib/gforth 2>/dev/null || ${TRUE}
diff --git a/lang/mercury/Makefile b/lang/mercury/Makefile
index 1fed0aaffe3..1a1d68f678b 100644
--- a/lang/mercury/Makefile
+++ b/lang/mercury/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2007/02/15 14:36:39 rillig Exp $
+# $NetBSD: Makefile,v 1.32 2007/02/20 19:04:13 wiz Exp $
 
 DISTNAME=		mercury-compiler-0.11.0
 PKGNAME=		mercury-0.11.0
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		lang
 MASTER_SITES=		ftp://ftp.mercury.cs.mu.oz.au/pub/mercury/ \
 			${MASTER_SITE_SUNSITE:=devel/lang/mercury/}
diff --git a/lang/mercury/PLIST b/lang/mercury/PLIST
index 15adc62309d..803d851b64a 100644
--- a/lang/mercury/PLIST
+++ b/lang/mercury/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2006/04/05 06:27:41 jlam Exp $
+@comment $NetBSD: PLIST,v 1.9 2007/02/20 19:04:14 wiz Exp $
 bin/c2init
 bin/canonical_grade
 bin/info_to_mdb
@@ -2063,8 +2063,6 @@ share/examples/mercury/ultra_sub.m
 @dirrm share/examples/mercury/c_interface
 @dirrm share/examples/mercury
 @dirrm share/emacs/site-lisp/mercury
-@unexec ${RMDIR} %D/share/emacs/site-lisp 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/emacs 2>/dev/null || ${TRUE}
 @dirrm share/doc/mercury
 @dirrm share/doc/html/mercury
 @dirrm lib/mercury/modules
diff --git a/lang/oo2c/Makefile b/lang/oo2c/Makefile
index ef5bbc8edf7..4522f400a81 100644
--- a/lang/oo2c/Makefile
+++ b/lang/oo2c/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2006/11/12 01:43:21 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2007/02/20 19:04:14 wiz Exp $
 
 DISTNAME=		oo2c_${BITS}-2.0.11
 PKGNAME=		oo2c-2.0.11
-PKGREVISION=		7
+PKGREVISION=		8
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=ooc/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/lang/oo2c/PLIST b/lang/oo2c/PLIST
index 1ea3fe2db50..fd78b7a46ea 100644
--- a/lang/oo2c/PLIST
+++ b/lang/oo2c/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:40 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2007/02/20 19:04:14 wiz Exp $
 bin/oo2c
 bin/oob
 bin/oobacktrace
@@ -610,8 +610,6 @@ man/man1/ooef.1
 man/man1/oowhereis.1
 share/doc/html/oo2c
 share/emacs/site-lisp/oo2c
-@unexec ${RMDIR} %D/share/emacs/site-lisp 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/emacs 2>/dev/null || ${TRUE}
 @dirrm lib/oo2c/sym/XML/UnicodeCodec
 @dirrm lib/oo2c/sym/XML/Builder
 @dirrm lib/oo2c/sym/XML/Basic
diff --git a/lang/sather/Makefile b/lang/sather/Makefile
index 1529134032c..8be0f138f73 100644
--- a/lang/sather/Makefile
+++ b/lang/sather/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2007/01/07 09:13:57 rillig Exp $
+# $NetBSD: Makefile,v 1.36 2007/02/20 19:04:14 wiz Exp $
 
 DISTNAME=		sather-1.2.1
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_GNU:=sather/}
 
diff --git a/lang/sather/PLIST b/lang/sather/PLIST
index c1a0a6db8e0..4413e105e8f 100644
--- a/lang/sather/PLIST
+++ b/lang/sather/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2006/04/05 06:27:42 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2007/02/20 19:04:14 wiz Exp $
 bin/sabrowse
 bin/sacomp
 info/sather-mode.info
@@ -469,8 +469,6 @@ share/emacs/site-lisp/hl319.el
 share/emacs/site-lisp/sather-lib.el
 share/emacs/site-lisp/sather-module.el
 share/emacs/site-lisp/sather.el
-@unexec ${RMDIR} %D/share/emacs/site-lisp 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/emacs 2>/dev/null || ${TRUE}
 @dirrm share/doc/sather/header
 @dirrm share/doc/sather/Gui
 @dirrm share/doc/sather
diff --git a/math/aribas/Makefile b/math/aribas/Makefile
index ac9f90729fc..f4a7504a3ba 100644
--- a/math/aribas/Makefile
+++ b/math/aribas/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2007/01/07 09:13:59 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2007/02/20 19:04:14 wiz Exp $
 
 DISTNAME=	aribas-1.53
+PKGREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.mathematik.uni-muenchen.de/pub/forster/aribas/
 
diff --git a/math/aribas/PLIST b/math/aribas/PLIST
index 7da965cbbaf..f6d784b0351 100644
--- a/math/aribas/PLIST
+++ b/math/aribas/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/08/30 20:49:21 jtb Exp $
+@comment $NetBSD: PLIST,v 1.5 2007/02/20 19:04:14 wiz Exp $
 bin/aribas
 man/man1/aribas.1
 share/doc/aribas/aribas.doc
@@ -9,6 +9,5 @@ share/examples/aribas/README
 share/examples/aribas/factor.ari
 share/examples/aribas/pi.ari
 share/examples/aribas/queens.ari
-@unexec ${RMDIR} %D/share/emacs/site-lisp 2>/dev/null || ${TRUE}
 @dirrm share/examples/aribas
 @dirrm share/doc/aribas
diff --git a/math/yacas/Makefile b/math/yacas/Makefile
index 60d0b14081e..954ca1193e8 100644
--- a/math/yacas/Makefile
+++ b/math/yacas/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2007/02/20 00:39:35 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2007/02/20 19:04:14 wiz Exp $
 #
 
 DISTNAME=	yacas-1.0.59
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	http://yacas.sourceforge.net/backups/
 
diff --git a/math/yacas/PLIST b/math/yacas/PLIST
index e36e9e25b02..3dfdecb3a06 100644
--- a/math/yacas/PLIST
+++ b/math/yacas/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2005/10/25 17:55:56 drochner Exp $
+@comment $NetBSD: PLIST,v 1.9 2007/02/20 19:04:15 wiz Exp $
 bin/yacas
 bin/yacas.sh
 bin/yacas_client
@@ -498,6 +498,4 @@ share/yacas/yacasinit.ys
 @dirrm share/yacas/array.rep
 @dirrm share/yacas/addons
 @dirrm share/yacas
-@unexec ${RMDIR} %D/share/emacs/site-lisp 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/emacs 2>/dev/null || ${TRUE}
 @dirrm lib/yacas
diff --git a/net/freewais-sf/Makefile b/net/freewais-sf/Makefile
index 68b0c348c60..130a0196429 100644
--- a/net/freewais-sf/Makefile
+++ b/net/freewais-sf/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.27 2006/10/04 21:53:16 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2007/02/20 19:04:15 wiz Exp $
 #
 
 DISTNAME=	freeWAIS-sf-2.2.12
 PKGNAME=	freewais-sf-2.2.12
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	net databases
 MASTER_SITES=	ftp://ftp.ngb.se/pub/linux/wais/ \
 		ftp://ftp.informatik.uni-hamburg.de/pub/soft/infosystems/wais/freeWAIS/
diff --git a/net/freewais-sf/PLIST b/net/freewais-sf/PLIST
index 7a0451eea90..543974f18c9 100644
--- a/net/freewais-sf/PLIST
+++ b/net/freewais-sf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2006/03/31 22:43:03 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2007/02/20 19:04:15 wiz Exp $
 bin/catalog
 bin/check-sources
 bin/dictionary
@@ -31,5 +31,3 @@ man/man1/waisserver.1
 man/man1/xwais.1
 man/man1/xwaisq.1
 share/emacs/site-lisp/wais.el
-@unexec ${RMDIR} %D/share/emacs/site-lisp 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/emacs 2>/dev/null || ${TRUE}
diff --git a/shells/esh/Makefile b/shells/esh/Makefile
index 6657daee881..6a17369d13e 100644
--- a/shells/esh/Makefile
+++ b/shells/esh/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2006/04/07 15:28:49 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2007/02/20 19:04:15 wiz Exp $
 
 DISTNAME=		esh-0.8
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		shells
 MASTER_SITES=		${MASTER_SITE_BACKUP}
 
diff --git a/shells/esh/PLIST b/shells/esh/PLIST
index 5c63d374724..466004c85e9 100644
--- a/shells/esh/PLIST
+++ b/shells/esh/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2006/04/07 15:28:49 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2007/02/20 19:04:15 wiz Exp $
 bin/esh
 info/esh.info
 share/doc/esh/esh.html
@@ -16,8 +16,5 @@ share/examples/esh/test4.esh
 share/examples/esh/test5.esh
 share/examples/esh/test6.esh
 share/examples/esh/test7.esh
-@unexec ${RMDIR} %D/share/emacs/site-lisp 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/emacs 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share 2>/dev/null || ${TRUE}
 @dirrm share/examples/esh
 @dirrm share/doc/esh