From owner-svn-ports-head@freebsd.org  Fri Dec 25 15:00:51 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 110ACA51C6D;
 Fri, 25 Dec 2015 15:00:51 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D362A114A;
 Fri, 25 Dec 2015 15:00:50 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBPF0n7E022135;
 Fri, 25 Dec 2015 15:00:49 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBPF0nAB022134;
 Fri, 25 Dec 2015 15:00:49 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201512251500.tBPF0nAB022134@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Fri, 25 Dec 2015 15:00:49 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r404431 - head/cad/electric
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Dec 2015 15:00:51 -0000

Author: amdmi3
Date: Fri Dec 25 15:00:49 2015
New Revision: 404431
URL: https://svnweb.freebsd.org/changeset/ports/404431

Log:
  - Switch to options helpers

Modified:
  head/cad/electric/Makefile

Modified: head/cad/electric/Makefile
==============================================================================
--- head/cad/electric/Makefile	Fri Dec 25 15:00:32 2015	(r404430)
+++ head/cad/electric/Makefile	Fri Dec 25 15:00:49 2015	(r404431)
@@ -13,30 +13,22 @@ COMMENT=	Sophisticated electrical CAD sy
 
 GNU_CONFIGURE=	yes
 
+USES=		motif
+
+FEATURES=	MOTIF
+
 OPTIONS_DEFINE=	T1LIB NLS OPTIMIZED_CFLAGS
-OPTIONS_DEFAULT=	T1LIB
+OPTIONS_DEFAULT=T1LIB
 T1LIB_DESC=	Use T1lib Type1 font library
 
-USES=		motif
+T1LIB_LIB_DEPENDS+=	libt1.so:${PORTSDIR}/devel/t1lib
+T1LIB_VARS=	FEATURES+=T1LIB
+NLS_USES=	gettext
+NLS_VARS=	FEATURES+=INT
+OPTIMIZED_CFLAGS_VARS= 	FEATURES+=OPT
 
 .include <bsd.port.options.mk>
 
-FEATURES+=	MOTIF
-
-.if ${PORT_OPTIONS:MT1LIB}
-LIB_DEPENDS+=	libt1.so:${PORTSDIR}/devel/t1lib
-FEATURES+=	T1LIB
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-FEATURES+=	INT
-.endif
-
-.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
-FEATURES+=	OPT
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share/electric/lib/|${DATADIR}/lib/|; \
 		s|/usr/share/electric/doc/|${DOCSDIR}/|; \