Index: head/lang/lafontaine/Makefile
===================================================================
--- head/lang/lafontaine/Makefile	(revision 319858)
+++ head/lang/lafontaine/Makefile	(revision 319859)
@@ -1,30 +1,32 @@
 # Created by: ijliao
 # $FreeBSD$
 
 PORTNAME=	lafontaine
 PORTVERSION=	0.4.1
 PORTREVISION=	8
 CATEGORIES=	lang
 MASTER_SITES=	http://www.nongnu.org/lafontaine/archives/
 DISTNAME=	${PORTNAME}_0.4-1
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical logo interpreter
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-0.4
 
 USES=        pathfix
 USE_GNOME=	gtk20
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_CSTD=	gnu89
 
-.if !defined(WITHOUT_NLS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
 .include <bsd.port.mk>
Index: head/lang/open-cobol/Makefile
===================================================================
--- head/lang/open-cobol/Makefile	(revision 319858)
+++ head/lang/open-cobol/Makefile	(revision 319859)
@@ -1,48 +1,45 @@
-# ex:ts=8
-# Ports collection makefile for:	open-cobol
-# Date created:			Aug 6, 2002
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	open-cobol
 PORTVERSION=	1.1
 CATEGORIES=	lang
 MASTER_SITES=	SF
 
 MAINTAINER=	gjb@FreeBSD.org
 COMMENT=	An open-source COBOL compiler
 
 LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp
 
 USE_BDB=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 
 INFO=		open-cobol
 
 CPPFLAGS+=	-I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-.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
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|__gmp_randinit|__gmpz_init|g ; \
 		 s|db-4.[0-9]|${BDB_LIB_NAME}|g' ${WRKSRC}/configure
 
 .if defined(MAINTAINER_MODE)
 test:	build
 	(cd ${WRKSRC}/tests;	\
 	./syntax;		\
 	./run)
 .endif
 
 .include <bsd.port.mk>