[arch-commits] Commit in flex/repos (22 files)
Allan McRae
allan at archlinux.org
Sun Jul 22 12:56:35 UTC 2012
Date: Sunday, July 22, 2012 @ 08:56:35
Author: allan
Revision: 163938
db-move: moved flex from [testing] to [core] ( i686, x86_64)
Added:
flex/repos/core-i686/PKGBUILD
(from rev 163937, flex/repos/testing-i686/PKGBUILD)
flex/repos/core-i686/flex.install
(from rev 163937, flex/repos/testing-i686/flex.install)
flex/repos/core-i686/lex.sh
(from rev 163937, flex/repos/testing-i686/lex.sh)
flex/repos/core-x86_64/PKGBUILD
(from rev 163937, flex/repos/testing-x86_64/PKGBUILD)
flex/repos/core-x86_64/flex.install
(from rev 163937, flex/repos/testing-x86_64/flex.install)
flex/repos/core-x86_64/lex.sh
(from rev 163937, flex/repos/testing-x86_64/lex.sh)
Deleted:
flex/repos/core-i686/PKGBUILD
flex/repos/core-i686/flex-2.5.35-gcc44.patch
flex/repos/core-i686/flex-2.5.35-hardening.patch
flex/repos/core-i686/flex-2.5.35-missing-prototypes.patch
flex/repos/core-i686/flex-2.5.35-sign.patch
flex/repos/core-i686/flex.install
flex/repos/core-i686/lex.sh
flex/repos/core-x86_64/PKGBUILD
flex/repos/core-x86_64/flex-2.5.35-gcc44.patch
flex/repos/core-x86_64/flex-2.5.35-hardening.patch
flex/repos/core-x86_64/flex-2.5.35-missing-prototypes.patch
flex/repos/core-x86_64/flex-2.5.35-sign.patch
flex/repos/core-x86_64/flex.install
flex/repos/core-x86_64/lex.sh
flex/repos/testing-i686/
flex/repos/testing-x86_64/
--------------------------------------------------+
core-i686/PKGBUILD | 103 ++++++++-------------
core-i686/flex-2.5.35-gcc44.patch | 22 ----
core-i686/flex-2.5.35-hardening.patch | 36 -------
core-i686/flex-2.5.35-missing-prototypes.patch | 53 ----------
core-i686/flex-2.5.35-sign.patch | 11 --
core-i686/flex.install | 44 ++++----
core-i686/lex.sh | 6 -
core-x86_64/PKGBUILD | 103 ++++++++-------------
core-x86_64/flex-2.5.35-gcc44.patch | 22 ----
core-x86_64/flex-2.5.35-hardening.patch | 36 -------
core-x86_64/flex-2.5.35-missing-prototypes.patch | 53 ----------
core-x86_64/flex-2.5.35-sign.patch | 11 --
core-x86_64/flex.install | 44 ++++----
core-x86_64/lex.sh | 6 -
14 files changed, 138 insertions(+), 412 deletions(-)
Deleted: core-i686/PKGBUILD
===================================================================
--- core-i686/PKGBUILD 2012-07-22 11:45:09 UTC (rev 163937)
+++ core-i686/PKGBUILD 2012-07-22 12:56:35 UTC (rev 163938)
@@ -1,59 +0,0 @@
-# $Id$
-# Maintainer: Allan McRae <allan at archlinux.org>
-# Contributor: judd <jvinet at zeroflux.org>
-
-pkgname=flex
-pkgver=2.5.35
-pkgrel=5
-pkgdesc="A tool for generating text-scanning programs"
-arch=('i686' 'x86_64')
-url="http://flex.sourceforge.net"
-license=('custom')
-groups=('base-devel')
-depends=('glibc' 'm4' 'sh')
-install=flex.install
-source=(http://downloads.sourceforge.net/sourceforge/flex/flex-$pkgver.tar.bz2
- flex-2.5.35-gcc44.patch
- flex-2.5.35-hardening.patch
- flex-2.5.35-missing-prototypes.patch
- flex-2.5.35-sign.patch
- lex.sh)
-md5sums=('10714e50cea54dc7a227e3eddcd44d57'
- 'e4444ef5c07db71a43280be74139bdea'
- 'de952b3ed7cc074bc8c3e6ab73634048'
- '6b83f56b1b654c6a321cdc530a3ec68d'
- 'd87fd9e9762ba7e230d516bdcf1c8c6f'
- 'f725259ec23a9e87ee29e2ef82eda9a5')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
-
- patch -Np1 -i $srcdir/flex-2.5.35-gcc44.patch
- patch -Np1 -i $srcdir/flex-2.5.35-hardening.patch
- patch -Np1 -i $srcdir/flex-2.5.35-missing-prototypes.patch
- patch -Np1 -i $srcdir/flex-2.5.35-sign.patch
-
- ./configure --prefix=/usr \
- --mandir=/usr/share/man --infodir=/usr/share/info
- make
-}
-
-check() {
- cd $srcdir/$pkgname-$pkgver
- make check
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
-
- make prefix=$pkgdir/usr \
- mandir=$pkgdir/usr/share/man \
- infodir=$pkgdir/usr/share/info \
- install
- install -Dm755 $srcdir/lex.sh $pkgdir/usr/bin/lex
-
- install -Dm644 COPYING \
- $pkgdir/usr/share/licenses/$pkgname/license.txt
-
-}
-
Copied: flex/repos/core-i686/PKGBUILD (from rev 163937, flex/repos/testing-i686/PKGBUILD)
===================================================================
--- core-i686/PKGBUILD (rev 0)
+++ core-i686/PKGBUILD 2012-07-22 12:56:35 UTC (rev 163938)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Allan McRae <allan at archlinux.org>
+# Contributor: judd <jvinet at zeroflux.org>
+
+pkgname=flex
+pkgver=2.5.36
+pkgrel=1
+pkgdesc="A tool for generating text-scanning programs"
+arch=('i686' 'x86_64')
+url="http://flex.sourceforge.net"
+license=('custom')
+groups=('base-devel')
+depends=('glibc' 'm4' 'sh')
+install=flex.install
+source=(http://downloads.sourceforge.net/sourceforge/flex/flex-$pkgver.tar.bz2
+ lex.sh)
+md5sums=('5e637290609fd3c2f1f2e75ac2bce1c5'
+ 'f725259ec23a9e87ee29e2ef82eda9a5')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ ./configure --prefix=/usr
+ make
+}
+
+check() {
+ cd $srcdir/$pkgname-$pkgver
+
+ # these tests used features removed in bison-2.6
+ sed -i -e '/test-bison-yylloc/d' -e '/test-bison-yylval/d' tests/Makefile.in
+
+ make check
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+
+ make DESTDIR=$pkgdir install
+ install -Dm755 $srcdir/lex.sh $pkgdir/usr/bin/lex
+
+ install -Dm644 COPYING \
+ $pkgdir/usr/share/licenses/$pkgname/license.txt
+}
+
Deleted: core-i686/flex-2.5.35-gcc44.patch
===================================================================
--- core-i686/flex-2.5.35-gcc44.patch 2012-07-22 11:45:09 UTC (rev 163937)
+++ core-i686/flex-2.5.35-gcc44.patch 2012-07-22 12:56:35 UTC (rev 163938)
@@ -1,22 +0,0 @@
-diff -urNp flex-2.5.35.orig/flex.skl flex-2.5.35/flex.skl
---- flex-2.5.35.orig/flex.skl 2009-04-20 03:09:46.000000000 +0530
-+++ flex-2.5.35/flex.skl 2009-04-20 07:46:58.000000000 +0530
-@@ -217,6 +217,7 @@ m4preproc_include(`flexint.h')
- /* begin standard C++ headers. */
- #include <iostream>
- #include <errno.h>
-+#include <cstdio>
- #include <cstdlib>
- #include <cstring>
- /* end standard C++ headers. */
-diff -urNp flex-2.5.35.orig/skel.c flex-2.5.35/skel.c
---- flex-2.5.35.orig/skel.c 2009-04-20 03:09:46.000000000 +0530
-+++ flex-2.5.35/skel.c 2009-04-20 07:46:40.000000000 +0530
-@@ -284,6 +284,7 @@ const char *skel[] = {
- "/* begin standard C++ headers. */",
- "#include <iostream> ",
- "#include <errno.h>",
-+ "#include <cstdio>",
- "#include <cstdlib>",
- "#include <cstring>",
- "/* end standard C++ headers. */",
Deleted: core-i686/flex-2.5.35-hardening.patch
===================================================================
--- core-i686/flex-2.5.35-hardening.patch 2012-07-22 11:45:09 UTC (rev 163937)
+++ core-i686/flex-2.5.35-hardening.patch 2012-07-22 12:56:35 UTC (rev 163938)
@@ -1,36 +0,0 @@
-diff -u flex-2.5.35/scan.c flex-2.5.35/scan.c
---- flex-2.5.35/scan.c
-+++ flex-2.5.35/scan.c
-@@ -2096,7 +2096,7 @@
- /* This used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite().
- */
--#define ECHO fwrite( yytext, yyleng, 1, yyout )
-+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
- #endif
-
- /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
-diff -u flex-2.5.35/flex.skl flex-2.5.35/flex.skl
---- flex-2.5.35/flex.skl
-+++ flex-2.5.35/flex.skl
-@@ -1075,7 +1075,7 @@
- /* This used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite().
- */
--#define ECHO fwrite( yytext, yyleng, 1, yyout )
-+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
- %endif
- %if-c++-only C++ definition
- #define ECHO LexerOutput( yytext, yyleng )
-diff -u flex-2.5.35/skel.c flex-2.5.35/skel.c
---- flex-2.5.35/skel.c
-+++ flex-2.5.35/skel.c
-@@ -1142,7 +1142,7 @@
- "/* This used to be an fputs(), but since the string might contain NUL's,",
- " * we now use fwrite().",
- " */",
-- "#define ECHO fwrite( yytext, yyleng, 1, yyout )",
-+ "#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)",
- "%endif",
- "%if-c++-only C++ definition",
- "#define ECHO LexerOutput( yytext, yyleng )",
Deleted: core-i686/flex-2.5.35-missing-prototypes.patch
===================================================================
--- core-i686/flex-2.5.35-missing-prototypes.patch 2012-07-22 11:45:09 UTC (rev 163937)
+++ core-i686/flex-2.5.35-missing-prototypes.patch 2012-07-22 12:56:35 UTC (rev 163938)
@@ -1,53 +0,0 @@
-diff -up flex-2.5.35/flex.skl\~ flex-2.5.35/flex.skl
---- flex-2.5.35/flex.skl~ 2010-07-13 17:18:43.000000000 +0200
-+++ flex-2.5.35/flex.skl 2010-07-13 17:23:49.000000000 +0200
-@@ -960,6 +960,22 @@ m4_ifdef( [[M4_YY_NO_SET_LINENO]],,
- void yyset_lineno M4_YY_PARAMS( int line_number M4_YY_PROTO_LAST_ARG );
- ]])
-
-+m4_ifdef( [[M4_YY_REENTRANT]],
-+[[
-+m4_ifdef( [[M4_YY_NO_GET_COLUMN]],,
-+[[
-+int yyget_column M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );
-+]])
-+]])
-+
-+m4_ifdef( [[M4_YY_REENTRANT]],
-+[[
-+m4_ifdef( [[M4_YY_NO_SET_COLUMN]],,
-+[[
-+void yyset_column M4_YY_PARAMS( int column_no M4_YY_PROTO_LAST_ARG );
-+]])
-+]])
-+
- %if-bison-bridge
- m4_ifdef( [[M4_YY_NO_GET_LVAL]],,
- [[
-
-Diff finished. Tue Jul 13 17:27:50 2010
---- flex-2.5.35/skel.c~ 2010-07-14 13:15:42.000000000 +0200
-+++ flex-2.5.35/skel.c 2010-07-14 13:16:05.000000000 +0200
-@@ -1027,6 +1027,22 @@
- "void yyset_lineno M4_YY_PARAMS( int line_number M4_YY_PROTO_LAST_ARG );",
- "]])",
- "",
-+ "m4_ifdef( [[M4_YY_REENTRANT]],",
-+ "[[",
-+ "m4_ifdef( [[M4_YY_NO_GET_COLUMN]],,",
-+ "[[",
-+ "int yyget_column M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );",
-+ "]])",
-+ "]])",
-+ "",
-+ "m4_ifdef( [[M4_YY_REENTRANT]],",
-+ "[[",
-+ "m4_ifdef( [[M4_YY_NO_SET_COLUMN]],,",
-+ "[[",
-+ "void yyset_column M4_YY_PARAMS( int column_no M4_YY_PROTO_LAST_ARG );",
-+ "]])",
-+ "]])",
-+ "",
- "%if-bison-bridge",
- "m4_ifdef( [[M4_YY_NO_GET_LVAL]],,",
- "[[",
Deleted: core-i686/flex-2.5.35-sign.patch
===================================================================
--- core-i686/flex-2.5.35-sign.patch 2012-07-22 11:45:09 UTC (rev 163937)
+++ core-i686/flex-2.5.35-sign.patch 2012-07-22 12:56:35 UTC (rev 163938)
@@ -1,11 +0,0 @@
---- flex-2.5.35/gen.c-orig 2008-04-30 22:51:08.000000000 +0200
-+++ flex-2.5.35/gen.c 2008-04-30 22:51:14.000000000 +0200
-@@ -1890,7 +1890,7 @@
- outn ("\tif ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \\");
- outn ("\t\t{ \\");
- outn ("\t\tint c = '*'; \\");
-- outn ("\t\tint n; \\");
-+ outn ("\t\tunsigned n; \\");
- outn ("\t\tfor ( n = 0; n < max_size && \\");
- outn ("\t\t\t (c = getc( yyin )) != EOF && c != '\\n'; ++n ) \\");
- outn ("\t\t\tbuf[n] = (char) c; \\");
Deleted: core-i686/flex.install
===================================================================
--- core-i686/flex.install 2012-07-22 11:45:09 UTC (rev 163937)
+++ core-i686/flex.install 2012-07-22 12:56:35 UTC (rev 163938)
@@ -1,22 +0,0 @@
-infodir=/usr/share/info
-filelist=(flex.info{,-1,-2})
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-# vim:set ts=2 sw=2 et:
Copied: flex/repos/core-i686/flex.install (from rev 163937, flex/repos/testing-i686/flex.install)
===================================================================
--- core-i686/flex.install (rev 0)
+++ core-i686/flex.install 2012-07-22 12:56:35 UTC (rev 163938)
@@ -0,0 +1,22 @@
+infodir=/usr/share/info
+filelist=(flex.info{,-1,-2})
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: core-i686/lex.sh
===================================================================
--- core-i686/lex.sh 2012-07-22 11:45:09 UTC (rev 163937)
+++ core-i686/lex.sh 2012-07-22 12:56:35 UTC (rev 163938)
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /usr/bin/flex -l "$@"
Copied: flex/repos/core-i686/lex.sh (from rev 163937, flex/repos/testing-i686/lex.sh)
===================================================================
--- core-i686/lex.sh (rev 0)
+++ core-i686/lex.sh 2012-07-22 12:56:35 UTC (rev 163938)
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /usr/bin/flex -l "$@"
Deleted: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD 2012-07-22 11:45:09 UTC (rev 163937)
+++ core-x86_64/PKGBUILD 2012-07-22 12:56:35 UTC (rev 163938)
@@ -1,59 +0,0 @@
-# $Id$
-# Maintainer: Allan McRae <allan at archlinux.org>
-# Contributor: judd <jvinet at zeroflux.org>
-
-pkgname=flex
-pkgver=2.5.35
-pkgrel=5
-pkgdesc="A tool for generating text-scanning programs"
-arch=('i686' 'x86_64')
-url="http://flex.sourceforge.net"
-license=('custom')
-groups=('base-devel')
-depends=('glibc' 'm4' 'sh')
-install=flex.install
-source=(http://downloads.sourceforge.net/sourceforge/flex/flex-$pkgver.tar.bz2
- flex-2.5.35-gcc44.patch
- flex-2.5.35-hardening.patch
- flex-2.5.35-missing-prototypes.patch
- flex-2.5.35-sign.patch
- lex.sh)
-md5sums=('10714e50cea54dc7a227e3eddcd44d57'
- 'e4444ef5c07db71a43280be74139bdea'
- 'de952b3ed7cc074bc8c3e6ab73634048'
- '6b83f56b1b654c6a321cdc530a3ec68d'
- 'd87fd9e9762ba7e230d516bdcf1c8c6f'
- 'f725259ec23a9e87ee29e2ef82eda9a5')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
-
- patch -Np1 -i $srcdir/flex-2.5.35-gcc44.patch
- patch -Np1 -i $srcdir/flex-2.5.35-hardening.patch
- patch -Np1 -i $srcdir/flex-2.5.35-missing-prototypes.patch
- patch -Np1 -i $srcdir/flex-2.5.35-sign.patch
-
- ./configure --prefix=/usr \
- --mandir=/usr/share/man --infodir=/usr/share/info
- make
-}
-
-check() {
- cd $srcdir/$pkgname-$pkgver
- make check
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
-
- make prefix=$pkgdir/usr \
- mandir=$pkgdir/usr/share/man \
- infodir=$pkgdir/usr/share/info \
- install
- install -Dm755 $srcdir/lex.sh $pkgdir/usr/bin/lex
-
- install -Dm644 COPYING \
- $pkgdir/usr/share/licenses/$pkgname/license.txt
-
-}
-
Copied: flex/repos/core-x86_64/PKGBUILD (from rev 163937, flex/repos/testing-x86_64/PKGBUILD)
===================================================================
--- core-x86_64/PKGBUILD (rev 0)
+++ core-x86_64/PKGBUILD 2012-07-22 12:56:35 UTC (rev 163938)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Allan McRae <allan at archlinux.org>
+# Contributor: judd <jvinet at zeroflux.org>
+
+pkgname=flex
+pkgver=2.5.36
+pkgrel=1
+pkgdesc="A tool for generating text-scanning programs"
+arch=('i686' 'x86_64')
+url="http://flex.sourceforge.net"
+license=('custom')
+groups=('base-devel')
+depends=('glibc' 'm4' 'sh')
+install=flex.install
+source=(http://downloads.sourceforge.net/sourceforge/flex/flex-$pkgver.tar.bz2
+ lex.sh)
+md5sums=('5e637290609fd3c2f1f2e75ac2bce1c5'
+ 'f725259ec23a9e87ee29e2ef82eda9a5')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ ./configure --prefix=/usr
+ make
+}
+
+check() {
+ cd $srcdir/$pkgname-$pkgver
+
+ # these tests used features removed in bison-2.6
+ sed -i -e '/test-bison-yylloc/d' -e '/test-bison-yylval/d' tests/Makefile.in
+
+ make check
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+
+ make DESTDIR=$pkgdir install
+ install -Dm755 $srcdir/lex.sh $pkgdir/usr/bin/lex
+
+ install -Dm644 COPYING \
+ $pkgdir/usr/share/licenses/$pkgname/license.txt
+}
+
Deleted: core-x86_64/flex-2.5.35-gcc44.patch
===================================================================
--- core-x86_64/flex-2.5.35-gcc44.patch 2012-07-22 11:45:09 UTC (rev 163937)
+++ core-x86_64/flex-2.5.35-gcc44.patch 2012-07-22 12:56:35 UTC (rev 163938)
@@ -1,22 +0,0 @@
-diff -urNp flex-2.5.35.orig/flex.skl flex-2.5.35/flex.skl
---- flex-2.5.35.orig/flex.skl 2009-04-20 03:09:46.000000000 +0530
-+++ flex-2.5.35/flex.skl 2009-04-20 07:46:58.000000000 +0530
-@@ -217,6 +217,7 @@ m4preproc_include(`flexint.h')
- /* begin standard C++ headers. */
- #include <iostream>
- #include <errno.h>
-+#include <cstdio>
- #include <cstdlib>
- #include <cstring>
- /* end standard C++ headers. */
-diff -urNp flex-2.5.35.orig/skel.c flex-2.5.35/skel.c
---- flex-2.5.35.orig/skel.c 2009-04-20 03:09:46.000000000 +0530
-+++ flex-2.5.35/skel.c 2009-04-20 07:46:40.000000000 +0530
-@@ -284,6 +284,7 @@ const char *skel[] = {
- "/* begin standard C++ headers. */",
- "#include <iostream> ",
- "#include <errno.h>",
-+ "#include <cstdio>",
- "#include <cstdlib>",
- "#include <cstring>",
- "/* end standard C++ headers. */",
Deleted: core-x86_64/flex-2.5.35-hardening.patch
===================================================================
--- core-x86_64/flex-2.5.35-hardening.patch 2012-07-22 11:45:09 UTC (rev 163937)
+++ core-x86_64/flex-2.5.35-hardening.patch 2012-07-22 12:56:35 UTC (rev 163938)
@@ -1,36 +0,0 @@
-diff -u flex-2.5.35/scan.c flex-2.5.35/scan.c
---- flex-2.5.35/scan.c
-+++ flex-2.5.35/scan.c
-@@ -2096,7 +2096,7 @@
- /* This used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite().
- */
--#define ECHO fwrite( yytext, yyleng, 1, yyout )
-+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
- #endif
-
- /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
-diff -u flex-2.5.35/flex.skl flex-2.5.35/flex.skl
---- flex-2.5.35/flex.skl
-+++ flex-2.5.35/flex.skl
-@@ -1075,7 +1075,7 @@
- /* This used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite().
- */
--#define ECHO fwrite( yytext, yyleng, 1, yyout )
-+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
- %endif
- %if-c++-only C++ definition
- #define ECHO LexerOutput( yytext, yyleng )
-diff -u flex-2.5.35/skel.c flex-2.5.35/skel.c
---- flex-2.5.35/skel.c
-+++ flex-2.5.35/skel.c
-@@ -1142,7 +1142,7 @@
- "/* This used to be an fputs(), but since the string might contain NUL's,",
- " * we now use fwrite().",
- " */",
-- "#define ECHO fwrite( yytext, yyleng, 1, yyout )",
-+ "#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)",
- "%endif",
- "%if-c++-only C++ definition",
- "#define ECHO LexerOutput( yytext, yyleng )",
Deleted: core-x86_64/flex-2.5.35-missing-prototypes.patch
===================================================================
--- core-x86_64/flex-2.5.35-missing-prototypes.patch 2012-07-22 11:45:09 UTC (rev 163937)
+++ core-x86_64/flex-2.5.35-missing-prototypes.patch 2012-07-22 12:56:35 UTC (rev 163938)
@@ -1,53 +0,0 @@
-diff -up flex-2.5.35/flex.skl\~ flex-2.5.35/flex.skl
---- flex-2.5.35/flex.skl~ 2010-07-13 17:18:43.000000000 +0200
-+++ flex-2.5.35/flex.skl 2010-07-13 17:23:49.000000000 +0200
-@@ -960,6 +960,22 @@ m4_ifdef( [[M4_YY_NO_SET_LINENO]],,
- void yyset_lineno M4_YY_PARAMS( int line_number M4_YY_PROTO_LAST_ARG );
- ]])
-
-+m4_ifdef( [[M4_YY_REENTRANT]],
-+[[
-+m4_ifdef( [[M4_YY_NO_GET_COLUMN]],,
-+[[
-+int yyget_column M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );
-+]])
-+]])
-+
-+m4_ifdef( [[M4_YY_REENTRANT]],
-+[[
-+m4_ifdef( [[M4_YY_NO_SET_COLUMN]],,
-+[[
-+void yyset_column M4_YY_PARAMS( int column_no M4_YY_PROTO_LAST_ARG );
-+]])
-+]])
-+
- %if-bison-bridge
- m4_ifdef( [[M4_YY_NO_GET_LVAL]],,
- [[
-
-Diff finished. Tue Jul 13 17:27:50 2010
---- flex-2.5.35/skel.c~ 2010-07-14 13:15:42.000000000 +0200
-+++ flex-2.5.35/skel.c 2010-07-14 13:16:05.000000000 +0200
-@@ -1027,6 +1027,22 @@
- "void yyset_lineno M4_YY_PARAMS( int line_number M4_YY_PROTO_LAST_ARG );",
- "]])",
- "",
-+ "m4_ifdef( [[M4_YY_REENTRANT]],",
-+ "[[",
-+ "m4_ifdef( [[M4_YY_NO_GET_COLUMN]],,",
-+ "[[",
-+ "int yyget_column M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );",
-+ "]])",
-+ "]])",
-+ "",
-+ "m4_ifdef( [[M4_YY_REENTRANT]],",
-+ "[[",
-+ "m4_ifdef( [[M4_YY_NO_SET_COLUMN]],,",
-+ "[[",
-+ "void yyset_column M4_YY_PARAMS( int column_no M4_YY_PROTO_LAST_ARG );",
-+ "]])",
-+ "]])",
-+ "",
- "%if-bison-bridge",
- "m4_ifdef( [[M4_YY_NO_GET_LVAL]],,",
- "[[",
Deleted: core-x86_64/flex-2.5.35-sign.patch
===================================================================
--- core-x86_64/flex-2.5.35-sign.patch 2012-07-22 11:45:09 UTC (rev 163937)
+++ core-x86_64/flex-2.5.35-sign.patch 2012-07-22 12:56:35 UTC (rev 163938)
@@ -1,11 +0,0 @@
---- flex-2.5.35/gen.c-orig 2008-04-30 22:51:08.000000000 +0200
-+++ flex-2.5.35/gen.c 2008-04-30 22:51:14.000000000 +0200
-@@ -1890,7 +1890,7 @@
- outn ("\tif ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \\");
- outn ("\t\t{ \\");
- outn ("\t\tint c = '*'; \\");
-- outn ("\t\tint n; \\");
-+ outn ("\t\tunsigned n; \\");
- outn ("\t\tfor ( n = 0; n < max_size && \\");
- outn ("\t\t\t (c = getc( yyin )) != EOF && c != '\\n'; ++n ) \\");
- outn ("\t\t\tbuf[n] = (char) c; \\");
Deleted: core-x86_64/flex.install
===================================================================
--- core-x86_64/flex.install 2012-07-22 11:45:09 UTC (rev 163937)
+++ core-x86_64/flex.install 2012-07-22 12:56:35 UTC (rev 163938)
@@ -1,22 +0,0 @@
-infodir=/usr/share/info
-filelist=(flex.info{,-1,-2})
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-# vim:set ts=2 sw=2 et:
Copied: flex/repos/core-x86_64/flex.install (from rev 163937, flex/repos/testing-x86_64/flex.install)
===================================================================
--- core-x86_64/flex.install (rev 0)
+++ core-x86_64/flex.install 2012-07-22 12:56:35 UTC (rev 163938)
@@ -0,0 +1,22 @@
+infodir=/usr/share/info
+filelist=(flex.info{,-1,-2})
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: core-x86_64/lex.sh
===================================================================
--- core-x86_64/lex.sh 2012-07-22 11:45:09 UTC (rev 163937)
+++ core-x86_64/lex.sh 2012-07-22 12:56:35 UTC (rev 163938)
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /usr/bin/flex -l "$@"
Copied: flex/repos/core-x86_64/lex.sh (from rev 163937, flex/repos/testing-x86_64/lex.sh)
===================================================================
--- core-x86_64/lex.sh (rev 0)
+++ core-x86_64/lex.sh 2012-07-22 12:56:35 UTC (rev 163938)
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /usr/bin/flex -l "$@"
More information about the arch-commits
mailing list