From d688889d109b93072d4642d1a6e0decf5ddae241 Mon Sep 17 00:00:00 2001
From: spz <spz>
Date: Sun, 25 Apr 2010 18:18:54 +0000
Subject: Pullup ticket 3092 - requested by dholland build fix

Revisions pulled up:
- pkgsrc/wm/golem/distinfo		1.7

Files added:
pkgsrc/wm/golem/patches/patch-ah
pkgsrc/wm/golem/patches/patch-ai
pkgsrc/wm/golem/patches/patch-aj

   --------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   dholland
   Date:           Sat Apr 24 19:28:31 UTC 2010

   Modified Files:
           pkgsrc/wm/golem: distinfo
   Added Files:
           pkgsrc/wm/golem/patches: patch-ah patch-ai

   Log Message:
   Fix energizer-bunny-makefiles.


   To generate a diff of this commit:
   cvs rdiff -u -r1.5 -r1.6 pkgsrc/wm/golem/distinfo
   cvs rdiff -u -r0 -r1.1 pkgsrc/wm/golem/patches/patch-ah \
       pkgsrc/wm/golem/patches/patch-ai

   --------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   dholland
   Date:           Sat Apr 24 19:36:14 UTC 2010

   Modified Files:
           pkgsrc/wm/golem: distinfo
   Added Files:
           pkgsrc/wm/golem/patches: patch-aj

   Log Message:
   Hack around build problem with -current's lex.


   To generate a diff of this commit:
   cvs rdiff -u -r1.6 -r1.7 pkgsrc/wm/golem/distinfo
   cvs rdiff -u -r0 -r1.1 pkgsrc/wm/golem/patches/patch-aj
---
 wm/golem/distinfo         |  5 ++++-
 wm/golem/patches/patch-ah | 15 +++++++++++++++
 wm/golem/patches/patch-ai | 15 +++++++++++++++
 wm/golem/patches/patch-aj | 19 +++++++++++++++++++
 4 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 wm/golem/patches/patch-ah
 create mode 100644 wm/golem/patches/patch-ai
 create mode 100644 wm/golem/patches/patch-aj

diff --git a/wm/golem/distinfo b/wm/golem/distinfo
index 7868657d9c6..8ced08b94e1 100644
--- a/wm/golem/distinfo
+++ b/wm/golem/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2009/11/26 17:16:47 joerg Exp $
+$NetBSD: distinfo,v 1.5.4.1 2010/04/25 18:18:54 spz Exp $
 
 SHA1 (golem-0.0.5.tar.gz) = 5939acf109502a2f962e20fa933b31970fb2ed74
 RMD160 (golem-0.0.5.tar.gz) = 845d67cc96fbf34aca99c50bdccf4c1afdafb7f1
@@ -10,3 +10,6 @@ SHA1 (patch-ad) = ca2f91ea4587148543811729c8afc8e474b1c1ba
 SHA1 (patch-ae) = 76ecf2c292a2d3af0a897a986e2a61c87dad4998
 SHA1 (patch-af) = 3d74dacec56e4c953169300dd492ecdbb67d3302
 SHA1 (patch-ag) = 29b9e2068191a84d30224eb1103e68601a3da220
+SHA1 (patch-ah) = a60ccac1bb4d818c7ac11c5acadd131e25f6803d
+SHA1 (patch-ai) = 580b4cbccb7039b476a3469a63d1d888d86e0993
+SHA1 (patch-aj) = 7e9df0996e972b174dfe833705219e937f11ab28
diff --git a/wm/golem/patches/patch-ah b/wm/golem/patches/patch-ah
new file mode 100644
index 00000000000..b648a499e91
--- /dev/null
+++ b/wm/golem/patches/patch-ah
@@ -0,0 +1,15 @@
+$NetBSD: patch-ah,v 1.1.2.2 2010/04/25 18:18:54 spz Exp $
+
+makefiles should stop on error.
+
+--- Makefile.in~	2008-03-30 12:40:03.000000000 -0400
++++ Makefile.in	2008-03-30 12:42:07.000000000 -0400
+@@ -17,7 +17,7 @@
+ # subdir recursion macro
+ RECUR=	@for dir in $(SUBDIRS) ; do \
+ 		echo "===> $$dir"; \
+-		(cd $$dir ; $(MAKE) $@) \
++		(cd $$dir && $(MAKE) $@) || exit 1; \
+ 	done
+ 
+ all:
diff --git a/wm/golem/patches/patch-ai b/wm/golem/patches/patch-ai
new file mode 100644
index 00000000000..19e43842e4b
--- /dev/null
+++ b/wm/golem/patches/patch-ai
@@ -0,0 +1,15 @@
+$NetBSD: patch-ai,v 1.1.2.2 2010/04/25 18:18:54 spz Exp $
+
+makefiles should stop on error.
+
+--- plugins/Makefile.in~	2001-12-25 16:27:17.000000000 -0500
++++ plugins/Makefile.in	2008-03-30 12:42:06.000000000 -0400
+@@ -8,7 +8,7 @@
+ 
+ RECUR=	@for dir in $(SUBDIRS) ; do \
+ 		echo "===> $$dir" ; \
+-		(cd $$dir ; $(MAKE) $@) ; \
++		(cd $$dir && $(MAKE) $@) || exit 1; \
+ 	done
+ 
+ all:
diff --git a/wm/golem/patches/patch-aj b/wm/golem/patches/patch-aj
new file mode 100644
index 00000000000..acf8e5eb823
--- /dev/null
+++ b/wm/golem/patches/patch-aj
@@ -0,0 +1,19 @@
+$NetBSD: patch-aj,v 1.1.2.2 2010/04/25 18:18:54 spz Exp $
+
+Hack around a problem that appears with the newer flex in NetBSD-current.
+(This is a hack, not a fix.)
+
+--- src/rclex.l~	2002-01-18 01:11:10.000000000 +0000
++++ src/rclex.l
+@@ -134,7 +134,11 @@ static int rclex_includef(FILE *file, ch
+ 	inside_forplug = forplug;
+ 	yyin = file;
+ 	yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE));
++#ifndef INITIAL	/* hack; flex docs say INITIAL === 0 */
++	BEGIN(0);
++#else
+ 	BEGIN(INITIAL);
++#endif
+ 
+ 	return 0;
+ }
-- 
cgit v1.2.3