Upgrade to 1.2.32, remove dependency to bash2.

PR:		ports/54458
Submitted by:	maintainer

6 files changed, 38 insertions, 26 deletions

diff --git a/www/caudium12/Makefile b/www/caudium12/Makefile
index 6adbea200531..55c275e16dd2 100644
--- a/www/caudium12/Makefile
+++ b/www/caudium12/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	caudium12
-PORTVERSION=	1.2.26
-PORTREVISION=	1
+PORTVERSION=	1.2.32
+PORTREVISION=	0
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.oav.net/caudium/source/	\
 		ftp://ftp.caudium.net/caudium/source/ \
@@ -20,19 +20,19 @@ DISTNAME=	caudium-${PORTVERSION}
 MAINTAINER=	kiwi@oav.net
 COMMENT=	A free webserver which is based on the Roxen Challenger 1.3 code base
 
-BUILD_DEPENDS=	pike:${PORTSDIR}/lang/pike72/ \
-		bash:${PORTSDIR}/shells/bash2/
+BUILD_DEPENDS=	pike:${PORTSDIR}/lang/pike72/
 LIB_DEPENDS=	sablot.70:${PORTSDIR}/textproc/sablotron/
 RUN_DEPENDS=	lsof:${PORTSDIR}/sysutils/lsof/
 DEPENDS=	${PORTSDIR}/lang/pexts/
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
-PIKEVERSION=	7.2.492
+PIKEVERSION=	7.2.570
 
-SH=		${PREFIX}/bin/bash
-GNU_CONFIGURE=  yes
-CONFIGURE_ARGS+= --without-debug --with-PiXSL --prefix=${PREFIX} \
+# bash:${PORTSDIR}/shells/bash2/
+#SH=		${PREFIX}/bin/bash
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=	--without-debug --with-PiXSL --prefix=${PREFIX} \
 		 --with-pike=${LOCALBASE}/bin/pike
 
 USE_GMAKE=	yes
diff --git a/www/caudium12/distinfo b/www/caudium12/distinfo
index 1e5ad83fd2a6..7bfd8aa84993 100644
--- a/www/caudium12/distinfo
+++ b/www/caudium12/distinfo
@@ -1,2 +1,2 @@
-MD5 (caudium-1.2.26.tar.gz) = 828f41249e4514f62ee158ffd9ddd087
-SIZE (caudium-1.2.26.tar.gz) = 3914621
+MD5 (caudium-1.2.32.tar.gz) = d010f747c21683124cb223a0be4eb436
+SIZE (caudium-1.2.32.tar.gz) = 3976307
diff --git a/www/caudium12/pkg-plist b/www/caudium12/pkg-plist
index 8c97409b3a2f..033ae6108a9b 100644
--- a/www/caudium12/pkg-plist
+++ b/www/caudium12/pkg-plist
@@ -200,6 +200,8 @@ caudium/server/modules/misc/language.pike
 caudium/server/modules/misc/mirrorserver.pike
 caudium/server/modules/misc/pathinfo.pike
 caudium/server/modules/misc/referrerdeny.pike
+caudium/server/modules/misc/robot_trap.pike
+caudium/server/modules/misc/robots.txt.pike
 caudium/server/modules/misc/sqldb.pike
 caudium/server/modules/misc/switch.pike
 caudium/server/modules/misc/tracer.pike
@@ -217,18 +219,20 @@ caudium/server/modules/proxies/gopher.pike
 caudium/server/modules/proxies/simple_proxy.pike
 caudium/server/modules/proxies/proxy.pike
 caudium/server/modules/proxies/wais.pike
-caudium/server/modules/scripting/pikescript.pike
 caudium/server/modules/scripting/caucho.pike
 caudium/server/modules/scripting/cgi.pike
+caudium/server/modules/scripting/fastcgi.pike
+caudium/server/modules/scripting/fastuniscript.pike
 caudium/server/modules/scripting/fcgi.pike
 caudium/server/modules/scripting/fpscript.pike
 caudium/server/modules/scripting/jssupport.pike
 caudium/server/modules/scripting/oldcgi.pike
+caudium/server/modules/scripting/perl.pike
 caudium/server/modules/scripting/php4.pike
+caudium/server/modules/scripting/pikescript.pike
 caudium/server/modules/scripting/servlet.pike
 caudium/server/modules/scripting/uniscript.pike
-caudium/server/modules/scripting/fastcgi.pike
-caudium/server/modules/scripting/perl.pike
+caudium/server/modules/scripting/uniscript_old.pike
 caudium/server/modules/tags/doc/accept-language
 caudium/server/modules/tags/doc/.no_modules
 caudium/server/modules/tags/doc/available_languages
@@ -349,6 +353,8 @@ caudium/server/modules/tags/jsredirect.pike
 caudium/server/modules/tags/killframe.pike
 caudium/server/modules/tags/lisp.pike
 caudium/server/modules/tags/lpctag.pike
+caudium/server/modules/tags/mailform.pike
+caudium/server/modules/tags/mailit.pike
 caudium/server/modules/tags/manual.pike
 caudium/server/modules/tags/obox.pike
 caudium/server/modules/tags/path.pike
diff --git a/www/caudium14/Makefile b/www/caudium14/Makefile
index 6adbea200531..55c275e16dd2 100644
--- a/www/caudium14/Makefile
+++ b/www/caudium14/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	caudium12
-PORTVERSION=	1.2.26
-PORTREVISION=	1
+PORTVERSION=	1.2.32
+PORTREVISION=	0
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.oav.net/caudium/source/	\
 		ftp://ftp.caudium.net/caudium/source/ \
@@ -20,19 +20,19 @@ DISTNAME=	caudium-${PORTVERSION}
 MAINTAINER=	kiwi@oav.net
 COMMENT=	A free webserver which is based on the Roxen Challenger 1.3 code base
 
-BUILD_DEPENDS=	pike:${PORTSDIR}/lang/pike72/ \
-		bash:${PORTSDIR}/shells/bash2/
+BUILD_DEPENDS=	pike:${PORTSDIR}/lang/pike72/
 LIB_DEPENDS=	sablot.70:${PORTSDIR}/textproc/sablotron/
 RUN_DEPENDS=	lsof:${PORTSDIR}/sysutils/lsof/
 DEPENDS=	${PORTSDIR}/lang/pexts/
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
-PIKEVERSION=	7.2.492
+PIKEVERSION=	7.2.570
 
-SH=		${PREFIX}/bin/bash
-GNU_CONFIGURE=  yes
-CONFIGURE_ARGS+= --without-debug --with-PiXSL --prefix=${PREFIX} \
+# bash:${PORTSDIR}/shells/bash2/
+#SH=		${PREFIX}/bin/bash
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=	--without-debug --with-PiXSL --prefix=${PREFIX} \
 		 --with-pike=${LOCALBASE}/bin/pike
 
 USE_GMAKE=	yes
diff --git a/www/caudium14/distinfo b/www/caudium14/distinfo
index 1e5ad83fd2a6..7bfd8aa84993 100644
--- a/www/caudium14/distinfo
+++ b/www/caudium14/distinfo
@@ -1,2 +1,2 @@
-MD5 (caudium-1.2.26.tar.gz) = 828f41249e4514f62ee158ffd9ddd087
-SIZE (caudium-1.2.26.tar.gz) = 3914621
+MD5 (caudium-1.2.32.tar.gz) = d010f747c21683124cb223a0be4eb436
+SIZE (caudium-1.2.32.tar.gz) = 3976307
diff --git a/www/caudium14/pkg-plist b/www/caudium14/pkg-plist
index 8c97409b3a2f..033ae6108a9b 100644
--- a/www/caudium14/pkg-plist
+++ b/www/caudium14/pkg-plist
@@ -200,6 +200,8 @@ caudium/server/modules/misc/language.pike
 caudium/server/modules/misc/mirrorserver.pike
 caudium/server/modules/misc/pathinfo.pike
 caudium/server/modules/misc/referrerdeny.pike
+caudium/server/modules/misc/robot_trap.pike
+caudium/server/modules/misc/robots.txt.pike
 caudium/server/modules/misc/sqldb.pike
 caudium/server/modules/misc/switch.pike
 caudium/server/modules/misc/tracer.pike
@@ -217,18 +219,20 @@ caudium/server/modules/proxies/gopher.pike
 caudium/server/modules/proxies/simple_proxy.pike
 caudium/server/modules/proxies/proxy.pike
 caudium/server/modules/proxies/wais.pike
-caudium/server/modules/scripting/pikescript.pike
 caudium/server/modules/scripting/caucho.pike
 caudium/server/modules/scripting/cgi.pike
+caudium/server/modules/scripting/fastcgi.pike
+caudium/server/modules/scripting/fastuniscript.pike
 caudium/server/modules/scripting/fcgi.pike
 caudium/server/modules/scripting/fpscript.pike
 caudium/server/modules/scripting/jssupport.pike
 caudium/server/modules/scripting/oldcgi.pike
+caudium/server/modules/scripting/perl.pike
 caudium/server/modules/scripting/php4.pike
+caudium/server/modules/scripting/pikescript.pike
 caudium/server/modules/scripting/servlet.pike
 caudium/server/modules/scripting/uniscript.pike
-caudium/server/modules/scripting/fastcgi.pike
-caudium/server/modules/scripting/perl.pike
+caudium/server/modules/scripting/uniscript_old.pike
 caudium/server/modules/tags/doc/accept-language
 caudium/server/modules/tags/doc/.no_modules
 caudium/server/modules/tags/doc/available_languages
@@ -349,6 +353,8 @@ caudium/server/modules/tags/jsredirect.pike
 caudium/server/modules/tags/killframe.pike
 caudium/server/modules/tags/lisp.pike
 caudium/server/modules/tags/lpctag.pike
+caudium/server/modules/tags/mailform.pike
+caudium/server/modules/tags/mailit.pike
 caudium/server/modules/tags/manual.pike
 caudium/server/modules/tags/obox.pike
 caudium/server/modules/tags/path.pike