diff options
| author | ohauer <ohauer@FreeBSD.org> | 2014-12-02 06:50:41 +0800 |
|---|---|---|
| committer | ohauer <ohauer@FreeBSD.org> | 2014-12-02 06:50:41 +0800 |
| commit | 724a8a29e880249cb1c07d13fa7955e257e59878 (patch) | |
| tree | 79a54ad649095700ddb102d47e31c8971fa12bda /www/apache24 | |
| parent | ea42866465e640f001334ed601c6b2dc242a8478 (diff) | |
| download | freebsd-ports-gnome-724a8a29e880249cb1c07d13fa7955e257e59878.tar.gz freebsd-ports-gnome-724a8a29e880249cb1c07d13fa7955e257e59878.tar.zst freebsd-ports-gnome-724a8a29e880249cb1c07d13fa7955e257e59878.zip | |
- make QA script happy and RMDIR empty folder below $PORTDOCS
the script complans on them even PORTDOCS=* is set
- do not slence INSTALL commands
Diffstat (limited to 'www/apache24')
| -rw-r--r-- | www/apache24/Makefile | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/www/apache24/Makefile b/www/apache24/Makefile index a3525e1c56c7..ea1e977b3cbd 100644 --- a/www/apache24/Makefile +++ b/www/apache24/Makefile @@ -97,8 +97,7 @@ CONFIGURE_ARGS+=--prefix=${PREFIX_RELDEST} \ --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 |