From 5a54d0dc63d0146c8ad893fda797c66d2edc48be Mon Sep 17 00:00:00 2001
From: Mikhail Teterin <mi@FreeBSD.org>
Date: Wed, 2 May 2001 20:35:43 +0000
Subject: Upgrade to the version 3.3...
---
www/tclhttpd/Makefile | 3 ++-
www/tclhttpd/distinfo | 2 +-
www/tclhttpd/files/patch-ab | 10 ++++++++++
www/tclhttpd/files/patch-ad | 28 +++++++++++++++++++++-------
www/tclhttpd/pkg-plist | 5 +++++
5 files changed, 39 insertions(+), 9 deletions(-)
(limited to 'www/tclhttpd')
diff --git a/www/tclhttpd/Makefile b/www/tclhttpd/Makefile
index 2db6e7d3937b..7d5159b9cc48 100644
--- a/www/tclhttpd/Makefile
+++ b/www/tclhttpd/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= tclhttpd
-PORTVERSION= 3.2.1
+PORTVERSION= 3.3
CATEGORIES= www tcl${TCL_VER}
MASTER_SITES= ${MASTER_SITE_TCLTK}
MASTER_SITE_SUBDIR= httpd
@@ -29,6 +29,7 @@ RCD= ${LOCALBASE}/etc/rc.d/tclhttpd.sh
SHLIB_NAME!= ${MAKE} -f "${FILESDIR}/Makefile.lib" ech
PLIST_SUB+= TCL_VER=${TCL_VER} PORTVERSION=${PORTVERSION} \
SHLIB_NAME=${SHLIB_NAME}
+MAKE_ENV+= TCLSH_PROG=tclsh${TCL_DVER}
do-build:
cd ${WRKSRC} && ${MAKE_ENV} ${MAKE} -j 2 TCL_DVER="${TCL_DVER}" \
diff --git a/www/tclhttpd/distinfo b/www/tclhttpd/distinfo
index f8769e894a88..7c43ef8645f1 100644
--- a/www/tclhttpd/distinfo
+++ b/www/tclhttpd/distinfo
@@ -1 +1 @@
-MD5 (tclhttpd3.2.1.tar.gz) = 0b628a24333419532142242a286773c4
+MD5 (tclhttpd3.3.tar.gz) = 0cc30bde4173ca1fae33abf593f8d6f2
diff --git a/www/tclhttpd/files/patch-ab b/www/tclhttpd/files/patch-ab
index 86ec389efa96..6a2d4729d733 100644
--- a/www/tclhttpd/files/patch-ab
+++ b/www/tclhttpd/files/patch-ab
@@ -5,6 +5,16 @@
-htdocsdir = $(SERVER_ROOT)/htdocs
+htdocsdir = $(prefix)/share/@PACKAGE@@VERSION@
+@@ -183,3 +183,3 @@
+ TCL_GENERIC_DIR_NATIVE = @TCL_GENERIC_DIR_NATIVE@
+-TCLSH_PROG = @TCLSH_PROG@
++TCLSH_PROG ?= tclsh8.3
+ SHARED_BUILD = @SHARED_BUILD@
+@@ -198,3 +198,3 @@
+ CONFIGDIR = @CONFIGDIR@
+-mkinstalldirs = $(SHELL) $(CONFIGDIR)/mkinstalldirs
++mkinstalldirs = mkdir -p
+ CONFIG_CLEAN_FILES =
@@ -220,3 +220,3 @@
-all: binaries libraries doc
diff --git a/www/tclhttpd/files/patch-ad b/www/tclhttpd/files/patch-ad
index 4ddfcb2b94f3..0736ee74c9f3 100644
--- a/www/tclhttpd/files/patch-ad
+++ b/www/tclhttpd/files/patch-ad
@@ -1,7 +1,21 @@
---- configure Wed Apr 26 17:44:05 2000
-+++ configure Thu Apr 27 18:44:11 2000
-@@ -1850,3 +1850,3 @@
- MAKE_STATIC_LIB="\${STLIB_LD} \$@ \$(\$@_OBJECTS)"
-- MAKE_SHARED_LIB="\${SHLIB_LD} -o \$@ \$(\$@_OBJECTS) \${SHLIB_LDFLAGS} \${SHLIB_LD_LIBS}"
-+ MAKE_SHARED_LIB="\${SHLIB_LD} -o \$@ \$> \${SHLIB_LDFLAGS} \${SHLIB_LD_LIBS}"
- ;;
++++ configure Tue Mar 13 02:10:00 2001
++++ configure Tue May 1 17:37:36 2001
+@@ -526,17 +526,3 @@
+
+-ac_aux_dir=
+-for ac_dir in config $srcdir/config; do
+- if test -f $ac_dir/install-sh; then
+- ac_aux_dir=$ac_dir
+- ac_install_sh="$ac_aux_dir/install-sh -c"
+- break
+- elif test -f $ac_dir/install.sh; then
+- ac_aux_dir=$ac_dir
+- ac_install_sh="$ac_aux_dir/install.sh -c"
+- break
+- fi
+-done
+-if test -z "$ac_aux_dir"; then
+- { echo "configure: error: can not find install-sh or install.sh in config $srcdir/config" 1>&2; exit 1; }
+-fi
++ac_aux_dir=`pwd`
+ ac_config_guess=$ac_aux_dir/config.guess
diff --git a/www/tclhttpd/pkg-plist b/www/tclhttpd/pkg-plist
index c2b4b8dee338..4daeb534fd71 100644
--- a/www/tclhttpd/pkg-plist
+++ b/www/tclhttpd/pkg-plist
@@ -37,6 +37,7 @@ lib/tclhttpd%%PORTVERSION%%/status.tcl
lib/tclhttpd%%PORTVERSION%%/stdin.tcl
lib/tclhttpd%%PORTVERSION%%/telnet.tcl
lib/tclhttpd%%PORTVERSION%%/thread.tcl
+lib/tclhttpd%%PORTVERSION%%/upload.tcl
lib/tclhttpd%%PORTVERSION%%/url.tcl
lib/tclhttpd%%PORTVERSION%%/utils.tcl
lib/tclhttpd%%PORTVERSION%%/version.tcl
@@ -62,12 +63,15 @@ share/tclhttpd%%PORTVERSION%%/access/bydir/user.cgi
share/tclhttpd%%PORTVERSION%%/access/bydir/.htaccess
share/tclhttpd%%PORTVERSION%%/access/bytcl/index.tml
share/tclhttpd%%PORTVERSION%%/access/bytcl/.tclaccess
+share/tclhttpd%%PORTVERSION%%/access/multiple/index.tml
+share/tclhttpd%%PORTVERSION%%/access/multiple/.htaccess
share/tclhttpd%%PORTVERSION%%/access/noawe/.htaccess
share/tclhttpd%%PORTVERSION%%/access/null/index.tml
share/tclhttpd%%PORTVERSION%%/access/null/.tclaccess
share/tclhttpd%%PORTVERSION%%/access/session/page.auth
share/tclhttpd%%PORTVERSION%%/access/session/.tclaccess
share/tclhttpd%%PORTVERSION%%/access/.htaccess
+share/tclhttpd%%PORTVERSION%%/access/htaccess.tml
share/tclhttpd%%PORTVERSION%%/book/TCLHTTPD-1.gif
share/tclhttpd%%PORTVERSION%%/book/TCLHTTPD-2.gif
share/tclhttpd%%PORTVERSION%%/book/TCLHTTPD.css
@@ -200,6 +204,7 @@ share/tclhttpd%%PORTVERSION%%/.tml
@dirrm share/tclhttpd%%PORTVERSION%%/access/auth
@dirrm share/tclhttpd%%PORTVERSION%%/access/bydir
@dirrm share/tclhttpd%%PORTVERSION%%/access/bytcl
+@dirrm share/tclhttpd%%PORTVERSION%%/access/multiple
@dirrm share/tclhttpd%%PORTVERSION%%/access/noawe
@dirrm share/tclhttpd%%PORTVERSION%%/access/null
@dirrm share/tclhttpd%%PORTVERSION%%/access/session
--
cgit v1.2.3