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, 10 insertions, 10 deletions

diff --git a/editors/calligra-l10n/Makefile b/editors/calligra-l10n/Makefile
index 885b09c87a1e..7d24616e6f21 100644
--- a/editors/calligra-l10n/Makefile
+++ b/editors/calligra-l10n/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?=	sahiro@crest.ocn.ne.jp
 
 BUILD_DEPENDS=	autoconf213:${PORTSDIR}/devel/autoconf213 \
 		automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext-old
 RUN_DEPENDS=	koshell:${PORTSDIR}/editors/koffice
 
 USE_KDELIBS_VER=2
diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile
index 5eaa36b3fd6a..c3c7f1b52f68 100644
--- a/editors/cooledit/Makefile
+++ b/editors/cooledit/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	apps/editors/X/cooledit
 
 MAINTAINER=	brett@peloton.runet.edu
 
-LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext-old \
 		vga.1:${PORTSDIR}/graphics/svgalib
 
 USE_LIBTOOL=	yes
diff --git a/editors/koffice-i18n/Makefile b/editors/koffice-i18n/Makefile
index 885b09c87a1e..7d24616e6f21 100644
--- a/editors/koffice-i18n/Makefile
+++ b/editors/koffice-i18n/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?=	sahiro@crest.ocn.ne.jp
 
 BUILD_DEPENDS=	autoconf213:${PORTSDIR}/devel/autoconf213 \
 		automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext-old
 RUN_DEPENDS=	koshell:${PORTSDIR}/editors/koffice
 
 USE_KDELIBS_VER=2
diff --git a/editors/koffice-kde4-l10n/Makefile b/editors/koffice-kde4-l10n/Makefile
index 885b09c87a1e..7d24616e6f21 100644
--- a/editors/koffice-kde4-l10n/Makefile
+++ b/editors/koffice-kde4-l10n/Makefile
@@ -16,7 +16,7 @@ MAINTAINER?=	sahiro@crest.ocn.ne.jp
 
 BUILD_DEPENDS=	autoconf213:${PORTSDIR}/devel/autoconf213 \
 		automake14:${PORTSDIR}/devel/automake14
-LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext-old
 RUN_DEPENDS=	koshell:${PORTSDIR}/editors/koffice
 
 USE_KDELIBS_VER=2
diff --git a/editors/lpe/Makefile b/editors/lpe/Makefile
index 0f28f86e9eba..48a2ee65c9db 100644
--- a/editors/lpe/Makefile
+++ b/editors/lpe/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ryan@sasknow.com
 
 LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang \
-		intl.1:${PORTSDIR}/devel/gettext
+		intl.1:${PORTSDIR}/devel/gettext-old
 
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
diff --git a/editors/nano/Makefile b/editors/nano/Makefile
index fc328eeb89ea..b3632258ccfa 100644
--- a/editors/nano/Makefile
+++ b/editors/nano/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	naddy@FreeBSD.org
 
-LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext-old
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
index ae55a97d4688..2e6cdb9eac3f 100644
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -17,7 +17,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
-LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext \
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext-old \
 		wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk-devel \
 		db3:${PORTSDIR}/databases/db3 \
 		giconv:${PORTSDIR}/converters/libiconv
diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile
index 0538968a0690..0cfea5ad8aae 100644
--- a/editors/xemacs-devel-mule/Makefile
+++ b/editors/xemacs-devel-mule/Makefile
@@ -29,7 +29,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		compface.1:${PORTSDIR}/mail/faces \
-		intl.1:${PORTSDIR}/devel/gettext \
+		intl.1:${PORTSDIR}/devel/gettext-old \
 		${LIB_INPUT_METHOD}
 
 XEMACS_MAJOR_VER?=	21
diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile
index f7d820b3f31e..bfa59d137e39 100644
--- a/editors/xemacs21-mule/Makefile
+++ b/editors/xemacs21-mule/Makefile
@@ -33,7 +33,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/xemacs-${XEMACS_VER}/lisp/x-win-xfree86.elc:${PORT
 RUN_DEPENDS=	${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.skk:${PORTSDIR}/editors/xemacs-mule-packages
 .endif
 LIB_DEPENDS=	compface.1:${PORTSDIR}/mail/faces \
-		intl.1:${PORTSDIR}/devel/gettext \
+		intl.1:${PORTSDIR}/devel/gettext-old \
 		${LIB_INPUT_METHOD}
 
 CONFIGURE_ARGS?=--with-x11 \
diff --git a/editors/yudit/Makefile b/editors/yudit/Makefile
index eefddef5230c..ed3de500f7b1 100644
--- a/editors/yudit/Makefile
+++ b/editors/yudit/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME}-2.5.4
 
 MAINTAINER=	jkoshy@freebsd.org
 
-BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext-old
 
 USE_XLIB=	YES
 CONFIGURE_ENV=	LC_ALL=