diff -ur comms/limesuite.old/Makefile comms/limesuite/Makefile --- comms/limesuite.old/Makefile 2021-01-07 13:02:18.868273000 +0100 +++ comms/limesuite/Makefile 2021-01-08 07:02:34.794815000 +0100 @@ -3,7 +3,7 @@ PORTNAME= limesuite DISTVERSIONPREFIX= v DISTVERSION= 20.10.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= comms astro hamradio MAINTAINER= tomek@cedro.info @@ -74,11 +74,10 @@ .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} +OCTAVE_OCT_SITE_DIR= (octave-config --oct-site-dir) +OCTAVE_M_SITE_DIR= (octave-config --m-site-dir) +PLIST_SUB+= OCTAVE_OCT_SITE_DIR=${OCTAVE_OCT_SITE_DIR:sh} +PLIST_SUB+= OCTAVE_M_SITE_DIR=${OCTAVE_M_SITE_DIR:sh} .endif .if ${PORT_OPTIONS:MDEBUG} diff -ur comms/limesuite.old/pkg-plist comms/limesuite/pkg-plist --- comms/limesuite.old/pkg-plist 2021-01-07 13:02:18.869574000 +0100 +++ comms/limesuite/pkg-plist 2021-01-08 06:03:09.721720000 +0100 @@ -48,8 +48,8 @@ %%GUI%%share/pixmaps/lime-suite-48.png %%GUI%%share/pixmaps/lime-suite-64.png %%QUICKTEST%%bin/LimeQuickTest -%%OCTAVE%%%%OCTAVE_OCT_SITE_DIR%%LimeSuite.oct -%%OCTAVE%%%%OCTAVE_M_SITE_DIR%%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