From owner-svn-ports-head@FreeBSD.ORG Mon Aug 11 12:14:48 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 70C66E78 for ; Mon, 11 Aug 2014 12:14:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 524372DB5 for ; Mon, 11 Aug 2014 12:14:48 +0000 (UTC) Received: from tijl (uid 1230) (envelope-from tijl@FreeBSD.org) id 2bc4 by svn.freebsd.org (DragonFly Mail Agent v0.9+); Mon, 11 Aug 2014 12:14:48 +0000 From: Tijl Coosemans Date: Mon, 11 Aug 2014 12:14:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r364599 - in head/devel/libftdi: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53e8b3b8.2bc4.1e208ebe@svn.freebsd.org> X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 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: Mon, 11 Aug 2014 12:14:48 -0000 Author: tijl Date: Mon Aug 11 12:14:47 2014 New Revision: 364599 URL: http://svnweb.freebsd.org/changeset/ports/364599 QAT: https://qat.redports.org/buildarchive/r364599/ Log: - Add license info - Switch to cmake - Use option helpers - Provide python module compiled with optimisations Deleted: head/devel/libftdi/files/extra-patch-configure.in Modified: head/devel/libftdi/Makefile head/devel/libftdi/pkg-plist Modified: head/devel/libftdi/Makefile ============================================================================== --- head/devel/libftdi/Makefile Mon Aug 11 12:12:00 2014 (r364598) +++ head/devel/libftdi/Makefile Mon Aug 11 12:14:47 2014 (r364599) @@ -2,67 +2,49 @@ PORTNAME= libftdi PORTVERSION= 0.20 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= http://www.intra2net.com/en/developer/libftdi/download/ MAINTAINER= ports@FreeBSD.org COMMENT= Library (using libusb) to talk to FTDI chips -OPTIONS_DEFINE+= BOOST PYTHON -BOOST_DESC= Build with boost -PYTHON_DESC= Python bindings - -USES= pathfix pkgconfig libtool -USE_AUTOTOOLS= autoconf automake -GNU_CONFIGURE= yes -CFLAGS+= -I${LOCALBASE}/include -USE_LDCONFIG= yes -INSTALL_TARGET= install-strip - -BUILD_DEPENDS= ${LOCALBASE}/bin/autoreconf-2.69:${PORTSDIR}/devel/autoconf \ - ${LOCALBASE}/bin/automake-1.14:${PORTSDIR}/devel/automake \ - ${LOCALBASE}/bin/libtoolize:${PORTSDIR}/devel/libtool - -PORTDOCS= COPYING.LIB ChangeLog README - -.include - -.if ${PORT_OPTIONS:MBOOST} -PLIST_SUB+= BOOST="" -CONFIGURE_ARGS+= --with-boost -CXXFLAGS+= "-I${LOCALBASE}/include" -LIB_DEPENDS+= libboost_system.so:${PORTSDIR}/devel/boost-libs -.else -PLIST_SUB+= BOOST="@comment " -CONFIGURE_ARGS+= --without-boost -.endif -.if ${PORT_OPTIONS:MPYTHON} -PLIST_SUB+= PYTHON="" PYDISTUTILS_EGGINFO=${PYDISTUTILS_EGGINFO} -CONFIGURE_ARGS+= --enable-python-binding -CONFIGURE_ENV+= SWIG="${LOCALBASE}/bin/swig2.0" -BUILD_DEPENDS+= swig2.0:${PORTSDIR}/devel/swig20 -USE_PYTHON= yes -.else -PLIST_SUB+= PYTHON="@comment " -.endif +LICENSE= GPLv2 LGPL21 +LICENSE_COMB= multi +LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING.GPL +LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LIB + +USES= cmake pkgconfig +CMAKE_ARGS= -DDOCUMENTATION:BOOL=OFF +USE_LDCONFIG= yes + +OPTIONS_DEFINE= BOOST DOCS PYTHON +OPTIONS_DEFAULT=BOOST DOCS PYTHON +OPTIONS_SUB= yes + +BOOST_DESC= C++ bindings (requires Boost) +BOOST_LIB_DEPENDS= libboost_system.so:${PORTSDIR}/devel/boost-libs +BOOST_CMAKE_ON= -DFTDIPP:BOOL=ON +BOOST_CMAKE_OFF= -DFTDIPP:BOOL=OFF +BOOST_CXXFLAGS= -I${LOCALBASE}/include -EXTRA_PATCHES= ${FILESDIR}/extra-patch-configure.in - -OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT= DOCS +PYTHON_DESC= Python bindings +PYTHON_BUILD_DEPENDS= swig2.0:${PORTSDIR}/devel/swig20 +PYTHON_CMAKE_ON= -DPYTHON_BINDINGS:BOOL=ON +PYTHON_CMAKE_OFF= -DPYTHON_BINDINGS:BOOL=OFF +PYTHON_USES= python post-patch: - ${REINPLACE_CMD} -E -e \ - 's:\$$\(libdir\)/pkgconfig:${PREFIX}/libdata/pkgconfig:' \ - ${WRKSRC}/Makefile.am ${WRKSRC}/Makefile.in - -pre-configure: - cd ${WRKSRC} && ${AUTORECONF} --force --install - echo "done pre-conf" + @${REINPLACE_CMD} \ + -e '/SET.*LIB_SUFFIX/s/64/""/' \ + -e 's|lib$${LIB_SUFFIX}/pkgconfig|libdata/pkgconfig|' \ + ${WRKSRC}/CMakeLists.txt + @${REINPLACE_CMD} 's|SITEPACKAGE.*ABSOLUTE|SITEPACKAGE ${PYTHON_SITELIBDIR} ABSOLUTE|' \ + ${WRKSRC}/bindings/CMakeLists.txt post-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ + ${PYTHON_CMD} -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} + ${PYTHON_CMD} -O -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} + ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_ftdi.so .include Modified: head/devel/libftdi/pkg-plist ============================================================================== --- head/devel/libftdi/pkg-plist Mon Aug 11 12:12:00 2014 (r364598) +++ head/devel/libftdi/pkg-plist Mon Aug 11 12:14:47 2014 (r364599) @@ -1,19 +1,10 @@ -bin/baud_test -bin/bitbang -bin/bitbang2 -bin/bitbang_cbus -bin/bitbang_ft2232 -bin/find_all -%%BOOST%%bin/find_all_pp bin/libftdi-config -bin/serial_test -bin/simple include/ftdi.h %%BOOST%%include/ftdi.hpp %%PYTHON%%%%PYTHON_SITELIBDIR%%/_ftdi.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/ftdi.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/ftdi.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/%%PYDISTUTILS_EGGINFO%% +%%PYTHON%%%%PYTHON_SITELIBDIR%%/ftdi.pyo lib/libftdi.a lib/libftdi.so lib/libftdi.so.1