diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2018-03-30 15:04:37 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2018-03-30 15:04:37 +0000 |
| commit | 29ff8831b4fe45cd014251fcd92987dbf9431bb1 (patch) | |
| tree | 2fea6897d0376e31352ca2cedcbd2cba4c9688c5 /www/apache24 | |
| parent | d60452fa5bd7e7ff1bd21ba15837c82b7f4f62c6 (diff) | |
| download | ports-29ff8831b4fe45cd014251fcd92987dbf9431bb1.tar.gz ports-29ff8831b4fe45cd014251fcd92987dbf9431bb1.zip | |
www/apache24: Fix ssl linking issues
- Remove -L/usr/lib from LDFLAGS [1]
- Remove non-working show-modules target
- Use new style patch filenames
PR: 227108 [1]
With hat: apache
Submitted by: mat [1]
Reported by: eugen [1]
MFH: 2018Q1
Notes
Notes:
svn path=/head/; revision=465978
Diffstat (limited to 'www/apache24')
| -rw-r--r-- | www/apache24/Makefile | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/www/apache24/Makefile b/www/apache24/Makefile index 7d136be5974a..285b923fe732 100644 --- a/www/apache24/Makefile +++ b/www/apache24/Makefile @@ -30,10 +30,6 @@ CPE_PRODUCT= http_server PORTDOCS= * SUB_FILES= pkg-install pkg-deinstall -# XXX: before running makepatch please run the command -# `$SED -e 's/PATCH_PATH_SEPARATOR=/PATCH_PATH_SEPARATOR?=/' Mk/bsd.port.mk -PATCH_PATH_SEPARATOR= __ - # Fallback MPM after switching from static to modular MPM SUB_LIST+= MPMF="000_mpm_prefork_fallback.conf" @@ -194,10 +190,8 @@ SUB_FILES+= pkg-message .endif pre-extract-SUEXEC-on: - @${ECHO_CMD} "" - @${ECHO_CMD} "suexec builds with user '${USERS}' and docroot '${PREFIX}/www' by default," - @${ECHO_CMD} "use SUEXEC_DOCROOT and SUEXEC_USERDIR in /etc/make.conf to adjust." - @${ECHO_CMD} "" + @${ECHO_CMD} -e "\nsuexec builds with user '${USERS}' and docroot '${PREFIX}/www' by default," + @${ECHO_CMD} -e "use SUEXEC_DOCROOT and SUEXEC_USERDIR in /etc/make.conf to adjust.\n" post-extract: # make sure the configure script contains our patches, preserve the original script for comparsion @@ -219,9 +213,6 @@ post-patch: ${INSTALL_DATA} ${WRKSRC}/NOTICE ${WRKSRC}/docs/manual pre-configure:: - @${ECHO_MSG} "" - @${ECHO_MSG} " You can check your modules configuration by using make show-modules" - @${ECHO_MSG} "" # silence autotools -@${MV} -v ${WRKSRC}/configure.in ${WRKSRC}/configure.ac 2>/dev/null @@ -229,6 +220,7 @@ post-configure: @FTPUSERS=`${EGREP} -v '^#' /etc/ftpusers| ${TR} -s "\n" " "` ;\ ${REINPLACE_CMD} -e "s,%%FTPUSERS%%,$${FTPUSERS}," \ ${WRKSRC}/docs/conf/extra/httpd-userdir.conf + ${REINPLACE_CMD} -e "/EXTRA_LDFLAGS/s|-L/usr/lib||g" ${WRKSRC}/build/config_vars.mk ${REINPLACE_CMD} -e "s,%%WWWOWN%%,${WWWOWN}," -e "s,%%WWWGRP%%,${WWWGRP}," \ ${WRKSRC}/docs/conf/httpd.conf ${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," ${WRKSRC}/support/envvars-std |