svn commit: r473209 - in head/misc/py-SoapySDR: . files

[Yuri Victorovich]

Author: yuri
Date: Sun Jun 24 19:01:23 2018
New Revision: 473209
URL: https://svnweb.freebsd.org/changeset/ports/473209

Log:
  misc/py-SoapySDR: Fix the problem that C library was built with the python binding
  
  Also add CATEGORIES=hamradio

Deleted:
  head/misc/py-SoapySDR/files/patch-CMakeLists.txt
Modified:
  head/misc/py-SoapySDR/Makefile
  head/misc/py-SoapySDR/files/patch-python3_CMakeLists.txt
  head/misc/py-SoapySDR/files/patch-python3_FindPython3Interp.cmake
  head/misc/py-SoapySDR/files/patch-python3_FindPython3Libs.cmake
  head/misc/py-SoapySDR/files/patch-python_CMakeLists.txt

Modified: head/misc/py-SoapySDR/Makefile
==============================================================================
--- head/misc/py-SoapySDR/Makefile	Sun Jun 24 18:28:00 2018	(r473208)
+++ head/misc/py-SoapySDR/Makefile	Sun Jun 24 19:01:23 2018	(r473209)
@@ -4,14 +4,14 @@ PORTNAME=	SoapySDR
 DISTVERSIONPREFIX=	soapy-sdr-
 DISTVERSION=	0.6.1-71
 DISTVERSIONSUFFIX=	-g69c16e9
-CATEGORIES=	misc python 
+CATEGORIES=	misc hamradio python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri at FreeBSD.org
 COMMENT=	Vendor and platform neutral SDR support library (python binding)
 
 LICENSE=	BSL
-LICENSE_FILE=	${WRKSRC}/LICENSE_1_0.txt
+LICENSE_FILE=	${WRKSRC}/../LICENSE_1_0.txt
 
 BROKEN_i386=	error: redefinition of 'swig::traits<unsigned int>', pending fix of https://github.com/pothosware/SoapySDR/issues/169
 
@@ -27,10 +27,9 @@ CMAKE_ARGS=	-DFREEBSD_PYTHON_VERSION:INTEGER=${PYTHON_
 		-DFREEBSD_PYTHON_VER2:STRING=${PYTHON_VER}
 CMAKE_OFF=	ENABLE_DOCS
 
+WRKSRC_SUBDIR=	python${PYTHON_VER:R:R:S/2//} # WARNING There are handcrafted paths in patches with '../' added to match this WRKSRC_SUBDIR for all python flavors
+
 PLIST_FILES=	${PYTHON_SITELIBDIR}/SoapySDR.py \
 		${PYTHON_SITELIBDIR}/_SoapySDR.so
-
-post-install: # Until fixed, just delete libs: https://github.com/pothosware/SoapySDR/issues/169
-	@cd ${STAGEDIR}${PREFIX} && ${RM} -r bin include lib/lib* libdata share
 
 .include <bsd.port.mk>

Modified: head/misc/py-SoapySDR/files/patch-python3_CMakeLists.txt
==============================================================================
--- head/misc/py-SoapySDR/files/patch-python3_CMakeLists.txt	Sun Jun 24 18:28:00 2018	(r473208)
+++ head/misc/py-SoapySDR/files/patch-python3_CMakeLists.txt	Sun Jun 24 19:01:23 2018	(r473209)
@@ -1,5 +1,5 @@
---- python3/CMakeLists.txt.orig	2018-05-13 06:02:48 UTC
-+++ python3/CMakeLists.txt
+--- ../python3/CMakeLists.txt.orig	2018-05-13 06:02:48 UTC
++++ ../python3/CMakeLists.txt
 @@ -55,7 +55,7 @@ endif()
  ########################################################################
  include(FeatureSummary)

Modified: head/misc/py-SoapySDR/files/patch-python3_FindPython3Interp.cmake
==============================================================================
--- head/misc/py-SoapySDR/files/patch-python3_FindPython3Interp.cmake	Sun Jun 24 18:28:00 2018	(r473208)
+++ head/misc/py-SoapySDR/files/patch-python3_FindPython3Interp.cmake	Sun Jun 24 19:01:23 2018	(r473209)
@@ -1,5 +1,5 @@
---- python3/FindPython3Interp.cmake.orig	2018-06-19 06:38:27 UTC
-+++ python3/FindPython3Interp.cmake
+--- ../python3/FindPython3Interp.cmake.orig	2018-06-19 06:38:27 UTC
++++ ../python3/FindPython3Interp.cmake
 @@ -39,7 +39,7 @@
  # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  

Modified: head/misc/py-SoapySDR/files/patch-python3_FindPython3Libs.cmake
==============================================================================
--- head/misc/py-SoapySDR/files/patch-python3_FindPython3Libs.cmake	Sun Jun 24 18:28:00 2018	(r473208)
+++ head/misc/py-SoapySDR/files/patch-python3_FindPython3Libs.cmake	Sun Jun 24 19:01:23 2018	(r473209)
@@ -1,5 +1,5 @@
---- python3/FindPython3Libs.cmake.orig	2018-06-19 06:36:21 UTC
-+++ python3/FindPython3Libs.cmake
+--- ../python3/FindPython3Libs.cmake.orig	2018-06-19 06:36:21 UTC
++++ ../python3/FindPython3Libs.cmake
 @@ -46,7 +46,7 @@ INCLUDE(CMakeFindFrameworks)
  # Search for the python framework on Apple.
  # CMAKE_FIND_FRAMEWORKS(Python)

Modified: head/misc/py-SoapySDR/files/patch-python_CMakeLists.txt
==============================================================================
--- head/misc/py-SoapySDR/files/patch-python_CMakeLists.txt	Sun Jun 24 18:28:00 2018	(r473208)
+++ head/misc/py-SoapySDR/files/patch-python_CMakeLists.txt	Sun Jun 24 19:01:23 2018	(r473209)
@@ -1,5 +1,5 @@
---- python/CMakeLists.txt.orig	2018-06-19 07:11:01 UTC
-+++ python/CMakeLists.txt
+--- ../python/CMakeLists.txt.orig	2018-06-19 07:11:01 UTC
++++ ../python/CMakeLists.txt
 @@ -121,7 +121,7 @@ set(CMAKE_SWIG_FLAGS ${CMAKE_SWIG_FLAGS}
  ########################################################################
  include(FeatureSummary)