Update ap-rivet to 0.5.0. Mainly conversion to autotools.

5 files changed, 114 insertions, 86 deletions

diff --git a/www/ap-rivet/Makefile b/www/ap-rivet/Makefile
index eee28afb38f..82dbcde05a2 100644
--- a/www/ap-rivet/Makefile
+++ b/www/ap-rivet/Makefile
@@ -1,25 +1,21 @@
-# $NetBSD: Makefile,v 1.6 2006/06/02 18:27:59 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2006/08/23 11:22:06 minskim Exp $
 
-DISTNAME=	rivet_0.4.0-1
-PKGNAME=	ap13-rivet-0.4.0.1
+DISTNAME=	rivet-0.5.0
+PKGNAME=	ap13-${DISTNAME}
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_APACHE:=tcl/rivet/}
+MASTER_SITES=	http://apache.mirror99.com/tcl/rivet/
 
-MAINTAINER=	minskim@NetBSD.org
+MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://tcl.apache.org/rivet/
 COMMENT=	System for creating dynamic web content via Tcl
 
 CONFLICTS=	ap-rivet-[0-9]*
 
-WRKSRC=		${WRKDIR}/tcl-rivet
-HAS_CONFIGURE=	yes
-CONFIGURE_DIRS=	src
+GNU_CONFIGURE=	yes
 
-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
+#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"
@@ -28,10 +24,7 @@ pre-install:
 	set -e;								\
 	cd ${WRKSRC:Q};							\
 	for i in "*" "*/*" "*/*/*"; do					\
-		eval ${RM:Q}" -rf $$i/.OLDEntries $$i/CVS";		\
+		eval ${RM:Q}" -rf $$i/CVS";				\
 	done
 
-do-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 9e799a5af40..b7dafff00a1 100644
--- a/www/ap-rivet/PLIST
+++ b/www/ap-rivet/PLIST
@@ -1,66 +1,69 @@
-@comment $NetBSD: PLIST,v 1.2 2006/01/13 00:36:30 rillig Exp $
-lib/httpd/mod_rivet.so
-lib/rivet/README
-lib/rivet/init.tcl
-lib/rivet/packages/README
-lib/rivet/packages/commserver/commserver.tcl
-lib/rivet/packages/commserver/server.tcl
-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/dtcl.tcl
-lib/rivet/packages/dtcl/pkgIndex.tcl
-lib/rivet/packages/form/form.tcl
-lib/rivet/packages/form/pkgIndex.tcl
-lib/rivet/packages/rivet/librivet.so
-lib/rivet/packages/rivet/librivetparser.so
-lib/rivet/packages/rivet/pkgIndex.tcl
-lib/rivet/packages/session/README.txt
-lib/rivet/packages/session/pkgIndex.tcl
-lib/rivet/packages/session/session-class.tcl
-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/pkgIndex.tcl
-lib/rivet/packages/simpledb/simpledb.tcl
-lib/rivet/packages/simpledb/simpledb.test
-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/README
-lib/rivet/rivet-tcl/cookie.tcl
-lib/rivet/rivet-tcl/debug.tcl
-lib/rivet/rivet-tcl/html.tcl
-lib/rivet/rivet-tcl/import_keyvalue_pairs.tcl
-lib/rivet/rivet-tcl/import_switch_args.tcl
-lib/rivet/rivet-tcl/incr0.tcl
-lib/rivet/rivet-tcl/lassign.tcl
-lib/rivet/rivet-tcl/lempty.tcl
-lib/rivet/rivet-tcl/lmatch.tcl
-lib/rivet/rivet-tcl/load_cookies.tcl
-lib/rivet/rivet-tcl/load_response.tcl
-lib/rivet/rivet-tcl/parray.tcl
-lib/rivet/rivet-tcl/random.tcl
-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
-@dirrm lib/rivet/packages/tclrivet
-@dirrm lib/rivet/packages/simpledb
-@dirrm lib/rivet/packages/session
-@dirrm lib/rivet/packages/rivet
-@dirrm lib/rivet/packages/form
-@dirrm lib/rivet/packages/dtcl
-@dirrm lib/rivet/packages/dio
-@dirrm lib/rivet/packages/commserver
-@dirrm lib/rivet/packages
+@comment $NetBSD: PLIST,v 1.3 2006/08/23 11:22:06 minskim Exp $
+lib/httpd/mod_rivet.la
+lib/rivet/librivet.la
+lib/rivet/librivetparser.la
+lib/rivet${PKGVERSION}/README
+lib/rivet${PKGVERSION}/init.tcl
+lib/rivet${PKGVERSION}/packages/README
+lib/rivet${PKGVERSION}/packages/commserver/commserver.tcl
+lib/rivet${PKGVERSION}/packages/commserver/server.tcl
+lib/rivet${PKGVERSION}/packages/dio/dio.tcl
+lib/rivet${PKGVERSION}/packages/dio/dio_Mysql.tcl
+lib/rivet${PKGVERSION}/packages/dio/dio_Postgresql.tcl
+lib/rivet${PKGVERSION}/packages/dio/dio_Sqlite.tcl
+lib/rivet${PKGVERSION}/packages/dio/diodisplay.tcl
+lib/rivet${PKGVERSION}/packages/dio/pkgIndex.tcl
+lib/rivet${PKGVERSION}/packages/dtcl/dtcl.tcl
+lib/rivet${PKGVERSION}/packages/dtcl/pkgIndex.tcl
+lib/rivet${PKGVERSION}/packages/form/form.tcl
+lib/rivet${PKGVERSION}/packages/form/pkgIndex.tcl
+lib/rivet${PKGVERSION}/packages/rivet_ncgi/rivet_ncgi.tcl
+lib/rivet${PKGVERSION}/packages/session/README.txt
+lib/rivet${PKGVERSION}/packages/session/pkgIndex.tcl
+lib/rivet${PKGVERSION}/packages/session/session-class.tcl
+lib/rivet${PKGVERSION}/packages/session/session-create.sql
+lib/rivet${PKGVERSION}/packages/session/session-demo.rvt
+lib/rivet${PKGVERSION}/packages/session/session-drop.sql
+lib/rivet${PKGVERSION}/packages/session/session-httpd.conf
+lib/rivet${PKGVERSION}/packages/simpledb/pkgIndex.tcl
+lib/rivet${PKGVERSION}/packages/simpledb/simpledb.tcl
+lib/rivet${PKGVERSION}/packages/simpledb/simpledb.test
+lib/rivet${PKGVERSION}/packages/tclrivet/README
+lib/rivet${PKGVERSION}/packages/tclrivet/parse.tcl
+lib/rivet${PKGVERSION}/packages/tclrivet/pkgIndex.tcl
+lib/rivet${PKGVERSION}/packages/tclrivet/tclrivet.tcl
+lib/rivet${PKGVERSION}/packages/tclrivet/tclrivetparser.tcl
+lib/rivet${PKGVERSION}/pkgIndex.tcl
+lib/rivet${PKGVERSION}/rivet-tcl/README
+lib/rivet${PKGVERSION}/rivet-tcl/cookie.tcl
+lib/rivet${PKGVERSION}/rivet-tcl/debug.tcl
+lib/rivet${PKGVERSION}/rivet-tcl/html.tcl
+lib/rivet${PKGVERSION}/rivet-tcl/import_keyvalue_pairs.tcl
+lib/rivet${PKGVERSION}/rivet-tcl/import_switch_args.tcl
+lib/rivet${PKGVERSION}/rivet-tcl/incr0.tcl
+lib/rivet${PKGVERSION}/rivet-tcl/lassign.tcl
+lib/rivet${PKGVERSION}/rivet-tcl/lempty.tcl
+lib/rivet${PKGVERSION}/rivet-tcl/lmatch.tcl
+lib/rivet${PKGVERSION}/rivet-tcl/load_cookies.tcl
+lib/rivet${PKGVERSION}/rivet-tcl/load_response.tcl
+lib/rivet${PKGVERSION}/rivet-tcl/parray.tcl
+lib/rivet${PKGVERSION}/rivet-tcl/random.tcl
+lib/rivet${PKGVERSION}/rivet-tcl/read_file.tcl
+lib/rivet${PKGVERSION}/rivet-tcl/rivet_command_document.tcl
+lib/rivet${PKGVERSION}/rivet-tcl/tclIndex
+lib/rivet${PKGVERSION}/rivet-tcl/wrap.tcl
+@dirrm lib/rivet${PKGVERSION}/rivet-tcl
+@dirrm lib/rivet${PKGVERSION}/packages/tclrivet
+@dirrm lib/rivet${PKGVERSION}/packages/simpledb
+@dirrm lib/rivet${PKGVERSION}/packages/session
+@dirrm lib/rivet${PKGVERSION}/packages/rivet_ncgi
+@exec ${MKDIR} %D/lib/rivet${PKGVERSION}/packages/rivet
+@dirrm lib/rivet${PKGVERSION}/packages/rivet
+@dirrm lib/rivet${PKGVERSION}/packages/form
+@dirrm lib/rivet${PKGVERSION}/packages/dtcl
+@dirrm lib/rivet${PKGVERSION}/packages/dio
+@dirrm lib/rivet${PKGVERSION}/packages/commserver
+@dirrm lib/rivet${PKGVERSION}/packages
+@dirrm lib/rivet${PKGVERSION}
 @dirrm lib/rivet
-@comment in www/apache: @dirrm lib/httpd
+@comment In www/apache: @dirrm lib/httpd
diff --git a/www/ap-rivet/distinfo b/www/ap-rivet/distinfo
index 299454b965a..c36c8ecc8ac 100644
--- a/www/ap-rivet/distinfo
+++ b/www/ap-rivet/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.3 2006/06/10 20:06:56 minskim Exp $
+$NetBSD: distinfo,v 1.4 2006/08/23 11:22:06 minskim Exp $
 
-SHA1 (rivet_0.4.0-1.tar.gz) = 3d542afcc203c6d3d20ab3456c63c7c549ef0008
-RMD160 (rivet_0.4.0-1.tar.gz) = d72dc6afed2972d6527b3746771388e7375423d0
-Size (rivet_0.4.0-1.tar.gz) = 547851 bytes
+SHA1 (rivet-0.5.0.tar.gz) = a273d1fe72780491294aa8f164fd92f50f2fe8ac
+RMD160 (rivet-0.5.0.tar.gz) = 1cf02739f16156761ce8d10df855c5812e492312
+Size (rivet-0.5.0.tar.gz) = 792027 bytes
 SHA1 (patch-aa) = 63fd2544995a5cf4a0245a8c42d9af9ab4dfa8be
+SHA1 (patch-ab) = 66d7832e71a0d7c19be0a01d5e16ae38fc653f09
+SHA1 (patch-ac) = af11e2e286fc00c611e255b07942cb9fd543eb70
diff --git a/www/ap-rivet/patches/patch-ab b/www/ap-rivet/patches/patch-ab
new file mode 100644
index 00000000000..b28ec80f4db
--- /dev/null
+++ b/www/ap-rivet/patches/patch-ab
@@ -0,0 +1,17 @@
+$NetBSD: patch-ab,v 1.1 2006/08/23 11:22:07 minskim Exp $
+
+--- src/TclWebapache.c.orig	2004-12-03 02:17:10.000000000 +0000
++++ src/TclWebapache.c
+@@ -660,10 +660,10 @@ TclWeb_GetEnvVar( TclWebRequest *req, ch
+     TclWeb_InitEnvVars( req );
+ 
+     /* Check to see if it's a header variable first. */
+-    (const char *)val = ap_table_get( req->req->headers_in, key );
++    val = (char *)ap_table_get( req->req->headers_in, key );
+ 
+     if( !val ) {
+-	(const char *)val = ap_table_get( req->req->subprocess_env, key );
++	val = (char *)ap_table_get( req->req->subprocess_env, key );
+     }
+ 
+     return val;
diff --git a/www/ap-rivet/patches/patch-ac b/www/ap-rivet/patches/patch-ac
new file mode 100644
index 00000000000..d1e0503bae8
--- /dev/null
+++ b/www/ap-rivet/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2006/08/23 11:22:07 minskim Exp $
+
+--- src/Makefile.in.orig	2005-03-24 10:32:04.000000000 +0000
++++ src/Makefile.in
+@@ -281,7 +281,7 @@ apxs_libexec_LTLIBRARIES = mod_rivet.la
+ 
+ # ... and these two.  We want to put the libs in the package path,
+ # rather than the standard library location for the system.
+-lib_libexecdir = @TCL_PACKAGE_PATH@/rivet
++lib_libexecdir = @prefix@/lib/rivet
+ lib_libexec_LTLIBRARIES = librivet.la librivetparser.la
+ 
+ #