From owner-svn-ports-head@freebsd.org  Tue Sep 13 00:49:14 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0FC41BD8EC9;
 Tue, 13 Sep 2016 00:49:14 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C4D28EAB;
 Tue, 13 Sep 2016 00:49:13 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8D0nDkK089263;
 Tue, 13 Sep 2016 00:49:13 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8D0nDOA089262;
 Tue, 13 Sep 2016 00:49:13 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201609130049.u8D0nDOA089262@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: marino set sender to
 marino@FreeBSD.org using -f
From: John Marino <marino@FreeBSD.org>
Date: Tue, 13 Sep 2016 00:49:12 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r421967 - head/devel/hadoop
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Sep 2016 00:49:14 -0000

Author: marino
Date: Tue Sep 13 00:49:12 2016
New Revision: 421967
URL: https://svnweb.freebsd.org/changeset/ports/421967

Log:
  devel/hadoop: Unbreak build (nominal case)
  
  The ssl.mk helper can augment the MAKE_ARGS variable with a OPENSSL_CFLAGS
  definition which just happens to break this port.  Add a filter to remove
  any such definitions if they occur.  The issue was introduced when
  USES+=ssl was added to the makefile to document the SSL requirement.

Modified:
  head/devel/hadoop/Makefile

Modified: head/devel/hadoop/Makefile
==============================================================================
--- head/devel/hadoop/Makefile	Mon Sep 12 23:05:22 2016	(r421966)
+++ head/devel/hadoop/Makefile	Tue Sep 13 00:49:12 2016	(r421967)
@@ -78,7 +78,11 @@ MAKE_ARGS=	-Dbuild.classes=${WRKSRC}/had
 		-Dcompile.c++=true -Dmake.cmd=gmake -Dlibhdfs=1 -Dlibrecordio=true  -Dskip.record-parser=true
 ALL_TARGET=	compile-core-native compile-c++ compile-c++-libhdfs compile-c++-pipes compile-c++-utils
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
+
+# The ssl.mk helper can augment MAKE_ARGS and break the build.  Filter out
+# the OPENSSL_CFLAGS if it exists to prevent that from happening.
+MAKE_ARGS:=	${MAKE_ARGS:NOPENSSL_CFLAGS=*}
 
 .if ${ARCH} == "amd64"
 _HADOOP_ARCH=	FreeBSD-amd64-64
@@ -142,4 +146,4 @@ do-install-DOCS-on:
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>