From owner-svn-ports-head@freebsd.org Wed Sep 14 08:52:38 2016 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 48760BDA6CE; Wed, 14 Sep 2016 08:52:38 +0000 (UTC) (envelope-from mr@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 00FA8A2B; Wed, 14 Sep 2016 08:52:37 +0000 (UTC) (envelope-from mr@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8E8qbvE030132; Wed, 14 Sep 2016 08:52:37 GMT (envelope-from mr@FreeBSD.org) Received: (from mr@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8E8qbGp030130; Wed, 14 Sep 2016 08:52:37 GMT (envelope-from mr@FreeBSD.org) Message-Id: <201609140852.u8E8qbGp030130@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mr set sender to mr@FreeBSD.org using -f From: Michael Reifenberger Date: Wed, 14 Sep 2016 08:52:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r422118 - in head/comms/uhd: . files 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, 14 Sep 2016 08:52:38 -0000 Author: mr Date: Wed Sep 14 08:52:36 2016 New Revision: 422118 URL: https://svnweb.freebsd.org/changeset/ports/422118 Log: Some fixes for better ports compatibility suggested my Mathieu. Submitted by: mat@ Deleted: head/comms/uhd/files/patch-CMakeLists.txt Modified: head/comms/uhd/Makefile head/comms/uhd/pkg-plist Modified: head/comms/uhd/Makefile ============================================================================== --- head/comms/uhd/Makefile Wed Sep 14 07:28:07 2016 (r422117) +++ head/comms/uhd/Makefile Wed Sep 14 08:52:36 2016 (r422118) @@ -7,16 +7,13 @@ CATEGORIES= comms hamradio MASTER_SITES= http://files.ettus.com/binaries/images/ DISTFILES= ${IMAGE_FILE} DIST_SUBDIR= ${PORTNAME} -EXTRACT_ONLY= ${DISTFILES} MAINTAINER= mr@FreeBSD.org COMMENT= Ettus Research UHD driver framework USE_GITHUB= yes GH_ACCOUNT= EttusResearch -GH_TAGNAME= ${UHD_COMMIT} - -UHD_COMMIT= 32951af2f3e7b1ddb56486c9f15b2e1033605bd6 +GH_TAGNAME= 32951af2f3e7b1ddb56486c9f15b2e1033605bd6 CONFLICTS= usrp-[0-9]* @@ -27,26 +24,20 @@ BUILD_DEPENDS= ${LOCALBASE}/include/boos orcc:${PORTSDIR}/devel/orc \ ${PYTHON_PKGNAMEPREFIX}mako>0:${PORTSDIR}/textproc/py-mako -USES= compiler:c++0x cmake:outsource gmake pkgconfig dos2unix python:2.7 -COMPILER_FEATURES= libc++ +USES= compiler:c++0x cmake:outsource gmake pkgconfig dos2unix python:2.7 pathfix USE_LDCONFIG= yes CMAKE_SOURCE_PATH= ${WRKSRC}/host -MAKE_JOBS_UNSAFE= yes +#MAKE_JOBS_UNSAFE= yes CMAKE_ARGS+= -DPKG_LIB_DIR:STRING="share/uhd" -DUHD_TXRX_DEBUG_PRINTS="yes" # for excruciating debug use this -db #CMAKE_ARGS+= --debug-output --trace -DOCSDIR= share/doc/uhd IMAGE_FILE= uhd-images_003.009.005-release.zip .include -.if ${OSVERSION} < 800000 -IGNORE= needs libusb 1.0 -.endif - -.if ${PORT_OPTIONS:MDOCS} +.if ${PORT_OPTIONS:MDOXYGEN} BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen CMAKE_ARGS+= -DENABLE_DOXYGEN:STRING="ON" HAVEDOCS= YES Modified: head/comms/uhd/pkg-plist ============================================================================== --- head/comms/uhd/pkg-plist Wed Sep 14 07:28:07 2016 (r422117) +++ head/comms/uhd/pkg-plist Wed Sep 14 08:52:36 2016 (r422118) @@ -108,7 +108,6 @@ lib/cmake/uhd/UHDConfigVersion.cmake lib/libuhd.so lib/libuhd.so.003 lib/libuhd.so.003.009 -libdata/pkgconfig/uhd.pc %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/README.md %%PORTDOCS%%%%DOCSDIR%%/doxygen/html/Ettus_Logo.png