From owner-svn-ports-all@freebsd.org  Sun Feb  7 14:07:17 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 15590AA1B85;
 Sun,  7 Feb 2016 14:07:17 +0000 (UTC)
 (envelope-from marino@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 D6809155B;
 Sun,  7 Feb 2016 14:07:16 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u17E7Fjf085858;
 Sun, 7 Feb 2016 14:07:15 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u17E7FRC085857;
 Sun, 7 Feb 2016 14:07:15 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201602071407.u17E7FRC085857@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: marino set sender to
 marino@FreeBSD.org using -f
From: John Marino <marino@FreeBSD.org>
Date: Sun, 7 Feb 2016 14:07:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r408410 - head/math/calctool
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Feb 2016 14:07:17 -0000

Author: marino
Date: Sun Feb  7 14:07:15 2016
New Revision: 408410
URL: https://svnweb.freebsd.org/changeset/ports/408410

Log:
  math/calctool: USES+= ncurses, link with ncurses, not curses
  
  Also use OPTIONS_SUB=yes.  More options framework could be used as well.

Modified:
  head/math/calctool/Makefile

Modified: head/math/calctool/Makefile
==============================================================================
--- head/math/calctool/Makefile	Sun Feb  7 13:44:26 2016	(r408409)
+++ head/math/calctool/Makefile	Sun Feb  7 14:07:15 2016	(r408410)
@@ -15,33 +15,26 @@ USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	X11 TTY XVIEW
 OPTIONS_DEFAULT=	X11 TTY
+OPTIONS_SUB=	yes
 X11_DESC=	Build X11 version of calctool
 TTY_DESC=	Build tty version of calctool
 XVIEW_DESC=	Build tty version of calctool
+TTY_USES=	ncurses
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MX11}
 USE_XORG=	x11
 BINARIES+=	xcalctool
-PLIST_SUB+=	X11=""
-.else
-PLIST_SUB+=	X11="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MTTY}
 BINARIES+=	tty_calctool
-PLIST_SUB+=	TTY=""
-.else
-PLIST_SUB+=	TTY="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MXVIEW}
 BINARIES+=	xv_calctool
 LIB_DEPENDS+=	libxview.so:${PORTSDIR}/x11-toolkits/xview
-PLIST_SUB+=	XVIEW=""
-.else
-PLIST_SUB+=	XVIEW="@comment "
 .endif
 
 .if ${ARCH} == "sparc64"
@@ -55,6 +48,7 @@ post-patch:
 				-e "s#%%LOCALBASE%%#${LOCALBASE}#g" \
 				-e "s#%%BINARIES%%#${BINARIES}#g" \
 				-e "s#%%DATADIR%%#${DATADIR}#g" \
+				-e 's|-ltermcap|$${LDFLAGS} -lncurses|g' \
 				${WRKSRC}/Makefile
 
 do-install: