From 33a1238e6c940033d1155c188dcb3adad8187932 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 30 Jul 2010 20:07:14 +0200 Subject: more FreeBSD fixes and package updates --- package/bison/Makefile | 6 +++--- package/bison/patches/patch-Makefile_in | 8 ++++---- package/bison/patches/patch-lib_config_hin | 12 ------------ package/bison/patches/patch-lib_spawn_in_h | 18 ++++++++++++++++++ package/bison/patches/patch-src_Makefile_in | 11 +++++++++++ 5 files changed, 36 insertions(+), 19 deletions(-) delete mode 100644 package/bison/patches/patch-lib_config_hin create mode 100644 package/bison/patches/patch-lib_spawn_in_h create mode 100644 package/bison/patches/patch-src_Makefile_in (limited to 'package/bison') diff --git a/package/bison/Makefile b/package/bison/Makefile index b3642d177..bf058fc9a 100644 --- a/package/bison/Makefile +++ b/package/bison/Makefile @@ -4,12 +4,12 @@ include ${TOPDIR}/rules.mk PKG_NAME:= bison -PKG_VERSION:= 2.4.1 +PKG_VERSION:= 2.4.2 PKG_RELEASE:= 1 -PKG_MD5SUM:= c58aa1da418dc9704070872489e89bf5 +PKG_MD5SUM:= 6fc502f135738e98fecf1e5c8de38d62 PKG_DESCR:= GNU parser generator PKG_SECTION:= lang -PKG_URL:= http://www.gnu.org/software/bison +PKG_URL:= http://www.gnu.org/software/bison/ PKG_SITES:= ${MASTER_SITE_GNU:=${PKG_NAME}/} include ${TOPDIR}/mk/package.mk diff --git a/package/bison/patches/patch-Makefile_in b/package/bison/patches/patch-Makefile_in index 19d01c699..7f757fb29 100644 --- a/package/bison/patches/patch-Makefile_in +++ b/package/bison/patches/patch-Makefile_in @@ -1,11 +1,11 @@ ---- bison-2.4.1.orig/Makefile.in 2008-12-11 23:05:53.000000000 +0100 -+++ bison-2.4.1/Makefile.in 2010-02-23 20:11:17.748535777 +0100 -@@ -502,7 +502,7 @@ top_build_prefix = @top_build_prefix@ +--- bison-2.4.2.orig/Makefile.in 2010-03-20 18:14:08.000000000 +0100 ++++ bison-2.4.2/Makefile.in 2010-07-30 17:11:16.198057000 +0200 +@@ -871,7 +871,7 @@ top_build_prefix = @top_build_prefix@ 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 etc aclocal_DATA = m4/bison-i18n.m4 - EXTRA_DIST = .prev-version .version cfg.mk maint.mk \ + EXTRA_DIST = .prev-version .version cfg.mk \ OChangeLog PACKAGING \ diff --git a/package/bison/patches/patch-lib_config_hin b/package/bison/patches/patch-lib_config_hin deleted file mode 100644 index dde4f8ee0..000000000 --- a/package/bison/patches/patch-lib_config_hin +++ /dev/null @@ -1,12 +0,0 @@ ---- bison-2.4.1.orig/lib/config.hin 2008-12-11 23:05:52.000000000 +0100 -+++ bison-2.4.1/lib/config.hin 2010-02-23 20:09:49.477285615 +0100 -@@ -399,6 +399,9 @@ - /* Define to the one symbol short name of this package. */ - #undef PACKAGE_TARNAME - -+/* Define to the home page for this package. */ -+#undef PACKAGE_URL -+ - /* Define to the version of this package. */ - #undef PACKAGE_VERSION - diff --git a/package/bison/patches/patch-lib_spawn_in_h b/package/bison/patches/patch-lib_spawn_in_h new file mode 100644 index 000000000..a32d9eb93 --- /dev/null +++ b/package/bison/patches/patch-lib_spawn_in_h @@ -0,0 +1,18 @@ +--- bison-2.4.2.orig/lib/spawn.in.h 2010-03-17 20:17:04.000000000 +0100 ++++ bison-2.4.2/lib/spawn.in.h 2010-07-30 17:23:46.000000000 +0200 +@@ -29,13 +29,8 @@ + #ifndef _GL_SPAWN_H + #define _GL_SPAWN_H + +-/* Get definitions of 'struct sched_param' and 'sigset_t'. +- But avoid namespace pollution on glibc systems. */ +-#ifndef __GLIBC__ +-# include +-# include +-#endif +- ++#include ++#include + #include + + #ifndef __THROW diff --git a/package/bison/patches/patch-src_Makefile_in b/package/bison/patches/patch-src_Makefile_in new file mode 100644 index 000000000..0a1b9c247 --- /dev/null +++ b/package/bison/patches/patch-src_Makefile_in @@ -0,0 +1,11 @@ +--- bison-2.4.2.orig/src/Makefile.in 2010-03-20 18:14:10.000000000 +0100 ++++ bison-2.4.2/src/Makefile.in 2010-07-30 17:28:09.000000000 +0200 +@@ -1313,7 +1313,7 @@ uninstall-am: uninstall-binPROGRAMS unin + + yacc: + echo '#! /bin/sh' >$@ +- echo "exec '$(bindir)/bison' -y "'"$$@"' >>$@ ++ echo "exec bison -y "'"$$@"' >>$@ + chmod a+x $@ + + echo: -- cgit v1.2.3