Index: head/editors/texworks/Makefile =================================================================== --- head/editors/texworks/Makefile +++ head/editors/texworks/Makefile @@ -2,101 +2,52 @@ # $FreeBSD$ PORTNAME= texworks -PORTVERSION= 0.4.6 DISTVERSIONPREFIX= release- -PORTREVISION= 7 +DISTVERSION= 0.6.2 CATEGORIES= editors MAINTAINER= hrs@FreeBSD.org COMMENT= Simple TeX front-end program -LICENSE= GPLv2 +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_armv6= fails to install: PDFDocument.cpp:1836:39: cannot initialize a parameter of type 'qreal *' with an rvalue of type 'double *' -BROKEN_armv7= fails to install: PDFDocument.cpp:1836:39: cannot initialize a parameter of type 'qreal *' with an rvalue of type 'double *' - BUILD_DEPENDS= hunspell:textproc/hunspell -LIB_DEPENDS= libpoppler-qt4.so:graphics/poppler-qt4 +LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell \ + libpoppler.so:graphics/poppler \ + libpoppler-qt5.so:graphics/poppler-qt5 -USES= compiler:c++11-lang pkgconfig qmake qt:4 +USES= cmake:outsource desktop-file-utils pkgconfig qt:5 USE_GITHUB= yes GH_ACCOUNT= TeXworks -USE_QT= gui corelib rcc_build moc_build uic_build \ - dbus xml scripttools designer_build -QMAKE_ARGS= INSTALL_PREFIX=${PREFIX} \ - DATA_DIR=${DATADIR} \ - DOCS_DIR=${DOCSDIR} \ - ICON_DIR=${PREFIX}/share/pixmaps \ - DESKTOP_DIR=${PREFIX}/share/applications \ - MAN_DIR=${PREFIX}/man/man1 \ - TW_DICPATH=${LOCALBASE}/share/hunspell \ - TW_HELPPATH=${DOCSDIR} \ - TW_PLUGINPATH=${PREFIX}/lib/texworks +USE_QT= buildtools_build designer_build qmake_build \ + core concurrent dbus gui linguisttools script \ + scripttools uitools widgets xml + USE_TEX= synctex +USE_LDCONFIG= yes -DESKTOP_ENTRIES="TexWorks" \ - "Lowering the entry barrier to the TeX world" \ - "TeXworks" \ - "${PORTNAME}" \ - "Utility;Qt;" \ - true +CMAKE_ARGS= -DTeXworks_DIC_DIR:PATH=${LOCALBASE}/share/hunspell \ + -DTeXworks_DOCS_DIR:PATH=${DOCSDIR_REL} \ + -DTeXworks_HELP_DIR:PATH=${DOCSDIR_REL} \ + -DTeXworks_MAN_DIR:PATH=man/man1 -PLIST_FILES= bin/texworks \ - man/man1/texworks.1.gz \ - share/pixmaps/TeXworks.png -PLIST_DIRS= lib/texworks -PORTDOCS= * - OPTIONS_DEFINE= DOCS LUA PYTHON -LUA_USES= lua:51 -LUA_PLIST_FILES=lib/texworks/libTWLuaPlugin.so -PYTHON_USES= python:3.4+ -PYTHON_PLIST_FILES=lib/texworks/libTWPythonPlugin.so -post-extract: - cd ${WRKSRC} && ${INSTALL_DATA} GitArchiveInfo.txt src/GitRev.h +LUA_USES= lua +LUA_CMAKE_BOOL= WITH_LUA +LUA_PLIST_FILES= lib/texworks/libTWLuaPlugin.so -post-patch: - @${REINPLACE_CMD} -e 's,/usr/share,${LOCALBASE}/share,' \ - ${WRKSRC}/src/TWUtils.cpp - @${REINPLACE_CMD} -e 's,lua5.1,lua-5.1,' \ - ${WRKSRC}/plugins-src/TWLuaPlugin/TWLuaPlugin.pro - @${REINPLACE_CMD} -e '53,54s,^,#,' \ - -e '57,59s,#,,' \ - -e 's,python3,python-${PYTHON_VER},' \ - ${WRKSRC}/plugins-src/TWPythonPlugin/TWPythonPlugin.pro +PYTHON_USES= python:3.4+ +PYTHON_CMAKE_BOOL= WITH_PYTHON +PYTHON_PLIST_FILES= lib/texworks/libTWPythonPlugin.so -post-patch-DOCS-off: - @${REINPLACE_CMD} -e '/INSTALLS/s,documentation manual ,,' \ - ${WRKSRC}/TeXworks.pro +PORTDOCS= * -post-configure-LUA-on: - cd ${WRKSRC}/plugins-src/TWLuaPlugin && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} ${QMAKE_ARGS} - -post-configure-PYTHON-on: - cd ${WRKSRC}/plugins-src/TWPythonPlugin && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} ${QMAKE_ARGS} - -post-build-LUA-on: - cd ${WRKSRC}/plugins-src/TWLuaPlugin && ${MAKE} - -post-build-PYTHON-on: - cd ${WRKSRC}/plugins-src/TWPythonPlugin && ${MAKE} - -post-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/lib/texworks - -post-install-LUA-on: - ${MKDIR} ${STAGEDIR}${PREFIX}/lib/texworks - cd ${WRKSRC}/plugins-src/TWLuaPlugin && \ - ${INSTALL_DATA} libTWLuaPlugin.so \ - ${STAGEDIR}${PREFIX}/lib/texworks - -post-install-PYTHON-on: - ${MKDIR} ${STAGEDIR}${PREFIX}/lib/texworks - cd ${WRKSRC}/plugins-src/TWPythonPlugin && \ - ${INSTALL_DATA} libTWPythonPlugin.so \ - ${STAGEDIR}${PREFIX}/lib/texworks +PLIST_FILES= bin/texworks \ + man/man1/texworks.1.gz \ + share/appdata/texworks.appdata.xml \ + share/applications/texworks.desktop \ + share/pixmaps/TeXworks.png .include Index: head/editors/texworks/distinfo =================================================================== --- head/editors/texworks/distinfo +++ head/editors/texworks/distinfo @@ -1,2 +1,3 @@ -SHA256 (TeXworks-texworks-release-0.4.6_GH0.tar.gz) = 58650574c1e3234c38cddc3375f8043a83cc65075839030fc7089471af6a3bde -SIZE (TeXworks-texworks-release-0.4.6_GH0.tar.gz) = 11271881 +TIMESTAMP = 1536894823 +SHA256 (TeXworks-texworks-release-0.6.2_GH0.tar.gz) = 22885c11d92654b0cba1f4808fc9aa3c2fdd3e5435fd89dff9aa1e67658a6339 +SIZE (TeXworks-texworks-release-0.6.2_GH0.tar.gz) = 11508277 Index: head/editors/texworks/files/patch-TeXworks.pro =================================================================== --- head/editors/texworks/files/patch-TeXworks.pro +++ head/editors/texworks/files/patch-TeXworks.pro @@ -1,44 +0,0 @@ ---- TeXworks.pro.orig 2015-04-03 18:05:39 UTC -+++ TeXworks.pro -@@ -108,7 +108,7 @@ unix:!macx { # on Unix-ish platforms we - CONFIG += link_pkgconfig - PKGCONFIG += hunspell - PKGCONFIG += poppler-qt4 -- PKGCONFIG += zlib -+ PKGCONFIG += synctex zlib - - # Enclose the path in \\\" (which later gets expanded to \", which in turn - # gets expanded to " in the c++ code) -@@ -180,8 +181,7 @@ HEADERS += src/TWApp.h \ - src/TWVersion.h \ - src/TWTextCodecs.h \ - src/SvnRev.h \ -- src/synctex_parser.h \ -- src/synctex_parser_utils.h \ -+ src/TWSynchronizer.h \ - src/ClickableLabel.h \ - src/ConfigurableApp.h \ - src/TWSystemCmd.h -@@ -225,8 +225,7 @@ SOURCES += src/main.cpp \ - src/ResourcesDialog.cpp \ - src/ScriptManager.cpp \ - src/ConfirmDelete.cpp \ -- src/synctex_parser.c \ -- src/synctex_parser_utils.c -+ src/TWSynchronizer.cpp - - RESOURCES += res/resources.qrc \ - res/resfiles.qrc -@@ -259,10 +258,10 @@ unix:!macx { # installation on Unix-ish - isEmpty(DESKTOP_DIR):DESKTOP_DIR = $$DATA_DIR/applications - - target.path = $$BIN_DIR -- documentation.files = COPYING README NEWS -+ documentation.files = README NEWS - documentation.path = $$DOCS_DIR - manual.files = manual/* -- manual.path = $$TW_HELPPATH -+ manual.path = DOCS_DIR - icon.files = res/images/TeXworks.png - icon.path = $$ICON_DIR - man.files = man/texworks.1