Update texworks to 0.6.1

Release 0.6.1 (TL'16) [May 2016]
        * Fix "Jump to Source" from PDF context menu
        * Fix fine-sync'ing close to PDF line boundaries
        * Fix loading of Qt-global translations
        * Fix pixel-alignment after zoomFitWindow in continuous mode
        * Fix handling of changing scroll bar visibilities in zoomFitWidth and
          zoomFitWindow
        * Allow horizontal scrolling by Shift+MouseWheel
        * Update translations

Release 0.6.0 (TL'16) [April 2016]
        * Complete redesign of the PDF previewer using QtPDF by Charlie Sharpsteen
        * Fast and responsive preview even at very high magnifications
        * New page modes: continuous scrolling and two-column layout
        * Text selection/copying from the PDF
        * Go back to previous view after clicking on a link using Alt+left arrow

        * Fix disappearing spellcheck underline with some fonts/font sizes in Qt 5
        * Update the width of the line number display when changing the editor font
        * Show a note in the "About Scripts" dialog for disabled script languages
        * Explicitly add a "Quit TeXworks" menu item to the global menubar on
          Mac OS X

        * Make Qt5 the default framework for building TeXworks
        * Use Travis CI for continuous integration tests and builds for Windows and
          Mac OS X
        * Add support for Lua 5.3

Release 0.4.6 (TL'15) [April 2015]
        * Implement character-level synchronization by using text searching to
          assist SyncTeX
        * Lift hardwrap line length limitation and implement (hard) unwrap
        * Always show console output tab while typesetting to show progress
        * Improve the handling of UTF-8 byte order marks
        * Improve the log parsing script
        * Improve the handling of script errors

        * Work around a race condition that causes lines to become invisible,
          subsequently leading to a crash
        * Fix incorrectly accumulating indent
        * Fix SyncTeX initialization with non-ASCII filenames
        * Fix selection of whole lines and when selecting right-to-left
        * Fix hangs and crashes when using "Fit to ..." in the PDF view
        * Fix a crash when running an invalid system command from scripts
        * Fix encoding issues when reading environment variables
        * Fix scrolling when searching for multi-line strings
        * Fix auto-completion when working with RTL languages
        * Improve the handling of Retina displays in Mac OS X
        * Fix a crash when opening PDF files from the Windows Explorer
        * Provide texworks.appdata.xml for *nix platforms

        * Fix compilation with Qt 5
        * Improve the CMake build system
        * Add support for Lua 5.2
        * Move development from Google Code to GitHub

4 files changed, 25 insertions, 131 deletions

diff --git a/editors/texworks/Makefile b/editors/texworks/Makefile
index 2c4cd7dfe92..2c811b7c5b3 100644
--- a/editors/texworks/Makefile
+++ b/editors/texworks/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.40 2017/01/25 14:36:37 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2017/02/14 09:19:43 markd Exp $
 
-DISTNAME=	texworks-0.4.5-r1281
-PKGNAME=	texworks-0.4.5
-PKGREVISION=	16
+DISTNAME=	texworks-0.6.1
 CATEGORIES=	editors
-MASTER_SITES=	http://texworks.googlecode.com/files/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=TeXworks/}
+GITHUB_PROJECT=	texworks
+GITHUB_TAG=     release-${PKGVERSION_NOREV}
 
 MAINTAINER=	markd@NetBSD.org
 HOMEPAGE=	http://www.tug.org/texworks/
@@ -13,23 +13,18 @@ LICENSE=	gnu-gpl-v2
 
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	pkg-config gmake
-MAKE_ENV+=	INSTALL_ROOT=${DESTDIR}
+USE_CMAKE=	yes
 
-DEPENDS+=	poppler-data>=0.4.5:../../print/poppler-data
-
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
+CMAKE_ARGS+=	-DWITH_LUA:BOOL=OFF
+CMAKE_ARGS+=	-DWITH_PYTHON:BOOL=OFF
+CMAKE_ARGS+=	-DTeXworks_DIC_DIR:PATH=share/hunspell
+CMAKE_ARGS+=	-DTeXworks_MAN_DIR:PATH=${PKGMANDIR}/man1
 
-SUBST_CLASSES+=		man
-SUBST_STAGE.man=	post-configure
-SUBST_FILES.man=	Makefile
-SUBST_SED.man=		-e "s!/share/man/man1!/${PKGMANDIR}/man1!g"
+DEPENDS+=	poppler-data>=0.4.5:../../print/poppler-data
 
 pre-configure:
 	${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/
 
-do-configure:
-	cd ${WRKSRC}; env QTDIR=${QTDIR} qmake INSTALL_PREFIX=${PREFIX} TW_DICPATH=${BUILDLINK_PREFIX.hunspell}/share/hunspell
-
 BUILDLINK_DEPMETHOD.qt4-tools=	full
 
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/editors/texworks/PLIST b/editors/texworks/PLIST
index 7da4e01c63f..3fb15ea763e 100644
--- a/editors/texworks/PLIST
+++ b/editors/texworks/PLIST
@@ -1,97 +1,9 @@
-@comment $NetBSD: PLIST,v 1.4 2015/12/29 06:14:58 dholland Exp $
+@comment $NetBSD: PLIST,v 1.5 2017/02/14 09:19:43 markd Exp $
 bin/texworks
 man/man1/texworks.1
+share/appdata/texworks.appdata.xml
 share/applications/texworks.desktop
 share/doc/texworks/COPYING
 share/doc/texworks/NEWS
-share/doc/texworks/README
+share/doc/texworks/README.md
 share/pixmaps/TeXworks.png
-share/texworks-help/en/Acknowledgements.html
-share/texworks-help/en/AdvanceduseScripting.html
-share/texworks-help/en/Beyondthismanual.html
-share/texworks-help/en/CompilingTw.html
-share/texworks-help/en/CustomizingTw.html
-share/texworks-help/en/Firststeps.html
-share/texworks-help/en/GoingfurtherEditingtools.html
-share/texworks-help/en/GoingfurtherOthertools.html
-share/texworks-help/en/Installation.html
-share/texworks-help/en/Introduction.html
-share/texworks-help/en/Regularexpressions.html
-share/texworks-help/en/TeXworks-manual.pdf
-share/texworks-help/en/bibname.html
-share/texworks-help/en/contentsname.html
-share/texworks-help/en/images/LMB.png
-share/texworks-help/en/images/Linux.png
-share/texworks-help/en/images/Mac.png
-share/texworks-help/en/images/MacCmdKey.png
-share/texworks-help/en/images/MacOptKey.png
-share/texworks-help/en/images/RMB.png
-share/texworks-help/en/images/TeXworks.png
-share/texworks-help/en/images/Windows.png
-share/texworks-help/en/images/cmsy10-c-41.png
-share/texworks-help/en/images/cmsy10-c-4d.png
-share/texworks-help/en/images/cmsy10-c-53.png
-share/texworks-help/en/images/consoleOutput.png
-share/texworks-help/en/images/errorParsingScript.png
-share/texworks-help/en/images/example.png
-share/texworks-help/en/images/iconAbortTypesetting.png
-share/texworks-help/en/images/iconTypeset.png
-share/texworks-help/en/images/index0x.png
-share/texworks-help/en/images/index1x.png
-share/texworks-help/en/images/index2x.png
-share/texworks-help/en/images/index3x.png
-share/texworks-help/en/images/index4x.png
-share/texworks-help/en/images/index5x.png
-share/texworks-help/en/images/index6x.png
-share/texworks-help/en/images/index7x.png
-share/texworks-help/en/images/index8x.png
-share/texworks-help/en/images/interface-summary.png
-share/texworks-help/en/images/replaceDialog.png
-share/texworks-help/en/images/screenshotHardWrapDlg.png
-share/texworks-help/en/images/toolbar1.png
-share/texworks-help/en/images/toolbar2.png
-share/texworks-help/en/index.css
-share/texworks-help/en/index.html
-share/texworks-help/en/index10.html
-share/texworks-help/en/index12.html
-share/texworks-help/en/index13.html
-share/texworks-help/en/index14.html
-share/texworks-help/en/index15.html
-share/texworks-help/en/index16.html
-share/texworks-help/en/index17.html
-share/texworks-help/en/index18.html
-share/texworks-help/en/index19.html
-share/texworks-help/en/index2.html
-share/texworks-help/en/index20.html
-share/texworks-help/en/index21.html
-share/texworks-help/en/index23.html
-share/texworks-help/en/index24.html
-share/texworks-help/en/index25.html
-share/texworks-help/en/index26.html
-share/texworks-help/en/index27.html
-share/texworks-help/en/index28.html
-share/texworks-help/en/index29.html
-share/texworks-help/en/index30.html
-share/texworks-help/en/index32.html
-share/texworks-help/en/index33.html
-share/texworks-help/en/index34.html
-share/texworks-help/en/index36.html
-share/texworks-help/en/index37.html
-share/texworks-help/en/index40.html
-share/texworks-help/en/index41.html
-share/texworks-help/en/index42.html
-share/texworks-help/en/index43.html
-share/texworks-help/en/index44.html
-share/texworks-help/en/index45.html
-share/texworks-help/en/index46.html
-share/texworks-help/en/index47.html
-share/texworks-help/en/index48.html
-share/texworks-help/en/index49.html
-share/texworks-help/en/index5.html
-share/texworks-help/en/index50.html
-share/texworks-help/en/index6.html
-share/texworks-help/en/index8.html
-share/texworks-help/en/index9.html
-share/texworks-help/en/indexname.html
-share/texworks-help/en/manual.css
-share/texworks-help/en/tw-help-title.txt
diff --git a/editors/texworks/patches/patch-TeXworks.pro b/editors/texworks/patches/patch-TeXworks.pro
deleted file mode 100644
index 1f43fd5378a..00000000000
--- a/editors/texworks/patches/patch-TeXworks.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-TeXworks.pro,v 1.1.1.1 2012/03/21 22:44:20 markd Exp $
-
-pkg-config doesnt know about zlib so just assume its there
-
---- TeXworks.pro.orig	2011-06-29 17:03:14.000000000 +0000
-+++ TeXworks.pro
-@@ -103,7 +103,7 @@ unix:!macx { # on Unix-ish platforms we 
- 	CONFIG		+= link_pkgconfig
- 	PKGCONFIG	+= hunspell
- 	PKGCONFIG	+= poppler-qt4
--	PKGCONFIG	+= zlib
-+	#PKGCONFIG	+= zlib
- 
- 	# Enclose the path in \\\" (which later gets expanded to \", which in turn
- 	# gets expanded to " in the c++ code)
diff --git a/editors/texworks/patches/patch-getDefaultBinPaths.sh b/editors/texworks/patches/patch-getDefaultBinPaths.sh
index a1d8ca95555..003e0569f21 100644
--- a/editors/texworks/patches/patch-getDefaultBinPaths.sh
+++ b/editors/texworks/patches/patch-getDefaultBinPaths.sh
@@ -1,25 +1,27 @@
-$NetBSD: patch-getDefaultBinPaths.sh,v 1.3 2014/01/14 08:56:08 markd Exp $
+$NetBSD: patch-getDefaultBinPaths.sh,v 1.4 2017/02/14 09:19:43 markd Exp $
 
---- getDefaultBinPaths.sh.orig	2013-04-14 13:45:23.000000000 +0000
+--- getDefaultBinPaths.sh.orig	2016-05-01 08:43:14.000000000 +0000
 +++ getDefaultBinPaths.sh
-@@ -74,13 +74,13 @@ case $PLATFORM in
+@@ -74,14 +74,14 @@ case $PLATFORM in
  	*)			OS=`echo $PLATFORM | sed 's/.*-//'`
  esac
  
+-appendPath "/usr/local/texlive/2017/bin/$ARCH-$OS"
+-appendPath "/usr/local/texlive/2016/bin/$ARCH-$OS"
+-appendPath "/usr/local/texlive/2015/bin/$ARCH-$OS"
+-appendPath "/usr/local/texlive/2014/bin/$ARCH-$OS"
 -appendPath "/usr/local/texlive/2013/bin/$ARCH-$OS"
 -appendPath "/usr/local/texlive/2012/bin/$ARCH-$OS"
 -appendPath "/usr/local/texlive/2011/bin/$ARCH-$OS"
 -appendPath "/usr/local/texlive/2010/bin/$ARCH-$OS"
--appendPath "/usr/local/texlive/2009/bin/$ARCH-$OS"
--appendPath "/usr/local/texlive/2008/bin/$ARCH-$OS"
--appendPath "/usr/local/texlive/2007/bin/$ARCH-$OS"
++#appendPath "/usr/local/texlive/2017/bin/$ARCH-$OS"
++#appendPath "/usr/local/texlive/2016/bin/$ARCH-$OS"
++#appendPath "/usr/local/texlive/2015/bin/$ARCH-$OS"
++#appendPath "/usr/local/texlive/2014/bin/$ARCH-$OS"
 +#appendPath "/usr/local/texlive/2013/bin/$ARCH-$OS"
 +#appendPath "/usr/local/texlive/2012/bin/$ARCH-$OS"
 +#appendPath "/usr/local/texlive/2011/bin/$ARCH-$OS"
 +#appendPath "/usr/local/texlive/2010/bin/$ARCH-$OS"
-+#appendPath "/usr/local/texlive/2009/bin/$ARCH-$OS"
-+#appendPath "/usr/local/texlive/2008/bin/$ARCH-$OS"
-+#appendPath "/usr/local/texlive/2007/bin/$ARCH-$OS"
  
  for TEXLIVEROOT in /usr/local/texlive/* /opt/texlive/*; do
  	# Check if this is really a folder (e.g., /opt/... might not exist)