mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00
Code Issues Releases Activity

- Ensure we use correct OpenSSL libs [1]

Browse Source 
- 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]
This commit is contained in:
Clement Laforet 2007-03-17 16:03:24 +00:00
parent e902286b8a
commit 4598cbe127
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=187576
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
www/apache22/Makefile
View File

@ -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

4
www/apache22/files/apache22.sh.in
View File

@ -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:-}"

2
www/apache22/pkg-plist
View File

@ -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