- make QA script happy and RMDIR empty folder below $PORTDOCS
the script complans on them even PORTDOCS=* is set - do not slence INSTALL commands
This commit is contained in:
Olli Hauer
parent
56035a0de7
commit
94e7d5ec8c
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=373726
2 changed files with 21 additions and 11 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue