svn commit: r400253 - in head/devel/libdap: . files

[Sunpoet Po-Chuan Hsieh]

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;