Update to 3.0.4

- Add LICENSE
- Use USES=localbase
- Use PORTDATA
- Sort PLIST

Changes:	http://git.savannah.gnu.org/cgit/bison.git/tree/NEWS
Differential Revision:	https://reviews.FreeBSD.org/D9073
PR:		215840
Exp-run by:	antoine

3 files changed, 20 insertions, 42 deletions

diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index a914f8d58dd4..cbd3567528a2 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bison
-PORTVERSION=	2.7.1
-PORTREVISION=	1
+PORTVERSION=	3.0.4
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	GNU
@@ -11,32 +10,31 @@ MASTER_SITES=	GNU
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Parser generator from FSF, (mostly) compatible with Yacc
 
+LICENSE=	GPLv3+
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 BUILD_DEPENDS=	m4>=1.4.16,1:devel/m4
-RUN_DEPENDS=	m4>=1.4.16,1:devel/m4
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-OPTIONS_DEFINE=	EXAMPLES NLS
+OPTIONS_DEFINE=	DOCS EXAMPLES NLS
 OPTIONS_SUB=	yes
 
-CONFIGURE_ARGS+=--disable-yacc
-CPPFLAGS+=	-I${LOCALBASE}/include
+CONFIGURE_ARGS=	--disable-yacc
 GNU_CONFIGURE=	yes
-LDFLAGS+=	-L${LOCALBASE}/lib
 TEST_TARGET=	check
 USE_PERL5=	build
-USES=		charsetfix makeinfo perl5 tar:xz
+USES=		charsetfix localbase makeinfo perl5 tar:xz
 
 INFO=		bison
-PORTEXAMPLES=	calc++
+PORTDATA=	*
+PORTDOCS=	*
+PORTEXAMPLES=	*
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 
 post-patch:
-	@${RM} ${WRKSRC}/doc/bison.info*
-	@${REINPLACE_CMD} 's/MANS = yacc.1/MANS =/' ${WRKSRC}/doc/Makefile.in
-
-post-install:
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/calc++
-	${INSTALL_DATA} ${WRKSRC}/examples/calc++/*.[chly]* ${STAGEDIR}${EXAMPLESDIR}/calc++
+	@${REINPLACE_CMD} -e 's|$$(docdir)\(/examples\)|$$(datarootdir)\1/bison|' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's/\(.*\) _Noreturn void/_Noreturn \1 void/' ${WRKSRC}/data/*.c ${WRKSRC}/lib/*.[ch]
 
 .include <bsd.port.mk>
diff --git a/devel/bison/distinfo b/devel/bison/distinfo
index bf3adf940cbe..c39a8a6d7a33 100644
--- a/devel/bison/distinfo
+++ b/devel/bison/distinfo
@@ -1,2 +1,3 @@
-SHA256 (bison-2.7.1.tar.xz) = b409adcbf245baadb68d2f66accf6fdca5e282cafec1b865f4b5e963ba8ea7fb
-SIZE (bison-2.7.1.tar.xz) = 1781068
+TIMESTAMP = 1482778226
+SHA256 (bison-3.0.4.tar.xz) = a72428c7917bdf9fa93cb8181c971b6e22834125848cf1d03ce10b1bb0716fe1
+SIZE (bison-3.0.4.tar.xz) = 1973796
diff --git a/devel/bison/pkg-plist b/devel/bison/pkg-plist
index 37fe4a3b742b..ff1195a2e100 100644
--- a/devel/bison/pkg-plist
+++ b/devel/bison/pkg-plist
@@ -1,28 +1,6 @@
 bin/bison
 man/man1/bison.1.gz
 share/aclocal/bison-i18n.m4
-%%DATADIR%%/README
-%%DATADIR%%/bison.m4
-%%DATADIR%%/c++-skel.m4
-%%DATADIR%%/c++.m4
-%%DATADIR%%/c-like.m4
-%%DATADIR%%/c-skel.m4
-%%DATADIR%%/c.m4
-%%DATADIR%%/glr.c
-%%DATADIR%%/glr.cc
-%%DATADIR%%/java-skel.m4
-%%DATADIR%%/java.m4
-%%DATADIR%%/lalr1.cc
-%%DATADIR%%/lalr1.java
-%%DATADIR%%/location.cc
-%%DATADIR%%/m4sugar/foreach.m4
-%%DATADIR%%/m4sugar/m4sugar.m4
-%%DATADIR%%/stack.hh
-%%DATADIR%%/xslt/bison.xsl
-%%DATADIR%%/xslt/xml2dot.xsl
-%%DATADIR%%/xslt/xml2text.xsl
-%%DATADIR%%/xslt/xml2xhtml.xsl
-%%DATADIR%%/yacc.c
 %%NLS%%share/locale/ast/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/da/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/da/LC_MESSAGES/bison.mo
@@ -46,6 +24,7 @@ share/aclocal/bison-i18n.m4
 %%NLS%%share/locale/hr/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/bison-runtime.mo
+%%NLS%%share/locale/ia/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/id/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/id/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/it/LC_MESSAGES/bison-runtime.mo
@@ -63,18 +42,18 @@ share/aclocal/bison-i18n.m4
 %%NLS%%share/locale/nl/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/bison.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/bison-runtime.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/bison-runtime.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/bison-runtime.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/bison.mo
-%%NLS%%share/locale/sq/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/th/LC_MESSAGES/bison-runtime.mo