svn commit: r429597 - in branches/2016Q4/www/apache24: . files

[Olli Hauer]

Author: ohauer
Date: Tue Dec 27 10:31:48 2016
New Revision: 429597
URL: https://svnweb.freebsd.org/changeset/ports/429597

Log:
  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)

Modified:
  branches/2016Q4/www/apache24/Makefile
  branches/2016Q4/www/apache24/files/patch-configure.in
Directory Properties:
  branches/2016Q4/   (props changed)

Modified: branches/2016Q4/www/apache24/Makefile
==============================================================================
--- branches/2016Q4/www/apache24/Makefile	Tue Dec 27 10:30:38 2016	(r429596)
+++ branches/2016Q4/www/apache24/Makefile	Tue Dec 27 10:31:48 2016	(r429597)
@@ -2,6 +2,7 @@
 
 PORTNAME=	apache24
 PORTVERSION=	2.4.25
+PORTREVISION=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	APACHE_HTTPD
 DISTNAME=	httpd-${PORTVERSION}

Modified: branches/2016Q4/www/apache24/files/patch-configure.in
==============================================================================
--- branches/2016Q4/www/apache24/files/patch-configure.in	Tue Dec 27 10:30:38 2016	(r429596)
+++ branches/2016Q4/www/apache24/files/patch-configure.in	Tue Dec 27 10:31:48 2016	(r429597)
@@ -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])