1) patch-configure is not needed as configure contains LT{LIBINTL,LIBLIBICONV}
in theere. upstream seems to have taken care of this. i might be wrong here.
please review
2) patch-src_output_c is partly modified. the later part of this patch needs
review.
per landry@ new x11/qgis needs newer bison. and i am interested in newer
x11/qgis.
thanks
? bison.diff
? patches/ORIG_patch-src_output_c
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/bison/Makefile,v
retrieving revision 1.46
diff -u -p -r1.46 Makefile
--- Makefile 4 Aug 2012 19:40:12 -0000 1.46
+++ Makefile 18 Oct 2012 22:15:37 -0000
@@ -2,10 +2,9 @@
COMMENT= GNU parser generator
-DISTNAME= bison-2.3
+DISTNAME= bison-2.6
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU:=bison/}
-REVISION = 0
HOMEPAGE= http://www.gnu.org/software/bison/
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/bison/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo 8 Jul 2008 00:24:17 -0000 1.8
+++ distinfo 18 Oct 2012 22:15:37 -0000
@@ -1,5 +1,2 @@
-MD5 (bison-2.3.tar.gz) = IjJ+/dUIDisay25WCgS0Og==
-RMD160 (bison-2.3.tar.gz) = TTPc/Q1LnSEVYIt6Je14hdm9gyI=
-SHA1 (bison-2.3.tar.gz) = TfhMLFlxlGER/xmC+4MLPHjXxX4=
-SHA256 (bison-2.3.tar.gz) = UveKpHYadM63/fdw81VN2EMIw7k8QlXjpcF1WOzaKT4=
-SIZE (bison-2.3.tar.gz) = 1386694
+SHA256 (bison-2.6.tar.gz) = 4HY8QO1qVdjv5Ty/MxHhhe+4TqhYV98reBpWDYkoVHs=
+SIZE (bison-2.6.tar.gz) = 3068713
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 8 Jul 2008 00:24:17 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-configure,v 1.3 2008/07/08 00:24:17 brad Exp $
---- configure.orig Mon Jun 5 03:32:01 2006
-+++ configure Sun Jun 29 22:09:16 2008
-@@ -16768,10 +16768,10 @@ s,@host_cpu@,$host_cpu,;t t
- s,@host_vendor@,$host_vendor,;t t
- s,@host_os@,$host_os,;t t
- s,@INTL_MACOSX_LIBS@,$INTL_MACOSX_LIBS,;t t
--s,@LIBICONV@,$LIBICONV,;t t
-+s,@LIBICONV@,$LTLIBICONV,;t t
- s,@LTLIBICONV@,$LTLIBICONV,;t t
- s,@INTLLIBS@,$INTLLIBS,;t t
--s,@LIBINTL@,$LIBINTL,;t t
-+s,@LIBINTL@,$LTLIBINTL,;t t
- s,@LTLIBINTL@,$LTLIBINTL,;t t
- s,@POSUB@,$POSUB,;t t
- s,@UNISTD_H@,$UNISTD_H,;t t
Index: patches/patch-data_m4sugar_m4sugar_m4
===================================================================
RCS file: /cvs/ports/devel/bison/patches/patch-data_m4sugar_m4sugar_m4,v
retrieving revision 1.2
diff -u -p -r1.2 patch-data_m4sugar_m4sugar_m4
--- patches/patch-data_m4sugar_m4sugar_m4 8 Jul 2008 00:24:17 -0000
1.2
+++ patches/patch-data_m4sugar_m4sugar_m4 18 Oct 2012 22:15:37 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-data_m4sugar_m4sugar_m4,v 1.2 2008/07/08 00:24:17 brad Exp $
---- data/m4sugar/m4sugar.m4.orig Mon Nov 14 03:13:07 2005
-+++ data/m4sugar/m4sugar.m4 Sun Jun 29 22:09:16 2008
-@@ -55,13 +55,6 @@ divert(-1)#
+--- data/m4sugar/m4sugar.m4.orig Thu Oct 18 16:32:29 2012
++++ data/m4sugar/m4sugar.m4 Thu Oct 18 16:32:53 2012
+@@ -31,15 +31,6 @@ divert(-1)#
changequote()
changequote([, ])
@@ -12,6 +12,8 @@ $OpenBSD: patch-data_m4sugar_m4sugar_m4,
-[errprint(M4sugar requires GNU M4. Install it before installing M4sugar or
-set the M4 environment variable to its absolute file name.)
-m4exit(2)])
-
-
+-
+-
+ ## ------------------------------- ##
+ ## 1. Simulate --prefix-builtins. ##
## ------------------------------- ##
Index: patches/patch-src_output_c
===================================================================
RCS file: /cvs/ports/devel/bison/patches/patch-src_output_c,v
retrieving revision 1.5
diff -u -p -r1.5 patch-src_output_c
--- patches/patch-src_output_c 14 Apr 2012 12:22:25 -0000 1.5
+++ patches/patch-src_output_c 18 Oct 2012 22:15:37 -0000
@@ -1,50 +1,12 @@
-$OpenBSD: patch-src_output_c,v 1.5 2012/04/14 12:22:25 espie Exp $
---- src/output.c.orig Sun May 14 22:40:35 2006
-+++ src/output.c Fri Apr 13 20:38:39 2012
-@@ -501,7 +501,8 @@ output_skeleton (void)
- FILE *in;
- FILE *out;
- int filter_fd[2];
-- char const *argv[6];
-+ char const *argv[7];
-+ int i;
- pid_t pid;
-
- /* Compute the names of the package data dir and skeleton file.
-@@ -512,7 +513,7 @@ output_skeleton (void)
- char *full_m4sugar;
+$OpenBSD$
+--- src/output.c.orig Thu Oct 18 17:05:23 2012
++++ src/output.c Thu Oct 18 17:05:57 2012
+@@ -502,7 +502,7 @@ output_skeleton (void)
+ char *full_m4bison;
char *full_skeleton;
char const *p;
- char const *m4 = (p = getenv ("M4")) ? p : M4;
+ char const *m4 = (p = getenv ("M4")) ? p : "/usr/bin/m4";
- char const *pkgdatadir = (p = getenv ("BISON_PKGDATADIR")) ? p : PKGDATADIR;
+ char const *pkgdatadir = compute_pkgdatadir ();
size_t skeleton_size = strlen (skeleton) + 1;
size_t pkgdatadirlen = strlen (pkgdatadir);
-@@ -534,12 +535,21 @@ output_skeleton (void)
- fprintf (stderr, "running: %s %s - %s\n",
- m4, full_m4sugar, full_skeleton);
-
-- argv[0] = m4;
-- argv[1] = full_m4sugar;
-- argv[2] = "-";
-- argv[3] = full_skeleton;
-- argv[4] = trace_flag & trace_m4 ? "-dV" : NULL;
-- argv[5] = NULL;
-+ i = 0;
-+ argv[i++] = m4;
-+ p = strrchr(m4, '/');
-+ if (p)
-+ p++;
-+ else
-+ p = m4;
-+ if (strcmp(p, "m4") == 0) {
-+ argv[i++] = "-g";
-+ }
-+ argv[i++] = full_m4sugar;
-+ argv[i++] = "-";
-+ argv[i++] = full_skeleton;
-+ argv[i++] = trace_flag & trace_m4 ? "-dV" : NULL;
-+ argv[i++] = NULL;
-
- init_subpipe ();
- pid = create_subpipe (argv, filter_fd);
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/bison/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST 8 Jul 2008 00:24:17 -0000 1.9
+++ pkg/PLIST 18 Oct 2012 22:15:37 -0000
@@ -1,39 +1,72 @@
@comment $OpenBSD: PLIST,v 1.9 2008/07/08 00:24:17 brad Exp $
@bin bin/bison
@info info/bison.info
+@comment lib/charset.alias
@man man/man1/bison.1
+@man man/man1/yacc.1
share/aclocal/bison-i18n.m4
share/bison/
share/bison/README
+share/bison/bison.m4
+share/bison/c++-skel.m4
share/bison/c++.m4
+share/bison/c-skel.m4
share/bison/c.m4
share/bison/glr.c
share/bison/glr.cc
+share/bison/java-skel.m4
+share/bison/java.m4
share/bison/lalr1.cc
+share/bison/lalr1.java
share/bison/location.cc
share/bison/m4sugar/
+share/bison/m4sugar/foreach.m4
share/bison/m4sugar/m4sugar.m4
+share/bison/stack.hh
+share/bison/xslt/
+share/bison/xslt/bison.xsl
+share/bison/xslt/xml2dot.xsl
+share/bison/xslt/xml2text.xsl
+share/bison/xslt/xml2xhtml.xsl
share/bison/yacc.c
+share/locale/ast/
+share/locale/ast/LC_MESSAGES/
+share/locale/ast/LC_MESSAGES/bison-runtime.mo
share/locale/da/LC_MESSAGES/bison-runtime.mo
share/locale/da/LC_MESSAGES/bison.mo
share/locale/de/LC_MESSAGES/bison-runtime.mo
share/locale/de/LC_MESSAGES/bison.mo
+share/locale/el/LC_MESSAGES/bison-runtime.mo
+share/locale/el/LC_MESSAGES/bison.mo
+share/locale/eo/LC_MESSAGES/bison-runtime.mo
+share/locale/eo/LC_MESSAGES/bison.mo
share/locale/es/LC_MESSAGES/bison-runtime.mo
share/locale/es/LC_MESSAGES/bison.mo
share/locale/et/LC_MESSAGES/bison-runtime.mo
share/locale/et/LC_MESSAGES/bison.mo
+share/locale/fi/LC_MESSAGES/bison-runtime.mo
+share/locale/fi/LC_MESSAGES/bison.mo
share/locale/fr/LC_MESSAGES/bison-runtime.mo
share/locale/fr/LC_MESSAGES/bison.mo
share/locale/ga/LC_MESSAGES/bison-runtime.mo
share/locale/ga/LC_MESSAGES/bison.mo
+share/locale/gl/LC_MESSAGES/bison-runtime.mo
share/locale/hr/LC_MESSAGES/bison-runtime.mo
share/locale/hr/LC_MESSAGES/bison.mo
+share/locale/hu/LC_MESSAGES/bison-runtime.mo
share/locale/id/LC_MESSAGES/bison-runtime.mo
share/locale/id/LC_MESSAGES/bison.mo
share/locale/it/LC_MESSAGES/bison-runtime.mo
share/locale/it/LC_MESSAGES/bison.mo
share/locale/ja/LC_MESSAGES/bison-runtime.mo
share/locale/ja/LC_MESSAGES/bison.mo
+share/locale/ky/
+share/locale/ky/LC_MESSAGES/
+share/locale/ky/LC_MESSAGES/bison-runtime.mo
+share/locale/lt/
+share/locale/lt/LC_MESSAGES/
+share/locale/lt/LC_MESSAGES/bison-runtime.mo
+share/locale/lv/LC_MESSAGES/bison-runtime.mo
share/locale/ms/
share/locale/ms/LC_MESSAGES/
share/locale/ms/LC_MESSAGES/bison-runtime.mo
@@ -44,21 +77,28 @@ share/locale/nl/LC_MESSAGES/bison-runtim
share/locale/nl/LC_MESSAGES/bison.mo
share/locale/pl/LC_MESSAGES/bison-runtime.mo
share/locale/pl/LC_MESSAGES/bison.mo
+share/locale/pt/LC_MESSAGES/bison-runtime.mo
+share/locale/pt/LC_MESSAGES/bison.mo
share/locale/pt_BR/LC_MESSAGES/bison-runtime.mo
share/locale/pt_BR/LC_MESSAGES/bison.mo
share/locale/ro/LC_MESSAGES/bison-runtime.mo
share/locale/ro/LC_MESSAGES/bison.mo
share/locale/ru/LC_MESSAGES/bison-runtime.mo
share/locale/ru/LC_MESSAGES/bison.mo
-share/locale/rw/
-share/locale/rw/LC_MESSAGES/
-share/locale/rw/LC_MESSAGES/bison-runtime.mo
-share/locale/rw/LC_MESSAGES/bison.mo
share/locale/sl/LC_MESSAGES/bison-runtime.mo
+share/locale/sr/LC_MESSAGES/bison-runtime.mo
share/locale/sv/LC_MESSAGES/bison-runtime.mo
share/locale/sv/LC_MESSAGES/bison.mo
+share/locale/th/
+share/locale/th/LC_MESSAGES/
+share/locale/th/LC_MESSAGES/bison-runtime.mo
share/locale/tr/LC_MESSAGES/bison-runtime.mo
share/locale/tr/LC_MESSAGES/bison.mo
+share/locale/uk/LC_MESSAGES/bison-runtime.mo
+share/locale/uk/LC_MESSAGES/bison.mo
share/locale/vi/LC_MESSAGES/bison-runtime.mo
share/locale/vi/LC_MESSAGES/bison.mo
+share/locale/zh_CN/LC_MESSAGES/bison-runtime.mo
+share/locale/zh_CN/LC_MESSAGES/bison.mo
share/locale/zh_TW/LC_MESSAGES/bison-runtime.mo
+share/locale/zh_TW/LC_MESSAGES/bison.mo
