Don't install own copy of charset.alias - use one from libiconv instead. Bump

PORTREVISION.

18 files changed, 222 insertions, 84 deletions

diff --git a/devel/bison-devel/Makefile b/devel/bison-devel/Makefile
index d5fb066..f9c118f 100644
--- a/devel/bison-devel/Makefile
+++ b/devel/bison-devel/Makefile
@@ -6,25 +6,26 @@
 # $FreeBSD$
 #
 
-PORTNAME=		bison
-PORTVERSION=		1.35
-CATEGORIES=		devel
-MASTER_SITES=		${MASTER_SITE_GNU}
+PORTNAME=	bison
+PORTVERSION=	1.35
+PORTREVISION=	1
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	bison
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
-USE_BZIP2=		yes
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS=		--with-included-gettext
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib" \
-			MAKEINFO="makeinfo --no-split"
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-included-gettext
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		MAKEINFO="makeinfo --no-split"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
-MAN1=			bison.1
+MAN1=		bison.1
 
 post-extract:
 	@${RM} -f ${WRKSRC}/doc/bison.info*
diff --git a/devel/bison-devel/files/patch-intl::Makefile.in b/devel/bison-devel/files/patch-intl::Makefile.in
new file mode 100644
index 0000000..adfc8cd
--- /dev/null
+++ b/devel/bison-devel/files/patch-intl::Makefile.in
@@ -0,0 +1,23 @@
+
+$FreeBSD$
+
+--- intl/Makefile.in	2002/04/30 08:12:35	1.1
++++ intl/Makefile.in	2002/04/30 08:13:50
+@@ -52,7 +52,7 @@
+ YFLAGS = --name-prefix=__gettext
+ 
+ DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
+--DLIBDIR=\"$(libdir)\" -DIN_LIBINTL @DEFS@
++-DLIBDIR=\"$(prefix)/libdata\" -DIN_LIBINTL @DEFS@
+ CPPFLAGS = @CPPFLAGS@
+ CFLAGS = @CFLAGS@
+ LDFLAGS = @LDFLAGS@
+@@ -152,7 +152,7 @@
+ 	else \
+ 	  : ; \
+ 	fi
+-	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
++	if test no = yes; then \
+ 	  test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
+ 	  temp=$(DESTDIR)$(libdir)/t-charset.alias; \
+ 	  dest=$(DESTDIR)$(libdir)/charset.alias; \
diff --git a/devel/bison-devel/pkg-plist b/devel/bison-devel/pkg-plist
index b2c3a1a..60f7c9c 100644
--- a/devel/bison-devel/pkg-plist
+++ b/devel/bison-devel/pkg-plist
@@ -1,6 +1,5 @@
 @comment $FreeBSD$
 bin/bison
-lib/charset.alias
 share/bison/bison.hairy
 share/bison/bison.simple
 @unexec install-info --delete %D/info/bison.info %D/info/dir
diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index d5fb066..f9c118f 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -6,25 +6,26 @@
 # $FreeBSD$
 #
 
-PORTNAME=		bison
-PORTVERSION=		1.35
-CATEGORIES=		devel
-MASTER_SITES=		${MASTER_SITE_GNU}
+PORTNAME=	bison
+PORTVERSION=	1.35
+PORTREVISION=	1
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	bison
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
-USE_BZIP2=		yes
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS=		--with-included-gettext
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib" \
-			MAKEINFO="makeinfo --no-split"
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-included-gettext
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		MAKEINFO="makeinfo --no-split"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
-MAN1=			bison.1
+MAN1=		bison.1
 
 post-extract:
 	@${RM} -f ${WRKSRC}/doc/bison.info*
diff --git a/devel/bison/files/patch-intl::Makefile.in b/devel/bison/files/patch-intl::Makefile.in
new file mode 100644
index 0000000..adfc8cd
--- /dev/null
+++ b/devel/bison/files/patch-intl::Makefile.in
@@ -0,0 +1,23 @@
+
+$FreeBSD$
+
+--- intl/Makefile.in	2002/04/30 08:12:35	1.1
++++ intl/Makefile.in	2002/04/30 08:13:50
+@@ -52,7 +52,7 @@
+ YFLAGS = --name-prefix=__gettext
+ 
+ DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
+--DLIBDIR=\"$(libdir)\" -DIN_LIBINTL @DEFS@
++-DLIBDIR=\"$(prefix)/libdata\" -DIN_LIBINTL @DEFS@
+ CPPFLAGS = @CPPFLAGS@
+ CFLAGS = @CFLAGS@
+ LDFLAGS = @LDFLAGS@
+@@ -152,7 +152,7 @@
+ 	else \
+ 	  : ; \
+ 	fi
+-	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
++	if test no = yes; then \
+ 	  test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
+ 	  temp=$(DESTDIR)$(libdir)/t-charset.alias; \
+ 	  dest=$(DESTDIR)$(libdir)/charset.alias; \
diff --git a/devel/bison/pkg-plist b/devel/bison/pkg-plist
index b2c3a1a..60f7c9c 100644
--- a/devel/bison/pkg-plist
+++ b/devel/bison/pkg-plist
@@ -1,6 +1,5 @@
 @comment $FreeBSD$
 bin/bison
-lib/charset.alias
 share/bison/bison.hairy
 share/bison/bison.simple
 @unexec install-info --delete %D/info/bison.info %D/info/dir
diff --git a/devel/bison175/Makefile b/devel/bison175/Makefile
index d5fb066..f9c118f 100644
--- a/devel/bison175/Makefile
+++ b/devel/bison175/Makefile
@@ -6,25 +6,26 @@
 # $FreeBSD$
 #
 
-PORTNAME=		bison
-PORTVERSION=		1.35
-CATEGORIES=		devel
-MASTER_SITES=		${MASTER_SITE_GNU}
+PORTNAME=	bison
+PORTVERSION=	1.35
+PORTREVISION=	1
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	bison
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
-USE_BZIP2=		yes
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS=		--with-included-gettext
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib" \
-			MAKEINFO="makeinfo --no-split"
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-included-gettext
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		MAKEINFO="makeinfo --no-split"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
-MAN1=			bison.1
+MAN1=		bison.1
 
 post-extract:
 	@${RM} -f ${WRKSRC}/doc/bison.info*
diff --git a/devel/bison175/files/patch-intl::Makefile.in b/devel/bison175/files/patch-intl::Makefile.in
new file mode 100644
index 0000000..adfc8cd
--- /dev/null
+++ b/devel/bison175/files/patch-intl::Makefile.in
@@ -0,0 +1,23 @@
+
+$FreeBSD$
+
+--- intl/Makefile.in	2002/04/30 08:12:35	1.1
++++ intl/Makefile.in	2002/04/30 08:13:50
+@@ -52,7 +52,7 @@
+ YFLAGS = --name-prefix=__gettext
+ 
+ DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
+--DLIBDIR=\"$(libdir)\" -DIN_LIBINTL @DEFS@
++-DLIBDIR=\"$(prefix)/libdata\" -DIN_LIBINTL @DEFS@
+ CPPFLAGS = @CPPFLAGS@
+ CFLAGS = @CFLAGS@
+ LDFLAGS = @LDFLAGS@
+@@ -152,7 +152,7 @@
+ 	else \
+ 	  : ; \
+ 	fi
+-	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
++	if test no = yes; then \
+ 	  test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
+ 	  temp=$(DESTDIR)$(libdir)/t-charset.alias; \
+ 	  dest=$(DESTDIR)$(libdir)/charset.alias; \
diff --git a/devel/bison175/pkg-plist b/devel/bison175/pkg-plist
index b2c3a1a..60f7c9c 100644
--- a/devel/bison175/pkg-plist
+++ b/devel/bison175/pkg-plist
@@ -1,6 +1,5 @@
 @comment $FreeBSD$
 bin/bison
-lib/charset.alias
 share/bison/bison.hairy
 share/bison/bison.simple
 @unexec install-info --delete %D/info/bison.info %D/info/dir
diff --git a/devel/bison1875/Makefile b/devel/bison1875/Makefile
index d5fb066..f9c118f 100644
--- a/devel/bison1875/Makefile
+++ b/devel/bison1875/Makefile
@@ -6,25 +6,26 @@
 # $FreeBSD$
 #
 
-PORTNAME=		bison
-PORTVERSION=		1.35
-CATEGORIES=		devel
-MASTER_SITES=		${MASTER_SITE_GNU}
+PORTNAME=	bison
+PORTVERSION=	1.35
+PORTREVISION=	1
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	bison
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
-USE_BZIP2=		yes
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS=		--with-included-gettext
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib" \
-			MAKEINFO="makeinfo --no-split"
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-included-gettext
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		MAKEINFO="makeinfo --no-split"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
-MAN1=			bison.1
+MAN1=		bison.1
 
 post-extract:
 	@${RM} -f ${WRKSRC}/doc/bison.info*
diff --git a/devel/bison1875/files/patch-intl::Makefile.in b/devel/bison1875/files/patch-intl::Makefile.in
new file mode 100644
index 0000000..adfc8cd
--- /dev/null
+++ b/devel/bison1875/files/patch-intl::Makefile.in
@@ -0,0 +1,23 @@
+
+$FreeBSD$
+
+--- intl/Makefile.in	2002/04/30 08:12:35	1.1
++++ intl/Makefile.in	2002/04/30 08:13:50
+@@ -52,7 +52,7 @@
+ YFLAGS = --name-prefix=__gettext
+ 
+ DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
+--DLIBDIR=\"$(libdir)\" -DIN_LIBINTL @DEFS@
++-DLIBDIR=\"$(prefix)/libdata\" -DIN_LIBINTL @DEFS@
+ CPPFLAGS = @CPPFLAGS@
+ CFLAGS = @CFLAGS@
+ LDFLAGS = @LDFLAGS@
+@@ -152,7 +152,7 @@
+ 	else \
+ 	  : ; \
+ 	fi
+-	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
++	if test no = yes; then \
+ 	  test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
+ 	  temp=$(DESTDIR)$(libdir)/t-charset.alias; \
+ 	  dest=$(DESTDIR)$(libdir)/charset.alias; \
diff --git a/devel/bison1875/pkg-plist b/devel/bison1875/pkg-plist
index b2c3a1a..60f7c9c 100644
--- a/devel/bison1875/pkg-plist
+++ b/devel/bison1875/pkg-plist
@@ -1,6 +1,5 @@
 @comment $FreeBSD$
 bin/bison
-lib/charset.alias
 share/bison/bison.hairy
 share/bison/bison.simple
 @unexec install-info --delete %D/info/bison.info %D/info/dir
diff --git a/devel/bison2/Makefile b/devel/bison2/Makefile
index d5fb066..f9c118f 100644
--- a/devel/bison2/Makefile
+++ b/devel/bison2/Makefile
@@ -6,25 +6,26 @@
 # $FreeBSD$
 #
 
-PORTNAME=		bison
-PORTVERSION=		1.35
-CATEGORIES=		devel
-MASTER_SITES=		${MASTER_SITE_GNU}
+PORTNAME=	bison
+PORTVERSION=	1.35
+PORTREVISION=	1
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	bison
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
-USE_BZIP2=		yes
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS=		--with-included-gettext
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib" \
-			MAKEINFO="makeinfo --no-split"
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-included-gettext
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		MAKEINFO="makeinfo --no-split"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
-MAN1=			bison.1
+MAN1=		bison.1
 
 post-extract:
 	@${RM} -f ${WRKSRC}/doc/bison.info*
diff --git a/devel/bison2/files/patch-intl::Makefile.in b/devel/bison2/files/patch-intl::Makefile.in
new file mode 100644
index 0000000..adfc8cd
--- /dev/null
+++ b/devel/bison2/files/patch-intl::Makefile.in
@@ -0,0 +1,23 @@
+
+$FreeBSD$
+
+--- intl/Makefile.in	2002/04/30 08:12:35	1.1
++++ intl/Makefile.in	2002/04/30 08:13:50
+@@ -52,7 +52,7 @@
+ YFLAGS = --name-prefix=__gettext
+ 
+ DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
+--DLIBDIR=\"$(libdir)\" -DIN_LIBINTL @DEFS@
++-DLIBDIR=\"$(prefix)/libdata\" -DIN_LIBINTL @DEFS@
+ CPPFLAGS = @CPPFLAGS@
+ CFLAGS = @CFLAGS@
+ LDFLAGS = @LDFLAGS@
+@@ -152,7 +152,7 @@
+ 	else \
+ 	  : ; \
+ 	fi
+-	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
++	if test no = yes; then \
+ 	  test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
+ 	  temp=$(DESTDIR)$(libdir)/t-charset.alias; \
+ 	  dest=$(DESTDIR)$(libdir)/charset.alias; \
diff --git a/devel/bison2/pkg-plist b/devel/bison2/pkg-plist
index b2c3a1a..60f7c9c 100644
--- a/devel/bison2/pkg-plist
+++ b/devel/bison2/pkg-plist
@@ -1,6 +1,5 @@
 @comment $FreeBSD$
 bin/bison
-lib/charset.alias
 share/bison/bison.hairy
 share/bison/bison.simple
 @unexec install-info --delete %D/info/bison.info %D/info/dir
diff --git a/devel/bison20/Makefile b/devel/bison20/Makefile
index d5fb066..f9c118f 100644
--- a/devel/bison20/Makefile
+++ b/devel/bison20/Makefile
@@ -6,25 +6,26 @@
 # $FreeBSD$
 #
 
-PORTNAME=		bison
-PORTVERSION=		1.35
-CATEGORIES=		devel
-MASTER_SITES=		${MASTER_SITE_GNU}
+PORTNAME=	bison
+PORTVERSION=	1.35
+PORTREVISION=	1
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	bison
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
-USE_BZIP2=		yes
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS=		--with-included-gettext
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib" \
-			MAKEINFO="makeinfo --no-split"
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-included-gettext
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		MAKEINFO="makeinfo --no-split"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
-MAN1=			bison.1
+MAN1=		bison.1
 
 post-extract:
 	@${RM} -f ${WRKSRC}/doc/bison.info*
diff --git a/devel/bison20/files/patch-intl::Makefile.in b/devel/bison20/files/patch-intl::Makefile.in
new file mode 100644
index 0000000..adfc8cd
--- /dev/null
+++ b/devel/bison20/files/patch-intl::Makefile.in
@@ -0,0 +1,23 @@
+
+$FreeBSD$
+
+--- intl/Makefile.in	2002/04/30 08:12:35	1.1
++++ intl/Makefile.in	2002/04/30 08:13:50
+@@ -52,7 +52,7 @@
+ YFLAGS = --name-prefix=__gettext
+ 
+ DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
+--DLIBDIR=\"$(libdir)\" -DIN_LIBINTL @DEFS@
++-DLIBDIR=\"$(prefix)/libdata\" -DIN_LIBINTL @DEFS@
+ CPPFLAGS = @CPPFLAGS@
+ CFLAGS = @CFLAGS@
+ LDFLAGS = @LDFLAGS@
+@@ -152,7 +152,7 @@
+ 	else \
+ 	  : ; \
+ 	fi
+-	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
++	if test no = yes; then \
+ 	  test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
+ 	  temp=$(DESTDIR)$(libdir)/t-charset.alias; \
+ 	  dest=$(DESTDIR)$(libdir)/charset.alias; \
diff --git a/devel/bison20/pkg-plist b/devel/bison20/pkg-plist
index b2c3a1a..60f7c9c 100644
--- a/devel/bison20/pkg-plist
+++ b/devel/bison20/pkg-plist
@@ -1,6 +1,5 @@
 @comment $FreeBSD$
 bin/bison
-lib/charset.alias
 share/bison/bison.hairy
 share/bison/bison.simple
 @unexec install-info --delete %D/info/bison.info %D/info/dir