From owner-svn-ports-all@FreeBSD.ORG Mon Dec 1 22:50:42 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EA708EB4; Mon, 1 Dec 2014 22:50:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CC324366; Mon, 1 Dec 2014 22:50:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB1MogL1008479; Mon, 1 Dec 2014 22:50:42 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB1Mog9g008475; Mon, 1 Dec 2014 22:50:42 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201412012250.sB1Mog9g008475@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Mon, 1 Dec 2014 22:50:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r373726 - in head/www: apache22 apache24 X-SVN-Group: ports-head 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.18-1 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: Mon, 01 Dec 2014 22:50:43 -0000 Author: ohauer Date: Mon Dec 1 22:50:41 2014 New Revision: 373726 URL: https://svnweb.freebsd.org/changeset/ports/373726 QAT: https://qat.redports.org/buildarchive/r373726/ Log: - make QA script happy and RMDIR empty folder below $PORTDOCS the script complans on them even PORTDOCS=* is set - do not slence INSTALL commands Modified: head/www/apache22/Makefile head/www/apache24/Makefile Modified: head/www/apache22/Makefile ============================================================================== --- head/www/apache22/Makefile Mon Dec 1 22:31:14 2014 (r373725) +++ head/www/apache22/Makefile Mon Dec 1 22:50:41 2014 (r373726) @@ -95,8 +95,7 @@ CONFIGURE_ARGS+=--prefix=${PREFIX} \ --with-apr=${APR_CONFIG} \ --with-apr-util=${APU_CONFIG} -CONFIGURE_ENV= \ - CONFIG_SHELL="${SH}" \ +CONFIGURE_ENV= CONFIG_SHELL="${SH}" \ LOCALBASE="${LOCALBASE}" MAKE_ENV+= EXPR_COMPAT=yes \ @@ -135,6 +134,12 @@ post-extract: # limit grep results ... @${FIND} ${WRKSRC} -type f \( -name 'NWGNU*' -o -name '*.ds?' -o -name '*.dep' -o -name '*.mak' -o -name '*.win' \) -delete +# make qa script happy, it complains on empty dirs even 'PORTDOCS=*' is set +# use RMDIR in case upstream ever place some files into this dirs +.for d in xsl/util xsl lang + -${RMDIR} ${WRKSRC}/docs/manual/style/${d} +.endfor + post-patch: @${REINPLACE_CMD} -e 's," PLATFORM ",FreeBSD,' ${WRKSRC}/server/core.c # IPv4_mapping fix: https://issues.apache.org/bugzilla/show_bug.cgi?id=53824 @@ -142,7 +147,7 @@ post-patch: -e 's|^perlbin=.*|perlbin=${PERL}|' \ ${WRKSRC}/configure.in ${WRKSRC}/configure @${RM} -f ${WRKSRC}/docs/docroot/*.bak - @${INSTALL_DATA} ${WRKSRC}/NOTICE ${WRKSRC}/docs/manual + ${INSTALL_DATA} ${WRKSRC}/NOTICE ${WRKSRC}/docs/manual # we use devel/apr and devel/pcre @${RM} -rf ${WRKSRC}/srclib @${REINPLACE_CMD} -e 's/srclib//' ${WRKSRC}/Makefile.in @@ -165,22 +170,22 @@ pre-configure:: 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 "s,%%FTPUSERS%%,$${FTPUSERS}," ${WRKSRC}/docs/conf/extra/httpd-userdir.conf @${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 post-install: @${MKDIR} ${ETC_SUBDIRS:S|^|${STAGEDIR}${ETCDIR}/|} ${INSTALL_DATA} ${FILESDIR}/no-accf.conf ${STAGEDIR}${ETCDIR}/Includes/ +# place for 3rd party module configuration ${INSTALL_DATA} ${FILESDIR}/README_modules.d ${STAGEDIR}${ETCDIR}/modules.d/ -# place for module configuration samples @${MKDIR} ${STAGEDIR}/${EXAMPLESDIR}/modules.d ${INSTALL_DATA} ${FILESDIR}/README_modules.d ${STAGEDIR}${EXAMPLESDIR}/modules.d # strip returns an error for non binary files, but we have a big mix -${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/* 2>/dev/null -${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/apache22/mod_*.so .if ${PORT_OPTIONS:MLOG_FORENSIC} - @${INSTALL_SCRIPT} ${WRKSRC}/support/check_forensic ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_SCRIPT} ${WRKSRC}/support/check_forensic ${STAGEDIR}${PREFIX}/sbin .endif # maintainer only, check for new modules Modified: head/www/apache24/Makefile ============================================================================== --- head/www/apache24/Makefile Mon Dec 1 22:31:14 2014 (r373725) +++ head/www/apache24/Makefile Mon Dec 1 22:50:41 2014 (r373726) @@ -97,8 +97,7 @@ CONFIGURE_ARGS+=--prefix=${PREFIX_RELDES --with-apr=${APR_CONFIG} \ --with-apr-util=${APU_CONFIG} -CONFIGURE_ENV= \ - CONFIG_SHELL="${SH}" \ +CONFIGURE_ENV= CONFIG_SHELL="${SH}" \ LOCALBASE="${LOCALBASE}" MAKE_ENV+= EXPR_COMPAT=yes \ @@ -132,6 +131,12 @@ post-extract: # limit grep results ... @${FIND} ${WRKSRC} -type f \( -name 'NWGNU*' -o -name '*.ds?' -o -name '*.dep' -o -name '*.mak' -o -name '*.win' \) -delete +# make qa script happy, it complains on empty dirs even 'PORTDOCS=*' is set +# use RMDIR in case upstream ever place some files into this dirs +.for d in xsl/util xsl lang + -${RMDIR} ${WRKSRC}/docs/manual/style/${d} +.endfor + post-patch: @${REINPLACE_CMD} -e 's," PLATFORM ",FreeBSD,' ${WRKSRC}/server/core.c # IPv4_mapping fix: https://issues.apache.org/bugzilla/show_bug.cgi?id=53824 @@ -139,19 +144,19 @@ post-patch: -e 's|^perlbin=.*|perlbin=${PERL}|' \ ${WRKSRC}/configure.in ${WRKSRC}/configure @${RM} -f ${WRKSRC}/docs/docroot/*.bak - @${INSTALL_DATA} ${WRKSRC}/NOTICE ${WRKSRC}/docs/manual + ${INSTALL_DATA} ${WRKSRC}/NOTICE ${WRKSRC}/docs/manual 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 "s,%%FTPUSERS%%,$${FTPUSERS}," ${WRKSRC}/docs/conf/extra/httpd-userdir.conf @${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 post-install: @${MKDIR} ${ETC_SUBDIRS:S|^|${STAGEDIR}${ETCDIR}/|} ${INSTALL_DATA} ${FILESDIR}/no-accf.conf ${STAGEDIR}${ETCDIR}/Includes/ +# place for 3rd party module configuration ${INSTALL_DATA} ${FILESDIR}/README_modules.d ${STAGEDIR}${ETCDIR}/modules.d/ -# place for module configuration samples @${MKDIR} ${STAGEDIR}/${EXAMPLESDIR}/modules.d ${INSTALL_DATA} ${FILESDIR}/README_modules.d ${STAGEDIR}${EXAMPLESDIR}/modules.d # strip returns an error for non binary files, but we have a big mix