Add missing bison.info-* and NLS files to pkg/PLIST.

Change to depend on pkgsrc gettext instead.

5 files changed, 48 insertions, 6 deletions

diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index cb77731e33d..3d44281915f 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1999/08/24 12:51:24 agc Exp $
+# $NetBSD: Makefile,v 1.11 1999/10/04 17:24:00 jlam Exp $
 
 DISTNAME=	bison-1.28
 CATEGORIES=	devel
@@ -7,10 +7,15 @@ MASTER_SITES=	${MASTER_SITE_GNU:=bison/}
 MAINTAINER=	thorpej@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/bison/bison.html
 
+DEPENDS+=	gettext-0.10.35:../../devel/gettext
+
 GNU_CONFIGURE=	yes
-# needed for $TMPDIR parsing
-CFLAGS+=	-Dunix
 
 INFO_FILES=	bison.info
 
+CPPFLAGS+=	-Dunix				# for $TMPDIR parsing
+CPPFLAGS+=	-I${LOCALBASE}/include		# for libintl.h
+INTLLIBS=	-L${LOCALBASE}/lib -lintl
+CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" INTLLIBS="${INTLLIBS}"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/bison/files/patch-sum b/devel/bison/files/patch-sum
index f54e34d1980..f73178ccd36 100644
--- a/devel/bison/files/patch-sum
+++ b/devel/bison/files/patch-sum
@@ -1,4 +1,6 @@
-$NetBSD: patch-sum,v 1.2 1999/08/24 12:51:25 agc Exp $
+$NetBSD: patch-sum,v 1.3 1999/10/04 17:24:01 jlam Exp $
 
 MD5 (patch-aa) = 3edc18b2508fc13d087e3f6e80fb8684
 MD5 (patch-ab) = 0aee895505c684915d8c6d2fd38e4172
+MD5 (patch-ac) = 5f1cb06155359a3297544de061a8cb5c
+MD5 (patch-ad) = 13dbf11212a918e10b2ab91dfe583119
diff --git a/devel/bison/patches/patch-ac b/devel/bison/patches/patch-ac
new file mode 100644
index 00000000000..ce70bdfc6f5
--- /dev/null
+++ b/devel/bison/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.3 1999/10/04 17:24:02 jlam Exp $
+
+--- src/Makefile.in.orig	Tue Jul  6 09:20:06 1999
++++ src/Makefile.in	Sat Oct  2 02:42:21 1999
+@@ -95,7 +95,7 @@
+ EXTRA_bison_SOURCES = vmsgetargs.c
+ 
+ bison_LDADD = @INTLLIBS@ @ALLOCA@
+-INCLUDES = -I../intl -I$(top_srcdir)/intl
++INCLUDES = # -I../intl -I$(top_srcdir)/intl
+ 
+ noinst_HEADERS = alloc.h files.h gram.h lex.h machine.h state.h	 symtab.h system.h types.h getopt.h
+ 
diff --git a/devel/bison/patches/patch-ad b/devel/bison/patches/patch-ad
new file mode 100644
index 00000000000..72d6b42ab2a
--- /dev/null
+++ b/devel/bison/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 1999/10/04 17:24:02 jlam Exp $
+
+--- po/Makefile.in.in.orig	Fri Feb  5 10:05:15 1999
++++ po/Makefile.in.in	Sat Oct  2 20:59:36 1999
+@@ -19,7 +19,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = $(prefix)/@DATADIRNAME@
+-localedir = $(datadir)/locale
++localedir = $(prefix)/share/locale
+ gnulocaledir = $(prefix)/share/locale
+ gettextsrcdir = $(prefix)/share/gettext/po
+ subdir = po
diff --git a/devel/bison/pkg/PLIST b/devel/bison/pkg/PLIST
index 87b0e34bd38..172d49a2c1d 100644
--- a/devel/bison/pkg/PLIST
+++ b/devel/bison/pkg/PLIST
@@ -1,8 +1,17 @@
-@comment $NetBSD: PLIST,v 1.4 1999/02/19 03:27:13 tv Exp $
+@comment $NetBSD: PLIST,v 1.5 1999/10/04 17:24:03 jlam Exp $
 bin/bison
-man/man1/bison.1
 @unexec install-info --delete %D/info/bison.info %D/info/dir
 info/bison.info
+info/bison.info-1
+info/bison.info-2
+info/bison.info-3
+info/bison.info-4
+info/bison.info-5
 @exec install-info %D/info/bison.info %D/info/dir
+man/man1/bison.1
 share/bison.simple
 share/bison.hairy
+share/locale/de/LC_MESSAGES/bison.mo
+share/locale/es/LC_MESSAGES/bison.mo
+share/locale/fr/LC_MESSAGES/bison.mo
+share/locale/nl/LC_MESSAGES/bison.mo