Date: Wed, 6 Jan 2021 18:32:15 +0000 (UTC) From: Diane Bruce <db@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r560544 - head/comms/limesuite Message-ID: <202101061832.106IWFgk046772@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: db Date: Wed Jan 6 18:32:15 2021 New Revision: 560544 URL: https://svnweb.freebsd.org/changeset/ports/560544 Log: fixes octave paths and adds debug that is enabled by default PR: ports/252350 Submitted by: pcc <pcc@gmx.net> Modified: head/comms/limesuite/Makefile head/comms/limesuite/pkg-plist (contents, props changed) Modified: head/comms/limesuite/Makefile ============================================================================== --- head/comms/limesuite/Makefile Wed Jan 6 16:54:18 2021 (r560543) +++ head/comms/limesuite/Makefile Wed Jan 6 18:32:15 2021 (r560544) @@ -3,6 +3,7 @@ PORTNAME= limesuite DISTVERSIONPREFIX= v DISTVERSION= 20.10.0 +PORTREVISION= 1 CATEGORIES= comms astro hamradio MAINTAINER= tomek@cedro.info @@ -34,8 +35,8 @@ CMAKE_ON= ENABLE_LIBRARY \ ENABLE_LIMERFE \ ENABLE_EVB7COM -OPTIONS_DEFINE= DOCS GUI QUICKTEST OCTAVE REMOTE SOAPYSDR -OPTIONS_DEFAULT= GUI QUICKTEST SOAPYSDR +OPTIONS_DEFINE= DOCS GUI QUICKTEST OCTAVE REMOTE SOAPYSDR DEBUG +OPTIONS_DEFAULT= GUI QUICKTEST SOAPYSDR DEBUG OPTIONS_UNSET= DOCS OPTIONS_SUB= yes QUICKTEST_DESC= Build QuickTest Self-Test suite @@ -55,7 +56,6 @@ QUICKTEST_LIB_DEPENDS= libfltk.so:x11-toolkits/fltk OCTAVE_CMAKE_BOOL= ENABLE_OCTAVE OCTAVE_BUILD_DEPENDS= octave:math/octave -PLIST_SUB+= OCTAVE_VERSION=${OCTAVE_VERSION} REMOTE_CMAKE_BOOL= ENABLE_REMOTE @@ -66,13 +66,25 @@ SOAPYSDR_LIB_DEPENDS= libSoapySDR.so:misc/soapysdr .if ${PORT_OPTIONS:MGUI} USES+= gl xorg -USE_XORG= x11 ice sm xcursor xext xfixes xinerama xft xrender -USE_GL= gl glu -USE_WX= 3.1 -WX_COMPS= wx:lib +USE_XORG+= x11 ice sm xcursor xext xfixes xinerama xft xrender +USE_GL+= gl glu +USE_WX+= 3.1 +WX_COMPS+= wx:lib LIB_DEPENDS+= libfontconfig.so:x11-fonts/fontconfig .endif +.if ${PORT_OPTIONS:MOCTAVE} +.include "${.CURDIR}/../../math/octave/Makefile.version" +OCTAVE_OCT_SITE_DIR= "lib/octave/${OCTAVE_VERSION}/site/oct/${CONFIGURE_TARGET}/" +PLIST_SUB+= OCTAVE_OCT_SITE_DIR=${OCTAVE_OCT_SITE_DIR} +OCTAVE_M_SITE_DIR= "share/octave/${OCTAVE_VERSION}/site/m/" +PLIST_SUB+= OCTAVE_M_SITE_DIR=${OCTAVE_M_SITE_DIR} +.endif + +.if ${PORT_OPTIONS:MDEBUG} +WITH_DEBUG= yes +.endif + post-build: # N.B. COPYTREE_BIN here chmods 555 which breaks CMAKE_INSTALL in user mode! (cd ${BUILD_WRKSRC}/bin && ${COPYTREE_BIN} . ${STAGEDIR}${PREFIX}/bin) @@ -89,5 +101,4 @@ post-build: (cd ${WRKSRC}/Desktop && ${CP} lime-suite.desktop ${STAGEDIR}${PREFIX}/share/applications/) .endif -.include "../../math/octave/Makefile.version" .include <bsd.port.post.mk> Modified: head/comms/limesuite/pkg-plist ============================================================================== --- head/comms/limesuite/pkg-plist Wed Jan 6 16:54:18 2021 (r560543) +++ head/comms/limesuite/pkg-plist Wed Jan 6 18:32:15 2021 (r560544) @@ -48,8 +48,8 @@ libdata/pkgconfig/LimeSuite.pc %%GUI%%share/pixmaps/lime-suite-48.png %%GUI%%share/pixmaps/lime-suite-64.png %%QUICKTEST%%bin/LimeQuickTest -%%OCTAVE%%lib/octave/%%OCTAVE_VERSION%%/site/oct/%%CONFIGURE_TARGET%%/LimeSuite.oct -%%OCTAVE%%share/octave/%%OCTAVE_VERSION%%/site/m/LoadLimeSuite.m +%%OCTAVE%%%%OCTAVE_OCT_SITE_DIR%%LimeSuite.oct +%%OCTAVE%%%%OCTAVE_M_SITE_DIR%%LoadLimeSuite.m %%PORTDOCS%%%%DOCSDIR%%/LMS_API_Documentation/_lime_suite_8h.html %%PORTDOCS%%%%DOCSDIR%%/LMS_API_Documentation/_lime_suite_8h.js %%PORTDOCS%%%%DOCSDIR%%/LMS_API_Documentation/_lime_suite_8h_source.html
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101061832.106IWFgk046772>