diff options
| author | Andrey A. Chernov <ache@FreeBSD.org> | 2001-10-22 17:40:16 +0000 |
|---|---|---|
| committer | Andrey A. Chernov <ache@FreeBSD.org> | 2001-10-22 17:40:16 +0000 |
| commit | 925425e291b53a0dac27ca62498e935ba4d1191a (patch) | |
| tree | 20568c1da46d35c6e37db731e3e2dbb9ba8c6c6e /www/apache13 | |
| parent | Update to 1.7.4. (diff) | |
Install properly in case existen main "data" and "cgi-bin" are symlinks
Notes
Notes:
svn path=/head/; revision=49083
Diffstat (limited to 'www/apache13')
| -rw-r--r-- | www/apache13/Makefile | 2 | ||||
| -rw-r--r-- | www/apache13/files/patch-ab | 4 | ||||
| -rw-r--r-- | www/apache13/pkg-plist | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/www/apache13/Makefile b/www/apache13/Makefile index 9918ba277da1..07306610a1ea 100644 --- a/www/apache13/Makefile +++ b/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/ \ diff --git a/www/apache13/files/patch-ab b/www/apache13/files/patch-ab index 8e4daa3d356e..9198d26da0da 100644 --- a/www/apache13/files/patch-ab +++ b/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)/"; \ diff --git a/www/apache13/pkg-plist b/www/apache13/pkg-plist index 7674ac379beb..fc90f5dd0bff 100644 --- a/www/apache13/pkg-plist +++ b/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 |