aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlli Hauer <ohauer@FreeBSD.org>2016-12-27 10:31:48 +0000
committerOlli Hauer <ohauer@FreeBSD.org>2016-12-27 10:31:48 +0000
commitb6fc7b9cb9e2077d57159a6fad14927aa42997cb (patch)
treef2331e750295a2e26bf74236064dfe9bb796a385
parent5d48b1baf8f96a72c61f3499c8b69877dcf1ff39 (diff)
downloadports-b6fc7b9cb9e2077d57159a6fad14927aa42997cb.tar.gz
ports-b6fc7b9cb9e2077d57159a6fad14927aa42997cb.zip
MFH: r429588
- fix third party module build e.g. mod_mpm_itk by removing -Werror from configure.in - bump PORTREVISON (fix changes config_vars.mk that is used to build third party modules) PR: 215594 Submitted by: Marcelo Araujo Sponsored by: iXsystems Approved by: ports-secteam (blanket)
Notes
Notes: svn path=/branches/2016Q4/; revision=429597
-rw-r--r--www/apache24/Makefile1
-rw-r--r--www/apache24/files/patch-configure.in12
2 files changed, 11 insertions, 2 deletions
diff --git a/www/apache24/Makefile b/www/apache24/Makefile
index 9fa4bc9837c3..c9245a7997ca 100644
--- a/www/apache24/Makefile
+++ b/www/apache24/Makefile
@@ -2,6 +2,7 @@
PORTNAME= apache24
PORTVERSION= 2.4.25
+PORTREVISION= 1
CATEGORIES= www ipv6
MASTER_SITES= APACHE_HTTPD
DISTNAME= httpd-${PORTVERSION}
diff --git a/www/apache24/files/patch-configure.in b/www/apache24/files/patch-configure.in
index 8aaaa9e11831..b1728b22ab28 100644
--- a/www/apache24/files/patch-configure.in
+++ b/www/apache24/files/patch-configure.in
@@ -1,4 +1,4 @@
---- configure.in.orig 2015-09-05 17:02:03 UTC
+--- configure.in.orig 2016-12-02 11:36:06 UTC
+++ configure.in
@@ -111,7 +111,7 @@ fi
@@ -18,7 +18,15 @@
[--enable-layout=*|\'--enable-layout=*])
dnl We must be the last to build and the first to be cleaned
AP_BUILD_SRCLIB_DIRS="$AP_BUILD_SRCLIB_DIRS apr-util"
-@@ -830,8 +830,14 @@ AC_DEFINE_UNQUOTED(HTTPD_ROOT, "${ap_pre
+@@ -597,7 +597,6 @@ AC_ARG_ENABLE(maintainer-mode,APACHE_HEL
+ if test "$GCC" = "yes"; then
+ APR_ADDTO(CFLAGS,[-Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -Wpointer-arith])
+ APACHE_ADD_GCC_CFLAG([-std=c89])
+- APACHE_ADD_GCC_CFLAG([-Werror])
+ APACHE_ADD_GCC_CFLAG([-Wdeclaration-after-statement])
+ APACHE_ADD_GCC_CFLAG([-Wformat])
+ APACHE_ADD_GCC_CFLAG([-Wformat-security])
+@@ -838,8 +837,14 @@ AC_DEFINE_UNQUOTED(HTTPD_ROOT, "${ap_pre
[Root directory of the Apache install area])
AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf",
[Location of the config file, relative to the Apache root directory])