2 files changed, 34 insertions, 29 deletions

diff --git a/devel/bison-devel/Makefile b/devel/bison-devel/Makefile
index bed51ea37372..9cbe502f92fa 100644
--- a/devel/bison-devel/Makefile
+++ b/devel/bison-devel/Makefile
@@ -15,14 +15,13 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	seanc@FreeBSD.org
 COMMENT=	A parser generator from FSF, (mostly) compatible with Yacc
 
-CONFLICTS=	bison-1.7[0-9]*
-
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
+CONFLICTS=	bison-1.7[0-9]*
+
 NO_LATEST_LINK=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -30,6 +29,15 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		MAKEINFO="makeinfo --no-split"
 
 MAN1=		bison.1
+INFO=		bison
+
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.else
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.endif
 
 .ifdef USE_BISON
 .error You have `USE_BISON' variable defined either in environment or in make(1) arguments. Please undefine and try again.
@@ -39,6 +47,6 @@ post-extract:
 	@${RM} -f ${WRKSRC}/doc/bison.info*
 
 post-install:
-	${LN} -sf ${LOCALBASE}/bin/bison ${LOCALBASE}/bin/bison1875
+	${LN} -sf ${PREFIX}/bin/bison ${PREFIX}/bin/bison1875
 
 .include <bsd.port.mk>
diff --git a/devel/bison-devel/pkg-plist b/devel/bison-devel/pkg-plist
index edad32f1329c..71e3b6972fff 100644
--- a/devel/bison-devel/pkg-plist
+++ b/devel/bison-devel/pkg-plist
@@ -2,29 +2,26 @@
 bin/bison
 bin/bison1875
 bin/yacc
-@unexec install-info --delete %D/info/bison.info %D/info/dir
-info/bison.info
 lib/liby.a
-@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/README
-share/bison/yacc.c
-share/locale/da/LC_MESSAGES/bison.mo
-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
+%%DATADIR%%/c.m4
+%%DATADIR%%/glr.c
+%%DATADIR%%/lalr1.cc
+%%DATADIR%%/m4sugar/m4sugar.m4
+%%DATADIR%%/README
+%%DATADIR%%/yacc.c
+%%NLS%%share/locale/da/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/de/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/es/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/et/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/id/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/it/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/bison.mo
+@dirrm %%DATADIR%%/m4sugar
+@dirrm %%DATADIR%%