- Removed CVS files from the PLIST.

- Fixed all pkglint warnings.
- Bumped PKGREVISION.

2 files changed, 17 insertions, 63 deletions

diff --git a/www/ap-rivet/Makefile b/www/ap-rivet/Makefile
index 80135bc6d78..fe0efe54578 100644
--- a/www/ap-rivet/Makefile
+++ b/www/ap-rivet/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:47:50 tv Exp $
+# $NetBSD: Makefile,v 1.3 2006/01/13 00:36:29 rillig Exp $
 
 DISTNAME=	rivet_0.4.0-1
 PKGNAME=	ap-rivet-0.4.0.1
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE:=tcl/rivet/}
 
@@ -9,19 +10,27 @@ MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://tcl.apache.org/rivet/
 COMMENT=	System for creating dynamic web content via Tcl
 
-WRKSRC=		${WRKDIR}/tcl-rivet/src
+WRKSRC=		${WRKDIR}/tcl-rivet
 HAS_CONFIGURE=	yes
+CONFIGURE_DIRS=	src
 
-CONFIGURE_SCRIPT=	./configure.tcl
-CONFIGURE_ARGS+=	-prefix ${PREFIX}/lib				\
-			-with-apxs ${APXS}				\
-			-with-tclconfig ${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh
 CONFIGURE_ENV+=		LANG=C
+CONFIGURE_SCRIPT=	./configure.tcl
+CONFIGURE_ARGS+=	-prefix ${PREFIX:Q}/lib
+CONFIGURE_ARGS+=	-with-apxs ${APXS:Q}
+CONFIGURE_ARGS+=	-with-tclconfig ${BUILDLINK_PREFIX.tcl:Q}/lib/tclConfig.sh
 
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../www/apache/buildlink3.mk"
 
+pre-install:
+	set -e;								\
+	cd ${WRKSRC:Q};							\
+	for i in "*" "*/*" "*/*/*"; do					\
+		eval ${RM:Q}" -rf $$i/.OLDEntries $$i/CVS";		\
+	done
+
 do-install:
-	cd ${WRKSRC}; ./make.tcl install
+	cd ${WRKSRC:Q}/src && ./make.tcl install
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-rivet/PLIST b/www/ap-rivet/PLIST
index 3846b739733..9e799a5af40 100644
--- a/www/ap-rivet/PLIST
+++ b/www/ap-rivet/PLIST
@@ -1,55 +1,23 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/12/27 23:49:49 minskim Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/01/13 00:36:30 rillig Exp $
 lib/httpd/mod_rivet.so
-lib/rivet/.OLDEntries
-lib/rivet/CVS/Entries
-lib/rivet/CVS/Repository
-lib/rivet/CVS/Root
 lib/rivet/README
 lib/rivet/init.tcl
-lib/rivet/packages/.OLDEntries
-lib/rivet/packages/CVS/Entries
-lib/rivet/packages/CVS/Repository
-lib/rivet/packages/CVS/Root
 lib/rivet/packages/README
-lib/rivet/packages/commserver/.OLDEntries
-lib/rivet/packages/commserver/CVS/Entries
-lib/rivet/packages/commserver/CVS/Repository
-lib/rivet/packages/commserver/CVS/Root
 lib/rivet/packages/commserver/commserver.tcl
 lib/rivet/packages/commserver/server.tcl
-lib/rivet/packages/dio/.OLDEntries
-lib/rivet/packages/dio/CVS/Entries
-lib/rivet/packages/dio/CVS/Repository
-lib/rivet/packages/dio/CVS/Root
 lib/rivet/packages/dio/dio.tcl
 lib/rivet/packages/dio/dio_Mysql.tcl
 lib/rivet/packages/dio/dio_Postgresql.tcl
 lib/rivet/packages/dio/dio_Sqlite.tcl
 lib/rivet/packages/dio/diodisplay.tcl
 lib/rivet/packages/dio/pkgIndex.tcl
-lib/rivet/packages/dtcl/.OLDEntries
-lib/rivet/packages/dtcl/CVS/Entries
-lib/rivet/packages/dtcl/CVS/Repository
-lib/rivet/packages/dtcl/CVS/Root
 lib/rivet/packages/dtcl/dtcl.tcl
 lib/rivet/packages/dtcl/pkgIndex.tcl
-lib/rivet/packages/form/.OLDEntries
-lib/rivet/packages/form/CVS/Entries
-lib/rivet/packages/form/CVS/Repository
-lib/rivet/packages/form/CVS/Root
 lib/rivet/packages/form/form.tcl
 lib/rivet/packages/form/pkgIndex.tcl
-lib/rivet/packages/rivet/.OLDEntries
-lib/rivet/packages/rivet/CVS/Entries
-lib/rivet/packages/rivet/CVS/Repository
-lib/rivet/packages/rivet/CVS/Root
 lib/rivet/packages/rivet/librivet.so
 lib/rivet/packages/rivet/librivetparser.so
 lib/rivet/packages/rivet/pkgIndex.tcl
-lib/rivet/packages/session/.OLDEntries
-lib/rivet/packages/session/CVS/Entries
-lib/rivet/packages/session/CVS/Repository
-lib/rivet/packages/session/CVS/Root
 lib/rivet/packages/session/README.txt
 lib/rivet/packages/session/pkgIndex.tcl
 lib/rivet/packages/session/session-class.tcl
@@ -57,27 +25,15 @@ lib/rivet/packages/session/session-create.sql
 lib/rivet/packages/session/session-demo.rvt
 lib/rivet/packages/session/session-drop.sql
 lib/rivet/packages/session/session-httpd.conf
-lib/rivet/packages/simpledb/.OLDEntries
-lib/rivet/packages/simpledb/CVS/Entries
-lib/rivet/packages/simpledb/CVS/Repository
-lib/rivet/packages/simpledb/CVS/Root
 lib/rivet/packages/simpledb/pkgIndex.tcl
 lib/rivet/packages/simpledb/simpledb.tcl
 lib/rivet/packages/simpledb/simpledb.test
-lib/rivet/packages/tclrivet/.OLDEntries
-lib/rivet/packages/tclrivet/CVS/Entries
-lib/rivet/packages/tclrivet/CVS/Repository
-lib/rivet/packages/tclrivet/CVS/Root
 lib/rivet/packages/tclrivet/README
 lib/rivet/packages/tclrivet/parse.tcl
 lib/rivet/packages/tclrivet/pkgIndex.tcl
 lib/rivet/packages/tclrivet/tclrivet.tcl
 lib/rivet/packages/tclrivet/tclrivetparser.tcl
 lib/rivet/pkgIndex.tcl
-lib/rivet/rivet-tcl/.OLDEntries
-lib/rivet/rivet-tcl/CVS/Entries
-lib/rivet/rivet-tcl/CVS/Repository
-lib/rivet/rivet-tcl/CVS/Root
 lib/rivet/rivet-tcl/README
 lib/rivet/rivet-tcl/cookie.tcl
 lib/rivet/rivet-tcl/debug.tcl
@@ -96,26 +52,15 @@ lib/rivet/rivet-tcl/read_file.tcl
 lib/rivet/rivet-tcl/rivet_command_document.tcl
 lib/rivet/rivet-tcl/tclIndex
 lib/rivet/rivet-tcl/wrap.tcl
-@dirrm lib/rivet/rivet-tcl/CVS
 @dirrm lib/rivet/rivet-tcl
-@dirrm lib/rivet/packages/tclrivet/CVS
 @dirrm lib/rivet/packages/tclrivet
-@dirrm lib/rivet/packages/simpledb/CVS
 @dirrm lib/rivet/packages/simpledb
-@dirrm lib/rivet/packages/session/CVS
 @dirrm lib/rivet/packages/session
-@dirrm lib/rivet/packages/rivet/CVS
 @dirrm lib/rivet/packages/rivet
-@dirrm lib/rivet/packages/form/CVS
 @dirrm lib/rivet/packages/form
-@dirrm lib/rivet/packages/dtcl/CVS
 @dirrm lib/rivet/packages/dtcl
-@dirrm lib/rivet/packages/dio/CVS
 @dirrm lib/rivet/packages/dio
-@dirrm lib/rivet/packages/commserver/CVS
 @dirrm lib/rivet/packages/commserver
-@dirrm lib/rivet/packages/CVS
 @dirrm lib/rivet/packages
-@dirrm lib/rivet/CVS
 @dirrm lib/rivet
 @comment in www/apache: @dirrm lib/httpd