Index: head/cad/electric/Makefile
===================================================================
--- head/cad/electric/Makefile	(revision 404430)
+++ head/cad/electric/Makefile	(revision 404431)
@@ -1,58 +1,50 @@
 # Created by: Mario S F Ferreira <lioux@linf.unb.br> et al.
 # $FreeBSD$
 
 PORTNAME=	electric
 PORTVERSION=	7.0.0
 PORTREVISION=	4
 CATEGORIES=	cad
 MASTER_SITES=	GNU
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/^(...)\./\1/}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Sophisticated electrical CAD system
 
 GNU_CONFIGURE=	yes
 
-OPTIONS_DEFINE=	T1LIB NLS OPTIMIZED_CFLAGS
-OPTIONS_DEFAULT=	T1LIB
-T1LIB_DESC=	Use T1lib Type1 font library
-
 USES=		motif
 
-.include <bsd.port.options.mk>
+FEATURES=	MOTIF
 
-FEATURES+=	MOTIF
+OPTIONS_DEFINE=	T1LIB NLS OPTIMIZED_CFLAGS
+OPTIONS_DEFAULT=T1LIB
+T1LIB_DESC=	Use T1lib Type1 font library
 
-.if ${PORT_OPTIONS:MT1LIB}
-LIB_DEPENDS+=	libt1.so:${PORTSDIR}/devel/t1lib
-FEATURES+=	T1LIB
-.endif
+T1LIB_LIB_DEPENDS+=	libt1.so:${PORTSDIR}/devel/t1lib
+T1LIB_VARS=	FEATURES+=T1LIB
+NLS_USES=	gettext
+NLS_VARS=	FEATURES+=INT
+OPTIMIZED_CFLAGS_VARS= 	FEATURES+=OPT
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-FEATURES+=	INT
-.endif
-
-.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
-FEATURES+=	OPT
-.endif
+.include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share/electric/lib/|${DATADIR}/lib/|; \
 		s|/usr/share/electric/doc/|${DOCSDIR}/|; \
 		s|/usr/bin/|${LOCALBASE}/bin/|; \
 		s|${LOCALBASE}/bin/sort|${SORT}|' \
 		${WRKSRC}/src/include/config.h
 	@${REINPLACE_CMD} -e 's|/usr/share/electric/lib|${DATADIR}/lib|; \
 		s|/usr/share/electric/doc|${DOCSDIR}|; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|/usr/X11R6/|${LOCALBASE}/|' ${WRKSRC}/configure
 .for FEATURE in ${FEATURES}
 	@${REINPLACE_CMD} -e 's|#%%${FEATURE}%%||g' ${WRKSRC}/Makefile.in
 .endfor
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/electric
 
 .include <bsd.port.mk>