From owner-svn-ports-all@freebsd.org Mon Feb 8 16:35:31 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8410A538BCC; Mon, 8 Feb 2021 16:35:31 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DZBTb3KVXz4Ttt; Mon, 8 Feb 2021 16:35:31 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 64D561ADD4; Mon, 8 Feb 2021 16:35:31 +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 118GZVa1072563; Mon, 8 Feb 2021 16:35:31 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 118GZUAb072562; Mon, 8 Feb 2021 16:35:30 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <202102081635.118GZUAb072562@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 8 Feb 2021 16:35:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r564721 - head/devel/libftdi1 X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: head/devel/libftdi1 X-SVN-Commit-Revision: 564721 X-SVN-Commit-Repository: ports 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.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Feb 2021 16:35:31 -0000 Author: amdmi3 Date: Mon Feb 8 16:35:30 2021 New Revision: 564721 URL: https://svnweb.freebsd.org/changeset/ports/564721 Log: - Update MASTER_SITES to https - Switch to options helpers, CMAKE_BOOL, PORTEXAMPLES - Install examples into designated EXAMPLESDIR, instead of bin/ - Fix inability to enable PYTHON and DOCS at the same time PR: 252922 Submitted by: amdmi3 Approved by: maintainer timeout (bsam, 2 weeks) Modified: head/devel/libftdi1/Makefile head/devel/libftdi1/pkg-plist Modified: head/devel/libftdi1/Makefile ============================================================================== --- head/devel/libftdi1/Makefile Mon Feb 8 16:35:02 2021 (r564720) +++ head/devel/libftdi1/Makefile Mon Feb 8 16:35:30 2021 (r564721) @@ -2,9 +2,9 @@ PORTNAME= libftdi1 PORTVERSION= 1.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel -MASTER_SITES= http://www.intra2net.com/en/developer/libftdi/download/ +MASTER_SITES= https://www.intra2net.com/en/developer/libftdi/download/ MAINTAINER= bsam@FreeBSD.org COMMENT= Library (using libusb) to talk to FTDI chips @@ -21,6 +21,10 @@ LIB_DEPENDS= libconfuse.so:devel/libconfuse USES= cmake:insource compiler:c++11-lang gettext-runtime pkgconfig tar:bzip2 USE_LDCONFIG= yes +PORTDOCS= ChangeLog README +PORTEXAMPLES= baud_test bitbang bitbang2 bitbang_cbus bitbang_ft2232 \ + eeprom find_all serial_test simple stream_test + OPTIONS_DEFINE= PYTHON BOOST DOCS EXAMPLES OPTIONS_DEFAULT=PYTHON BOOST OPTIONS_SUB= yes @@ -28,53 +32,26 @@ OPTIONS_SUB= yes BOOST_DESC= Build with boost PYTHON_DESC= Build Python bindings -PORTDOCS= ChangeLog README +EXAMPLES_CMAKE_BOOL= EXAMPLES -.include +PYTHON_USES= python +PYTHON_CMAKE_BOOL= PYTHON_BINDINGS +PYTHON_BUILD_DEPENDS= swig:devel/swig -.if ${PORT_OPTIONS:MDOCS} -CMAKE_ARGS+= -DDOCUMENTATION:BOOL=true \ - -DPYTHON_BINDINGS:BOOL=false -.else -CMAKE_ARGS+= -DDOCUMENTATION:BOOL=false -.endif +BOOST_CMAKE_BOOL= FTDIPP +BOOST_LIB_DEPENDS= libboost_system.so:devel/boost-libs +BOOST_PORTEXAMPLES= find_all_pp -.if ${PORT_OPTIONS:MEXAMPLES} -CMAKE_ARGS+= -DEXAMPLES:BOOL=true -.else -CMAKE_ARGS+= -DEXAMPLES:BOOL=false -.endif +.include -.if ${PORT_OPTIONS:MPYTHON} -USES+= python -CMAKE_ARGS+= -DPYTHON_BINDINGS:BOOL=true \ - -DDOCUMENTATION:BOOL=false -BUILD_DEPENDS+= swig:devel/swig -.else -CMAKE_ARGS+= -DPYTHON_BINDINGS:BOOL=false -.endif - -.if ${PORT_OPTIONS:MBOOST} -CMAKE_ARGS+= -DFTDIPP:BOOL=true -LIB_DEPENDS+= libboost_system.so:devel/boost-libs -.else -CMAKE_ARGS+= -DFTDIPP:BOOL=false -.endif - -post-install: -.if ${PORT_OPTIONS:MEXAMPLES} -.for fname in baud_test bitbang bitbang2 bitbang_cbus bitbang_ft2232 eeprom find_all serial_test simple stream_test - ${INSTALL_PROGRAM} ${WRKSRC}/examples/${fname} ${STAGEDIR}${PREFIX}/bin/ftdi1_${fname}_example +post-install-EXAMPLES-on: + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} +.for fname in ${PORTEXAMPLES} + ${INSTALL_PROGRAM} ${WRKSRC}/examples/${fname} ${STAGEDIR}${EXAMPLESDIR}/ .endfor -.if ${PORT_OPTIONS:MBOOST} -.for fname in find_all_pp - ${INSTALL_PROGRAM} ${WRKSRC}/examples/${fname} ${STAGEDIR}${PREFIX}/bin/ftdi1_${fname}_example -.endfor -.endif -.endif -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${STAGEDIR}${DOCSDIR} + +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ -.endif .include Modified: head/devel/libftdi1/pkg-plist ============================================================================== --- head/devel/libftdi1/pkg-plist Mon Feb 8 16:35:02 2021 (r564720) +++ head/devel/libftdi1/pkg-plist Mon Feb 8 16:35:30 2021 (r564721) @@ -1,16 +1,5 @@ bin/ftdi_eeprom bin/libftdi1-config -%%EXAMPLES%%bin/ftdi1_baud_test_example -%%EXAMPLES%%bin/ftdi1_bitbang2_example -%%EXAMPLES%%bin/ftdi1_bitbang_cbus_example -%%EXAMPLES%%bin/ftdi1_bitbang_example -%%EXAMPLES%%bin/ftdi1_bitbang_ft2232_example -%%EXAMPLES%%bin/ftdi1_eeprom_example -%%EXAMPLES%%bin/ftdi1_find_all_example -%%EXAMPLES%%%%BOOST%%bin/ftdi1_find_all_pp_example -%%EXAMPLES%%bin/ftdi1_serial_test_example -%%EXAMPLES%%bin/ftdi1_simple_example -%%EXAMPLES%%bin/ftdi1_stream_test_example libdata/pkgconfig/libftdi1.pc libdata/pkgconfig/libftdipp1.pc lib/cmake/libftdi1/LibFTDI1Config.cmake