diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache21/Makefile | 3 | ||||
| -rw-r--r-- | www/apache21/files/patch-support:envvars-std.in | 2 | ||||
| -rw-r--r-- | www/apache21/pkg-plist | 4 | ||||
| -rw-r--r-- | www/apache22/Makefile | 3 | ||||
| -rw-r--r-- | www/apache22/files/patch-support:envvars-std.in | 2 | ||||
| -rw-r--r-- | www/apache22/pkg-plist | 4 |
6 files changed, 10 insertions, 8 deletions
diff --git a/www/apache21/Makefile b/www/apache21/Makefile index afa43f3..f9e7717 100644 --- a/www/apache21/Makefile +++ b/www/apache21/Makefile @@ -9,7 +9,7 @@ PORTNAME= apache PORTVERSION= 2.1.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_LOCAL:S/%SUBDIR%/clement/} DISTNAME= httpd-${PORTVERSION}-alpha @@ -220,6 +220,7 @@ install-startup-script: @${INSTALL_SCRIPT} -m 555 ${WRKDIR}/apache21.sh ${PREFIX}/etc/rc.d/apache21.sh post-install: install-startup-script + @${MKDIR} ${PREFIX}/etc/apache21/envvars.d @${MKDIR} ${PREFIX}/etc/apache21/Includes @@${CAT} ${PKGMESSAGE} diff --git a/www/apache21/files/patch-support:envvars-std.in b/www/apache21/files/patch-support:envvars-std.in index 26a094f..6148034 100644 --- a/www/apache21/files/patch-support:envvars-std.in +++ b/www/apache21/files/patch-support:envvars-std.in @@ -5,7 +5,7 @@ # @OS_SPECIFIC_VARS@ + -+ENVVARS_DIR=%%PREFIX%%/etc/apache2/envvars.d ++ENVVARS_DIR=%%PREFIX%%/etc/apache21/envvars.d + +for envvars_file in $(ls ${ENVVARS_DIR}/*.env 2>/dev/null) +do diff --git a/www/apache21/pkg-plist b/www/apache21/pkg-plist index ffafdef..5c5717c 100644 --- a/www/apache21/pkg-plist +++ b/www/apache21/pkg-plist @@ -504,8 +504,8 @@ share/apache21/build/special.mk @unexec rmdir %D/libexec/apache21 2> /dev/null || true @dirrm include/apache21 @exec mkdir -p %D/etc/apache21/Includes 2> /dev/null || true -@exec mkdir -p %D/etc/apache2/envvars.d 2> /dev/null || true +@exec mkdir -p %D/etc/apache21/envvars.d 2> /dev/null || true @unexec rmdir %D/etc/apache21/Includes 2> /dev/null || true -@unexec rmdir %D/etc/apache2/envvars.d 2> /dev/null || true @unexec rm -f %D/etc/apache21/httpd.conf.bak 2> /dev/null || true +@unexec rmdir %D/etc/apache21/envvars.d 2> /dev/null || true @unexec rmdir %D/etc/apache21 2> /dev/null || echo "===> If you plan to do not reinstall apache21, you can safely remove %D/etc/apache21." diff --git a/www/apache22/Makefile b/www/apache22/Makefile index afa43f3..f9e7717 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -9,7 +9,7 @@ PORTNAME= apache PORTVERSION= 2.1.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_LOCAL:S/%SUBDIR%/clement/} DISTNAME= httpd-${PORTVERSION}-alpha @@ -220,6 +220,7 @@ install-startup-script: @${INSTALL_SCRIPT} -m 555 ${WRKDIR}/apache21.sh ${PREFIX}/etc/rc.d/apache21.sh post-install: install-startup-script + @${MKDIR} ${PREFIX}/etc/apache21/envvars.d @${MKDIR} ${PREFIX}/etc/apache21/Includes @@${CAT} ${PKGMESSAGE} diff --git a/www/apache22/files/patch-support:envvars-std.in b/www/apache22/files/patch-support:envvars-std.in index 26a094f..6148034 100644 --- a/www/apache22/files/patch-support:envvars-std.in +++ b/www/apache22/files/patch-support:envvars-std.in @@ -5,7 +5,7 @@ # @OS_SPECIFIC_VARS@ + -+ENVVARS_DIR=%%PREFIX%%/etc/apache2/envvars.d ++ENVVARS_DIR=%%PREFIX%%/etc/apache21/envvars.d + +for envvars_file in $(ls ${ENVVARS_DIR}/*.env 2>/dev/null) +do diff --git a/www/apache22/pkg-plist b/www/apache22/pkg-plist index ffafdef..5c5717c 100644 --- a/www/apache22/pkg-plist +++ b/www/apache22/pkg-plist @@ -504,8 +504,8 @@ share/apache21/build/special.mk @unexec rmdir %D/libexec/apache21 2> /dev/null || true @dirrm include/apache21 @exec mkdir -p %D/etc/apache21/Includes 2> /dev/null || true -@exec mkdir -p %D/etc/apache2/envvars.d 2> /dev/null || true +@exec mkdir -p %D/etc/apache21/envvars.d 2> /dev/null || true @unexec rmdir %D/etc/apache21/Includes 2> /dev/null || true -@unexec rmdir %D/etc/apache2/envvars.d 2> /dev/null || true @unexec rm -f %D/etc/apache21/httpd.conf.bak 2> /dev/null || true +@unexec rmdir %D/etc/apache21/envvars.d 2> /dev/null || true @unexec rmdir %D/etc/apache21 2> /dev/null || echo "===> If you plan to do not reinstall apache21, you can safely remove %D/etc/apache21." |
