From owner-svn-ports-all@freebsd.org Fri Mar 30 15:04:38 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5130EF73D0F; Fri, 30 Mar 2018 15:04:38 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 030596C432; Fri, 30 Mar 2018 15:04:38 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F008B2485; Fri, 30 Mar 2018 15:04:37 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2UF4bDe070870; Fri, 30 Mar 2018 15:04:37 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2UF4b3V070869; Fri, 30 Mar 2018 15:04:37 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201803301504.w2UF4b3V070869@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Fri, 30 Mar 2018 15:04:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r465978 - head/www/apache24 X-SVN-Group: ports-head X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: head/www/apache24 X-SVN-Commit-Revision: 465978 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Mar 2018 15:04:38 -0000 Author: brnrd Date: Fri Mar 30 15:04:37 2018 New Revision: 465978 URL: https://svnweb.freebsd.org/changeset/ports/465978 Log: 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 Modified: head/www/apache24/Makefile Modified: head/www/apache24/Makefile ============================================================================== --- head/www/apache24/Makefile Fri Mar 30 14:48:59 2018 (r465977) +++ head/www/apache24/Makefile Fri Mar 30 15:04:37 2018 (r465978) @@ -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