Install properly in case existen main "data" and "cgi-bin" are symlinks

svn path=/head/; revision=49083

www/apache13/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	apache
 PORTVERSION=    1.3.22
-PORTREVISION=   3
+PORTREVISION=   4
 CATEGORIES=	www
 MASTER_SITES=   http://httpd.apache.org/dist/httpd/ \
 		ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/httpd/ \

www/apache13/files/patch-ab

@@ -45,7 +45,7 @@
  		find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \
 +#        fi
 +	$(LN) -sf $(root)$(manualdir) $(root)$(htdocsdir).default/manual
-+	if [ ! -d $(root)$(htdocsdir) ]; then \
++	if [ ! -d $(root)$(htdocsdir)/ ]; then \
 +		$(LN) -sf $(root)$(htdocsdir).default $(root)$(htdocsdir); \
  	fi
 -	-@if [ -f $(root)$(cgidir)/printenv ]; then \
@@ -65,7 +65,7 @@
  		done; \
 -	fi
 +#        fi
-+	if [ ! -d $(root)$(cgidir) ]; then \
++	if [ ! -d $(root)$(cgidir)/ ]; then \
 +		$(LN) -sf $(root)$(cgidir).default $(root)$(cgidir); \
 +  	fi
  	@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \

www/apache13/pkg-plist

@@ -102,7 +102,7 @@ sbin/httpd
 sbin/logresolve
 sbin/rotatelogs
 www/data.default/apache_pb.gif
-@exec [ -d %D/www/data ] || ln -fs %B %D/www/data
+@exec [ -d %D/www/data/ ] || ln -fs %B %D/www/data
 www/data.default/index.html.ca
 www/data.default/index.html.cz
 www/data.default/index.html.de
@@ -366,7 +366,7 @@ share/doc/apache/win_service.html.html
 share/doc/apache/win_service.html.ja.jis
 share/doc/apache/windows.html
 www/cgi-bin.default/printenv
-@exec [ -d %D/www/cgi-bin ] || ln -fs %B %D/www/cgi-bin
+@exec [ -d %D/www/cgi-bin/ ] || ln -fs %B %D/www/cgi-bin
 www/cgi-bin.default/test-cgi
 www/icons/README
 www/icons/a.gif