summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/flex/Makefile29
-rw-r--r--devel/flex/distinfo10
-rw-r--r--devel/flex/patches/patch-ab19
3 files changed, 38 insertions, 20 deletions
diff --git a/devel/flex/Makefile b/devel/flex/Makefile
index b8ee04f6f1d..c33dd3bea8e 100644
--- a/devel/flex/Makefile
+++ b/devel/flex/Makefile
@@ -1,26 +1,27 @@
-# $NetBSD: Makefile,v 1.39 2014/04/17 12:41:03 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2014/04/17 16:44:30 adam Exp $
-DISTNAME= flex-2.5.39
-CATEGORIES= lang
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=flex/}
+DISTNAME= flex-2.5.39
+CATEGORIES= lang
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=flex/}
+EXTRACT_SUFX= .tar.xz
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://flex.sourceforge.net/
-COMMENT= Fast clone of lex(1), the lexical scanner generator
+MAINTAINER= pkgsrc-users@NetBSD.org
+HOMEPAGE= http://flex.sourceforge.net/
+COMMENT= Fast clone of lex(1), the lexical scanner generator
+LICENSE= 2-clause-bsd
# needed for building flex.pdf, make it an option?
-#BUILD_DEPENDS+= gtexinfo-[0-9]*:../../devel/gtexinfo
-#BUILD_DEPENDS+= tex-tex-[0-9]*:../../print/tex-tex
-#BUILD_DEPENDS+= tex-pdftex-[0-9]*:../../print/tex-pdftex
-#BUILD_DEPENDS+= tex-latex-fonts-[0-9]*:../../fonts/tex-latex-fonts
+#BUILD_DEPENDS+= gtexinfo-[0-9]*:../../devel/gtexinfo
+#BUILD_DEPENDS+= tex-tex-[0-9]*:../../print/tex-tex
+#BUILD_DEPENDS+= tex-pdftex-[0-9]*:../../print/tex-pdftex
+#BUILD_DEPENDS+= tex-latex-fonts-[0-9]*:../../fonts/tex-latex-fonts
-GNU_CONFIGURE= yes
USE_LIBTOOL= yes
+USE_PKGLOCALEDIR= yes
USE_TOOLS+= gm4:run makeinfo
+GNU_CONFIGURE= yes
INFO_FILES= yes
-USE_PKGLOCALEDIR= yes
-MAKE_JOBS_SAFE= no
TEST_TARGET= check
LIBS.SunOS+= -lm
diff --git a/devel/flex/distinfo b/devel/flex/distinfo
index 3a1dd73e058..1c004fc8cef 100644
--- a/devel/flex/distinfo
+++ b/devel/flex/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.15 2014/04/17 12:41:03 wiz Exp $
+$NetBSD: distinfo,v 1.16 2014/04/17 16:44:30 adam Exp $
-SHA1 (flex-2.5.39.tar.gz) = 40866373afd3ab88a7f7fe26c9b27b035aa1f2a9
-RMD160 (flex-2.5.39.tar.gz) = 5c2e3859466cac39da72d2f6e4b23998ba0ecaf6
-Size (flex-2.5.39.tar.gz) = 1916273 bytes
+SHA1 (flex-2.5.39.tar.xz) = 415e82bb0dc9b1713fc4802a9db2274cd8d2909a
+RMD160 (flex-2.5.39.tar.xz) = b5c9555d1fe48086d96475cf41ca800e8138514d
+Size (flex-2.5.39.tar.xz) = 1347436 bytes
SHA1 (patch-aa) = 938335a9071be62f534bad8e785003318816fd38
-SHA1 (patch-ab) = d2fde3befc93337f21965241080b783c9aa75e67
+SHA1 (patch-ab) = 374a9aa4a9044de6540c0686d43beaf35f0ba029
SHA1 (patch-ac) = 27ac026f8a180b49523933c5d70db0237e8dc095
SHA1 (patch-ad) = b7fe34269e4425a7b3871278bb6a2b1e754c9045
SHA1 (patch-doc_Makefile.in) = 358daafc6ab8a9c68f8541c67ae147cfa3b7d5cc
diff --git a/devel/flex/patches/patch-ab b/devel/flex/patches/patch-ab
index 6b58523b7b9..6f82e19f878 100644
--- a/devel/flex/patches/patch-ab
+++ b/devel/flex/patches/patch-ab
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.5 2014/04/17 12:41:04 wiz Exp $
+$NetBSD: patch-ab,v 1.6 2014/04/17 16:44:30 adam Exp $
+
+Avoid -no-undefined flags, or missing symbols might occur.
--- Makefile.in.orig 2014-03-26 18:58:57.000000000 +0000
+++ Makefile.in
@@ -11,3 +13,18 @@ $NetBSD: patch-ab,v 1.5 2014/04/17 12:41:04 wiz Exp $
flex_LDADD = $(LDADD)
flex_DEPENDENCIES = lib/libcompat.la
DEFAULT_INCLUDES = -I.@am__isrc@
+@@ -435,12 +435,12 @@ libfl_la_SOURCES = \
+ libmain.c \
+ libyywrap.c
+
+-libfl_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@
++libfl_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
+ libfl_pic_la_SOURCES = \
+ libmain.c \
+ libyywrap.c
+
+-libfl_pic_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@
++libfl_pic_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
+ noinst_HEADERS = \
+ flexdef.h \
+ flexint.h \