From dd710d9e322ddb383b3c9023d333c4fc029bf357 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nagy=20K=C3=A1roly=20G=C3=A1briel?= Date: Thu, 29 Oct 2015 16:34:56 +0100 Subject: [PATCH] bison: Updated (2.6.5 -> 3.0.4) --- base/bison/bison.conf | 3 +++ base/bison/bison.desc | 6 +++--- base/bison/disable-examples.patch | 28 ---------------------------- 3 files changed, 6 insertions(+), 31 deletions(-) delete mode 100644 base/bison/disable-examples.patch diff --git a/base/bison/bison.conf b/base/bison/bison.conf index 80ee8d546..86c620630 100644 --- a/base/bison/bison.conf +++ b/base/bison/bison.conf @@ -2,6 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../bison/bison.conf +# Copyright (C) 2015 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # @@ -23,3 +24,5 @@ if ! atstage native; then makeopt="datadir=${datadir#$root}" fi hook_add postmake 5 "make_yacc" +# we never want this file +var_append INSTALL_WRAPPER_FILTER "|" "sed -e 's,.*/charset.alias,/tmp/x,'" diff --git a/base/bison/bison.desc b/base/bison/bison.desc index 655b381dc..3a7586320 100644 --- a/base/bison/bison.desc +++ b/base/bison/bison.desc @@ -2,7 +2,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../bison/bison.desc -[COPY] Copyright (C) 2006 - 2014 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2015 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2003 Clifford Wolf [COPY] @@ -40,8 +40,8 @@ [L] GPL [S] Stable -[V] 2.6.5 +[V] 3.0.4 [P] X 01-3-----9 109.400 -[D] 2863146360 bison-2.6.5.tar.gz ftp://ftp.gnu.org/pub/gnu/bison/ +[D] 237414469 bison-3.0.4.tar.gz ftp://ftp.gnu.org/pub/gnu/bison/ diff --git a/base/bison/disable-examples.patch b/base/bison/disable-examples.patch deleted file mode 100644 index 39032caf4..000000000 --- a/base/bison/disable-examples.patch +++ /dev/null @@ -1,28 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../bison/disable-examples.patch -# Copyright (C) 2009 The OpenSDE Project -# Copyright (C) 2004 - 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - ---- ./Makefile.in.orig 2008-12-11 19:05:53.000000000 -0300 -+++ ./Makefile.in 2009-07-27 15:09:52.000000000 -0400 -@@ -502,7 +502,7 @@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - ACLOCAL_AMFLAGS = -I m4 --SUBDIRS = build-aux po runtime-po lib data src doc examples tests etc -+SUBDIRS = build-aux po runtime-po lib data src doc tests etc - aclocal_DATA = m4/bison-i18n.m4 - EXTRA_DIST = .prev-version .version cfg.mk maint.mk \ - OChangeLog PACKAGING \