12 files changed, 48 insertions, 66 deletions

diff --git a/devel/bison-devel/Makefile b/devel/bison-devel/Makefile
index cb97e3ad4d59..05fe515556c2 100644
--- a/devel/bison-devel/Makefile
+++ b/devel/bison-devel/Makefile
@@ -14,23 +14,23 @@ MASTER_SITE_SUBDIR=	bison
 
 MAINTAINER=		ports@FreeBSD.org
 
-LIB_DEPENDS=		intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=		giconv.2:${PORTSDIR}/converters/libiconv
 
 GNU_CONFIGURE=		yes
+CONFIGURE_ARGS=		--with-included-gettext
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib -lintl" \
+			LDFLAGS="-L${LOCALBASE}/lib" \
 			MAKEINFO="makeinfo --no-split"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 MAN1=			bison.1
 
 post-extract:
-	${RM} -f ${WRKSRC}/doc/bison.info*
+	@${RM} -f ${WRKSRC}/doc/bison.info*
+	@${FIND} ${WRKSRC} -type f | ${XARGS} ${PERL} -pi -e \
+		's|-liconv|-lgiconv|g ; s|iconv\.h|giconv\.h|g'
 
 post-install:
-	@if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' \/usr\/share\/info/dir > ${PREFIX}/info/dir; \
-	 fi
-	@install-info ${PREFIX}/info/bison.info ${PREFIX}/info/dir
+	install-info ${PREFIX}/info/bison.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/devel/bison-devel/pkg-plist b/devel/bison-devel/pkg-plist
index a7069cfbf822..b2c3a1a5dfa4 100644
--- a/devel/bison-devel/pkg-plist
+++ b/devel/bison-devel/pkg-plist
@@ -1,8 +1,8 @@
 @comment $FreeBSD$
 bin/bison
+lib/charset.alias
 share/bison/bison.hairy
 share/bison/bison.simple
-lib/charset.alias
 @unexec install-info --delete %D/info/bison.info %D/info/dir
 info/bison.info
 @exec install-info %D/info/bison.info %D/info/dir
@@ -17,6 +17,3 @@ share/locale/ru/LC_MESSAGES/bison.mo
 share/locale/sv/LC_MESSAGES/bison.mo
 share/locale/tr/LC_MESSAGES/bison.mo
 @dirrm share/bison
-@unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/* 2>/dev/null || true
-@unexec rmdir %D/share/locale 2>/dev/null || true
diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index cb97e3ad4d59..05fe515556c2 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -14,23 +14,23 @@ MASTER_SITE_SUBDIR=	bison
 
 MAINTAINER=		ports@FreeBSD.org
 
-LIB_DEPENDS=		intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=		giconv.2:${PORTSDIR}/converters/libiconv
 
 GNU_CONFIGURE=		yes
+CONFIGURE_ARGS=		--with-included-gettext
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib -lintl" \
+			LDFLAGS="-L${LOCALBASE}/lib" \
 			MAKEINFO="makeinfo --no-split"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 MAN1=			bison.1
 
 post-extract:
-	${RM} -f ${WRKSRC}/doc/bison.info*
+	@${RM} -f ${WRKSRC}/doc/bison.info*
+	@${FIND} ${WRKSRC} -type f | ${XARGS} ${PERL} -pi -e \
+		's|-liconv|-lgiconv|g ; s|iconv\.h|giconv\.h|g'
 
 post-install:
-	@if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' \/usr\/share\/info/dir > ${PREFIX}/info/dir; \
-	 fi
-	@install-info ${PREFIX}/info/bison.info ${PREFIX}/info/dir
+	install-info ${PREFIX}/info/bison.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/devel/bison/pkg-plist b/devel/bison/pkg-plist
index a7069cfbf822..b2c3a1a5dfa4 100644
--- a/devel/bison/pkg-plist
+++ b/devel/bison/pkg-plist
@@ -1,8 +1,8 @@
 @comment $FreeBSD$
 bin/bison
+lib/charset.alias
 share/bison/bison.hairy
 share/bison/bison.simple
-lib/charset.alias
 @unexec install-info --delete %D/info/bison.info %D/info/dir
 info/bison.info
 @exec install-info %D/info/bison.info %D/info/dir
@@ -17,6 +17,3 @@ share/locale/ru/LC_MESSAGES/bison.mo
 share/locale/sv/LC_MESSAGES/bison.mo
 share/locale/tr/LC_MESSAGES/bison.mo
 @dirrm share/bison
-@unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/* 2>/dev/null || true
-@unexec rmdir %D/share/locale 2>/dev/null || true
diff --git a/devel/bison175/Makefile b/devel/bison175/Makefile
index cb97e3ad4d59..05fe515556c2 100644
--- a/devel/bison175/Makefile
+++ b/devel/bison175/Makefile
@@ -14,23 +14,23 @@ MASTER_SITE_SUBDIR=	bison
 
 MAINTAINER=		ports@FreeBSD.org
 
-LIB_DEPENDS=		intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=		giconv.2:${PORTSDIR}/converters/libiconv
 
 GNU_CONFIGURE=		yes
+CONFIGURE_ARGS=		--with-included-gettext
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib -lintl" \
+			LDFLAGS="-L${LOCALBASE}/lib" \
 			MAKEINFO="makeinfo --no-split"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 MAN1=			bison.1
 
 post-extract:
-	${RM} -f ${WRKSRC}/doc/bison.info*
+	@${RM} -f ${WRKSRC}/doc/bison.info*
+	@${FIND} ${WRKSRC} -type f | ${XARGS} ${PERL} -pi -e \
+		's|-liconv|-lgiconv|g ; s|iconv\.h|giconv\.h|g'
 
 post-install:
-	@if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' \/usr\/share\/info/dir > ${PREFIX}/info/dir; \
-	 fi
-	@install-info ${PREFIX}/info/bison.info ${PREFIX}/info/dir
+	install-info ${PREFIX}/info/bison.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/devel/bison175/pkg-plist b/devel/bison175/pkg-plist
index a7069cfbf822..b2c3a1a5dfa4 100644
--- a/devel/bison175/pkg-plist
+++ b/devel/bison175/pkg-plist
@@ -1,8 +1,8 @@
 @comment $FreeBSD$
 bin/bison
+lib/charset.alias
 share/bison/bison.hairy
 share/bison/bison.simple
-lib/charset.alias
 @unexec install-info --delete %D/info/bison.info %D/info/dir
 info/bison.info
 @exec install-info %D/info/bison.info %D/info/dir
@@ -17,6 +17,3 @@ share/locale/ru/LC_MESSAGES/bison.mo
 share/locale/sv/LC_MESSAGES/bison.mo
 share/locale/tr/LC_MESSAGES/bison.mo
 @dirrm share/bison
-@unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/* 2>/dev/null || true
-@unexec rmdir %D/share/locale 2>/dev/null || true
diff --git a/devel/bison1875/Makefile b/devel/bison1875/Makefile
index cb97e3ad4d59..05fe515556c2 100644
--- a/devel/bison1875/Makefile
+++ b/devel/bison1875/Makefile
@@ -14,23 +14,23 @@ MASTER_SITE_SUBDIR=	bison
 
 MAINTAINER=		ports@FreeBSD.org
 
-LIB_DEPENDS=		intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=		giconv.2:${PORTSDIR}/converters/libiconv
 
 GNU_CONFIGURE=		yes
+CONFIGURE_ARGS=		--with-included-gettext
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib -lintl" \
+			LDFLAGS="-L${LOCALBASE}/lib" \
 			MAKEINFO="makeinfo --no-split"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 MAN1=			bison.1
 
 post-extract:
-	${RM} -f ${WRKSRC}/doc/bison.info*
+	@${RM} -f ${WRKSRC}/doc/bison.info*
+	@${FIND} ${WRKSRC} -type f | ${XARGS} ${PERL} -pi -e \
+		's|-liconv|-lgiconv|g ; s|iconv\.h|giconv\.h|g'
 
 post-install:
-	@if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' \/usr\/share\/info/dir > ${PREFIX}/info/dir; \
-	 fi
-	@install-info ${PREFIX}/info/bison.info ${PREFIX}/info/dir
+	install-info ${PREFIX}/info/bison.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/devel/bison1875/pkg-plist b/devel/bison1875/pkg-plist
index a7069cfbf822..b2c3a1a5dfa4 100644
--- a/devel/bison1875/pkg-plist
+++ b/devel/bison1875/pkg-plist
@@ -1,8 +1,8 @@
 @comment $FreeBSD$
 bin/bison
+lib/charset.alias
 share/bison/bison.hairy
 share/bison/bison.simple
-lib/charset.alias
 @unexec install-info --delete %D/info/bison.info %D/info/dir
 info/bison.info
 @exec install-info %D/info/bison.info %D/info/dir
@@ -17,6 +17,3 @@ share/locale/ru/LC_MESSAGES/bison.mo
 share/locale/sv/LC_MESSAGES/bison.mo
 share/locale/tr/LC_MESSAGES/bison.mo
 @dirrm share/bison
-@unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/* 2>/dev/null || true
-@unexec rmdir %D/share/locale 2>/dev/null || true
diff --git a/devel/bison2/Makefile b/devel/bison2/Makefile
index cb97e3ad4d59..05fe515556c2 100644
--- a/devel/bison2/Makefile
+++ b/devel/bison2/Makefile
@@ -14,23 +14,23 @@ MASTER_SITE_SUBDIR=	bison
 
 MAINTAINER=		ports@FreeBSD.org
 
-LIB_DEPENDS=		intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=		giconv.2:${PORTSDIR}/converters/libiconv
 
 GNU_CONFIGURE=		yes
+CONFIGURE_ARGS=		--with-included-gettext
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib -lintl" \
+			LDFLAGS="-L${LOCALBASE}/lib" \
 			MAKEINFO="makeinfo --no-split"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 MAN1=			bison.1
 
 post-extract:
-	${RM} -f ${WRKSRC}/doc/bison.info*
+	@${RM} -f ${WRKSRC}/doc/bison.info*
+	@${FIND} ${WRKSRC} -type f | ${XARGS} ${PERL} -pi -e \
+		's|-liconv|-lgiconv|g ; s|iconv\.h|giconv\.h|g'
 
 post-install:
-	@if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' \/usr\/share\/info/dir > ${PREFIX}/info/dir; \
-	 fi
-	@install-info ${PREFIX}/info/bison.info ${PREFIX}/info/dir
+	install-info ${PREFIX}/info/bison.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/devel/bison2/pkg-plist b/devel/bison2/pkg-plist
index a7069cfbf822..b2c3a1a5dfa4 100644
--- a/devel/bison2/pkg-plist
+++ b/devel/bison2/pkg-plist
@@ -1,8 +1,8 @@
 @comment $FreeBSD$
 bin/bison
+lib/charset.alias
 share/bison/bison.hairy
 share/bison/bison.simple
-lib/charset.alias
 @unexec install-info --delete %D/info/bison.info %D/info/dir
 info/bison.info
 @exec install-info %D/info/bison.info %D/info/dir
@@ -17,6 +17,3 @@ share/locale/ru/LC_MESSAGES/bison.mo
 share/locale/sv/LC_MESSAGES/bison.mo
 share/locale/tr/LC_MESSAGES/bison.mo
 @dirrm share/bison
-@unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/* 2>/dev/null || true
-@unexec rmdir %D/share/locale 2>/dev/null || true
diff --git a/devel/bison20/Makefile b/devel/bison20/Makefile
index cb97e3ad4d59..05fe515556c2 100644
--- a/devel/bison20/Makefile
+++ b/devel/bison20/Makefile
@@ -14,23 +14,23 @@ MASTER_SITE_SUBDIR=	bison
 
 MAINTAINER=		ports@FreeBSD.org
 
-LIB_DEPENDS=		intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=		giconv.2:${PORTSDIR}/converters/libiconv
 
 GNU_CONFIGURE=		yes
+CONFIGURE_ARGS=		--with-included-gettext
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib -lintl" \
+			LDFLAGS="-L${LOCALBASE}/lib" \
 			MAKEINFO="makeinfo --no-split"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 MAN1=			bison.1
 
 post-extract:
-	${RM} -f ${WRKSRC}/doc/bison.info*
+	@${RM} -f ${WRKSRC}/doc/bison.info*
+	@${FIND} ${WRKSRC} -type f | ${XARGS} ${PERL} -pi -e \
+		's|-liconv|-lgiconv|g ; s|iconv\.h|giconv\.h|g'
 
 post-install:
-	@if [ ! -f ${PREFIX}/info/dir ]; then \
-	  ${SED} -ne '1,/Menu:/p' \/usr\/share\/info/dir > ${PREFIX}/info/dir; \
-	 fi
-	@install-info ${PREFIX}/info/bison.info ${PREFIX}/info/dir
+	install-info ${PREFIX}/info/bison.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/devel/bison20/pkg-plist b/devel/bison20/pkg-plist
index a7069cfbf822..b2c3a1a5dfa4 100644
--- a/devel/bison20/pkg-plist
+++ b/devel/bison20/pkg-plist
@@ -1,8 +1,8 @@
 @comment $FreeBSD$
 bin/bison
+lib/charset.alias
 share/bison/bison.hairy
 share/bison/bison.simple
-lib/charset.alias
 @unexec install-info --delete %D/info/bison.info %D/info/dir
 info/bison.info
 @exec install-info %D/info/bison.info %D/info/dir
@@ -17,6 +17,3 @@ share/locale/ru/LC_MESSAGES/bison.mo
 share/locale/sv/LC_MESSAGES/bison.mo
 share/locale/tr/LC_MESSAGES/bison.mo
 @dirrm share/bison
-@unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/* 2>/dev/null || true
-@unexec rmdir %D/share/locale 2>/dev/null || true