Use flex and patch "'struct tm' has no member named 'tm_zone'" error on SunOS

4 files changed, 25 insertions, 9 deletions

diff --git a/devel/cvs-fast-export/Makefile b/devel/cvs-fast-export/Makefile
index 0f5cc286260..fabb7693eee 100644
--- a/devel/cvs-fast-export/Makefile
+++ b/devel/cvs-fast-export/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/08/05 02:10:07 gdt Exp $
+# $NetBSD: Makefile,v 1.4 2014/02/26 10:29:27 wiedi Exp $
 #
 
 DISTNAME=	cvs-fast-export-0.5
@@ -10,7 +10,7 @@ HOMEPAGE=	http://www.catb.org/~esr/cvs-fast-export/
 COMMENT=	Export an RCS or CVS history as a fast-import stream
 LICENSE=	gnu-gpl-v2
 
-USE_TOOLS+=	lex yacc
+USE_TOOLS+=	flex yacc
 BUILD_DEPENDS+=	asciidoc-[0-9]*:../../textproc/asciidoc
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/cvs-fast-export/distinfo b/devel/cvs-fast-export/distinfo
index 0c441915359..3cae37c6a57 100644
--- a/devel/cvs-fast-export/distinfo
+++ b/devel/cvs-fast-export/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2013/08/05 02:10:07 gdt Exp $
+$NetBSD: distinfo,v 1.4 2014/02/26 10:29:27 wiedi Exp $
 
 SHA1 (cvs-fast-export-0.5.tar.gz) = b7ccd8fd348afc859c54a98dda18b92c6b62db1a
 RMD160 (cvs-fast-export-0.5.tar.gz) = b1701d4656ce1ab0e0d9c58981ad7858598b8b21
 Size (cvs-fast-export-0.5.tar.gz) = 83565 bytes
-SHA1 (patch-Makefile) = 2b30aaf8d83b7372173aa0190afc858a2f85fbe9
+SHA1 (patch-Makefile) = 89f4067a1e11197f1731173209269312f7a13424
+SHA1 (patch-lex.l) = f28661386041b3ef8308bf3da4323f61a73ff515
diff --git a/devel/cvs-fast-export/patches/patch-Makefile b/devel/cvs-fast-export/patches/patch-Makefile
index a68c7e36423..7c7738995f1 100644
--- a/devel/cvs-fast-export/patches/patch-Makefile
+++ b/devel/cvs-fast-export/patches/patch-Makefile
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile,v 1.3 2013/08/05 02:10:07 gdt Exp $
+$NetBSD: patch-Makefile,v 1.4 2014/02/26 10:29:27 wiedi Exp $
 
 * Add "all" target.
 * Use ${PREFIX} variable.
@@ -6,18 +6,19 @@ $NetBSD: patch-Makefile,v 1.3 2013/08/05 02:10:07 gdt Exp $
 
 --- Makefile.orig	2013-05-22 03:23:56.000000000 +0000
 +++ Makefile
-@@ -3,8 +3,9 @@
+@@ -3,9 +3,9 @@
  # Build requirements: A C compiler, yacc, lex, and asciidoc.
  
  INSTALL = install
 -prefix?=/usr/local
 +prefix=$(PREFIX)
  target=$(DESTDIR)$(prefix)
+-LEX=/usr/bin/flex
 +mandir=$(PKGMANDIR)
- LEX=/usr/bin/flex
  
  VERSION=0.5
-@@ -25,6 +26,8 @@ OBJS=gram.o lex.o main.o cvsutil.o revdi
+ 
+@@ -25,6 +25,8 @@ OBJS=gram.o lex.o main.o cvsutil.o revdi
  	revlist.o atom.o revcvs.o generate.o export.o \
  	nodehash.o tags.o authormap.o graph.o
  
@@ -26,7 +27,7 @@ $NetBSD: patch-Makefile,v 1.3 2013/08/05 02:10:07 gdt Exp $
  cvs-fast-export: $(OBJS)
  	cc $(CFLAGS) -o $@ $(OBJS)
  
-@@ -56,9 +59,9 @@ clean:
+@@ -56,9 +58,9 @@ clean:
  
  install: cvs-fast-export.1 all
  	$(INSTALL) -d "$(target)/bin"
diff --git a/devel/cvs-fast-export/patches/patch-lex.l b/devel/cvs-fast-export/patches/patch-lex.l
new file mode 100644
index 00000000000..6d3dd44d9ce
--- /dev/null
+++ b/devel/cvs-fast-export/patches/patch-lex.l
@@ -0,0 +1,14 @@
+$NetBSD: patch-lex.l,v 1.1 2014/02/26 10:29:27 wiedi Exp $
+
+'struct tm' has no member named 'tm_zone' on SunOS
+--- lex.l.orig	2013-05-22 00:56:11.000000000 +0000
++++ lex.l
+@@ -188,7 +188,7 @@ lex_date (cvs_number *n)
+ 	tm.tm_min = n->n[4];
+ 	tm.tm_sec = n->n[5];
+ 	tm.tm_isdst = 0;
+-	#ifndef __CYGWIN__
++	#if !defined(__CYGWIN__) && !defined(__sun)
+ 	tm.tm_zone = 0;
+ 	#endif
+ 	d = mktime (&tm);