From owner-svn-ports-all@freebsd.org  Fri Jun 24 13:54:35 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 D53ADB73150;
 Fri, 24 Jun 2016 13:54:35 +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 950002422;
 Fri, 24 Jun 2016 13:54:35 +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 u5ODsYCT019903;
 Fri, 24 Jun 2016 13:54:34 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5ODsYfv019902;
 Fri, 24 Jun 2016 13:54:34 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201606241354.u5ODsYfv019902@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, 24 Jun 2016 13:54:34 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r417421 - head/math/oleo
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.22
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: Fri, 24 Jun 2016 13:54:35 -0000

Author: amdmi3
Date: Fri Jun 24 13:54:34 2016
New Revision: 417421
URL: https://svnweb.freebsd.org/changeset/ports/417421

Log:
  - Clarify LICENSE
  - Add LICENSE_FILE
  - Switch to USES=localbase
  - Switch to options helpers

Modified:
  head/math/oleo/Makefile

Modified: head/math/oleo/Makefile
==============================================================================
--- head/math/oleo/Makefile	Fri Jun 24 13:48:31 2016	(r417420)
+++ head/math/oleo/Makefile	Fri Jun 24 13:54:34 2016	(r417421)
@@ -10,40 +10,31 @@ MASTER_SITES=	GNU
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The GNU spreadsheet for X11 and terminals
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		bison perl5
+USES=		bison localbase perl5
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-x --without-xlt --without-SciPlot
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib -lintl
 MAKE_ENV+=	DESTDIR=${STAGEDIR}
 
 INFO=		oleo
 
 OPTIONS_DEFINE=	MOTIF NLS
+OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MMOTIF}
-LIB_DEPENDS+=	libplot.so:graphics/plotutils \
-		libXbae.so:x11-toolkits/xbae \
-		libXmHTML.so:x11-toolkits/xmhtml
-USES+=		motif
-CONFIGURE_ARGS+=	--with-motif
-.else
-USE_XORG=	xt ice sm
-CONFIGURE_ARGS+=	--without-motif
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB=	NLS="@comment "
-.endif
+MOTIF_LIB_DEPENDS=	libplot.so:graphics/plotutils \
+			libXbae.so:x11-toolkits/xbae \
+			libXmHTML.so:x11-toolkits/xmhtml
+MOTIF_USES=		motif
+MOTIF_CONFIGURE_WITH=	motif
+MOTIF_USE_OFF=		XORG=xt,ice,sm
+
+NLS_USES=		gettext
+NLS_LIBS=		-lintl
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES_OFF=		gettext-tools
 
 post-patch:
 	@${GREP} -lR "malloc\.h" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \