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

15 files changed, 15 insertions, 15 deletions

diff --git a/www/amyc/Makefile b/www/amyc/Makefile
index 75396bfbf813..bb1158675199 100644
--- a/www/amyc/Makefile
+++ b/www/amyc/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.crevola.com/about/current/
 
 MAINTAINER=	petef@FreeBSD.org
 
-LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext-old
 
 USE_AUTOCONF=	yes
 GNU_CONFIGURE=	yes
diff --git a/www/cadaver/Makefile b/www/cadaver/Makefile
index 2c1376b525f4..c16d30812d0d 100644
--- a/www/cadaver/Makefile
+++ b/www/cadaver/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.webdav.org/cadaver/
 MAINTAINER=	tarkhil@over.ru
 
 LIB_DEPENDS=	neon.18:${PORTSDIR}/www/neon \
-		intl.1:${PORTSDIR}/devel/gettext
+		intl.1:${PORTSDIR}/devel/gettext-old
 
 .ifndef NO_OPENSSL
 USE_OPENSSL=	yes
diff --git a/www/dillo-i18n/Makefile b/www/dillo-i18n/Makefile
index 6cffed93169e..6528ba27bd18 100644
--- a/www/dillo-i18n/Makefile
+++ b/www/dillo-i18n/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	greid@FreeBSD.org
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
-		intl.1:${PORTSDIR}/devel/gettext
+		intl.1:${PORTSDIR}/devel/gettext-old
 
 USE_GTK=	yes
 GNU_CONFIGURE=	yes
diff --git a/www/dillo/Makefile b/www/dillo/Makefile
index 6cffed93169e..6528ba27bd18 100644
--- a/www/dillo/Makefile
+++ b/www/dillo/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	greid@FreeBSD.org
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
-		intl.1:${PORTSDIR}/devel/gettext
+		intl.1:${PORTSDIR}/devel/gettext-old
 
 USE_GTK=	yes
 GNU_CONFIGURE=	yes
diff --git a/www/dillo2/Makefile b/www/dillo2/Makefile
index 6cffed93169e..6528ba27bd18 100644
--- a/www/dillo2/Makefile
+++ b/www/dillo2/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	greid@FreeBSD.org
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
-		intl.1:${PORTSDIR}/devel/gettext
+		intl.1:${PORTSDIR}/devel/gettext-old
 
 USE_GTK=	yes
 GNU_CONFIGURE=	yes
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index fc2eb24d7903..7a11b5af16b6 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	${X11BASE}/include/mozilla/gtkembedmoz/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers \
 		${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} \
-		msgfmt-new:${PORTSDIR}/devel/gettext-devel
+		msgfmt-new:${PORTSDIR}/devel/gettext
 LIB_DEPENDS=	giconv.2:${PORTSDIR}/converters/libiconv
 RUN_DEPENDS=	${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
 
diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile
index fc2eb24d7903..7a11b5af16b6 100644
--- a/www/galeon2/Makefile
+++ b/www/galeon2/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	${X11BASE}/include/mozilla/gtkembedmoz/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers \
 		${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} \
-		msgfmt-new:${PORTSDIR}/devel/gettext-devel
+		msgfmt-new:${PORTSDIR}/devel/gettext
 LIB_DEPENDS=	giconv.2:${PORTSDIR}/converters/libiconv
 RUN_DEPENDS=	${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
 
diff --git a/www/horde-devel/Makefile b/www/horde-devel/Makefile
index f676cc232938..f08f6b60ce9c 100644
--- a/www/horde-devel/Makefile
+++ b/www/horde-devel/Makefile
@@ -23,7 +23,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 #
 #-----------------------------------------------------------------------
 
-LIB_DEPENDS+=	intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS+=	intl.1:${PORTSDIR}/devel/gettext-old
 .if !defined(WITHOUT_MCAL)
 LIB_DEPENDS+=	mcal.0:${PORTSDIR}/misc/libmcal
 .endif
diff --git a/www/horde2/Makefile b/www/horde2/Makefile
index f676cc232938..f08f6b60ce9c 100644
--- a/www/horde2/Makefile
+++ b/www/horde2/Makefile
@@ -23,7 +23,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 #
 #-----------------------------------------------------------------------
 
-LIB_DEPENDS+=	intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS+=	intl.1:${PORTSDIR}/devel/gettext-old
 .if !defined(WITHOUT_MCAL)
 LIB_DEPENDS+=	mcal.0:${PORTSDIR}/misc/libmcal
 .endif
diff --git a/www/kdewebdev/Makefile b/www/kdewebdev/Makefile
index 1fe4c3dc71ad..98ad75a22a61 100644
--- a/www/kdewebdev/Makefile
+++ b/www/kdewebdev/Makefile
@@ -21,7 +21,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 
 MAINTAINER=	jeremy@external.org
 
-LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext-old
 
 WRKSRC=         ${WRKDIR}/${PORTNAME}
 
diff --git a/www/kdewebdev4/Makefile b/www/kdewebdev4/Makefile
index 1fe4c3dc71ad..98ad75a22a61 100644
--- a/www/kdewebdev4/Makefile
+++ b/www/kdewebdev4/Makefile
@@ -21,7 +21,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 
 MAINTAINER=	jeremy@external.org
 
-LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext-old
 
 WRKSRC=         ${WRKDIR}/${PORTNAME}
 
diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile
index 8560cc14d35c..7b1540589ed2 100644
--- a/www/lynx-current/Makefile
+++ b/www/lynx-current/Makefile
@@ -13,7 +13,7 @@ DISTNAME=       ${PORTNAME}2.8.5dev.7
 
 MAINTAINER=	ache@FreeBSD.org
 
-LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext-old
 
 WRKSRC=		${WRKDIR}/${PORTNAME}2-8-5
 USE_BZIP2=	yes
diff --git a/www/quanta/Makefile b/www/quanta/Makefile
index 1fe4c3dc71ad..98ad75a22a61 100644
--- a/www/quanta/Makefile
+++ b/www/quanta/Makefile
@@ -21,7 +21,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 
 MAINTAINER=	jeremy@external.org
 
-LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext-old
 
 WRKSRC=         ${WRKDIR}/${PORTNAME}
 
diff --git a/www/retawq/Makefile b/www/retawq/Makefile
index ba1e43c39618..4a19b4593a88 100644
--- a/www/retawq/Makefile
+++ b/www/retawq/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	intl:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	intl:${PORTSDIR}/devel/gettext-old
 
 CFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile
index f1a81efe0ac4..40c5cc749147 100644
--- a/www/sitecopy/Makefile
+++ b/www/sitecopy/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.lyra.org/sitecopy/
 
 MAINTAINER=	olgeni@FreeBSD.org
 
-LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext-old
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CC="${CC} -I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib -lintl"