diff options
| -rw-r--r-- | devel/tcllib/Makefile | 65 | ||||
| -rw-r--r-- | devel/tcllib/distinfo | 4 | ||||
| -rw-r--r-- | devel/tcllib/files/patch-koi8 | 8 | ||||
| -rw-r--r-- | devel/tcllib/pkg-plist | 85 | ||||
| -rw-r--r-- | devel/tclxml/Makefile | 2 | ||||
| -rw-r--r-- | net-im/amsn/Makefile | 2 | ||||
| -rw-r--r-- | net/amsn/Makefile | 2 | ||||
| -rw-r--r-- | www/tclhttpd/Makefile | 14 | ||||
| -rw-r--r-- | www/tclhttpd/distinfo | 4 | ||||
| -rw-r--r-- | www/tclhttpd/files/Makefile.lib | 7 | ||||
| -rw-r--r-- | www/tclhttpd/files/metaPackage.c | 1 | ||||
| -rw-r--r-- | www/tclhttpd/files/patch-ab | 13 | ||||
| -rw-r--r-- | www/tclhttpd/files/patch-af | 5 | ||||
| -rw-r--r-- | www/tclhttpd/files/patch-ak | 90 | ||||
| -rw-r--r-- | www/tclhttpd/files/patch-tcl84 | 15 | ||||
| -rw-r--r-- | www/tclhttpd/files/tclhttpd.sh | 2 | ||||
| -rw-r--r-- | www/tclhttpd/pkg-plist | 228 | ||||
| -rw-r--r-- | www/tclhttpd/scripts/post-patch | 8 |
18 files changed, 339 insertions, 216 deletions
diff --git a/devel/tcllib/Makefile b/devel/tcllib/Makefile index ec0a63757e12..6bfcf9c99c50 100644 --- a/devel/tcllib/Makefile +++ b/devel/tcllib/Makefile @@ -6,8 +6,7 @@ # PORTNAME= tcllib -PORTVERSION= 1.6 -PORTREVISION= 1 +PORTVERSION= 1.7 CATEGORIES= devel tcl83 tcl84 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= tcllib @@ -19,30 +18,54 @@ BUILD_DEPENDS= tclsh:${PORTSDIR}/lang/tcl84 USE_BZIP2= yes GNU_CONFIGURE= yes -ALL_TARGET= all test +ALL_TARGET= all MAKE_ENV+= LANG=C PLIST_SUB+= PORTVERSION=${PORTVERSION} -MANN= base64.n calculus.n changelog.n cksum.n cmdline.n \ - combinatorics.n comm.n control.n counter.n crc16.n crc32.n \ - csv.n cvs.n des.n docidx.n docidx_api.n docidx_fmt.n \ - doctoc.n doctoc_api.n doctoc_fmt.n doctools.n doctools_api.n \ - doctools_fmt.n exif.n expander.n fileutil.n ftp.n ftpd.n \ - fuzzy.n graph.n html.n htmlparse.n ini.n irc.n javascript.n log.n \ - logger.n math.n matrix.n md4.n md5.n mime.n mpexpand.n \ - multiplexer.n \ - ncgi.n nntp.n ntp_time.n optimize.n pool.n pop3.n pop3d.n \ - pop3d_dbox.n pop3d_udb.n prioqueue.n profiler.n queue.n \ - record.n report.n sha1.n skiplist.n smtp.n smtpd.n \ - snit.n snitfaq.n soundex.n \ - stack.n statistics.n stooop.n struct_list.n struct_set.n \ - struct_tree.n \ - sum.n tcllib_dns.n textutil.n uri.n uuencode.n yencode.n +MANN= asn.n autoproxy.n base64.n bee.n bignum.n calculus.n changelog.n\ + cksum.n cmdline.n combinatorics.n comm.n constants.n control.n\ + counter.n crc16.n crc32.n csv.n cvs.n dacceptor.n des.n dexec.n\ + docidx.n docidx_api.n docidx_fmt.n doctoc.n doctoc_api.n doctoc_fmt.n\ + doctools.n doctools_api.n doctools_fmt.n dtplite.n exif.n expander.n\ + fa.n faop.n fileutil.n fourier.n ftp.n ftpd.n fuzzy.n geometry.n\ + graph.n graph1.n html.n htmlparse.n ident.n ini.n interpolate.n\ + irc.n javascript.n jpeg.n ldap.n log.n logger.n math.n matrix.n\ + matrix1.n md4.n md5.n md5crypt.n mime.n mpexpand.n multiplexer.n\ + ncgi.n nntp.n ntp_time.n optimize.n png.n polynomials.n pool.n\ + pop3.n pop3d.n pop3d_dbox.n pop3d_udb.n prioqueue.n profiler.n\ + qcomplex.n queue.n rc4.n record.n report.n ripemd128.n ripemd160.n\ + romberg.n sha1.n skiplist.n smtp.n smtpd.n snit.n snitfaq.n soundex.n\ + special.n stack.n statistics.n stooop.n struct_list.n struct_set.n\ + struct_tree.n struct_tree1.n sum.n tar.n tcllib_dns.n tcllib_ip.n\ + textutil.n tie.n treeql.n uri.n uuencode.n uuid.n yencode.n\ MANCOMPRESSED= no -post-patch: - @${CHMOD} 666 ${WRKSRC}/modules/inifile/test.ini +test: +.ifdef DISPLAY + # + # DISPLAY environment variable appears to be set (${DISPLAY}). + # Tcllib may perform some additional Tk-only tests. + # + -${TEST} -t 1 && sleep 2 +.endif + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} test -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${ARCH} == "i386" +post-build: test +.else +post-build: + # Build is over quickly... + # + # Several of tcllib's tests are known to hang/fail on non-i386 + # architectures (not only on ${OPSYS}) so testing on your + # (${ARCH}) system is not performed automatically. You are + # encouraged to run `make test' manually, however, to check if + # the parts, that are important to you, are problem-free. + # +.endif + +.include <bsd.port.post.mk> diff --git a/devel/tcllib/distinfo b/devel/tcllib/distinfo index 238e63abf312..69e251bd106f 100644 --- a/devel/tcllib/distinfo +++ b/devel/tcllib/distinfo @@ -1,2 +1,2 @@ -MD5 (tcllib-1.6.tar.bz2) = 6014528dce625b83cc40a0c6ed5b0761 -SIZE (tcllib-1.6.tar.bz2) = 1175233 +MD5 (tcllib-1.7.tar.bz2) = db8de0205d0a65b88a4a3e235da6ae10 +SIZE (tcllib-1.7.tar.bz2) = 1544908 diff --git a/devel/tcllib/files/patch-koi8 b/devel/tcllib/files/patch-koi8 deleted file mode 100644 index 755532372661..000000000000 --- a/devel/tcllib/files/patch-koi8 +++ /dev/null @@ -1,8 +0,0 @@ ---- modules/mime/mime.tcl Sun Feb 15 18:15:51 2004 -+++ modules/mime/mime.tcl Wed Apr 28 16:52:53 2004 -@@ -166,4 +166,5 @@ - jis0212 "" \ - koi8-r KOI8-R \ -+ koi8-u KOI8-U \ - ksc5601 "" \ - macCentEuro "" \ diff --git a/devel/tcllib/pkg-plist b/devel/tcllib/pkg-plist index dae0efa85d0e..1bfe3414bf65 100644 --- a/devel/tcllib/pkg-plist +++ b/devel/tcllib/pkg-plist @@ -1,10 +1,16 @@ lib/tcllib%%PORTVERSION%%/pkgIndex.tcl +lib/tcllib%%PORTVERSION%%/asn/asn.tcl +lib/tcllib%%PORTVERSION%%/asn/pkgIndex.tcl +@dirrm lib/tcllib%%PORTVERSION%%/asn lib/tcllib%%PORTVERSION%%/base64/base64.tcl lib/tcllib%%PORTVERSION%%/base64/base64c.tcl lib/tcllib%%PORTVERSION%%/base64/pkgIndex.tcl lib/tcllib%%PORTVERSION%%/base64/uuencode.tcl lib/tcllib%%PORTVERSION%%/base64/yencode.tcl @dirrm lib/tcllib%%PORTVERSION%%/base64 +lib/tcllib%%PORTVERSION%%/bee/bee.tcl +lib/tcllib%%PORTVERSION%%/bee/pkgIndex.tcl +@dirrm lib/tcllib%%PORTVERSION%%/bee lib/tcllib%%PORTVERSION%%/cmdline/cmdline.tcl lib/tcllib%%PORTVERSION%%/cmdline/pkgIndex.tcl lib/tcllib%%PORTVERSION%%/cmdline/typedCmdline.tcl @@ -37,8 +43,10 @@ lib/tcllib%%PORTVERSION%%/des/des.tcl lib/tcllib%%PORTVERSION%%/des/pkgIndex.tcl @dirrm lib/tcllib%%PORTVERSION%%/des lib/tcllib%%PORTVERSION%%/dns/dns.tcl +lib/tcllib%%PORTVERSION%%/dns/ip.tcl lib/tcllib%%PORTVERSION%%/dns/pkgIndex.tcl lib/tcllib%%PORTVERSION%%/dns/resolv.tcl +lib/tcllib%%PORTVERSION%%/dns/spf.tcl @dirrm lib/tcllib%%PORTVERSION%%/dns lib/tcllib%%PORTVERSION%%/doctools/api.tcl lib/tcllib%%PORTVERSION%%/doctools/api_idx.tcl @@ -98,12 +106,24 @@ lib/tcllib%%PORTVERSION%%/ftp/pkgIndex.tcl lib/tcllib%%PORTVERSION%%/ftpd/ftpd.tcl lib/tcllib%%PORTVERSION%%/ftpd/pkgIndex.tcl @dirrm lib/tcllib%%PORTVERSION%%/ftpd +lib/tcllib%%PORTVERSION%%/grammar_fa/dacceptor.tcl +lib/tcllib%%PORTVERSION%%/grammar_fa/dexec.tcl +lib/tcllib%%PORTVERSION%%/grammar_fa/fa.tcl +lib/tcllib%%PORTVERSION%%/grammar_fa/faop.tcl +lib/tcllib%%PORTVERSION%%/grammar_fa/pkgIndex.tcl +@dirrm lib/tcllib%%PORTVERSION%%/grammar_fa lib/tcllib%%PORTVERSION%%/html/html.tcl lib/tcllib%%PORTVERSION%%/html/pkgIndex.tcl @dirrm lib/tcllib%%PORTVERSION%%/html +lib/tcllib%%PORTVERSION%%/http/autoproxy.tcl +lib/tcllib%%PORTVERSION%%/http/pkgIndex.tcl +@dirrm lib/tcllib%%PORTVERSION%%/http lib/tcllib%%PORTVERSION%%/htmlparse/htmlparse.tcl lib/tcllib%%PORTVERSION%%/htmlparse/pkgIndex.tcl @dirrm lib/tcllib%%PORTVERSION%%/htmlparse +lib/tcllib%%PORTVERSION%%/ident/ident.tcl +lib/tcllib%%PORTVERSION%%/ident/pkgIndex.tcl +@dirrm lib/tcllib%%PORTVERSION%%/ident lib/tcllib%%PORTVERSION%%/inifile/ini.tcl lib/tcllib%%PORTVERSION%%/inifile/pkgIndex.tcl @dirrm lib/tcllib%%PORTVERSION%%/inifile @@ -113,14 +133,28 @@ lib/tcllib%%PORTVERSION%%/irc/pkgIndex.tcl lib/tcllib%%PORTVERSION%%/javascript/javascript.tcl lib/tcllib%%PORTVERSION%%/javascript/pkgIndex.tcl @dirrm lib/tcllib%%PORTVERSION%%/javascript +lib/tcllib%%PORTVERSION%%/jpeg/jpeg.tcl +lib/tcllib%%PORTVERSION%%/jpeg/pkgIndex.tcl +@dirrm lib/tcllib%%PORTVERSION%%/jpeg +lib/tcllib%%PORTVERSION%%/ldap/ldap.tcl +lib/tcllib%%PORTVERSION%%/ldap/pkgIndex.tcl +@dirrm lib/tcllib%%PORTVERSION%%/ldap lib/tcllib%%PORTVERSION%%/log/log.tcl lib/tcllib%%PORTVERSION%%/log/logger.tcl lib/tcllib%%PORTVERSION%%/log/pkgIndex.tcl @dirrm lib/tcllib%%PORTVERSION%%/log +lib/tcllib%%PORTVERSION%%/math/bessel.tcl +lib/tcllib%%PORTVERSION%%/math/bignum.tcl lib/tcllib%%PORTVERSION%%/math/calculus.tcl +lib/tcllib%%PORTVERSION%%/math/classic_polyns.tcl lib/tcllib%%PORTVERSION%%/math/combinatorics.tcl +lib/tcllib%%PORTVERSION%%/math/constants.tcl +lib/tcllib%%PORTVERSION%%/math/elliptic.tcl +lib/tcllib%%PORTVERSION%%/math/exponential.tcl +lib/tcllib%%PORTVERSION%%/math/fourier.tcl lib/tcllib%%PORTVERSION%%/math/fuzzy.tcl lib/tcllib%%PORTVERSION%%/math/geometry.tcl +lib/tcllib%%PORTVERSION%%/math/interpolate.tcl lib/tcllib%%PORTVERSION%%/math/liststat.tcl lib/tcllib%%PORTVERSION%%/math/math.tcl lib/tcllib%%PORTVERSION%%/math/misc.tcl @@ -128,6 +162,10 @@ lib/tcllib%%PORTVERSION%%/math/optimize.tcl lib/tcllib%%PORTVERSION%%/math/pdf_stat.tcl lib/tcllib%%PORTVERSION%%/math/pkgIndex.tcl lib/tcllib%%PORTVERSION%%/math/plotstat.tcl +lib/tcllib%%PORTVERSION%%/math/polynomials.tcl +lib/tcllib%%PORTVERSION%%/math/qcomplex.tcl +lib/tcllib%%PORTVERSION%%/math/rational_funcs.tcl +lib/tcllib%%PORTVERSION%%/math/special.tcl lib/tcllib%%PORTVERSION%%/math/statistics.tcl lib/tcllib%%PORTVERSION%%/math/tclIndex @dirrm lib/tcllib%%PORTVERSION%%/math @@ -161,6 +199,9 @@ lib/tcllib%%PORTVERSION%%/nntp/pkgIndex.tcl lib/tcllib%%PORTVERSION%%/ntp/pkgIndex.tcl lib/tcllib%%PORTVERSION%%/ntp/time.tcl @dirrm lib/tcllib%%PORTVERSION%%/ntp +lib/tcllib%%PORTVERSION%%/png/pkgIndex.tcl +lib/tcllib%%PORTVERSION%%/png/png.tcl +@dirrm lib/tcllib%%PORTVERSION%%/png lib/tcllib%%PORTVERSION%%/pop3/clnt.tcl lib/tcllib%%PORTVERSION%%/pop3/pkgIndex.tcl lib/tcllib%%PORTVERSION%%/pop3/pop3.tcl @@ -174,6 +215,14 @@ lib/tcllib%%PORTVERSION%%/pop3d/pop3d_udb.tcl lib/tcllib%%PORTVERSION%%/profiler/pkgIndex.tcl lib/tcllib%%PORTVERSION%%/profiler/profiler.tcl @dirrm lib/tcllib%%PORTVERSION%%/profiler +lib/tcllib%%PORTVERSION%%/rc4/pkgIndex.tcl +lib/tcllib%%PORTVERSION%%/rc4/rc4.tcl +lib/tcllib%%PORTVERSION%%/rc4/rc4c.tcl +@dirrm lib/tcllib%%PORTVERSION%%/rc4 +lib/tcllib%%PORTVERSION%%/ripemd/pkgIndex.tcl +lib/tcllib%%PORTVERSION%%/ripemd/ripemd128.tcl +lib/tcllib%%PORTVERSION%%/ripemd/ripemd160.tcl +@dirrm lib/tcllib%%PORTVERSION%%/ripemd lib/tcllib%%PORTVERSION%%/report/pkgIndex.tcl lib/tcllib%%PORTVERSION%%/report/report.tcl @dirrm lib/tcllib%%PORTVERSION%%/report @@ -196,8 +245,10 @@ lib/tcllib%%PORTVERSION%%/stooop/switched.tcl lib/tcllib%%PORTVERSION%%/stooop/xifo.tcl @dirrm lib/tcllib%%PORTVERSION%%/stooop lib/tcllib%%PORTVERSION%%/struct/graph.tcl +lib/tcllib%%PORTVERSION%%/struct/graph1.tcl lib/tcllib%%PORTVERSION%%/struct/list.tcl lib/tcllib%%PORTVERSION%%/struct/matrix.tcl +lib/tcllib%%PORTVERSION%%/struct/matrix1.tcl lib/tcllib%%PORTVERSION%%/struct/pkgIndex.tcl lib/tcllib%%PORTVERSION%%/struct/pool.tcl lib/tcllib%%PORTVERSION%%/struct/pooltest.tcl @@ -208,22 +259,25 @@ lib/tcllib%%PORTVERSION%%/struct/sets.tcl lib/tcllib%%PORTVERSION%%/struct/skiplist.tcl lib/tcllib%%PORTVERSION%%/struct/stack.tcl lib/tcllib%%PORTVERSION%%/struct/struct.tcl +lib/tcllib%%PORTVERSION%%/struct/struct1.tcl lib/tcllib%%PORTVERSION%%/struct/tree.tcl +lib/tcllib%%PORTVERSION%%/struct/tree1.tcl @dirrm lib/tcllib%%PORTVERSION%%/struct -lib/tcllib%%PORTVERSION%%/struct1/graph.tcl -lib/tcllib%%PORTVERSION%%/struct1/list.tcl -lib/tcllib%%PORTVERSION%%/struct1/matrix.tcl -lib/tcllib%%PORTVERSION%%/struct1/pkgIndex.tcl -lib/tcllib%%PORTVERSION%%/struct1/pool.tcl -lib/tcllib%%PORTVERSION%%/struct1/pooltest.tcl -lib/tcllib%%PORTVERSION%%/struct1/prioqueue.tcl -lib/tcllib%%PORTVERSION%%/struct1/queue.tcl -lib/tcllib%%PORTVERSION%%/struct1/record.tcl -lib/tcllib%%PORTVERSION%%/struct1/skiplist.tcl -lib/tcllib%%PORTVERSION%%/struct1/stack.tcl -lib/tcllib%%PORTVERSION%%/struct1/struct.tcl -lib/tcllib%%PORTVERSION%%/struct1/tree.tcl -@dirrm lib/tcllib%%PORTVERSION%%/struct1 +lib/tcllib%%PORTVERSION%%/tar/pkgIndex.tcl +lib/tcllib%%PORTVERSION%%/tar/tar.tcl +@dirrm lib/tcllib%%PORTVERSION%%/tar +lib/tcllib%%PORTVERSION%%/tie/pkgIndex.tcl +lib/tcllib%%PORTVERSION%%/tie/tie.tcl +lib/tcllib%%PORTVERSION%%/tie/tie_array.tcl +lib/tcllib%%PORTVERSION%%/tie/tie_dsource.tcl +lib/tcllib%%PORTVERSION%%/tie/tie_file.tcl +lib/tcllib%%PORTVERSION%%/tie/tie_log.tcl +lib/tcllib%%PORTVERSION%%/tie/tie_rarray.tcl +@dirrm lib/tcllib%%PORTVERSION%%/tie +lib/tcllib%%PORTVERSION%%/treeql/pkgIndex.tcl +lib/tcllib%%PORTVERSION%%/treeql/treeql.tcl +lib/tcllib%%PORTVERSION%%/treeql/treeql84.tcl +@dirrm lib/tcllib%%PORTVERSION%%/treeql lib/tcllib%%PORTVERSION%%/textutil/adjust.tcl lib/tcllib%%PORTVERSION%%/textutil/dehypht.tex lib/tcllib%%PORTVERSION%%/textutil/eshyph_vo.tex @@ -239,4 +293,7 @@ lib/tcllib%%PORTVERSION%%/uri/pkgIndex.tcl lib/tcllib%%PORTVERSION%%/uri/uri.tcl lib/tcllib%%PORTVERSION%%/uri/urn-scheme.tcl @dirrm lib/tcllib%%PORTVERSION%%/uri +lib/tcllib%%PORTVERSION%%/uuid/pkgIndex.tcl +lib/tcllib%%PORTVERSION%%/uuid/uuid.tcl +@dirrm lib/tcllib%%PORTVERSION%%/uuid @dirrm lib/tcllib%%PORTVERSION%% diff --git a/devel/tclxml/Makefile b/devel/tclxml/Makefile index cf713aeebdde..3a8be96319e4 100644 --- a/devel/tclxml/Makefile +++ b/devel/tclxml/Makefile @@ -16,7 +16,7 @@ COMMENT= API for parsing XML documents using Tcl BUILD_DEPENDS= tclsh8.4:${PORTSDIR}/lang/tcl84 RUN_DEPENDS= tclsh8.4:${PORTSDIR}/lang/tcl84 \ - ${LOCALBASE}/lib/tcllib1.6/uri/uri.tcl:${PORTSDIR}/devel/tcllib + ${LOCALBASE}/lib/tcllib1.7/uri/uri.tcl:${PORTSDIR}/devel/tcllib GNU_CONFIGURE= yes INSTALLS_SHLIB= yes diff --git a/net-im/amsn/Makefile b/net-im/amsn/Makefile index cd19441effdc..4ec07342a5b6 100644 --- a/net-im/amsn/Makefile +++ b/net-im/amsn/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib BUILD_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84 \ convert:${PORTSDIR}/graphics/ImageMagick \ ${LOCALBASE}/lib/tls/tls.tcl:${PORTSDIR}/devel/tcltls \ - ${LOCALBASE}/lib/tcllib1.6/base64/base64.tcl:${PORTSDIR}/devel/tcllib + ${LOCALBASE}/lib/tcllib1.7/base64/base64.tcl:${PORTSDIR}/devel/tcllib RUN_DEPENDS= ${BUILD_DEPENDS} USE_REINPLACE= yes diff --git a/net/amsn/Makefile b/net/amsn/Makefile index cd19441effdc..4ec07342a5b6 100644 --- a/net/amsn/Makefile +++ b/net/amsn/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib BUILD_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84 \ convert:${PORTSDIR}/graphics/ImageMagick \ ${LOCALBASE}/lib/tls/tls.tcl:${PORTSDIR}/devel/tcltls \ - ${LOCALBASE}/lib/tcllib1.6/base64/base64.tcl:${PORTSDIR}/devel/tcllib + ${LOCALBASE}/lib/tcllib1.7/base64/base64.tcl:${PORTSDIR}/devel/tcllib RUN_DEPENDS= ${BUILD_DEPENDS} USE_REINPLACE= yes diff --git a/www/tclhttpd/Makefile b/www/tclhttpd/Makefile index ad7fd83a786c..abcc24e71fb6 100644 --- a/www/tclhttpd/Makefile +++ b/www/tclhttpd/Makefile @@ -6,8 +6,8 @@ # PORTNAME= tclhttpd -PORTVERSION= 3.4.2 -CATEGORIES= www tcl83 +PORTVERSION= 3.5.1 +CATEGORIES= www tcl83 tcl84 MASTER_SITES= ${MASTER_SITE_TCLTK} MASTER_SITE_SUBDIR= httpd DISTNAME= ${PORTNAME}${PORTVERSION} @@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION} MAINTAINER= mi@aldan.algebra.com COMMENT= An http-server implemented in TCL -RUN_DEPENDS= ${LOCALBASE}/lib/tcllib1.6/pkgIndex.tcl:${PORTSDIR}/devel/tcllib +RUN_DEPENDS= ${LOCALBASE}/lib/tcllib1.7/pkgIndex.tcl:${PORTSDIR}/devel/tcllib LIB_DEPENDS= tcl${TCL_VER}:${PORTSDIR}/lang/tcl${TCL_VER} TCL_DVER?= 8.4 @@ -28,14 +28,20 @@ MAN1= tclhttpd.1 RCD= ${LOCALBASE}/etc/rc.d/tclhttpd.sh .include <bsd.port.pre.mk> -SHLIB_NAME!= ${MAKE} -f "${FILESDIR}/Makefile.lib" ech +SHLIB_NAME!= ${MAKE} -f "${FILESDIR}/Makefile.lib" -V SHLIB_NAME PLIST_SUB+= TCL_VER=${TCL_VER} PORTVERSION=${PORTVERSION} \ SHLIB_NAME=${SHLIB_NAME} MAKE_ENV+= TCLSH_PROG=tclsh${TCL_DVER} +SCRIPTS_ENV+= TCL_DVER=${TCL_DVER} do-build: cd ${WRKSRC} && ${MAKE_ENV} ${MAKE} -j 2 TCL_DVER="${TCL_DVER}" \ FILESDIR="${FILESDIR}" -f "${FILESDIR}/Makefile.lib" + # + # Note, the ``utime'' command supplied by the tclhttpd's library + # (interface to utimes(2)) has been long obsoleted by TCL's own + # file(n) and is finally removed from this port + # pre-install: ${MKDIR} ${PREFIX}/tclhttpd/custom diff --git a/www/tclhttpd/distinfo b/www/tclhttpd/distinfo index 8548b484a7b5..9daa8674e2f9 100644 --- a/www/tclhttpd/distinfo +++ b/www/tclhttpd/distinfo @@ -1,2 +1,2 @@ -MD5 (tclhttpd3.4.2.tar.gz) = d5c6517430023735a78afb5e8d707e83 -SIZE (tclhttpd3.4.2.tar.gz) = 450344 +MD5 (tclhttpd3.5.1.tar.gz) = f48676606a8715312308f178ccd9289d +SIZE (tclhttpd3.5.1.tar.gz) = 594484 diff --git a/www/tclhttpd/files/Makefile.lib b/www/tclhttpd/files/Makefile.lib index fc8e63104efa..0a0fd8a4ae69 100644 --- a/www/tclhttpd/files/Makefile.lib +++ b/www/tclhttpd/files/Makefile.lib @@ -1,8 +1,8 @@ -TCL_DVER?= 8.3 +TCL_DVER?= 8.4 TCL_VER= ${TCL_DVER:S/.//} PREFIX?= /usr/local -SRCS=crypt.c setuid.c limit.c utime.c metaPackage.c +SRCS=crypt.c setuid.c limit.c metaPackage.c CFLAGS+=-I${LOCALBASE}/include/tcl${TCL_DVER} -DUSE_TCL_STUBS \ -DTclhttpdbin_Init=${LIBNAME}_Init -Wall -Werror @@ -13,7 +13,4 @@ LDADD+=-L${LOCALBASE}/lib -ltclstub${TCL_VER} -lcrypt LIBNAME= Tclhttpdbin SHLIB_NAME= lib${LIBNAME}.so -ech: - @echo ${SHLIB_NAME} - .include <bsd.lib.mk> diff --git a/www/tclhttpd/files/metaPackage.c b/www/tclhttpd/files/metaPackage.c index 6046531e084e..4629a41964f9 100644 --- a/www/tclhttpd/files/metaPackage.c +++ b/www/tclhttpd/files/metaPackage.c @@ -7,7 +7,6 @@ int Tclhttpdbin_Init(Tcl_Interp *I) { Crypt_Init(I); Limit_Init(I); Setuid_Init(I); - Utime_Init(I); return TCL_OK; } diff --git a/www/tclhttpd/files/patch-ab b/www/tclhttpd/files/patch-ab index 8a95f84c0d89..750aa3737aef 100644 --- a/www/tclhttpd/files/patch-ab +++ b/www/tclhttpd/files/patch-ab @@ -5,11 +5,6 @@ -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 @@ -28,8 +23,10 @@ @@ -330,1 +330,1 @@ - $(INSTALL_DATA) $(srcdir)/doc/httpd.1 $(mandir)/man1/httpd.1 + $(INSTALL_DATA) $(srcdir)/doc/httpd.1 $(mandir)/man1/tclhttpd.1 -@@ -335,3 +335,3 @@ +@@ -343,5 +343,5 @@ + installdirs: -- $(mkinstalldirs) $(pkglibdir) $(cryptlibdir) $(prefix)/bin $(htdocsdir) $(customdir) -+ $(mkinstalldirs) $(pkglibdir) $(prefix)/bin $(htdocsdir) $(customdir) +- $(mkinstalldirs) $(DESTDIR)$(pkglibdir) $(DESTDIR)$(cryptlibdir) $(DESTDIR)$(prefix)/bin $(DESTDIR)$(htdocsdir) $(DESTDIR)$(customdir) ++ $(mkinstalldirs) $(DESTDIR)$(pkglibdir) $(DESTDIR)$(prefix)/bin $(DESTDIR)$(htdocsdir) $(DESTDIR)$(customdir) + clean: diff --git a/www/tclhttpd/files/patch-af b/www/tclhttpd/files/patch-af deleted file mode 100644 index 74df2c3f7272..000000000000 --- a/www/tclhttpd/files/patch-af +++ /dev/null @@ -1,5 +0,0 @@ ---- lib/log.tcl Mon Apr 3 20:00:28 2000 -+++ lib/log.tcl Fri May 5 10:01:58 2000 -@@ -29,1 +29,1 @@ -- set Log(compressProg) /usr/local/bin/gzip -+ set Log(compressProg) /usr/bin/gzip diff --git a/www/tclhttpd/files/patch-ak b/www/tclhttpd/files/patch-ak index 48137087c614..5f8e65a3899f 100644 --- a/www/tclhttpd/files/patch-ak +++ b/www/tclhttpd/files/patch-ak @@ -1,6 +1,15 @@ ---- src/limit.c Thu May 11 02:00:43 2000 -+++ src/limit.c Fri Dec 1 20:04:58 2000 -@@ -20,7 +20,6 @@ +--- src/limit.c Thu May 1 19:42:14 2003 ++++ src/limit.c Fri Nov 19 13:21:15 2004 +@@ -9,6 +9,5 @@ + + +-static int LimitCmd _ANSI_ARGS_((ClientData clientData, +- Tcl_Interp *interp, int argc, char *argv[])); ++Tcl_ObjCmdProc LimitCmd; + + #undef TCL_STORAGE_CLASS +@@ -29,9 +28,8 @@ + */ int -LimitCmd(ClientData data, Tcl_Interp *interp, int argc, char *argv[]) +LimitCmd(ClientData data, Tcl_Interp *interp, int argc, Tcl_Obj *CONST objv[]) @@ -10,66 +19,35 @@ struct rlimit limit; + Tcl_Obj *limObj[2]; Tcl_ResetResult(interp); -@@ -31,3 +30,4 @@ + if (getrlimit(RLIMIT_NOFILE, &limit) < 0) { +@@ -40,12 +38,18 @@ + } if (argc > 1) { -- Tcl_GetInt(interp, argv[1], (int *)&limit.rlim_cur); -+ if (Tcl_GetLongFromObj(interp, objv[1], (long *)&limit.rlim_cur) -+ != TCL_OK) return TCL_ERROR; +- Tcl_GetInt(interp, argv[1], (int *)&limit.rlim_cur); ++ long rlim_cur; ++ ++ if (Tcl_GetLongFromObj(interp, objv[1], &rlim_cur) != TCL_OK) ++ return TCL_ERROR; ++ limit.rlim_cur = rlim_cur; if (setrlimit(RLIMIT_NOFILE, &limit) < 0) { -@@ -37,3 +37,5 @@ +- Tcl_AppendResult(interp, "NOFILE: ", Tcl_PosixError(interp), NULL); +- return TCL_ERROR; +- } ++ Tcl_AppendResult(interp, "NOFILE: ", Tcl_PosixError(interp), NULL); ++ return TCL_ERROR; ++ } } + /* bad, bad style, direct writing to interp->result */ - sprintf(interp->result, "%d %d", limit.rlim_cur, limit.rlim_max); + limObj[0] = Tcl_NewLongObj((long)limit.rlim_cur); + limObj[1] = Tcl_NewLongObj((long)limit.rlim_max); + Tcl_SetObjResult(interp, Tcl_NewListObj(2, limObj)); return TCL_OK; -@@ -54,3 +56,3 @@ - { + } +@@ -71,5 +75,5 @@ + #endif + - Tcl_CreateCommand(interp, "limit", LimitCmd, NULL, NULL); + Tcl_CreateObjCommand(interp, "limit", LimitCmd, NULL, NULL); - Tcl_PkgProvide(interp, "limit", "1.0"); ---- src/setuid.c Tue Oct 6 20:12:11 1998 -+++ src/setuid.c Fri Dec 1 20:05:52 2000 -@@ -7,2 +7,3 @@ - #include <sys/types.h> -+#include <unistd.h> - ---- src/utime.c Tue Oct 6 20:12:11 1998 -+++ src/utime.c Fri Dec 1 20:14:21 2000 -@@ -20,13 +20,8 @@ - int --UtimeCmd(ClientData data, Tcl_Interp *interp, int argc, char *argv[]) -+UtimeCmd(ClientData data, Tcl_Interp *interp, int argc, Tcl_Obj *CONST objv[]) - { - struct utimbuf u = {0, 0}; -+ char *file; - - Tcl_ResetResult(interp); -- if (argc > 3) { -- Tcl_GetInt(interp, argv[3], &u.actime); /* new access time */ -- } -- if (argc > 2) { -- Tcl_GetInt(interp, argv[2], &u.modtime); /* new modify time */ -- } - if (argc > 4 || argc <= 1) { -@@ -35,4 +30,13 @@ - } -- if (utime(argv[1], &u) < 0) { -- Tcl_AppendResult(interp, "utime: ", argv[1], Tcl_PosixError(interp), NULL); -+ if (argc > 3) { -+ if (Tcl_GetLongFromObj(interp, objv[3], (long *)&u.actime) -+ != TCL_OK) return TCL_ERROR; /* new access time */ -+ } -+ if (argc > 2) { -+ if (Tcl_GetLongFromObj(interp, objv[2], (long *)&u.modtime) -+ != TCL_OK) return TCL_ERROR; /* new modify time */ -+ } -+ file = Tcl_GetString(objv[1]); -+ if (utime(file, &u) < 0) { -+ Tcl_AppendResult(interp, "utime: ", file, Tcl_PosixError(interp), NULL); - return TCL_ERROR; -@@ -55,3 +59,3 @@ - { -- Tcl_CreateCommand(interp, "utime", UtimeCmd, NULL, NULL); -+ Tcl_CreateObjCommand(interp, "utime", UtimeCmd, NULL, NULL); - Tcl_PkgProvide(interp, "utime", "1.0"); + code = Tcl_PkgProvide(interp, "limit", "1.0"); + if (code != TCL_OK) { diff --git a/www/tclhttpd/files/patch-tcl84 b/www/tclhttpd/files/patch-tcl84 index 0d9b472f8fe0..d3da03a679ab 100644 --- a/www/tclhttpd/files/patch-tcl84 +++ b/www/tclhttpd/files/patch-tcl84 @@ -27,17 +27,18 @@ { char *result; --- src/setuid.c Tue Oct 6 20:12:11 1998 -+++ src/setuid.c Thu Apr 24 12:03:18 2003 -@@ -8,4 +8,8 @@ - #include <unistd.h> - ++++ src/setuid.c Fri Nov 19 13:17:06 2004 +@@ -6,4 +6,9 @@ + #include <tcl.h> + #include <sys/types.h> ++#include <unistd.h> ++ +#ifndef CONST84 +# define CONST84 +#endif -+ + /* - * SetuidCmd -- -@@ -19,5 +23,5 @@ +@@ -18,5 +23,5 @@ */ int -SetuidCmd(ClientData data, Tcl_Interp *interp, int argc, char *argv[]) diff --git a/www/tclhttpd/files/tclhttpd.sh b/www/tclhttpd/files/tclhttpd.sh index bba81a73cb35..6376cb49a646 100644 --- a/www/tclhttpd/files/tclhttpd.sh +++ b/www/tclhttpd/files/tclhttpd.sh @@ -12,7 +12,7 @@ case $1 in fi ;; ''|start) - COMMAND_LINE & + env LANG=C COMMAND_LINE & sleep 2 if kill -0 $! ; then echo -n ' tclhttpd' diff --git a/www/tclhttpd/pkg-plist b/www/tclhttpd/pkg-plist index 9c145e03108d..c065bd260ad1 100644 --- a/www/tclhttpd/pkg-plist +++ b/www/tclhttpd/pkg-plist @@ -7,13 +7,18 @@ lib/tclhttpd%%PORTVERSION%%/%%SHLIB_NAME%% lib/tclhttpd%%PORTVERSION%%/admin.tcl lib/tclhttpd%%PORTVERSION%%/auth.tcl lib/tclhttpd%%PORTVERSION%%/cgi.tcl +lib/tclhttpd%%PORTVERSION%%/compat.tcl lib/tclhttpd%%PORTVERSION%%/config.tcl +lib/tclhttpd%%PORTVERSION%%/cookie.tcl lib/tclhttpd%%PORTVERSION%%/counter.tcl lib/tclhttpd%%PORTVERSION%%/debug.tcl -lib/tclhttpd%%PORTVERSION%%/demo.tcl +lib/tclhttpd%%PORTVERSION%%/digest.tcl lib/tclhttpd%%PORTVERSION%%/direct.tcl lib/tclhttpd%%PORTVERSION%%/dirlist.tcl lib/tclhttpd%%PORTVERSION%%/doc.tcl +lib/tclhttpd%%PORTVERSION%%/doc_error.tcl +lib/tclhttpd%%PORTVERSION%%/doctools.tcl +lib/tclhttpd%%PORTVERSION%%/fallback.tcl lib/tclhttpd%%PORTVERSION%%/httpd.tcl lib/tclhttpd%%PORTVERSION%%/imagemap.tcl lib/tclhttpd%%PORTVERSION%%/include.tcl @@ -25,17 +30,18 @@ lib/tclhttpd%%PORTVERSION%%/maptk.tcl lib/tclhttpd%%PORTVERSION%%/mtype.tcl lib/tclhttpd%%PORTVERSION%%/open.tcl lib/tclhttpd%%PORTVERSION%%/passcheck.tcl +lib/tclhttpd%%PORTVERSION%%/passgen.tcl lib/tclhttpd%%PORTVERSION%%/pkgIndex.tcl lib/tclhttpd%%PORTVERSION%%/prodebug.tcl lib/tclhttpd%%PORTVERSION%%/redirect.tcl lib/tclhttpd%%PORTVERSION%%/safecgio.tcl lib/tclhttpd%%PORTVERSION%%/session.tcl -lib/tclhttpd%%PORTVERSION%%/sendsock.tcl -lib/tclhttpd%%PORTVERSION%%/snmp.tcl lib/tclhttpd%%PORTVERSION%%/srvui.tcl lib/tclhttpd%%PORTVERSION%%/status.tcl lib/tclhttpd%%PORTVERSION%%/stdin.tcl -lib/tclhttpd%%PORTVERSION%%/telnet.tcl +lib/tclhttpd%%PORTVERSION%%/subst.tcl +lib/tclhttpd%%PORTVERSION%%/tclcrypt.tcl +lib/tclhttpd%%PORTVERSION%%/template.tcl lib/tclhttpd%%PORTVERSION%%/thread.tcl lib/tclhttpd%%PORTVERSION%%/upload.tcl lib/tclhttpd%%PORTVERSION%%/url.tcl @@ -43,35 +49,30 @@ lib/tclhttpd%%PORTVERSION%%/utils.tcl lib/tclhttpd%%PORTVERSION%%/version.tcl lib/tclhttpd%%PORTVERSION%%/mime.types @dirrm lib/tclhttpd%%PORTVERSION%% -share/tclhttpd%%PORTVERSION%%/empty.html -share/tclhttpd%%PORTVERSION%%/error.html -share/tclhttpd%%PORTVERSION%%/hacks.tml -share/tclhttpd%%PORTVERSION%%/include.shtml -share/tclhttpd%%PORTVERSION%%/index.tml -share/tclhttpd%%PORTVERSION%%/license.terms -share/tclhttpd%%PORTVERSION%%/notfound.html -share/tclhttpd%%PORTVERSION%%/redirect -share/tclhttpd%%PORTVERSION%%/register.tml -share/tclhttpd%%PORTVERSION%%/test.tml +share/tclhttpd%%PORTVERSION%%/.tml +share/tclhttpd%%PORTVERSION%%/access/.htaccess share/tclhttpd%%PORTVERSION%%/access/README.txt -share/tclhttpd%%PORTVERSION%%/access/index.tml +share/tclhttpd%%PORTVERSION%%/access/auth/.htaccess share/tclhttpd%%PORTVERSION%%/access/auth/hello.txt share/tclhttpd%%PORTVERSION%%/access/auth/test.cgi -share/tclhttpd%%PORTVERSION%%/access/auth/.htaccess +share/tclhttpd%%PORTVERSION%%/access/bydir/.htaccess share/tclhttpd%%PORTVERSION%%/access/bydir/README.txt 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/bytcl/index.tml +share/tclhttpd%%PORTVERSION%%/access/digest/.htaccess +share/tclhttpd%%PORTVERSION%%/access/digest/Readme.txt +share/tclhttpd%%PORTVERSION%%/access/htaccess.tml +share/tclhttpd%%PORTVERSION%%/access/htman.tml +share/tclhttpd%%PORTVERSION%%/access/index.tml share/tclhttpd%%PORTVERSION%%/access/multiple/.htaccess +share/tclhttpd%%PORTVERSION%%/access/multiple/index.tml 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/null/index.tml share/tclhttpd%%PORTVERSION%%/access/session/.tclaccess -share/tclhttpd%%PORTVERSION%%/access/.htaccess -share/tclhttpd%%PORTVERSION%%/access/htaccess.tml +share/tclhttpd%%PORTVERSION%%/access/session/page.auth +share/tclhttpd%%PORTVERSION%%/admin/.htaccess share/tclhttpd%%PORTVERSION%%/book/TCLHTTPD-1.gif share/tclhttpd%%PORTVERSION%%/book/TCLHTTPD-2.gif share/tclhttpd%%PORTVERSION%%/book/TCLHTTPD.css @@ -96,22 +97,37 @@ share/tclhttpd%%PORTVERSION%%/cgi-bin/tclIndex share/tclhttpd%%PORTVERSION%%/cgi-bin/test.cgi share/tclhttpd%%PORTVERSION%%/cgi-bin/testupload.cgi share/tclhttpd%%PORTVERSION%%/cgi-bin/user.cgi +share/tclhttpd%%PORTVERSION%%/cgi-bin/wiki.cgi +share/tclhttpd%%PORTVERSION%%/debug/.htaccess +share/tclhttpd%%PORTVERSION%%/debug/.tclaccess +share/tclhttpd%%PORTVERSION%%/debug/README +share/tclhttpd%%PORTVERSION%%/empty.html +share/tclhttpd%%PORTVERSION%%/error.html +share/tclhttpd%%PORTVERSION%%/forms/.tml share/tclhttpd%%PORTVERSION%%/forms/file.tml share/tclhttpd%%PORTVERSION%%/forms/form1.tml share/tclhttpd%%PORTVERSION%%/forms/formget.tml share/tclhttpd%%PORTVERSION%%/forms/headers.tml share/tclhttpd%%PORTVERSION%%/forms/headerspost.tml share/tclhttpd%%PORTVERSION%%/forms/index.tml +share/tclhttpd%%PORTVERSION%%/forms/multi.tml share/tclhttpd%%PORTVERSION%%/forms/ncgiredirect.cgi +share/tclhttpd%%PORTVERSION%%/forms/posttest.tml share/tclhttpd%%PORTVERSION%%/forms/redirect.tml share/tclhttpd%%PORTVERSION%%/forms/redirect2.tml -share/tclhttpd%%PORTVERSION%%/forms/multi.tml -share/tclhttpd%%PORTVERSION%%/forms/posttest.tml share/tclhttpd%%PORTVERSION%%/forms/testupload.tml -share/tclhttpd%%PORTVERSION%%/forms/.tml share/tclhttpd%%PORTVERSION%%/guestbook/guestbook.cgi share/tclhttpd%%PORTVERSION%%/guestbook/newguest.cgi share/tclhttpd%%PORTVERSION%%/guestbook/newguest.html +share/tclhttpd%%PORTVERSION%%/hacks.tml +share/tclhttpd%%PORTVERSION%%/htaccess/.htaccess +share/tclhttpd%%PORTVERSION%%/htaccess/.tml +share/tclhttpd%%PORTVERSION%%/htaccess/group +share/tclhttpd%%PORTVERSION%%/htaccess/group.tml +share/tclhttpd%%PORTVERSION%%/htaccess/htaccess.org +share/tclhttpd%%PORTVERSION%%/htaccess/index.tml +share/tclhttpd%%PORTVERSION%%/htaccess/register.tml +share/tclhttpd%%PORTVERSION%%/htaccess/user.tml share/tclhttpd%%PORTVERSION%%/images/AjubaLogo.gif share/tclhttpd%%PORTVERSION%%/images/Blue.gif share/tclhttpd%%PORTVERSION%%/images/Red.gif @@ -134,7 +150,9 @@ share/tclhttpd%%PORTVERSION%%/images/pwrdLogo75.gif share/tclhttpd%%PORTVERSION%%/images/setup.gif share/tclhttpd%%PORTVERSION%%/images/tcl89.gif share/tclhttpd%%PORTVERSION%%/images/tclp.gif +share/tclhttpd%%PORTVERSION%%/include.shtml share/tclhttpd%%PORTVERSION%%/include/footer.html +share/tclhttpd%%PORTVERSION%%/index.tml share/tclhttpd%%PORTVERSION%%/java/Auth.class share/tclhttpd%%PORTVERSION%%/java/Getpass.class share/tclhttpd%%PORTVERSION%%/java/Helper.class @@ -144,35 +162,75 @@ share/tclhttpd%%PORTVERSION%%/java/ServerDemo.class share/tclhttpd%%PORTVERSION%%/java/ServerDemo.html share/tclhttpd%%PORTVERSION%%/java/auth.js share/tclhttpd%%PORTVERSION%%/java/test.html +share/tclhttpd%%PORTVERSION%%/learn/direct.tml +share/tclhttpd%%PORTVERSION%%/learn/domain.tml +share/tclhttpd%%PORTVERSION%%/learn/index.tml +share/tclhttpd%%PORTVERSION%%/learn/security.tml +share/tclhttpd%%PORTVERSION%%/learn/setup.tml +share/tclhttpd%%PORTVERSION%%/license.terms share/tclhttpd%%PORTVERSION%%/links/INSTALL.txt -share/tclhttpd%%PORTVERSION%%/links/README.txt share/tclhttpd%%PORTVERSION%%/links/README.ssl.txt +share/tclhttpd%%PORTVERSION%%/links/README.txt share/tclhttpd%%PORTVERSION%%/links/WHATSNEW.txt -share/tclhttpd%%PORTVERSION%%/libtml/Index -share/tclhttpd%%PORTVERSION%%/libtml/faq.tcl -share/tclhttpd%%PORTVERSION%%/libtml/htmlutils.tcl -share/tclhttpd%%PORTVERSION%%/libtml/mypage.tcl -share/tclhttpd%%PORTVERSION%%/libtml/pkgIndex.tcl -share/tclhttpd%%PORTVERSION%%/libtml/ss_survey.tcl -share/tclhttpd%%PORTVERSION%%/libtml/sunscript.tcl +share/tclhttpd%%PORTVERSION%%/man/architecture.man +share/tclhttpd%%PORTVERSION%%/man/base64.man +share/tclhttpd%%PORTVERSION%%/man/cgi.man +share/tclhttpd%%PORTVERSION%%/man/changelog.man +share/tclhttpd%%PORTVERSION%%/man/cmdline.man +share/tclhttpd%%PORTVERSION%%/man/config.man +share/tclhttpd%%PORTVERSION%%/man/cookie.man +share/tclhttpd%%PORTVERSION%%/man/counter.man +share/tclhttpd%%PORTVERSION%%/man/cvs.man +share/tclhttpd%%PORTVERSION%%/man/direct.man +share/tclhttpd%%PORTVERSION%%/man/dirlist.man +share/tclhttpd%%PORTVERSION%%/man/doc.man +share/tclhttpd%%PORTVERSION%%/man/doc_error.man +share/tclhttpd%%PORTVERSION%%/man/docidx.man +share/tclhttpd%%PORTVERSION%%/man/docidx_api.man +share/tclhttpd%%PORTVERSION%%/man/docidx_fmt.man +share/tclhttpd%%PORTVERSION%%/man/doctoc.man +share/tclhttpd%%PORTVERSION%%/man/doctoc_api.man +share/tclhttpd%%PORTVERSION%%/man/doctoc_fmt.man +share/tclhttpd%%PORTVERSION%%/man/doctools.man +share/tclhttpd%%PORTVERSION%%/man/doctools_api.man +share/tclhttpd%%PORTVERSION%%/man/doctools_fmt.man +share/tclhttpd%%PORTVERSION%%/man/expander.man +share/tclhttpd%%PORTVERSION%%/man/fileutil.man +share/tclhttpd%%PORTVERSION%%/man/html.man +share/tclhttpd%%PORTVERSION%%/man/httpd.man +share/tclhttpd%%PORTVERSION%%/man/index.tml +share/tclhttpd%%PORTVERSION%%/man/log.man +share/tclhttpd%%PORTVERSION%%/man/logstd.man +share/tclhttpd%%PORTVERSION%%/man/md5.man +share/tclhttpd%%PORTVERSION%%/man/md5crypt.man +share/tclhttpd%%PORTVERSION%%/man/mime.man +share/tclhttpd%%PORTVERSION%%/man/mpexpand.man +share/tclhttpd%%PORTVERSION%%/man/mtype.man +share/tclhttpd%%PORTVERSION%%/man/ncgi.man +share/tclhttpd%%PORTVERSION%%/man/session.man +share/tclhttpd%%PORTVERSION%%/man/smtp.man +share/tclhttpd%%PORTVERSION%%/man/subst.man +share/tclhttpd%%PORTVERSION%%/man/tclhttpd.man +share/tclhttpd%%PORTVERSION%%/man/textutil.man +share/tclhttpd%%PORTVERSION%%/man/uri.man +share/tclhttpd%%PORTVERSION%%/man/url.man +share/tclhttpd%%PORTVERSION%%/man/uuencode.man +share/tclhttpd%%PORTVERSION%%/man/version.man +share/tclhttpd%%PORTVERSION%%/man/yencode.man +share/tclhttpd%%PORTVERSION%%/manual/embedding.tml share/tclhttpd%%PORTVERSION%%/manual/htdig.html -share/tclhttpd%%PORTVERSION%%/manual/reference.tml +share/tclhttpd%%PORTVERSION%%/manual/intro.tml share/tclhttpd%%PORTVERSION%%/manual/stdin.html -share/tclhttpd%%PORTVERSION%%/manual/technotes.tml share/tclhttpd%%PORTVERSION%%/map/bush.tml share/tclhttpd%%PORTVERSION%%/map/index.tml share/tclhttpd%%PORTVERSION%%/map/mapdefault.tml share/tclhttpd%%PORTVERSION%%/map/surfer.tml +share/tclhttpd%%PORTVERSION%%/notfound.html +share/tclhttpd%%PORTVERSION%%/redirect +share/tclhttpd%%PORTVERSION%%/register.tml +share/tclhttpd%%PORTVERSION%%/sampleapp/bugdb/.tml +share/tclhttpd%%PORTVERSION%%/sampleapp/calendar.tml share/tclhttpd%%PORTVERSION%%/snmp/allport.snmp -share/tclhttpd%%PORTVERSION%%/snmp/discover.snmp -share/tclhttpd%%PORTVERSION%%/snmp/host.snmp -share/tclhttpd%%PORTVERSION%%/snmp/index.html -share/tclhttpd%%PORTVERSION%%/snmp/outdiscov.snmp -share/tclhttpd%%PORTVERSION%%/snmp/portdetail.snmp -share/tclhttpd%%PORTVERSION%%/snmp/repeat.snmp -share/tclhttpd%%PORTVERSION%%/snmp/system.snmp -share/tclhttpd%%PORTVERSION%%/snmp/telnet.snmp -share/tclhttpd%%PORTVERSION%%/snmp/telnet_pass.snmp share/tclhttpd%%PORTVERSION%%/snmp/browser/README share/tclhttpd%%PORTVERSION%%/snmp/browser/browser.snmp share/tclhttpd%%PORTVERSION%%/snmp/browser/browser2.snmp @@ -184,6 +242,15 @@ share/tclhttpd%%PORTVERSION%%/snmp/browser/title.html share/tclhttpd%%PORTVERSION%%/snmp/browser/title.snmp share/tclhttpd%%PORTVERSION%%/snmp/browser/walk.snmp share/tclhttpd%%PORTVERSION%%/snmp/browser/walker.snmp +share/tclhttpd%%PORTVERSION%%/snmp/discover.snmp +share/tclhttpd%%PORTVERSION%%/snmp/host.snmp +share/tclhttpd%%PORTVERSION%%/snmp/index.html +share/tclhttpd%%PORTVERSION%%/snmp/outdiscov.snmp +share/tclhttpd%%PORTVERSION%%/snmp/portdetail.snmp +share/tclhttpd%%PORTVERSION%%/snmp/repeat.snmp +share/tclhttpd%%PORTVERSION%%/snmp/system.snmp +share/tclhttpd%%PORTVERSION%%/snmp/telnet.snmp +share/tclhttpd%%PORTVERSION%%/snmp/telnet_pass.snmp share/tclhttpd%%PORTVERSION%%/snmp/test_mibTable/README share/tclhttpd%%PORTVERSION%%/snmp/test_mibTable/index.html share/tclhttpd%%PORTVERSION%%/snmp/test_mibTable/table1.snmp @@ -191,46 +258,61 @@ share/tclhttpd%%PORTVERSION%%/snmp/test_mibTable/table2.snmp share/tclhttpd%%PORTVERSION%%/snmp/test_mibTable/table3.snmp share/tclhttpd%%PORTVERSION%%/snmp/test_mibTable/table4.snmp share/tclhttpd%%PORTVERSION%%/snmp/test_mibTable/test2.snmp +share/tclhttpd%%PORTVERSION%%/stats/.tml share/tclhttpd%%PORTVERSION%%/stats/doc.tml share/tclhttpd%%PORTVERSION%%/stats/index.tml share/tclhttpd%%PORTVERSION%%/stats/notfound.tml -share/tclhttpd%%PORTVERSION%%/stats/.tml +share/tclhttpd%%PORTVERSION%%/status/.htaccess +share/tclhttpd%%PORTVERSION%%/status/.tclaccess +share/tclhttpd%%PORTVERSION%%/templates/.tml share/tclhttpd%%PORTVERSION%%/templates/faqfaq.tml share/tclhttpd%%PORTVERSION%%/templates/form.tml share/tclhttpd%%PORTVERSION%%/templates/index.tml +share/tclhttpd%%PORTVERSION%%/templates/self.tml share/tclhttpd%%PORTVERSION%%/templates/simple.subst -share/tclhttpd%%PORTVERSION%%/templates/.tml -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 -@dirrm share/tclhttpd%%PORTVERSION%%/access -@dirrm share/tclhttpd%%PORTVERSION%%/book -@dirrm share/tclhttpd%%PORTVERSION%%/cgi-bin -@dirrm share/tclhttpd%%PORTVERSION%%/forms -@dirrm share/tclhttpd%%PORTVERSION%%/guestbook -@dirrm share/tclhttpd%%PORTVERSION%%/images -@dirrm share/tclhttpd%%PORTVERSION%%/include -@dirrm share/tclhttpd%%PORTVERSION%%/java -@dirrm share/tclhttpd%%PORTVERSION%%/libtml -@dirrm share/tclhttpd%%PORTVERSION%%/links -@dirrm share/tclhttpd%%PORTVERSION%%/manual -@dirrm share/tclhttpd%%PORTVERSION%%/map -@dirrm share/tclhttpd%%PORTVERSION%%/snmp/browser +share/tclhttpd%%PORTVERSION%%/test.tml +share/tclhttpd%%PORTVERSION%%/tests/add_headers.tml +share/tclhttpd%%PORTVERSION%%/tests/refresh.tml +share/tclhttpd%%PORTVERSION%%/version_history.tml +@dirrm share/tclhttpd%%PORTVERSION%%/tests +@dirrm share/tclhttpd%%PORTVERSION%%/templates +@dirrm share/tclhttpd%%PORTVERSION%%/status +@dirrm share/tclhttpd%%PORTVERSION%%/stats @dirrm share/tclhttpd%%PORTVERSION%%/snmp/test_mibTable +@dirrm share/tclhttpd%%PORTVERSION%%/snmp/browser @dirrm share/tclhttpd%%PORTVERSION%%/snmp -@dirrm share/tclhttpd%%PORTVERSION%%/stats -@dirrm share/tclhttpd%%PORTVERSION%%/templates +@dirrm share/tclhttpd%%PORTVERSION%%/sampleapp/bugdb +@dirrm share/tclhttpd%%PORTVERSION%%/sampleapp +@dirrm share/tclhttpd%%PORTVERSION%%/map +@dirrm share/tclhttpd%%PORTVERSION%%/manual +@dirrm share/tclhttpd%%PORTVERSION%%/man +@dirrm share/tclhttpd%%PORTVERSION%%/links +@dirrm share/tclhttpd%%PORTVERSION%%/learn +@dirrm share/tclhttpd%%PORTVERSION%%/java +@dirrm share/tclhttpd%%PORTVERSION%%/include +@dirrm share/tclhttpd%%PORTVERSION%%/images +@dirrm share/tclhttpd%%PORTVERSION%%/htaccess +@dirrm share/tclhttpd%%PORTVERSION%%/guestbook +@dirrm share/tclhttpd%%PORTVERSION%%/forms +@dirrm share/tclhttpd%%PORTVERSION%%/debug +@dirrm share/tclhttpd%%PORTVERSION%%/cgi-bin +@dirrm share/tclhttpd%%PORTVERSION%%/book +@dirrm share/tclhttpd%%PORTVERSION%%/admin +@dirrm share/tclhttpd%%PORTVERSION%%/access/session +@dirrm share/tclhttpd%%PORTVERSION%%/access/null +@dirrm share/tclhttpd%%PORTVERSION%%/access/noawe +@dirrm share/tclhttpd%%PORTVERSION%%/access/multiple +@dirrm share/tclhttpd%%PORTVERSION%%/access/digest +@dirrm share/tclhttpd%%PORTVERSION%%/access/bytcl +@dirrm share/tclhttpd%%PORTVERSION%%/access/bydir +@dirrm share/tclhttpd%%PORTVERSION%%/access/auth +@dirrm share/tclhttpd%%PORTVERSION%%/access @dirrm share/tclhttpd%%PORTVERSION%% tclhttpd/custom/README -tclhttpd/custom/ddehack.tcl +tclhttpd/custom/dodirs.tcl +tclhttpd/custom/faq.tcl tclhttpd/custom/hello.tcl -tclhttpd/custom/snmpinit.tcl -tclhttpd/custom/tclpro.tcl +tclhttpd/custom/mypage.tcl @dirrm tclhttpd/custom tclhttpd/README tclhttpd/README_custom diff --git a/www/tclhttpd/scripts/post-patch b/www/tclhttpd/scripts/post-patch index 26de6121b1fd..0ac49a5f89ca 100644 --- a/www/tclhttpd/scripts/post-patch +++ b/www/tclhttpd/scripts/post-patch @@ -1,10 +1,6 @@ if [ ${LOCALBASE} != /usr/local ] ; then - for f in `find ${WRKSRC} -type f | xargs grep -l /usr/local` - do - cp -p $f $f.ul && \ - sed "s%/usr/local%${LOCALBASE}%g" < $f.ul > $f \ - && rm -f $f.ul - done + find ${WRKSRC} -type f | xargs grep -l /usr/local |\ + xargs sed -i "" -e s%/usr/local%${LOCALBASE}%g fi for f in `find ${WRKSRC} -type f | \ xargs grep -l '^exec tclsh.* '` |