From owner-svn-ports-all@freebsd.org  Tue Oct 27 15:49:06 2015
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 0F13CA1F870;
 Tue, 27 Oct 2015 15:49:06 +0000 (UTC)
 (envelope-from sunpoet@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 CF0B214D0;
 Tue, 27 Oct 2015 15:49:05 +0000 (UTC)
 (envelope-from sunpoet@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9RFn4em050562;
 Tue, 27 Oct 2015 15:49:04 GMT (envelope-from sunpoet@FreeBSD.org)
Received: (from sunpoet@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9RFn4O6050560;
 Tue, 27 Oct 2015 15:49:04 GMT (envelope-from sunpoet@FreeBSD.org)
Message-Id: <201510271549.t9RFn4O6050560@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to
 sunpoet@FreeBSD.org using -f
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Tue, 27 Oct 2015 15:49:04 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r400253 - in head/devel/libdap: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Oct 2015 15:49:06 -0000

Author: sunpoet
Date: Tue Oct 27 15:49:04 2015
New Revision: 400253
URL: https://svnweb.freebsd.org/changeset/ports/400253

Log:
  - Fix build on -head
  
  Reported by:	pkg-fallout

Added:
  head/devel/libdap/files/
  head/devel/libdap/files/extra-patch-dds.yy   (contents, props changed)
Modified:
  head/devel/libdap/Makefile

Modified: head/devel/libdap/Makefile
==============================================================================
--- head/devel/libdap/Makefile	Tue Oct 27 15:48:48 2015	(r400252)
+++ head/devel/libdap/Makefile	Tue Oct 27 15:49:04 2015	(r400253)
@@ -22,4 +22,10 @@ INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 USES=		bison charsetfix gmake libtool localbase pathfix
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 1100000
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-dds.yy
+.endif
+
+.include <bsd.port.post.mk>

Added: head/devel/libdap/files/extra-patch-dds.yy
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/libdap/files/extra-patch-dds.yy	Tue Oct 27 15:49:04 2015	(r400253)
@@ -0,0 +1,13 @@
+--- dds.yy.orig	2014-11-20 20:00:18 UTC
++++ dds.yy
+@@ -261,8 +261,8 @@ declaration:  base_type var ';' 
+ 
+ 		| grid '{' SCAN_WORD ':'
+ 		{ 
+-		    if (is_keyword(string($3), "array"))
+-			part = array; 
++		    if (is_keyword(string($3), "libdap::Part::array"))
++			part = libdap::Part::array; 
+ 		    else {
+ 			ostringstream msg;
+ 			msg << BAD_DECLARATION;