Date: Thu, 10 Apr 2014 06:12:56 +0900 From: Katsuya Higuchi <higuchi@jt-sys.co.jp> To: apache@FreeBSD.org Subject: FreeBSD Port: www/apache22 Message-ID: <5345B7D8.6060204@jt-sys.co.jp>
index | next in thread | raw e-mail
Dear Sir,
www/apache22 2.2.27_1 has little problem.
ports-mgmt/poudriere installs security/openssl for www/apache22 at
build-depends.
This causes empty OPENSSL_INSTALLED at post-patch.
Please refer an attached picture.
So, I think that the patch should be inserted to pre-configure.
--------
# diff -cu Makefile.org Makefile
--- Makefile.org 2014-04-09 08:33:57.000000000 +0900
+++ Makefile 2014-04-10 05:44:33.101744943 +0900
@@ -127,6 +127,13 @@
@${ECHO_MSG} ""
@${ECHO_MSG} " You can check your modules configuration by using make
show-modules"
@${ECHO_MSG} ""
+.if ${PORT_OPTIONS:MSSL}
+. if ${OPSYS} == FreeBSD && ${OSVERSION} > 1000000
+. if defined(OPENSSL_INSTALLED) && ${OPENSSL_INSTALLED} != ""
+ ${REINPLACE_CMD} -e "s|(ALL_CFLAGS)|(ALL_CFLAGS) -L${OPENSSLLIB}|"
${WRKSRC}/build/rules.mk.in
+. endif
+. endif
+.endif
show-options:
@${SED} -ne 's/^##//p' ${APACHEDIR}/Makefile.doc
@@ -149,15 +156,6 @@
@${RM} -rf ${WRKSRC}/srclib
@${REINPLACE_CMD} -e 's/srclib//' ${WRKSRC}/Makefile.in
-# Fix build on FreeBSD-10+ with OpenSSL from ports
-.if ${PORT_OPTIONS:MSSL}
-. if ${OPSYS} == FreeBSD && ${OSVERSION} > 1000000
-. if defined(OPENSSL_INSTALLED) && ${OPENSSL_INSTALLED} != ""
- ${REINPLACE_CMD} -e "s|(ALL_CFLAGS)|(ALL_CFLAGS) -L${OPENSSLLIB}|"
${WRKSRC}/build/rules.mk.in
-. endif
-. endif
-.endif
-
post-configure:
@FTPUSERS=`${EGREP} -v '^#' /etc/ftpusers| ${TR} -s "\n" " "` ;\
${REINPLACE_CMD} -e "s,%%FTPUSERS%%,$${FTPUSERS},"
${WRKSRC}/docs/conf/extra/httpd-userdir.conf
--------
Sorry for my poor english.
Thanks,
Katsuya Higuchi
higuchi@jt-sys.co.jp
help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5345B7D8.6060204>