Sat May 30 14:47:08 2009 UTC ()
Force bison to use the m4 we want and not to pick a potentially outdated
version itself.


(joerg)
diff -r1.69 -r1.70 pkgsrc/devel/bison/Makefile
cvs diff -r1.69 -r1.70 pkgsrc/devel/bison/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/bison/Makefile 2009/02/12 18:43:21 1.69
+++ pkgsrc/devel/bison/Makefile 2009/05/30 14:47:07 1.70
@@ -1,35 +1,36 @@ @@ -1,35 +1,36 @@
1# $NetBSD: Makefile,v 1.69 2009/02/12 18:43:21 minskim Exp $ 1# $NetBSD: Makefile,v 1.70 2009/05/30 14:47:07 joerg Exp $
2 2
3DISTNAME= bison-2.4.1 3DISTNAME= bison-2.4.1
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= ${MASTER_SITE_GNU:=bison/} 6MASTER_SITES= ${MASTER_SITE_GNU:=bison/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= cjep@NetBSD.org 9MAINTAINER= cjep@NetBSD.org
10HOMEPAGE= http://www.gnu.org/software/bison/bison.html 10HOMEPAGE= http://www.gnu.org/software/bison/bison.html
11COMMENT= GNU yacc(1) replacement 11COMMENT= GNU yacc(1) replacement
12 12
13PKG_INSTALLATION_TYPES= overwrite pkgviews 13PKG_INSTALLATION_TYPES= overwrite pkgviews
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16GNU_CONFIGURE= YES 16GNU_CONFIGURE= YES
17USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
18USE_PKGLOCALEDIR= yes 18USE_PKGLOCALEDIR= yes
19USE_TOOLS+= grep gm4:run msgfmt 19USE_TOOLS+= grep gm4:run msgfmt
20INFO_FILES= # PLIST 20INFO_FILES= # PLIST
21 21
22CONFIGURE_ENV+= gt_cv_func_gnugettext1_libintl=yes 22CONFIGURE_ENV+= gt_cv_func_gnugettext1_libintl=yes \
 23 ac_cv_prog_M4=${TOOLS_PATH.gm4}
23 24
24TEST_TARGET= check 25TEST_TARGET= check
25 26
26# Avoid rebuilding manpage 27# Avoid rebuilding manpage
27pre-build: 28pre-build:
28 ${TOUCH} ${WRKSRC}/doc/bison.1 29 ${TOUCH} ${WRKSRC}/doc/bison.1
29 30
30# "bison" wants a recent version of "gettext" which at least NetBSD doesn't 31# "bison" wants a recent version of "gettext" which at least NetBSD doesn't
31# provide. Figure out whether it will install the locale files or not. 32# provide. Figure out whether it will install the locale files or not.
32PLIST_SRC= ${WRKDIR}/PLIST 33PLIST_SRC= ${WRKDIR}/PLIST
33 34
34post-configure: 35post-configure:
35 if grep -q '^POSUB = po$$' ${WRKSRC}/Makefile; then \ 36 if grep -q '^POSUB = po$$' ${WRKSRC}/Makefile; then \