diff options
| -rw-r--r-- | www/apache13+ipv6/Makefile | 6 | ||||
| -rw-r--r-- | www/apache13+ipv6/distinfo | 4 | ||||
| -rw-r--r-- | www/apache13+ipv6/files/FreeBSD.layout | 1 | ||||
| -rw-r--r-- | www/apache13+ipv6/files/patch-ab | 42 | ||||
| -rw-r--r-- | www/apache13+ipv6/pkg-plist | 162 |
5 files changed, 180 insertions, 35 deletions
diff --git a/www/apache13+ipv6/Makefile b/www/apache13+ipv6/Makefile index 12482bf40d31..bd13e5c65e48 100644 --- a/www/apache13+ipv6/Makefile +++ b/www/apache13+ipv6/Makefile @@ -6,8 +6,7 @@ # PORTNAME= apache+ipv6 -PORTVERSION= 1.3.20 -PORTREVISION= 2 +PORTVERSION= 1.3.22 CATEGORIES= www ipv6 MASTER_SITES= http://httpd.apache.org/dist/httpd/ \ ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/httpd/ \ @@ -27,8 +26,7 @@ MASTER_SITES= http://httpd.apache.org/dist/httpd/ \ DISTNAME= apache_${PORTVERSION} PATCH_SITES= ftp://ftp.piuha.net/pub/misc/ -PATCHFILES= apache-1.3.20-v6-20011009.diff.gz -PATCH_DIST_STRIP= -p1 +PATCHFILES= apache-1.3.22-v6-20011017.diff.gz MAINTAINER= sumikawa@FreeBSD.org diff --git a/www/apache13+ipv6/distinfo b/www/apache13+ipv6/distinfo index 1d238e83c017..d1a01f0f8a6a 100644 --- a/www/apache13+ipv6/distinfo +++ b/www/apache13+ipv6/distinfo @@ -1,2 +1,2 @@ -MD5 (apache_1.3.20.tar.gz) = d58d373b5f528a61a3490daec5e8f91f -MD5 (apache-1.3.20-v6-20011009.diff.gz) = f6edb61668577b289b4876f44226e3be +MD5 (apache_1.3.22.tar.gz) = 77d34c0ac49c3af2416b786228007f90 +MD5 (apache-1.3.22-v6-20011017.diff.gz) = a639f8f178b3e2d618d4dc6579216f87 diff --git a/www/apache13+ipv6/files/FreeBSD.layout b/www/apache13+ipv6/files/FreeBSD.layout index 5524e186e9c0..29ec00a18559 100644 --- a/www/apache13+ipv6/files/FreeBSD.layout +++ b/www/apache13+ipv6/files/FreeBSD.layout @@ -10,6 +10,7 @@ datadir: $prefix/www iconsdir: $datadir/icons htdocsdir: $datadir/data + manualdir: $prefix/share/doc/apache/manual cgidir: $datadir/cgi-bin includedir: $prefix/include/apache localstatedir: /var diff --git a/www/apache13+ipv6/files/patch-ab b/www/apache13+ipv6/files/patch-ab index e4448f1e47ca..8615b1e3f9e0 100644 --- a/www/apache13+ipv6/files/patch-ab +++ b/www/apache13+ipv6/files/patch-ab @@ -1,6 +1,6 @@ ---- Makefile.tmpl.orig Tue Jan 11 22:47:41 2000 -+++ Makefile.tmpl Mon Jan 24 19:50:42 2000 -@@ -123,6 +123,7 @@ +--- Makefile.tmpl.orig Sun Oct 7 02:01:09 2001 ++++ Makefile.tmpl Sun Oct 14 11:14:32 2001 +@@ -127,6 +127,7 @@ runtimedir = @runtimedir@ logfiledir = @logfiledir@ proxycachedir = @proxycachedir@ @@ -8,19 +8,20 @@ libexecdir_relative = @libexecdir_relative@ -@@ -266,9 +267,9 @@ +@@ -270,10 +271,10 @@ $(MKDIR) $(root)$(mandir)/man1 $(MKDIR) $(root)$(mandir)/man8 $(MKDIR) $(root)$(sysconfdir) - $(MKDIR) $(root)$(htdocsdir) + $(MKDIR) $(root)$(doc_prefix) + $(MKDIR) $(root)$(manualdir) $(MKDIR) $(root)$(iconsdir) - $(MKDIR) $(root)$(cgidir) + $(MKDIR) $(root)$(cgidir).default $(MKDIR) $(root)$(includedir) $(MKDIR) $(root)$(includedir)/xml $(MKDIR) $(root)$(runtimedir) -@@ -452,25 +453,33 @@ +@@ -457,33 +458,41 @@ # icons and distributed CGI scripts. install-data: @echo "===> [data: Installing initial data files]" @@ -32,25 +33,34 @@ +# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \ +# else \ + echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \ - (cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - *) |\ + (cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - index* apache_pb.* ) |\ - (cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \ - find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \ -- find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \ +- find $(root)$(htdocsdir)/ -type f -print | xargs chmod a+r ; \ - fi -- -@if [ -f $(root)$(cgidir)/printenv ]; then \ -- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \ -- else \ +- -@if [ -d $(TOP)/htdocs/manual ]; then \ + (cd $(root)$(doc_prefix)/ && $(TAR) -xf -); \ + find $(root)$(doc_prefix)/ -type d -exec chmod a+rx {} \; ; \ -+ find $(root)$(doc_prefix)/ -type f -exec chmod a+r {} \; ; \ ++ find $(root)$(doc_prefix)/ -type f -print | xargs chmod a+r ; \ ++# fi ++# -@if [ -d $(TOP)/htdocs/manual ]; then \ + echo "Copying tree $(TOP)/htdocs/manual -> $(root)/$(manualdir)/"; \ + (cd $(TOP)/htdocs/manual/ && $(TAR) $(TAROPT) - *) |\ + (cd $(root)$(manualdir)/ && $(TAR) -xf -); \ + find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \ + find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \ +- fi +- -@if [ -f $(root)$(cgidir)/printenv ]; then \ +- echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \ +- else \ +# fi + if [ ! -d $(root)$(htdocsdir) ]; then \ + $(LN) -sf $(root)$(doc_prefix) $(root)$(htdocsdir); \ -+ fi ++ fi + $(RM) $(root)$(htdocsdir).default + $(LN) -s $(root)$(doc_prefix) $(root)$(htdocsdir).default +# -@if [ -f $(root)$(cgidir)/printenv ]; then \ -+# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \ ++# echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \ +# else \ for script in printenv test-cgi; do \ cat $(TOP)/cgi-bin/$${script} |\ @@ -61,13 +71,15 @@ + echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir).default/$${script}"; \ + $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir).default/$${script}; \ done; \ +- fi +# fi + if [ ! -d $(root)$(cgidir) ]; then \ + $(LN) -sf $(root)$(cgidir).default $(root)$(cgidir); \ - fi ++ fi @echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \ (cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\ -@@ -509,10 +518,10 @@ + (cd $(root)$(iconsdir)/ && $(TAR) -xf -); \ +@@ -522,10 +531,10 @@ -e 's;logs/accept\.lock;$(runtimedir)/$(TARGET).lock;' \ -e 's;logs/apache_runtime_status;$(runtimedir)/$(TARGET).scoreboard;' \ -e 's;logs/httpd\.pid;$(runtimedir)/$(TARGET).pid;' \ diff --git a/www/apache13+ipv6/pkg-plist b/www/apache13+ipv6/pkg-plist index ce475aa5ca9f..37bccd6584a2 100644 --- a/www/apache13+ipv6/pkg-plist +++ b/www/apache13+ipv6/pkg-plist @@ -103,7 +103,6 @@ sbin/apxs sbin/httpd sbin/logresolve sbin/rotatelogs -share/doc/apache/README.rus @exec mkdir -p %D/www @exec ln -fs %B %D/www/data.default @unexec rm -f %D/www/data.default @@ -125,6 +124,7 @@ share/doc/apache/index.html.ja.jis share/doc/apache/index.html.kr.iso-kr share/doc/apache/index.html.lu share/doc/apache/index.html.nl +share/doc/apache/index.html.nn share/doc/apache/index.html.no share/doc/apache/index.html.po.iso-pl share/doc/apache/index.html.pt @@ -139,20 +139,30 @@ share/doc/apache/index.html.ru.utf8 share/doc/apache/index.html.se share/doc/apache/index.html.zh.Big5 share/doc/apache/manual/LICENSE -share/doc/apache/manual/bind.html -share/doc/apache/manual/cgi_path.html +share/doc/apache/manual/bind.html.en +share/doc/apache/manual/bind.html.fr +share/doc/apache/manual/bind.html.html +share/doc/apache/manual/cgi_path.html.en +share/doc/apache/manual/cgi_path.html.fr +share/doc/apache/manual/cgi_path.html.html share/doc/apache/manual/configuring.html.en share/doc/apache/manual/configuring.html.fr share/doc/apache/manual/configuring.html.html share/doc/apache/manual/configuring.html.ja.jis share/doc/apache/manual/content-negotiation.html share/doc/apache/manual/custom-error.html.en +share/doc/apache/manual/custom-error.html.fr share/doc/apache/manual/custom-error.html.html share/doc/apache/manual/custom-error.html.ja.jis -share/doc/apache/manual/dns-caveats.html +share/doc/apache/manual/cygwin.html +share/doc/apache/manual/dns-caveats.html.en +share/doc/apache/manual/dns-caveats.html.fr +share/doc/apache/manual/dns-caveats.html.html share/doc/apache/manual/dso.html share/doc/apache/manual/ebcdic.html -share/doc/apache/manual/env.html +share/doc/apache/manual/env.html.en +share/doc/apache/manual/env.html.html +share/doc/apache/manual/env.html.ja.jis share/doc/apache/manual/footer.html share/doc/apache/manual/handler.html.en share/doc/apache/manual/handler.html.html @@ -186,11 +196,14 @@ share/doc/apache/manual/install.html.es share/doc/apache/manual/install.html.fr share/doc/apache/manual/install.html.html share/doc/apache/manual/install.html.ja.jis -share/doc/apache/manual/invoking.html +share/doc/apache/manual/invoking.html.en share/doc/apache/manual/invoking.html.fr share/doc/apache/manual/invoking.html.html -share/doc/apache/manual/keepalive.html +share/doc/apache/manual/keepalive.html.en +share/doc/apache/manual/keepalive.html.html +share/doc/apache/manual/keepalive.html.ja.jis share/doc/apache/manual/location.html +share/doc/apache/manual/logs.html share/doc/apache/manual/man-template.html share/doc/apache/manual/misc/API.html share/doc/apache/manual/misc/FAQ.html @@ -216,17 +229,27 @@ share/doc/apache/manual/misc/security_tips.html share/doc/apache/manual/misc/tutorials.html share/doc/apache/manual/misc/vif-info.html share/doc/apache/manual/misc/windoz_keepalive.html -share/doc/apache/manual/mod/core.html +share/doc/apache/manual/mod/core.html.en +share/doc/apache/manual/mod/core.html.fr +share/doc/apache/manual/mod/core.html.html share/doc/apache/manual/mod/directive-dict.html.en +share/doc/apache/manual/mod/directive-dict.html.fr share/doc/apache/manual/mod/directive-dict.html.html share/doc/apache/manual/mod/directive-dict.html.ja.jis -share/doc/apache/manual/mod/directives.html +share/doc/apache/manual/mod/directives.html.de +share/doc/apache/manual/mod/directives.html.en +share/doc/apache/manual/mod/directives.html.fr +share/doc/apache/manual/mod/directives.html.html +share/doc/apache/manual/mod/directives.html.ja.jis share/doc/apache/manual/mod/footer.html share/doc/apache/manual/mod/header.html -share/doc/apache/manual/mod/index-bytype.html +share/doc/apache/manual/mod/index-bytype.html.en share/doc/apache/manual/mod/index-bytype.html.fr -share/doc/apache/manual/mod/index.html +share/doc/apache/manual/mod/index-bytype.html.html +share/doc/apache/manual/mod/index.html.en share/doc/apache/manual/mod/index.html.fr +share/doc/apache/manual/mod/index.html.html +share/doc/apache/manual/mod/index.html.ja.jis share/doc/apache/manual/mod/mod_access.html share/doc/apache/manual/mod/mod_actions.html share/doc/apache/manual/mod/mod_alias.html @@ -316,7 +339,7 @@ share/doc/apache/manual/server-wide.html.fr share/doc/apache/manual/server-wide.html.html share/doc/apache/manual/server-wide.html.ja.jis share/doc/apache/manual/sourcereorg.html -share/doc/apache/manual/stopping.html +share/doc/apache/manual/stopping.html.en share/doc/apache/manual/stopping.html.fr share/doc/apache/manual/stopping.html.html share/doc/apache/manual/suexec.html.en @@ -338,123 +361,234 @@ share/doc/apache/manual/vhosts/index.html.html share/doc/apache/manual/vhosts/index.html.ja.jis share/doc/apache/manual/vhosts/ip-based.html share/doc/apache/manual/vhosts/mass.html -share/doc/apache/manual/vhosts/name-based.html +share/doc/apache/manual/vhosts/name-based.html.en +share/doc/apache/manual/vhosts/name-based.html.html +share/doc/apache/manual/vhosts/name-based.html.ja.jis share/doc/apache/manual/vhosts/vhosts-in-depth.html share/doc/apache/manual/vhosts/virtual-host.html share/doc/apache/manual/win_compiling.html -share/doc/apache/manual/win_service.html +share/doc/apache/manual/win_service.html.en +share/doc/apache/manual/win_service.html.html +share/doc/apache/manual/win_service.html.ja.jis share/doc/apache/manual/windows.html www/cgi-bin.default/printenv www/cgi-bin.default/test-cgi www/icons/README www/icons/a.gif +www/icons/a.png www/icons/alert.black.gif +www/icons/alert.black.png www/icons/alert.red.gif +www/icons/alert.red.png www/icons/apache_pb.gif +www/icons/apache_pb.png www/icons/back.gif +www/icons/back.png www/icons/ball.gray.gif +www/icons/ball.gray.png www/icons/ball.red.gif +www/icons/ball.red.png www/icons/binary.gif +www/icons/binary.png www/icons/binhex.gif +www/icons/binhex.png www/icons/blank.gif +www/icons/blank.png www/icons/bomb.gif +www/icons/bomb.png www/icons/box1.gif +www/icons/box1.png www/icons/box2.gif +www/icons/box2.png www/icons/broken.gif +www/icons/broken.png www/icons/burst.gif +www/icons/burst.png www/icons/c.gif +www/icons/c.png www/icons/comp.blue.gif +www/icons/comp.blue.png www/icons/comp.gray.gif +www/icons/comp.gray.png www/icons/compressed.gif +www/icons/compressed.png www/icons/continued.gif +www/icons/continued.png www/icons/dir.gif +www/icons/dir.png www/icons/down.gif +www/icons/down.png www/icons/dvi.gif +www/icons/dvi.png www/icons/f.gif +www/icons/f.png www/icons/folder.gif www/icons/folder.open.gif +www/icons/folder.open.png +www/icons/folder.png www/icons/folder.sec.gif +www/icons/folder.sec.png www/icons/forward.gif +www/icons/forward.png www/icons/generic.gif +www/icons/generic.png www/icons/generic.red.gif +www/icons/generic.red.png www/icons/generic.sec.gif +www/icons/generic.sec.png www/icons/hand.right.gif +www/icons/hand.right.png www/icons/hand.up.gif +www/icons/hand.up.png www/icons/icon.sheet.gif +www/icons/icon.sheet.png www/icons/image1.gif +www/icons/image1.png www/icons/image2.gif +www/icons/image2.png www/icons/image3.gif +www/icons/image3.png www/icons/index.gif +www/icons/index.png www/icons/layout.gif +www/icons/layout.png www/icons/left.gif +www/icons/left.png www/icons/link.gif +www/icons/link.png www/icons/movie.gif +www/icons/movie.png www/icons/p.gif +www/icons/p.png www/icons/patch.gif +www/icons/patch.png www/icons/pdf.gif +www/icons/pdf.png www/icons/pie0.gif +www/icons/pie0.png www/icons/pie1.gif +www/icons/pie1.png www/icons/pie2.gif +www/icons/pie2.png www/icons/pie3.gif +www/icons/pie3.png www/icons/pie4.gif +www/icons/pie4.png www/icons/pie5.gif +www/icons/pie5.png www/icons/pie6.gif +www/icons/pie6.png www/icons/pie7.gif +www/icons/pie7.png www/icons/pie8.gif +www/icons/pie8.png www/icons/portal.gif +www/icons/portal.png www/icons/ps.gif +www/icons/ps.png www/icons/quill.gif +www/icons/quill.png www/icons/right.gif +www/icons/right.png www/icons/screw1.gif +www/icons/screw1.png www/icons/screw2.gif +www/icons/screw2.png www/icons/script.gif +www/icons/script.png www/icons/small/README.txt www/icons/small/back.gif +www/icons/small/back.png www/icons/small/binary.gif +www/icons/small/binary.png www/icons/small/binhex.gif +www/icons/small/binhex.png www/icons/small/blank.gif +www/icons/small/blank.png www/icons/small/broken.gif +www/icons/small/broken.png www/icons/small/burst.gif +www/icons/small/burst.png www/icons/small/comp1.gif +www/icons/small/comp1.png www/icons/small/comp2.gif +www/icons/small/comp2.png www/icons/small/compressed.gif +www/icons/small/compressed.png www/icons/small/continued.gif +www/icons/small/continued.png www/icons/small/dir.gif +www/icons/small/dir.png www/icons/small/dir2.gif +www/icons/small/dir2.png www/icons/small/doc.gif +www/icons/small/doc.png www/icons/small/forward.gif +www/icons/small/forward.png www/icons/small/generic.gif +www/icons/small/generic.png www/icons/small/generic2.gif +www/icons/small/generic2.png www/icons/small/generic3.gif +www/icons/small/generic3.png www/icons/small/image.gif +www/icons/small/image.png www/icons/small/image2.gif +www/icons/small/image2.png www/icons/small/index.gif +www/icons/small/index.png www/icons/small/key.gif +www/icons/small/key.png www/icons/small/movie.gif +www/icons/small/movie.png www/icons/small/patch.gif +www/icons/small/patch.png www/icons/small/ps.gif +www/icons/small/ps.png www/icons/small/rainbow.gif +www/icons/small/rainbow.png www/icons/small/sound.gif +www/icons/small/sound.png www/icons/small/sound2.gif +www/icons/small/sound2.png www/icons/small/tar.gif +www/icons/small/tar.png www/icons/small/text.gif +www/icons/small/text.png www/icons/small/transfer.gif +www/icons/small/transfer.png www/icons/small/unknown.gif +www/icons/small/unknown.png www/icons/small/uu.gif +www/icons/small/uu.png www/icons/sound1.gif +www/icons/sound1.png www/icons/sound2.gif +www/icons/sound2.png www/icons/sphere1.gif +www/icons/sphere1.png www/icons/sphere2.gif +www/icons/sphere2.png www/icons/tar.gif +www/icons/tar.png www/icons/tex.gif +www/icons/tex.png www/icons/text.gif +www/icons/text.png www/icons/transfer.gif +www/icons/transfer.png www/icons/unknown.gif +www/icons/unknown.png www/icons/up.gif +www/icons/up.png www/icons/uu.gif +www/icons/uu.png www/icons/uuencoded.gif +www/icons/uuencoded.png www/icons/world1.gif +www/icons/world1.png www/icons/world2.gif +www/icons/world2.png @exec mkdir -p %D/www/proxy @unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi @unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi |