# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1343942645 -7200
# Node ID 6fd77f414c3674b704b5adc931e09c4647f9679b
# Parent  061d2617f42fb8be7f94fa6756a9fde2cdd32ac0
Resynchronize with upstream package maintainer version.

diff -r 061d2617f42f -r 6fd77f414c36 bison/bison.patch
--- a/bison/bison.patch	Thu Aug 02 22:11:13 2012 +0200
+++ b/bison/bison.patch	Thu Aug 02 23:24:05 2012 +0200
@@ -1,7 +1,7 @@
 Index: lib/timevar.c
---- lib/timevar.c.orig	2008-07-14 10:56:12 +0200
-+++ lib/timevar.c	2008-11-03 19:16:04 +0100
-@@ -42,6 +42,7 @@
+--- lib/timevar.c.orig	2010-07-26 01:33:12.000000000 +0200
++++ lib/timevar.c	2010-08-06 15:13:37.000000000 +0200
+@@ -45,6 +45,7 @@
  # include <sys/times.h>
  #endif
  #ifdef HAVE_SYS_RESOURCE_H
@@ -15,9 +15,9 @@
 http://undeadly.org/cgi?action=article&sid=20080708155228&mode=flat&count=13
 
 Index: data/yacc.c
---- data/yacc.c.orig	2008-11-02 19:09:10 +0100
-+++ data/yacc.c	2008-11-03 19:16:04 +0100
-@@ -1444,7 +1444,10 @@
+--- data/yacc.c.orig	2010-08-06 02:37:58.000000000 +0200
++++ data/yacc.c	2010-08-06 15:13:37.000000000 +0200
+@@ -1453,7 +1453,10 @@
       users should not rely upon it.  Assigning to YYVAL
       unconditionally makes the parser a bit smaller, and it avoids a
       GCC warning that YYVAL may be used uninitialized.  */
@@ -29,3 +29,26 @@
  ]b4_locations_if(
  [[  /* Default location.  */
  
+----------------------------------------------------------------------------
+
+Fix for FreeBSD 8 but without breaking Mac OS X 10.6
+
+Index: lib/spawn.in.h
+--- lib/spawn.in.h.orig	2010-04-11 20:31:37.000000000 +0200
++++ lib/spawn.in.h	2010-08-06 15:57:36.000000000 +0200
+@@ -121,6 +121,7 @@
+ #  define POSIX_SPAWN_SETSCHEDULER 0
+ # endif
+ #else
++#if !@HAVE_POSIX_SPAWN@ || defined(__APPLE__)
+ # if @REPLACE_POSIX_SPAWN@
+ /* Use the values from the system, for better compatibility.  */
+ /* But this implementation does not support AIX extensions.  */
+@@ -134,6 +135,7 @@
+ #  define POSIX_SPAWN_SETSCHEDULER       0x20
+ # endif
+ #endif
++#endif
+ /* A GNU extension.  Use the next free bit position.  */
+ #define POSIX_SPAWN_USEVFORK \
+   ((POSIX_SPAWN_RESETIDS | (POSIX_SPAWN_RESETIDS - 1)                     \
diff -r 061d2617f42f -r 6fd77f414c36 bison/bison.spec
--- a/bison/bison.spec	Thu Aug 02 22:11:13 2012 +0200
+++ b/bison/bison.spec	Thu Aug 02 23:24:05 2012 +0200
@@ -1,6 +1,6 @@
 ##
 ##  bison.spec -- OpenPKG RPM Package Specification
-##  Copyright (c) 2000-2008 OpenPKG Foundation e.V. <http://openpkg.net/>
+##  Copyright (c) 2000-2012 OpenPKG Foundation e.V. <http://openpkg.net/>
 ##
 ##  Permission to use, copy, modify, and distribute this software for
 ##  any purpose with or without fee is hereby granted, provided that
@@ -22,7 +22,7 @@
 ##
 
 #   package versions
-%define       V_new      2.4.1
+%define       V_new      2.6
 %define       V_old      1.35
 
 #   package information
@@ -36,23 +36,19 @@
 Group:        CompilerCompiler
 License:      GPL
 Version:      %{V_new}
-Release:      20090106
+Release:      20120720
 
 #   package options
 %option       with_old   no
 
 #   list of sources
-Source0:      ftp://ftp.gnu.org/gnu/bison/bison-%{V_new}.tar.gz
-Source1:      ftp://ftp.gnu.org/gnu/bison/bison-%{V_old}.tar.gz
+Source0:      http://ftp.gnu.org/gnu/bison/bison-%{V_new}.tar.gz
+Source1:      http://ftp.gnu.org/gnu/bison/bison-%{V_old}.tar.gz
 Patch0:       bison.patch
 
 #   build information
-Prefix:       %{l_prefix}
-BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20040212, m4, make
-PreReq:       OpenPKG, openpkg >= 20040212, m4
-AutoReq:      no
-AutoReqProv:  no
+BuildPreReq:  OpenPKG, openpkg >= 20100101, m4, make
+PreReq:       OpenPKG, openpkg >= 20100101, m4
 Conflicts:    yacc
 
 %description
@@ -68,12 +64,12 @@
 %track
     prog bison:new = {
         version   = %{V_new}
-        url       = ftp://ftp.gnu.org/gnu/bison/
+        url       = http://ftp.gnu.org/gnu/bison/
         regex     = bison-(2.\d+(.\d+)*[a-z]?)\.tar\.gz
     }
     prog bison:old = {
         version   = %{V_old}
-        url       = ftp://ftp.gnu.org/gnu/bison/
+        url       = http://ftp.gnu.org/gnu/bison/
         regex     = bison-(1\.3\d+)\.tar\.gz
     }
 
@@ -82,14 +78,22 @@
     %patch -p0 -d bison-%{V_new}
     %setup -q -T -D -a 1
     %{l_shtool} subst \
+        -e 's;ac_config_files.*etc/bench\.pl";;' \
+        bison-%{V_new}/configure
+    %{l_shtool} subst \
         -e 's;^\( *SUBDIRS = .*\) examples\(.*\)$;\1\2;' \
+        -e 's;^\( *SUBDIRS = .*\) tests\(.*\)$;\1\2;' \
+        -e 's;^\( *SUBDIRS = .*\) etc\(.*\)$;\1\2;' \
         bison-%{V_new}/Makefile.in
+    touch bison-%{V_new}/doc/bison.1
 
 %build
     ( cd bison-%{V_new}
       CC="%{l_cc}" \
       CFLAGS="%{l_cflags -O}" \
-      ./configure \
+      CONFIG_SHELL="%{l_bash}" \
+      GREP="grep" \
+      "%{l_bash}" configure \
           --prefix=%{l_prefix} \
           --mandir=%{l_prefix}/man \
           --infodir=%{l_prefix}/info \
@@ -100,6 +104,7 @@
     ( cd bison-%{V_old}
       CC="%{l_cc}" \
       CFLAGS="%{l_cflags -O}" \
+      GREP="grep" \
       ./configure \
           --prefix=%{l_prefix} \
           --mandir=%{l_prefix}/man \
@@ -110,7 +115,6 @@
 %endif
 
 %install
-    rm -rf $RPM_BUILD_ROOT
 %if "%{with_old}" == "yes"
     ( cd bison-%{V_old}
       %{l_make} -f Makefile %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
@@ -132,5 +136,4 @@
 %files -f files
 
 %clean
-    rm -rf $RPM_BUILD_ROOT