1 files changed, 24 insertions, 24 deletions
diff --git a/math/octave/pkg-plist b/math/octave/pkg-plist
index 9af2ea5fe737..c621696b464e 100644
--- a/math/octave/pkg-plist
+++ b/math/octave/pkg-plist
@@ -752,9 +752,9 @@ include/octave-%%OCTAVE_VERSION%%/octave/zfstream.h
 lib/octave/%%OCTAVE_VERSION%%/liboctave.so
 lib/octave/%%OCTAVE_VERSION%%/liboctave.so.7
 lib/octave/%%OCTAVE_VERSION%%/liboctave.so.7.0.0
-lib/octave/%%OCTAVE_VERSION%%/liboctgui.so
-lib/octave/%%OCTAVE_VERSION%%/liboctgui.so.5
-lib/octave/%%OCTAVE_VERSION%%/liboctgui.so.5.0.0
+%%QT5%%lib/octave/%%OCTAVE_VERSION%%/liboctgui.so
+%%QT5%%lib/octave/%%OCTAVE_VERSION%%/liboctgui.so.5
+%%QT5%%lib/octave/%%OCTAVE_VERSION%%/liboctgui.so.5.0.0
 lib/octave/%%OCTAVE_VERSION%%/liboctinterp.so
 lib/octave/%%OCTAVE_VERSION%%/liboctinterp.so.7
 lib/octave/%%OCTAVE_VERSION%%/liboctinterp.so.7.0.0
@@ -765,7 +765,7 @@ lib/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/__fltk_uigetfile__.oct
 lib/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/__glpk__.oct
 lib/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/__init_fltk__.oct
 lib/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/__init_gnuplot__.oct
-lib/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/__init_qt__.oct
+%%QT5%%lib/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/__init_qt__.oct
 lib/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/__ode15__.oct
 lib/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/__voronoi__.oct
 lib/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/amd.oct
@@ -783,8 +783,8 @@ lib/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/symbfact.oct
 lib/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/symrcm.oct
 libdata/pkgconfig/octave.pc
 libdata/pkgconfig/octinterp.pc
-libexec/octave/%%OCTAVE_VERSION%%/exec/%%GNU_HOST%%/octave-gui
-libexec/octave/%%OCTAVE_VERSION%%/exec/%%GNU_HOST%%/octave-svgconvert
+%%QT5%%libexec/octave/%%OCTAVE_VERSION%%/exec/%%GNU_HOST%%/octave-gui
+%%QT5%%libexec/octave/%%OCTAVE_VERSION%%/exec/%%GNU_HOST%%/octave-svgconvert
 %%PORTDOCS%%man/man1/mkoctfile.1.gz
 %%PORTDOCS%%man/man1/octave-cli.1.gz
 %%PORTDOCS%%man/man1/octave-config.1.gz
@@ -812,7 +812,7 @@ share/metainfo/org.octave.Octave.appdata.xml
 %%DATADIR%%/%%OCTAVE_VERSION%%/etc/CITATION
 %%DATADIR%%/%%OCTAVE_VERSION%%/etc/NEWS
 %%DATADIR%%/%%OCTAVE_VERSION%%/etc/built-in-docstrings
-%%DATADIR%%/%%OCTAVE_VERSION%%/etc/default-qt-settings
+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/etc/default-qt-settings
 %%DATADIR%%/%%OCTAVE_VERSION%%/etc/doc-cache
 %%DATADIR%%/%%OCTAVE_VERSION%%/etc/macros.texi
 %%DATADIR%%/%%OCTAVE_VERSION%%/etc/profiler/flat.html
@@ -1268,22 +1268,22 @@ share/metainfo/org.octave.Octave.appdata.xml
 %%DATADIR%%/%%OCTAVE_VERSION%%/imagelib/octave-logo.ico
 %%DATADIR%%/%%OCTAVE_VERSION%%/imagelib/octave-logo.svg
 %%DATADIR%%/%%OCTAVE_VERSION%%/imagelib/octave-sombrero.png
-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/be_BY.qm
-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/ca_ES.qm
-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/de_DE.qm
-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/en_US.qm
-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/es_ES.qm
-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/eu_ES.qm
-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/fr_FR.qm
-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/it_IT.qm
-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/ja_JP.qm
-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/lt_LT.qm
-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/nl_NL.qm
-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/pt_BR.qm
-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/pt_PT.qm
-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/ru_RU.qm
-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/uk_UA.qm
-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/zh_CN.qm
+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/be_BY.qm
+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/ca_ES.qm
+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/de_DE.qm
+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/en_US.qm
+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/es_ES.qm
+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/eu_ES.qm
+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/fr_FR.qm
+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/it_IT.qm
+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/ja_JP.qm
+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/lt_LT.qm
+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/nl_NL.qm
+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/pt_BR.qm
+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/pt_PT.qm
+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/ru_RU.qm
+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/uk_UA.qm
+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/zh_CN.qm
 %%DATADIR%%/%%OCTAVE_VERSION%%/m/+containers/Map.m
 %%DATADIR%%/%%OCTAVE_VERSION%%/m/+matlab/+lang/makeUniqueStrings.m
 %%DATADIR%%/%%OCTAVE_VERSION%%/m/+matlab/+lang/makeValidName.m
@@ -1577,7 +1577,7 @@ share/metainfo/org.octave.Octave.appdata.xml
 %%DATADIR%%/%%OCTAVE_VERSION%%/m/java/javaclasspath.m
 %%DATADIR%%/%%OCTAVE_VERSION%%/m/java/javamem.m
 %%DATADIR%%/%%OCTAVE_VERSION%%/m/java/javarmpath.m
-%%DATADIR%%/%%OCTAVE_VERSION%%/m/java/octave.jar
+%%JAVA%%%%DATADIR%%/%%OCTAVE_VERSION%%/m/java/octave.jar
 %%DATADIR%%/%%OCTAVE_VERSION%%/m/java/usejava.m
 %%DATADIR%%/%%OCTAVE_VERSION%%/m/legacy/findstr.m
 %%DATADIR%%/%%OCTAVE_VERSION%%/m/legacy/flipdim.m