6 files changed, 15 insertions, 72 deletions

diff --git a/devel/bison2/Makefile b/devel/bison2/Makefile
index ed700d39c92e..40dd5b89ac42 100644
--- a/devel/bison2/Makefile
+++ b/devel/bison2/Makefile
@@ -7,23 +7,21 @@
 #
 
 PORTNAME=	bison
-PORTVERSION=	1.35
-PORTREVISION=	1
+PORTVERSION=	1.75
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	bison
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-included-gettext
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		MAKEINFO="makeinfo --no-split"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 MAN1=		bison.1
 
@@ -34,7 +32,4 @@ MAN1=		bison.1
 post-extract:
 	@${RM} -f ${WRKSRC}/doc/bison.info*
 
-post-install:
-	install-info ${PREFIX}/info/bison.info ${PREFIX}/info/dir
-
 .include <bsd.port.mk>
diff --git a/devel/bison2/distinfo b/devel/bison2/distinfo
index 52e7df9d706a..ddc4996d19c8 100644
--- a/devel/bison2/distinfo
+++ b/devel/bison2/distinfo
@@ -1 +1 @@
-MD5 (bison-1.35.tar.bz2) = 87de58ab8f2aa07d18b6e77e3e665850
+MD5 (bison-1.75.tar.bz2) = dd88fe42e35d554c00af430a9342456a
diff --git a/devel/bison2/files/patch-getargs.c b/devel/bison2/files/patch-getargs.c
index 8bfc689dd9d1..e69de29bb2d1 100644
--- a/devel/bison2/files/patch-getargs.c
+++ b/devel/bison2/files/patch-getargs.c
@@ -1,14 +0,0 @@
---- src/getargs.c.orig	Wed Jan 23 05:12:17 2002
-+++ src/getargs.c	Sat Feb 16 19:47:24 2002
-@@ -36,4 +36,5 @@
- int graph_flag = 0;
- int trace_flag = 0;
-+int broken_undeftoken_init;
- 
- const char *skeleton = NULL;
-@@ -50,4 +51,5 @@
- 
-   /* Parser. */
-+  {"broken-undeftoken-init", 0, &broken_undeftoken_init, 1},
-   {"skeleton",		required_argument,	0, 'S'},
-   {"debug",		no_argument,		0, 't'},
diff --git a/devel/bison2/files/patch-intl::Makefile.in b/devel/bison2/files/patch-intl::Makefile.in
deleted file mode 100644
index adfc8cd770de..000000000000
--- a/devel/bison2/files/patch-intl::Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- intl/Makefile.in	2002/04/30 08:12:35	1.1
-+++ intl/Makefile.in	2002/04/30 08:13:50
-@@ -52,7 +52,7 @@
- YFLAGS = --name-prefix=__gettext
- 
- DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
---DLIBDIR=\"$(libdir)\" -DIN_LIBINTL @DEFS@
-+-DLIBDIR=\"$(prefix)/libdata\" -DIN_LIBINTL @DEFS@
- CPPFLAGS = @CPPFLAGS@
- CFLAGS = @CFLAGS@
- LDFLAGS = @LDFLAGS@
-@@ -152,7 +152,7 @@
- 	else \
- 	  : ; \
- 	fi
--	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
-+	if test no = yes; then \
- 	  test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
- 	  temp=$(DESTDIR)$(libdir)/t-charset.alias; \
- 	  dest=$(DESTDIR)$(libdir)/charset.alias; \
diff --git a/devel/bison2/files/patch-reader.c b/devel/bison2/files/patch-reader.c
deleted file mode 100644
index 92c21a13cc66..000000000000
--- a/devel/bison2/files/patch-reader.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/reader.c.orig	Thu Feb  7 09:12:44 2002
-+++ src/reader.c	Sat Feb 16 19:49:02 2002
-@@ -34,6 +34,8 @@
- #include "reader.h"
- #include "conflicts.h"
- 
-+extern int broken_undeftoken_init;
-+
- typedef struct symbol_list
- {
-   struct symbol_list *next;
-@@ -1978,7 +1979,10 @@
-      It is always token number 2.  */
-   undeftoken = getsym ("$undefined.");
-   undeftoken->class = token_sym;
--  undeftoken->user_token_number = 2;
-+  /* XXX ``broken_undeftoken_init'' makes Bison 1.29 bug-compatable
-+     with Bison 1.25.  FreeBSD depends on this behavior when compiling
-+     EGCS-1.1.2's cc1plus.  */
-+  undeftoken->user_token_number = broken_undeftoken_init ? 0 : 2;
- 
-   /* Read the declaration section.  Copy %{ ... %} groups to
-      TABLE_OBSTACK and FDEFINES file.  Also notice any %token, %left,
diff --git a/devel/bison2/pkg-plist b/devel/bison2/pkg-plist
index 60f7c9cd0ea1..40c58142784a 100644
--- a/devel/bison2/pkg-plist
+++ b/devel/bison2/pkg-plist
@@ -1,18 +1,26 @@
 @comment $FreeBSD$
 bin/bison
-share/bison/bison.hairy
-share/bison/bison.simple
 @unexec install-info --delete %D/info/bison.info %D/info/dir
 info/bison.info
 @exec install-info %D/info/bison.info %D/info/dir
+share/bison/c.m4
+share/bison/glr.c
+share/bison/lalr1.cc
+share/bison/m4sugar/m4sugar.m4
+share/bison/m4sugar/version.m4
+share/bison/yacc.c
 share/locale/de/LC_MESSAGES/bison.mo
 share/locale/es/LC_MESSAGES/bison.mo
 share/locale/et/LC_MESSAGES/bison.mo
 share/locale/fr/LC_MESSAGES/bison.mo
+share/locale/hr/LC_MESSAGES/bison.mo
+share/locale/id/LC_MESSAGES/bison.mo
 share/locale/it/LC_MESSAGES/bison.mo
 share/locale/ja/LC_MESSAGES/bison.mo
 share/locale/nl/LC_MESSAGES/bison.mo
+share/locale/pt_BR/LC_MESSAGES/bison.mo
 share/locale/ru/LC_MESSAGES/bison.mo
 share/locale/sv/LC_MESSAGES/bison.mo
 share/locale/tr/LC_MESSAGES/bison.mo
+@dirrm share/bison/m4sugar
 @dirrm share/bison