From owner-svn-ports-all@freebsd.org  Fri Sep 25 11:50:48 2015
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 338DAA08D60;
 Fri, 25 Sep 2015 11:50:48 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::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 23E7A11AC;
 Fri, 25 Sep 2015 11:50:48 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8PBomtt007577;
 Fri, 25 Sep 2015 11:50:48 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8PBomX4007576;
 Fri, 25 Sep 2015 11:50:48 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201509251150.t8PBomX4007576@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 Sep 2015 11:50:47 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r397816 - head/science/liblinear
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: Fri, 25 Sep 2015 11:50:48 -0000

Author: amdmi3
Date: Fri Sep 25 11:50:47 2015
New Revision: 397816
URL: https://svnweb.freebsd.org/changeset/ports/397816

Log:
  - Switch to options helpers
  - Simplify DOCS handling
  
  Approved by:	portmgr blanket

Modified:
  head/science/liblinear/Makefile

Modified: head/science/liblinear/Makefile
==============================================================================
--- head/science/liblinear/Makefile	Fri Sep 25 11:50:39 2015	(r397815)
+++ head/science/liblinear/Makefile	Fri Sep 25 11:50:47 2015	(r397816)
@@ -13,36 +13,26 @@ COMMENT=	Library for Large Linear Classi
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-OPTIONS_DEFINE=	OPTIMIZED_CFLAGS DOCS
-OPTIONS_DEFAULT=OPTIMIZED_CFLAGS
-
 USES=		zip
 
-TXT_DOCS=	COPYRIGHT README
+PORTDOCS=	COPYRIGHT README
 
 PLIST_FILES=	bin/train bin/predict
 
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-PORTDOCS=	${TXT_DOCS}
-.endif
+OPTIONS_DEFINE=	OPTIMIZED_CFLAGS DOCS
+OPTIONS_DEFAULT=OPTIMIZED_CFLAGS
 
-.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 # same as LIBLINEAR itself
-CFLAGS=		-Wall -O3
-.endif
+OPTIMIZED_CFLAGS_CFLAGS=		-Wall -O3
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/train ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/predict ${STAGEDIR}${PREFIX}/bin
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	for f in ${TXT_DOCS}; do \
-	  ${INSTALL_DATA} ${WRKSRC}/$$f ${STAGEDIR}${DOCSDIR}; \
+	for f in ${PORTDOCS}; do \
+		${INSTALL_DATA} ${WRKSRC}/$$f ${STAGEDIR}${DOCSDIR}; \
 	done
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>