From 2226ec3963ddfb82d2b2a958ddf3f505fce7adab Mon Sep 17 00:00:00 2001
From: Jun Kuriyama <kuriyama@FreeBSD.org>
Date: Sun, 2 Dec 2001 23:17:09 +0000
Subject: [PATCH] Merge from www/apache13:   Don't put 'manual' link to the
 Apache manual.

---
 www/apache13+ipv6/Makefile         | 2 +-
 www/apache13+ipv6/files/patch-ab   | 2 +-
 www/apache13+ipv6/pkg-plist        | 2 --
 www/apache13-modssl/Makefile       | 2 +-
 www/apache13-modssl/files/patch-ab | 2 +-
 www/apache13-modssl/pkg-plist      | 2 --
 6 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/www/apache13+ipv6/Makefile b/www/apache13+ipv6/Makefile
index 5aeedf395947..683914f0aa38 100644
--- a/www/apache13+ipv6/Makefile
+++ b/www/apache13+ipv6/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	apache+ipv6
 PORTVERSION=	1.3.22
 CATEGORIES=	www ipv6
-PORTREVISION=   3
+PORTREVISION=   4
 MASTER_SITES=   http://httpd.apache.org/dist/httpd/ \
 		ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/httpd/ \
 		ftp://ftp.rge.com/pub/infosystems/apache/dist/httpd/ \
diff --git a/www/apache13+ipv6/files/patch-ab b/www/apache13+ipv6/files/patch-ab
index 9198d26da0da..a0b5f7174245 100644
--- a/www/apache13+ipv6/files/patch-ab
+++ b/www/apache13+ipv6/files/patch-ab
@@ -44,7 +44,7 @@
  		find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \
  		find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \
 +#        fi
-+	$(LN) -sf $(root)$(manualdir) $(root)$(htdocsdir).default/manual
++#	$(LN) -sf $(root)$(manualdir) $(root)$(htdocsdir).default/manual
 +	if [ ! -d $(root)$(htdocsdir)/ ]; then \
 +		$(LN) -sf $(root)$(htdocsdir).default $(root)$(htdocsdir); \
  	fi
diff --git a/www/apache13+ipv6/pkg-plist b/www/apache13+ipv6/pkg-plist
index a99b700229e4..b059e9f0fc87 100644
--- a/www/apache13+ipv6/pkg-plist
+++ b/www/apache13+ipv6/pkg-plist
@@ -135,8 +135,6 @@ www/data.default/index.html.ru.utf8
 www/data.default/index.html.se
 www/data.default/index.html.zh.Big5
 share/doc/apache/LICENSE
-@exec ln -fs %B %D/www/data.default/manual
-@unexec rm -f %D/www/data.default/manual
 share/doc/apache/bind.html.en
 share/doc/apache/bind.html.fr
 share/doc/apache/bind.html.html
diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile
index aaa3d7cb83e1..c69510d8524d 100644
--- a/www/apache13-modssl/Makefile
+++ b/www/apache13-modssl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	apache+mod_ssl
 PORTVERSION=	${VERSION_APACHE}+${VERSION_MODSSL}
-PORTREVISION=   2
+PORTREVISION=   3
 CATEGORIES=	www security
 MASTER_SITES=	http://www.apache.org/dist/httpd/ \
 		http://www.modssl.org/source/ \
diff --git a/www/apache13-modssl/files/patch-ab b/www/apache13-modssl/files/patch-ab
index 809af8e2dd4c..f1bffafaedf2 100644
--- a/www/apache13-modssl/files/patch-ab
+++ b/www/apache13-modssl/files/patch-ab
@@ -44,7 +44,7 @@
  		find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \
  		find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \
 +#        fi
-+	$(LN) -sf $(root)$(manualdir) $(root)$(htdocsdir).default/manual
++#	$(LN) -sf $(root)$(manualdir) $(root)$(htdocsdir).default/manual
 +	if [ ! -d $(root)$(htdocsdir)/ ]; then \
 +		$(LN) -sf $(root)$(htdocsdir).default $(root)$(htdocsdir); \
  	fi
diff --git a/www/apache13-modssl/pkg-plist b/www/apache13-modssl/pkg-plist
index 2dca25dadde3..87339ca4e908 100644
--- a/www/apache13-modssl/pkg-plist
+++ b/www/apache13-modssl/pkg-plist
@@ -159,8 +159,6 @@ www/data.default/index.html.ru.utf8
 www/data.default/index.html.se
 www/data.default/index.html.zh.Big5
 share/doc/apache/LICENSE
-@exec ln -fs %B %D/www/data.default/manual
-@unexec rm -f %D/www/data.default/manual
 share/doc/apache/bind.html.en
 share/doc/apache/bind.html.fr
 share/doc/apache/bind.html.html