Prevent libfi to be linked with libintl.

Gettext is just used in flex tool, not in library.

Bump PKGREVISION.

4 files changed, 64 insertions, 7 deletions

diff --git a/devel/flex/Makefile b/devel/flex/Makefile
index 58ce4f7b9b9..c019b92f6b2 100644
--- a/devel/flex/Makefile
+++ b/devel/flex/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.42 2014/08/23 03:14:36 obache Exp $
+# $NetBSD: Makefile,v 1.43 2014/08/23 07:46:38 obache Exp $
 
 DISTNAME=	flex-2.5.39
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=flex/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/devel/flex/distinfo b/devel/flex/distinfo
index cb0421f6149..88fecb15cb7 100644
--- a/devel/flex/distinfo
+++ b/devel/flex/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.17 2014/08/23 03:14:36 obache Exp $
+$NetBSD: distinfo,v 1.18 2014/08/23 07:46:38 obache Exp $
 
 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-Makefile.am) = 7828c75f891db84b3be1719808b76542a24fdd74
 SHA1 (patch-aa) = 938335a9071be62f534bad8e785003318816fd38
-SHA1 (patch-ab) = 374a9aa4a9044de6540c0686d43beaf35f0ba029
+SHA1 (patch-ab) = 1a2b83af62151ccc09ad0bf74e0ff84d9a97d53f
 SHA1 (patch-ac) = 27ac026f8a180b49523933c5d70db0237e8dc095
 SHA1 (patch-ad) = b7fe34269e4425a7b3871278bb6a2b1e754c9045
diff --git a/devel/flex/patches/patch-Makefile.am b/devel/flex/patches/patch-Makefile.am
new file mode 100644
index 00000000000..92900d1fdf0
--- /dev/null
+++ b/devel/flex/patches/patch-Makefile.am
@@ -0,0 +1,39 @@
+$NetBSD: patch-Makefile.am,v 1.1 2014/08/23 07:46:38 obache Exp $
+
+* Prevent libfi to be linked with libintl.
+* Avoid -no-undefined flags, or missing symbols might occur.
+
+--- Makefile.am.orig	2014-03-26 12:46:44.000000000 +0000
++++ Makefile.am
+@@ -67,19 +67,19 @@ flex_SOURCES = \
+ 	regex.c
+ 
+ 
+-LDADD = lib/libcompat.la
++LDADD = lib/libcompat.la @LIBINTL@
+ 
+ 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 \
+@@ -124,7 +124,7 @@ SUBDIRS = \
+ 
+ localedir = $(datadir)/locale
+ AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl
+-LIBS = @LIBINTL@ @LIBS@
++LIBS = @LIBS@
+ 
+ skel.c: flex.skl mkskel.sh flexint.h tables_shared.h
+ 	sed 's/m4_/m4postproc_/g; s/m4preproc_/m4_/g' $(srcdir)/flex.skl | $(m4) -P -DFLEX_MAJOR_VERSION=`echo $(VERSION)|cut -f 1 -d .` -DFLEX_MINOR_VERSION=`echo $(VERSION)|cut -f 2 -d .` -DFLEX_SUBMINOR_VERSION=`echo $(VERSION)|cut -f 3 -d .` | sed 's/m4postproc_/m4_/g' | $(SHELL) $(srcdir)/mkskel.sh  >skel.c
diff --git a/devel/flex/patches/patch-ab b/devel/flex/patches/patch-ab
index 6f82e19f878..8618efb3091 100644
--- a/devel/flex/patches/patch-ab
+++ b/devel/flex/patches/patch-ab
@@ -1,6 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2014/04/17 16:44:30 adam Exp $
+$NetBSD: patch-ab,v 1.7 2014/08/23 07:46:38 obache Exp $
 
-Avoid -no-undefined flags, or missing symbols might occur.
+* XXX:
+* Prevent libfi to be linked with libintl.
+* Avoid -no-undefined flags, or missing symbols might occur.
 
 --- Makefile.in.orig	2014-03-26 18:58:57.000000000 +0000
 +++ Makefile.in
@@ -13,7 +15,22 @@ Avoid -no-undefined flags, or missing symbols might occur.
  flex_LDADD = $(LDADD)
  flex_DEPENDENCIES = lib/libcompat.la
  DEFAULT_INCLUDES = -I.@am__isrc@
-@@ -435,12 +435,12 @@ libfl_la_SOURCES = \
+@@ -304,7 +304,7 @@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBICONV = @LIBICONV@
+ LIBINTL = @LIBINTL@
+ LIBOBJS = @LIBOBJS@
+-LIBS = @LIBINTL@ @LIBS@
++LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+@@ -430,17 +430,17 @@ flex_SOURCES = \
+ 	filter.c \
+ 	regex.c
+ 
+-LDADD = lib/libcompat.la
++LDADD = lib/libcompat.la @LIBINTL@
+ libfl_la_SOURCES = \
  	libmain.c \
  	libyywrap.c