diff options
| author | jlam <jlam@pkgsrc.org> | 2002-06-23 18:57:14 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-06-23 18:57:14 +0000 |
| commit | 144ec548a3b1d0c2aa05b6f7d0decc1fc410968c (patch) | |
| tree | 6a53e2476bbe5ddbd73d5fd80adcc3152dc28ace /www | |
| parent | 759f695a1894bbbad984096b1fc5a2b518204b48 (diff) | |
| download | pkgsrc-144ec548a3b1d0c2aa05b6f7d0decc1fc410968c.tar.gz | |
Merge from pkgsrc-current to buildlink2 branch.
Diffstat (limited to 'www')
154 files changed, 1494 insertions, 1525 deletions
diff --git a/www/Makefile b/www/Makefile index face9117c8d..20985ed1e00 100644 --- a/www/Makefile +++ b/www/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.190 2002/05/06 21:50:41 seb Exp $ +# $NetBSD: Makefile,v 1.190.2.1 2002/06/23 19:03:18 jlam Exp $ # COMMENT= Packages related to the World Wide Web @@ -51,6 +51,7 @@ SUBDIR+= cronolog SUBDIR+= curl SUBDIR+= cvsweb SUBDIR+= dillo +SUBDIR+= elinks SUBDIR+= galeon SUBDIR+= galway SUBDIR+= glibwww @@ -75,10 +76,13 @@ SUBDIR+= jssi SUBDIR+= kannel SUBDIR+= libghttp SUBDIR+= libwww +SUBDIR+= lhs SUBDIR+= links +SUBDIR+= links-gui SUBDIR+= lynx SUBDIR+= lynx-current SUBDIR+= make_album +SUBDIR+= mknmz-wwwoffle SUBDIR+= mozilla SUBDIR+= navigator SUBDIR+= navigator3 @@ -123,6 +127,7 @@ SUBDIR+= p5-HTTPD-User-Manage SUBDIR+= p5-Template-Toolkit SUBDIR+= p5-URI SUBDIR+= p5-VRML +SUBDIR+= p5-WWW-Amazon-Wishlist SUBDIR+= p5-libapreq SUBDIR+= p5-libwww SUBDIR+= php-FastTemplate @@ -138,13 +143,13 @@ SUBDIR+= quanta SUBDIR+= quanta-docs SUBDIR+= ruby-htmlsplit SUBDIR+= ruby-tag -SUBDIR+= ruby-uri SUBDIR+= sitecopy SUBDIR+= skipstone SUBDIR+= snarf SUBDIR+= spfc SUBDIR+= squid SUBDIR+= surfraw +SUBDIR+= swill SUBDIR+= swish-e SUBDIR+= tcl-cgi SUBDIR+= thttpd @@ -153,6 +158,7 @@ SUBDIR+= urlget SUBDIR+= w3 SUBDIR+= w3c-httpd SUBDIR+= w3m +SUBDIR+= w3m-img SUBDIR+= wApua SUBDIR+= waplet SUBDIR+= wdg-validate diff --git a/www/analog/Makefile b/www/analog/Makefile index 232df9da93e..1d5d7564be5 100644 --- a/www/analog/Makefile +++ b/www/analog/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.32 2002/03/20 14:16:00 tron Exp $ +# $NetBSD: Makefile,v 1.32.2.1 2002/06/23 19:03:19 jlam Exp $ -DISTNAME= analog-5.22 +DISTNAME= analog-5.23 CATEGORIES= www MASTER_SITES= ${HOMEPAGE} \ http://www.web42.com/analog/ \ diff --git a/www/analog/PLIST b/www/analog/PLIST index 1890ccfb287..b0355bc6b09 100644 --- a/www/analog/PLIST +++ b/www/analog/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2002/02/20 16:44:27 tron Exp $ +@comment $NetBSD: PLIST,v 1.4.2.1 2002/06/23 19:03:20 jlam Exp $ bin/analog etc/analog.cfg.default @exec test -f %D/etc/analog.cfg || cp -p %D/%F %D/etc/analog.cfg @@ -247,8 +247,12 @@ lib/analog/lang/ptdom.tab lib/analog/lang/ro.lng lib/analog/lang/rodom.tab lib/analog/lang/ru.lng -lib/analog/lang/rua.lng lib/analog/lang/rudom.tab +lib/analog/lang/ru1.lng +lib/analog/lang/ru1desc.txt +lib/analog/lang/ru1dom.tab +lib/analog/lang/rudesc.txt +lib/analog/lang/ruform.html lib/analog/lang/se.lng lib/analog/lang/se2.lng lib/analog/lang/se2a.lng diff --git a/www/analog/distinfo b/www/analog/distinfo index 507df9d5164..29da66318fa 100644 --- a/www/analog/distinfo +++ b/www/analog/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.11 2002/03/20 14:16:01 tron Exp $ +$NetBSD: distinfo,v 1.11.2.1 2002/06/23 19:03:20 jlam Exp $ -SHA1 (analog-5.22.tar.gz) = 10d8ff187398243778fad0929e2a53f863ecf275 -Size (analog-5.22.tar.gz) = 876264 bytes +SHA1 (analog-5.23.tar.gz) = 323a6baf050d9e452d481305581338d2483b3b24 +Size (analog-5.23.tar.gz) = 980399 bytes SHA1 (patch-aa) = cc7879420cf9233db58908958f5380636d256656 SHA1 (patch-ab) = f11c9d3f5dec5b9cd04de0d114752c58484a648a diff --git a/www/ap-aolserver/Makefile b/www/ap-aolserver/Makefile index 099ccdd6ee4..389a931434e 100644 --- a/www/ap-aolserver/Makefile +++ b/www/ap-aolserver/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.8 2002/03/04 19:41:08 fredb Exp $ +# $NetBSD: Makefile,v 1.8.2.1 2002/06/23 19:03:20 jlam Exp $ # DISTNAME= mod_aolserver-1.1 PKGNAME= ap-aolserver-1.1 CATEGORIES= www -MASTER_SITES= # none +MASTER_SITES= ${MASTER_SITE_LOCAL} MAINTAINER= cjones@netbsd.org HOMEPAGE= http://www.arsdigita.com/acs-repository/one-version?version_id=601 diff --git a/www/ap-aolserver/distinfo b/www/ap-aolserver/distinfo index 13ee66de252..e3507fb8aa4 100644 --- a/www/ap-aolserver/distinfo +++ b/www/ap-aolserver/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.2 2001/08/21 17:26:07 cjones Exp $ +$NetBSD: distinfo,v 1.2.2.1 2002/06/23 19:03:21 jlam Exp $ SHA1 (mod_aolserver-1.1.tar.gz) = 4173d5881c3c82cbb567da85107d032e06f17118 Size (mod_aolserver-1.1.tar.gz) = 193569 bytes -SHA1 (patch-aa) = 0d702bb2eb0c6c93f98ec11f9886da654cf21b6c +SHA1 (patch-aa) = b5db9312ad50d0bf4b8705a54d82141ef8ad0183 diff --git a/www/ap-aolserver/patches/patch-aa b/www/ap-aolserver/patches/patch-aa index 5988ce79dad..e4a67fdf004 100644 --- a/www/ap-aolserver/patches/patch-aa +++ b/www/ap-aolserver/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.2 2001/08/21 17:26:08 cjones Exp $ +$NetBSD: patch-aa,v 1.2.2.1 2002/06/23 19:03:22 jlam Exp $ --- Makefile.in.orig Sat Oct 7 12:44:37 2000 -+++ Makefile.in Sat Aug 18 13:53:04 2001 ++++ Makefile.in Wed Jun 19 16:06:55 2002 @@ -7,7 +7,7 @@ APACHE_BASE = @APACHE_BASE@ APXS = @APXS@ @@ -43,7 +43,7 @@ $NetBSD: patch-aa,v 1.2 2001/08/21 17:26:08 cjones Exp $ $(MODULE_FILE): $(OBJS) - $(APXS) -c -o $@ $(OBJS) $(LIBS) -+ $(APXS) -c -o $@ $(OBJS) `echo $(LIBS) | sed 's/-Wl,//'` ++ $(APXS) -c -o $@ $(LIBS) $(OBJS) install: install-mod_aolserver install-bootstrap install-tcl diff --git a/www/ap-dtcl/distinfo b/www/ap-dtcl/distinfo index 30dff17bcf1..25a54bd44b8 100644 --- a/www/ap-dtcl/distinfo +++ b/www/ap-dtcl/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.7 2002/04/19 18:32:37 jwise Exp $ +$NetBSD: distinfo,v 1.7.2.1 2002/06/23 19:03:22 jlam Exp $ SHA1 (mod_dtcl-0.11.6.tar.gz) = 8a48b2292bb1048b17fd268011d1a4307ef5770e Size (mod_dtcl-0.11.6.tar.gz) = 90374 bytes -SHA1 (patch-aa) = 8dd25eb370d2cf598cac4c42842b863fa0943451 +SHA1 (patch-aa) = 512e310549e475fbd6106eef52d2f789f4a0390b diff --git a/www/ap-dtcl/patches/patch-aa b/www/ap-dtcl/patches/patch-aa index 7e8831dac4b..1cea97a6b92 100644 --- a/www/ap-dtcl/patches/patch-aa +++ b/www/ap-dtcl/patches/patch-aa @@ -1,8 +1,8 @@ ---- builddtcl.sh.orig Fri Apr 19 14:19:04 2002 -+++ builddtcl.sh Fri Apr 19 14:19:13 2002 -@@ -1,57 +1,6 @@ - #!/bin/sh - # $Id: patch-aa,v 1.7 2002/04/19 18:32:37 jwise Exp $ +$NetBSD: patch-aa,v 1.7.2.1 2002/06/23 19:03:23 jlam Exp $ + +--- builddtcl.sh.orig Tue Oct 9 17:29:47 2001 ++++ builddtcl.sh +@@ -3,53 +3,2 @@ -# Name of tclsh - on FreeBSD, this is probably tclsh8.2 -TCLSH=tclsh ######### CHANGEME ########## @@ -56,5 +56,3 @@ -fi - # find location of tclConfig.sh, source it, and export variables to - # make them available to 'make' - diff --git a/www/ap-jserv/patches/patch-aa b/www/ap-jserv/patches/patch-aa index 15761ce7ca2..6481989286d 100644 --- a/www/ap-jserv/patches/patch-aa +++ b/www/ap-jserv/patches/patch-aa @@ -1,3 +1,4 @@ +$NetBSD: patch-aa,v 1.2.2.1 2002/06/23 19:03:23 jlam Exp $ --- configure.orig Sat Jun 17 15:05:17 2000 +++ configure Mon Jan 14 10:16:23 2002 @@ -2439,8 +2439,8 @@ diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile index d5bae78a9c6..97f5ae05e5e 100644 --- a/www/ap-ssl/Makefile +++ b/www/ap-ssl/Makefile @@ -1,9 +1,11 @@ -# $NetBSD: Makefile,v 1.47 2002/04/02 14:22:23 jlam Exp $ +# $NetBSD: Makefile,v 1.47.2.1 2002/06/23 19:03:24 jlam Exp $ -DISTNAME= mod_ssl-2.8.8-1.3.24 -PKGNAME= ap-ssl-2.8.8 +DISTNAME= mod_ssl-2.8.9-1.3.26 +PKGNAME= ap-ssl-2.8.9 CATEGORIES= www security -MASTER_SITES= http://www.modssl.org/source/ +MASTER_SITES= http://www.modssl.org/source/ \ + ftp://ftp.pca.dfn.de/pub/tools/net/mod_ssl/source/ \ + ftp://ftp.funet.fi/pub/crypt/cryptography/libs/modssl/source/ MAINTAINER= jlam@netbsd.org HOMEPAGE= http://www.modssl.org/ @@ -11,7 +13,7 @@ COMMENT= SSL/TLS protocols module for Apache CONFLICTS= apache-1.3.[0-9] apache-*modssl-[0-9]* apache6-[0-9]* -DEPENDS+= apache-1.3.24:../../www/apache +DEPENDS+= apache-1.3.26nb1:../../www/apache USE_BUILDLINK_ONLY= YES diff --git a/www/ap-ssl/distinfo b/www/ap-ssl/distinfo index 6e98181fce7..984bac306b1 100644 --- a/www/ap-ssl/distinfo +++ b/www/ap-ssl/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.10 2002/04/02 14:22:23 jlam Exp $ +$NetBSD: distinfo,v 1.10.2.1 2002/06/23 19:03:25 jlam Exp $ -SHA1 (mod_ssl-2.8.8-1.3.24.tar.gz) = 9d9e7d0b78591a56b3c251a25a47e394719c8e36 -Size (mod_ssl-2.8.8-1.3.24.tar.gz) = 752322 bytes +SHA1 (mod_ssl-2.8.9-1.3.26.tar.gz) = 3075124cce758f06b292baa754d55eab639cdfc9 +Size (mod_ssl-2.8.9-1.3.26.tar.gz) = 752613 bytes SHA1 (patch-aa) = 6b66b8d9e8bd03613376dca3b4e0dad3a2e7ed15 SHA1 (patch-ab) = bd1d4eeff91f87a2b46f1ce0ad95dab8a3c23c84 diff --git a/www/apache/Makefile b/www/apache/Makefile index c1eb4d87533..54d7fb33e0c 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -1,14 +1,16 @@ -# $NetBSD: Makefile,v 1.92 2002/04/02 14:13:01 jlam Exp $ +# $NetBSD: Makefile,v 1.92.2.1 2002/06/23 19:03:25 jlam Exp $ # # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of # code hooks that allow mod_ssl to be compiled separately later, if desired). -DISTNAME= apache_1.3.24 -PKGNAME= apache-1.3.24 -PKGREVISION= # empty +DISTNAME= apache_1.3.26 +PKGNAME= apache-1.3.26 +PKGREVISION= 1 CATEGORIES= www MASTER_SITES= http://httpd.apache.org/dist/httpd/ \ http://www.apache.de/dist/httpd/ +# This must be defined, before it may be referred to on the LHS. +EXTRACT_SUFX= .tar.gz APACHE_DIST= ${DISTNAME}${EXTRACT_SUFX} DISTFILES= ${APACHE_DIST} @@ -17,11 +19,12 @@ NETBSD_LOGO= sitedrivenby.gif SITES_${NETBSD_LOGO}= http://www.netbsd.org/images/logos/ DISTFILES+= ${NETBSD_LOGO} -MODSSL_DISTNAME= mod_ssl-2.8.8-1.3.24 +MODSSL_DISTNAME= mod_ssl-2.8.9-1.3.26 MODSSL_DIST= ${MODSSL_DISTNAME}${EXTRACT_SUFX} MODSSL_SRC= ${WRKDIR}/${MODSSL_DISTNAME} SITES_${MODSSL_DIST}= http://www.modssl.org/source/ \ - ftp://ftp.uni-trier.de/pub/unix/security/mod_ssl/source/ + ftp://ftp.pca.dfn.de/pub/tools/net/mod_ssl/source/ \ + ftp://ftp.funet.fi/pub/crypt/cryptography/libs/modssl/source/ DISTFILES+= ${MODSSL_DIST} MAINTAINER= jlam@netbsd.org @@ -43,6 +46,7 @@ CONFIGURE_ARGS+= --with-perl=${PERL5} CONFIGURE_ARGS+= --with-port=80 CONFIGURE_ENV+= OPTIM="${APACHE_CUSTOM_CFLAGS}" CONFIGURE_ENV+= EAPI_MM="${BUILDLINK_DIR}" +CONFIGURE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} .include "../../mk/bsd.prefs.mk" @@ -166,7 +170,6 @@ post-install: done ${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/httpd/htdocs ${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache - ${CHOWN} -R ${DOCOWN}:${DOCGRP} ${PREFIX}/share/httpd .include "../../devel/libmm/buildlink.mk" .include "../../textproc/expat/buildlink.mk" diff --git a/www/apache/PLIST b/www/apache/PLIST index 1e5a0fb9adb..c241e8da820 100644 --- a/www/apache/PLIST +++ b/www/apache/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/04/02 14:13:02 jlam Exp $ +@comment $NetBSD: PLIST,v 1.3.2.1 2002/06/23 19:03:26 jlam Exp $ bin/checkgid bin/dbmmanage bin/htdigest @@ -87,7 +87,7 @@ share/httpd/htdocs/index.html.he.iso8859-8 share/httpd/htdocs/index.html.it share/httpd/htdocs/index.html.ja.jis share/httpd/htdocs/index.html.kr.iso-kr -share/httpd/htdocs/index.html.lu +share/httpd/htdocs/index.html.lb.utf8 share/httpd/htdocs/index.html.nl share/httpd/htdocs/index.html.nn share/httpd/htdocs/index.html.no @@ -102,14 +102,16 @@ share/httpd/htdocs/index.html.ru.ucs2 share/httpd/htdocs/index.html.ru.ucs4 share/httpd/htdocs/index.html.ru.utf8 share/httpd/htdocs/index.html.se -share/httpd/htdocs/index.html.zh.Big5 +share/httpd/htdocs/index.html.zh share/httpd/htdocs/manual/LICENSE share/httpd/htdocs/manual/bind.html.en share/httpd/htdocs/manual/bind.html.fr share/httpd/htdocs/manual/bind.html.html +share/httpd/htdocs/manual/bind.html.ja.jis share/httpd/htdocs/manual/cgi_path.html.en share/httpd/htdocs/manual/cgi_path.html.fr share/httpd/htdocs/manual/cgi_path.html.html +share/httpd/htdocs/manual/cgi_path.html.ja.jis share/httpd/htdocs/manual/configuring.html.en share/httpd/htdocs/manual/configuring.html.fr share/httpd/htdocs/manual/configuring.html.html @@ -133,14 +135,14 @@ share/httpd/htdocs/manual/handler.html.en share/httpd/htdocs/manual/handler.html.html share/httpd/htdocs/manual/handler.html.ja.jis share/httpd/htdocs/manual/header.html +share/httpd/htdocs/manual/howto/cgi.html.html share/httpd/htdocs/manual/howto/auth.html share/httpd/htdocs/manual/howto/cgi.html.en -share/httpd/htdocs/manual/howto/cgi.html.html share/httpd/htdocs/manual/howto/cgi.html.ja.jis +share/httpd/htdocs/manual/howto/ssi.html.html share/httpd/htdocs/manual/howto/footer.html share/httpd/htdocs/manual/howto/header.html share/httpd/htdocs/manual/howto/ssi.html.en -share/httpd/htdocs/manual/howto/ssi.html.html share/httpd/htdocs/manual/howto/ssi.html.ja.jis share/httpd/htdocs/manual/images/apache_header.gif share/httpd/htdocs/manual/images/custom_errordocs.gif @@ -171,24 +173,24 @@ share/httpd/htdocs/manual/keepalive.html.ja.jis share/httpd/htdocs/manual/location.html share/httpd/htdocs/manual/logs.html share/httpd/htdocs/manual/man-template.html +share/httpd/htdocs/manual/misc/fin_wait_2.html share/httpd/htdocs/manual/misc/API.html share/httpd/htdocs/manual/misc/FAQ.html -share/httpd/htdocs/manual/misc/HTTP_Features.tsv +share/httpd/htdocs/manual/misc/known_client_problems.html share/httpd/htdocs/manual/misc/client_block_api.html share/httpd/htdocs/manual/misc/compat_notes.html share/httpd/htdocs/manual/misc/custom_errordocs.html share/httpd/htdocs/manual/misc/descriptors.html -share/httpd/htdocs/manual/misc/fin_wait_2.html share/httpd/htdocs/manual/misc/footer.html +share/httpd/htdocs/manual/misc/HTTP_Features.tsv share/httpd/htdocs/manual/misc/header.html share/httpd/htdocs/manual/misc/howto.html share/httpd/htdocs/manual/misc/index.html -share/httpd/htdocs/manual/misc/known_client_problems.html -share/httpd/htdocs/manual/misc/nopgp.html share/httpd/htdocs/manual/misc/perf-bsd44.html +share/httpd/htdocs/manual/misc/nopgp.html +share/httpd/htdocs/manual/misc/perf-tuning.html share/httpd/htdocs/manual/misc/perf-dec.html share/httpd/htdocs/manual/misc/perf-hp.html -share/httpd/htdocs/manual/misc/perf-tuning.html share/httpd/htdocs/manual/misc/perf.html share/httpd/htdocs/manual/misc/rewriteguide.html share/httpd/htdocs/manual/misc/security_tips.html @@ -207,21 +209,27 @@ share/httpd/htdocs/manual/mod/directives.html.en share/httpd/htdocs/manual/mod/directives.html.fr share/httpd/htdocs/manual/mod/directives.html.html share/httpd/htdocs/manual/mod/directives.html.ja.jis -share/httpd/htdocs/manual/mod/footer.html share/httpd/htdocs/manual/mod/header.html share/httpd/htdocs/manual/mod/index-bytype.html.en share/httpd/htdocs/manual/mod/index-bytype.html.fr share/httpd/htdocs/manual/mod/index-bytype.html.html +share/httpd/htdocs/manual/mod/index-bytype.html.ja.jis share/httpd/htdocs/manual/mod/index.html.en share/httpd/htdocs/manual/mod/index.html.fr share/httpd/htdocs/manual/mod/index.html.html share/httpd/htdocs/manual/mod/index.html.ja.jis -share/httpd/htdocs/manual/mod/mod_access.html +share/httpd/htdocs/manual/mod/mod_access.html.en +share/httpd/htdocs/manual/mod/mod_access.html.html share/httpd/htdocs/manual/mod/mod_access.html.ja.jis -share/httpd/htdocs/manual/mod/mod_actions.html +share/httpd/htdocs/manual/mod/mod_actions.html.en +share/httpd/htdocs/manual/mod/mod_actions.html.html +share/httpd/htdocs/manual/mod/mod_actions.html.ja.jis share/httpd/htdocs/manual/mod/mod_alias.html -share/httpd/htdocs/manual/mod/mod_asis.html +share/httpd/htdocs/manual/mod/mod_asis.html.en +share/httpd/htdocs/manual/mod/mod_asis.html.html +share/httpd/htdocs/manual/mod/mod_asis.html.ja.jis share/httpd/htdocs/manual/mod/mod_auth.html +share/httpd/htdocs/manual/mod/mod_cgi.html.en share/httpd/htdocs/manual/mod/mod_auth_anon.html share/httpd/htdocs/manual/mod/mod_auth_db.html share/httpd/htdocs/manual/mod/mod_auth_dbm.html @@ -229,9 +237,9 @@ share/httpd/htdocs/manual/mod/mod_auth_digest.html share/httpd/htdocs/manual/mod/mod_autoindex.html share/httpd/htdocs/manual/mod/mod_browser.html share/httpd/htdocs/manual/mod/mod_cern_meta.html -share/httpd/htdocs/manual/mod/mod_cgi.html +share/httpd/htdocs/manual/mod/mod_cgi.html.html +share/httpd/htdocs/manual/mod/mod_cgi.html.ja.jis share/httpd/htdocs/manual/mod/mod_cookies.html -share/httpd/htdocs/manual/mod/mod_define.html share/httpd/htdocs/manual/mod/mod_digest.html share/httpd/htdocs/manual/mod/mod_dir.html.en share/httpd/htdocs/manual/mod/mod_dir.html.html @@ -240,12 +248,15 @@ share/httpd/htdocs/manual/mod/mod_dld.html share/httpd/htdocs/manual/mod/mod_env.html.en share/httpd/htdocs/manual/mod/mod_env.html.html share/httpd/htdocs/manual/mod/mod_env.html.ja.jis +share/httpd/htdocs/manual/mod/footer.html share/httpd/htdocs/manual/mod/mod_example.html share/httpd/htdocs/manual/mod/mod_expires.html share/httpd/htdocs/manual/mod/mod_headers.html share/httpd/htdocs/manual/mod/mod_imap.html share/httpd/htdocs/manual/mod/mod_include.html -share/httpd/htdocs/manual/mod/mod_info.html +share/httpd/htdocs/manual/mod/mod_info.html.en +share/httpd/htdocs/manual/mod/mod_info.html.html +share/httpd/htdocs/manual/mod/mod_info.html.ja.jis share/httpd/htdocs/manual/mod/mod_isapi.html share/httpd/htdocs/manual/mod/mod_log_agent.html share/httpd/htdocs/manual/mod/mod_log_common.html @@ -256,19 +267,28 @@ share/httpd/htdocs/manual/mod/mod_mime.html.html share/httpd/htdocs/manual/mod/mod_mime.html.ja.jis share/httpd/htdocs/manual/mod/mod_mime_magic.html share/httpd/htdocs/manual/mod/mod_mmap_static.html +share/httpd/htdocs/manual/mod/mod_proxy.html share/httpd/htdocs/manual/mod/mod_negotiation.html.en share/httpd/htdocs/manual/mod/mod_negotiation.html.html share/httpd/htdocs/manual/mod/mod_negotiation.html.ja.jis -share/httpd/htdocs/manual/mod/mod_proxy.html share/httpd/htdocs/manual/mod/mod_rewrite.html share/httpd/htdocs/manual/mod/mod_setenvif.html.en share/httpd/htdocs/manual/mod/mod_setenvif.html.html share/httpd/htdocs/manual/mod/mod_setenvif.html.ja.jis -share/httpd/htdocs/manual/mod/mod_so.html -share/httpd/htdocs/manual/mod/mod_speling.html +share/httpd/htdocs/manual/mod/mod_so.html.en +share/httpd/htdocs/manual/mod/mod_so.html.html +share/httpd/htdocs/manual/mod/mod_so.html.ja.jis +share/httpd/htdocs/manual/mod/mod_speling.html.en +share/httpd/htdocs/manual/mod/mod_speling.html.html +share/httpd/htdocs/manual/mod/mod_speling.html.ja.jis share/httpd/htdocs/manual/mod/mod_status.html -share/httpd/htdocs/manual/mod/mod_unique_id.html -share/httpd/htdocs/manual/mod/mod_userdir.html +share/httpd/htdocs/manual/mod/mod_unique_id.html.en +share/httpd/htdocs/manual/mod/mod_userdir.html.en +share/httpd/htdocs/manual/mod/mod_define.html +share/httpd/htdocs/manual/mod/mod_unique_id.html.html +share/httpd/htdocs/manual/mod/mod_unique_id.html.ja.jis +share/httpd/htdocs/manual/mod/mod_userdir.html.html +share/httpd/htdocs/manual/mod/mod_userdir.html.ja.jis share/httpd/htdocs/manual/mod/mod_usertrack.html share/httpd/htdocs/manual/mod/mod_vhost_alias.html share/httpd/htdocs/manual/mod/module-dict.html.en @@ -277,6 +297,7 @@ share/httpd/htdocs/manual/mod/module-dict.html.ja.jis share/httpd/htdocs/manual/mpeix.html share/httpd/htdocs/manual/multilogs.html share/httpd/htdocs/manual/netware.html +share/httpd/htdocs/manual/search/manual-index.cgi share/httpd/htdocs/manual/new_features_1_0.html share/httpd/htdocs/manual/new_features_1_1.html share/httpd/htdocs/manual/new_features_1_2.html @@ -284,26 +305,37 @@ share/httpd/htdocs/manual/new_features_1_3.html.en share/httpd/htdocs/manual/new_features_1_3.html.html share/httpd/htdocs/manual/new_features_1_3.html.ja.jis share/httpd/htdocs/manual/new_features_2_0.html -share/httpd/htdocs/manual/process-model.html -share/httpd/htdocs/manual/programs/ab.html -share/httpd/htdocs/manual/programs/apachectl.html +share/httpd/htdocs/manual/process-model.html.en +share/httpd/htdocs/manual/process-model.html.html +share/httpd/htdocs/manual/process-model.html.ja.jis share/httpd/htdocs/manual/programs/apxs.html +share/httpd/htdocs/manual/programs/ab.html +share/httpd/htdocs/manual/programs/apachectl.html.en +share/httpd/htdocs/manual/programs/apachectl.html.html +share/httpd/htdocs/manual/programs/apachectl.html.ja.jis share/httpd/htdocs/manual/programs/dbmmanage.html +share/httpd/htdocs/manual/programs/htdigest.html share/httpd/htdocs/manual/programs/footer.html share/httpd/htdocs/manual/programs/header.html -share/httpd/htdocs/manual/programs/htdigest.html -share/httpd/htdocs/manual/programs/htpasswd.html -share/httpd/htdocs/manual/programs/httpd.html +share/httpd/htdocs/manual/programs/htpasswd.html.en +share/httpd/htdocs/manual/programs/htpasswd.html.html +share/httpd/htdocs/manual/programs/htpasswd.html.ja.jis +share/httpd/htdocs/manual/programs/httpd.html.en +share/httpd/htdocs/manual/programs/httpd.html.html +share/httpd/htdocs/manual/programs/httpd.html.ja.jis share/httpd/htdocs/manual/programs/index.html.en share/httpd/htdocs/manual/programs/index.html.html share/httpd/htdocs/manual/programs/index.html.ja.jis share/httpd/htdocs/manual/programs/logresolve.html share/httpd/htdocs/manual/programs/other.html share/httpd/htdocs/manual/programs/rotatelogs.html -share/httpd/htdocs/manual/programs/suexec.html +share/httpd/htdocs/manual/programs/suexec.html.en +share/httpd/htdocs/manual/programs/suexec.html.html +share/httpd/htdocs/manual/programs/suexec.html.ja.jis share/httpd/htdocs/manual/readme-tpf.html -share/httpd/htdocs/manual/search/manual-index.cgi -share/httpd/htdocs/manual/sections.html +share/httpd/htdocs/manual/sections.html.en +share/httpd/htdocs/manual/sections.html.html +share/httpd/htdocs/manual/sections.html.ja.jis share/httpd/htdocs/manual/server-wide.html.en share/httpd/htdocs/manual/server-wide.html.fr share/httpd/htdocs/manual/server-wide.html.html @@ -323,11 +355,13 @@ share/httpd/htdocs/manual/urlmapping.html share/httpd/htdocs/manual/vhosts/details.html share/httpd/htdocs/manual/vhosts/details_1_2.html share/httpd/htdocs/manual/vhosts/examples.html -share/httpd/htdocs/manual/vhosts/fd-limits.html +share/httpd/htdocs/manual/vhosts/fd-limits.html.en +share/httpd/htdocs/manual/vhosts/fd-limits.html.html +share/httpd/htdocs/manual/vhosts/fd-limits.html.ja.jis +share/httpd/htdocs/manual/vhosts/index.html.en share/httpd/htdocs/manual/vhosts/footer.html share/httpd/htdocs/manual/vhosts/header.html share/httpd/htdocs/manual/vhosts/host.html -share/httpd/htdocs/manual/vhosts/index.html.en share/httpd/htdocs/manual/vhosts/index.html.html share/httpd/htdocs/manual/vhosts/index.html.ja.jis share/httpd/htdocs/manual/vhosts/ip-based.html @@ -335,13 +369,16 @@ share/httpd/htdocs/manual/vhosts/mass.html share/httpd/htdocs/manual/vhosts/name-based.html.en share/httpd/htdocs/manual/vhosts/name-based.html.html share/httpd/htdocs/manual/vhosts/name-based.html.ja.jis -share/httpd/htdocs/manual/vhosts/vhosts-in-depth.html share/httpd/htdocs/manual/vhosts/virtual-host.html -share/httpd/htdocs/manual/win_compiling.html +share/httpd/htdocs/manual/vhosts/vhosts-in-depth.html +share/httpd/htdocs/manual/win_compiling.html.en +share/httpd/htdocs/manual/win_compiling.html.html +share/httpd/htdocs/manual/win_compiling.html.ja.jis share/httpd/htdocs/manual/win_service.html.en share/httpd/htdocs/manual/win_service.html.html share/httpd/htdocs/manual/win_service.html.ja.jis -share/httpd/htdocs/manual/windows.html +share/httpd/htdocs/manual/windows.html.en +share/httpd/htdocs/manual/windows.html.ja.jis share/httpd/htdocs/sitedrivenby.gif share/httpd/icons/README share/httpd/icons/a.gif @@ -386,6 +423,8 @@ share/httpd/icons/continued.gif share/httpd/icons/continued.png share/httpd/icons/dir.gif share/httpd/icons/dir.png +share/httpd/icons/diskimg.gif +share/httpd/icons/diskimg.png share/httpd/icons/down.gif share/httpd/icons/down.png share/httpd/icons/dvi.gif diff --git a/www/apache/distinfo b/www/apache/distinfo index b59570f845c..5b6cf407b51 100644 --- a/www/apache/distinfo +++ b/www/apache/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.15 2002/04/02 14:13:02 jlam Exp $ +$NetBSD: distinfo,v 1.15.2.1 2002/06/23 19:03:26 jlam Exp $ -SHA1 (apache_1.3.24.tar.gz) = b758d4227820c3cfb33f8237926391fddee736eb -Size (apache_1.3.24.tar.gz) = 2232504 bytes +SHA1 (apache_1.3.26.tar.gz) = c8ab59541267c3e570592115b280e6cb2fb2b30f +Size (apache_1.3.26.tar.gz) = 2303147 bytes SHA1 (sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658 Size (sitedrivenby.gif) = 8519 bytes -SHA1 (mod_ssl-2.8.8-1.3.24.tar.gz) = 9d9e7d0b78591a56b3c251a25a47e394719c8e36 -Size (mod_ssl-2.8.8-1.3.24.tar.gz) = 752322 bytes -SHA1 (patch-aa) = 9ebfc626364271a60a4db4b1b0c28c92060a9f35 +SHA1 (mod_ssl-2.8.9-1.3.26.tar.gz) = 3075124cce758f06b292baa754d55eab639cdfc9 +Size (mod_ssl-2.8.9-1.3.26.tar.gz) = 752613 bytes +SHA1 (patch-aa) = d188ab15483eb9e099a9398083413267570b9f9b SHA1 (patch-ab) = 71ea1f3a59e0f7bc37175b0eefd462a1f7ca4fb6 SHA1 (patch-ac) = 12347c7a306d3e898b032c2b4b3b01670b62d4fd SHA1 (patch-ad) = 79e9b2adb23e412195f0382b30b56496af735297 @@ -19,3 +19,4 @@ SHA1 (patch-aj) = 1cdd2f010d381ec9c13f59b31caab7d1f6f63100 SHA1 (patch-ak) = 8f790a692ed9b2dd6943be43fa1cf7629c673955 SHA1 (patch-al) = a27b9676998621229dc3a1d920ea44b8e622feb2 SHA1 (patch-am) = d05f7c30b73c0e90daf17d9d1c4838be7fd73b02 +SHA1 (patch-ao) = 5930f9ea0f5080b260a6e0c66a37c6d1ad0df4d4 diff --git a/www/apache/patches/patch-aa b/www/apache/patches/patch-aa index 77a85fc98e9..6638aa89211 100644 --- a/www/apache/patches/patch-aa +++ b/www/apache/patches/patch-aa @@ -1,8 +1,17 @@ -$NetBSD: patch-aa,v 1.18 2002/02/01 16:04:39 jlam Exp $ +$NetBSD: patch-aa,v 1.18.2.1 2002/06/23 19:03:27 jlam Exp $ ---- Makefile.tmpl.orig Fri Feb 1 10:05:43 2002 +--- Makefile.tmpl.orig Fri Jun 21 02:02:43 2002 +++ Makefile.tmpl -@@ -324,11 +324,6 @@ +@@ -100,6 +100,8 @@ + PERL = @PERL@ + TAR = @TAR@ + TAROPT = @TAROPT@ ++BINOWN = @BINOWN@ ++BINGRP = @BINGRP@ + + # installation name of Apache webserver + TARGET = @TARGET@ +@@ -324,11 +326,6 @@ $(MKDIR) $(root)$(mandir)/man1 $(MKDIR) $(root)$(mandir)/man8 $(MKDIR) $(root)$(sysconfdir) @@ -14,7 +23,7 @@ $NetBSD: patch-aa,v 1.18 2002/02/01 16:04:39 jlam Exp $ $(MKDIR) $(root)$(htdocsdir) $(MKDIR) $(root)$(manualdir) $(MKDIR) $(root)$(iconsdir) -@@ -387,34 +382,6 @@ +@@ -387,34 +384,6 @@ file=`echo $${mod} | sed -e 's;^.*/\([^/]*\);\1;'`; \ echo "$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}"; \ $(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}; \ @@ -49,7 +58,7 @@ $NetBSD: patch-aa,v 1.18 2002/02/01 16:04:39 jlam Exp $ done; \ fi @echo "<=== [programs]" -@@ -533,7 +500,7 @@ +@@ -533,7 +502,7 @@ # icons and distributed CGI scripts. install-data: @echo "===> [data: Installing initial data files]" @@ -58,7 +67,25 @@ $NetBSD: patch-aa,v 1.18 2002/02/01 16:04:39 jlam Exp $ echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \ else \ echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \ -@@ -555,9 +522,10 @@ +@@ -541,6 +510,8 @@ + (cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \ + find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \ + find $(root)$(htdocsdir)/ -type f -print | xargs chmod a+r ; \ ++ find $(root)$(htdocsdir)/ -print | \ ++ xargs chown ${BINOWN}:${BINGRP} ; \ + fi + -@if [ -d $(TOP)/htdocs/manual ]; then \ + echo "Copying tree $(TOP)/htdocs/manual -> $(root)/$(manualdir)/"; \ +@@ -548,6 +519,8 @@ + (cd $(root)$(manualdir)/ && $(TAR) -xf -); \ + find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \ + find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \ ++ find $(root)$(manualdir)/ -print | \ ++ xargs chown ${BINOWN}:${BINGRP} ; \ + fi + -@if [ -f $(root)$(cgidir)/printenv ]; then \ + echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \ +@@ -555,23 +528,25 @@ for script in printenv test-cgi; do \ cat $(TOP)/cgi-bin/$${script} |\ sed -e 's;^#!/.*perl;#!$(PERL);' \ @@ -71,7 +98,15 @@ $NetBSD: patch-aa,v 1.18 2002/02/01 16:04:39 jlam Exp $ done; \ fi @echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \ -@@ -571,7 +539,7 @@ + (cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\ + (cd $(root)$(iconsdir)/ && $(TAR) -xf -); \ + find $(root)$(iconsdir)/ -type d -exec chmod a+rx {} \; ;\ +- find $(root)$(iconsdir)/ -type f -exec chmod a+r {} \; ++ find $(root)$(iconsdir)/ -type f -exec chmod a+r {} \; ;\ ++ chown -R ${BINOWN}:${BINGRP} $(root)$(iconsdir)/. + @echo "<=== [data]" + + # create the initial configuration by providing default files # and initial config files while preserving existing ones. install-config: @echo "===> [config: Installing Apache configuration files]" diff --git a/www/apache/patches/patch-ao b/www/apache/patches/patch-ao new file mode 100644 index 00000000000..168af80766e --- /dev/null +++ b/www/apache/patches/patch-ao @@ -0,0 +1,22 @@ +$NetBSD: patch-ao,v 1.1.2.2 2002/06/23 19:03:27 jlam Exp $ + +--- configure.orig Thu Jun 20 20:56:07 2002 ++++ configure +@@ -227,6 +227,8 @@ + fi + fi + ++BINOWN=${BINOWN:-root} ++BINGRP=${BINGRP:-wheel} + ## + ## determine default parameters + ## +@@ -1300,6 +1302,8 @@ + -e "s%@PLATFORM@%$PLATFORM%g" \ + -e "s%@PERL@%$PERL%g" \ + -e "s%@TAR@%$TAR%g" \ ++-e "s%@BINOWN@%$BINOWN%g" \ ++-e "s%@BINGRP@%$BINGRP%g" \ + -e "s%@TAROPT@%$TAROPT%g" \ + -e "s%@SRC@%$src%g" \ + -e "s%@MKF@%$mkf%g" \ diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 49071d45d2f..e3b52d282d8 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.6.2.2 2002/06/21 23:05:46 jlam Exp $ +# $NetBSD: Makefile,v 1.6.2.3 2002/06/23 19:03:28 jlam Exp $ -DISTNAME= httpd-2.0.35 -PKGNAME= apache-2.0.35 +DISTNAME= httpd-2.0.39 +PKGNAME= apache-2.0.39 CATEGORIES= www MASTER_SITES= http://httpd.apache.org/dist/httpd/ \ http://httpd.apache.org/dist/httpd/old/ \ + ftp://ftp.fu-berlin.de/unix/network/www/apache/httpd/ \ http://www.netbsd.org/images/logos/ MAINTAINER= jlam@netbsd.org @@ -29,7 +30,7 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --with-port=80 # Apache Portable Runtime library configure options -CONFIGURE_ARGS+= --with-mpm=prefork +CONFIGURE_ARGS+= --with-mpm=prefork --with-devrandom=/dev/urandom # Apache Portable Runtime Utility library configure options CONFIGURE_ARGS+= --with-dbm=sdbm diff --git a/www/apache2/PLIST b/www/apache2/PLIST index 0962d328773..61888820c81 100644 --- a/www/apache2/PLIST +++ b/www/apache2/PLIST @@ -1,61 +1,7 @@ -@comment $NetBSD: PLIST,v 1.3 2002/04/13 21:35:50 jlam Exp $ +@comment $NetBSD: PLIST,v 1.3.2.1 2002/06/23 19:03:29 jlam Exp $ bin/apr-config bin/apu-config etc/rc.d/apache -include/apr.h -include/apr_allocator.h -include/apr_anylock.h -include/apr_atomic.h -include/apr_base64.h -include/apr_buckets.h -include/apr_compat.h -include/apr_date.h -include/apr_dbm.h -include/apr_dso.h -include/apr_errno.h -include/apr_file_info.h -include/apr_file_io.h -include/apr_fnmatch.h -include/apr_general.h -include/apr_getopt.h -include/apr_global_mutex.h -include/apr_hash.h -include/apr_hooks.h -include/apr_inherit.h -include/apr_ldap.h -include/apr_lib.h -include/apr_lock.h -include/apr_md4.h -include/apr_md5.h -include/apr_mmap.h -include/apr_network_io.h -include/apr_optional.h -include/apr_optional_hooks.h -include/apr_pools.h -include/apr_portable.h -include/apr_proc_mutex.h -include/apr_ring.h -include/apr_rmm.h -include/apr_sdbm.h -include/apr_sha1.h -include/apr_shm.h -include/apr_signal.h -include/apr_strings.h -include/apr_tables.h -include/apr_thread_cond.h -include/apr_thread_mutex.h -include/apr_thread_proc.h -include/apr_thread_rwlock.h -include/apr_time.h -include/apr_uri.h -include/apr_user.h -include/apr_uuid.h -include/apr_version.h -include/apr_want.h -include/apr_xlate.h -include/apr_xml.h -include/apu.h -include/apu_compat.h include/httpd/ap_compat.h include/httpd/ap_config.h include/httpd/ap_config_auto.h @@ -86,7 +32,6 @@ include/httpd/apr_hooks.h include/httpd/apr_inherit.h include/httpd/apr_ldap.h include/httpd/apr_lib.h -include/httpd/apr_lock.h include/httpd/apr_md4.h include/httpd/apr_md5.h include/httpd/apr_mmap.h @@ -103,6 +48,7 @@ include/httpd/apr_sha1.h include/httpd/apr_shm.h include/httpd/apr_signal.h include/httpd/apr_strings.h +include/httpd/apr_strmatch.h include/httpd/apr_tables.h include/httpd/apr_thread_cond.h include/httpd/apr_thread_mutex.h @@ -171,18 +117,6 @@ lib/libaprutil.la lib/libaprutil.so lib/libaprutil.so.0 lib/libaprutil.so.0.0 -libexec/cgi-bin/printenv -libexec/cgi-bin/test-cgi -man/man1/dbmmanage.1 -man/man1/htdigest.1 -man/man1/htpasswd.1 -man/man8/ab.8 -man/man8/apachectl.8 -man/man8/apxs.8 -man/man8/httpd.8 -man/man8/logresolve.8 -man/man8/rotatelogs.8 -man/man8/suexec.8 sbin/ab sbin/apachectl sbin/apxs @@ -195,7 +129,6 @@ sbin/htpasswd sbin/httpd sbin/logresolve sbin/rotatelogs -${SUEXEC_COMMENT}sbin/suexec share/examples/httpd/highperformance-std.conf share/examples/httpd/httpd-std.conf share/examples/httpd/magic @@ -251,9 +184,8 @@ share/httpd/htdocs/index.html.he.iso8859-8 share/httpd/htdocs/index.html.hr.iso8859-2 share/httpd/htdocs/index.html.it share/httpd/htdocs/index.html.ja.iso2022-jp -share/httpd/htdocs/index.html.kr.iso2022-kr -share/httpd/htdocs/index.html.ltz.utf8 -share/httpd/htdocs/index.html.lu.utf8 +share/httpd/htdocs/index.html.ko.euc-kr +share/httpd/htdocs/index.html.lb.utf8 share/httpd/htdocs/index.html.nl share/httpd/htdocs/index.html.nn share/httpd/htdocs/index.html.no @@ -266,9 +198,8 @@ share/httpd/htdocs/index.html.ru.iso-ru share/httpd/htdocs/index.html.ru.koi8-r share/httpd/htdocs/index.html.ru.utf8 share/httpd/htdocs/index.html.se -share/httpd/htdocs/index.html.tw -share/httpd/htdocs/index.html.tw.Big5 share/httpd/htdocs/index.html.var +share/httpd/htdocs/index.html.zh share/httpd/icons/README share/httpd/icons/a.gif share/httpd/icons/a.png @@ -315,6 +246,8 @@ share/httpd/icons/continued.gif share/httpd/icons/continued.png share/httpd/icons/dir.gif share/httpd/icons/dir.png +share/httpd/icons/diskimg.gif +share/httpd/icons/diskimg.png share/httpd/icons/down.gif share/httpd/icons/down.png share/httpd/icons/dvi.gif @@ -489,12 +422,15 @@ share/httpd/icons/world1.png share/httpd/icons/world2.gif share/httpd/icons/world2.png share/httpd/manual/LICENSE -share/httpd/manual/bind.html -share/httpd/manual/cgi_path.html +share/httpd/manual/bind.html.en +share/httpd/manual/bind.html.ja.jis +share/httpd/manual/cgi_path.html.en +share/httpd/manual/cgi_path.html.ja.jis share/httpd/manual/configuring.html.en share/httpd/manual/configuring.html.ja.jis share/httpd/manual/content-negotiation.html -share/httpd/manual/custom-error.html +share/httpd/manual/custom-error.html.en +share/httpd/manual/custom-error.html.ja.jis share/httpd/manual/developer/API.html share/httpd/manual/developer/debugging.html share/httpd/manual/developer/documenting.html @@ -508,15 +444,19 @@ share/httpd/manual/developer/modules.html share/httpd/manual/developer/request.html share/httpd/manual/dns-caveats.html share/httpd/manual/dso.html +share/httpd/manual/dso.html.ko.euc-kr share/httpd/manual/ebcdic.html -share/httpd/manual/env.html +share/httpd/manual/env.html.en +share/httpd/manual/env.html.ja.jis share/httpd/manual/faq/index.html -share/httpd/manual/filter.html +share/httpd/manual/filter.html.en +share/httpd/manual/filter.html.ja.jis share/httpd/manual/footer.html share/httpd/manual/handler.html.en share/httpd/manual/handler.html.ja.jis share/httpd/manual/header.html -share/httpd/manual/howto/auth.html +share/httpd/manual/howto/auth.html.en +share/httpd/manual/howto/auth.html.ja.jis share/httpd/manual/howto/cgi.html.en share/httpd/manual/howto/cgi.html.ja.jis share/httpd/manual/howto/footer.html @@ -544,8 +484,12 @@ share/httpd/manual/images/sub.png share/httpd/manual/index.html.en share/httpd/manual/index.html.fr share/httpd/manual/index.html.ja.jis -share/httpd/manual/install.html -share/httpd/manual/invoking.html +share/httpd/manual/index.html.ko.euc-kr +share/httpd/manual/install.html.en +share/httpd/manual/install.html.ja.jis +share/httpd/manual/install.html.ko.euc-kr +share/httpd/manual/invoking.html.en +share/httpd/manual/invoking.html.ja.jis share/httpd/manual/logs.html share/httpd/manual/misc/custom_errordocs.html share/httpd/manual/misc/descriptors.html @@ -558,124 +502,136 @@ share/httpd/manual/misc/perf-tuning.html share/httpd/manual/misc/rewriteguide.html share/httpd/manual/misc/security_tips.html share/httpd/manual/misc/tutorials.html +share/httpd/manual/mod/allmodules.html.en share/httpd/manual/mod/allmodules.xml -share/httpd/manual/mod/core.html +share/httpd/manual/mod/core.html.en share/httpd/manual/mod/core.xml share/httpd/manual/mod/directive-dict.html -share/httpd/manual/mod/directives.html +share/httpd/manual/mod/directives.html.en share/httpd/manual/mod/directives.xml share/httpd/manual/mod/footer.html share/httpd/manual/mod/header.html -share/httpd/manual/mod/index-bytype.html -share/httpd/manual/mod/index.html +share/httpd/manual/mod/index.html.en share/httpd/manual/mod/index.xml -share/httpd/manual/mod/mod_TEMPLATE.html -share/httpd/manual/mod/mod_access.html +share/httpd/manual/mod/mod_access.html.en share/httpd/manual/mod/mod_access.xml -share/httpd/manual/mod/mod_actions.html +share/httpd/manual/mod/mod_actions.html.en share/httpd/manual/mod/mod_actions.xml -share/httpd/manual/mod/mod_alias.html +share/httpd/manual/mod/mod_alias.html.en share/httpd/manual/mod/mod_alias.xml -share/httpd/manual/mod/mod_asis.html +share/httpd/manual/mod/mod_asis.html.en share/httpd/manual/mod/mod_asis.xml -share/httpd/manual/mod/mod_auth.html +share/httpd/manual/mod/mod_auth.html.en share/httpd/manual/mod/mod_auth.xml -share/httpd/manual/mod/mod_auth_anon.html +share/httpd/manual/mod/mod_auth_anon.html.en share/httpd/manual/mod/mod_auth_anon.xml -share/httpd/manual/mod/mod_auth_dbm.html +share/httpd/manual/mod/mod_auth_dbm.html.en share/httpd/manual/mod/mod_auth_dbm.xml -share/httpd/manual/mod/mod_auth_digest.html +share/httpd/manual/mod/mod_auth_digest.html.en share/httpd/manual/mod/mod_auth_digest.xml -share/httpd/manual/mod/mod_auth_ldap.html -share/httpd/manual/mod/mod_autoindex.html +share/httpd/manual/mod/mod_autoindex.html.en share/httpd/manual/mod/mod_autoindex.xml -share/httpd/manual/mod/mod_cache.html +share/httpd/manual/mod/mod_cache.html.en share/httpd/manual/mod/mod_cache.xml -share/httpd/manual/mod/mod_cern_meta.html +share/httpd/manual/mod/mod_cern_meta.html.en share/httpd/manual/mod/mod_cern_meta.xml -share/httpd/manual/mod/mod_cgi.html +share/httpd/manual/mod/mod_cgi.html.en share/httpd/manual/mod/mod_cgi.xml -share/httpd/manual/mod/mod_cgid.html +share/httpd/manual/mod/mod_cgid.html.en share/httpd/manual/mod/mod_cgid.xml -share/httpd/manual/mod/mod_charset_lite.html +share/httpd/manual/mod/mod_charset_lite.html.en share/httpd/manual/mod/mod_charset_lite.xml -share/httpd/manual/mod/mod_dav.html +share/httpd/manual/mod/mod_dav.html.en +share/httpd/manual/mod/mod_dav.html.ja.jis share/httpd/manual/mod/mod_dav.xml -share/httpd/manual/mod/mod_deflate.html +share/httpd/manual/mod/mod_dav.xml.ja +share/httpd/manual/mod/mod_deflate.html.en share/httpd/manual/mod/mod_deflate.xml -share/httpd/manual/mod/mod_dir.html +share/httpd/manual/mod/mod_dir.html.en share/httpd/manual/mod/mod_dir.xml -share/httpd/manual/mod/mod_env.html +share/httpd/manual/mod/mod_env.html.en share/httpd/manual/mod/mod_env.xml -share/httpd/manual/mod/mod_example.html +share/httpd/manual/mod/mod_example.html.en share/httpd/manual/mod/mod_example.xml -share/httpd/manual/mod/mod_expires.html +share/httpd/manual/mod/mod_expires.html.en share/httpd/manual/mod/mod_expires.xml -share/httpd/manual/mod/mod_ext_filter.html +share/httpd/manual/mod/mod_ext_filter.html.en share/httpd/manual/mod/mod_ext_filter.xml -share/httpd/manual/mod/mod_file_cache.html +share/httpd/manual/mod/mod_file_cache.html.en share/httpd/manual/mod/mod_file_cache.xml -share/httpd/manual/mod/mod_headers.html +share/httpd/manual/mod/mod_headers.html.en share/httpd/manual/mod/mod_headers.xml -share/httpd/manual/mod/mod_imap.html +share/httpd/manual/mod/mod_imap.html.en share/httpd/manual/mod/mod_imap.xml -share/httpd/manual/mod/mod_include.html +share/httpd/manual/mod/mod_include.html.en share/httpd/manual/mod/mod_include.xml -share/httpd/manual/mod/mod_info.html +share/httpd/manual/mod/mod_info.html.en share/httpd/manual/mod/mod_info.xml -share/httpd/manual/mod/mod_isapi.html +share/httpd/manual/mod/mod_isapi.html.en share/httpd/manual/mod/mod_isapi.xml -share/httpd/manual/mod/mod_ldap.html -share/httpd/manual/mod/mod_log_config.html +share/httpd/manual/mod/mod_log_config.html.en share/httpd/manual/mod/mod_log_config.xml -share/httpd/manual/mod/mod_mime.html +share/httpd/manual/mod/mod_mime.html.en share/httpd/manual/mod/mod_mime.xml -share/httpd/manual/mod/mod_mime_magic.html +share/httpd/manual/mod/mod_mime_magic.html.en share/httpd/manual/mod/mod_mime_magic.xml -share/httpd/manual/mod/mod_mmap_static.html -share/httpd/manual/mod/mod_negotiation.html +share/httpd/manual/mod/mod_negotiation.html.en share/httpd/manual/mod/mod_negotiation.xml -share/httpd/manual/mod/mod_proxy.html +share/httpd/manual/mod/mod_proxy.html.en share/httpd/manual/mod/mod_proxy.xml -share/httpd/manual/mod/mod_rewrite.html +share/httpd/manual/mod/mod_rewrite.html.en share/httpd/manual/mod/mod_rewrite.xml -share/httpd/manual/mod/mod_setenvif.html +share/httpd/manual/mod/mod_setenvif.html.en share/httpd/manual/mod/mod_setenvif.xml -share/httpd/manual/mod/mod_so.html +share/httpd/manual/mod/mod_so.html.en share/httpd/manual/mod/mod_so.xml -share/httpd/manual/mod/mod_speling.html +share/httpd/manual/mod/mod_speling.html.en share/httpd/manual/mod/mod_speling.xml -share/httpd/manual/mod/mod_ssl.html +share/httpd/manual/mod/mod_ssl.html.en share/httpd/manual/mod/mod_ssl.xml -share/httpd/manual/mod/mod_status.html +share/httpd/manual/mod/mod_status.html.en share/httpd/manual/mod/mod_status.xml -share/httpd/manual/mod/mod_suexec.html +share/httpd/manual/mod/mod_suexec.html.en +share/httpd/manual/mod/mod_suexec.html.ja.jis share/httpd/manual/mod/mod_suexec.xml -share/httpd/manual/mod/mod_unique_id.html +share/httpd/manual/mod/mod_suexec.xml.ja +share/httpd/manual/mod/mod_unique_id.html.en share/httpd/manual/mod/mod_unique_id.xml -share/httpd/manual/mod/mod_userdir.html +share/httpd/manual/mod/mod_userdir.html.en +share/httpd/manual/mod/mod_userdir.html.ja.jis share/httpd/manual/mod/mod_userdir.xml -share/httpd/manual/mod/mod_usertrack.html +share/httpd/manual/mod/mod_userdir.xml.ja +share/httpd/manual/mod/mod_usertrack.html.en share/httpd/manual/mod/mod_usertrack.xml -share/httpd/manual/mod/mod_vhost_alias.html +share/httpd/manual/mod/mod_vhost_alias.html.en share/httpd/manual/mod/mod_vhost_alias.xml share/httpd/manual/mod/module-dict.html -share/httpd/manual/mod/mpm_common.html +share/httpd/manual/mod/mpm_common.html.en share/httpd/manual/mod/mpm_common.xml -share/httpd/manual/mod/mpm_netware.html +share/httpd/manual/mod/mpm_netware.html.en share/httpd/manual/mod/mpm_netware.xml -share/httpd/manual/mod/mpm_winnt.html +share/httpd/manual/mod/mpm_winnt.html.en +share/httpd/manual/mod/mpm_winnt.html.ja.jis share/httpd/manual/mod/mpm_winnt.xml -share/httpd/manual/mod/perchild.html +share/httpd/manual/mod/mpm_winnt.xml.ja +share/httpd/manual/mod/perchild.html.en share/httpd/manual/mod/perchild.xml -share/httpd/manual/mod/prefork.html +share/httpd/manual/mod/prefork.html.en +share/httpd/manual/mod/prefork.html.ja.jis share/httpd/manual/mod/prefork.xml -share/httpd/manual/mod/worker.html +share/httpd/manual/mod/prefork.xml.ja +share/httpd/manual/mod/worker.html.en +share/httpd/manual/mod/worker.html.ja.jis share/httpd/manual/mod/worker.xml -share/httpd/manual/mpm.html +share/httpd/manual/mod/worker.xml.ja +share/httpd/manual/mpm.html.en +share/httpd/manual/mpm.html.ja.jis +share/httpd/manual/mpm.html.ko.euc-kr share/httpd/manual/new_features_2_0.html.de share/httpd/manual/new_features_2_0.html.en share/httpd/manual/new_features_2_0.html.fr +share/httpd/manual/new_features_2_0.html.ja.jis +share/httpd/manual/new_features_2_0.html.ko.euc-kr share/httpd/manual/platform/footer.html share/httpd/manual/platform/header.html share/httpd/manual/platform/netware.html @@ -698,103 +654,71 @@ share/httpd/manual/programs/other.html share/httpd/manual/programs/rotatelogs.html share/httpd/manual/programs/suexec.html share/httpd/manual/search/manual-index.cgi -share/httpd/manual/sections.html +share/httpd/manual/sections.html.en +share/httpd/manual/sections.html.ja.jis share/httpd/manual/server-wide.html.en share/httpd/manual/server-wide.html.ja.jis share/httpd/manual/sitemap.html -share/httpd/manual/ssl/Makefile share/httpd/manual/ssl/footer.html share/httpd/manual/ssl/header.html -share/httpd/manual/ssl/index.html -share/httpd/manual/ssl/mod_ssl_sb.gif -share/httpd/manual/ssl/openssl_ics.gif -share/httpd/manual/ssl/ssl_compat.gfont000.gif +share/httpd/manual/ssl/index.html.en +share/httpd/manual/ssl/index.html.ja.jis share/httpd/manual/ssl/ssl_compat.html -share/httpd/manual/ssl/ssl_compat.wml -share/httpd/manual/ssl/ssl_cover.wml share/httpd/manual/ssl/ssl_cover_logo.jpg share/httpd/manual/ssl/ssl_cover_title.jpg -share/httpd/manual/ssl/ssl_faq.gfont000.gif share/httpd/manual/ssl/ssl_faq.html -share/httpd/manual/ssl/ssl_faq.wml share/httpd/manual/ssl/ssl_glossary.html -share/httpd/manual/ssl/ssl_glossary.wml -share/httpd/manual/ssl/ssl_howto.gfont000.gif share/httpd/manual/ssl/ssl_howto.html -share/httpd/manual/ssl/ssl_howto.wml -share/httpd/manual/ssl/ssl_intro.gfont000.gif share/httpd/manual/ssl/ssl_intro.html -share/httpd/manual/ssl/ssl_intro.wml share/httpd/manual/ssl/ssl_intro_fig1.gif share/httpd/manual/ssl/ssl_intro_fig2.gif share/httpd/manual/ssl/ssl_intro_fig3.gif -share/httpd/manual/ssl/ssl_overview.gfont000.gif -share/httpd/manual/ssl/ssl_overview.html -share/httpd/manual/ssl/ssl_overview.wml share/httpd/manual/ssl/ssl_overview_fig1.gif -share/httpd/manual/ssl/ssl_reference.gfont000.gif -share/httpd/manual/ssl/ssl_reference.html -share/httpd/manual/ssl/ssl_reference.wml -share/httpd/manual/ssl/ssl_template.head-chapter.gif -share/httpd/manual/ssl/ssl_template.head-num-1.gif -share/httpd/manual/ssl/ssl_template.head-num-2.gif -share/httpd/manual/ssl/ssl_template.head-num-3.gif -share/httpd/manual/ssl/ssl_template.head-num-4.gif -share/httpd/manual/ssl/ssl_template.head-num-5.gif -share/httpd/manual/ssl/ssl_template.head-num-6.gif -share/httpd/manual/ssl/ssl_template.head-num-7.gif share/httpd/manual/ssl/ssl_template.imgdot-1x1-000000.gif share/httpd/manual/ssl/ssl_template.imgdot-1x1-transp.gif -share/httpd/manual/ssl/ssl_template.inc -share/httpd/manual/ssl/ssl_template.navbut-next-n.gif -share/httpd/manual/ssl/ssl_template.navbut-next-s.gif -share/httpd/manual/ssl/ssl_template.navbut-prev-n.gif -share/httpd/manual/ssl/ssl_template.navbut-prev-s.gif -share/httpd/manual/ssl/ssl_template.title-abstract.gif -share/httpd/manual/ssl/ssl_template.title-compat.gif -share/httpd/manual/ssl/ssl_template.title-faq.gif -share/httpd/manual/ssl/ssl_template.title-gloss.gif -share/httpd/manual/ssl/ssl_template.title-howto.gif -share/httpd/manual/ssl/ssl_template.title-intro.gif -share/httpd/manual/ssl/ssl_template.title-over.gif -share/httpd/manual/ssl/ssl_template.title-preface.gif -share/httpd/manual/ssl/ssl_template.title-ref.gif -share/httpd/manual/ssl/ssl_template.title-toc.gif -share/httpd/manual/ssl/ssl_template.title-tutor.gif share/httpd/manual/stopping.html +share/httpd/manual/style/Makefile share/httpd/manual/style/build.sh share/httpd/manual/style/build.xml +share/httpd/manual/style/common.xsl share/httpd/manual/style/en.xml +share/httpd/manual/style/ja.xml share/httpd/manual/style/manual.css -share/httpd/manual/style/manual.xsl +share/httpd/manual/style/manual.en.xsl +share/httpd/manual/style/manual.ja.xsl share/httpd/manual/style/modulesynopsis.dtd -share/httpd/manual/style/settings.xsl share/httpd/manual/style/sv.xml -share/httpd/manual/suexec.html +share/httpd/manual/suexec.html.en +share/httpd/manual/suexec.html.ja.jis share/httpd/manual/upgrading.html.en share/httpd/manual/upgrading.html.fr +share/httpd/manual/upgrading.html.ja.jis +share/httpd/manual/upgrading.html.ko.euc-kr share/httpd/manual/urlmapping.html share/httpd/manual/vhosts/details.html share/httpd/manual/vhosts/examples.html -share/httpd/manual/vhosts/fd-limits.html +share/httpd/manual/vhosts/fd-limits.html.en +share/httpd/manual/vhosts/fd-limits.html.ja.jis share/httpd/manual/vhosts/footer.html share/httpd/manual/vhosts/header.html -share/httpd/manual/vhosts/index.html +share/httpd/manual/vhosts/index.html.en +share/httpd/manual/vhosts/index.html.ja.jis share/httpd/manual/vhosts/ip-based.html share/httpd/manual/vhosts/mass.html -share/httpd/manual/vhosts/name-based.html -@dirrm share/httpd/manual/vhosts -@dirrm share/httpd/manual/style -@dirrm share/httpd/manual/ssl -@dirrm share/httpd/manual/search -@dirrm share/httpd/manual/programs -@dirrm share/httpd/manual/platform -@dirrm share/httpd/manual/mod -@dirrm share/httpd/manual/misc -@dirrm share/httpd/manual/images -@dirrm share/httpd/manual/howto -@dirrm share/httpd/manual/faq +share/httpd/manual/vhosts/name-based.html.en +share/httpd/manual/vhosts/name-based.html.ja.jis @dirrm share/httpd/manual/developer +@dirrm share/httpd/manual/faq +@dirrm share/httpd/manual/howto +@dirrm share/httpd/manual/images +@dirrm share/httpd/manual/misc +@dirrm share/httpd/manual/mod +@dirrm share/httpd/manual/platform +@dirrm share/httpd/manual/programs +@dirrm share/httpd/manual/search +@dirrm share/httpd/manual/ssl +@dirrm share/httpd/manual/style +@dirrm share/httpd/manual/vhosts @dirrm share/httpd/manual @dirrm share/httpd/icons/small @dirrm share/httpd/icons diff --git a/www/apache2/distinfo b/www/apache2/distinfo index d00b9755bda..e55d23e5bcd 100644 --- a/www/apache2/distinfo +++ b/www/apache2/distinfo @@ -1,12 +1,13 @@ -$NetBSD: distinfo,v 1.5 2002/04/13 21:35:51 jlam Exp $ +$NetBSD: distinfo,v 1.5.2.1 2002/06/23 19:03:29 jlam Exp $ -SHA1 (httpd-2.0.35.tar.gz) = 242c44445270f9f2a674ec5c6ad646aa449fc76a -Size (httpd-2.0.35.tar.gz) = 4124937 bytes -SHA1 (patch-aa) = 8c29506b6bcf12eb0ee939e789b6d499dc38ca6d -SHA1 (patch-ad) = 139c2eed9b0b74323cb7ad88324ca968defff6d6 -SHA1 (patch-ag) = d3fe2a5f066353c64649c3efa76855ffd3d75111 -SHA1 (patch-ah) = d2192ec1e6f658440f2e6a14cfa57a8d9807243b -SHA1 (patch-ai) = 54207ba83f626834ab12a2f8aab2faa6eef50169 -SHA1 (patch-ak) = ee60c5d0d0a57f880a23bbe5cb2b7ecb2998960c +SHA1 (httpd-2.0.39.tar.gz) = 3f04dbffc081a34dbfc9aeab6738f320285db292 +Size (httpd-2.0.39.tar.gz) = 4413542 bytes +SHA1 (patch-aa) = 6f39606469ced7555f0ce3e927da0a4dec5f80bd +SHA1 (patch-ad) = e4a0c729ce5fbf43855ea080946052ef025334f1 +SHA1 (patch-ag) = 3d68e475caef0555097a9756533034686e81d474 +SHA1 (patch-ah) = f655dbabb32884a20e77f4791fa762e6c0e6cf74 +SHA1 (patch-ak) = f11a86b1235d5c595fa381bbb474db4fe8448215 SHA1 (patch-al) = 0dcba1455b4fa3fc40fbd488813608b7e2350309 SHA1 (patch-am) = ff60a7b69ad949363ebec194141e9b95cb796426 +SHA1 (patch-an) = 0ec78dc92d743db7fbbdb0f60d6f12f6d0dc3e90 +SHA1 (patch-ao) = 551922e4ebc89144c4f6c39bef8ad6657ce695f8 diff --git a/www/apache2/patches/patch-aa b/www/apache2/patches/patch-aa index 1177c738451..e2eed92dd09 100644 --- a/www/apache2/patches/patch-aa +++ b/www/apache2/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.3 2002/04/13 21:35:52 jlam Exp $ +$NetBSD: patch-aa,v 1.3.2.1 2002/06/23 19:03:30 jlam Exp $ ---- Makefile.in.orig Fri Apr 5 14:36:06 2002 -+++ Makefile.in -@@ -16,7 +16,7 @@ +--- Makefile.in.orig Sat Jun 15 18:41:03 2002 ++++ Makefile.in Wed Jun 19 07:39:04 2002 +@@ -14,7 +14,7 @@ PROGRAMS = $(PROGRAM_NAME) TARGETS = $(PROGRAMS) $(shared_build) $(other_targets) PHONY_TARGETS = $(srcdir)/buildmark.c @@ -11,35 +11,26 @@ $NetBSD: patch-aa,v 1.3 2002/04/13 21:35:52 jlam Exp $ install-other install-cgi install-include install-suexec install-man \ install-build -@@ -37,7 +37,7 @@ - done; \ - for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \ - cd $$j ; \ -- for i in *-std* ssl.conf; do \ -+ for i in *-std.conf ssl.conf; do \ - [ -f $$i ] || continue; \ - ( \ - n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \ -@@ -71,6 +71,7 @@ +@@ -68,6 +68,7 @@ + < $$i; \ fi \ - ) > $(sysconfdir)/$$i; \ - chmod 0644 $(sysconfdir)/$$i; \ + ) > $(DESTDIR)$(sysconfdir)/$$i; \ + if false; then \ + chmod 0644 $(DESTDIR)$(sysconfdir)/$$i; \ file=`echo $$i|sed s/-std//`; \ if [ "$$file" = "httpd.conf" ]; then \ - file=`echo $$file|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \ -@@ -78,12 +79,15 @@ - if test "$$file" != "$$i" && test ! -f $(sysconfdir)/$$file; then \ - $(INSTALL_DATA) $(sysconfdir)/$$i $(sysconfdir)/$$file; \ +@@ -76,12 +77,15 @@ + if test "$$file" != "$$i" && test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \ + $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/$$i $(DESTDIR)$(sysconfdir)/$$file; \ fi; \ + fi; \ done ; \ done @if test -f "$(builddir)/envvars-std"; then \ - cp -p envvars-std $(sbindir); \ + cp -p envvars-std $(DESTDIR)$(sbindir); \ + if false; then \ - if test ! -f $(sbindir)/envvars; then \ - cp -p envvars-std $(sbindir)/envvars ; \ + if test ! -f $(DESTDIR)$(sbindir)/envvars; then \ + cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \ + fi ; \ fi ; \ fi diff --git a/www/apache2/patches/patch-ad b/www/apache2/patches/patch-ad index 28b5801a1f6..a4cc2530be4 100644 --- a/www/apache2/patches/patch-ad +++ b/www/apache2/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.3 2002/04/13 21:35:52 jlam Exp $ +$NetBSD: patch-ad,v 1.3.2.1 2002/06/23 19:03:31 jlam Exp $ ---- config.layout.orig Thu Mar 28 14:04:47 2002 -+++ config.layout -@@ -309,3 +309,26 @@ +--- config.layout.orig Fri May 17 23:49:30 2002 ++++ config.layout Wed Jun 19 07:39:33 2002 +@@ -298,3 +298,26 @@ installbuilddir: ${prefix}/etc/apache2/build errordir: ${datadir}/error </Layout> diff --git a/www/apache2/patches/patch-ag b/www/apache2/patches/patch-ag index 954b2d3adf7..5bba8886433 100644 --- a/www/apache2/patches/patch-ag +++ b/www/apache2/patches/patch-ag @@ -1,14 +1,14 @@ -$NetBSD: patch-ag,v 1.4 2002/04/13 21:35:53 jlam Exp $ +$NetBSD: patch-ag,v 1.4.2.1 2002/06/23 19:03:31 jlam Exp $ ---- support/Makefile.in.orig Mon Mar 25 04:50:41 2002 -+++ support/Makefile.in -@@ -24,8 +24,10 @@ +--- support/Makefile.in.orig Sat Jun 15 13:41:52 2002 ++++ support/Makefile.in Wed Jun 19 07:39:51 2002 +@@ -22,8 +22,10 @@ done @if test -f "$(builddir)/envvars-std"; then \ - cp -p envvars-std $(sbindir); \ + cp -p envvars-std $(DESTDIR)$(sbindir); \ + if false; then \ - if test ! -f $(sbindir)/envvars; then \ - cp -p envvars-std $(sbindir)/envvars ; \ + if test ! -f $(DESTDIR)$(sbindir)/envvars; then \ + cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \ + fi ; \ fi ; \ fi diff --git a/www/apache2/patches/patch-ah b/www/apache2/patches/patch-ah index 825862f69a5..4d65b6340c4 100644 --- a/www/apache2/patches/patch-ah +++ b/www/apache2/patches/patch-ah @@ -1,13 +1,9 @@ -$NetBSD: patch-ah,v 1.3 2002/04/13 21:35:53 jlam Exp $ +$NetBSD: patch-ah,v 1.3.2.1 2002/06/23 19:03:32 jlam Exp $ ---- support/apachectl.in.orig Thu Apr 4 04:15:44 2002 -+++ support/apachectl.in -@@ -29,11 +29,11 @@ - PIDFILE=@exp_runtimedir@/@progname@.pid - # - # the path to your httpd binary, including options if necessary --HTTPD='@exp_bindir@/@progname@' -+HTTPD='@exp_sbindir@/@progname@' +--- support/apachectl.in.orig Mon May 27 20:46:01 2002 ++++ support/apachectl.in Wed Jun 19 07:40:07 2002 +@@ -31,8 +31,8 @@ + HTTPD='@exp_sbindir@/@progname@' # # pick up any necessary environment variables -if test -f @exp_bindir@/envvars; then diff --git a/www/apache2/patches/patch-ai b/www/apache2/patches/patch-ai deleted file mode 100644 index d4193dd2d08..00000000000 --- a/www/apache2/patches/patch-ai +++ /dev/null @@ -1,46 +0,0 @@ -$NetBSD: patch-ai,v 1.3 2002/04/13 21:35:53 jlam Exp $ - ---- support/apxs.in.orig Wed Mar 13 15:48:05 2002 -+++ support/apxs.in -@@ -63,10 +63,11 @@ - - my $prefix = "@prefix@"; - my $CFG_PREFIX = $prefix; -+my $installbuilddir = "@exp_installbuilddir@" - - # read the configuration variables once - my %config_vars = (); --get_config_vars("$prefix/build/config_vars.mk",\%config_vars); -+get_config_vars("$installbuilddir/config_vars.mk",\%config_vars); - - my $exec_prefix = get_vars("exec_prefix"); - my $CFG_TARGET = get_vars("progname"); -@@ -415,7 +416,7 @@ - $la =~ s|\.c$|.la|; - my $o = $s; - $o =~ s|\.c$|.o|; -- push(@cmds, "$prefix/build/libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo"); -+ push(@cmds, "$installbuilddir/libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo"); - unshift(@objs, $lo); - } - -@@ -440,7 +441,7 @@ - $opt .= " -l$opt_l"; - } - -- push(@cmds, "$prefix/build/libtool $ltflags --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo"); -+ push(@cmds, "$installbuilddir/libtool $ltflags --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo"); - - # execute the commands - &execute_cmds(@cmds); -@@ -471,8 +472,8 @@ - $t =~ s|^.+/([^/]+)$|$1|; - $t =~ s|\.la$|\.so|; - if ($opt_i) { -- push(@cmds, "$prefix/build/instdso.sh SH_LIBTOOL='" . -- "$prefix/build/libtool' $f $CFG_LIBEXECDIR"); -+ push(@cmds, "$installbuilddir/instdso.sh SH_LIBTOOL='" . -+ "$installbuilddir/libtool' $f $CFG_LIBEXECDIR"); - push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t"); - } - diff --git a/www/apache2/patches/patch-ak b/www/apache2/patches/patch-ak index 87918ebb951..8e9dac45a35 100644 --- a/www/apache2/patches/patch-ak +++ b/www/apache2/patches/patch-ak @@ -1,6 +1,6 @@ -$NetBSD: patch-ak,v 1.1 2002/04/13 21:35:54 jlam Exp $ +$NetBSD: patch-ak,v 1.1.2.1 2002/06/23 19:03:32 jlam Exp $ ---- docs/conf/httpd-std.conf.in.orig Thu Apr 4 04:15:43 2002 +--- docs/conf/httpd-std.conf.in.orig Wed Apr 24 16:24:35 2002 +++ docs/conf/httpd-std.conf.in @@ -24,9 +24,9 @@ # Configuration and logfile names: If the filenames you specify for many @@ -32,104 +32,3 @@ $NetBSD: patch-ak,v 1.1 2002/04/13 21:35:54 jlam Exp $ </IfModule> </IfModule> -@@ -78,7 +78,7 @@ - # identification number when it starts. - # - <IfModule !mpm_netware.c> --PidFile @rel_logfiledir@/httpd.pid -+PidFile @rel_runtimedir@/httpd.pid - </IfModule> - - # -@@ -290,7 +290,7 @@ - # documents. By default, all requests are taken from this directory, but - # symbolic links and aliases may be used to point to other locations. - # --DocumentRoot "@@ServerRoot@@/@rel_htdocsdir@" -+DocumentRoot "@exp_htdocsdir@" - - # - # Each directory to which Apache has access can be configured with respect -@@ -315,7 +315,7 @@ - # - # This should be changed to whatever you set DocumentRoot to. - # --<Directory "@@ServerRoot@@/@rel_htdocsdir@"> -+<Directory "@exp_htdocsdir@"> - - # - # Possible values for the Options directive are "None", "All", -@@ -499,9 +499,9 @@ - # We include the /icons/ alias for FancyIndexed directory listings. If you - # do not use FancyIndexing, you may comment this out. - # --Alias /icons/ "@@ServerRoot@@/@rel_iconsdir@/" -+Alias /icons/ "@exp_iconsdir@/" - --<Directory "@@ServerRoot@@/@rel_iconsdir@"> -+<Directory "@exp_iconsdir@"> - Options Indexes MultiViews - AllowOverride None - Order allow,deny -@@ -513,9 +513,9 @@ - # the manual, even if you choose to move your DocumentRoot. You may comment - # this out if you do not care for the documentation. - # --Alias /manual "@@ServerRoot@@/@rel_manualdir@" -+Alias /manual "@exp_manualdir@" - --<Directory "@@ServerRoot@@/@rel_manualdir@"> -+<Directory "@exp_manualdir@"> - Options Indexes FollowSymLinks MultiViews - AllowOverride None - Order allow,deny -@@ -530,7 +530,7 @@ - # The same rules about trailing "/" apply to ScriptAlias directives as to - # Alias. - # --ScriptAlias /cgi-bin/ "@@ServerRoot@@/@rel_cgidir@/" -+ScriptAlias /cgi-bin/ "@exp_cgidir@/" - - <IfModule mod_cgid.c> - # -@@ -541,10 +541,10 @@ - </IfModule> - - # --# "@@ServerRoot@@/@rel_cgidir@" should be changed to whatever your ScriptAliased -+# "@exp_cgidir@" should be changed to whatever your ScriptAliased - # CGI directory exists, if you have that configured. - # --<Directory "@@ServerRoot@@/@rel_cgidir@"> -+<Directory "@exp_cgidir@"> - AllowOverride None - Options None - Order allow,deny -@@ -854,15 +854,15 @@ - # Alias /error/include/ "/your/include/path/" - # - # which allows you to create your own set of files by starting with the --# @@ServerRoot@@/@rel_errordir@/include/ files and -+# @exp_errordir@/include/ files and - # copying them to /your/include/path/, even on a per-VirtualHost basis. - # - - <IfModule mod_negotiation.c> - <IfModule mod_include.c> -- Alias /error/ "@@ServerRoot@@/@rel_errordir@/" -+ Alias /error/ "@exp_errordir@/" - -- <Directory "@@ServerRoot@@/@rel_errordir@"> -+ <Directory "@exp_errordir@"> - AllowOverride None - Options IncludesNoExec - AddOutputFilter Includes html -@@ -960,7 +960,7 @@ - # To enable the cache as well, edit and uncomment the following lines: - # (no cacheing without CacheRoot) - # --#CacheRoot "@@ServerRoot@@/@rel_proxycachedir@" -+#CacheRoot "@exp_proxycachedir@" - #CacheSize 5 - #CacheGcInterval 4 - #CacheMaxExpire 24 diff --git a/www/apache2/patches/patch-an b/www/apache2/patches/patch-an new file mode 100644 index 00000000000..ef15e307905 --- /dev/null +++ b/www/apache2/patches/patch-an @@ -0,0 +1,17 @@ +$NetBSD: patch-an,v 1.2.2.2 2002/06/23 19:03:33 jlam Exp $ + +--with-randomdev=foo does not work. + +--- srclib/apr/configure.in- Wed Jun 19 08:23:52 2002 ++++ srclib/apr/configure.in Wed Jun 19 08:32:09 2002 +@@ -1561,8 +1561,8 @@ + fi + elif test "$apr_devrandom" != "no"; then + if test -r "$apr_devrandom"; then +- AC_DEFINE(DEV_RANDOM, [$apr_devrandom]) +- AC_MSG_RESULT($apr_devrandom) ++ AC_DEFINE(DEV_RANDOM, [/dev/urandom]) ++ AC_MSG_RESULT([/dev/urandom]) + rand="1" + else + AC_ERROR([$apr_devrandom not found or unreadable.]) diff --git a/www/apache2/patches/patch-ao b/www/apache2/patches/patch-ao new file mode 100644 index 00000000000..1f98c987732 --- /dev/null +++ b/www/apache2/patches/patch-ao @@ -0,0 +1,21 @@ +$NetBSD: patch-ao,v 1.2.2.2 2002/06/23 19:03:33 jlam Exp $ + +--with-randomdev=foo does not work. + +--- srclib/apr/configure- Wed Jun 19 08:23:54 2002 ++++ srclib/apr/configure Wed Jun 19 08:34:18 2002 +@@ -25347,11 +25347,11 @@ + elif test "$apr_devrandom" != "no"; then + if test -r "$apr_devrandom"; then + cat >>confdefs.h <<\_ACEOF +-#define DEV_RANDOM $apr_devrandom ++#define DEV_RANDOM /dev/urandom + _ACEOF + +- echo "$as_me:$LINENO: result: $apr_devrandom" >&5 +-echo "${ECHO_T}$apr_devrandom" >&6 ++ echo "$as_me:$LINENO: result: /dev/urandom" >&5 ++echo "${ECHO_T}/dev/urandom" >&6 + rand="1" + else + { { echo "$as_me:$LINENO: error: $apr_devrandom not found or unreadable." >&5 diff --git a/www/apache6/Makefile b/www/apache6/Makefile index 400c7442778..49671466b7f 100644 --- a/www/apache6/Makefile +++ b/www/apache6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2001/12/26 21:20:27 jlam Exp $ +# $NetBSD: Makefile,v 1.49.2.1 2002/06/23 19:03:34 jlam Exp $ # # This package does not compile in mod_ssl support hooks, as it conflicts # with IPv6-enable patch. @@ -7,9 +7,8 @@ # sanity fixes in apache module API (for example, avoid u_long for IPv4 addrs) # -DISTNAME= apache_1.3.22 -PKGNAME= apache6-1.3.22 -PKGREVISION= 1 +DISTNAME= apache_1.3.26 +PKGNAME= apache6-1.3.26 CATEGORIES= www MASTER_SITES= http://httpd.apache.org/dist/httpd/ \ http://www.apache.de/dist/httpd/ \ @@ -17,9 +16,10 @@ MASTER_SITES= http://httpd.apache.org/dist/httpd/ \ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ sitedrivenby.gif -MASTER_SITES+= ftp://ftp.piuha.net/pub/misc/ -DISTFILES+= ${IPV6_PATCH} -IPV6_PATCH= apache-1.3.22-v6-20011123.diff.gz +PATCH_SITES+= http://www.ipng.nl/ +PATCHFILES+= ${IPV6_PATCH} +IPV6_PATCH= apache-1.3.26-ipv6.diff.gz +PATCH_DIST_STRIP= -p1 MAINTAINER= itojun@netbsd.org HOMEPAGE= http://httpd.apache.org/ @@ -30,11 +30,14 @@ CONFLICTS= apache-[0-9]* apache-*modssl-[0-9]* apache6-[0-9]* EXTRACT_ONLY= ${DISTFILES:N*.gif:N*.diff.gz} USE_BUILDLINK_ONLY= YES HAS_CONFIGURE= YES -CONFIGURE_SCRIPT= ${WRKSRC}/configure.v6 CONFIGURE_ARGS+= --with-layout="${WRKDIR}/config.layout:pkgsrc" -CONFIGURE_ARGS+= --enable-module=most \ - --enable-module=auth_db \ - --disable-module=auth_dbm +CONFIGURE_ARGS+= --enable-module=most \ + --enable-module=auth_db \ + --enable-module=so \ + --disable-module=auth_dbm \ + --enable-rule=INET6 +# proxy module is broken with the IPv6 patch +CONFIGURE_ARGS+= --disable-module=proxy CONFIGURE_ARGS+= --with-perl=${PERL5} CONFIGURE_ARGS+= --with-port=80 CONFIGURE_ENV+= OPTIM="${APACHE_CUSTOM_CFLAGS}" @@ -68,14 +71,6 @@ BUILD_DEFS+= APACHE_SUEXEC_CONFIGURE_ARGS # Under Apache 1.3, modules can be compiled to link dynamically to the server # using the "apxs" program. See apxs(8). -.if !defined(NOPIC) -CONFIGURE_ARGS+= --enable-module=so # requires dlopen() -CONFIGURE_ARGS+= --enable-shared=proxy -PLIST_SRC+= ${PKGDIR}/PLIST.shared -.else -CONFIGURE_ARGS+= --disable-module=proxy -.endif - PLIST_SRC+= ${PKGDIR}/PLIST APACHE_CUSTOM_CFLAGS?= # empty @@ -115,7 +110,6 @@ RCD_SCRIPTS= apache OWN_DIRS= /var/log/httpd OWN_DIRS+= /var/spool/httpd -OWN_DIRS_PERMS+= /var/spool/httpd/proxy nobody nobody 0755 pre-patch: ${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f @@ -125,13 +119,6 @@ post-patch: ${SED} -e "s|@INSTALL@|"`${TYPE} ${INSTALL} | ${AWK} '{ print $$NF }'`" -c -o ${LIBOWN} -g ${LIBGRP}|" \ apxs.pl > apxs.pl.sed; \ ${MV} apxs.pl.sed apxs.pl - - for file in ${IPV6_PATCH}; do \ - ${GZCAT} ${_DISTDIR}/$${file} | \ - ${PATCH} ${PATCH_DIST_ARGS} \ - || ( ${ECHO} "Patch $${file} failed" ; exit 1 ) ; \ - done - ${CHMOD} +x ${CONFIGURE_SCRIPT} cp ${WRKSRC}/conf/httpd.conf-dist ${WRKSRC}/conf/httpd.conf-dist- ${SED} -e "s|#Listen ::|Listen ::|" \ -e "s|#Listen 0.0.0.0|Listen 0.0.0.0|" \ @@ -147,9 +134,6 @@ pre-install: @${SED} ${FILES_SUBST_SED} ${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh post-install: -.if !defined(NOPIC) - cd ${PREFIX}/lib/httpd; ${MV} libproxy.so mod_proxy.so -.endif ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/httpd for file in httpd.conf magic mime.types; do \ ${INSTALL_DATA} ${PKG_SYSCONFDIR}/$${file}.default \ @@ -158,7 +142,6 @@ post-install: done ${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/httpd/htdocs ${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache - ${CHOWN} -R ${DOCOWN}:${DOCGRP} ${PREFIX}/share/httpd .include "../../textproc/expat/buildlink.mk" .include "../../mk/bsd.pkg.install.mk" diff --git a/www/apache6/PLIST b/www/apache6/PLIST index aa71be4e196..3728c2dd14f 100644 --- a/www/apache6/PLIST +++ b/www/apache6/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:16:12 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.1.2.1 2002/06/23 19:03:35 jlam Exp $ bin/dbmmanage bin/htdigest bin/htpasswd @@ -84,7 +84,7 @@ share/httpd/htdocs/index.html.he.iso8859-8 share/httpd/htdocs/index.html.it share/httpd/htdocs/index.html.ja.jis share/httpd/htdocs/index.html.kr.iso-kr -share/httpd/htdocs/index.html.lu +share/httpd/htdocs/index.html.lb.utf8 share/httpd/htdocs/index.html.nl share/httpd/htdocs/index.html.nn share/httpd/htdocs/index.html.no @@ -99,14 +99,16 @@ share/httpd/htdocs/index.html.ru.ucs2 share/httpd/htdocs/index.html.ru.ucs4 share/httpd/htdocs/index.html.ru.utf8 share/httpd/htdocs/index.html.se -share/httpd/htdocs/index.html.zh.Big5 +share/httpd/htdocs/index.html.zh share/httpd/htdocs/manual/LICENSE share/httpd/htdocs/manual/bind.html.en share/httpd/htdocs/manual/bind.html.fr share/httpd/htdocs/manual/bind.html.html +share/httpd/htdocs/manual/bind.html.ja.jis share/httpd/htdocs/manual/cgi_path.html.en share/httpd/htdocs/manual/cgi_path.html.fr share/httpd/htdocs/manual/cgi_path.html.html +share/httpd/htdocs/manual/cgi_path.html.ja.jis share/httpd/htdocs/manual/configuring.html.en share/httpd/htdocs/manual/configuring.html.fr share/httpd/htdocs/manual/configuring.html.html @@ -130,6 +132,7 @@ share/httpd/htdocs/manual/handler.html.en share/httpd/htdocs/manual/handler.html.html share/httpd/htdocs/manual/handler.html.ja.jis share/httpd/htdocs/manual/header.html +share/httpd/htdocs/manual/howto/auth.html share/httpd/htdocs/manual/howto/cgi.html.en share/httpd/htdocs/manual/howto/cgi.html.html share/httpd/htdocs/manual/howto/cgi.html.ja.jis @@ -208,14 +211,21 @@ share/httpd/htdocs/manual/mod/header.html share/httpd/htdocs/manual/mod/index-bytype.html.en share/httpd/htdocs/manual/mod/index-bytype.html.fr share/httpd/htdocs/manual/mod/index-bytype.html.html +share/httpd/htdocs/manual/mod/index-bytype.html.ja.jis share/httpd/htdocs/manual/mod/index.html.en share/httpd/htdocs/manual/mod/index.html.fr share/httpd/htdocs/manual/mod/index.html.html share/httpd/htdocs/manual/mod/index.html.ja.jis -share/httpd/htdocs/manual/mod/mod_access.html -share/httpd/htdocs/manual/mod/mod_actions.html +share/httpd/htdocs/manual/mod/mod_access.html.en +share/httpd/htdocs/manual/mod/mod_access.html.html +share/httpd/htdocs/manual/mod/mod_access.html.ja.jis +share/httpd/htdocs/manual/mod/mod_actions.html.en +share/httpd/htdocs/manual/mod/mod_actions.html.html +share/httpd/htdocs/manual/mod/mod_actions.html.ja.jis share/httpd/htdocs/manual/mod/mod_alias.html -share/httpd/htdocs/manual/mod/mod_asis.html +share/httpd/htdocs/manual/mod/mod_asis.html.en +share/httpd/htdocs/manual/mod/mod_asis.html.html +share/httpd/htdocs/manual/mod/mod_asis.html.ja.jis share/httpd/htdocs/manual/mod/mod_auth.html share/httpd/htdocs/manual/mod/mod_auth_anon.html share/httpd/htdocs/manual/mod/mod_auth_db.html @@ -224,10 +234,14 @@ share/httpd/htdocs/manual/mod/mod_auth_digest.html share/httpd/htdocs/manual/mod/mod_autoindex.html share/httpd/htdocs/manual/mod/mod_browser.html share/httpd/htdocs/manual/mod/mod_cern_meta.html -share/httpd/htdocs/manual/mod/mod_cgi.html +share/httpd/htdocs/manual/mod/mod_cgi.html.en +share/httpd/htdocs/manual/mod/mod_cgi.html.html +share/httpd/htdocs/manual/mod/mod_cgi.html.ja.jis share/httpd/htdocs/manual/mod/mod_cookies.html share/httpd/htdocs/manual/mod/mod_digest.html -share/httpd/htdocs/manual/mod/mod_dir.html +share/httpd/htdocs/manual/mod/mod_dir.html.en +share/httpd/htdocs/manual/mod/mod_dir.html.html +share/httpd/htdocs/manual/mod/mod_dir.html.ja.jis share/httpd/htdocs/manual/mod/mod_dld.html share/httpd/htdocs/manual/mod/mod_env.html.en share/httpd/htdocs/manual/mod/mod_env.html.html @@ -237,7 +251,9 @@ share/httpd/htdocs/manual/mod/mod_expires.html share/httpd/htdocs/manual/mod/mod_headers.html share/httpd/htdocs/manual/mod/mod_imap.html share/httpd/htdocs/manual/mod/mod_include.html -share/httpd/htdocs/manual/mod/mod_info.html +share/httpd/htdocs/manual/mod/mod_info.html.en +share/httpd/htdocs/manual/mod/mod_info.html.html +share/httpd/htdocs/manual/mod/mod_info.html.ja.jis share/httpd/htdocs/manual/mod/mod_isapi.html share/httpd/htdocs/manual/mod/mod_log_agent.html share/httpd/htdocs/manual/mod/mod_log_common.html @@ -256,11 +272,19 @@ share/httpd/htdocs/manual/mod/mod_rewrite.html share/httpd/htdocs/manual/mod/mod_setenvif.html.en share/httpd/htdocs/manual/mod/mod_setenvif.html.html share/httpd/htdocs/manual/mod/mod_setenvif.html.ja.jis -share/httpd/htdocs/manual/mod/mod_so.html -share/httpd/htdocs/manual/mod/mod_speling.html +share/httpd/htdocs/manual/mod/mod_so.html.en +share/httpd/htdocs/manual/mod/mod_so.html.html +share/httpd/htdocs/manual/mod/mod_so.html.ja.jis +share/httpd/htdocs/manual/mod/mod_speling.html.en +share/httpd/htdocs/manual/mod/mod_speling.html.html +share/httpd/htdocs/manual/mod/mod_speling.html.ja.jis share/httpd/htdocs/manual/mod/mod_status.html -share/httpd/htdocs/manual/mod/mod_unique_id.html -share/httpd/htdocs/manual/mod/mod_userdir.html +share/httpd/htdocs/manual/mod/mod_unique_id.html.en +share/httpd/htdocs/manual/mod/mod_unique_id.html.html +share/httpd/htdocs/manual/mod/mod_unique_id.html.ja.jis +share/httpd/htdocs/manual/mod/mod_userdir.html.en +share/httpd/htdocs/manual/mod/mod_userdir.html.html +share/httpd/htdocs/manual/mod/mod_userdir.html.ja.jis share/httpd/htdocs/manual/mod/mod_usertrack.html share/httpd/htdocs/manual/mod/mod_vhost_alias.html share/httpd/htdocs/manual/mod/module-dict.html.en @@ -276,30 +300,43 @@ share/httpd/htdocs/manual/new_features_1_3.html.en share/httpd/htdocs/manual/new_features_1_3.html.html share/httpd/htdocs/manual/new_features_1_3.html.ja.jis share/httpd/htdocs/manual/new_features_2_0.html -share/httpd/htdocs/manual/process-model.html +share/httpd/htdocs/manual/process-model.html.en +share/httpd/htdocs/manual/process-model.html.html +share/httpd/htdocs/manual/process-model.html.ja.jis share/httpd/htdocs/manual/programs/ab.html -share/httpd/htdocs/manual/programs/apachectl.html +share/httpd/htdocs/manual/programs/apachectl.html.en +share/httpd/htdocs/manual/programs/apachectl.html.html +share/httpd/htdocs/manual/programs/apachectl.html.ja.jis share/httpd/htdocs/manual/programs/apxs.html share/httpd/htdocs/manual/programs/dbmmanage.html share/httpd/htdocs/manual/programs/footer.html share/httpd/htdocs/manual/programs/header.html share/httpd/htdocs/manual/programs/htdigest.html -share/httpd/htdocs/manual/programs/htpasswd.html -share/httpd/htdocs/manual/programs/httpd.html +share/httpd/htdocs/manual/programs/htpasswd.html.en +share/httpd/htdocs/manual/programs/htpasswd.html.html +share/httpd/htdocs/manual/programs/htpasswd.html.ja.jis +share/httpd/htdocs/manual/programs/httpd.html.en +share/httpd/htdocs/manual/programs/httpd.html.html +share/httpd/htdocs/manual/programs/httpd.html.ja.jis share/httpd/htdocs/manual/programs/index.html.en share/httpd/htdocs/manual/programs/index.html.html share/httpd/htdocs/manual/programs/index.html.ja.jis share/httpd/htdocs/manual/programs/logresolve.html share/httpd/htdocs/manual/programs/other.html share/httpd/htdocs/manual/programs/rotatelogs.html -share/httpd/htdocs/manual/programs/suexec.html +share/httpd/htdocs/manual/programs/suexec.html.en +share/httpd/htdocs/manual/programs/suexec.html.html +share/httpd/htdocs/manual/programs/suexec.html.ja.jis share/httpd/htdocs/manual/readme-tpf.html share/httpd/htdocs/manual/search/manual-index.cgi -share/httpd/htdocs/manual/sections.html +share/httpd/htdocs/manual/sections.html.en +share/httpd/htdocs/manual/sections.html.html +share/httpd/htdocs/manual/sections.html.ja.jis share/httpd/htdocs/manual/server-wide.html.en share/httpd/htdocs/manual/server-wide.html.fr share/httpd/htdocs/manual/server-wide.html.html share/httpd/htdocs/manual/server-wide.html.ja.jis +share/httpd/htdocs/manual/sitemap.html share/httpd/htdocs/manual/sourcereorg.html share/httpd/htdocs/manual/stopping.html.en share/httpd/htdocs/manual/stopping.html.fr @@ -314,7 +351,9 @@ share/httpd/htdocs/manual/urlmapping.html share/httpd/htdocs/manual/vhosts/details.html share/httpd/htdocs/manual/vhosts/details_1_2.html share/httpd/htdocs/manual/vhosts/examples.html -share/httpd/htdocs/manual/vhosts/fd-limits.html +share/httpd/htdocs/manual/vhosts/fd-limits.html.en +share/httpd/htdocs/manual/vhosts/fd-limits.html.html +share/httpd/htdocs/manual/vhosts/fd-limits.html.ja.jis share/httpd/htdocs/manual/vhosts/footer.html share/httpd/htdocs/manual/vhosts/header.html share/httpd/htdocs/manual/vhosts/host.html @@ -328,11 +367,14 @@ share/httpd/htdocs/manual/vhosts/name-based.html.html share/httpd/htdocs/manual/vhosts/name-based.html.ja.jis share/httpd/htdocs/manual/vhosts/vhosts-in-depth.html share/httpd/htdocs/manual/vhosts/virtual-host.html -share/httpd/htdocs/manual/win_compiling.html +share/httpd/htdocs/manual/win_compiling.html.en +share/httpd/htdocs/manual/win_compiling.html.html +share/httpd/htdocs/manual/win_compiling.html.ja.jis share/httpd/htdocs/manual/win_service.html.en share/httpd/htdocs/manual/win_service.html.html share/httpd/htdocs/manual/win_service.html.ja.jis -share/httpd/htdocs/manual/windows.html +share/httpd/htdocs/manual/windows.html.en +share/httpd/htdocs/manual/windows.html.ja.jis share/httpd/htdocs/sitedrivenby.gif share/httpd/icons/README share/httpd/icons/a.gif @@ -377,6 +419,8 @@ share/httpd/icons/continued.gif share/httpd/icons/continued.png share/httpd/icons/dir.gif share/httpd/icons/dir.png +share/httpd/icons/diskimg.gif +share/httpd/icons/diskimg.png share/httpd/icons/down.gif share/httpd/icons/down.png share/httpd/icons/dvi.gif @@ -563,3 +607,4 @@ share/httpd/icons/world2.png @dirrm share/examples/httpd @dirrm include/httpd/xml @dirrm include/httpd + diff --git a/www/apache6/PLIST.shared b/www/apache6/PLIST.shared deleted file mode 100644 index c8a2ec74fc2..00000000000 --- a/www/apache6/PLIST.shared +++ /dev/null @@ -1,4 +0,0 @@ -@comment $NetBSD: PLIST.shared,v 1.1 2001/11/01 02:23:26 zuntum Exp $ -lib/httpd/mod_proxy.so -lib/httpd/httpd.exp -@dirrm lib/httpd diff --git a/www/apache6/distinfo b/www/apache6/distinfo index 758939ce288..6b3e48ef4d1 100644 --- a/www/apache6/distinfo +++ b/www/apache6/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.11 2002/01/01 06:22:54 jlam Exp $ +$NetBSD: distinfo,v 1.11.2.1 2002/06/23 19:03:35 jlam Exp $ -SHA1 (apache_1.3.22.tar.gz) = 5b93c1f8c8cfb703e6082ffa2cd99ea017e1e05e -Size (apache_1.3.22.tar.gz) = 2177983 bytes +SHA1 (apache_1.3.26.tar.gz) = c8ab59541267c3e570592115b280e6cb2fb2b30f +Size (apache_1.3.26.tar.gz) = 2303147 bytes SHA1 (sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658 Size (sitedrivenby.gif) = 8519 bytes -SHA1 (apache-1.3.22-v6-20011123.diff.gz) = aec9c4e8b918f176b6c73e3a85cde82e21a45776 -Size (apache-1.3.22-v6-20011123.diff.gz) = 53755 bytes +SHA1 (apache-1.3.26-ipv6.diff.gz) = 610bba0fd90b43834abab1f574ac4c6ebbce6989 +Size (apache-1.3.26-ipv6.diff.gz) = 35421 bytes SHA1 (patch-aa) = d8305a8a00d1d017a4e49f35329d5011c4d39ff8 SHA1 (patch-ab) = 7619dbf1cf584f9e92998fe25de0860bfbeb277e SHA1 (patch-ac) = d4dd4f5521a7c713a038dec2606dad14356d746f diff --git a/www/asp2php/DESCR b/www/asp2php/DESCR index 80ed01d2922..83f372896ed 100644 --- a/www/asp2php/DESCR +++ b/www/asp2php/DESCR @@ -1,2 +1,2 @@ -asp2php converts WWW Active Server Pages (ASP) files that run on the -Microsoft IIS Web Server into PHP pages to run on Apache. +asp2php converts WWW Active Server Pages (ASP) files that run on +the Microsoft IIS Web Server into PHP pages to run on Apache. diff --git a/www/asp2php/Makefile b/www/asp2php/Makefile index 31bdcb4ff69..b7accb3ada1 100644 --- a/www/asp2php/Makefile +++ b/www/asp2php/Makefile @@ -1,13 +1,11 @@ -# $NetBSD: Makefile,v 1.4 2001/12/21 10:48:15 agc Exp $ +# $NetBSD: Makefile,v 1.4.2.1 2002/06/23 19:03:36 jlam Exp $ -DISTNAME= asp2php-0.75.25 +DISTNAME= asp2php-0.76.10 CATEGORIES= www -MASTER_SITES= http://home.swbell.net/mikekohn/asp2php/ +MASTER_SITES= http://65.108.58.129/asp2php/ -MAINTAINER= shell@shellhung.org +MAINTAINER= shell@netbsd.org HOMEPAGE= http://asp2php.naken.cc/ COMMENT= converts asp pages to php pages -WRKSRC= ${WRKDIR}/asp2php - .include "../../mk/bsd.pkg.mk" diff --git a/www/asp2php/distinfo b/www/asp2php/distinfo index 900f393f75d..c7dbf4c90cf 100644 --- a/www/asp2php/distinfo +++ b/www/asp2php/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.4 2001/12/21 10:48:15 agc Exp $ +$NetBSD: distinfo,v 1.4.2.1 2002/06/23 19:03:37 jlam Exp $ -SHA1 (asp2php-0.75.25.tar.gz) = 1f05d9598c81383e43d53f61f1d73ca485bd7ed6 -Size (asp2php-0.75.25.tar.gz) = 41450 bytes -SHA1 (patch-aa) = bbba1dd0baf796abf0a8f3ba3e5b90756ad24006 +SHA1 (asp2php-0.76.10.tar.gz) = f36dcadb7c171b6b0dc9ce1908da7a705279101b +Size (asp2php-0.76.10.tar.gz) = 49983 bytes +SHA1 (patch-aa) = 166a0e83d6c41b23b0254ec9fc19d2d78fd672df diff --git a/www/asp2php/patches/patch-aa b/www/asp2php/patches/patch-aa index 5d1e40d62e9..ea7e3549e04 100644 --- a/www/asp2php/patches/patch-aa +++ b/www/asp2php/patches/patch-aa @@ -1,27 +1,33 @@ -$NetBSD: patch-aa,v 1.1 2001/11/22 11:26:59 agc Exp $ +$NetBSD: patch-aa,v 1.1.2.1 2002/06/23 19:03:37 jlam Exp $ ---- Makefile.orig Mon Jul 9 02:54:24 2001 -+++ Makefile Mon Jul 9 02:55:51 2001 -@@ -1,5 +1,6 @@ +--- Makefile.orig Mon Jun 10 10:00:48 2002 ++++ Makefile +@@ -1,6 +1,7 @@ -CC=gcc -+CC+= ${CFLAGS} -+BINDIR= ${PREFIX}/bin ++CC+=${CFLAGS} + LD=ld ++BINDIR=${PREFIX}/bin default: - $(CC) -c conditionals.c -Wall -@@ -44,10 +45,10 @@ - $(CC) -o unipiss unipiss.c html.o general.o -Wall + cd src && make +@@ -16,14 +17,14 @@ + @mv src/gtkasp2php . install: - @if [ -e asp2php ]; then install asp2php /usr/local/bin; fi; -- @if [ -e unipiss ]; then install unipiss /usr/local/bin; fi; - @if [ -e gtkasp2php ]; then install gtkasp2php /usr/local/bin; fi; - @echo "Compiled programs have been installed in /usr/local/bin" + @if [ -e asp2php ]; then install asp2php ${BINDIR}; fi; -+ @if [ -e unipiss ]; then install unipiss ${BINDIR}; fi; + @if [ -e gtkasp2php ]; then install gtkasp2php ${BINDIR}; fi; + @echo "Compiled programs have been installed in ${BINDIR}" @echo "" - all: default + uninstall: +- @if [ -e /usr/local/bin/asp2php ]; then rm /usr/local/bin/asp2php; fi; +- @if [ -e /usr/local/bin/gtkasp2php ]; then rm /usr/local/bin/gtkasp2php; fi; ++ @if [ -e ${BINDIR}/asp2php ]; then rm ${BINDIR}/asp2php; fi; ++ @if [ -e ${BINDIR}/gtkasp2php ]; then rm ${BINDIR}/gtkasp2php; fi; + @echo "asp2php has been uninstalled." + @echo "" + diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile index 930d809f527..3eb1d8d97c1 100644 --- a/www/bluefish/Makefile +++ b/www/bluefish/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2002/03/19 08:52:24 skrll Exp $ +# $NetBSD: Makefile,v 1.24.2.1 2002/06/23 19:03:38 jlam Exp $ DISTNAME= bluefish-0.7 PKGREVISION= 1 @@ -22,7 +22,7 @@ DEPENDS+= jpeg-6b:../../graphics/jpeg DEPENDS+= png>=1.2.1:../../graphics/png DEPENDS+= tiff-[0-9]*:../../graphics/tiff DEPENDS+= gnome-libs>=1.4.1.2nb1:../../x11/gnome-libs -DEPENDS+= gdk-pixbuf-0.11.0nb1:../../graphics/gdk-pixbuf +DEPENDS+= gdk-pixbuf>=0.11.0nb1:../../graphics/gdk-pixbuf BUILD_USES_MSGFMT= YES diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile index bc193fc31ae..0751fbfbe46 100644 --- a/www/cocoon/Makefile +++ b/www/cocoon/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.15 2002/04/03 21:16:29 jwise Exp $ +# $NetBSD: Makefile,v 1.15.2.1 2002/06/23 19:03:38 jlam Exp $ DISTNAME= Cocoon-1.8.2 PKGNAME= cocoon-1.8.2 CATEGORIES= www -MASTER_SITES= http://xml.apache.org/dist/cocoon/ +MASTER_SITES= http://xml.apache.org/dist/cocoon/cocoon1/ MAINTAINER= jwise@netbsd.org HOMEPAGE= http://xml.apache.org/cocoon/ diff --git a/www/curl/Makefile b/www/curl/Makefile index d88ba7663ed..923dce6498b 100644 --- a/www/curl/Makefile +++ b/www/curl/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.18.2.2 2002/06/21 23:05:48 jlam Exp $ +# $NetBSD: Makefile,v 1.18.2.3 2002/06/23 19:03:39 jlam Exp $ -DISTNAME= curl-7.9.6 +DISTNAME= curl-7.9.7 CATEGORIES= www MASTER_SITES= http://curl.haxx.se/download/ \ ftp://ftp.sunet.se/pub/www/utilities/curl/ \ diff --git a/www/curl/PLIST b/www/curl/PLIST index 8918864f31f..363d4a4cd96 100644 --- a/www/curl/PLIST +++ b/www/curl/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/04/21 12:07:45 shell Exp $ +@comment $NetBSD: PLIST,v 1.3.2.1 2002/06/23 19:03:40 jlam Exp $ bin/curl bin/curl-config include/curl/curl.h @@ -50,6 +50,7 @@ share/doc/curl/MANUAL share/doc/curl/TheArtOfHttpScripting share/examples/curl/README share/examples/curl/curlgtk.c +share/examples/curl/fopen.c share/examples/curl/ftpget.c share/examples/curl/ftpgetresp.c share/examples/curl/ftpupload.c @@ -58,6 +59,7 @@ share/examples/curl/http-post.c share/examples/curl/httpput.c share/examples/curl/multi-app.c share/examples/curl/multi-double.c +share/examples/curl/multi-post.c share/examples/curl/multi-single.c share/examples/curl/multithread.c share/examples/curl/persistant.c @@ -66,7 +68,6 @@ share/examples/curl/postit2.c share/examples/curl/sepheaders.c share/examples/curl/simple.c share/examples/curl/simplessl.c -share/examples/curl/win32sockets.c @dirrm share/examples/curl @dirrm share/doc/curl @dirrm include/curl diff --git a/www/curl/distinfo b/www/curl/distinfo index 53292151496..0a32816084c 100644 --- a/www/curl/distinfo +++ b/www/curl/distinfo @@ -1,4 +1,5 @@ -$NetBSD: distinfo,v 1.10 2002/04/21 12:07:45 shell Exp $ +$NetBSD: distinfo,v 1.10.2.1 2002/06/23 19:03:40 jlam Exp $ -SHA1 (curl-7.9.6.tar.gz) = 33278d881460cd2667cfcf3295f99825b4fe8399 -Size (curl-7.9.6.tar.gz) = 706370 bytes +SHA1 (curl-7.9.7.tar.gz) = 6fcb23be788984bcfca7debe5f307ec65fb56101 +Size (curl-7.9.7.tar.gz) = 717489 bytes +SHA1 (patch-aa) = 5990fe1f4d583847751549f2e647f23b2bbbbe96 diff --git a/www/curl/patches/patch-aa b/www/curl/patches/patch-aa new file mode 100644 index 00000000000..8ce3608a66f --- /dev/null +++ b/www/curl/patches/patch-aa @@ -0,0 +1,12 @@ +$NetBSD: patch-aa,v 1.5.2.2 2002/06/23 19:03:41 jlam Exp $ + +--- src/writeout.c 2002/06/11 12:31:17 1.1 ++++ src/writeout.c 2002/06/11 12:31:35 +@@ -27,6 +27,7 @@ + #include <string.h> + + #ifdef HAVE_SYS_SELECT_H ++#include <sys/types.h> + #include <sys/select.h> + #endif + diff --git a/www/dillo/Makefile b/www/dillo/Makefile index e171cc4903c..13eb2957380 100644 --- a/www/dillo/Makefile +++ b/www/dillo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2002/04/29 11:57:03 rh Exp $ +# $NetBSD: Makefile,v 1.6.2.1 2002/06/23 19:03:42 jlam Exp $ # DISTNAME= dillo-0.6.5 @@ -18,10 +18,8 @@ post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dillo ${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/dillo - -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/png/buildlink.mk" -.include "../../x11/gtk/buildlink.mk" -.include "../../mk/x11.buildlink.mk" - +.include "../../graphics/jpeg/buildlink.mk" +.include "../../graphics/png/buildlink.mk" +.include "../../x11/gtk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/dillo/distinfo b/www/dillo/distinfo index 6aa99778227..3e42413fae7 100644 --- a/www/dillo/distinfo +++ b/www/dillo/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.7 2002/04/29 11:57:03 rh Exp $ +$NetBSD: distinfo,v 1.7.2.1 2002/06/23 19:03:42 jlam Exp $ SHA1 (dillo-0.6.5.tar.gz) = 34e11b573e577d24fc20a2b8a9a13f44883ecf51 Size (dillo-0.6.5.tar.gz) = 310323 bytes SHA1 (patch-aa) = 1ae5a680306102d03d587acfbbf16cbf1f5df366 -SHA1 (patch-ab) = 3246d74bd6f62e794446f7734501ad66906f0e15 +SHA1 (patch-ab) = 1687c870ae8f6c5a3be4a91335a6d913d9773ff2 diff --git a/www/dillo/patches/patch-ab b/www/dillo/patches/patch-ab new file mode 100644 index 00000000000..7542ea5711a --- /dev/null +++ b/www/dillo/patches/patch-ab @@ -0,0 +1,16 @@ +$NetBSD: patch-ab,v 1.4.2.2 2002/06/23 19:03:43 jlam Exp $ + +--- Makefile.in.orig Tue May 21 12:53:53 2002 ++++ Makefile.in +@@ -359,9 +359,9 @@ + + install-data-local: dillorc + -if [ -d $(DESTDIR)$(sysconfdir) ]; then \ +- $(INSTALL_DATA) --backup=t $(srcdir)/dillorc $(DESTDIR)$(sysconfdir)/; \ ++ $(INSTALL_DATA) $(srcdir)/dillorc $(DESTDIR)$(sysconfdir)/; \ + elif [ -d /etc/ ]; then \ +- $(INSTALL_DATA) --backup=t $(srcdir)/dillorc /etc/; \ ++ $(INSTALL_DATA) $(srcdir)/dillorc /etc/; \ + fi + + uninstall-local: diff --git a/www/elinks/DESCR b/www/elinks/DESCR new file mode 100644 index 00000000000..395f62e1877 --- /dev/null +++ b/www/elinks/DESCR @@ -0,0 +1,5 @@ +This is the elinks tree - intended to provide feature-rich version of links, +however not rock-stable and dedicated mainly for testing. Its purpuose is to +make alternative to links, until Mikulas will have some time to maintain it, +and to test and tune various patches for Mikulas to be able to include them +in the official links releases. diff --git a/www/elinks/Makefile b/www/elinks/Makefile new file mode 100644 index 00000000000..de65684d2a0 --- /dev/null +++ b/www/elinks/Makefile @@ -0,0 +1,19 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 19:03:44 jlam Exp $ +# + +DISTNAME= elinks-0.3.0 +CATEGORIES= www +MASTER_SITES= http://elinks.pld.org.pl/download/ +EXTRACT_SUFX= .tar.bz2 + +MAINTAINER= dawszy@arhea.net +HOMEPAGE= http://elinks.pld.org.pl/ +COMMENT= Extended/Enhanced Links (elinks) + +CONFLICTS= links[0-9]* + +GNU_CONFIGURE= YES +USE_BUILDLINK_ONLY= YES + +.include "../../security/openssl/buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/www/elinks/PLIST b/www/elinks/PLIST new file mode 100644 index 00000000000..b939d8b4a89 --- /dev/null +++ b/www/elinks/PLIST @@ -0,0 +1,3 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.2.2 2002/06/23 19:03:45 jlam Exp $ +bin/links +man/man1/links.1 diff --git a/www/elinks/distinfo b/www/elinks/distinfo new file mode 100644 index 00000000000..0f94d71faa3 --- /dev/null +++ b/www/elinks/distinfo @@ -0,0 +1,4 @@ + + +SHA1 (elinks-0.3.0.tar.bz2) = c531d7922b1fb51fb8eeda960ff1e41c656db03e +Size (elinks-0.3.0.tar.bz2) = 446820 bytes diff --git a/www/galeon/Makefile b/www/galeon/Makefile index 3d4c07bfc7b..ec8b0a7cc31 100644 --- a/www/galeon/Makefile +++ b/www/galeon/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.28 2002/04/26 15:16:38 tron Exp $ +# $NetBSD: Makefile,v 1.28.2.1 2002/06/23 19:03:47 jlam Exp $ -DISTNAME= galeon-1.2.1 +DISTNAME= galeon-1.2.5 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=galeon/} @@ -12,7 +12,7 @@ CONFLICTS= galeon-current-[0-9]* BUILD_DEPENDS+= xml-i18n-tools>=0.8.1:../../textproc/xml-i18n-tools DEPENDS+= scrollkeeper>=0.2:../../textproc/scrollkeeper -DEPENDS+= mozilla>=1.0rc1:../../www/mozilla +DEPENDS+= mozilla>=1.0:../../www/mozilla USE_X11BASE= yes USE_GMAKE= yes diff --git a/www/galeon/PLIST b/www/galeon/PLIST index b50cc85f96e..f92cf72b6d9 100644 --- a/www/galeon/PLIST +++ b/www/galeon/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2002/04/26 15:16:39 tron Exp $ +@comment $NetBSD: PLIST,v 1.9.2.1 2002/06/23 19:03:47 jlam Exp $ bin/galeon bin/galeon-bin bin/galeon-config-tool @@ -70,8 +70,8 @@ share/galeon/new_item_small.xpm share/galeon/new_separator.xpm share/galeon/new_separator_small.xpm share/galeon/preferences.glade -share/galeon/print.glade share/galeon/print-preview.glade +share/galeon/print.glade share/galeon/programs.png share/galeon/prompts.glade share/galeon/rpm.png @@ -207,6 +207,7 @@ share/galeon/toc.css share/galeon/toolbars.png share/galeon/windows.png share/gnome/apps/Internet/galeon.desktop +share/gnome/help/galeon-manual/C/LEGALNOTICE.html share/gnome/help/galeon-manual/C/aboutbook.html share/gnome/help/galeon-manual/C/apx-authors.sgml share/gnome/help/galeon-manual/C/apx-bugs.sgml @@ -293,47 +294,47 @@ share/gnome/help/galeon-manual/C/stylesheet-images/toc-minus.gif share/gnome/help/galeon-manual/C/stylesheet-images/toc-plus.gif share/gnome/help/galeon-manual/C/stylesheet-images/up.gif share/gnome/help/galeon-manual/C/stylesheet-images/warning.gif -share/gnome/help/galeon-manual/C/LEGALNOTICE.html share/gnome/help/galeon-manual/C/tabbed-browsing.html share/gnome/help/galeon-manual/C/toolbar.html share/gnome/ui/nautilus-galeon-view-ui.xml -share/locale/az/LC_MESSAGES/galeon.mo -share/locale/bg/LC_MESSAGES/galeon.mo -share/locale/ca/LC_MESSAGES/galeon.mo -share/locale/cs/LC_MESSAGES/galeon.mo -share/locale/da/LC_MESSAGES/galeon.mo -share/locale/de/LC_MESSAGES/galeon.mo -share/locale/el/LC_MESSAGES/galeon.mo -share/locale/es/LC_MESSAGES/galeon.mo -share/locale/et/LC_MESSAGES/galeon.mo -share/locale/fi/LC_MESSAGES/galeon.mo -share/locale/fr/LC_MESSAGES/galeon.mo -share/locale/gl/LC_MESSAGES/galeon.mo -share/locale/hr/LC_MESSAGES/galeon.mo -share/locale/hu/LC_MESSAGES/galeon.mo -share/locale/it/LC_MESSAGES/galeon.mo -share/locale/ja/LC_MESSAGES/galeon.mo -share/locale/ko/LC_MESSAGES/galeon.mo -share/locale/lt/LC_MESSAGES/galeon.mo -share/locale/lv/LC_MESSAGES/galeon.mo -share/locale/ms/LC_MESSAGES/galeon.mo -share/locale/nl/LC_MESSAGES/galeon.mo -share/locale/nn/LC_MESSAGES/galeon.mo -share/locale/no/LC_MESSAGES/galeon.mo -share/locale/pl/LC_MESSAGES/galeon.mo -share/locale/pt/LC_MESSAGES/galeon.mo -share/locale/pt_BR/LC_MESSAGES/galeon.mo -share/locale/ro/LC_MESSAGES/galeon.mo -share/locale/ru/LC_MESSAGES/galeon.mo -share/locale/sk/LC_MESSAGES/galeon.mo -share/locale/sl/LC_MESSAGES/galeon.mo -share/locale/sv/LC_MESSAGES/galeon.mo -share/locale/ta/LC_MESSAGES/galeon.mo -share/locale/tr/LC_MESSAGES/galeon.mo -share/locale/uk/LC_MESSAGES/galeon.mo -share/locale/wa/LC_MESSAGES/galeon.mo -share/locale/zh_CN/LC_MESSAGES/galeon.mo -share/locale/zh_TW/LC_MESSAGES/galeon.mo +${PKGLOCALEDIR}/locale/az/LC_MESSAGES/galeon.mo +${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/galeon.mo +${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/galeon.mo +${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/galeon.mo +${PKGLOCALEDIR}/locale/da/LC_MESSAGES/galeon.mo +${PKGLOCALEDIR}/locale/de/LC_MESSAGES/galeon.mo +${PKGLOCALEDIR}/locale/el/LC_MESSAGES/galeon.mo +${PKGLOCALEDIR}/locale/es/LC_MESSAGES/galeon.mo +${PKGLOCALEDIR}/locale/et/LC_MESSAGES/galeon.mo +${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/galeon.mo +${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/galeon.mo +${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/galeon.mo +${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/galeon.mo +${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/galeon.mo +${PKGLOCALEDIR}/locale/it/LC_MESSAGES/galeon.mo +${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/galeon.mo +${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/galeon.mo +${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/galeon.mo +${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/galeon.mo +${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/galeon.mo +${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/galeon.mo +${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/galeon.mo +${PKGLOCALEDIR}/locale/no/LC_MESSAGES/galeon.mo +${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/galeon.mo +${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/galeon.mo +${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/galeon.mo +${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/galeon.mo +${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/galeon.mo +${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/galeon.mo +${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/galeon.mo +${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/galeon.mo +${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/galeon.mo +${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/galeon.mo +${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/galeon.mo +${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/galeon.mo +${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/galeon.mo +${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/galeon.mo +${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/galeon.mo share/oaf/GNOME_Galeon_Automation.oaf share/oaf/GNOME_Galeon_NautilusView.oaf share/omf/galeon/galeon-manual-C.omf diff --git a/www/galeon/distinfo b/www/galeon/distinfo index 943d082eb53..3212d96d3b2 100644 --- a/www/galeon/distinfo +++ b/www/galeon/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.23 2002/04/26 15:16:39 tron Exp $ +$NetBSD: distinfo,v 1.23.2.1 2002/06/23 19:03:48 jlam Exp $ -SHA1 (galeon-1.2.1.tar.gz) = 81492fd62740ff1d5688a619957520f9f7c510f5 -Size (galeon-1.2.1.tar.gz) = 3931284 bytes +SHA1 (galeon-1.2.5.tar.gz) = 93977e663709260c4f566d60ffeef29f4abab886 +Size (galeon-1.2.5.tar.gz) = 4004289 bytes diff --git a/www/grail/Makefile b/www/grail/Makefile index 7a254f81c9e..fc45641eaa5 100644 --- a/www/grail/Makefile +++ b/www/grail/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.13 2002/02/15 10:30:24 drochner Exp $ +# $NetBSD: Makefile,v 1.13.2.1 2002/06/23 19:03:48 jlam Exp $ # DISTNAME= grail-0.6 CATEGORIES= www -MASTER_SITES= http://prdownloads.sourceforge.net/grail/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=grail/} EXTRACT_SUFX= .tgz MAINTAINER= tsarna@netbsd.org diff --git a/www/gtkasp2php/DESCR b/www/gtkasp2php/DESCR index 80ed01d2922..83f372896ed 100644 --- a/www/gtkasp2php/DESCR +++ b/www/gtkasp2php/DESCR @@ -1,2 +1,2 @@ -asp2php converts WWW Active Server Pages (ASP) files that run on the -Microsoft IIS Web Server into PHP pages to run on Apache. +asp2php converts WWW Active Server Pages (ASP) files that run on +the Microsoft IIS Web Server into PHP pages to run on Apache. diff --git a/www/gtkasp2php/Makefile b/www/gtkasp2php/Makefile index 6108ac126cd..838f8c41db0 100644 --- a/www/gtkasp2php/Makefile +++ b/www/gtkasp2php/Makefile @@ -1,17 +1,15 @@ -# $NetBSD: Makefile,v 1.2 2001/12/21 10:52:30 agc Exp $ +# $NetBSD: Makefile,v 1.2.2.1 2002/06/23 19:03:50 jlam Exp $ -DISTNAME= asp2php-0.75.25 +DISTNAME= asp2php-0.76.10 PKGNAME= gtk${DISTNAME} CATEGORIES= www -MASTER_SITES= http://home.swbell.net/mikekohn/asp2php/ +MASTER_SITES= http://65.108.58.129/asp2php/ -MAINTAINER= shell@shellhung.org +MAINTAINER= shell@netbsd.org HOMEPAGE= http://asp2php.naken.cc/ COMMENT= gtk+ version of utility to convert asp pages to php pages -WRKSRC= ${WRKDIR}/asp2php - -ALL_TARGET= all gtkasp2php +ALL_TARGET= all gui .include "../../x11/gtk/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/gtkasp2php/distinfo b/www/gtkasp2php/distinfo index 9ee2a7a05ad..9c2da6ccd52 100644 --- a/www/gtkasp2php/distinfo +++ b/www/gtkasp2php/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.2 2001/12/21 10:52:30 agc Exp $ +$NetBSD: distinfo,v 1.2.2.1 2002/06/23 19:03:51 jlam Exp $ -SHA1 (asp2php-0.75.25.tar.gz) = 1f05d9598c81383e43d53f61f1d73ca485bd7ed6 -Size (asp2php-0.75.25.tar.gz) = 41450 bytes -SHA1 (patch-aa) = 8f1e08e7cb41d39b0226c5ee4a98a69b3098fb6d +SHA1 (asp2php-0.76.10.tar.gz) = f36dcadb7c171b6b0dc9ce1908da7a705279101b +Size (asp2php-0.76.10.tar.gz) = 49983 bytes +SHA1 (patch-aa) = 3e82a4ee63ea0e3050ce7eac3ccc2f675aa701b8 diff --git a/www/gtkasp2php/patches/patch-aa b/www/gtkasp2php/patches/patch-aa index 6438d73bf53..b2488140348 100644 --- a/www/gtkasp2php/patches/patch-aa +++ b/www/gtkasp2php/patches/patch-aa @@ -1,26 +1,31 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/11/22 11:32:29 agc Exp $ +$NetBSD: patch-aa,v 1.1.1.1.2.1 2002/06/23 19:03:52 jlam Exp $ ---- Makefile.orig Mon Jul 9 02:54:24 2001 -+++ Makefile Mon Jul 9 02:55:51 2001 -@@ -1,5 +1,6 @@ +--- Makefile.orig Fri May 31 05:13:18 2002 ++++ Makefile +@@ -1,6 +1,6 @@ -CC=gcc -+CC+= ${CFLAGS} -+BINDIR= ${PREFIX}/bin +-LD=ld ++CC+=${CFLAGS} ++BINDIR=${PREFIX}/bin default: - $(CC) -c conditionals.c -Wall -@@ -46,10 +47,9 @@ - $(CC) -o unipiss unipiss.c html.o general.o -Wall + cd src && make +@@ -16,14 +16,12 @@ + @mv src/gtkasp2php . install: - @if [ -e asp2php ]; then install asp2php /usr/local/bin; fi; -- @if [ -e unipiss ]; then install unipiss /usr/local/bin; fi; - @if [ -e gtkasp2php ]; then install gtkasp2php /usr/local/bin; fi; - @echo "Compiled programs have been installed in /usr/local/bin" -+ @if [ -e unipiss ]; then install unipiss ${BINDIR}; fi; + @if [ -e gtkasp2php ]; then install gtkasp2php ${BINDIR}; fi; + @echo "Compiled programs have been installed in ${BINDIR}" @echo "" - all: default + uninstall: +- @if [ -e /usr/local/bin/asp2php ]; then rm /usr/local/bin/asp2php; fi; +- @if [ -e /usr/local/bin/gtkasp2php ]; then rm /usr/local/bin/gtkasp2php; fi; ++ @if [ -e ${BINDIR}/gtkasp2php ]; then rm ${BINDIR}/gtkasp2php; fi; + @echo "asp2php has been uninstalled." + @echo "" + diff --git a/www/htmlfix/Makefile b/www/htmlfix/Makefile index 694ea281c00..5885f939fbe 100644 --- a/www/htmlfix/Makefile +++ b/www/htmlfix/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2002/04/04 15:57:19 abs Exp $ +# $NetBSD: Makefile,v 1.3.2.1 2002/06/23 19:03:52 jlam Exp $ # -DISTNAME= htmlfix-1.02 +DISTNAME= htmlfix-1.03 CATEGORIES= www MASTER_SITES= http://www.mono.org/abs/tools/htmlfix/ diff --git a/www/htmlfix/distinfo b/www/htmlfix/distinfo index 19c1b8e0243..94b38a84bca 100644 --- a/www/htmlfix/distinfo +++ b/www/htmlfix/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2002/04/04 15:57:19 abs Exp $ +$NetBSD: distinfo,v 1.3.2.1 2002/06/23 19:03:53 jlam Exp $ -SHA1 (htmlfix-1.02.tar.gz) = 1f0748c1b07fc7f57e5d92b3527fda06fca8545f -Size (htmlfix-1.02.tar.gz) = 2127 bytes +SHA1 (htmlfix-1.03.tar.gz) = d40bebc47d547a561f8e2e9849d087c099eb252b +Size (htmlfix-1.03.tar.gz) = 2157 bytes diff --git a/www/htmllint/Makefile b/www/htmllint/Makefile index 08c0112e19d..ec223761245 100644 --- a/www/htmllint/Makefile +++ b/www/htmllint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/09/09 20:36:53 agc Exp $ +# $NetBSD: Makefile,v 1.4.2.1 2002/06/23 19:03:53 jlam Exp $ # DISTNAME= htmllint @@ -11,7 +11,7 @@ MAINTAINER= kei@netbsd.org HOMEPAGE= http://openlab.ring.gr.jp/k16/htmllint/ COMMENT= Another HTML-Lint program -DEPENDS+= p5-Jcode>=0.68:../../japanese/p5-Jcode +DEPENDS+= p5-Jcode>=0.68:../../converters/p5-Jcode USE_PERL5= # defined WRKSRC= ${WRKDIR} diff --git a/www/jakarta-tomcat/Makefile b/www/jakarta-tomcat/Makefile index c15ae94fdcb..3310734c731 100644 --- a/www/jakarta-tomcat/Makefile +++ b/www/jakarta-tomcat/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.28 2002/04/19 15:54:21 jwise Exp $ +# $NetBSD: Makefile,v 1.28.2.1 2002/06/23 19:03:54 jlam Exp $ DISTNAME= jakarta-tomcat-3.2.4-src PKGNAME= jakarta-tomcat-3.2.4 +PKGREVISION= 1 CATEGORIES= www MASTER_SITES= http://jakarta.apache.org/builds/jakarta-tomcat/release/v3.2.4/src/ @@ -10,7 +11,7 @@ HOMEPAGE= http://jakarta.apache.org/ COMMENT= the Apache Project's Java Servlet 2.2 and JSP 1.1 server DEPENDS+= jakarta-servletapi-[0-9]*:../../www/jakarta-servletapi -BUILD_DEPENDS+= jakarta-ant>=1.4.1:../../devel/jakarta-ant +DEPENDS+= jakarta-ant>=1.4.1:../../devel/jakarta-ant USE_JAVA= yes WRKSRC= ${WRKDIR}/${DISTNAME} diff --git a/www/jakarta-tomcat/files/tomcat.sh b/www/jakarta-tomcat/files/tomcat.sh index 5dda4fb5df6..b69e3489cf4 100644 --- a/www/jakarta-tomcat/files/tomcat.sh +++ b/www/jakarta-tomcat/files/tomcat.sh @@ -1,6 +1,6 @@ #! /bin/sh # -# $NetBSD: tomcat.sh,v 1.5 2001/05/24 16:06:43 abs Exp $ +# $NetBSD: tomcat.sh,v 1.5.2.1 2002/06/23 19:03:54 jlam Exp $ # # PROVIDE: tomcat # REQUIRE: DAEMON @@ -34,7 +34,7 @@ then eval ${rcvar}_flags="${flags}" fi -CLASSPATH=${CLASSPATH}:${PREFIX}/lib/java/servlet.jar:${PREFIX}/lib/java/jaxp.jar:${PREFIX}/lib/java/parser.jar +CLASSPATH=${CLASSPATH}:${PREFIX}/lib/java/servlet.jar:${PREFIX}/lib/java/jaxp.jar:${PREFIX}/lib/java/parser.jar:${PREFIX}/lib/java/crimson.jar:${PREFIX}/lib/java/ant.jar if [ -n "${tomcat_classpath}" ] then CLASSPATH=${CLASSPATH}:${tomcat_classpath} @@ -77,8 +77,12 @@ then $0 start ;; + flush) + cd ${PREFIX}/tomcat/work && rm -rf */* + ;; + *) - echo 1>&2 "Usage: $0 [restart|start|stop]" + echo 1>&2 "Usage: $0 [restart|start|stop|flush]" exit 1 ;; esac diff --git a/www/jakarta-tomcat/patches/patch-aa b/www/jakarta-tomcat/patches/patch-aa index 555bb5d1a25..19339e452cc 100644 --- a/www/jakarta-tomcat/patches/patch-aa +++ b/www/jakarta-tomcat/patches/patch-aa @@ -1,3 +1,4 @@ +$NetBSD: patch-aa,v 1.10.2.1 2002/06/23 19:03:55 jlam Exp $ --- build.xml.orig Fri Oct 26 09:59:03 2001 +++ build.xml Fri Apr 19 13:38:31 2002 @@ -2,15 +2,15 @@ diff --git a/www/jakarta-tomcat/patches/patch-ad b/www/jakarta-tomcat/patches/patch-ad index 455cc2fbeb8..cbb10075420 100644 --- a/www/jakarta-tomcat/patches/patch-ad +++ b/www/jakarta-tomcat/patches/patch-ad @@ -1,3 +1,4 @@ +$NetBSD: patch-ad,v 1.1.2.1 2002/06/23 19:03:56 jlam Exp $ --- src/share/org/apache/tomcat/facade/RequestDispatcherImpl.java.orig Thu Dec 28 14:13:50 2000 +++ src/share/org/apache/tomcat/facade/RequestDispatcherImpl.java Sat Aug 11 15:39:18 2001 @@ -139,6 +139,7 @@ diff --git a/www/jakarta-tomcat/patches/patch-ae b/www/jakarta-tomcat/patches/patch-ae index 00cdda27be6..d48f5b2a92b 100644 --- a/www/jakarta-tomcat/patches/patch-ae +++ b/www/jakarta-tomcat/patches/patch-ae @@ -1,3 +1,4 @@ +$NetBSD: patch-ae,v 1.1.2.1 2002/06/23 19:03:56 jlam Exp $ --- src/share/org/apache/tomcat/loader/AdaptiveClassLoader.java.orig Fri Apr 19 10:40:20 2002 +++ src/share/org/apache/tomcat/loader/AdaptiveClassLoader.java Fri Apr 19 10:40:48 2002 @@ -813,7 +813,7 @@ diff --git a/www/jssi/patches/patch-aa b/www/jssi/patches/patch-aa index 7bde3ecea16..f3f09b4d904 100644 --- a/www/jssi/patches/patch-aa +++ b/www/jssi/patches/patch-aa @@ -1,3 +1,4 @@ +$NetBSD: patch-aa,v 1.1.2.1 2002/06/23 19:03:57 jlam Exp $ --- ../../docs/generate_javadoc.orig Mon Jan 14 10:23:29 2002 +++ ../../docs/generate_javadoc Mon Jan 14 10:23:47 2002 @@ -73,6 +73,6 @@ diff --git a/www/kannel/Makefile b/www/kannel/Makefile index ef245ab4d07..cf7dc4f88ad 100644 --- a/www/kannel/Makefile +++ b/www/kannel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/08/31 07:22:31 skrll Exp $ +# $NetBSD: Makefile,v 1.8.2.1 2002/06/23 19:03:58 jlam Exp $ # DISTNAME= gateway-${KANNEL_VER} @@ -12,12 +12,14 @@ COMMENT= open source WAP and SMS gateway KANNEL_VER= 1.0.3 +GNU_CONFIGURE= YES USE_BUILDLINK_ONLY= YES -USE_PERL5= YES USE_GMAKE= YES -GNU_CONFIGURE= YES +USE_PERL5= YES +USE_PTHREAD= native pth + CONFIGURE_ARGS+= --disable-docs .include "../../textproc/libxml2/buildlink.mk" -.include "../../devel/pth/buildlink.mk" +.include "../../mk/pthread.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/lhs/DESCR b/www/lhs/DESCR new file mode 100644 index 00000000000..27f503af00e --- /dev/null +++ b/www/lhs/DESCR @@ -0,0 +1,5 @@ +lhs is a beta version of very simple http server. Only static files +are supported - CGI, PHP and SSI are not allowed. However, there is +support for both IPv6 and SSL. By default it will listen on ports +8000 and 8001 and read files from ${PREFIX}/share/httpd/htdocs and +will not change uid for other unless you use the -u option. diff --git a/www/lhs/MESSAGE b/www/lhs/MESSAGE new file mode 100644 index 00000000000..3520c63dfb9 --- /dev/null +++ b/www/lhs/MESSAGE @@ -0,0 +1,7 @@ +================================================================================ +Web files by default should be placed under: + ${PREFIX}/share/httpd/htdocs + +For help use: + ${PREFIX}/sbin/lhs -h +================================================================================ diff --git a/www/lhs/Makefile b/www/lhs/Makefile new file mode 100644 index 00000000000..e99ce817ea0 --- /dev/null +++ b/www/lhs/Makefile @@ -0,0 +1,25 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 19:04:00 jlam Exp $ +# + +DISTNAME= lhs-0.1 +CATEGORIES= www +MASTER_SITES= ftp://dev.null.pl/pub/ + +MAINTAINER= dawszy@arhea.net +HOMEPAGE= http://dev.null.pl/ +COMMENT= Lightweight HTTP Server, IPv6-aware and SSL-enabled + +WRKSRC= ${WRKDIR}/lhs + +GNU_CONFIGURE= yes + +BUILD_DEFS+= USE_INET6 + +MAKE_ENV+= OPENSSL_ROOT=${BUILDLINK_PREFIX.openssl} +MAKE_ENV+= DEFAULT_ROOT_DIR=${PREFIX}/share/httpd/htdocs + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/lhs ${PREFIX}/sbin/lhs + +.include "../../security/openssl/buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/www/lhs/PLIST b/www/lhs/PLIST new file mode 100644 index 00000000000..8783f537bd1 --- /dev/null +++ b/www/lhs/PLIST @@ -0,0 +1,2 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.50.2 2002/06/23 19:04:01 jlam Exp $ +sbin/lhs diff --git a/www/lhs/distinfo b/www/lhs/distinfo new file mode 100644 index 00000000000..ad981ad39e0 --- /dev/null +++ b/www/lhs/distinfo @@ -0,0 +1,7 @@ +$NetBSD: distinfo,v 1.1.1.1.12.2 2002/06/23 19:04:02 jlam Exp $ + +SHA1 (lhs-0.1.tar.gz) = 74fbb0a982cd00c668c9f07b7c3c583759f14fd6 +Size (lhs-0.1.tar.gz) = 10665 bytes +SHA1 (patch-aa) = 02c2bdd8e28c2e209ba60fe85065519b128c1eb4 +SHA1 (patch-ab) = 23fef016758618b8b6fdda949c7094aa8256c4fd +SHA1 (patch-ac) = 14b197556274187aefda11c67dd800d5dd58537b diff --git a/www/lhs/patches/patch-aa b/www/lhs/patches/patch-aa new file mode 100644 index 00000000000..c1a7e2a3502 --- /dev/null +++ b/www/lhs/patches/patch-aa @@ -0,0 +1,15 @@ +$NetBSD: patch-aa,v 1.1.1.1.50.2 2002/06/23 19:04:03 jlam Exp $ + +--- Makefile.in.orig Sun Feb 25 14:42:39 2001 ++++ Makefile.in Tue Jun 18 12:58:26 2002 +@@ -1,7 +1,7 @@ +-CC = gcc -O2 -Wall +-LIBS = #LIBS# ++CC = gcc -O2 -Wall -DDEFAULT_ROOT_DIR='"${DEFAULT_ROOT_DIR}"' ++LIBS = -L${OPENSSL_ROOT}/lib -Wl,-R${OPENSSL_ROOT}/lib #LIBS# + +-default: lhs ++default all: lhs + + lhs: lhs.c lhs.h content-type.h icons.h + $(CC) lhs.c -o lhs $(LIBS) diff --git a/www/lhs/patches/patch-ab b/www/lhs/patches/patch-ab new file mode 100644 index 00000000000..d614abd4d4f --- /dev/null +++ b/www/lhs/patches/patch-ab @@ -0,0 +1,15 @@ +$NetBSD: patch-ab,v 1.1.1.1.50.2 2002/06/23 19:04:03 jlam Exp $ + +--- lhs.h 2002/06/18 11:49:31 1.1 ++++ lhs.h 2002/06/18 11:50:29 +@@ -7,7 +7,10 @@ + + #define VERSION "lhs/0.1" + ++#ifndef DEFAULT_ROOT_DIR + #define DEFAULT_ROOT_DIR "/home/httpd/html" ++#endif ++ + #define DEFAULT_HTTP_PORT 8000 + #define DEFAULT_HTTPS_PORT 8001 + #define DEFAULT_MAX_SOCKS 50 diff --git a/www/lhs/patches/patch-ac b/www/lhs/patches/patch-ac new file mode 100644 index 00000000000..215557d4cae --- /dev/null +++ b/www/lhs/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1.1.1.50.2 2002/06/23 19:04:04 jlam Exp $ + +--- lhs.c 2002/06/18 11:54:40 1.1 ++++ lhs.c 2002/06/18 11:54:05 +@@ -592,7 +592,7 @@ + " -s version set SSL protocol version (default: SSLv2)\n" + " -c filename load certificate file (default: lhs.pem)\n" + #endif +-" -r path set server's root directory (default: /home/httpd/html)\n" ++" -r path set server's root directory (default: " DEFAULT_ROOT_DIR ")\n" + " -u user switch to other user after startup\n" + " -g group change gid to other than user's\n" + " -m socks set number of sockets (default: 50, min: 3)\n" diff --git a/www/libwww/Makefile b/www/libwww/Makefile index d82cbd4ade1..964e35e5b4c 100644 --- a/www/libwww/Makefile +++ b/www/libwww/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2001/11/29 19:46:13 jlam Exp $ +# $NetBSD: Makefile,v 1.30.2.1 2002/06/23 19:04:05 jlam Exp $ DISTNAME= w3c-libwww-5.3.2 PKGNAME= libwww-5.3.2 @@ -17,7 +17,6 @@ BUILD_DEPENDS+= perl>=${PERL5_REQD}:../../lang/perl5 USE_BUILDLINK_ONLY= YES USE_GMAKE= YES USE_LIBTOOL= YES -#USE_SSL= YES GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-zlib --with-regex --without-x diff --git a/www/libwww/patches/patch-ah b/www/libwww/patches/patch-ah index e849f2bcfd0..caaebb5f31f 100644 --- a/www/libwww/patches/patch-ah +++ b/www/libwww/patches/patch-ah @@ -1,3 +1,4 @@ +$NetBSD: patch-ah,v 1.3.2.1 2002/06/23 19:04:05 jlam Exp $ --- configure.in.orig Thu Dec 14 11:49:06 2000 +++ configure.in Tue Aug 28 17:09:57 2001 @@ -213,7 +213,12 @@ diff --git a/www/libwww/patches/patch-aj b/www/libwww/patches/patch-aj index 5b80bd82636..3e7b95cee57 100644 --- a/www/libwww/patches/patch-aj +++ b/www/libwww/patches/patch-aj @@ -1,3 +1,4 @@ +$NetBSD: patch-aj,v 1.1.2.1 2002/06/23 19:04:06 jlam Exp $ --- acinclude.m4.orig Tue Aug 28 14:56:47 2001 +++ acinclude.m4 Tue Aug 28 14:58:27 2001 @@ -251,19 +251,6 @@ diff --git a/www/links-gui/DESCR b/www/links-gui/DESCR new file mode 100644 index 00000000000..1460bc1c40d --- /dev/null +++ b/www/links-gui/DESCR @@ -0,0 +1,3 @@ +Lynx-like text and graphics WWW browser, supporting frames, tables +and JavaScript, displaying pages during download, background downloads +and more. diff --git a/www/links-gui/Makefile b/www/links-gui/Makefile new file mode 100644 index 00000000000..63b738e43fb --- /dev/null +++ b/www/links-gui/Makefile @@ -0,0 +1,18 @@ +# $NetBSD: Makefile,v 1.2.2.2 2002/06/23 19:04:10 jlam Exp $ +# + +PKGNAME= links-gui-2.0 +COMMENT= Lynx-like text and graphics WWW browser + +CONFLICTS+= links-[0-9]* + +USE_BUILDLINK2= YES + +.include "../../www/links/Makefile.common" + +CONFIGURE_ARGS+= --enable-graphics + +.include "../../graphics/png/buildlink2.mk" +.include "../../graphics/tiff/buildlink2.mk" + +.include "../../mk/bsd.pkg.mk" diff --git a/www/links-gui/distinfo b/www/links-gui/distinfo new file mode 100644 index 00000000000..8da05d02df1 --- /dev/null +++ b/www/links-gui/distinfo @@ -0,0 +1,4 @@ +$NetBSD: distinfo,v 1.1.1.1.2.2 2002/06/23 19:04:10 jlam Exp $ + +SHA1 (links-2.0.tar.bz2) = c4584e728ebbb5ef60aab6d661a2d865445c451d +Size (links-2.0.tar.bz2) = 3499871 bytes diff --git a/www/links/DESCR b/www/links/DESCR index b887398630e..03069d3ae4e 100644 --- a/www/links/DESCR +++ b/www/links/DESCR @@ -1,2 +1,2 @@ -Lynx-like text WWW browser, supporting frames and tables, displaying -pages during download, background downloads and more. +Lynx-like text WWW browser, supporting frames, tables and JavaScript, +displaying pages during download, background downloads and more. diff --git a/www/links/Makefile b/www/links/Makefile index a0ee0f15811..265ddda82af 100644 --- a/www/links/Makefile +++ b/www/links/Makefile @@ -1,20 +1,12 @@ -# $NetBSD: Makefile,v 1.8.2.2 2002/06/21 23:05:48 jlam Exp $ +# $NetBSD: Makefile,v 1.8.2.3 2002/06/23 19:04:08 jlam Exp $ # -DISTNAME= links-0.96 -CATEGORIES= www -MASTER_SITES= http://artax.karlin.mff.cuni.cz/~mikulas/links/download/ \ - http://www.add.com.pl/links/download/ \ - http://ice.dammit.lt/links/download/ \ - http://mirrors.oven.com/links/ \ - http://links.sourceforge.net/download/ - -MAINTAINER= wiz@netbsd.org -HOMEPAGE= http://artax.karlin.mff.cuni.cz/~mikulas/links/ +PKGNAME= links-2.0 COMMENT= Lynx-like text WWW browser -GNU_CONFIGURE= YES +CONFLICTS+= links-gui-[0-9]* + USE_BUILDLINK2= YES -.include "../../security/openssl/buildlink2.mk" +.include "../../www/links/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/www/links/Makefile.common b/www/links/Makefile.common new file mode 100644 index 00000000000..37ec2a69977 --- /dev/null +++ b/www/links/Makefile.common @@ -0,0 +1,20 @@ +# $NetBSD: Makefile.common,v 1.1.2.2 2002/06/23 19:04:08 jlam Exp $ +# + +DISTNAME= links-2.0 +CATEGORIES= www +MASTER_SITES= \ + http://atrey.karlin.mff.cuni.cz/~clock/twibright/links/download/ \ + http://artax.karlin.mff.cuni.cz/~mikulas/links/download/ \ + ftp://atrey.karlin.mff.cuni.cz/pub/local/clock/links/ +EXTRACT_SUFX= .tar.bz2 + +MAINTAINER= jschauma@netbsd.org +HOMEPAGE= http://atrey.karlin.mff.cuni.cz/~clock/twibright/links/ + +GNU_CONFIGURE= YES +CONFIGURE_ARGS+= --enable-javascript + +PLIST_SRC= ${.CURDIR}/../../www/links/PLIST + +.include "../../security/openssl/buildlink2.mk" diff --git a/www/links/distinfo b/www/links/distinfo index d587e115f87..5a1c66991df 100644 --- a/www/links/distinfo +++ b/www/links/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2001/07/10 12:06:41 wiz Exp $ +$NetBSD: distinfo,v 1.3.2.1 2002/06/23 19:04:08 jlam Exp $ -SHA1 (links-0.96.tar.gz) = 4d160bf58ff1491aa19897c49504294912aa9cdb -Size (links-0.96.tar.gz) = 485442 bytes +SHA1 (links-2.0.tar.bz2) = c4584e728ebbb5ef60aab6d661a2d865445c451d +Size (links-2.0.tar.bz2) = 3499871 bytes diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile index bbec56919c6..3191501e8ad 100644 --- a/www/lynx-current/Makefile +++ b/www/lynx-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2002/05/04 17:06:48 fredb Exp $ +# $NetBSD: Makefile,v 1.38.2.1 2002/06/23 19:04:11 jlam Exp $ # DISTNAME= lynx2.8.5dev.7 @@ -15,14 +15,13 @@ HOMEPAGE= http://lynx.browser.org/ COMMENT= Alphanumeric display oriented World-Wide Web Client BUILD_USES_MSGFMT= yes +USE_BUILDLINK_ONLY= yes WRKSRC= ${WRKDIR}/lynx2-8-5 USE_BUILDLINK_ONLY= yes GNU_CONFIGURE= yes USE_GMAKE= yes -USE_LIBINTL= yes -USE_SSL= yes INSTALL_TARGET= install-full install-lss MAKEFILE= makefile diff --git a/www/mknmz-wwwoffle/DESCR b/www/mknmz-wwwoffle/DESCR new file mode 100644 index 00000000000..369310b4173 --- /dev/null +++ b/www/mknmz-wwwoffle/DESCR @@ -0,0 +1,2 @@ +mknmz-wwwoffle enables namazu to handle wwwoffle's HTTP cache index +directory. diff --git a/www/mknmz-wwwoffle/Makefile b/www/mknmz-wwwoffle/Makefile new file mode 100644 index 00000000000..002860dd13f --- /dev/null +++ b/www/mknmz-wwwoffle/Makefile @@ -0,0 +1,19 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 19:04:13 jlam Exp $ +# + +DISTNAME= mknmz-wwwoffle-0.7.0 +CATEGORIES= japanese www +MASTER_SITES= http://www.naney.org/comp/distrib/mknmz-wwwoffle/archive/ + +MAINTAINER= kei@netbsd.org +HOMEPAGE= http://www.naney.org/comp/distrib/mknmz-wwwoffle/index.html +COMMENT= full text indexing and searching system for wwwoffle's cache directory + +DEPENDS+= namazu>=2.0.5:../../textproc/namazu2 +DEPENDS+= wwwoffle>=2.6:../../www/wwwoffle + +USE_PERL5= # defined +GNU_CONFIGURE= # defined +CONFIG_ARGS+= --prefix=${PREFIX}/share/namazu + +.include "../../mk/bsd.pkg.mk" diff --git a/www/mknmz-wwwoffle/PLIST b/www/mknmz-wwwoffle/PLIST new file mode 100644 index 00000000000..17ce27acda3 --- /dev/null +++ b/www/mknmz-wwwoffle/PLIST @@ -0,0 +1,4 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.50.2 2002/06/23 19:04:13 jlam Exp $ +bin/mknmz-wwwoffle +man/man1/mknmz-wwwoffle.1 +share/namazu/filter/wwwofflecache.pl diff --git a/www/mknmz-wwwoffle/distinfo b/www/mknmz-wwwoffle/distinfo new file mode 100644 index 00000000000..fa9c2c812b5 --- /dev/null +++ b/www/mknmz-wwwoffle/distinfo @@ -0,0 +1,4 @@ +$NetBSD: distinfo,v 1.1.1.1.12.2 2002/06/23 19:04:14 jlam Exp $ + +SHA1 (mknmz-wwwoffle-0.7.0.tar.gz) = e1afdf5f753ff1daed51c2b961357b73268e707a +Size (mknmz-wwwoffle-0.7.0.tar.gz) = 45777 bytes diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile index 1f0bb17b45d..5b8d65e47a9 100644 --- a/www/mozilla/Makefile +++ b/www/mozilla/Makefile @@ -1,13 +1,11 @@ -# $NetBSD: Makefile,v 1.84 2002/05/07 23:45:49 taya Exp $ +# $NetBSD: Makefile,v 1.84.2.1 2002/06/23 19:04:15 jlam Exp $ -MOZ_VER= 1.0rc1 -DISTNAME= mozilla-source-1.0.rc1 +MOZ_VER= 1.0 +DISTNAME= mozilla-source-${MOZ_VER} PKGNAME= mozilla-${MOZ_VER} -PKGREVISION= 1 WRKSRC= ${WRKDIR}/mozilla CATEGORIES= www -MASTER_SITES= ftp://ftp.mozilla.org/pub/mozilla/releases/mozilla${MOZ_VER}/src/ \ - ftp://ftp.fu-berlin.de/pub/unix/network/www/mozilla/releases/mozilla${MOZ_VER}/src/ +MASTER_SITES= ${MASTER_SITE_MOZILLA:=mozilla${MOZ_VER}/src/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= taya@netbsd.org @@ -41,7 +39,7 @@ ALL_TARGET= ONLY_FOR_PLATFORM= NetBSD-1.4[Y-Z]-i386 NetBSD-1.4Z[A-Z]-i386 \ NetBSD-1.5_ALPHA-i386 NetBSD-1.5_BETA-* \ - NetBSD-1.[5-9]*-* Linux-*-* + NetBSD-1.[5-9]*-* Linux-*-* SunOS-*-* MOZ_LIBDIR= ${PREFIX}/lib/mozilla MAKE_ENV+= LIBRUNPATH=${MOZ_LIBDIR} @@ -50,6 +48,10 @@ MAKE_ENV+= MOZ_INTERNAL_LIBART_LGPL=1 CONFIGURE_ENV+= MOZ_INTERNAL_LIBART_LGPL=1 LDFLAGS+= -Wl,-R${MOZ_LIBDIR} +# avoid creating a .mozilla directory in the users home +# directory +SCRIPTS_ENV+= HOME="${WRKDIR}" + PLIST_SRC= ${PKGDIR}/PLIST-${OBJECT_FMT} SCRIPTS_ENV+= OBJECT_FMT=${OBJECT_FMT} diff --git a/www/mozilla/PLIST-ELF b/www/mozilla/PLIST-ELF index 10e3c064d15..a6a5f45afe8 100644 --- a/www/mozilla/PLIST-ELF +++ b/www/mozilla/PLIST-ELF @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST-ELF,v 1.7 2002/04/25 15:52:44 taya Exp $ +@comment $NetBSD: PLIST-ELF,v 1.7.2.1 2002/06/23 19:04:15 jlam Exp $ bin/mozilla @comment begin PROGRAMS lib/mozilla/dirver @@ -258,6 +258,7 @@ lib/mozilla/components/nsDictionary.js lib/mozilla/components/nsDownloadProgressListener.js lib/mozilla/components/nsFilePicker.js lib/mozilla/components/nsHelperAppDlg.js +lib/mozilla/components/nsKillAll.js lib/mozilla/components/nsLDAPPrefsService.js lib/mozilla/components/nsProgressDialog.js lib/mozilla/components/nsProxyAutoConfig.js @@ -849,6 +850,7 @@ include/mozilla/docshell/nsIWebPageDescriptor.h include/mozilla/dom/domstubs.h include/mozilla/dom/nsDOMCID.h include/mozilla/dom/nsDOMError.h +include/mozilla/dom/nsIBaseDOMException.h include/mozilla/dom/nsIDOM3Node.h include/mozilla/dom/nsIDOMAbstractView.h include/mozilla/dom/nsIDOMAttr.h @@ -1006,6 +1008,7 @@ include/mozilla/dom/nsIDOMPluginArray.h include/mozilla/dom/nsIDOMProcessingInstruction.h include/mozilla/dom/nsIDOMRGBColor.h include/mozilla/dom/nsIDOMRange.h +include/mozilla/dom/nsIDOMRangeException.h include/mozilla/dom/nsIDOMRect.h include/mozilla/dom/nsIDOMSVGAnimPresAspRatio.h include/mozilla/dom/nsIDOMSVGAnimTransformList.h @@ -1816,6 +1819,7 @@ include/mozilla/msgsmime/nsSMimeJSHelper.h include/mozilla/necko/mozITXTToHTMLConv.h include/mozilla/necko/netCore.h include/mozilla/necko/nsCPasswordManager.h +include/mozilla/necko/nsCPasswordManagerInternal.h include/mozilla/necko/nsHTTPChunkConv.h include/mozilla/necko/nsIAboutModule.h include/mozilla/necko/nsIAuthPrompt.h @@ -1879,6 +1883,8 @@ include/mozilla/necko/nsISecretDecoderRing.h include/mozilla/necko/nsISecureBrowserUI.h include/mozilla/necko/nsISecurityEventSink.h include/mozilla/necko/nsISecurityManagerComponent.h +include/mozilla/necko/nsISimpleStreamListener.h +include/mozilla/necko/nsISimpleStreamProvider.h include/mozilla/necko/nsISocketProvider.h include/mozilla/necko/nsISocketProviderService.h include/mozilla/necko/nsISocketTransport.h @@ -1889,8 +1895,11 @@ include/mozilla/necko/nsIStreamConverterService.h include/mozilla/necko/nsIStreamIO.h include/mozilla/necko/nsIStreamIOChannel.h include/mozilla/necko/nsIStreamListener.h +include/mozilla/necko/nsIStreamListenerProxy.h +include/mozilla/necko/nsIStreamListenerTee.h include/mozilla/necko/nsIStreamLoader.h include/mozilla/necko/nsIStreamProvider.h +include/mozilla/necko/nsIStreamProviderProxy.h include/mozilla/necko/nsITXTToHTMLConv.h include/mozilla/necko/nsITransport.h include/mozilla/necko/nsITransportSecurityInfo.h @@ -2083,6 +2092,7 @@ include/mozilla/pippki/nsIASN1Tree.h include/mozilla/pippki/nsIPKIParamBlock.h include/mozilla/plugin/npapi.h include/mozilla/plugin/npupp.h +include/mozilla/plugin/nsDefaultPlugin.h include/mozilla/plugin/nsICookieStorage.h include/mozilla/plugin/nsIEventHandler.h include/mozilla/plugin/nsIFileUtilities.h @@ -2169,7 +2179,6 @@ include/mozilla/shistory/nsISHistoryInternal.h include/mozilla/shistory/nsISHistoryListener.h include/mozilla/sidebar/nsISidebar.h include/mozilla/string/nsAFlatString.h -include/mozilla/string/nsAPromiseString.h include/mozilla/string/nsASingleFragmentString.h include/mozilla/string/nsAString.h include/mozilla/string/nsAStringGenerator.h @@ -2500,6 +2509,7 @@ include/mozilla/xpcom/nsIThreadPool.h include/mozilla/xpcom/nsITimelineService.h include/mozilla/xpcom/nsITimer.h include/mozilla/xpcom/nsITimerCallback.h +include/mozilla/xpcom/nsITimerManager.h include/mozilla/xpcom/nsIUnicharBuffer.h include/mozilla/xpcom/nsIUnicharInputStream.h include/mozilla/xpcom/nsIVariant.h @@ -2596,6 +2606,7 @@ include/mozilla/zlib/zlib.h @unexec rm %D/lib/mozilla/component.reg @unexec rm %D/lib/mozilla/chrome/chrome.rdf @unexec rm %D/lib/mozilla/chrome/overlayinfo/communicator/content/overlays.rdf +@unexec rm %D/lib/mozilla/chrome/overlayinfo/cookie/content/overlays.rdf @unexec rm %D/lib/mozilla/chrome/overlayinfo/editor/content/overlays.rdf @unexec rm %D/lib/mozilla/chrome/overlayinfo/messenger/content/overlays.rdf @unexec rm %D/lib/mozilla/chrome/overlayinfo/navigator/content/overlays.rdf @@ -2609,6 +2620,8 @@ include/mozilla/zlib/zlib.h @dirrm lib/mozilla/chrome/overlayinfo/inspector @dirrm lib/mozilla/chrome/overlayinfo/editor/content @dirrm lib/mozilla/chrome/overlayinfo/editor +@dirrm lib/mozilla/chrome/overlayinfo/cookie/content +@dirrm lib/mozilla/chrome/overlayinfo/cookie @dirrm lib/mozilla/chrome/overlayinfo/communicator/content @dirrm lib/mozilla/chrome/overlayinfo/communicator @dirrm lib/mozilla/chrome/overlayinfo diff --git a/www/mozilla/PLIST-a.out b/www/mozilla/PLIST-a.out index 62ec0bcd0c5..4177b5378f7 100644 --- a/www/mozilla/PLIST-a.out +++ b/www/mozilla/PLIST-a.out @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST-a.out,v 1.7 2002/04/25 15:52:45 taya Exp $ +@comment $NetBSD: PLIST-a.out,v 1.7.2.1 2002/06/23 19:04:17 jlam Exp $ bin/mozilla @comment begin PROGRAMS lib/mozilla/dirver @@ -258,6 +258,7 @@ lib/mozilla/components/nsDictionary.js lib/mozilla/components/nsDownloadProgressListener.js lib/mozilla/components/nsFilePicker.js lib/mozilla/components/nsHelperAppDlg.js +lib/mozilla/components/nsKillAll.js lib/mozilla/components/nsLDAPPrefsService.js lib/mozilla/components/nsProgressDialog.js lib/mozilla/components/nsProxyAutoConfig.js @@ -849,6 +850,7 @@ include/mozilla/docshell/nsIWebPageDescriptor.h include/mozilla/dom/domstubs.h include/mozilla/dom/nsDOMCID.h include/mozilla/dom/nsDOMError.h +include/mozilla/dom/nsIBaseDOMException.h include/mozilla/dom/nsIDOM3Node.h include/mozilla/dom/nsIDOMAbstractView.h include/mozilla/dom/nsIDOMAttr.h @@ -1006,6 +1008,7 @@ include/mozilla/dom/nsIDOMPluginArray.h include/mozilla/dom/nsIDOMProcessingInstruction.h include/mozilla/dom/nsIDOMRGBColor.h include/mozilla/dom/nsIDOMRange.h +include/mozilla/dom/nsIDOMRangeException.h include/mozilla/dom/nsIDOMRect.h include/mozilla/dom/nsIDOMSVGAnimPresAspRatio.h include/mozilla/dom/nsIDOMSVGAnimTransformList.h @@ -1816,6 +1819,7 @@ include/mozilla/msgsmime/nsSMimeJSHelper.h include/mozilla/necko/mozITXTToHTMLConv.h include/mozilla/necko/netCore.h include/mozilla/necko/nsCPasswordManager.h +include/mozilla/necko/nsCPasswordManagerInternal.h include/mozilla/necko/nsHTTPChunkConv.h include/mozilla/necko/nsIAboutModule.h include/mozilla/necko/nsIAuthPrompt.h @@ -1879,6 +1883,8 @@ include/mozilla/necko/nsISecretDecoderRing.h include/mozilla/necko/nsISecureBrowserUI.h include/mozilla/necko/nsISecurityEventSink.h include/mozilla/necko/nsISecurityManagerComponent.h +include/mozilla/necko/nsISimpleStreamListener.h +include/mozilla/necko/nsISimpleStreamProvider.h include/mozilla/necko/nsISocketProvider.h include/mozilla/necko/nsISocketProviderService.h include/mozilla/necko/nsISocketTransport.h @@ -1889,8 +1895,11 @@ include/mozilla/necko/nsIStreamConverterService.h include/mozilla/necko/nsIStreamIO.h include/mozilla/necko/nsIStreamIOChannel.h include/mozilla/necko/nsIStreamListener.h +include/mozilla/necko/nsIStreamListenerProxy.h +include/mozilla/necko/nsIStreamListenerTee.h include/mozilla/necko/nsIStreamLoader.h include/mozilla/necko/nsIStreamProvider.h +include/mozilla/necko/nsIStreamProviderProxy.h include/mozilla/necko/nsITXTToHTMLConv.h include/mozilla/necko/nsITransport.h include/mozilla/necko/nsITransportSecurityInfo.h @@ -2083,6 +2092,7 @@ include/mozilla/pippki/nsIASN1Tree.h include/mozilla/pippki/nsIPKIParamBlock.h include/mozilla/plugin/npapi.h include/mozilla/plugin/npupp.h +include/mozilla/plugin/nsDefaultPlugin.h include/mozilla/plugin/nsICookieStorage.h include/mozilla/plugin/nsIEventHandler.h include/mozilla/plugin/nsIFileUtilities.h @@ -2169,7 +2179,6 @@ include/mozilla/shistory/nsISHistoryInternal.h include/mozilla/shistory/nsISHistoryListener.h include/mozilla/sidebar/nsISidebar.h include/mozilla/string/nsAFlatString.h -include/mozilla/string/nsAPromiseString.h include/mozilla/string/nsASingleFragmentString.h include/mozilla/string/nsAString.h include/mozilla/string/nsAStringGenerator.h @@ -2500,6 +2509,7 @@ include/mozilla/xpcom/nsIThreadPool.h include/mozilla/xpcom/nsITimelineService.h include/mozilla/xpcom/nsITimer.h include/mozilla/xpcom/nsITimerCallback.h +include/mozilla/xpcom/nsITimerManager.h include/mozilla/xpcom/nsIUnicharBuffer.h include/mozilla/xpcom/nsIUnicharInputStream.h include/mozilla/xpcom/nsIVariant.h @@ -2596,6 +2606,7 @@ include/mozilla/zlib/zlib.h @unexec rm %D/lib/mozilla/component.reg @unexec rm %D/lib/mozilla/chrome/chrome.rdf @unexec rm %D/lib/mozilla/chrome/overlayinfo/communicator/content/overlays.rdf +@unexec rm %D/lib/mozilla/chrome/overlayinfo/cookie/content/overlays.rdf @unexec rm %D/lib/mozilla/chrome/overlayinfo/editor/content/overlays.rdf @unexec rm %D/lib/mozilla/chrome/overlayinfo/messenger/content/overlays.rdf @unexec rm %D/lib/mozilla/chrome/overlayinfo/navigator/content/overlays.rdf @@ -2609,6 +2620,8 @@ include/mozilla/zlib/zlib.h @dirrm lib/mozilla/chrome/overlayinfo/inspector @dirrm lib/mozilla/chrome/overlayinfo/editor/content @dirrm lib/mozilla/chrome/overlayinfo/editor +@dirrm lib/mozilla/chrome/overlayinfo/cookie/content +@dirrm lib/mozilla/chrome/overlayinfo/cookie @dirrm lib/mozilla/chrome/overlayinfo/communicator/content @dirrm lib/mozilla/chrome/overlayinfo/communicator @dirrm lib/mozilla/chrome/overlayinfo diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo index ad0c0a4e67f..fe75c853258 100644 --- a/www/mozilla/distinfo +++ b/www/mozilla/distinfo @@ -1,18 +1,15 @@ -$NetBSD: distinfo,v 1.18 2002/05/07 23:45:49 taya Exp $ +$NetBSD: distinfo,v 1.18.2.1 2002/06/23 19:04:18 jlam Exp $ -SHA1 (mozilla-source-1.0.rc1.tar.bz2) = ae20fe87f9d7fe33e97897525e21be9580949cee -Size (mozilla-source-1.0.rc1.tar.bz2) = 29528701 bytes -SHA1 (patch-ab) = 514da032af71d01d8f5fa8a22530bef114a16641 -SHA1 (patch-aw) = e19620cacb571b928513f7315d661081e00627bb -SHA1 (patch-az) = 27427ef1f8125333f41a62906d3c4d536bd27a30 -SHA1 (patch-ba) = edd3ee1640df437ee0e1a6230acc6173c5c6cee0 -SHA1 (patch-bb) = 5a5b3d732ca7ef76c4a414aea473ca20d799ba5c -SHA1 (patch-bc) = a309e2a614ec252c4df6898a8abb069edad7cb67 -SHA1 (patch-be) = 686e6b61d1a64229a6853408945dd182b4e83c35 -SHA1 (patch-bf) = e73cfdaf6b53d0cd5706629651d6bf5e901c3777 -SHA1 (patch-bg) = 716c4bdc68844c6c44f67b148697ca38fac578f4 -SHA1 (patch-bh) = f6b22f6df0c330ca807926263fdf48ed89106df1 -SHA1 (patch-bi) = 9fe409b736dc98eded947d3b7ee1792b174ef9e9 -SHA1 (patch-bj) = 5693349418802026d861c1f10b1addfc4f71cc7f -SHA1 (patch-bk) = e45a7a1a42283cbc774c525dd0853863ccbc66f1 -SHA1 (patch-security_fix) = c8c75e6ebd1ebe38857363bed247268b53340d12 +SHA1 (mozilla-source-1.0.tar.bz2) = 92d44f3196dca3182ffe64414fc0a574a5aa7416 +Size (mozilla-source-1.0.tar.bz2) = 29620700 bytes +SHA1 (patch-ab) = 62041f6d8150eaee552f3b02cb1757ee691bd5e1 +SHA1 (patch-aw) = d0e738f5ed84aaf390de56a6d741de0e8ee69d3a +SHA1 (patch-ba) = f165b8b82e5d1f89ae7af12cf93566e116391f77 +SHA1 (patch-bb) = cff7139dd754fb9c800839b54c7697eb3fd32f93 +SHA1 (patch-bc) = cb1cb5b6e2010f561042e16e184abc5870f41c72 +SHA1 (patch-be) = 230639b8f5a2f9d228fbc1ac6fdb71c83bd5379b +SHA1 (patch-bf) = 9d594a9eec7d396d93c8cee0b911c4c89a67a335 +SHA1 (patch-bh) = 2b2067c7306d5da3e924f99ea603092c22c3d035 +SHA1 (patch-bi) = 8d0707e1f5d098af5a19147c4b840a0479e55717 +SHA1 (patch-bj) = c1238a549620911415738a11c840309a7230b08a +SHA1 (patch-bk) = 3d1437036169c5788dbc70526841f421aa67cb97 diff --git a/www/mozilla/patches/patch-ab b/www/mozilla/patches/patch-ab index 718db27671a..50abf078d4d 100644 --- a/www/mozilla/patches/patch-ab +++ b/www/mozilla/patches/patch-ab @@ -1,9 +1,9 @@ -$NetBSD: patch-ab,v 1.21 2002/04/25 15:52:46 taya Exp $ +$NetBSD: patch-ab,v 1.21.2.1 2002/06/23 19:04:18 jlam Exp $ -diff -ru ../mozilla-current.orig/mozilla/configure.in ./configure.in ---- ../mozilla-current.orig/mozilla/configure.in Sat Apr 6 23:46:35 2002 -+++ ./configure.in Sun Apr 7 01:18:18 2002 -@@ -1016,6 +1016,13 @@ +diff -ru ../Orig/mozilla/configure.in ./configure.in +--- ../Orig/mozilla/configure.in Tue May 28 04:29:12 2002 ++++ ./configure.in Thu Jun 6 09:13:17 2002 +@@ -1014,6 +1014,13 @@ if test "$LIBRUNPATH"; then DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS" fi diff --git a/www/mozilla/patches/patch-aw b/www/mozilla/patches/patch-aw index 30e3699f6b8..5dc85328734 100644 --- a/www/mozilla/patches/patch-aw +++ b/www/mozilla/patches/patch-aw @@ -1,8 +1,8 @@ -$NetBSD: patch-aw,v 1.10 2002/04/25 15:52:46 taya Exp $ +$NetBSD: patch-aw,v 1.10.2.1 2002/06/23 19:04:19 jlam Exp $ -diff -ru ../mozilla-current.orig/mozilla/widget/src/gtksuperwin/Makefile.in ./widget/src/gtksuperwin/Makefile.in ---- ../mozilla-current.orig/mozilla/widget/src/gtksuperwin/Makefile.in Sun Oct 28 20:02:37 2001 -+++ ./widget/src/gtksuperwin/Makefile.in Sun Apr 7 01:18:30 2002 +diff -ru ../Orig/mozilla/widget/src/gtksuperwin/Makefile.in ./widget/src/gtksuperwin/Makefile.in +--- ../Orig/mozilla/widget/src/gtksuperwin/Makefile.in Wed Apr 10 12:35:09 2002 ++++ ./widget/src/gtksuperwin/Makefile.in Thu Jun 6 09:13:20 2002 @@ -25,6 +25,7 @@ MODULE = widget LIBRARY_NAME = gtksuperwin diff --git a/www/mozilla/patches/patch-az b/www/mozilla/patches/patch-az deleted file mode 100644 index a27fff606f1..00000000000 --- a/www/mozilla/patches/patch-az +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-az,v 1.8 2002/04/25 15:52:46 taya Exp $ - -diff -ru ../mozilla-current.orig/mozilla/directory/c-sdk/ldap/include/portable.h ./directory/c-sdk/ldap/include/portable.h ---- ../mozilla-current.orig/mozilla/directory/c-sdk/ldap/include/portable.h Wed Apr 3 00:31:24 2002 -+++ ./directory/c-sdk/ldap/include/portable.h Sun Apr 7 01:18:35 2002 -@@ -116,7 +116,7 @@ - * some systems don't have the BSD re_comp and re_exec routines - */ - #ifndef NEED_BSDREGEX --#if ( defined( SYSV ) || defined( VMS ) || defined( netbsd ) || defined( freebsd ) || defined( linux ) || defined( DARWIN )) && !defined(sgi) -+#if ( defined( SYSV ) || defined( VMS ) || defined( NETBSD ) || defined( freebsd ) || defined( linux ) || defined( DARWIN )) && !defined(sgi) - #define NEED_BSDREGEX - #endif - #endif diff --git a/www/mozilla/patches/patch-ba b/www/mozilla/patches/patch-ba index 5f47bb1a3e5..e9135ff8c1a 100644 --- a/www/mozilla/patches/patch-ba +++ b/www/mozilla/patches/patch-ba @@ -1,8 +1,8 @@ -$NetBSD: patch-ba,v 1.7 2002/04/25 15:52:46 taya Exp $ +$NetBSD: patch-ba,v 1.7.2.1 2002/06/23 19:04:20 jlam Exp $ -diff -ru ../mozilla-current.orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include/md/_netbsd.cfg ---- ../mozilla-current.orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg Thu Aug 23 22:31:15 2001 -+++ ./nsprpub/pr/include/md/_netbsd.cfg Sun Apr 7 01:18:38 2002 +diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include/md/_netbsd.cfg +--- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg Wed Apr 10 12:16:42 2002 ++++ ./nsprpub/pr/include/md/_netbsd.cfg Thu Jun 6 09:13:25 2002 @@ -91,6 +91,52 @@ #define PR_ALIGN_OF_DOUBLE 4 #define PR_ALIGN_OF_POINTER 4 diff --git a/www/mozilla/patches/patch-bb b/www/mozilla/patches/patch-bb index 2a7da33aa2c..49382466360 100644 --- a/www/mozilla/patches/patch-bb +++ b/www/mozilla/patches/patch-bb @@ -1,8 +1,8 @@ -$NetBSD: patch-bb,v 1.7 2002/04/25 15:52:46 taya Exp $ +$NetBSD: patch-bb,v 1.7.2.1 2002/06/23 19:04:21 jlam Exp $ -diff -ru ../mozilla-current.orig/mozilla/nsprpub/pr/include/md/_netbsd.h ./nsprpub/pr/include/md/_netbsd.h ---- ../mozilla-current.orig/mozilla/nsprpub/pr/include/md/_netbsd.h Thu Aug 23 22:31:16 2001 -+++ ./nsprpub/pr/include/md/_netbsd.h Sun Apr 7 01:18:40 2002 +diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h ./nsprpub/pr/include/md/_netbsd.h +--- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h Wed Apr 10 12:16:43 2002 ++++ ./nsprpub/pr/include/md/_netbsd.h Thu Jun 6 09:13:29 2002 @@ -48,6 +48,8 @@ #define _PR_SI_ARCHITECTURE "m68k" #elif defined(__powerpc__) diff --git a/www/mozilla/patches/patch-bc b/www/mozilla/patches/patch-bc index 73755d83751..29745102524 100644 --- a/www/mozilla/patches/patch-bc +++ b/www/mozilla/patches/patch-bc @@ -1,8 +1,8 @@ -$NetBSD: patch-bc,v 1.7 2002/04/25 15:52:46 taya Exp $ +$NetBSD: patch-bc,v 1.7.2.1 2002/06/23 19:04:21 jlam Exp $ -diff -ru ../mozilla-current.orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/reflect/xptcall/src/md/unix/Makefile.in ---- ../mozilla-current.orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in Wed Apr 3 00:53:47 2002 -+++ ./xpcom/reflect/xptcall/src/md/unix/Makefile.in Sun Apr 7 01:18:50 2002 +diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/reflect/xptcall/src/md/unix/Makefile.in +--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in Wed Apr 10 12:37:34 2002 ++++ ./xpcom/reflect/xptcall/src/md/unix/Makefile.in Thu Jun 6 09:13:32 2002 @@ -254,6 +254,13 @@ CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s diff --git a/www/mozilla/patches/patch-be b/www/mozilla/patches/patch-be index e72f179ca9b..798a6075b50 100644 --- a/www/mozilla/patches/patch-be +++ b/www/mozilla/patches/patch-be @@ -1,8 +1,8 @@ -$NetBSD: patch-be,v 1.6 2002/04/25 15:52:46 taya Exp $ +$NetBSD: patch-be,v 1.6.2.1 2002/06/23 19:04:22 jlam Exp $ -diff -ru ../mozilla-current.orig/mozilla/nsprpub/pr/src/io/prsocket.c ./nsprpub/pr/src/io/prsocket.c ---- ../mozilla-current.orig/mozilla/nsprpub/pr/src/io/prsocket.c Sun Mar 17 20:00:21 2002 -+++ ./nsprpub/pr/src/io/prsocket.c Sun Apr 7 01:18:55 2002 +diff -ru ../Orig/mozilla/nsprpub/pr/src/io/prsocket.c ./nsprpub/pr/src/io/prsocket.c +--- ../Orig/mozilla/nsprpub/pr/src/io/prsocket.c Wed Apr 10 12:17:03 2002 ++++ ./nsprpub/pr/src/io/prsocket.c Thu Jun 6 09:13:34 2002 @@ -1299,6 +1299,15 @@ if (osfd == -1) { return 0; diff --git a/www/mozilla/patches/patch-bf b/www/mozilla/patches/patch-bf index 1a3a64ea0c2..c04d225901a 100644 --- a/www/mozilla/patches/patch-bf +++ b/www/mozilla/patches/patch-bf @@ -1,11 +1,9 @@ -$NetBSD: patch-bf,v 1.4 2002/04/25 15:52:46 taya Exp $ +$NetBSD: patch-bf,v 1.4.2.1 2002/06/23 19:04:22 jlam Exp $ -diff -ru ../mozilla-current.orig/mozilla/xpfe/browser/resources/locale/en-US/navigator.dtd ./xpfe/browser/resources/locale/en-US/navigator.dtd ---- ../mozilla-current.orig/mozilla/xpfe/browser/resources/locale/en-US/navigator.dtd Thu Apr 4 20:28:58 2002 -+++ ./xpfe/browser/resources/locale/en-US/navigator.dtd Sun Apr 7 01:18:57 2002 -@@ -4,9 +4,9 @@ - <!-- LOCALIZATION NOTE : FILE Do not translate accesskey and commandkey --> - +diff -ru ../Orig/mozilla/xpfe/browser/resources/locale/en-US/navigator-title.dtd ./xpfe/browser/resources/locale/en-US/navigator-title.dtd +--- ../Orig/mozilla/xpfe/browser/resources/locale/en-US/navigator-title.dtd Wed May 8 08:43:59 2002 ++++ ./xpfe/browser/resources/locale/en-US/navigator-title.dtd Thu Jun 6 09:13:39 2002 +@@ -1,6 +1,6 @@ <!-- LOCALIZATION NOTE (mainWindow.title): DONT_TRANSLATE --> -<!ENTITY mainWindow.title "&brandShortName; {&buildId.label;}"> +<!ENTITY mainWindow.title "&brandShortName;"> @@ -14,4 +12,3 @@ diff -ru ../mozilla-current.orig/mozilla/xpfe/browser/resources/locale/en-US/nav +<!ENTITY mainWindow.titlemodifier "&brandShortName;"> <!-- LOCALIZATION NOTE (mainWindow.titlemodifiermenuseparator): DONT_TRANSLATE --> <!ENTITY mainWindow.titlemodifiermenuseparator " - "> - <!ENTITY viewsourcetitle.preface "Source for: "> diff --git a/www/mozilla/patches/patch-bg b/www/mozilla/patches/patch-bg deleted file mode 100644 index 4446ceb3a0a..00000000000 --- a/www/mozilla/patches/patch-bg +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-bg,v 1.3 2002/04/25 15:52:46 taya Exp $ - -diff -ru ../mozilla-current.orig/mozilla/xpcom/threads/TimerThread.cpp ./xpcom/threads/TimerThread.cpp ---- ../mozilla-current.orig/mozilla/xpcom/threads/TimerThread.cpp Sun Mar 10 20:03:33 2002 -+++ ./xpcom/threads/TimerThread.cpp Sun Apr 7 01:18:59 2002 -@@ -46,7 +46,7 @@ - TimerThread::TimerThread() : - mLock(nsnull), - mCondVar(nsnull), -- mProcessing(PR_FALSE), -+ mProcessing(PR_TRUE), - mWaiting(PR_FALSE), - mDelayLineCounter(0), - mMinTimerPeriod(0), -@@ -184,7 +184,6 @@ - NS_IMETHODIMP TimerThread::Run() - { - nsAutoLock lock(mLock); -- mProcessing = PR_TRUE; - - while (mProcessing) { - PRIntervalTime now = PR_IntervalNow(); diff --git a/www/mozilla/patches/patch-bh b/www/mozilla/patches/patch-bh index 466ff3cc6b3..afd575cc4aa 100644 --- a/www/mozilla/patches/patch-bh +++ b/www/mozilla/patches/patch-bh @@ -1,8 +1,8 @@ -$NetBSD: patch-bh,v 1.2 2002/04/25 15:52:47 taya Exp $ +$NetBSD: patch-bh,v 1.2.2.1 2002/06/23 19:04:23 jlam Exp $ -diff -ru ../mozilla-current.orig/mozilla/security/nss/lib/ssl/sslmutex.c ./security/nss/lib/ssl/sslmutex.c ---- ../mozilla-current.orig/mozilla/security/nss/lib/ssl/sslmutex.c Thu Feb 28 20:00:25 2002 -+++ ./security/nss/lib/ssl/sslmutex.c Sun Apr 7 01:19:02 2002 +diff -ru ../Orig/mozilla/security/nss/lib/ssl/sslmutex.c ./security/nss/lib/ssl/sslmutex.c +--- ../Orig/mozilla/security/nss/lib/ssl/sslmutex.c Wed Apr 10 12:29:16 2002 ++++ ./security/nss/lib/ssl/sslmutex.c Thu Jun 6 09:13:42 2002 @@ -83,7 +83,7 @@ return SECSuccess; } diff --git a/www/mozilla/patches/patch-bi b/www/mozilla/patches/patch-bi index 55dcd070cd9..2474d73da53 100644 --- a/www/mozilla/patches/patch-bi +++ b/www/mozilla/patches/patch-bi @@ -1,8 +1,8 @@ -$NetBSD: patch-bi,v 1.2 2002/04/25 15:52:47 taya Exp $ +$NetBSD: patch-bi,v 1.2.2.1 2002/06/23 19:04:23 jlam Exp $ -diff -ru ../mozilla-current.orig/mozilla/security/nss/lib/ssl/sslmutex.h ./security/nss/lib/ssl/sslmutex.h ---- ../mozilla-current.orig/mozilla/security/nss/lib/ssl/sslmutex.h Thu Feb 28 20:00:25 2002 -+++ ./security/nss/lib/ssl/sslmutex.h Sun Apr 7 01:19:06 2002 +diff -ru ../Orig/mozilla/security/nss/lib/ssl/sslmutex.h ./security/nss/lib/ssl/sslmutex.h +--- ../Orig/mozilla/security/nss/lib/ssl/sslmutex.h Wed Apr 10 12:29:16 2002 ++++ ./security/nss/lib/ssl/sslmutex.h Thu Jun 6 09:13:46 2002 @@ -77,7 +77,7 @@ typedef int sslPID; diff --git a/www/mozilla/patches/patch-bj b/www/mozilla/patches/patch-bj index 95c5f2f00bc..1bf679d6a30 100644 --- a/www/mozilla/patches/patch-bj +++ b/www/mozilla/patches/patch-bj @@ -1,8 +1,8 @@ -$NetBSD: patch-bj,v 1.1 2002/04/25 15:52:47 taya Exp $ +$NetBSD: patch-bj,v 1.1.2.1 2002/06/23 19:04:23 jlam Exp $ -diff -ru ../mozilla-current.orig/mozilla/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c ./directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c ---- ../mozilla-current.orig/mozilla/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c Thu Apr 4 20:00:49 2002 -+++ ./directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c Sun Apr 7 11:01:47 2002 +diff -ru ../Orig/mozilla/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c ./directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c +--- ../Orig/mozilla/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c Sun Apr 14 20:15:10 2002 ++++ ./directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c Thu Jun 6 09:13:48 2002 @@ -186,6 +186,11 @@ #define EDEADLOCK -1 #endif diff --git a/www/mozilla/patches/patch-bk b/www/mozilla/patches/patch-bk index 3935947bea1..18f8225da15 100644 --- a/www/mozilla/patches/patch-bk +++ b/www/mozilla/patches/patch-bk @@ -1,8 +1,8 @@ -$NetBSD: patch-bk,v 1.1 2002/04/25 15:52:47 taya Exp $ +$NetBSD: patch-bk,v 1.1.2.1 2002/06/23 19:04:24 jlam Exp $ -diff -ru ../mozilla-current.orig/mozilla/directory/c-sdk/build.mk ./directory/c-sdk/build.mk ---- ../mozilla-current.orig/mozilla/directory/c-sdk/build.mk Thu Apr 4 20:00:46 2002 -+++ ./directory/c-sdk/build.mk Sun Apr 7 11:21:34 2002 +diff -ru ../Orig/mozilla/directory/c-sdk/build.mk ./directory/c-sdk/build.mk +--- ../Orig/mozilla/directory/c-sdk/build.mk Fri May 17 16:02:53 2002 ++++ ./directory/c-sdk/build.mk Thu Jun 6 09:13:52 2002 @@ -396,7 +396,7 @@ SO_FILES_TO_REMOVE=so_locations endif diff --git a/www/mozilla/patches/patch-security_fix b/www/mozilla/patches/patch-security_fix deleted file mode 100644 index 51f9ac2db5a..00000000000 --- a/www/mozilla/patches/patch-security_fix +++ /dev/null @@ -1,99 +0,0 @@ -$NetBSD: patch-security_fix,v 1.1 2002/05/07 23:45:50 taya Exp $ - -Index: uriloader/base/nsDocLoader.cpp -=================================================================== -RCS file: /cvsroot/mozilla/uriloader/base/nsDocLoader.cpp,v -retrieving revision 3.251 -diff -u -r3.251 nsDocLoader.cpp ---- uriloader/base/nsDocLoader.cpp 17 Apr 2002 03:48:37 -0000 3.251 -+++ uriloader/base/nsDocLoader.cpp 30 Apr 2002 19:02:19 -0000 -@@ -1263,6 +1263,7 @@ - rv = aNewChannel->GetURI(getter_AddRefs(newURI)); - if (NS_FAILED(rv)) return rv; - -+#ifdef HTTP_DOESNT_CALL_CHECKLOADURI - // verify that this is a legal redirect - nsCOMPtr<nsIScriptSecurityManager> securityManager = - do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); -@@ -1270,6 +1271,7 @@ - rv = securityManager->CheckLoadURI(oldURI, newURI, - nsIScriptSecurityManager::DISALLOW_FROM_MAIL); - if (NS_FAILED(rv)) return rv; -+#endif - - nsLoadFlags loadFlags = 0; - PRInt32 stateFlags = nsIWebProgressListener::STATE_REDIRECTING | -Index: netwerk/protocol/http/src/Makefile.in -=================================================================== -RCS file: /cvsroot/mozilla/netwerk/protocol/http/src/Makefile.in,v -retrieving revision 1.56 -diff -u -r1.56 Makefile.in ---- netwerk/protocol/http/src/Makefile.in 19 Apr 2002 22:25:18 -0000 1.56 -+++ netwerk/protocol/http/src/Makefile.in 30 Apr 2002 19:02:19 -0000 -@@ -36,6 +36,8 @@ - intl \ - exthandler \ - caps \ -+ xpconnect \ -+ js \ - $(NULL) - - CPPSRCS = \ -Index: netwerk/protocol/http/src/nsHttpChannel.cpp -=================================================================== -RCS file: /cvsroot/mozilla/netwerk/protocol/http/src/nsHttpChannel.cpp,v -retrieving revision 1.114 -diff -u -r1.114 nsHttpChannel.cpp ---- netwerk/protocol/http/src/nsHttpChannel.cpp 26 Apr 2002 22:50:50 -0000 1.114 -+++ netwerk/protocol/http/src/nsHttpChannel.cpp 30 Apr 2002 19:02:19 -0000 -@@ -34,6 +34,7 @@ - #include "nsISupportsPrimitives.h" - #include "nsIURL.h" - #include "nsIMIMEService.h" -+#include "nsIScriptSecurityManager.h" - #include "nsCExternalHandlerService.h" - #include "nsMimeTypes.h" - #include "nsNetUtil.h" -@@ -1465,6 +1466,15 @@ - rv = ioService->NewURI(nsDependentCString(location), nsnull, mURI, - getter_AddRefs(newURI)); - if (NS_FAILED(rv)) return rv; -+ -+ // verify that this is a legal redirect -+ nsCOMPtr<nsIScriptSecurityManager> securityManager = -+ do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID); -+ if (securityManager) { -+ rv = securityManager->CheckLoadURI(mURI, newURI, -+ nsIScriptSecurityManager::DISALLOW_FROM_MAIL); -+ if (NS_FAILED(rv)) return rv; -+ } - - // Kill the current cache entry if we are redirecting - // back to ourself. ---- htmlparser/src/CNavDTD.cpp.orig Sat May 4 00:32:17 2002 -+++ htmlparser/src/CNavDTD.cpp Sat May 4 01:14:59 2002 -@@ -473,14 +473,14 @@ - - nsresult result = NS_OK; - -- if (aTokenizer && mSink && aParser) { -+ if (aTokenizer && aParser) { - nsITokenizer* oldTokenizer = mTokenizer; - - mTokenizer = aTokenizer; - mParser = (nsParser*)aParser; - mTokenAllocator = mTokenizer->GetTokenAllocator(); - -- -+ if (mSink) { - if (mBodyContext->GetCount() == 0) { - CStartToken* theToken=nsnull; - if(ePlainText==mDocType) { -@@ -537,6 +537,7 @@ - } - }//while - mTokenizer = oldTokenizer; -+ } - } - - return result; diff --git a/www/navigator/Makefile.common b/www/navigator/Makefile.common index 97dffa91c3f..4c5f742fd30 100644 --- a/www/navigator/Makefile.common +++ b/www/navigator/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.47 2002/04/05 11:44:55 tron Exp $ +# $NetBSD: Makefile.common,v 1.47.2.1 2002/06/23 19:04:24 jlam Exp $ # # Common include file for communicator and navigator packages @@ -204,9 +204,6 @@ do-install: ${CHOWN} -R 0:0 ${MOZILLA_HOME} ${CHMOD} -R go-w ${MOZILLA_HOME} - cd ${MOZILLA_HOME} ; ${PATCH} -s < ${FILESDIR}/bookmarks.patch - @${RM} -f ${MOZILLA_HOME}/bookmark.htm.orig -f ${MOZILLA_HOME}/bookmark.htm~ - .endif .endif diff --git a/www/navigator/files/bookmarks.patch b/www/navigator/files/bookmarks.patch deleted file mode 100644 index b74667fc0ca..00000000000 --- a/www/navigator/files/bookmarks.patch +++ /dev/null @@ -1,8 +0,0 @@ -$NetBSD: bookmarks.patch,v 1.1 1999/10/19 18:30:26 abs Exp $ - ---- bookmark.htm Fri May 28 19:12:54 1999 -+++ bookmark.plusnetbsd Tue Oct 19 19:02:55 1999 -@@ -66,2 +66,3 @@ - <DT><H3>Computers and Internet</H3> - <DL><p> -+ <DT><A HREF="http://www.netbsd.org/">The NetBSD project</A> diff --git a/www/opera6/Makefile b/www/opera6/Makefile index 6aba3359014..b7ee6ca6728 100644 --- a/www/opera6/Makefile +++ b/www/opera6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8.2.2 2002/06/21 23:05:49 jlam Exp $ +# $NetBSD: Makefile,v 1.8.2.3 2002/06/23 19:04:26 jlam Exp $ DISTNAME= opera-${OPERA_PKG_VERSION} CATEGORIES= www @@ -7,7 +7,8 @@ MASTER_SITES= ftp://opera.panix.com/pub/linux/${OPERA_DIR}/ \ http://ftp.sunet.se/pub/www/clients/Opera/linux/${OPERA_DIR}/ \ http://ftp.opera.com/pub/opera/linux/${OPERA_DIR}/ \ http://opera.online.no/linux/${OPERA_DIR}/ \ - ftp://ftp.tuwien.ac.at/infosys/browsers/opera/linux/${OPERA_DIR}/ + ftp://ftp.tuwien.ac.at/infosys/browsers/opera/linux/${OPERA_DIR}/ \ + ftp://ftp.opera.com/pub/opera/linux/ EXTRACT_SUFX= .rpm DISTFILES= opera-${OPERA_DIST_VERSION}.${OPERA_ARCH}${EXTRACT_SUFX} @@ -29,7 +30,7 @@ USE_BUILDLINK2= # defined .include "../../mk/bsd.prefs.mk" # A default so lintpkgsrc is happy -OPERA_PKG_VERSION= 6.0 +OPERA_PKG_VERSION= 6.01 .if (${MACHINE_ARCH} == i386) DEPENDS+= suse_compat>=6.3:../../emulators/${SUSE_DIR_PREFIX}_compat @@ -38,9 +39,9 @@ DEPENDS+= suse_libpng>=6.4:../../emulators/${SUSE_DIR_PREFIX}_libpng DEPENDS+= suse_x11>=6.3:../../emulators/${SUSE_DIR_PREFIX}_x11 OPERA_ARCH= i386 -OPERA_DIR= 600/beta2 -OPERA_DIST_VERSION= 6.0-20020412.1-static-qt -OPERA_PKG_VERSION= 5.999.2 +OPERA_DIR= 601/final/en/qt_static +OPERA_DIST_VERSION= 6.01-20020523.1-static-qt +OPERA_PKG_VERSION= 6.01 .endif RPMFILES= ${DISTFILES} diff --git a/www/opera6/distinfo b/www/opera6/distinfo index 2ce3e9a51ed..458c8078147 100644 --- a/www/opera6/distinfo +++ b/www/opera6/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2002/04/18 18:01:04 tron Exp $ +$NetBSD: distinfo,v 1.3.2.1 2002/06/23 19:04:26 jlam Exp $ -SHA1 (./opera-6.0-20020412.1-static-qt.i386.rpm) = 713cb49f40a9c0bbfb3cba44ccff80f24fe1a0e7 -Size (./opera-6.0-20020412.1-static-qt.i386.rpm) = 4823326 bytes +SHA1 (./opera-6.01-20020523.1-static-qt.i386.rpm) = 4a2ea0df5979e0b3145bdfa4d0ea15b3cbb64fa7 +Size (./opera-6.01-20020523.1-static-qt.i386.rpm) = 4840045 bytes diff --git a/www/p5-HTML-FillInForm/Makefile b/www/p5-HTML-FillInForm/Makefile index 92fcd851e91..bf9d48e0af2 100644 --- a/www/p5-HTML-FillInForm/Makefile +++ b/www/p5-HTML-FillInForm/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.4 2002/04/17 12:02:39 shell Exp $ +# $NetBSD: Makefile,v 1.4.2.1 2002/06/23 19:04:27 jlam Exp $ -DISTNAME= HTML-FillInForm-0.26 +DISTNAME= HTML-FillInForm-0.29 PKGNAME= p5-${DISTNAME} SVR4_PKGNAME= p5hfi CATEGORIES= www perl5 diff --git a/www/p5-HTML-FillInForm/distinfo b/www/p5-HTML-FillInForm/distinfo index 4626e296ea3..e736b0e45b2 100644 --- a/www/p5-HTML-FillInForm/distinfo +++ b/www/p5-HTML-FillInForm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2002/04/17 12:02:39 shell Exp $ +$NetBSD: distinfo,v 1.2.2.1 2002/06/23 19:04:27 jlam Exp $ -SHA1 (HTML-FillInForm-0.26.tar.gz) = e8e84f7f679075a0841d14d64ed21fbc9c32ccb8 -Size (HTML-FillInForm-0.26.tar.gz) = 8728 bytes +SHA1 (HTML-FillInForm-0.29.tar.gz) = 88b033b7eb7346ff4e58d7aae05e24624d3653af +Size (HTML-FillInForm-0.29.tar.gz) = 9057 bytes diff --git a/www/p5-HTML-FixEntities/Makefile b/www/p5-HTML-FixEntities/Makefile index 2401a40e684..2630b168df5 100644 --- a/www/p5-HTML-FixEntities/Makefile +++ b/www/p5-HTML-FixEntities/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2002/02/01 16:18:58 abs Exp $ +# $NetBSD: Makefile,v 1.2.2.1 2002/06/23 19:04:28 jlam Exp $ -DISTNAME= HTML-FixEntities-1.01 +DISTNAME= HTML-FixEntities-1.02 PKGNAME= p5-${DISTNAME} CATEGORIES= www perl5 MASTER_SITES= http://www.mono.org/abs/tools/HTML-FixEntities/ diff --git a/www/p5-HTML-FixEntities/distinfo b/www/p5-HTML-FixEntities/distinfo index 4e32837f4fd..6fccdfdfcf7 100644 --- a/www/p5-HTML-FixEntities/distinfo +++ b/www/p5-HTML-FixEntities/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2002/02/01 16:18:58 abs Exp $ +$NetBSD: distinfo,v 1.2.2.1 2002/06/23 19:04:28 jlam Exp $ -SHA1 (HTML-FixEntities-1.01.tar.gz) = 482000b3dae7c2ee3dbd31cf59573c995ac322ed -Size (HTML-FixEntities-1.01.tar.gz) = 3163 bytes +SHA1 (HTML-FixEntities-1.02.tar.gz) = 0866fe2c9d5c4bf36eded529c837850a6065dfb4 +Size (HTML-FixEntities-1.02.tar.gz) = 3274 bytes diff --git a/www/p5-Template-Toolkit/Makefile b/www/p5-Template-Toolkit/Makefile index 957950eaf6f..cd1dd17c484 100644 --- a/www/p5-Template-Toolkit/Makefile +++ b/www/p5-Template-Toolkit/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2002/03/13 17:37:52 fredb Exp $ +# $NetBSD: Makefile,v 1.4.2.1 2002/06/23 19:04:29 jlam Exp $ # -DISTNAME= Template-Toolkit-2.04 +DISTNAME= Template-Toolkit-2.07 PKGNAME= p5-${DISTNAME} -PKGREVISION= 1 SVR4_PKGNAME= p5tto CATEGORIES= www perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Template/} @@ -31,6 +30,7 @@ USE_PERL5= # defined PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Template/.packlist do-configure: - @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL + @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \ + TT_PREFIX=${PREFIX}/share/tt2 TT_ACCEPT=y .include "../../mk/bsd.pkg.mk" diff --git a/www/p5-Template-Toolkit/PLIST b/www/p5-Template-Toolkit/PLIST index 7fca5e0c010..19b205e138e 100644 --- a/www/p5-Template-Toolkit/PLIST +++ b/www/p5-Template-Toolkit/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:18:17 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.1.2.1 2002/06/23 19:04:29 jlam Exp $ share/tt2/docs/README share/tt2/docs/html/FAQ/FAQ.html share/tt2/docs/html/FAQ/index.html @@ -37,6 +37,7 @@ share/tt2/docs/html/Modules/Template/Plugin/Date.html share/tt2/docs/html/Modules/Template/Plugin/Directory.html share/tt2/docs/html/Modules/Template/Plugin/Dumper.html share/tt2/docs/html/Modules/Template/Plugin/File.html +share/tt2/docs/html/Modules/Template/Plugin/Filter.html share/tt2/docs/html/Modules/Template/Plugin/Format.html share/tt2/docs/html/Modules/Template/Plugin/GD/Constants.html share/tt2/docs/html/Modules/Template/Plugin/GD/Graph/area.html @@ -57,6 +58,7 @@ share/tt2/docs/html/Modules/Template/Plugin/GD/Text/Wrap.html share/tt2/docs/html/Modules/Template/Plugin/HTML.html share/tt2/docs/html/Modules/Template/Plugin/Iterator.html share/tt2/docs/html/Modules/Template/Plugin/Pod.html +share/tt2/docs/html/Modules/Template/Plugin/String.html share/tt2/docs/html/Modules/Template/Plugin/Table.html share/tt2/docs/html/Modules/Template/Plugin/URL.html share/tt2/docs/html/Modules/Template/Plugin/View.html @@ -64,16 +66,20 @@ share/tt2/docs/html/Modules/Template/Plugin/Wrap.html share/tt2/docs/html/Modules/Template/Plugin/XML/DOM.html share/tt2/docs/html/Modules/Template/Plugin/XML/RSS.html share/tt2/docs/html/Modules/Template/Plugin/XML/Simple.html +share/tt2/docs/html/Modules/Template/Plugin/XML/Style.html share/tt2/docs/html/Modules/Template/Plugin/XML/XPath.html share/tt2/docs/html/Modules/Template/Plugins.html share/tt2/docs/html/Modules/Template/Provider.html share/tt2/docs/html/Modules/Template/Service.html share/tt2/docs/html/Modules/Template/Stash.html share/tt2/docs/html/Modules/Template/Stash/Context.html +share/tt2/docs/html/Modules/Template/Stash/XS.html share/tt2/docs/html/Modules/Template/Test.html share/tt2/docs/html/Modules/index.html share/tt2/docs/html/README share/tt2/docs/html/Release/Changes.html +share/tt2/docs/html/Release/HACKING.html +share/tt2/docs/html/Release/INSTALL.html share/tt2/docs/html/Release/README.html share/tt2/docs/html/Release/TODO.html share/tt2/docs/html/Release/index.html @@ -132,6 +138,7 @@ share/tt2/docs/src/Modules/Template/Plugin/Date.html share/tt2/docs/src/Modules/Template/Plugin/Directory.html share/tt2/docs/src/Modules/Template/Plugin/Dumper.html share/tt2/docs/src/Modules/Template/Plugin/File.html +share/tt2/docs/src/Modules/Template/Plugin/Filter.html share/tt2/docs/src/Modules/Template/Plugin/Format.html share/tt2/docs/src/Modules/Template/Plugin/GD/Constants.html share/tt2/docs/src/Modules/Template/Plugin/GD/Graph/area.html @@ -152,6 +159,7 @@ share/tt2/docs/src/Modules/Template/Plugin/GD/Text/Wrap.html share/tt2/docs/src/Modules/Template/Plugin/HTML.html share/tt2/docs/src/Modules/Template/Plugin/Iterator.html share/tt2/docs/src/Modules/Template/Plugin/Pod.html +share/tt2/docs/src/Modules/Template/Plugin/String.html share/tt2/docs/src/Modules/Template/Plugin/Table.html share/tt2/docs/src/Modules/Template/Plugin/URL.html share/tt2/docs/src/Modules/Template/Plugin/View.html @@ -159,15 +167,19 @@ share/tt2/docs/src/Modules/Template/Plugin/Wrap.html share/tt2/docs/src/Modules/Template/Plugin/XML/DOM.html share/tt2/docs/src/Modules/Template/Plugin/XML/RSS.html share/tt2/docs/src/Modules/Template/Plugin/XML/Simple.html +share/tt2/docs/src/Modules/Template/Plugin/XML/Style.html share/tt2/docs/src/Modules/Template/Plugin/XML/XPath.html share/tt2/docs/src/Modules/Template/Plugins.html share/tt2/docs/src/Modules/Template/Provider.html share/tt2/docs/src/Modules/Template/Service.html share/tt2/docs/src/Modules/Template/Stash.html share/tt2/docs/src/Modules/Template/Stash/Context.html +share/tt2/docs/src/Modules/Template/Stash/XS.html share/tt2/docs/src/Modules/Template/Test.html share/tt2/docs/src/Modules/index.html share/tt2/docs/src/Release/Changes.html +share/tt2/docs/src/Release/HACKING.html +share/tt2/docs/src/Release/INSTALL.html share/tt2/docs/src/Release/README.html share/tt2/docs/src/Release/TODO.html share/tt2/docs/src/Release/index.html @@ -438,6 +450,7 @@ share/tt2/images/splash/aqua/brhair.gif share/tt2/images/splash/aqua/diamond.gif share/tt2/images/splash/aqua/dot.gif share/tt2/images/splash/aqua/down.gif +share/tt2/images/splash/aqua/horz.gif share/tt2/images/splash/aqua/left.gif share/tt2/images/splash/aqua/minus.gif share/tt2/images/splash/aqua/negbox.gif @@ -461,6 +474,7 @@ share/tt2/images/splash/black/brhair.gif share/tt2/images/splash/black/diamond.gif share/tt2/images/splash/black/dot.gif share/tt2/images/splash/black/down.gif +share/tt2/images/splash/black/horz.gif share/tt2/images/splash/black/left.gif share/tt2/images/splash/black/minus.gif share/tt2/images/splash/black/negbox.gif @@ -484,6 +498,7 @@ share/tt2/images/splash/blood/brhair.gif share/tt2/images/splash/blood/diamond.gif share/tt2/images/splash/blood/dot.gif share/tt2/images/splash/blood/down.gif +share/tt2/images/splash/blood/horz.gif share/tt2/images/splash/blood/left.gif share/tt2/images/splash/blood/minus.gif share/tt2/images/splash/blood/negbox.gif @@ -507,6 +522,7 @@ share/tt2/images/splash/blue/brhair.gif share/tt2/images/splash/blue/diamond.gif share/tt2/images/splash/blue/dot.gif share/tt2/images/splash/blue/down.gif +share/tt2/images/splash/blue/horz.gif share/tt2/images/splash/blue/left.gif share/tt2/images/splash/blue/minus.gif share/tt2/images/splash/blue/negbox.gif @@ -530,6 +546,7 @@ share/tt2/images/splash/blue25/brhair.gif share/tt2/images/splash/blue25/diamond.gif share/tt2/images/splash/blue25/dot.gif share/tt2/images/splash/blue25/down.gif +share/tt2/images/splash/blue25/horz.gif share/tt2/images/splash/blue25/left.gif share/tt2/images/splash/blue25/minus.gif share/tt2/images/splash/blue25/negbox.gif @@ -553,6 +570,7 @@ share/tt2/images/splash/blue50/brhair.gif share/tt2/images/splash/blue50/diamond.gif share/tt2/images/splash/blue50/dot.gif share/tt2/images/splash/blue50/down.gif +share/tt2/images/splash/blue50/horz.gif share/tt2/images/splash/blue50/left.gif share/tt2/images/splash/blue50/minus.gif share/tt2/images/splash/blue50/negbox.gif @@ -576,6 +594,7 @@ share/tt2/images/splash/blue75/brhair.gif share/tt2/images/splash/blue75/diamond.gif share/tt2/images/splash/blue75/dot.gif share/tt2/images/splash/blue75/down.gif +share/tt2/images/splash/blue75/horz.gif share/tt2/images/splash/blue75/left.gif share/tt2/images/splash/blue75/minus.gif share/tt2/images/splash/blue75/negbox.gif @@ -599,6 +618,7 @@ share/tt2/images/splash/bud/brhair.gif share/tt2/images/splash/bud/diamond.gif share/tt2/images/splash/bud/dot.gif share/tt2/images/splash/bud/down.gif +share/tt2/images/splash/bud/horz.gif share/tt2/images/splash/bud/left.gif share/tt2/images/splash/bud/minus.gif share/tt2/images/splash/bud/negbox.gif @@ -622,6 +642,7 @@ share/tt2/images/splash/green/brhair.gif share/tt2/images/splash/green/diamond.gif share/tt2/images/splash/green/dot.gif share/tt2/images/splash/green/down.gif +share/tt2/images/splash/green/horz.gif share/tt2/images/splash/green/left.gif share/tt2/images/splash/green/minus.gif share/tt2/images/splash/green/negbox.gif @@ -645,6 +666,7 @@ share/tt2/images/splash/green25/brhair.gif share/tt2/images/splash/green25/diamond.gif share/tt2/images/splash/green25/dot.gif share/tt2/images/splash/green25/down.gif +share/tt2/images/splash/green25/horz.gif share/tt2/images/splash/green25/left.gif share/tt2/images/splash/green25/minus.gif share/tt2/images/splash/green25/negbox.gif @@ -668,6 +690,7 @@ share/tt2/images/splash/green50/brhair.gif share/tt2/images/splash/green50/diamond.gif share/tt2/images/splash/green50/dot.gif share/tt2/images/splash/green50/down.gif +share/tt2/images/splash/green50/horz.gif share/tt2/images/splash/green50/left.gif share/tt2/images/splash/green50/minus.gif share/tt2/images/splash/green50/negbox.gif @@ -691,6 +714,7 @@ share/tt2/images/splash/green75/brhair.gif share/tt2/images/splash/green75/diamond.gif share/tt2/images/splash/green75/dot.gif share/tt2/images/splash/green75/down.gif +share/tt2/images/splash/green75/horz.gif share/tt2/images/splash/green75/left.gif share/tt2/images/splash/green75/minus.gif share/tt2/images/splash/green75/negbox.gif @@ -714,6 +738,7 @@ share/tt2/images/splash/grey25/brhair.gif share/tt2/images/splash/grey25/diamond.gif share/tt2/images/splash/grey25/dot.gif share/tt2/images/splash/grey25/down.gif +share/tt2/images/splash/grey25/horz.gif share/tt2/images/splash/grey25/left.gif share/tt2/images/splash/grey25/minus.gif share/tt2/images/splash/grey25/negbox.gif @@ -737,6 +762,7 @@ share/tt2/images/splash/grey50/brhair.gif share/tt2/images/splash/grey50/diamond.gif share/tt2/images/splash/grey50/dot.gif share/tt2/images/splash/grey50/down.gif +share/tt2/images/splash/grey50/horz.gif share/tt2/images/splash/grey50/left.gif share/tt2/images/splash/grey50/minus.gif share/tt2/images/splash/grey50/negbox.gif @@ -760,6 +786,7 @@ share/tt2/images/splash/grey75/brhair.gif share/tt2/images/splash/grey75/diamond.gif share/tt2/images/splash/grey75/dot.gif share/tt2/images/splash/grey75/down.gif +share/tt2/images/splash/grey75/horz.gif share/tt2/images/splash/grey75/left.gif share/tt2/images/splash/grey75/minus.gif share/tt2/images/splash/grey75/negbox.gif @@ -783,6 +810,7 @@ share/tt2/images/splash/leaf/brhair.gif share/tt2/images/splash/leaf/diamond.gif share/tt2/images/splash/leaf/dot.gif share/tt2/images/splash/leaf/down.gif +share/tt2/images/splash/leaf/horz.gif share/tt2/images/splash/leaf/left.gif share/tt2/images/splash/leaf/minus.gif share/tt2/images/splash/leaf/negbox.gif @@ -806,6 +834,7 @@ share/tt2/images/splash/lilac/brhair.gif share/tt2/images/splash/lilac/diamond.gif share/tt2/images/splash/lilac/dot.gif share/tt2/images/splash/lilac/down.gif +share/tt2/images/splash/lilac/horz.gif share/tt2/images/splash/lilac/left.gif share/tt2/images/splash/lilac/minus.gif share/tt2/images/splash/lilac/negbox.gif @@ -829,6 +858,7 @@ share/tt2/images/splash/marine/brhair.gif share/tt2/images/splash/marine/diamond.gif share/tt2/images/splash/marine/dot.gif share/tt2/images/splash/marine/down.gif +share/tt2/images/splash/marine/horz.gif share/tt2/images/splash/marine/left.gif share/tt2/images/splash/marine/minus.gif share/tt2/images/splash/marine/negbox.gif @@ -852,6 +882,7 @@ share/tt2/images/splash/mauve/brhair.gif share/tt2/images/splash/mauve/diamond.gif share/tt2/images/splash/mauve/dot.gif share/tt2/images/splash/mauve/down.gif +share/tt2/images/splash/mauve/horz.gif share/tt2/images/splash/mauve/left.gif share/tt2/images/splash/mauve/minus.gif share/tt2/images/splash/mauve/negbox.gif @@ -875,6 +906,7 @@ share/tt2/images/splash/mint/brhair.gif share/tt2/images/splash/mint/diamond.gif share/tt2/images/splash/mint/dot.gif share/tt2/images/splash/mint/down.gif +share/tt2/images/splash/mint/horz.gif share/tt2/images/splash/mint/left.gif share/tt2/images/splash/mint/minus.gif share/tt2/images/splash/mint/negbox.gif @@ -898,6 +930,7 @@ share/tt2/images/splash/navy/brhair.gif share/tt2/images/splash/navy/diamond.gif share/tt2/images/splash/navy/dot.gif share/tt2/images/splash/navy/down.gif +share/tt2/images/splash/navy/horz.gif share/tt2/images/splash/navy/left.gif share/tt2/images/splash/navy/minus.gif share/tt2/images/splash/navy/negbox.gif @@ -913,6 +946,30 @@ share/tt2/images/splash/navy/tlhair.gif share/tt2/images/splash/navy/tr.gif share/tt2/images/splash/navy/trhair.gif share/tt2/images/splash/navy/up.gif +share/tt2/images/splash/orange/bl.gif +share/tt2/images/splash/orange/blhair.gif +share/tt2/images/splash/orange/box.gif +share/tt2/images/splash/orange/br.gif +share/tt2/images/splash/orange/brhair.gif +share/tt2/images/splash/orange/diamond.gif +share/tt2/images/splash/orange/dot.gif +share/tt2/images/splash/orange/down.gif +share/tt2/images/splash/orange/horz.gif +share/tt2/images/splash/orange/left.gif +share/tt2/images/splash/orange/minus.gif +share/tt2/images/splash/orange/negbox.gif +share/tt2/images/splash/orange/plus.gif +share/tt2/images/splash/orange/posbox.gif +share/tt2/images/splash/orange/right.gif +share/tt2/images/splash/orange/ring.gif +share/tt2/images/splash/orange/ringdot.gif +share/tt2/images/splash/orange/single.gif +share/tt2/images/splash/orange/square.gif +share/tt2/images/splash/orange/tl.gif +share/tt2/images/splash/orange/tlhair.gif +share/tt2/images/splash/orange/tr.gif +share/tt2/images/splash/orange/trhair.gif +share/tt2/images/splash/orange/up.gif share/tt2/images/splash/purple/bl.gif share/tt2/images/splash/purple/blhair.gif share/tt2/images/splash/purple/box.gif @@ -921,6 +978,7 @@ share/tt2/images/splash/purple/brhair.gif share/tt2/images/splash/purple/diamond.gif share/tt2/images/splash/purple/dot.gif share/tt2/images/splash/purple/down.gif +share/tt2/images/splash/purple/horz.gif share/tt2/images/splash/purple/left.gif share/tt2/images/splash/purple/minus.gif share/tt2/images/splash/purple/negbox.gif @@ -944,6 +1002,7 @@ share/tt2/images/splash/red/brhair.gif share/tt2/images/splash/red/diamond.gif share/tt2/images/splash/red/dot.gif share/tt2/images/splash/red/down.gif +share/tt2/images/splash/red/horz.gif share/tt2/images/splash/red/left.gif share/tt2/images/splash/red/minus.gif share/tt2/images/splash/red/negbox.gif @@ -967,6 +1026,7 @@ share/tt2/images/splash/red25/brhair.gif share/tt2/images/splash/red25/diamond.gif share/tt2/images/splash/red25/dot.gif share/tt2/images/splash/red25/down.gif +share/tt2/images/splash/red25/horz.gif share/tt2/images/splash/red25/left.gif share/tt2/images/splash/red25/minus.gif share/tt2/images/splash/red25/negbox.gif @@ -990,6 +1050,7 @@ share/tt2/images/splash/red50/brhair.gif share/tt2/images/splash/red50/diamond.gif share/tt2/images/splash/red50/dot.gif share/tt2/images/splash/red50/down.gif +share/tt2/images/splash/red50/horz.gif share/tt2/images/splash/red50/left.gif share/tt2/images/splash/red50/minus.gif share/tt2/images/splash/red50/negbox.gif @@ -1013,6 +1074,7 @@ share/tt2/images/splash/red75/brhair.gif share/tt2/images/splash/red75/diamond.gif share/tt2/images/splash/red75/dot.gif share/tt2/images/splash/red75/down.gif +share/tt2/images/splash/red75/horz.gif share/tt2/images/splash/red75/left.gif share/tt2/images/splash/red75/minus.gif share/tt2/images/splash/red75/negbox.gif @@ -1036,6 +1098,7 @@ share/tt2/images/splash/rose/brhair.gif share/tt2/images/splash/rose/diamond.gif share/tt2/images/splash/rose/dot.gif share/tt2/images/splash/rose/down.gif +share/tt2/images/splash/rose/horz.gif share/tt2/images/splash/rose/left.gif share/tt2/images/splash/rose/minus.gif share/tt2/images/splash/rose/negbox.gif @@ -1059,6 +1122,7 @@ share/tt2/images/splash/scarlet/brhair.gif share/tt2/images/splash/scarlet/diamond.gif share/tt2/images/splash/scarlet/dot.gif share/tt2/images/splash/scarlet/down.gif +share/tt2/images/splash/scarlet/horz.gif share/tt2/images/splash/scarlet/left.gif share/tt2/images/splash/scarlet/minus.gif share/tt2/images/splash/scarlet/negbox.gif @@ -1082,6 +1146,7 @@ share/tt2/images/splash/sky/brhair.gif share/tt2/images/splash/sky/diamond.gif share/tt2/images/splash/sky/dot.gif share/tt2/images/splash/sky/down.gif +share/tt2/images/splash/sky/horz.gif share/tt2/images/splash/sky/left.gif share/tt2/images/splash/sky/minus.gif share/tt2/images/splash/sky/negbox.gif @@ -1105,6 +1170,7 @@ share/tt2/images/splash/white/brhair.gif share/tt2/images/splash/white/diamond.gif share/tt2/images/splash/white/dot.gif share/tt2/images/splash/white/down.gif +share/tt2/images/splash/white/horz.gif share/tt2/images/splash/white/left.gif share/tt2/images/splash/white/minus.gif share/tt2/images/splash/white/negbox.gif @@ -1221,6 +1287,7 @@ share/tt2/templates/splash/ttpower @dirrm share/tt2/images/splash/red25 @dirrm share/tt2/images/splash/red @dirrm share/tt2/images/splash/purple +@dirrm share/tt2/images/splash/orange @dirrm share/tt2/images/splash/navy @dirrm share/tt2/images/splash/mint @dirrm share/tt2/images/splash/mauve diff --git a/www/p5-Template-Toolkit/distinfo b/www/p5-Template-Toolkit/distinfo index 36001c0535b..ac1e640931f 100644 --- a/www/p5-Template-Toolkit/distinfo +++ b/www/p5-Template-Toolkit/distinfo @@ -1,5 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2001/07/02 18:08:25 nra Exp $ +$NetBSD: distinfo,v 1.1.1.1.2.1 2002/06/23 19:04:30 jlam Exp $ -SHA1 (Template-Toolkit-2.04.tar.gz) = 24baf396e3dd512337349c9ed09393625e69c30f -Size (Template-Toolkit-2.04.tar.gz) = 695530 bytes -SHA1 (patch-aa) = db71c18672b040d06ab59d233092f9003ed01b0a +SHA1 (Template-Toolkit-2.07.tar.gz) = 4c6afc336261afd713afc116374d9399c259c352 +Size (Template-Toolkit-2.07.tar.gz) = 780616 bytes diff --git a/www/p5-Template-Toolkit/patches/patch-aa b/www/p5-Template-Toolkit/patches/patch-aa deleted file mode 100644 index a40b32066d3..00000000000 --- a/www/p5-Template-Toolkit/patches/patch-aa +++ /dev/null @@ -1,137 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/07/02 18:08:27 nra Exp $ - ---- Makefile.PL.orig Thu Jun 14 03:59:04 2001 -+++ Makefile.PL Fri Jun 29 10:10:31 2001 -@@ -10,7 +10,7 @@ - $TT_LATEX_PATH $TT_PDFLATEX_PATH $TT_DVIPS_PATH $TT_LATEX_ENABLE - $TT_SPLASH_THEME ); - --$TT_INST_ROOT = '/usr/local/tt2'; -+$TT_INST_ROOT = '/usr/pkg/share/tt2'; - $TT_IMAGES = '/tt2/images'; - $TT_RUN_DBI = 'y'; - $TT_BUILD_DOCS = 'y'; -@@ -191,16 +191,16 @@ - $TT_LATEX_ENABLE = 'n'; - } - $TT_LATEX_ENABLE ||= 'y'; --$TT_LATEX_ENABLE = ( -- prompt('Do you want to enable the latex filter?', -- $TT_LATEX_ENABLE) =~ /^y/i --); -+#$TT_LATEX_ENABLE = ( -+# prompt('Do you want to enable the latex filter?', -+# $TT_LATEX_ENABLE) =~ /^y/i -+#); - if ( $TT_LATEX_ENABLE ) { -- if (prompt('Are the pdflatex, latex and dvips paths ok?', 'y') !~ /^y/i) { -- $TT_PDFLATEX_PATH = prompt('pdflatex path', $TT_PDFLATEX_PATH); -- $TT_LATEX_PATH = prompt('latex path', $TT_LATEX_PATH); -- $TT_DVIPS_PATH = prompt('dvips path', $TT_DVIPS_PATH); -- } -+# if (prompt('Are the pdflatex, latex and dvips paths ok?', 'y') !~ /^y/i) { -+# $TT_PDFLATEX_PATH = prompt('pdflatex path', $TT_PDFLATEX_PATH); -+# $TT_LATEX_PATH = prompt('latex path', $TT_LATEX_PATH); -+# $TT_DVIPS_PATH = prompt('dvips path', $TT_DVIPS_PATH); -+# } - } else { - # - # Empty paths will cause the latex filter to throw an error -@@ -237,7 +237,8 @@ - - EOF - --if (prompt('Do you want to install these components?', 'y') =~ /^y/i) { -+if (1) { -+#prompt('Do you want to install these components?', 'y') =~ /^y/i) { - print <<EOF; - - You can chose any directory for the installation of the additional -@@ -246,8 +247,8 @@ - for other platforms welcome). - - EOF -- $TT_INST_ROOT = prompt('Installation directory', -- $TT_INST_ROOT); -+# $TT_INST_ROOT = prompt('Installation directory', -+# $TT_INST_ROOT); - } - else { - $TT_INST_ROOT = ''; -@@ -304,7 +305,7 @@ - EOF - } - -- $TT_IMAGES = prompt('URL base for TT2 images?', $TT_IMAGES); -+# $TT_IMAGES = prompt('URL base for TT2 images?', $TT_IMAGES); - $TT_IMAGES =~ s[/$][]g; # just in case - fix_file('templates/splash/config', 'images', "$TT_IMAGES/splash"); - } -@@ -338,10 +339,10 @@ - - EOF - -- $TT_BUILD_DOCS = ( -- prompt('Do you want to build the HTML documentation?', -- $TT_BUILD_DOCS) =~ /^y/i -- ); -+# $TT_BUILD_DOCS = ( -+# prompt('Do you want to build the HTML documentation?', -+# $TT_BUILD_DOCS) =~ /^y/i -+# ); - - #-------------------------------------------------------------------- - # prompt for docs style: plain or splash -@@ -356,10 +357,10 @@ - use plain HTML. - - EOF -- $TT_SPLASH_DOCS = ( -- prompt('Do you want to use the Splash! library?', -- $TT_SPLASH_DOCS) =~ /^y/i -- ); -+# $TT_SPLASH_DOCS = ( -+# prompt('Do you want to use the Splash! library?', -+# $TT_SPLASH_DOCS) =~ /^y/i -+# ); - - if ($TT_SPLASH_DOCS) { - my $splash_style = ''; -@@ -379,7 +380,7 @@ - print "\n"; - - while (! $splash_style) { -- $TT_SPLASH_THEME = prompt("Enter name of colour scheme: ", $TT_SPLASH_THEME); -+# $TT_SPLASH_THEME = prompt("Enter name of colour scheme: ", $TT_SPLASH_THEME); - print("! No such scheme\n"), $TT_SPLASH_THEME = 'default' - unless ($splash_style = $SPLASH_STYLES->{ $TT_SPLASH_THEME }); - } -@@ -437,10 +438,10 @@ - - EOF - -- $TT_EXAMPLES = ( -- prompt('Do you want to build the HTML example pages?', -- $TT_EXAMPLES) =~ /^y/i -- ); -+# $TT_EXAMPLES = ( -+# prompt('Do you want to build the HTML example pages?', -+# $TT_EXAMPLES) =~ /^y/i -+# ); - - #-------------------------------------------------------------------- - # write ttree config file for building examples -@@ -698,9 +699,10 @@ - - print "[X] version $DBI::VERSION installed, configuring tests\n\n"; - -- if (prompt("Do you want to run the DBI tests?\n" . -- "It requires access to an existing test database.", -- $TT_RUN_DBI) =~ /y/i) { -+ if (0) { -+#prompt("Do you want to run the DBI tests?\n" . -+# "It requires access to an existing test database.", -+# $TT_RUN_DBI) =~ /y/i) { - - $TT_RUN_DBI = 1; - my ($driver, $dbname); diff --git a/www/p5-URI/Makefile b/www/p5-URI/Makefile index 8143a359914..5cb9bc2e515 100644 --- a/www/p5-URI/Makefile +++ b/www/p5-URI/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.15 2002/01/18 22:45:50 mjl Exp $ +# $NetBSD: Makefile,v 1.15.2.1 2002/06/23 19:04:31 jlam Exp $ # -DISTNAME= URI-1.18 +DISTNAME= URI-1.19 PKGNAME= p5-${DISTNAME} SVR4_PKGNAME= p5uri CATEGORIES= www net perl5 diff --git a/www/p5-URI/distinfo b/www/p5-URI/distinfo index 956e3f99139..2f249ebbf86 100644 --- a/www/p5-URI/distinfo +++ b/www/p5-URI/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/01/18 22:45:50 mjl Exp $ +$NetBSD: distinfo,v 1.4.2.1 2002/06/23 19:04:32 jlam Exp $ -SHA1 (URI-1.18.tar.gz) = c8e9a6c778a7a4aa82140d2e33e84f58655f01dd -Size (URI-1.18.tar.gz) = 82597 bytes +SHA1 (URI-1.19.tar.gz) = 9346e67e38a9ff62aa4e240731cdb6aa6f8015b7 +Size (URI-1.19.tar.gz) = 83046 bytes diff --git a/www/p5-WWW-Amazon-Wishlist/DESCR b/www/p5-WWW-Amazon-Wishlist/DESCR new file mode 100644 index 00000000000..a4c6f47d003 --- /dev/null +++ b/www/p5-WWW-Amazon-Wishlist/DESCR @@ -0,0 +1,3 @@ +Some perl utilities that can be used to get your wish-list from +Amazon.(com|co.uk) and return it in an array of hashrefs so that you +can fiddle with it until your hearts content. diff --git a/www/p5-WWW-Amazon-Wishlist/Makefile b/www/p5-WWW-Amazon-Wishlist/Makefile new file mode 100644 index 00000000000..a5bbbd51b85 --- /dev/null +++ b/www/p5-WWW-Amazon-Wishlist/Makefile @@ -0,0 +1,23 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 19:04:34 jlam Exp $ +# + +DISTNAME= WWW-Amazon-Wishlist-0.65 +PKGNAME= p5-${DISTNAME} +SVR4_PKGNAME= p5waw +CATEGORIES= www perl5 +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=WWW/} + +MAINTAINER= packages@netbsd.org +HOMEPAGE= http://www.cpan.org/modules/by-module/WWW/WWW-Amazon-Wishlist-0.65.readme +COMMENT= perl5 module to get details from your Amazon wishlist + +DEPENDS+= p5-libwww-*:../../www/p5-libwww + +USE_BUILDLINK_ONLY= YES +PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/WWW/Amazon/Wishlist/.packlist + +do-configure: + @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL + +.include "../../lang/perl5/buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/www/p5-WWW-Amazon-Wishlist/PLIST b/www/p5-WWW-Amazon-Wishlist/PLIST new file mode 100644 index 00000000000..bb8276afa89 --- /dev/null +++ b/www/p5-WWW-Amazon-Wishlist/PLIST @@ -0,0 +1 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.34.2 2002/06/23 19:04:35 jlam Exp $ diff --git a/www/p5-WWW-Amazon-Wishlist/distinfo b/www/p5-WWW-Amazon-Wishlist/distinfo new file mode 100644 index 00000000000..0c4a50d2b40 --- /dev/null +++ b/www/p5-WWW-Amazon-Wishlist/distinfo @@ -0,0 +1,4 @@ +$NetBSD: distinfo,v 1.1.1.1.12.2 2002/06/23 19:04:35 jlam Exp $ + +SHA1 (WWW-Amazon-Wishlist-0.65.tar.gz) = d3c752cdd202c50d097efb459dc2d5c6a7ff13f3 +Size (WWW-Amazon-Wishlist-0.65.tar.gz) = 6591 bytes diff --git a/www/py-curl/Makefile b/www/py-curl/Makefile index ed94a5badfd..516f74266e5 100644 --- a/www/py-curl/Makefile +++ b/www/py-curl/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2002/04/21 12:14:50 shell Exp $ +# $NetBSD: Makefile,v 1.2.2.1 2002/06/23 19:04:36 jlam Exp $ -DISTNAME= pycurl-0.4.9 -PKGNAME= ${PYPKGPREFIX}-curl-0.4.9 +DISTNAME= pycurl-7.9.7 +PKGNAME= ${PYPKGPREFIX}-curl-7.9.7 CATEGORIES= www MASTER_SITES= http://pycurl.sourceforge.net/ @@ -9,7 +9,7 @@ MAINTAINER= shell@netbsd.org HOMEPAGE= http://pycurl.sf.net/ COMMENT= python module interface to the cURL library -DEPENDS+= curl>=7.9.6:../../www/curl +DEPENDS+= curl>=7.9.7:../../www/curl PYDISTUTILSPKG= # defined PYBINMODULE= # defined diff --git a/www/py-curl/distinfo b/www/py-curl/distinfo index bb444d51ec4..7746ff55a0d 100644 --- a/www/py-curl/distinfo +++ b/www/py-curl/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2002/04/21 12:14:50 shell Exp $ +$NetBSD: distinfo,v 1.2.2.1 2002/06/23 19:04:36 jlam Exp $ -SHA1 (pycurl-0.4.9.tar.gz) = d1e424f8353da38975a3ed964740254824cad8fe -Size (pycurl-0.4.9.tar.gz) = 24180 bytes +SHA1 (pycurl-7.9.7.tar.gz) = 985e35980c4b0927283e6f7ce46835091f77535e +Size (pycurl-7.9.7.tar.gz) = 24640 bytes diff --git a/www/ruby-uri/DESCR b/www/ruby-uri/DESCR deleted file mode 100644 index 2242bf6d1da..00000000000 --- a/www/ruby-uri/DESCR +++ /dev/null @@ -1,4 +0,0 @@ -This is a Ruby interface to parse URIs according to RFC 2396. FTP and -HTTP URLs are supported for the present. - -Author: Tomoyuki Kosimizu <greentea@fa2.so-net.ne.jp> diff --git a/www/ruby-uri/Makefile b/www/ruby-uri/Makefile deleted file mode 100644 index c1426032bb2..00000000000 --- a/www/ruby-uri/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# $NetBSD: Makefile,v 1.2 2002/03/17 15:22:12 taca Exp $ -# FreeBSD: ports/net/ruby-uri/Makefile,v 1.7 2000/12/25 15:54:08 knu Exp - -DISTNAME= uri-4.27 -PKGNAME= ${RUBY_PKGNAMEPREFIX}${DISTNAME} -CATEGORIES= www -MASTER_SITES= http://www02.so-net.ne.jp/~greentea/ruby/uri/ - -MAINTAINER= taca@netbsd.org -HOMEPAGE= http://www02.so-net.ne.jp/%7Egreentea/ruby/uri/ -COMMENT= Ruby interface to parse URIs according to RFC 2396 - -RUBY_VER= 1.4 # now this is for ruby 1.4 only. - -DIST_SUBDIR= ruby -USE_RUBY= yes -NO_BUILD= yes - -WRKSRC= ${WRKDIR}/uri - -MODULES= uri.rb urireg.rb -DOCS= index.html -EXAMPLES= in-uri.txt test-uri.rb - -do-install: -.for f in ${MODULES} - ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_SITELIBDIR} -.endfor - ${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/uri -.for f in ${EXAMPLES} - ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_EXAMPLESDIR}/uri -.endfor - ${MKDIR} ${RUBY_DOCDIR}/uri -.for f in ${DOCS} - ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/uri -.endfor - -.include "../../lang/ruby-base/Makefile.common" -.include "../../mk/bsd.pkg.mk" diff --git a/www/ruby-uri/PLIST b/www/ruby-uri/PLIST deleted file mode 100644 index 5ba1023615a..00000000000 --- a/www/ruby-uri/PLIST +++ /dev/null @@ -1,8 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:18:48 zuntum Exp $ -${RUBY_SITELIBDIR}/uri.rb -${RUBY_SITELIBDIR}/urireg.rb -${RUBY_EXAMPLESDIR}/uri/test-uri.rb -${RUBY_EXAMPLESDIR}/uri/in-uri.txt -@dirrm ${RUBY_EXAMPLESDIR}/uri -${RUBY_DOCDIR}/uri/index.html -@dirrm ${RUBY_DOCDIR}/uri diff --git a/www/ruby-uri/distinfo b/www/ruby-uri/distinfo deleted file mode 100644 index 9eb499143e0..00000000000 --- a/www/ruby-uri/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -$NetBSD: distinfo,v 1.1.1.1 2001/07/01 14:29:22 taca Exp $ - -SHA1 (ruby/uri-4.27.tar.gz) = 8c4bb7656fa844716b7b2f77a6ea0c85e0963c3e -Size (ruby/uri-4.27.tar.gz) = 43534 bytes diff --git a/www/skipstone/Makefile b/www/skipstone/Makefile index cd2fbf46d5d..e0a5d343d21 100644 --- a/www/skipstone/Makefile +++ b/www/skipstone/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.11 2002/04/22 13:39:26 tron Exp $ +# $NetBSD: Makefile,v 1.11.2.1 2002/06/23 19:04:38 jlam Exp $ -DISTNAME= skipstone-0.8.1 +DISTNAME= skipstone-0.8.2 CATEGORIES= www MASTER_SITES= http://www.muhri.net/skipstone/ @@ -8,15 +8,17 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.muhri.net/skipstone/ COMMENT= GTK+ web browser that embeds Mozilla's renderer -DEPENDS+= mozilla>=0.9.9:../../www/mozilla +DEPENDS+= mozilla>=1.0rc3:../../www/mozilla +EVAL_PREFIX+= MOZ_DIR=mozilla +MOZ_INCDIR= ${MOZ_DIR}/include/mozilla +MOZ_LIBDIR= ${MOZ_DIR}/lib/mozilla USE_GMAKE= yes - -MAKE_ENV+= X11PREFIX="${X11PREFIX}" - -post-patch: - ${SED} -e s,@PREFIX@,${X11PREFIX},g \ - < ${WRKSRC}/src/skipstone > ${WRKSRC}/src/skipstone.tmp - ${MV} ${WRKSRC}/src/skipstone.tmp ${WRKSRC}/src/skipstone +USE_X11BASE= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --prefix=${PREFIX} \ + --with-mozilla-includes=${MOZ_INCDIR} \ + --with-mozilla-libs=${MOZ_LIBDIR} +LDFLAGS+= -Wl,-R${MOZ_LIBDIR} .include "../../mk/bsd.pkg.mk" diff --git a/www/skipstone/PLIST b/www/skipstone/PLIST index da199f30dca..a264c260177 100644 --- a/www/skipstone/PLIST +++ b/www/skipstone/PLIST @@ -1,7 +1,7 @@ -@comment $NetBSD: PLIST,v 1.2 2002/01/24 13:47:02 wiz Exp $ +@comment $NetBSD: PLIST,v 1.2.2.1 2002/06/23 19:04:39 jlam Exp $ +bin/skipdownload bin/skipstone bin/skipstone-bin -bin/skipdownload share/skipstone/pixmaps/default/back.xpm share/skipstone/pixmaps/default/config.xpm share/skipstone/pixmaps/default/forward.xpm diff --git a/www/skipstone/distinfo b/www/skipstone/distinfo index 4788fcb072e..1653d543f1a 100644 --- a/www/skipstone/distinfo +++ b/www/skipstone/distinfo @@ -1,8 +1,6 @@ -$NetBSD: distinfo,v 1.7 2002/04/22 13:39:26 tron Exp $ +$NetBSD: distinfo,v 1.7.2.1 2002/06/23 19:04:39 jlam Exp $ -SHA1 (skipstone-0.8.1.tar.gz) = 91650eef792acdc02db70b5b1bcac3c9c674cd1e -Size (skipstone-0.8.1.tar.gz) = 393285 bytes -SHA1 (patch-aa) = 64d4423f214aa8cfc2792831d3d5f8046e8ad88c -SHA1 (patch-ab) = 0ce631832790a2fd2e243c75ddf466aad337ec2e -SHA1 (patch-ac) = d79acc2997b95d3844501ed0f4e767beac6b90ad -SHA1 (patch-ad) = 0476574e5165030d1a4589ed28c8445444e99384 +SHA1 (skipstone-0.8.2.tar.gz) = d95e48ecd2f1907998e327fb8cb09f6e7f3da3e1 +Size (skipstone-0.8.2.tar.gz) = 420922 bytes +SHA1 (patch-ad) = e45ab1dbbed9c007fa427fa358b5744057e5f5c1 +SHA1 (patch-ae) = 72d1f2b4fa9d29161697abcb6d2a09714e6ec46b diff --git a/www/skipstone/patches/patch-aa b/www/skipstone/patches/patch-aa deleted file mode 100644 index 9f1db133ef3..00000000000 --- a/www/skipstone/patches/patch-aa +++ /dev/null @@ -1,115 +0,0 @@ -$NetBSD: patch-aa,v 1.5 2002/03/28 10:40:33 jmc Exp $ - ---- config.mk.orig Wed Mar 27 14:12:02 2002 -+++ config.mk Thu Mar 28 10:35:00 2002 -@@ -1,78 +1,32 @@ --PREFIX=/usr/local -+#PREFIX=/usr/local - PLUGINDIR=$(HOME)/.skipstone/plugins - - MOZILLA_INCLUDES = \ -- -I/usr/include/mozilla \ -- -I$(PREFIX)/include/mozilla \ -- -I/usr/include/nspr \ -- -I/usr/include/mozilla/dom \ -- -I/usr/include/mozilla/windowwatcher \ -- -I/usr/include/mozilla/webbrowserpersist \ -- -I/usr/include/mozilla/appcomps \ -- -I/usr/include/mozilla/find \ -- -I/usr/include/mozilla/txtsvc \ -- -I/usr/include/mozilla/docshell \ -- -I/usr/include/mozilla/shistory \ -- -I/usr/include/mozilla/webshell \ -- -I/usr/include/mozilla/gfx \ -- -I/usr/include/mozilla/necko \ -- -I/usr/include/mozilla/widget \ -- -I/usr/include/mozilla/content \ -- -I/usr/include/mozilla/layout \ -- -I/usr/include/mozilla/browser \ -- -I/usr/include/mozilla/webbrwsr \ -- -I/usr/include/mozilla/string \ -- -I/usr/include/mozilla/xpcom \ -- -I/usr/include/mozilla/pref \ -- -I/usr/include/mozilla/gtkembedmoz \ -- -I/usr/include/mozilla/nspr \ -- -I/usr/include/mozilla/uconv \ -- -I/usr/local/include/nspr \ -- -I/usr/local/include/mozilla/gtkembedmoz \ -- -I/usr/local/include/mozilla/dom \ -- -I/usr/local/include/mozilla/windowwatcher \ -- -I/usr/local/include/mozilla/appcomps \ -- -I/usr/local/include/mozilla/find \ -- -I/usr/local/include/mozilla/txtsvc \ -- -I/usr/local/include/mozilla/docshell \ -- -I/usr/local/include/mozilla/shistory \ -- -I/usr/local/include/mozilla/webshell \ -- -I/usr/local/include/mozilla/gfx \ -- -I/usr/include/mozilla/webbrowserpersist \ -- -I/usr/local/include/mozilla/necko \ -- -I/usr/local/include/mozilla/widget \ -- -I/usr/local/include/mozilla/content \ -- -I/usr/local/include/mozilla/layout \ -- -I/usr/local/include/mozilla/browser \ -- -I/usr/local/include/mozilla/webbrwsr \ -- -I/usr/local/include/mozilla/string \ -- -I/usr/local/include/mozilla/xpcom \ -- -I/usr/local/include/mozilla/pref \ -- -I/usr/local/include/mozilla/uconv \ -- -I$(PREFIX)/include/mozilla/nspr \ -- -I$(PREFIX)/include/mozilla/gtkembedmoz \ -- -I$(PREFIX)/include/mozilla/dom \ -- -I$(PREFIX)/include/mozilla/windowwatcher \ -- -I$(PREFIX)/include/mozilla/appcomps \ -- -I$(PREFIX)/include/mozilla/find \ -- -I$(PREFIX)/include/mozilla/txtsvc \ -- -I$(PREFIX)/include/mozilla/docshell \ -- -I$(PREFIX)/include/mozilla/shistory \ -- -I$(PREFIX)/include/mozilla/webshell \ -- -I$(PREFIX)/include/mozilla/gfx \ -- -I$(PREFIX)/include/mozilla/necko \ -- -I$(PREFIX)/include/mozilla/widget \ -- -I$(PREFIX)/include/mozilla/webbrowserpersist \ -- -I$(PREFIX)/include/mozilla/content \ -- -I$(PREFIX)/include/mozilla/layout \ -- -I$(PREFIX)/include/mozilla/browser \ -- -I$(PREFIX)/include/mozilla/webbrwsr \ -- -I$(PREFIX)/include/mozilla/string \ -- -I$(PREFIX)/include/mozilla/xpcom \ -- -I$(PREFIX)/include/mozilla/pref \ -- -I$(PREFIX)/include/mozilla/uconv -+ -I$(X11PREFIX)/include/mozilla/nspr \ -+ -I$(X11PREFIX)/include/mozilla/gtkembedmoz \ -+ -I$(X11PREFIX)/include/mozilla/dom \ -+ -I$(X11PREFIX)/include/mozilla/windowwatcher \ -+ -I$(X11PREFIX)/include/mozilla/appcomps \ -+ -I$(X11PREFIX)/include/mozilla/find \ -+ -I$(X11PREFIX)/include/mozilla/txtsvc \ -+ -I$(X11PREFIX)/include/mozilla/docshell \ -+ -I$(X11PREFIX)/include/mozilla/shistory \ -+ -I$(X11PREFIX)/include/mozilla/webshell \ -+ -I$(X11PREFIX)/include/mozilla/gfx \ -+ -I$(X11PREFIX)/include/mozilla/necko \ -+ -I$(X11PREFIX)/include/mozilla/widget \ -+ -I$(X11PREFIX)/include/mozilla/webbrowserpersist \ -+ -I$(X11PREFIX)/include/mozilla/content \ -+ -I$(X11PREFIX)/include/mozilla/layout \ -+ -I$(X11PREFIX)/include/mozilla/browser \ -+ -I$(X11PREFIX)/include/mozilla/webbrwsr \ -+ -I$(X11PREFIX)/include/mozilla/string \ -+ -I$(X11PREFIX)/include/mozilla/xpcom \ -+ -I$(X11PREFIX)/include/mozilla/pref \ -+ -I$(X11PREFIX)/include/mozilla/uconv - - MOZILLA_LIBS = \ -+ -L$(X11PREFIX)/lib/mozilla -Wl,-R${X11PREFIX}/lib/mozilla \ - -L/usr/lib/mozilla \ - -L$(PREFIX)/lib/mozilla \ - -lgtkembedmoz -lplds4 -lplc4 -lnspr4 -lgtksuperwin -lxpcom -@@ -84,6 +38,7 @@ - CXX = g++ - - CPPFLAGS = $(GTK_INCLUDES) $(MOZILLA_INCLUDES) -+CPPFLAGS += -DPREFIX=\"${PREFIX}\" - CFLAGS = -g -O2 -Wall - CXXFLAGS = $(CFLAGS) -fno-rtti - diff --git a/www/skipstone/patches/patch-ab b/www/skipstone/patches/patch-ab deleted file mode 100644 index 97ac39944da..00000000000 --- a/www/skipstone/patches/patch-ab +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2002/01/24 13:47:03 wiz Exp $ - ---- src/skipstone.h.orig Fri Dec 28 23:27:53 2001 -+++ src/skipstone.h -@@ -40,6 +40,11 @@ - #define SKIPSTONE_SYSTEM_THEME_DIR "/usr/share/skipstone/pixmaps" - #define SKIPSTONE_LOCAL_PLUGIN_DIR "/usr/local/share/skipstone/plugins" - #define SKIPSTONE_SYSTEM_PLUGIN_DIR "/usr/share/skipstone/plugins" -+ -+#undef SKIPSTONE_SYSTEM_THEME_DIR -+#undef SKIPSTONE_SYSTEM_PLUGIN_DIR -+#define SKIPSTONE_SYSTEM_THEME_DIR PREFIX "/share/skipstone/pixmaps" -+#define SKIPSTONE_SYSTEM_PLUGIN_DIR PREFIX "/share/skipstone/plugins" - /*--------*/ - - /* bookmarks */ diff --git a/www/skipstone/patches/patch-ad b/www/skipstone/patches/patch-ad index 6a49fde10ed..e3dad837c49 100644 --- a/www/skipstone/patches/patch-ad +++ b/www/skipstone/patches/patch-ad @@ -1,7 +1,8 @@ -$NetBSD: patch-ad,v 1.2 2002/01/24 13:47:03 wiz Exp $ +$NetBSD: patch-ad,v 1.2.2.1 2002/06/23 19:04:41 jlam Exp $ ---- src/mozilla.cpp.orig Fri Dec 28 23:27:52 2001 -+++ src/mozilla.cpp +diff -ru ../Orig/skipstone-0.8.2/src/mozilla.cpp ./src/mozilla.cpp +--- ../Orig/skipstone-0.8.2/src/mozilla.cpp Sat May 11 05:20:45 2002 ++++ ./src/mozilla.cpp Sun May 26 20:35:02 2002 @@ -3,6 +3,7 @@ * * * released under the GPL */ @@ -10,3 +11,34 @@ $NetBSD: patch-ad,v 1.2 2002/01/24 13:47:03 wiz Exp $ #include <gtk/gtk.h> #include <sys/types.h> +@@ -277,7 +278,11 @@ + nsCOMPtr<nsIWebBrowserPersist> persist(do_QueryInterface(wb)); + if (persist) { + nsCOMPtr<nsILocalFile> file; ++#if 0 + NS_NewLocalFile(FullPath, PR_TRUE, getter_AddRefs(file)); ++#else ++ NS_NewNativeLocalFile(nsDependentCString(FullPath), PR_TRUE, getter_AddRefs(file)); ++#endif + if (!file) D_RETURN; + persist->SaveURI(linkURI, nsnull, file); + } +@@ -402,10 +407,18 @@ + relative_path[i] = '\0'; + break; + } ++#if 0 + NS_NewLocalFile(relative_path, PR_TRUE, getter_AddRefs(relative)); ++#else ++ NS_NewNativeLocalFile(nsDependentCString(relative_path), PR_TRUE, getter_AddRefs(relative)); ++#endif + + } ++#if 0 + NS_NewLocalFile(file_name,PR_TRUE,getter_AddRefs(file)); ++#else ++ NS_NewNativeLocalFile(nsDependentCString(file_name),PR_TRUE,getter_AddRefs(file)); ++#endif + //#ifdef CVS_MOZILLA + if (file) persist->SaveDocument(domDoc,file,relative, nsnull, 0, 0); + //#else diff --git a/www/skipstone/patches/patch-ac b/www/skipstone/patches/patch-ae index 6ebca7c7067..c1352de82b8 100644 --- a/www/skipstone/patches/patch-ac +++ b/www/skipstone/patches/patch-ae @@ -1,26 +1,27 @@ -$NetBSD: patch-ac,v 1.3 2002/03/10 10:47:17 jmc Exp $ +$NetBSD: patch-ae,v 1.1.2.2 2002/06/23 19:04:41 jlam Exp $ ---- src/skipstone.orig Wed Feb 6 07:42:16 2002 -+++ src/skipstone Sun Mar 10 10:35:49 2002 +diff -ru ../Orig/skipstone-0.8.2/src/skipstone.in ./src/skipstone.in +--- ../Orig/skipstone-0.8.2/src/skipstone.in Sat May 11 05:20:45 2002 ++++ ./src/skipstone.in Tue May 28 23:59:50 2002 @@ -1,29 +1,3 @@ #!/bin/sh +-# allow MOZILLA_FIVE_HOME to override defaults/install path -if test -n "$MOZILLA_FIVE_HOME"; then - LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:$LD_LIBRARY_PATH - export LD_LIBRARY_PATH -- if [ -f ./skipstone-bin ]; then -- exec ./skipstone-bin $@ -- else -- exec skipstone-bin $@ -- fi --elif [ -f /usr/lib/mozilla/libgtkembedmoz.so ]; then +-elif [ -f /usr/lib/libgtkembedmoz.so ]; then - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/mozilla - export MOZILLA_FIVE_HOME=/usr/lib/mozilla +-elif [ -f @MOZILLA_LIB_HOME@/libgtkembedmoz.so ]; then +- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:@MOZILLA_LIB_HOME@ +- export MOZILLA_FIVE_HOME=@MOZILLA_LIB_HOME@ -elif [ -f /usr/local/lib/mozilla/libgtkembedmoz.so ]; then - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib/mozilla - export MOZILLA_FIVE_HOME=/usr/local/lib/mozilla -elif [ -f /opt/mozilla/libgtkembedmoz.so ]; then - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/mozilla - export MOZILLA_FIVE_HOME=/opt/mozilla +- -else - -echo "Please set your MOZILLA_FIVE_HOME and LD_LIBRARY_PATH manually as I could not find them" @@ -32,5 +33,5 @@ $NetBSD: patch-ac,v 1.3 2002/03/10 10:47:17 jmc Exp $ -else - exec skipstone-bin $@ -fi -+export MOZILLA_FIVE_HOME=@PREFIX@/lib/mozilla -+exec skipstone-bin $@ ++export MOZILLA_FIVE_HOME=@MOZILLA_LIB_HOME@ ++exec @prefix@/bin/skipstone-bin $@ diff --git a/www/swill/DESCR b/www/swill/DESCR new file mode 100644 index 00000000000..88af90a4f85 --- /dev/null +++ b/www/swill/DESCR @@ -0,0 +1,5 @@ +SWILL (Simple Web Interface Link Library) is a web server library +that makes it easy to add a web interface capability to existing +programs. Its intended use is to provide web access to applications +that don't normally fit the standard model of a standard "Internet" +application. diff --git a/www/swill/Makefile b/www/swill/Makefile new file mode 100644 index 00000000000..013a80f5ce0 --- /dev/null +++ b/www/swill/Makefile @@ -0,0 +1,15 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 19:04:42 jlam Exp $ + +DISTNAME= swill-0.1 +CATEGORIES= www devel +MASTER_SITES= http://systems.cs.uchicago.edu/swill/ + +MAINTAINER= thorpej@netbsd.org +HOMEPAGE= http://systems.cs.uchicago.edu/swill/ +COMMENT= The Simple Web Interface Link Library + +GNU_CONFIGURE= yes + +WRKSRC= ${WRKDIR}/SWILL-0.1 + +.include "../../mk/bsd.pkg.mk" diff --git a/www/swill/PLIST b/www/swill/PLIST new file mode 100644 index 00000000000..a54053d0db9 --- /dev/null +++ b/www/swill/PLIST @@ -0,0 +1,3 @@ +@comment $NetBSD: PLIST,v 1.1.1.1.48.2 2002/06/23 19:04:43 jlam Exp $ +include/swill.h +lib/libswill.a diff --git a/www/swill/distinfo b/www/swill/distinfo new file mode 100644 index 00000000000..06d7e4faa0e --- /dev/null +++ b/www/swill/distinfo @@ -0,0 +1,4 @@ +$NetBSD: distinfo,v 1.1.1.1.12.2 2002/06/23 19:04:43 jlam Exp $ + +SHA1 (swill-0.1.tar.gz) = bfdc0e8fc49532aa656b166eeeedbdb6c378ef07 +Size (swill-0.1.tar.gz) = 119170 bytes diff --git a/www/thttpd/Makefile b/www/thttpd/Makefile index 905ac48feb4..a53c3b6ceeb 100644 --- a/www/thttpd/Makefile +++ b/www/thttpd/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.17 2001/12/02 06:56:47 jlam Exp $ +# $NetBSD: Makefile,v 1.17.2.1 2002/06/23 19:04:44 jlam Exp $ -DISTNAME= thttpd-2.21b +DISTNAME= thttpd-2.23beta1 +PKGNAME= thttpd-2.23.0.1 CATEGORIES= www MASTER_SITES= http://www.acme.com/software/thttpd/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ @@ -23,16 +24,16 @@ RCD_SCRIPTS= thttpd pre-configure: ${MV} ${WRKSRC}/extras/htpasswd.1 ${WRKSRC}/extras/thtpasswd.1 ${MV} ${WRKSRC}/extras/htpasswd.c ${WRKSRC}/extras/thtpasswd.c - for file in thttpd.8 extras/Makefile.in extras/thtpasswd.c; do \ - ${MV} -f ${WRKSRC}/$${file} ${WRKSRC}/$${file}.bak; \ - ${SED} -e "s,htpasswd,thtpasswd,g" \ - ${WRKSRC}/$${file}.bak > ${WRKSRC}/$${file}; \ + for FILE in thttpd.8 extras/Makefile.in extras/thtpasswd.c; do \ + ${MV} -f ${WRKSRC}/$${FILE} ${WRKSRC}/$${FILE}.bak; \ + ${SED} -e "s,\.htpasswd,XXX,g;s,htpasswd,thtpasswd,g;s,XXX,.htpasswd,g" \ + ${WRKSRC}/$${FILE}.bak > ${WRKSRC}/$${FILE}; \ done post-build: - for file in thttpd.conf thttpd.sh; do \ + for FILE in thttpd.conf thttpd.sh; do \ ${SED} ${FILES_SUBST_SED} \ - ${FILESDIR}/$${file} > ${WRKDIR}/$${file}; \ + ${FILESDIR}/$${FILE} > ${WRKDIR}/$${FILE}; \ done pre-install: diff --git a/www/thttpd/distinfo b/www/thttpd/distinfo index f7c95246123..4ee990de2ff 100644 --- a/www/thttpd/distinfo +++ b/www/thttpd/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.3 2001/06/09 11:26:33 wiz Exp $ +$NetBSD: distinfo,v 1.3.2.1 2002/06/23 19:04:44 jlam Exp $ -SHA1 (thttpd-2.21b.tar.gz) = 4ad90204802b2456a59c9bfdf20695e4a3ebb6fd -Size (thttpd-2.21b.tar.gz) = 127824 bytes +SHA1 (thttpd-2.23beta1.tar.gz) = 22331276c2e5f6f1850f0b1ca2b739d0db88bf51 +Size (thttpd-2.23beta1.tar.gz) = 128696 bytes SHA1 (sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658 Size (sitedrivenby.gif) = 8519 bytes -SHA1 (patch-aa) = e8dab4830fe993da8eb35de8250502e807b60444 +SHA1 (patch-aa) = 0f739bebf1ade45a9b9819fc92d48eeb1004eb66 SHA1 (patch-ab) = 3766ae48fabc1980483e482157d1267971e621df -SHA1 (patch-ac) = 7ea638e2d9b33efddd1c98d263b56887362e5cf2 +SHA1 (patch-ac) = 71b2926a9513bd25a124510ad5f234d029492eb2 SHA1 (patch-ad) = 1d7777516ff0c5e7b03643809854bf96707759ec diff --git a/www/thttpd/patches/patch-aa b/www/thttpd/patches/patch-aa index c8b39dedfd4..e935b008562 100644 --- a/www/thttpd/patches/patch-aa +++ b/www/thttpd/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.5 2000/12/17 22:21:44 jlam Exp $ +$NetBSD: patch-aa,v 1.5.2.1 2002/06/23 19:04:45 jlam Exp $ ---- Makefile.in.orig Tue Jul 4 12:21:32 2000 +--- Makefile.in.orig Wed Apr 3 04:49:35 2002 +++ Makefile.in @@ -34,7 +34,7 @@ # Pathname of directory to install the man page. @@ -29,15 +29,19 @@ $NetBSD: patch-aa,v 1.5 2000/12/17 22:21:44 jlam Exp $ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ NETLIBS = @V_NETLIBS@ -@@ -111,10 +111,10 @@ +@@ -109,12 +109,12 @@ install: installthis install-man installsubdirs installthis: +- -mkdir -p $(DESTDIR)$(BINDIR) - $(INSTALL) -m 555 -o bin -g bin thttpd $(DESTDIR)$(BINDIR) ++ $(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(BINDIR) + $(BSD_INSTALL_PROGRAM) thttpd $(DESTDIR)$(BINDIR) install-man: +- -mkdir -p $(DESTDIR)$(MANDIR)/man8 - $(INSTALL) -m 444 -o bin -g bin thttpd.8 $(DESTDIR)$(MANDIR)/man8 ++ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(MANDIR)/man8 + $(BSD_INSTALL_MAN) thttpd.8 $(DESTDIR)$(MANDIR)/man8 installsubdirs: diff --git a/www/thttpd/patches/patch-ac b/www/thttpd/patches/patch-ac index 0bb0df4849e..819e40548b5 100644 --- a/www/thttpd/patches/patch-ac +++ b/www/thttpd/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.5 2001/01/14 06:14:14 jlam Exp $ +$NetBSD: patch-ac,v 1.5.2.1 2002/06/23 19:04:45 jlam Exp $ ---- cgi-src/Makefile.in.orig Tue Sep 26 16:20:14 2000 +--- cgi-src/Makefile.in.orig Mon Nov 12 22:52:00 2001 +++ cgi-src/Makefile.in @@ -34,7 +34,7 @@ CCOPT = @V_CCOPT@ @@ -13,7 +13,7 @@ $NetBSD: patch-ac,v 1.5 2001/01/14 06:14:14 jlam Exp $ NETLIBS = @V_NETLIBS@ @@ -69,15 +69,15 @@ install: all - -mkdir $(CGIBINDIR) + -mkdir -p $(CGIBINDIR) rm -f $(CGIBINDIR)/redirect - cp redirect $(CGIBINDIR)/redirect + $(BSD_INSTALL_PROGRAM) redirect $(CGIBINDIR)/redirect diff --git a/www/w3m-img/DESCR b/www/w3m-img/DESCR new file mode 100644 index 00000000000..5994d869427 --- /dev/null +++ b/www/w3m-img/DESCR @@ -0,0 +1,25 @@ +W3m is a termial-based WWW browser which supports HTML tables and frames. +It's small, so faster than other WWW browsers. It also supports following +URL by clicking mouse button on the anchor in xterm and its variants from +990526 version. Additionally, this package enables inline-image support +which is added in version 0.3. + +It uses Boehm-GC to implement the table/frame parser. + +Quoted from README.m17n: + +Muntilingualizaion of w3m + 2002/02/16 + H. Sakamoto + +Introduction + + I have tried the muntilingualization of w3m (w3m-m17n). + The patch for w3m-0.2.1 is available on the following site. + + http://www2u.biglobe.ne.jp/~hsaka/w3m/index.html#m17n + patch/w3m-0.3-m17n-20020316.tar.gz + patch/README.m17n + + It is a development version. And enough test is not preformed because + I can understand Japanese only. Please use, test, and report bugs. diff --git a/www/w3m-img/Makefile b/www/w3m-img/Makefile new file mode 100644 index 00000000000..bf01fafd67f --- /dev/null +++ b/www/w3m-img/Makefile @@ -0,0 +1,14 @@ +# $NetBSD: Makefile,v 1.1.1.1.2.2 2002/06/23 19:04:48 jlam Exp $ +# + +PKGNAME= w3m-img-${W3M_BASE_VERS} +COMMENT= multilingualized version of a pager/text-based browser w3m with inline image support + +CONFLICTS+= w3m-[0-9]* + +# enable image support +W3M_USE_IMAGE= YES + +PLIST_SRC= ${.CURDIR}/../../www/w3m/PLIST + +.include "../../www/w3m/Makefile.common" diff --git a/www/w3m/Makefile b/www/w3m/Makefile index df84503c322..3a80b5eef0c 100644 --- a/www/w3m/Makefile +++ b/www/w3m/Makefile @@ -1,174 +1,10 @@ -# $NetBSD: Makefile,v 1.35 2002/04/24 13:48:48 martti Exp $ +# $NetBSD: Makefile,v 1.35.2.1 2002/06/23 19:04:46 jlam Exp $ # -DISTNAME= w3m-${W3M_VERS} PKGNAME= w3m-${W3M_BASE_VERS} -PKGREVISION= # null -CATEGORIES= www -MASTER_SITES= http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/ - -MAINTAINER= kei@netbsd.org -HOMEPAGE= http://www2u.biglobe.ne.jp/~hsaka/w3m/ +PKGREVISION= 2 COMMENT= multilingualized version of a pager/text-based browser w3m -CONFLICTS+= w3m-m17n-[0-9]* - -USE_BUILDLINK_ONLY= yes - -W3M_VERS= ${W3M_BASE_VERS}-m17n-${W3M_M17N_VERS} -W3M_BASE_VERS= 0.3 -W3M_M17N_VERS= 20020316 - -# w3m source with m17n patch applied. -W3M_SRC= ${DISTNAME}${EXTRACT_SUFX} -WRKSRC= ${WRKDIR}/w3m-${W3M_VERS} -DISTFILES+= ${W3M_SRC} -EXTRACT_ONLY= ${W3M_SRC} - -# multibyte/wide character support was split into libwc in latest version of -# w3m-m17n. -#LIBWC_SRC= libwc-latest.tar.gz -#LIBWC_WRKSRC= ${WRKDIR}/w3m-${W3M_VERS} -#DISTFILES+= ${LIBWC_SRC} -#EXTRACT_ONLY+= ${LIBWC_SRC} - -HELPDIR= share/doc/w3m -HELPERDIR= lib/w3m - -# configure will check IPv6 readiness automatically -BUILD_DEFS+= USE_INET6 - -.include "../../mk/bsd.prefs.mk" -.if defined(EXTRACT_USING_PAX) -EXTRACT_ELEMENTS= -c ${DISTNAME}/gc/\* -.else -EXTRACT_ELEMENTS= --exclude ${DISTNAME}/gc/\* -.endif - -# Always enable multiligualization. -W3M_USE_M17N= YES -# Set this to YES if you want unicode support. -W3M_USE_UNICODE?= YES -# set this to YES to use Japanese messages. -W3M_USE_JAPANESE_MESSAGES?= NO -# Set this to YES to use lynx like key binding. -W3M_USE_LYNX_KEY?= NO -# set this to YES if you want HTTPS support. -W3M_USE_SSL?= YES -# set this to YES if you want HTTP cookie support. -W3M_USE_COOKIE?= YES -# set this to YES if you want mouse support. -W3M_USE_MOUSE?= YES -# set this to YES if you want color support. -W3M_USE_COLOR?= YES - -CONFIGURE_ENV+= use_m17n=y -.if ${W3M_USE_UNICODE} == YES -CONFIGURE_ENV+= use_unicode=y -.else -CONFIGURE_ENV+= use_unicode=n -.endif -CONFIGURE_ENV+= charset=ISO-2022-JP-2 -.if ${W3M_USE_JAPANESE_MESSAGES} == YES -CONFIGURE_ARGS+= --lang=ja -HELP_LANG= _ja -.else -CONFIGURE_ARGS+= --lang=en -HELP_LANG= _en -.endif -.if ${W3M_USE_COLOR} == YES -CONFIGURE_ENV+= use_color=y -.else -CONFIGURE_ENV+= use_color=n -.endif -.if ${W3M_USE_MOUSE} == YES -CONFIGURE_ENV+= use_mouse=y -.else -CONFIGURE_ENV+= use_mouse=n -.endif -.if ${W3M_USE_COOKIE} == YES -CONFIGURE_ENV+= use_cookie=y -.else -CONFIGURE_ENV+= use_cookie=n -.endif -.if ${W3M_USE_SSL} == YES -USE_SSL= YES -CONFIGURE_ENV+= use_ssl=y use_ssl_verify=n -CONFIGURE_ARGS+= --ssl-includedir=${BUILDLINK_DIR}/include/openssl -CONFIGURE_ARGS+= --ssl-libdir=${BUILDLINK_DIR}/lib -.include "../../security/openssl/buildlink.mk" -.else -CONFIGURE_ENV+= use_ssl=n use_ssl_verify=n -.endif -.if ${W3M_USE_LYNX_KEY} == YES -CONFIGURE_ENV+= lynx_key=y -HELP_W3M= -lynx -.else -CONFIGURE_ENV+= lynx_key=n -HELP_W3M= -w3m -.endif -CONFIGURE_ENV+= use_menu=y use_matrix=n use_image=y use_ansi_color=y -CONFIGURE_ENV+= use_help_cgi=n use_migemo=n -CONFIGURE_ENV+= ded=vi dmail=Mail dbrowser= -CONFIGURE_ENV+= dcc="${CC}" dtermlib="-ltermcap" -CONFIGURE_ENV+= dmodel=6 -CONFIGURE_ENV+= LOCALBASE="${LOCALBASE}" -CONFIGURE_ARGS+= --yes -CONFIGURE_ARGS+= --suffix= -CONFIGURE_ARGS+= --prefix=${PREFIX} -CONFIGURE_ARGS+= --bindir=${PREFIX}/bin -CONFIGURE_ARGS+= --libdir=${PREFIX}/${HELPERDIR} -CONFIGURE_ARGS+= --helpdir=${PREFIX}/${HELPDIR} -CONFIGURE_ARGS+= --gc-includedir=${BUILDLINK_DIR}/include -CONFIGURE_ARGS+= --gc-libdir=${BUILDLINK_DIR}/lib - -post-extract: - @(cd ${WRKSRC}/doc; ${RM} -fr CVS) - @(cd ${WRKSRC}/doc-jp; ${RM} -fr CVS) -# @${LN} ${LIBWC_WRKSRC} ${WRKSRC}/libwc - -post-patch: - ${FIND} ${WRKSRC} -type f -name '*.orig' | ${XARGS} ${RM} - -# do not look at previous configuration -do-configure: - @(cd ${WRKSRC} && CC="${CC}" ac_cv_path_CC="${CC}" \ - INSTALL="${INSTALL_SCRIPT}" \ - CFLAGS="${CFLAGS}" INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ - ${CONFIGURE_ENV} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}) - -pre-build: - @(cd ${WRKSRC}; \ - ${MAKE} XXMakefile; \ - ${MV} XXMakefile XXMakefile.gen; \ - ${SED} -e '/^GCLIB/s|gc/gc.a|-lgc|' -e '/^GCTARGET/s|gc/gc.a||' \ - XXMakefile.gen > XXMakefile) - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/w3m ${LOCALBASE}/bin - ${INSTALL_MAN} ${WRKSRC}/doc/w3m.1 ${LOCALBASE}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/doc-jp/w3m.1 ${LOCALBASE}/man/ja_JP.EUC/man1 - ${INSTALL_DATA_DIR} ${LOCALBASE}/${HELPDIR} - ${INSTALL_DATA} ${WRKSRC}/w3mhelp-w3m_en.html ${LOCALBASE}/${HELPDIR} - ${INSTALL_DATA} ${WRKSRC}/w3mhelp-w3m_ja.html ${LOCALBASE}/${HELPDIR} - ${INSTALL_DATA} ${WRKSRC}/w3mhelp-lynx_en.html ${LOCALBASE}/${HELPDIR} - ${INSTALL_DATA} ${WRKSRC}/w3mhelp-lynx_ja.html ${LOCALBASE}/${HELPDIR} - # Use ${PAX} to discard uid/gid - (cd ${WRKSRC}; ${PAX} -w doc doc-jp) | \ - (cd ${LOCALBASE}/${HELPDIR}; ${PAX} -r) - ${INSTALL_DATA_DIR} ${LOCALBASE}/${HELPERDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/inflate ${LOCALBASE}/${HELPERDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/w3mbookmark ${LOCALBASE}/${HELPERDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/w3mhelperpanel ${LOCALBASE}/${HELPERDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/w3mimgdisplay ${LOCALBASE}/${HELPERDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/w3mimgsize ${LOCALBASE}/${HELPERDIR} - -post-install: - (cd ${LOCALBASE}/${HELPDIR}; \ - ${RM} -f w3mhelp.html; \ - ${LN} -s w3mhelp${HELP_W3M}${HELP_LANG}.html w3mhelp.html) +CONFLICTS+= w3m-img-[0-9]* -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/imlib/buildlink.mk" -.include "../../devel/boehm-gc/buildlink.mk" -.include "../../mk/bsd.pkg.mk" +.include "../../www/w3m/Makefile.common" diff --git a/www/w3m/Makefile.common b/www/w3m/Makefile.common new file mode 100644 index 00000000000..126db7064da --- /dev/null +++ b/www/w3m/Makefile.common @@ -0,0 +1,192 @@ +# $NetBSD: Makefile.common,v 1.4.2.2 2002/06/23 19:04:46 jlam Exp $ +# + +DISTNAME= w3m-${W3M_VERS} +CATEGORIES= www +MASTER_SITES= http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/ + +MAINTAINER= kei@netbsd.org +HOMEPAGE= http://www2u.biglobe.ne.jp/~hsaka/w3m/ + +USE_BUILDLINK_ONLY= yes + +W3M_VERS= ${W3M_BASE_VERS}-m17n-${W3M_M17N_VERS} +W3M_BASE_VERS= 0.3 +W3M_M17N_VERS= 20020316 + +# w3m source with m17n patch applied. +W3M_SRC= ${DISTNAME}${EXTRACT_SUFX} +WRKSRC= ${WRKDIR}/w3m-${W3M_VERS} +DISTFILES+= ${W3M_SRC} +EXTRACT_ONLY= ${W3M_SRC} + +PATCHDIR= ${.CURDIR}/../w3m/patches +DISTINFO_FILE= ${.CURDIR}/../w3m/distinfo + +# For manuals +USE_PERL5= # defined + +# multibyte/wide character support was split into libwc in latest version of +# w3m-m17n. +#LIBWC_SRC= libwc-latest.tar.gz +#LIBWC_WRKSRC= ${WRKDIR}/w3m-${W3M_VERS} +#DISTFILES+= ${LIBWC_SRC} +#EXTRACT_ONLY+= ${LIBWC_SRC} + +HELPDIR= share/doc/w3m +HELPERDIR= lib/w3m + +# configure will check IPv6 readiness automatically +BUILD_DEFS+= USE_INET6 + +.include "../../mk/bsd.prefs.mk" +.if defined(EXTRACT_USING_PAX) +EXTRACT_ELEMENTS= -c ${DISTNAME}/gc/\* +.else +EXTRACT_ELEMENTS= --exclude ${DISTNAME}/gc/\* +.endif + +# Always enable multiligualization. +W3M_USE_M17N= YES +# Set this to YES if you want unicode support. +W3M_USE_UNICODE?= YES +# set this to YES to use Japanese messages. +W3M_USE_JAPANESE_MESSAGES?= NO +# Set this to YES to use lynx like key binding. +W3M_USE_LYNX_KEY?= NO +# set this to YES if you want HTTPS support. +W3M_USE_SSL?= YES +# set this to YES if you want HTTP cookie support. +W3M_USE_COOKIE?= YES +# set this to YES if you want mouse support. +W3M_USE_MOUSE?= YES +# set this to YES if you want color support. +W3M_USE_COLOR?= YES +# set this to YES if you want image support. +W3M_USE_IMAGE?= NO + +CONFIGURE_ENV+= use_m17n=y +.if ${W3M_USE_UNICODE} == YES +CONFIGURE_ENV+= use_unicode=y +.else +CONFIGURE_ENV+= use_unicode=n +.endif +CONFIGURE_ENV+= charset=ISO-2022-JP-2 +.if ${W3M_USE_JAPANESE_MESSAGES} == YES +CONFIGURE_ARGS+= --lang=ja +HELP_LANG= _ja +.else +CONFIGURE_ARGS+= --lang=en +HELP_LANG= _en +.endif +.if ${W3M_USE_COLOR} == YES +CONFIGURE_ENV+= use_color=y +.else +CONFIGURE_ENV+= use_color=n +.endif +.if ${W3M_USE_MOUSE} == YES +CONFIGURE_ENV+= use_mouse=y +.else +CONFIGURE_ENV+= use_mouse=n +.endif +.if ${W3M_USE_COOKIE} == YES +CONFIGURE_ENV+= use_cookie=y +.else +CONFIGURE_ENV+= use_cookie=n +.endif +.if ${W3M_USE_SSL} == YES +USE_SSL= YES +CONFIGURE_ENV+= use_ssl=y use_ssl_verify=n +CONFIGURE_ARGS+= --ssl-includedir=${BUILDLINK_DIR}/include/openssl +CONFIGURE_ARGS+= --ssl-libdir=${BUILDLINK_DIR}/lib +.include "../../security/openssl/buildlink.mk" +.else +CONFIGURE_ENV+= use_ssl=n use_ssl_verify=n +.endif +.if ${W3M_USE_LYNX_KEY} == YES +CONFIGURE_ENV+= lynx_key=y +HELP_W3M= -lynx +.else +CONFIGURE_ENV+= lynx_key=n +HELP_W3M= -w3m +.endif +.if ${W3M_USE_IMAGE} == YES +CONFIGURE_ENV+= use_image=y +.else +CONFIGURE_ENV+= use_image=n +.endif +CONFIGURE_ENV+= use_menu=y use_matrix=n use_ansi_color=y +CONFIGURE_ENV+= use_help_cgi=n use_migemo=n +CONFIGURE_ENV+= ded=vi dmail=Mail dbrowser= +CONFIGURE_ENV+= dcc="${CC}" dtermlib="-ltermcap" +CONFIGURE_ENV+= dmodel=6 +CONFIGURE_ENV+= LOCALBASE="${LOCALBASE}" +CONFIGURE_ARGS+= --yes +CONFIGURE_ARGS+= --suffix= +CONFIGURE_ARGS+= --prefix=${PREFIX} +CONFIGURE_ARGS+= --bindir=${PREFIX}/bin +CONFIGURE_ARGS+= --libdir=${PREFIX}/${HELPERDIR} +CONFIGURE_ARGS+= --helpdir=${PREFIX}/${HELPDIR} +CONFIGURE_ARGS+= --gc-includedir=${BUILDLINK_DIR}/include +CONFIGURE_ARGS+= --gc-libdir=${BUILDLINK_DIR}/lib + +.if ${W3M_USE_IMAGE} == YES +PLIST_SUBST+= USE_IMAGE='' +.else +PLIST_SUBST+= USE_IMAGE='@comment ' +.endif + +post-extract: + @(cd ${WRKSRC}/doc; ${RM} -fr CVS) + @(cd ${WRKSRC}/doc-jp; ${RM} -fr CVS) +# @${LN} ${LIBWC_WRKSRC} ${WRKSRC}/libwc + +post-patch: + ${FIND} ${WRKSRC} -type f -name '*.orig' | ${XARGS} ${RM} + +# do not look at previous configuration +do-configure: + @(cd ${WRKSRC} && CC="${CC}" ac_cv_path_CC="${CC}" \ + INSTALL="${INSTALL_SCRIPT}" \ + CFLAGS="${CFLAGS}" INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ + ${CONFIGURE_ENV} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}) + +pre-build: + @(cd ${WRKSRC}; \ + ${MAKE} XXMakefile; \ + ${MV} XXMakefile XXMakefile.gen; \ + ${SED} -e '/^GCLIB/s|gc/gc.a|-lgc|' -e '/^GCTARGET/s|gc/gc.a||' \ + XXMakefile.gen > XXMakefile) + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/w3m ${LOCALBASE}/bin + ${INSTALL_MAN} ${WRKSRC}/doc/w3m.1 ${LOCALBASE}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/doc-jp/w3m.1 ${LOCALBASE}/man/ja_JP.EUC/man1 + ${INSTALL_DATA_DIR} ${LOCALBASE}/${HELPDIR} + ${INSTALL_DATA} ${WRKSRC}/w3mhelp-w3m_en.html ${LOCALBASE}/${HELPDIR} + ${INSTALL_DATA} ${WRKSRC}/w3mhelp-w3m_ja.html ${LOCALBASE}/${HELPDIR} + ${INSTALL_DATA} ${WRKSRC}/w3mhelp-lynx_en.html ${LOCALBASE}/${HELPDIR} + ${INSTALL_DATA} ${WRKSRC}/w3mhelp-lynx_ja.html ${LOCALBASE}/${HELPDIR} + # Use ${PAX} to discard uid/gid + (cd ${WRKSRC}; ${PAX} -w doc doc-jp) | \ + (cd ${LOCALBASE}/${HELPDIR}; ${PAX} -r) + ${INSTALL_DATA_DIR} ${LOCALBASE}/${HELPERDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/inflate ${LOCALBASE}/${HELPERDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/w3mbookmark ${LOCALBASE}/${HELPERDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/w3mhelperpanel ${LOCALBASE}/${HELPERDIR} +.if ${W3M_USE_IMAGE} == YES + ${INSTALL_PROGRAM} ${WRKSRC}/w3mimgdisplay ${LOCALBASE}/${HELPERDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/w3mimgsize ${LOCALBASE}/${HELPERDIR} +.endif + +post-install: + (cd ${LOCALBASE}/${HELPDIR}; \ + ${RM} -f w3mhelp.html; \ + ${LN} -s w3mhelp${HELP_W3M}${HELP_LANG}.html w3mhelp.html) + +.if ${W3M_USE_IMAGE} == YES +.include "../../graphics/jpeg/buildlink.mk" +.include "../../graphics/imlib/buildlink.mk" +.endif +.include "../../devel/boehm-gc/buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/www/w3m/PLIST b/www/w3m/PLIST index b552a35e745..5c38dd24742 100644 --- a/www/w3m/PLIST +++ b/www/w3m/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/04/21 23:34:32 kei Exp $ +@comment $NetBSD: PLIST,v 1.3.2.1 2002/06/23 19:04:47 jlam Exp $ bin/w3m man/man1/w3m.1 man/ja_JP.EUC/man1/w3m.1 @@ -51,6 +51,6 @@ share/doc/w3m/doc-jp/w3m.1 lib/w3m/inflate lib/w3m/w3mbookmark lib/w3m/w3mhelperpanel -lib/w3m/w3mimgdisplay -lib/w3m/w3mimgsize +${USE_IMAGE}lib/w3m/w3mimgdisplay +${USE_IMAGE}lib/w3m/w3mimgsize @dirrm lib/w3m diff --git a/www/wwwoffle/distinfo b/www/wwwoffle/distinfo index feaea93f798..f9ff55ef4eb 100644 --- a/www/wwwoffle/distinfo +++ b/www/wwwoffle/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.10 2002/04/25 10:43:26 fredb Exp $ +$NetBSD: distinfo,v 1.10.2.1 2002/06/23 19:04:49 jlam Exp $ SHA1 (wwwoffle-2.7b.tgz) = fb9d8c4a374e9fe1c339537af756896f6dd1172d Size (wwwoffle-2.7b.tgz) = 857511 bytes SHA1 (patch-aa) = 897de385a47826e16a8a09b1bc1c207a2d350f94 +SHA1 (patch-ab) = 976d43802c8d8db406b1e5bceead2903c6ef33bf diff --git a/www/wwwoffle/patches/patch-ab b/www/wwwoffle/patches/patch-ab new file mode 100644 index 00000000000..b1648db3a45 --- /dev/null +++ b/www/wwwoffle/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.7.2.2 2002/06/23 19:04:49 jlam Exp $ + +--- src/headbody.c.orig Sat Apr 13 09:45:24 2002 ++++ src/headbody.c +@@ -205,7 +205,7 @@ + { + /* Append text to the last header line */ + +- if(!head->key[head->n-1]) ++ if(head->n==0 || !head->key[head->n-1]) + return; /* weird: there must be a last header... */ + + head->size+=strlen(val); |