Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 7 Feb 2016 14:07:15 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r408410 - head/math/calctool
Message-ID:  <201602071407.u17E7FRC085857@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602071407.u17E7FRC085857>