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

10 files changed, 11 insertions, 11 deletions

diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile
index 4ee53c54e42e..8a8cb1e74eee 100644
--- a/graphics/gphoto2/Makefile
+++ b/graphics/gphoto2/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.gphoto.net/dist/
 MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	giconv.2:${PORTSDIR}/converters/libiconv \
-		intl.1:${PORTSDIR}/devel/gettext \
+		intl.1:${PORTSDIR}/devel/gettext-old \
 		usb-0.1.5:${PORTSDIR}/devel/libusb \
 		aa.1:${PORTSDIR}/graphics/aalib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
diff --git a/graphics/gtkgraph/Makefile b/graphics/gtkgraph/Makefile
index b9c6a9594eae..aecde0765845 100644
--- a/graphics/gtkgraph/Makefile
+++ b/graphics/gtkgraph/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= jedgar
 
 MAINTAINER=	jedgar@FreeBSD.org
 
-LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext-old
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/graphics/gtksee/Makefile b/graphics/gtksee/Makefile
index b4e98546982e..ece7fb273f84 100644
--- a/graphics/gtksee/Makefile
+++ b/graphics/gtksee/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.linux.tucows.com/files/x11/graphics/ \
 
 MAINTAINER=	dirk@FreeBSD.org
 
-LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext-old \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff
diff --git a/graphics/libxine/Makefile b/graphics/libxine/Makefile
index 9c8a099b881b..85609723fb52 100644
--- a/graphics/libxine/Makefile
+++ b/graphics/libxine/Makefile
@@ -20,7 +20,7 @@ MAINTAINER=	nobutaka@FreeBSD.org
 BUILD_DEPENDS=	${LOCALBASE}/lib/libavcodec.a:${PORTSDIR}/graphics/ffmpeg
 LIB_DEPENDS=	a52.0:${PORTSDIR}/audio/liba52 \
 		aa.1:${PORTSDIR}/graphics/aalib \
-		intl.1:${PORTSDIR}/devel/gettext
+		intl.1:${PORTSDIR}/devel/gettext-old
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-lib-${PORTVERSION}
 
diff --git a/graphics/ogle-gui/Makefile b/graphics/ogle-gui/Makefile
index 1afa59c7347b..5db265eb6860 100644
--- a/graphics/ogle-gui/Makefile
+++ b/graphics/ogle-gui/Makefile
@@ -16,7 +16,7 @@ DISTNAME=	${PORTNAME}_gui-${PORTVERSION}
 MAINTAINER=	lioux@FreeBSD.org
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/ogle/libdvdcontrol.so.5:${PORTSDIR}/graphics/ogle
-LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext-old \
 		giconv.2:${PORTSDIR}/converters/libiconv \
 		glade.4:${PORTSDIR}/devel/libglade \
 		xml2.5:${PORTSDIR}/textproc/libxml2
diff --git a/graphics/ruby-tgif/Makefile b/graphics/ruby-tgif/Makefile
index 432ddb1de6b9..526840f5242d 100644
--- a/graphics/ruby-tgif/Makefile
+++ b/graphics/ruby-tgif/Makefile
@@ -17,7 +17,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	knu@FreeBSD.org
 
 BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/${TGIF_PORT}:build
-LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext-old
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
diff --git a/graphics/tgif-nls/Makefile b/graphics/tgif-nls/Makefile
index 747d0d7a5675..55834c00443e 100644
--- a/graphics/tgif-nls/Makefile
+++ b/graphics/tgif-nls/Makefile
@@ -16,8 +16,8 @@ PKGNAMESUFFIX=	-nls
 
 MAINTAINER=	one@netlab.is.tsukuba.ac.jp
 
-BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
-LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext-old
 RUN_DEPENDS=	giftopnm:${PORTSDIR}/graphics/netpbm
 
 USE_IMAKE=	yes
diff --git a/graphics/xine/Makefile b/graphics/xine/Makefile
index ae82b8c3406c..661cca2668e1 100644
--- a/graphics/xine/Makefile
+++ b/graphics/xine/Makefile
@@ -19,7 +19,7 @@ MAINTAINER=	nobutaka@FreeBSD.org
 LIB_DEPENDS=	xine.0:${PORTSDIR}/graphics/libxine \
 		aa.1:${PORTSDIR}/graphics/aalib \
 		png.5:${PORTSDIR}/graphics/png \
-		intl.1:${PORTSDIR}/devel/gettext
+		intl.1:${PORTSDIR}/devel/gettext-old
 
 USE_X_PREFIX=	yes
 USE_IMLIB=	yes
diff --git a/graphics/xmps-opendivx-plugin/Makefile b/graphics/xmps-opendivx-plugin/Makefile
index e04c1e7da828..18116c232039 100644
--- a/graphics/xmps-opendivx-plugin/Makefile
+++ b/graphics/xmps-opendivx-plugin/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	lioux@FreeBSD.org
 
 LIB_DEPENDS=	divxdecore.0:${PORTSDIR}/graphics/libdivxdecore \
 		xmps.0:${PORTSDIR}/graphics/xmps \
-		intl.1:${PORTSDIR}/devel/gettext
+		intl.1:${PORTSDIR}/devel/gettext-old
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-0.0.2
 USE_GMAKE=	yes
diff --git a/graphics/xmps-win32-plugin/Makefile b/graphics/xmps-win32-plugin/Makefile
index e8399daf87f8..6f7167f219c4 100644
--- a/graphics/xmps-win32-plugin/Makefile
+++ b/graphics/xmps-win32-plugin/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://xmps.sourceforge.net/sources/
 MAINTAINER=	lioux@FreeBSD.org
 
 LIB_DEPENDS=	xmps.0:${PORTSDIR}/graphics/xmps \
-		intl.1:${PORTSDIR}/devel/gettext
+		intl.1:${PORTSDIR}/devel/gettext-old
 RUN_DEPENDS=	${CODEC_DETECTION_FILE}:${CODEC_PORT}
 
 USE_GMAKE=	yes