18 files changed, 44 insertions, 45 deletions

diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 5847e358dcb7..03cc9132f985 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sylpheed-claws
 PORTVERSION=	0.9.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail news ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sylpheed-claws
@@ -19,12 +19,11 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	A lightweight and very featureful GTK+ based e-mail and news client
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 THEMEVERSION=	20031130
 THEMEFILE=	sylpheed-iconset-${THEMEVERSION}.tar.gz
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index 23297a91d203..2571f89b562f 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	elm
 PORTVERSION=	2.5.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.virginia.edu/pub/elm/ \
 		http://www.dragondata.com/software/
@@ -16,11 +16,11 @@ DISTNAME=	${PORTNAME}${PORTVERSION}
 MAINTAINER=	toasty@dragondata.com
 COMMENT=	A once-popular mail user agent, version 2.5.x
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
 BUILD_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
 
 WRKSRC=			${WRKDIR}/elm${PORTVERSION}
 NO_LATEST_LINK=		yes
+USE_GETTEXT=		yes
 IS_INTERACTIVE=		yes
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	Configure
diff --git a/mail/elmo-devel/Makefile b/mail/elmo-devel/Makefile
index 27ccf7b216cf..31806f23d190 100644
--- a/mail/elmo-devel/Makefile
+++ b/mail/elmo-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	elmo
 PORTVERSION=	0.8.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:sf/} \
 		${MASTER_SITE_SAVANNAH:S/$/:sav/}
@@ -18,8 +18,7 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:sf,sav
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Receive, filter, read, compose and send mail at the text console
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
-		intl.5:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
@@ -28,6 +27,7 @@ MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
 MAN1=		elmo.1 elmoconf.pl.1
 PLIST=		${WRKDIR}/pkg-plist
+USE_GETTEXT=	yes
 USE_PERL5=	yes
 
 pre-extract:
diff --git a/mail/elmo/Makefile b/mail/elmo/Makefile
index 27ccf7b216cf..31806f23d190 100644
--- a/mail/elmo/Makefile
+++ b/mail/elmo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	elmo
 PORTVERSION=	0.8.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:sf/} \
 		${MASTER_SITE_SAVANNAH:S/$/:sav/}
@@ -18,8 +18,7 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:sf,sav
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Receive, filter, read, compose and send mail at the text console
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
-		intl.5:${PORTSDIR}/devel/gettext-old
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
@@ -28,6 +27,7 @@ MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
 MAN1=		elmo.1 elmoconf.pl.1
 PLIST=		${WRKDIR}/pkg-plist
+USE_GETTEXT=	yes
 USE_PERL5=	yes
 
 pre-extract:
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index b362b2b56c71..b6c6de4895f3 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -11,6 +11,7 @@
 
 PORTNAME=	fetchmail
 PORTVERSION=	6.2.5
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://www.catb.org/~esr/%SUBDIR%/ \
 		ftp://ftp.ayamura.org/pub/%SUBDIR%/ \
@@ -21,11 +22,11 @@ MASTER_SITE_SUBDIR=	fetchmail
 MAINTAINER=	eik@FreeBSD.org
 COMMENT=	Batch mail retrieval utility for IMAP/POP2/POP3/APOP/KPOP/ETRN/ODMR
 
-LIB_DEPENDS=	intl:${PORTSDIR}/devel/gettext-old
 .if defined(WITH_X11)
 RUN_DEPENDS=	${LOCALBASE}/lib/${PYTHON_VERSION}/site-packages/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
 .endif
 
+USE_GETTEXT=	yes
 .if defined(WITH_X11)
 USE_PYTHON=	yes
 .endif
diff --git a/mail/filtermail/Makefile b/mail/filtermail/Makefile
index 14f2a4318cb8..32097b8f2775 100644
--- a/mail/filtermail/Makefile
+++ b/mail/filtermail/Makefile
@@ -10,6 +10,7 @@
 
 PORTNAME=	filtermail
 PORTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://home.in.tum.de/baueran/%SUBDIR%/
@@ -19,8 +20,6 @@ DISTNAME=	mailfilter-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Filter mail on a pop3 server: saves downloading spam
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 # This port is filtermail, but the author called it mailfilter. To avoid a
 #  clash with another port called mailfilter, we change all files
 #  installed by this port from the form *mailfilter* to the form
@@ -31,6 +30,7 @@ EXTRACT_AFTER_ARGS=	| ${SED} 's/[mM][aA][iI][lL][fF][iI][lL][tT][eE][rR]/filterm
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_GETOPT_LONG=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
 GNU_CONFIGURE=	yes
diff --git a/mail/kbiff/Makefile b/mail/kbiff/Makefile
index 328fe371a3a7..154a349b601e 100644
--- a/mail/kbiff/Makefile
+++ b/mail/kbiff/Makefile
@@ -7,17 +7,16 @@
 
 PORTNAME=	kbiff
 PORTVERSION=	3.6.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail kde
 MASTER_SITES=	http://devel-home.kde.org/~granroth/kbiff/
 
 MAINTAINER=	arved@FreeBSD.org
 COMMENT=	"Mail notification utility for KDE with nice features"
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=
 CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index d8dac1f1b0f1..2f2ea5f5bcd1 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -75,7 +75,7 @@
 
 PORTNAME=	mutt-devel
 PORTVERSION=	1.5.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES+=	mail ipv6
 .if defined(WITH_MUTT_NNTP)
 CATEGORIES+=	news
@@ -177,7 +177,7 @@ SGML_USED=	no
 .endif
 
 .if !defined(WITHOUT_NLS)
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
+USE_GETTEXT=	yes
 .endif
 
 .if defined(NOPORTDOCS)
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 27165c40e184..0e5a202c085f 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	mutt
 PORTVERSION=	1.4.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES+=	mail ipv6
 MASTER_SITES=	ftp://ftp.mutt.org/mutt/ \
 		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
@@ -42,7 +42,7 @@ WITH_SGML_DOCS?=yes
 .endif
 
 .if !defined(WITHOUT_NLS)
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
+USE_GETTEXT=	yes
 .endif
 .if defined(WITH_SLANG)
 LIB_DEPENDS+=	slang.1:${PORTSDIR}/devel/libslang
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index 27165c40e184..0e5a202c085f 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	mutt
 PORTVERSION=	1.4.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES+=	mail ipv6
 MASTER_SITES=	ftp://ftp.mutt.org/mutt/ \
 		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
@@ -42,7 +42,7 @@ WITH_SGML_DOCS?=yes
 .endif
 
 .if !defined(WITHOUT_NLS)
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
+USE_GETTEXT=	yes
 .endif
 .if defined(WITH_SLANG)
 LIB_DEPENDS+=	slang.1:${PORTSDIR}/devel/libslang
diff --git a/mail/perdition/Makefile b/mail/perdition/Makefile
index e816bda04cea..51258f35e3f1 100644
--- a/mail/perdition/Makefile
+++ b/mail/perdition/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	perdition
 PORTVERSION=	1.13
+PORTREVISION=	1
 CATEGORIES=	mail net security
 MASTER_SITES=	http://www.vergenet.net/linux/perdition/download/${PORTVERSION}/
 
 MAINTAINER=	clement@FreeBSD.org
 COMMENT=	A POP3 & IMAP4 proxy that can map users to multiple backend servers
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		popt.0:${PORTSDIR}/devel/popt \
+LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
 		vanessa_logger.0:${PORTSDIR}/devel/libvanessa_logger \
 		vanessa_socket.0:${PORTSDIR}/devel/libvanessa_socket \
 		vanessa_adt.0:${PORTSDIR}/devel/libvanessa_adt
@@ -24,6 +24,7 @@ MAN8=		perdition.8
 
 MANCOMPRESSED=	no
 
+USE_GETTEXT=	yes
 USE_LIBTOOL=	YES
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" BDB_LIB=db3
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/mail/spruce/Makefile b/mail/spruce/Makefile
index feea8e5249c4..26a0f5dab440 100644
--- a/mail/spruce/Makefile
+++ b/mail/spruce/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	spruce
 PORTVERSION=	0.6.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	erich@tacni.net
 COMMENT=	A simple GTK based email client
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile
index 5847e358dcb7..03cc9132f985 100644
--- a/mail/sylpheed-claws/Makefile
+++ b/mail/sylpheed-claws/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sylpheed-claws
 PORTVERSION=	0.9.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail news ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sylpheed-claws
@@ -19,12 +19,11 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	A lightweight and very featureful GTK+ based e-mail and news client
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old
-
 THEMEVERSION=	20031130
 THEMEFILE=	sylpheed-iconset-${THEMEVERSION}.tar.gz
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
diff --git a/mail/sylpheed-gtk2/Makefile b/mail/sylpheed-gtk2/Makefile
index e8d36cc90c74..0ef624477482 100644
--- a/mail/sylpheed-gtk2/Makefile
+++ b/mail/sylpheed-gtk2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		sylpheed-gtk2
 PORTVERSION=		0.9.8a.20040109
+PORTREVISION=		1
 CATEGORIES=		mail ipv6
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,9 +16,9 @@ DISTNAME=		sylpheed-${PORTVERSION:R}-gtk2-${PORTVERSION:E}
 MAINTAINER=		jylefort@brutele.be
 COMMENT=		The GTK+ 2.0 port of a lightweight, featureful and fast e-mail client
 
-LIB_DEPENDS=		intl.5:${PORTSDIR}/devel/gettext-old \
-			iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=		iconv.3:${PORTSDIR}/converters/libiconv
 
+USE_GETTEXT=		yes
 USE_GMAKE=		yes
 USE_X_PREFIX=		yes
 USE_GNOME=		gtk20
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index 85be3ec7348d..cca46179c230 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sylpheed
 PORTVERSION=	0.9.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://sylpheed.good-day.net/sylpheed/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -16,10 +16,10 @@ MASTER_SITE_SUBDIR=	sylpheed-claws
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	A lightweight, featureful, and fast GTK+ based e-mail client
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
diff --git a/mail/sylpheed2-devel/Makefile b/mail/sylpheed2-devel/Makefile
index 85be3ec7348d..cca46179c230 100644
--- a/mail/sylpheed2-devel/Makefile
+++ b/mail/sylpheed2-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sylpheed
 PORTVERSION=	0.9.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://sylpheed.good-day.net/sylpheed/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -16,10 +16,10 @@ MASTER_SITE_SUBDIR=	sylpheed-claws
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	A lightweight, featureful, and fast GTK+ based e-mail client
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
diff --git a/mail/sylpheed2/Makefile b/mail/sylpheed2/Makefile
index 85be3ec7348d..cca46179c230 100644
--- a/mail/sylpheed2/Makefile
+++ b/mail/sylpheed2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sylpheed
 PORTVERSION=	0.9.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://sylpheed.good-day.net/sylpheed/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -16,10 +16,10 @@ MASTER_SITE_SUBDIR=	sylpheed-claws
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	A lightweight, featureful, and fast GTK+ based e-mail client
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
diff --git a/mail/sylpheed3/Makefile b/mail/sylpheed3/Makefile
index 85be3ec7348d..cca46179c230 100644
--- a/mail/sylpheed3/Makefile
+++ b/mail/sylpheed3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sylpheed
 PORTVERSION=	0.9.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://sylpheed.good-day.net/sylpheed/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -16,10 +16,10 @@ MASTER_SITE_SUBDIR=	sylpheed-claws
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	A lightweight, featureful, and fast GTK+ based e-mail client
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext-old \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12