From owner-svn-ports-head@freebsd.org Wed Apr 12 09:56:37 2017 Return-Path: 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 3F0ADD3A6E5; Wed, 12 Apr 2017 09:56:37 +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 025A2EF9; Wed, 12 Apr 2017 09:56:36 +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 v3C9uade062221; Wed, 12 Apr 2017 09:56:36 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3C9ualE062220; Wed, 12 Apr 2017 09:56:36 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201704120956.v3C9ualE062220@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 12 Apr 2017 09:56:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r438344 - head/science/libsvm 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.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2017 09:56:37 -0000 Author: amdmi3 Date: Wed Apr 12 09:56:35 2017 New Revision: 438344 URL: https://svnweb.freebsd.org/changeset/ports/438344 Log: - Sort out options (for instance, OPTIMIZED_CFLAGS does not belong to python slave port) - Add NO_ARCH for libsvm-python - Switch to PORTDOCS - Switch to options helpers - Cosmetic fixes Modified: head/science/libsvm/Makefile Modified: head/science/libsvm/Makefile ============================================================================== --- head/science/libsvm/Makefile Wed Apr 12 09:54:11 2017 (r438343) +++ head/science/libsvm/Makefile Wed Apr 12 09:56:35 2017 (r438344) @@ -13,14 +13,13 @@ COMMENT= Library for Support Vector Mach LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYRIGHT -OPTIONS_DEFINE= OPTIMIZED_CFLAGS DOCS -OPTIONS_DEFAULT= OPTIMIZED_CFLAGS - USES= zip USE_LDCONFIG= yes ALL_TARGET= all lib +OPTIONS_DEFINE= DOCS + .if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX} == "-python" CATEGORIES+= python @@ -28,29 +27,22 @@ USES+= python MAKE_ARGS= PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR} -TXT_DOCS= README.python +PORTDOCS= README.python NO_BUILD= yes - +NO_ARCH= yes .else -TXT_DOCS= COPYRIGHT README FAQ.html README.tools +PORTDOCS= README FAQ.html README.tools TOOLS= tools/checkdata.py tools/easy.py tools/grid.py tools/subset.py SUB_FILES= pkg-message SUB_LIST= DATADIR=${DATADIR} -.endif - -.include - -.if ${PORT_OPTIONS:MDOCS} -PORTDOCS= ${TXT_DOCS} -.endif +OPTIONS_DEFINE+= OPTIMIZED_CFLAGS +OPTIONS_DEFAULT+= OPTIMIZED_CFLAGS -.if ${PORT_OPTIONS:MOCFLAGS} -# same as LIBSVM itself -CFLAGS= -Wall -Wconversion -O3 +OPTIMIZED_CFLAGS_CFLAGS= -Wall -Wconversion -O3 .endif post-patch: @@ -60,31 +52,28 @@ post-patch: @${CP} ${WRKSRC}/tools/README ${WRKSRC}/README.tools .endif -.if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX} == "-python" do-install: - ${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} +.if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX} == "-python" + @${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} ${INSTALL_DATA} ${WRKSRC}/python/svm.py ${STAGEDIR}${PYTHON_SITELIBDIR} ${INSTALL_DATA} ${WRKSRC}/python/svmutil.py ${STAGEDIR}${PYTHON_SITELIBDIR} .else - -do-install: ${INSTALL_PROGRAM} ${WRKSRC}/svm-train ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_PROGRAM} ${WRKSRC}/svm-predict ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_PROGRAM} ${WRKSRC}/svm-scale ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_DATA} ${WRKSRC}/svm.h ${STAGEDIR}${PREFIX}/include/ ${INSTALL_LIB} ${WRKSRC}/libsvm.so.2 ${STAGEDIR}${PREFIX}/lib/ ${LN} -sf libsvm.so.2 ${STAGEDIR}${PREFIX}/lib/libsvm.so - ${MKDIR} ${STAGEDIR}${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR} for f in ${TOOLS}; do \ - ${INSTALL_DATA} ${WRKSRC}/$$f ${STAGEDIR}${DATADIR}; \ + ${INSTALL_DATA} ${WRKSRC}/$$f ${STAGEDIR}${DATADIR}; \ done - .endif -post-install-DOCS-on: +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - for f in ${TXT_DOCS}; do \ - ${INSTALL_DATA} ${WRKSRC}/$$f ${STAGEDIR}${DOCSDIR}; \ - done +.for f in ${PORTDOCS} + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} +.endfor -.include +.include