3 files changed, 18 insertions, 22 deletions

diff --git a/net-im/freetalk/Makefile b/net-im/freetalk/Makefile
index 740c537a9410..a6d9902fc07a 100644
--- a/net-im/freetalk/Makefile
+++ b/net-im/freetalk/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   freetalk
-# Date created:        19 June 2009
-# Whom:                Oleg Ginzburg  (olevole@olevole.ru)
-#
+# Created by: Oleg Ginzburg  (olevole@olevole.ru)
 # $FreeBSD$
-#
 
 PORTNAME=	freetalk
 PORTVERSION=	3.2
@@ -15,14 +11,15 @@ MASTER_SITES=	SAVANNAH/freetalk \
 MAINTAINER=	olevole@olevole.ru
 COMMENT=	GNU console based Jabber client
 
-OPTIONS_DEFINE=	BEEP
+OPTIONS_DEFINE=	BEEP NLS
 BEEP_DESC=	Use beep program
 
 LIB_DEPENDS=	loudmouth-1.0:${PORTSDIR}/net-im/loudmouth
 BUILD_DEPENDS=	guile>=1.8.6:${PORTSDIR}/lang/guile
 RUN_DEPENDS=	guile>=1.8.6:${PORTSDIR}/lang/guile
 
-USE_GNOME=	pkgconfig glib20
+USES=		pkgconfig
+USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
@@ -30,9 +27,9 @@ LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 MAN1=		freetalk.1
 INFO=		freetalk
 
-OPTIONS=	BEEP "Use beep program" off
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 PLIST_SUB+=     NLS=""
 USES+=		gettext
 CONFIGURE_ARGS= --with-libintl-prefix=${LOCALBASE}
@@ -41,8 +38,6 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=     NLS="@comment "
 .endif
 
-.include <bsd.port.options.mk>
-
 .if ${PORT_OPTIONS:MBEEP}
 RUN_DEPENDS+=	${LOCALBASE}/bin/beep:${PORTSDIR}/audio/beep
 .endif
diff --git a/net-im/licq/Makefile b/net-im/licq/Makefile
index 97275dfe7d86..91463b191f0b 100644
--- a/net-im/licq/Makefile
+++ b/net-im/licq/Makefile
@@ -30,7 +30,9 @@ CONFIGURE_ARGS+=--with-openssl-inc=${OPENSSLINC}
 CONFIGURE_ARGS+=--with-openssl-lib=${OPENSSLLIB}
 .endif
 
-.if defined(WITHOUT_NLS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
 CMAKE_ARGS+=	-DENABLE_NLS:BOOL=OFF
 PLIST_SUB+=	NLS="@comment "
 .else
diff --git a/net-im/pidgin-libnotify/Makefile b/net-im/pidgin-libnotify/Makefile
index bb72fc2497a5..94216ad3a9f8 100644
--- a/net-im/pidgin-libnotify/Makefile
+++ b/net-im/pidgin-libnotify/Makefile
@@ -1,9 +1,5 @@
-# Ports collection Makefile for:	pidgin-libnotify
-# Date created:				2007-07-10
-# Whom:					Meethune Bhowmick <meethune@gmail.com>
-#
+# Created by: Meethune Bhowmick <meethune@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	libnotify
 PORTVERSION=	0.14
@@ -24,14 +20,17 @@ LIB_DEPENDS=	notify.4:${PORTSDIR}/devel/libnotify \
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig gtk20
+USE_GNOME=	gtk20
+USES=		pkgconfig
 
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.else
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
 PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
 .endif
 
 CPPFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include