Stage 1 of gettext update.

Move gettext (0.10.35) with gettext-old
Update gettext from gettext-devel (0.10.40)
Remove gettext-devel
Fix dependencies

Stage 2 will involve upgraded gettext to 0.11 and fixing issues
Stage 3 involves a de-orbit burn sequence for gettext-old

Reviewed by:	portmgr

18 files changed, 18 insertions, 18 deletions

diff --git a/databases/mysql-gui/Makefile b/databases/mysql-gui/Makefile
index 6bb7422e78f9..7074fb5ae223 100644
--- a/databases/mysql-gui/Makefile
+++ b/databases/mysql-gui/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME:S/-//}-${PORTVERSION}
 MAINTAINER=	cyrille.lefevre@laposte.net
 
 LIB_DEPENDS=	sqlplus.1:${PORTSDIR}/databases/mysql++ \
- 		intl.1:${PORTSDIR}/devel/gettext \
+ 		intl.1:${PORTSDIR}/devel/gettext-old \
  		glut.3:${PORTSDIR}/graphics/Mesa3 \
  		jpeg.9:${PORTSDIR}/graphics/jpeg \
  		fleditor.1:${PORTSDIR}/x11-toolkits/fl_editor \
diff --git a/databases/namazu2/Makefile b/databases/namazu2/Makefile
index f4c218fb5623..8206b9684219 100644
--- a/databases/namazu2/Makefile
+++ b/databases/namazu2/Makefile
@@ -13,7 +13,7 @@ PKGNAMESUFFIX=	2
 
 MAINTAINER=	knu@FreeBSD.org
 
-LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext-old
 BUILD_DEPENDS=	${PM_BASE}/File/MMagic.pm:${PORTSDIR}/devel/p5-File-MMagic
 RUN_DEPENDS=	${PM_BASE}/File/MMagic.pm:${PORTSDIR}/devel/p5-File-MMagic
 #		xlHtml:${PORTSDIR}/textproc/xlhtml \
diff --git a/databases/p5-DBD-Sybase/Makefile b/databases/p5-DBD-Sybase/Makefile
index d86b9fdc061b..cc889a7c7979 100644
--- a/databases/p5-DBD-Sybase/Makefile
+++ b/databases/p5-DBD-Sybase/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	sheldonh@FreeBSD.org
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
 LIB_DEPENDS=	ct.0:${PORTSDIR}/databases/freetds \
-		intl.1:${PORTSDIR}/devel/gettext
+		intl.1:${PORTSDIR}/devel/gettext-old
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/databases/postgresql-devel-server/Makefile b/databases/postgresql-devel-server/Makefile
index 0f192fc19631..d94e85360f31 100644
--- a/databases/postgresql-devel-server/Makefile
+++ b/databases/postgresql-devel-server/Makefile
@@ -56,7 +56,7 @@ LIB_DEPENDS=	gnugetopt:${PORTSDIR}/devel/libgnugetopt
 .if defined(WITH_GETTEXT)
 CONFIGURE_ARGS+=--enable-nls
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
-BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
 PLIST_SUB+=	GETTEXT=""
 .else
 PLIST_SUB+=	GETTEXT="@comment "
diff --git a/databases/postgresql-devel/Makefile b/databases/postgresql-devel/Makefile
index 0f192fc19631..d94e85360f31 100644
--- a/databases/postgresql-devel/Makefile
+++ b/databases/postgresql-devel/Makefile
@@ -56,7 +56,7 @@ LIB_DEPENDS=	gnugetopt:${PORTSDIR}/devel/libgnugetopt
 .if defined(WITH_GETTEXT)
 CONFIGURE_ARGS+=--enable-nls
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
-BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
 PLIST_SUB+=	GETTEXT=""
 .else
 PLIST_SUB+=	GETTEXT="@comment "
diff --git a/databases/postgresql7/Makefile b/databases/postgresql7/Makefile
index 0f192fc19631..d94e85360f31 100644
--- a/databases/postgresql7/Makefile
+++ b/databases/postgresql7/Makefile
@@ -56,7 +56,7 @@ LIB_DEPENDS=	gnugetopt:${PORTSDIR}/devel/libgnugetopt
 .if defined(WITH_GETTEXT)
 CONFIGURE_ARGS+=--enable-nls
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
-BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
 PLIST_SUB+=	GETTEXT=""
 .else
 PLIST_SUB+=	GETTEXT="@comment "
diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile
index 0f192fc19631..d94e85360f31 100644
--- a/databases/postgresql73-server/Makefile
+++ b/databases/postgresql73-server/Makefile
@@ -56,7 +56,7 @@ LIB_DEPENDS=	gnugetopt:${PORTSDIR}/devel/libgnugetopt
 .if defined(WITH_GETTEXT)
 CONFIGURE_ARGS+=--enable-nls
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
-BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
 PLIST_SUB+=	GETTEXT=""
 .else
 PLIST_SUB+=	GETTEXT="@comment "
diff --git a/databases/postgresql73/Makefile b/databases/postgresql73/Makefile
index 0f192fc19631..d94e85360f31 100644
--- a/databases/postgresql73/Makefile
+++ b/databases/postgresql73/Makefile
@@ -56,7 +56,7 @@ LIB_DEPENDS=	gnugetopt:${PORTSDIR}/devel/libgnugetopt
 .if defined(WITH_GETTEXT)
 CONFIGURE_ARGS+=--enable-nls
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
-BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
 PLIST_SUB+=	GETTEXT=""
 .else
 PLIST_SUB+=	GETTEXT="@comment "
diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index 0f192fc19631..d94e85360f31 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -56,7 +56,7 @@ LIB_DEPENDS=	gnugetopt:${PORTSDIR}/devel/libgnugetopt
 .if defined(WITH_GETTEXT)
 CONFIGURE_ARGS+=--enable-nls
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
-BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
 PLIST_SUB+=	GETTEXT=""
 .else
 PLIST_SUB+=	GETTEXT="@comment "
diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index 0f192fc19631..d94e85360f31 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -56,7 +56,7 @@ LIB_DEPENDS=	gnugetopt:${PORTSDIR}/devel/libgnugetopt
 .if defined(WITH_GETTEXT)
 CONFIGURE_ARGS+=--enable-nls
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
-BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
 PLIST_SUB+=	GETTEXT=""
 .else
 PLIST_SUB+=	GETTEXT="@comment "
diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile
index 0f192fc19631..d94e85360f31 100644
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@@ -56,7 +56,7 @@ LIB_DEPENDS=	gnugetopt:${PORTSDIR}/devel/libgnugetopt
 .if defined(WITH_GETTEXT)
 CONFIGURE_ARGS+=--enable-nls
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
-BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
 PLIST_SUB+=	GETTEXT=""
 .else
 PLIST_SUB+=	GETTEXT="@comment "
diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile
index 0f192fc19631..d94e85360f31 100644
--- a/databases/postgresql82-server/Makefile
+++ b/databases/postgresql82-server/Makefile
@@ -56,7 +56,7 @@ LIB_DEPENDS=	gnugetopt:${PORTSDIR}/devel/libgnugetopt
 .if defined(WITH_GETTEXT)
 CONFIGURE_ARGS+=--enable-nls
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
-BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
 PLIST_SUB+=	GETTEXT=""
 .else
 PLIST_SUB+=	GETTEXT="@comment "
diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile
index 0f192fc19631..d94e85360f31 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@@ -56,7 +56,7 @@ LIB_DEPENDS=	gnugetopt:${PORTSDIR}/devel/libgnugetopt
 .if defined(WITH_GETTEXT)
 CONFIGURE_ARGS+=--enable-nls
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
-BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
 PLIST_SUB+=	GETTEXT=""
 .else
 PLIST_SUB+=	GETTEXT="@comment "
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index 0f192fc19631..d94e85360f31 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -56,7 +56,7 @@ LIB_DEPENDS=	gnugetopt:${PORTSDIR}/devel/libgnugetopt
 .if defined(WITH_GETTEXT)
 CONFIGURE_ARGS+=--enable-nls
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
-BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
 PLIST_SUB+=	GETTEXT=""
 .else
 PLIST_SUB+=	GETTEXT="@comment "
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index 0f192fc19631..d94e85360f31 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -56,7 +56,7 @@ LIB_DEPENDS=	gnugetopt:${PORTSDIR}/devel/libgnugetopt
 .if defined(WITH_GETTEXT)
 CONFIGURE_ARGS+=--enable-nls
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
-BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
 PLIST_SUB+=	GETTEXT=""
 .else
 PLIST_SUB+=	GETTEXT="@comment "
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index 0f192fc19631..d94e85360f31 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -56,7 +56,7 @@ LIB_DEPENDS=	gnugetopt:${PORTSDIR}/devel/libgnugetopt
 .if defined(WITH_GETTEXT)
 CONFIGURE_ARGS+=--enable-nls
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
-BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
 PLIST_SUB+=	GETTEXT=""
 .else
 PLIST_SUB+=	GETTEXT="@comment "
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index 0f192fc19631..d94e85360f31 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -56,7 +56,7 @@ LIB_DEPENDS=	gnugetopt:${PORTSDIR}/devel/libgnugetopt
 .if defined(WITH_GETTEXT)
 CONFIGURE_ARGS+=--enable-nls
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
-BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS+= ${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext-old
 PLIST_SUB+=	GETTEXT=""
 .else
 PLIST_SUB+=	GETTEXT="@comment "
diff --git a/databases/sqsh/Makefile b/databases/sqsh/Makefile
index 03635b895357..15d274ea33e8 100644
--- a/databases/sqsh/Makefile
+++ b/databases/sqsh/Makefile
@@ -13,7 +13,7 @@ EXTRACT_SUFX=	-src.tar.gz
 MAINTAINER=	midom@dammit.lt
 
 LIB_DEPENDS=	tds.0:${PORTSDIR}/databases/freetds \
-		intl.1:${PORTSDIR}/devel/gettext
+		intl.1:${PORTSDIR}/devel/gettext-old
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash1
 
 GNU_CONFIGURE=	yes