From c41bdc0a1a41477586342766cc34b73fde2f906b Mon Sep 17 00:00:00 2001
From: ryoon <ryoon>
Date: Sun, 25 Sep 2011 13:52:26 +0000
Subject: Add workaround for fix build on NetBSD 5.99.55. It seems behaviout of
 flex 2.5.35 had been changed from flex 2.5.4.

Tested on NetBSD/i386 5.99.55, NetBSD/i386 5.1, and DragonFly/i386 2.10.1.
---
 graphics/mgl/Makefile         | 11 ++++++++++-
 graphics/mgl/distinfo         |  4 ++--
 graphics/mgl/patches/patch-ab |  4 ++--
 3 files changed, 14 insertions(+), 5 deletions(-)

(limited to 'graphics/mgl')

diff --git a/graphics/mgl/Makefile b/graphics/mgl/Makefile
index cf0bb49a200..36810355550 100644
--- a/graphics/mgl/Makefile
+++ b/graphics/mgl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2011/03/09 16:26:49 drochner Exp $
+# $NetBSD: Makefile,v 1.37 2011/09/25 13:52:26 ryoon Exp $
 #
 
 DISTNAME=	mgl2-alpha-020
@@ -43,6 +43,15 @@ SUBST_STAGE.prefix=	pre-configure
 SUBST_FILES.prefix=	utils/mglcons.sh
 SUBST_VARS.prefix=	PREFIX
 
+
+SUBST_CLASSES+=		flex
+SUBST_STAGE.flex=	pre-configure
+SUBST_FILES.flex=	conf/config.mk-netbsd-i386-x
+SUBST_SED.flex=		-e 's,@PATCH_YY_BUF_SIZE_FLAG@,PATCH_YY_BUF_SIZE=y,'
+.if !empty(MACHINE_PLATFORM:MNetBSD-5.99*)
+SUBST_SED.flex=		-e 's,@PATCH_YY_BUF_SIZE_FLAG@,,'
+.endif
+
 INSTALL_MAKE_FLAGS+=	PREFIX=${DESTDIR}${PREFIX}
 
 INSTALLATION_DIRS+=	bin sbin
diff --git a/graphics/mgl/distinfo b/graphics/mgl/distinfo
index 1c5cd637480..578bb58faf2 100644
--- a/graphics/mgl/distinfo
+++ b/graphics/mgl/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.8 2011/04/03 11:40:07 wiz Exp $
+$NetBSD: distinfo,v 1.9 2011/09/25 13:52:26 ryoon Exp $
 
 SHA1 (mgl2-alpha-020.tar.gz) = aa6be2be28749ba9952afbb359ca0525cad3717f
 RMD160 (mgl2-alpha-020.tar.gz) = 4c1b6772d9b9adc96279b016fb574defb78f1fe7
 Size (mgl2-alpha-020.tar.gz) = 341420 bytes
 SHA1 (patch-aa) = 65104bb4030f3bd393f08d6b81382dc87913f5c7
-SHA1 (patch-ab) = d9ac9acb108f3f1254a24a90b5ceb7efe4e44e7b
+SHA1 (patch-ab) = ed6040306ea2b515c8aa01618f712cd60d699eef
 SHA1 (patch-ac) = e4179c5e6a000fbf24ab515769ab71849f0ec7fd
 SHA1 (patch-ad) = 8d333d48b897758754d781339a85b78edfd44541
 SHA1 (patch-ae) = e631dbe4341056cbc67f0a0054952746a087c5c1
diff --git a/graphics/mgl/patches/patch-ab b/graphics/mgl/patches/patch-ab
index 7e530b1d453..ebb252433c9 100644
--- a/graphics/mgl/patches/patch-ab
+++ b/graphics/mgl/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2011/04/03 11:40:08 wiz Exp $
+$NetBSD: patch-ab,v 1.4 2011/09/25 13:52:26 ryoon Exp $
 
 --- conf/config.mk-netbsd-i386-x.orig	Sun Dec 10 02:49:30 2000
 +++ conf/config.mk-netbsd-i386-x	Wed Mar 14 06:41:48 2001
@@ -41,7 +41,7 @@ $NetBSD: patch-ab,v 1.3 2011/04/03 11:40:08 wiz Exp $
 +
 +# nine
 +GP_DYNAMIC=y
-+PATCH_YY_BUF_SIZE=y
++@PATCH_YY_BUF_SIZE_FLAG@
  
  # mil options 
  USE_JPEG   = -DUSE_JPEG
-- 
cgit v1.2.3