pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/devel/flex



Module Name:    pkgsrc
Committed By:   mef
Date:           Fri Aug 12 10:12:23 UTC 2016

Modified Files:
        pkgsrc/devel/flex: Makefile PLIST distinfo
        pkgsrc/devel/flex/patches: patch-src_Makefile.am
Added Files:
        pkgsrc/devel/flex/patches: patch-src_Makefile.in patch-src_filter.c
            patch-tests_Makefile.in
Removed Files:
        pkgsrc/devel/flex/patches: patch-tests_Makefile.am

Log Message:
Reverted devel/flex to 2.6.0
----------------------------
Recent commit update to 2.6.1 has problem, reverting now, thanks joerg and wiz
 - Bison is required to build without pre-generated files, but
   Bison needs flex, thus cyclic-dependency problem
 - Missing to include gettext-tool/buildlink3.mk


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 pkgsrc/devel/flex/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/flex/PLIST
cvs rdiff -u -r1.23 -r1.24 pkgsrc/devel/flex/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/flex/patches/patch-src_Makefile.am
cvs rdiff -u -r0 -r1.3 pkgsrc/devel/flex/patches/patch-src_Makefile.in \
    pkgsrc/devel/flex/patches/patch-src_filter.c \
    pkgsrc/devel/flex/patches/patch-tests_Makefile.in
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/flex/patches/patch-tests_Makefile.am

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/flex/Makefile
diff -u pkgsrc/devel/flex/Makefile:1.50 pkgsrc/devel/flex/Makefile:1.51
--- pkgsrc/devel/flex/Makefile:1.50     Thu Aug 11 03:23:44 2016
+++ pkgsrc/devel/flex/Makefile  Fri Aug 12 10:12:23 2016
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.50 2016/08/11 03:23:44 mef Exp $
+# $NetBSD: Makefile,v 1.51 2016/08/12 10:12:23 mef Exp $
 
-VERSION=       2.6.1
-DISTNAME=      flex-${VERSION}
-CATEGORIES=    devel lang
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=westes/}
-GITHUB_TAG=    v${VERSION}
+DISTNAME=      flex-2.6.0
+CATEGORIES=    lang
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=flex/}
+EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/westes/flex
@@ -13,15 +12,13 @@ LICENSE=    2-clause-bsd
 
 USE_LIBTOOL=           yes
 USE_PKGLOCALEDIR=      yes
-USE_TOOLS+=            gm4:run automake autoconf makeinfo gettext
+USE_TOOLS+=            gm4:run
 GNU_CONFIGURE=         yes
 INFO_FILES=            yes
 
 TEST_TARGET=           check
 LIBS.SunOS+=           -lm
 
-BUILD_DEPENDS+=                help2man-[0-9]*:../../converters/help2man
-
 .include "../../mk/bsd.prefs.mk"
 
 CFLAGS.AIX+=           -D_LINUX_SOURCE_COMPAT
@@ -37,8 +34,5 @@ REPLACE_BASH=         tests/testwrapper.sh test
 USE_TOOLS+=            gmake   # bmake has problems with the test suite
 #.endif
 
-pre-configure:
-       (cd ${WRKSRC}; ./autogen.sh)
-
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/flex/PLIST
diff -u pkgsrc/devel/flex/PLIST:1.10 pkgsrc/devel/flex/PLIST:1.11
--- pkgsrc/devel/flex/PLIST:1.10        Thu Aug 11 03:23:44 2016
+++ pkgsrc/devel/flex/PLIST     Fri Aug 12 10:12:23 2016
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2016/08/11 03:23:44 mef Exp $
+@comment $NetBSD: PLIST,v 1.11 2016/08/12 10:12:23 mef Exp $
 bin/flex
 bin/flex++
 include/FlexLexer.h
@@ -11,6 +11,7 @@ share/doc/flex/COPYING
 share/doc/flex/NEWS
 share/doc/flex/ONEWS
 share/doc/flex/README
+share/doc/flex/flex.pdf
 share/locale/ca/LC_MESSAGES/flex.mo
 share/locale/da/LC_MESSAGES/flex.mo
 share/locale/de/LC_MESSAGES/flex.mo

Index: pkgsrc/devel/flex/distinfo
diff -u pkgsrc/devel/flex/distinfo:1.23 pkgsrc/devel/flex/distinfo:1.24
--- pkgsrc/devel/flex/distinfo:1.23     Thu Aug 11 03:23:44 2016
+++ pkgsrc/devel/flex/distinfo  Fri Aug 12 10:12:23 2016
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.23 2016/08/11 03:23:44 mef Exp $
+$NetBSD: distinfo,v 1.24 2016/08/12 10:12:23 mef Exp $
 
-SHA1 (flex-2.6.1.tar.gz) = c99b9217dc13bc78eef3a503fc93608d113ddcad
-RMD160 (flex-2.6.1.tar.gz) = 497c257bff161300e80f0997987d250882db15a4
-SHA512 (flex-2.6.1.tar.gz) = d458822621d47472a9074e03883a9df7f6c329303debc8f03bd98617536e2c7e11afd990386cec9a4e9674cc1fc9bfa4ead45e67b72c680aab3c5626086f4c1c
-Size (flex-2.6.1.tar.gz) = 591026 bytes
-SHA1 (patch-src_Makefile.am) = 42fb784f188d44fe6c6125fd0ae117e3720e0038
-SHA1 (patch-tests_Makefile.am) = 35aeea5d02c8ce021e5d767eb311e40b6a4089a4
+SHA1 (flex-2.6.0.tar.xz) = 684c927c9f1b170e9627338de12e99cf2c224b91
+RMD160 (flex-2.6.0.tar.xz) = 07c8ffa268fc4a9a117e9c12736f8b58a583dde8
+SHA512 (flex-2.6.0.tar.xz) = 9cd48aa79ce70814902745d6e67f677bcc67f23dcc46ebb5f2963efac0d8f6f6c10ee87369d2d7557d29e390a3502dd99246db0fd2e096b9e7bb6e16d51d3abe
+Size (flex-2.6.0.tar.xz) = 1369552 bytes
+SHA1 (patch-src_Makefile.am) = b50c07da46385500c1a220967c84bea1027b4081
+SHA1 (patch-src_Makefile.in) = 8d36fbd12918986715c53c772df549a5057325b7
+SHA1 (patch-src_filter.c) = 377be93afefeca93efa1f8eae0407374bd006ab3
+SHA1 (patch-tests_Makefile.in) = cff98017e0cc0046b57d3b50c9d07ca43d7ce4f7

Index: pkgsrc/devel/flex/patches/patch-src_Makefile.am
diff -u pkgsrc/devel/flex/patches/patch-src_Makefile.am:1.2 pkgsrc/devel/flex/patches/patch-src_Makefile.am:1.3
--- pkgsrc/devel/flex/patches/patch-src_Makefile.am:1.2 Thu Aug 11 03:23:44 2016
+++ pkgsrc/devel/flex/patches/patch-src_Makefile.am     Fri Aug 12 10:12:23 2016
@@ -1,15 +1,25 @@
-$NetBSD: patch-src_Makefile.am,v 1.2 2016/08/11 03:23:44 mef Exp $
+$NetBSD: patch-src_Makefile.am,v 1.3 2016/08/12 10:12:23 mef Exp $
 
-parse.h should be created before main.c is compiled
+libfl* do not need to be linked against libintl, only the binaries do.
+https://sourceforge.net/p/flex/bugs/198/
 
---- src/Makefile.am.orig       2016-03-02 09:24:24.000000000 +0900
-+++ src/Makefile.am    2016-08-11 11:29:09.000000000 +0900
-@@ -103,7 +103,7 @@ gen.o: gen.c flexdef.h flexint.h tables.
- libmain.o: libmain.c
- libyywrap.o: libyywrap.c
- main.o: main.c flexdef.h flexint.h version.h options.h scanopt.h \
-- tables.h tables_shared.h
-+ tables.h tables_shared.h parse.h
- misc.o: misc.c flexdef.h flexint.h tables.h tables_shared.h
- nfa.o: nfa.c flexdef.h flexint.h
- options.o: options.c options.h scanopt.h flexdef.h flexint.h
+--- src/Makefile.am.orig       2015-11-13 19:32:53.000000000 +0000
++++ src/Makefile.am
+@@ -1,7 +1,7 @@
+ AM_YFLAGS = -d
+ localedir = $(datadir)/locale
+ AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl
+-LIBS = @LIBINTL@ @LIBS@
++LIBS = @LIBS@
+ 
+ m4 = @M4@
+ 
+@@ -33,7 +33,7 @@ flex_SOURCES = \
+       filter.c \
+       regex.c
+ 
+-LDADD = ../lib/libcompat.la
++LDADD = ../lib/libcompat.la @LIBINTL@
+ 
+ libfl_la_SOURCES = \
+       libmain.c \

Added files:

Index: pkgsrc/devel/flex/patches/patch-src_Makefile.in
diff -u /dev/null pkgsrc/devel/flex/patches/patch-src_Makefile.in:1.3
--- /dev/null   Fri Aug 12 10:12:23 2016
+++ pkgsrc/devel/flex/patches/patch-src_Makefile.in     Fri Aug 12 10:12:23 2016
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_Makefile.in,v 1.3 2016/08/12 10:12:23 mef Exp $
+
+libfl* do not need to be linked against libintl, only the binaries do.
+https://sourceforge.net/p/flex/bugs/198/
+
+--- src/Makefile.in.orig       2015-11-17 16:19:45.000000000 +0000
++++ src/Makefile.in
+@@ -302,7 +302,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@
+@@ -428,7 +428,7 @@ flex_SOURCES = \
+       filter.c \
+       regex.c
+ 
+-LDADD = ../lib/libcompat.la
++LDADD = ../lib/libcompat.la @LIBINTL@
+ libfl_la_SOURCES = \
+       libmain.c \
+       libyywrap.c
Index: pkgsrc/devel/flex/patches/patch-src_filter.c
diff -u /dev/null pkgsrc/devel/flex/patches/patch-src_filter.c:1.3
--- /dev/null   Fri Aug 12 10:12:23 2016
+++ pkgsrc/devel/flex/patches/patch-src_filter.c        Fri Aug 12 10:12:23 2016
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_filter.c,v 1.3 2016/08/12 10:12:23 mef Exp $
+
+Improve stdin-to-pipe hack on NetBSD
+https://sourceforge.net/p/flex/bugs/198/
+
+--- src/filter.c.orig  2015-11-10 23:10:20.000000000 +0000
++++ src/filter.c
+@@ -174,6 +174,8 @@ clearerr(stdin);
+                       flexfatal (_("dup2(pipes[0],0)"));
+               close (pipes[0]);
+         fseek (stdin, 0, SEEK_CUR);
++        ungetc(' ', stdin); /* still an evil hack, but one that works better */
++        (void)fgetc(stdin); /* on NetBSD than the fseek attempt does */
+ 
+               /* run as a filter, either internally or by exec */
+               if (chain->filter_func) {
Index: pkgsrc/devel/flex/patches/patch-tests_Makefile.in
diff -u /dev/null pkgsrc/devel/flex/patches/patch-tests_Makefile.in:1.3
--- /dev/null   Fri Aug 12 10:12:23 2016
+++ pkgsrc/devel/flex/patches/patch-tests_Makefile.in   Fri Aug 12 10:12:23 2016
@@ -0,0 +1,31 @@
+$NetBSD: patch-tests_Makefile.in,v 1.3 2016/08/12 10:12:23 mef Exp $
+
+Disable bison tests since we don't want to build with bison
+to avoid a dependency cycle, since bison depends on flex.
+
+--- tests/Makefile.in.orig     2015-11-17 16:19:46.000000000 +0000
++++ tests/Makefile.in
+@@ -131,8 +131,8 @@ CONFIG_HEADER = $(top_builddir)/src/conf
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ am__EXEEXT_1 = alloc_extra$(EXEEXT) array_nr$(EXEEXT) array_r$(EXEEXT) \
+-      basic_nr$(EXEEXT) basic_r$(EXEEXT) bison_nr$(EXEEXT) \
+-      bison_yylloc$(EXEEXT) bison_yylval$(EXEEXT) c_cxx_nr$(EXEEXT) \
++      basic_nr$(EXEEXT) basic_r$(EXEEXT) \
++      c_cxx_nr$(EXEEXT) \
+       c_cxx_r$(EXEEXT) ccl$(EXEEXT) cxx_basic$(EXEEXT) \
+       cxx_multiple_scanners$(EXEEXT) debug_nr$(EXEEXT) \
+       debug_r$(EXEEXT) extended$(EXEEXT) header_nr$(EXEEXT) \
+@@ -1440,12 +1440,6 @@ string_r_SOURCES = string_r.l
+ top_SOURCES = top.l top_main.c
+ yyextra_SOURCES = yyextra.l
+ BUILT_SOURCES = \
+-      bison_nr_parser.h \
+-      bison_nr_scanner.h \
+-      bison_yylloc_parser.h \
+-      bison_yylloc_scanner.h \
+-      bison_yylval_parser.h \
+-      bison_yylval_scanner.h \
+       header_nr_scanner.h \
+       header_r_scanner.h \
+       multiple_scanners_nr_1.h \



Home | Main Index | Thread Index | Old Index