From 22dc05cfccdd4c0633b8415f79ba37d9087e73f6 Mon Sep 17 00:00:00 2001 From: rsadowski Date: Fri, 6 Dec 2019 10:44:20 +0000 Subject: [PATCH] Fix hidden dependency textproc/discount and cleanup Spotted by sthen@ Thanks! --- x11/kde-applications/cantor/Makefile | 15 +++---- x11/kde-applications/cantor/pkg/PLIST | 60 +++++++++++++-------------- 2 files changed, 38 insertions(+), 37 deletions(-) diff --git a/x11/kde-applications/cantor/Makefile b/x11/kde-applications/cantor/Makefile index 0e74796ca91..260a3f34bd8 100644 --- a/x11/kde-applications/cantor/Makefile +++ b/x11/kde-applications/cantor/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.10 2019/04/28 21:08:27 naddy Exp $ +# $OpenBSD: Makefile,v 1.11 2019/12/06 10:44:20 rsadowski Exp $ COMMENT = KDE mathematical applications DISTNAME = cantor-${VERSION} CATEGORIES = education math -REVISION = 2 +REVISION = 3 SHARED_LIBS += cantorlibs 51.0 # 17.08 @@ -19,7 +19,7 @@ WANTLIB += KF5XmlGui Qt5Concurrent Qt5Core Qt5DBus Qt5Gui Qt5Network WANTLIB += Qt5PrintSupport Qt5Widgets Qt5Xml Qt5XmlPatterns c # XXX should use MODPY_WANTLIB, but difficult with the mix of py2+py3 WANTLIB += cln m python2.7 python${MODPY_DEFAULT_VERSION_3}m qalculate spectre -WANTLIB += lib/R/lib/R lib/R/lib/Rblas lib/R/lib/Rlapack +WANTLIB += lib/R/lib/R lib/R/lib/Rblas lib/R/lib/Rlapack markdown WANTLIB += luajit-${MODLUA_DEFAULT_VERSION} KF5SyntaxHighlighting MODULES += fortran \ @@ -31,14 +31,14 @@ MODFORTRAN_COMPILER = gfortran COMPILER = base-clang ports-clang ports-gcc -MODPY_RUNDEP= No +MODPY_RUNDEP = No MODKDE5_DESKTOP_FILE = yes MODKDE5_ICON_CACHE = yes MODKDE5_TRANSLATIONS = yes MODKDE5_DOCS = yes -# XXXX MOR# XXXX MOREE -LIB_DEPENDS+= devel/kf5/kconfig \ + +LIB_DEPENDS += devel/kf5/kconfig \ devel/kf5/kcrash \ devel/kf5/kiconthemes \ devel/kf5/kjobwidgets \ @@ -48,14 +48,15 @@ LIB_DEPENDS+= devel/kf5/kconfig \ devel/kf5/kservice \ devel/kf5/ktexteditor \ devel/kf5/kxmlgui \ + devel/kf5/syntax-highlighting \ lang/luajit \ lang/python/${MODPY_DEFAULT_VERSION_2} \ lang/python/${MODPY_DEFAULT_VERSION_3} \ math/R \ math/libqalculate \ print/libspectre \ + textproc/discount \ x11/kde-applications/analitza \ - devel/kf5/syntax-highlighting \ x11/qt5/qtxmlpatterns TEST_IS_INTERACTIVE = X11 diff --git a/x11/kde-applications/cantor/pkg/PLIST b/x11/kde-applications/cantor/pkg/PLIST index 0aef049ab83..38b550d564c 100644 --- a/x11/kde-applications/cantor/pkg/PLIST +++ b/x11/kde-applications/cantor/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.5 2018/12/18 09:39:17 rsadowski Exp $ +@comment $OpenBSD: PLIST,v 1.6 2019/12/06 10:44:20 rsadowski Exp $ @conflict kde-l10n-* @pkgpath x11/kde4/cantor @bin bin/cantor @@ -25,40 +25,40 @@ include/cantor/session.h include/cantor/syntaxhelpobject.h include/cantor/textresult.h include/cantor/worksheetaccess.h -lib/libcantor_config.so -lib/libcantor_pythonbackend.so +@so lib/libcantor_config.so +@so lib/libcantor_pythonbackend.so @lib lib/libcantorlibs.so.${LIBcantorlibs_VERSION} lib/qt5/plugins/cantor/ lib/qt5/plugins/cantor/assistants/ -lib/qt5/plugins/cantor/assistants/cantor_advancedplotassistant.so -lib/qt5/plugins/cantor/assistants/cantor_creatematrixassistant.so -lib/qt5/plugins/cantor/assistants/cantor_differentiateassistant.so -lib/qt5/plugins/cantor/assistants/cantor_eigenvaluesassistant.so -lib/qt5/plugins/cantor/assistants/cantor_eigenvectorsassistant.so -lib/qt5/plugins/cantor/assistants/cantor_importpackageassistant.so -lib/qt5/plugins/cantor/assistants/cantor_integrateassistant.so -lib/qt5/plugins/cantor/assistants/cantor_invertmatrixassistant.so -lib/qt5/plugins/cantor/assistants/cantor_plot2dassistant.so -lib/qt5/plugins/cantor/assistants/cantor_plot3dassistant.so -lib/qt5/plugins/cantor/assistants/cantor_qalculateplotassistant.so -lib/qt5/plugins/cantor/assistants/cantor_runscriptassistant.so -lib/qt5/plugins/cantor/assistants/cantor_solveassistant.so +@so lib/qt5/plugins/cantor/assistants/cantor_advancedplotassistant.so +@so lib/qt5/plugins/cantor/assistants/cantor_creatematrixassistant.so +@so lib/qt5/plugins/cantor/assistants/cantor_differentiateassistant.so +@so lib/qt5/plugins/cantor/assistants/cantor_eigenvaluesassistant.so +@so lib/qt5/plugins/cantor/assistants/cantor_eigenvectorsassistant.so +@so lib/qt5/plugins/cantor/assistants/cantor_importpackageassistant.so +@so lib/qt5/plugins/cantor/assistants/cantor_integrateassistant.so +@so lib/qt5/plugins/cantor/assistants/cantor_invertmatrixassistant.so +@so lib/qt5/plugins/cantor/assistants/cantor_plot2dassistant.so +@so lib/qt5/plugins/cantor/assistants/cantor_plot3dassistant.so +@so lib/qt5/plugins/cantor/assistants/cantor_qalculateplotassistant.so +@so lib/qt5/plugins/cantor/assistants/cantor_runscriptassistant.so +@so lib/qt5/plugins/cantor/assistants/cantor_solveassistant.so lib/qt5/plugins/cantor/backends/ -lib/qt5/plugins/cantor/backends/cantor_kalgebrabackend.so -lib/qt5/plugins/cantor/backends/cantor_luabackend.so -lib/qt5/plugins/cantor/backends/cantor_maximabackend.so -lib/qt5/plugins/cantor/backends/cantor_nullbackend.so -lib/qt5/plugins/cantor/backends/cantor_octavebackend.so -lib/qt5/plugins/cantor/backends/cantor_python2backend.so -lib/qt5/plugins/cantor/backends/cantor_python3backend.so -lib/qt5/plugins/cantor/backends/cantor_qalculatebackend.so -lib/qt5/plugins/cantor/backends/cantor_rbackend.so -lib/qt5/plugins/cantor/backends/cantor_sagebackend.so -lib/qt5/plugins/cantor/backends/cantor_scilabbackend.so +@so lib/qt5/plugins/cantor/backends/cantor_kalgebrabackend.so +@so lib/qt5/plugins/cantor/backends/cantor_luabackend.so +@so lib/qt5/plugins/cantor/backends/cantor_maximabackend.so +@so lib/qt5/plugins/cantor/backends/cantor_nullbackend.so +@so lib/qt5/plugins/cantor/backends/cantor_octavebackend.so +@so lib/qt5/plugins/cantor/backends/cantor_python2backend.so +@so lib/qt5/plugins/cantor/backends/cantor_python3backend.so +@so lib/qt5/plugins/cantor/backends/cantor_qalculatebackend.so +@so lib/qt5/plugins/cantor/backends/cantor_rbackend.so +@so lib/qt5/plugins/cantor/backends/cantor_sagebackend.so +@so lib/qt5/plugins/cantor/backends/cantor_scilabbackend.so lib/qt5/plugins/cantor/panels/ -lib/qt5/plugins/cantor/panels/cantor_helppanelplugin.so -lib/qt5/plugins/cantor/panels/cantor_variablemanagerplugin.so -lib/qt5/plugins/libcantorpart.so +@so lib/qt5/plugins/cantor/panels/cantor_helppanelplugin.so +@so lib/qt5/plugins/cantor/panels/cantor_variablemanagerplugin.so +@so lib/qt5/plugins/libcantorpart.so share/applications/org.kde.cantor.desktop share/cantor/ share/cantor/maximabackend/