diff options
| author | Clement Laforet <clement@FreeBSD.org> | 2007-03-17 16:03:24 +0000 |
|---|---|---|
| committer | Clement Laforet <clement@FreeBSD.org> | 2007-03-17 16:03:24 +0000 |
| commit | 4598cbe1270b0b1ca773f4f95d39a0b66e8e5266 (patch) | |
| tree | b385140b745a2da00d2d810e60263e149bec081d /www/apache22 | |
| parent | - Update to 1.4.1 (diff) | |
- Ensure we use correct OpenSSL libs [1]
- Fix multiprofiles support in rc script [2]
PR: ports/100315 [1],
ports/109536 [2]
Submitted by: Jo Rhett <jrhett@svcolo.com> [1]
Eygene Ryabinkin <rea-fbsd@codelabs.ru> [2]
Notes
Notes:
svn path=/head/; revision=187576
Diffstat (limited to 'www/apache22')
| -rw-r--r-- | www/apache22/Makefile | 11 | ||||
| -rw-r--r-- | www/apache22/files/apache22.sh.in | 4 | ||||
| -rw-r--r-- | www/apache22/pkg-plist | 2 |
3 files changed, 10 insertions, 7 deletions
diff --git a/www/apache22/Makefile b/www/apache22/Makefile index a302b0e917d8..e10af55e2733 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -9,6 +9,7 @@ PORTNAME= apache PORTVERSION= 2.2.4 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} \ ${MASTER_SITE_LOCAL:S/%SUBDIR%\//clement\/:aprmysql/} @@ -50,6 +51,7 @@ USE_ICONV= yes USE_AUTOTOOLS= autoconf:259 libtool:15 USE_PERL5= yes USE_RC_SUBR= apache22.sh +SUB_LIST+= RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX} LIBTOOLFILES= configure .if !defined(WITH_APR_FROM_PORTS) @@ -88,10 +90,6 @@ CONFIGURE_ARGS+= --enable-v4-mapped . endif .endif -.if !defined(WITHOUT_SSL_MODULES) -USE_OPENSSL= yes -.endif - .if defined(WITH_STATIC_SUPPORT) CONFIGURE_ARGS+= --enable-static-support .endif @@ -126,6 +124,11 @@ CONFIGURE_ARGS+= --with-ldap \ .include "${APACHEDIR}/Makefile.modules" .include <bsd.port.pre.mk> +.if !defined(WITHOUT_SSL_MODULES) +USE_OPENSSL_RPATH=yes +.include "${PORTSDIR}/Mk/bsd.openssl.mk" +.endif + .if defined(WITH_APR_FROM_PORTS) PLIST_SUB+= APR_PORTS="@comment " LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr diff --git a/www/apache22/files/apache22.sh.in b/www/apache22/files/apache22.sh.in index 8ef0b34fae46..87ad36a1023a 100644 --- a/www/apache22/files/apache22.sh.in +++ b/www/apache22/files/apache22.sh.in @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/www/apache22/files/Attic/apache22.sh.in,v 1.2 2007-01-13 12:13:12 clement Exp $ +# $FreeBSD: /tmp/pcvs/ports/www/apache22/files/Attic/apache22.sh.in,v 1.3 2007-03-17 16:03:24 clement Exp $ # # PROVIDE: apache22 @@ -91,7 +91,7 @@ else if [ "x$1" != "xrestart" ]; then for profile in ${apache22_profiles}; do echo "===> apache22 profile: ${profile}" - %%PREFIX%%/etc/rc.d/apache22.sh $1 ${profile} + %%PREFIX%%/etc/rc.d/apache22%%RC_SUBR_SUFFIX%% $1 ${profile} retcode="$?" if [ "0${retcode}" -ne 0 ]; then failed="${profile} (${retcode}) ${failed:-}" diff --git a/www/apache22/pkg-plist b/www/apache22/pkg-plist index 930b2b07e2bd..82d5b7253f92 100644 --- a/www/apache22/pkg-plist +++ b/www/apache22/pkg-plist @@ -543,4 +543,4 @@ www/apache22/icons/world2.png @unexec rm -f %D/etc/apache22/httpd.conf.bak 2> /dev/null || true @dirrmtry etc/apache22/envvars.d @dirrmtry etc/apache22/extra -@unexec rmdir %D/etc/apache22 2> /dev/null || echo "===> If you plan to do not reinstall apache22, you can safely remove %D/etc/apache22." +@dirrmtry etc/apache22 |