diff --git a/textproc/pageedit/Makefile b/textproc/pageedit/Makefile index 3461a4484072..6c43041c049a 100644 --- a/textproc/pageedit/Makefile +++ b/textproc/pageedit/Makefile @@ -1,37 +1,22 @@ PORTNAME= pageedit -DISTVERSION= 1.9.20 +DISTVERSION= 2.7.6 CATEGORIES= textproc -PKGNAMESUFFIX= -${FLAVOR} MAINTAINER= FreeBSD@Shaneware.biz COMMENT= WYSIWYG visual XHTML editor WWW= https://github.com/Sigil-Ebook/PageEdit LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING.txt -FLAVORS= qt6 qt5 -FLAVOR?= qt6 -qt5_CONFLICTS_INSTALL= pageedit-qt6 -qt6_CONFLICTS_INSTALL= pageedit-qt5 - -USES= cmake qt:${FLAVOR:S/qt//} ${_USES_${FLAVOR}} desktop-file-utils +USES= cmake compiler:c++17-lang desktop-file-utils gl qt:6 USE_GITHUB= yes GH_ACCOUNT= Sigil-Ebook GH_PROJECT= PageEdit -USE_QT= ${_USE_QT_${FLAVOR}} -USE_GL= ${_USE_GL_${FLAVOR}} -CMAKE_ARGS= ${_CMAKE_ARGS_${FLAVOR}} +USE_GL= opengl +USE_QT= base declarative positioning svg translations webchannel \ + webengine -_CMAKE_ARGS_qt6= -DUSE_QT6:BOOL=TRUE -_USES_qt6= gl -_USE_GL_qt6= gl opengl -_USE_QT_qt6= 5compat base webengine translations declarative webchannel positioning -_USE_QT_qt5= concurrent core declarative gui location network \ - printsupport webchannel webengine widgets xml \ - buildtools:build linguisttools:build qmake:build -_PLIST_QT5_qt5= -_PLIST_QT5_qt6= "@comment " -PLIST_SUB= QT5_ONLY=${_PLIST_QT5_${FLAVOR}} +CONFLICTS_INSTALL= dooble .include diff --git a/textproc/pageedit/distinfo b/textproc/pageedit/distinfo index b63b23ae71c7..dd50d681e59a 100644 --- a/textproc/pageedit/distinfo +++ b/textproc/pageedit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691937741 -SHA256 (Sigil-Ebook-PageEdit-1.9.20_GH0.tar.gz) = 87c9adf784fab7e03f1cb3368fda8d817fd918de90ea7ea7ebe115f365fabb6c -SIZE (Sigil-Ebook-PageEdit-1.9.20_GH0.tar.gz) = 8471592 +TIMESTAMP = 1784535544 +SHA256 (Sigil-Ebook-PageEdit-2.7.6_GH0.tar.gz) = 44665e4e758559314687fa4535e0767fed4b1c7db2fe8f49e3492fecf37bb243 +SIZE (Sigil-Ebook-PageEdit-2.7.6_GH0.tar.gz) = 7589779 diff --git a/textproc/pageedit/pkg-plist b/textproc/pageedit/pkg-plist index 9775352622ac..8f0a0483ecc4 100644 --- a/textproc/pageedit/pkg-plist +++ b/textproc/pageedit/pkg-plist @@ -1,33 +1,34 @@ bin/pageedit share/applications/pageedit.desktop share/icons/hicolor/128x128/apps/pageedit.png share/icons/hicolor/256x256/apps/pageedit.png share/icons/hicolor/32x32/apps/pageedit.png share/icons/hicolor/48x48/apps/pageedit.png share/icons/hicolor/scalable/apps/pageedit.svg +%%DATADIR%%/examples/clip_entries.ini +%%DATADIR%%/translations/pageedit_ar.qm +%%DATADIR%%/translations/pageedit_ca.qm %%DATADIR%%/translations/pageedit_cs.qm %%DATADIR%%/translations/pageedit_da_DK.qm %%DATADIR%%/translations/pageedit_de.qm %%DATADIR%%/translations/pageedit_en.qm %%DATADIR%%/translations/pageedit_es.qm +%%DATADIR%%/translations/pageedit_fi.qm %%DATADIR%%/translations/pageedit_fr.qm %%DATADIR%%/translations/pageedit_hu_HU.qm %%DATADIR%%/translations/pageedit_it.qm %%DATADIR%%/translations/pageedit_ja.qm %%DATADIR%%/translations/pageedit_ko.qm %%DATADIR%%/translations/pageedit_nl.qm %%DATADIR%%/translations/pageedit_pl.qm %%DATADIR%%/translations/pageedit_pt_BR.qm %%DATADIR%%/translations/pageedit_ru.qm %%DATADIR%%/translations/pageedit_sr.qm -%%DATADIR%%/translations/pageedit_sv.qm %%DATADIR%%/translations/pageedit_tr.qm -%%DATADIR%%/translations/pageedit_uk_UA.qm +%%DATADIR%%/translations/pageedit_uk.qm %%DATADIR%%/translations/pageedit_zh_CN.qm -%%DATADIR%%/translations/pageedit_zh_TW.qm -@dir %%QT_DATADIR%%/qtwebengine_dictionaries -%%QT5_ONLY%%%%QT_DATADIR%%/qtwebengine_dictionaries/de_DE.bdic -%%QT5_ONLY%%%%QT_DATADIR%%/qtwebengine_dictionaries/en_GB.bdic -%%QT5_ONLY%%%%QT_DATADIR%%/qtwebengine_dictionaries/en_US.bdic -%%QT5_ONLY%%%%QT_DATADIR%%/qtwebengine_dictionaries/es.bdic -%%QT5_ONLY%%%%QT_DATADIR%%/qtwebengine_dictionaries/fr.bdic +%%QT_DATADIR%%/qtwebengine_dictionaries/de_DE.bdic +%%QT_DATADIR%%/qtwebengine_dictionaries/en_GB.bdic +%%QT_DATADIR%%/qtwebengine_dictionaries/en_US.bdic +%%QT_DATADIR%%/qtwebengine_dictionaries/es.bdic +%%QT_DATADIR%%/qtwebengine_dictionaries/fr.bdic diff --git a/www/dooble/Makefile b/www/dooble/Makefile index 1290ee9027bd..9ea3431f57b2 100644 --- a/www/dooble/Makefile +++ b/www/dooble/Makefile @@ -1,47 +1,49 @@ PORTNAME= dooble DISTVERSION= 2026.05.15 CATEGORIES= www MAINTAINER= eric@camachat.org COMMENT= Dooble Web Browser WWW= https://textbrowser.github.io/dooble/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE USES= compiler:c++17-lang desktop-file-utils gl gmake qmake qt:6 ssl \ tar xorg USE_GITHUB= yes GH_ACCOUNT= textbrowser GH_TUPLE= textbrowser:dooble-dictionaries:0f1e715:dictionaries #textbrowser:dooble:${DISTVERSION}:DEFAULT USE_GL= opengl USE_QT= base charts declarative positioning sqldriver-sqlite:run \ webchannel webengine USE_XORG= xcb QMAKE_ENV+= DOOBLE_DICTIONARIES_DIRECTORY=${WRKSRC_dictionaries}/Dictionaries QMAKE_SOURCE_PATH= dooble.pro CXXFLAGS+= -Wno-c++26-extensions +CONFLICTS_INSTALL= pageedit + QTWEBENGINE_DICTIONARIES= ${QT_DATADIR}/qtwebengine_dictionaries PLIST_SUB= QTWEBENGINE_DICTIONARIES=${QTWEBENGINE_DICTIONARIES} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/Dooble ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps \ ${STAGEDIR}${QTWEBENGINE_DICTIONARIES} ${INSTALL_DATA} ${WRKSRC}/Icons/Logo/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps ${INSTALL_DATA} ${WRKSRC}/qtwebengine_dictionaries/*.bdic ${STAGEDIR}${QTWEBENGINE_DICTIONARIES} ${LOCALBASE}/bin/desktop-file-edit \ --remove-category=Web \ --add-category=Network \ --add-category=WebBrowser \ --set-key=Exec \ --set-value="/usr/bin/env QTWEBENGINE_DICTIONARIES_PATH=${QTWEBENGINE_DICTIONARIES} ${PREFIX}/bin/${PORTNAME}" \ --set-icon=${PREFIX}/share/pixmaps/${PORTNAME}.png \ ${WRKSRC}/Distributions/${PORTNAME}.desktop ${INSTALL_DATA} ${WRKSRC}/Distributions/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR} .include