aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/libdap/Makefile8
-rw-r--r--devel/libdap/files/extra-patch-dds.yy13
2 files changed, 1 insertions, 20 deletions
diff --git a/devel/libdap/Makefile b/devel/libdap/Makefile
index f80ab6d2dfcb..c1b0369604fc 100644
--- a/devel/libdap/Makefile
+++ b/devel/libdap/Makefile
@@ -23,10 +23,4 @@ INSTALL_TARGET= install-strip
USE_LDCONFIG= yes
USES= bison charsetfix gmake libtool localbase pathfix
-.include <bsd.port.pre.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100000
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-dds.yy
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/libdap/files/extra-patch-dds.yy b/devel/libdap/files/extra-patch-dds.yy
deleted file mode 100644
index c18b893a68ed..000000000000
--- a/devel/libdap/files/extra-patch-dds.yy
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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;