From owner-svn-ports-head@freebsd.org Sat Aug 22 19:03:23 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 553AB9C0234; Sat, 22 Aug 2015 19:03:23 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4429011E4; Sat, 22 Aug 2015 19:03:23 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7MJ3N1J064898; Sat, 22 Aug 2015 19:03:23 GMT (envelope-from hrs@FreeBSD.org) Received: (from hrs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7MJ3MmJ064895; Sat, 22 Aug 2015 19:03:22 GMT (envelope-from hrs@FreeBSD.org) Message-Id: <201508221903.t7MJ3MmJ064895@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hrs set sender to hrs@FreeBSD.org using -f From: Hiroki Sato Date: Sat, 22 Aug 2015 19:03:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r395048 - in head/editors/texworks: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Aug 2015 19:03:23 -0000 Author: hrs Date: Sat Aug 22 19:03:21 2015 New Revision: 395048 URL: https://svnweb.freebsd.org/changeset/ports/395048 Log: - Update to 0.4.6. - Use libsynctex.so provided by devel/tex-synctex. Added: head/editors/texworks/files/ head/editors/texworks/files/patch-TeXworks.pro (contents, props changed) Modified: head/editors/texworks/Makefile head/editors/texworks/distinfo Modified: head/editors/texworks/Makefile ============================================================================== --- head/editors/texworks/Makefile Sat Aug 22 17:48:35 2015 (r395047) +++ head/editors/texworks/Makefile Sat Aug 22 19:03:21 2015 (r395048) @@ -2,23 +2,21 @@ # $FreeBSD$ PORTNAME= texworks -PORTVERSION= 0.4.5 -DISTVERSIONSUFFIX= -r${VCS_REVISION} -PORTREVISION= 5 +PORTVERSION= 0.4.6 CATEGORIES= editors -MASTER_SITES= GOOGLE_CODE -MAINTAINER= ports@FreeBSD.org +MAINTAINER= hrs@FreeBSD.org COMMENT= Simple TeX front-end program LICENSE= GPLv2 -OPTIONS_DEFINE= DOCS LUA PYTHON - BUILD_DEPENDS= hunspell:${PORTSDIR}/textproc/hunspell LIB_DEPENDS= libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4 USES= pkgconfig qmake +USE_GITHUB= yes +GH_ACCOUNT= TeXworks +GH_TAGNAME= release-${PORTVERSION} USE_QT4= gui corelib rcc_build moc_build uic_build \ dbus xml scripttools designer_build QMAKE_ARGS= INSTALL_PREFIX=${PREFIX} \ @@ -30,10 +28,7 @@ QMAKE_ARGS= INSTALL_PREFIX=${PREFIX} \ TW_DICPATH=${LOCALBASE}/share/hunspell \ TW_HELPPATH=${DOCSDIR} \ TW_PLUGINPATH=${PREFIX}/lib/texworks -LDFLAGS+= -lz - -VCS_REVISION= 1281 -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +USE_TEX= synctex DESKTOP_ENTRIES="TexWorks" \ "Lowering the entry barrier to the TeX world" \ @@ -48,58 +43,57 @@ PLIST_FILES= bin/texworks \ PLIST_DIRS= lib/texworks PORTDOCS= * -.include +OPTIONS_DEFINE= DOCS LUA PYTHON +OPTIONS_DEFAULT=DOCS +LUA_USES= lua:51 +LUA_PLIST_FILES=lib/texworks/libTWLuaPlugin.so +PYTHON_USES= python:3 +PYTHON_PLIST_FILES=lib/texworks/libTWPythonPlugin.so -.if ${PORT_OPTIONS:MLUA} -USES+= lua:51 -PLIST_FILES+= lib/texworks/libTWLuaPlugin.so -.endif - -.if ${PORT_OPTIONS:MPYTHON} -USES+= python:3 -PLIST_FILES+= lib/texworks/libTWPythonPlugin.so -.endif +post-extract: + cd ${WRKSRC} && ${INSTALL_DATA} GitArchiveInfo.txt src/GitRev.h post-patch: - @${REINPLACE_CMD} -e '/zlib/d; s|COPYING ||; /manual.path/s|TW_HELPPATH|DOCS_DIR|' \ + @${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 + +post-patch-DOCS-off: + @${REINPLACE_CMD} -e '/INSTALLS/s,documentation manual ,,' \ ${WRKSRC}/TeXworks.pro - @${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|^|#|; 57,59s|#||; s|python3|python-${PYTHON_VER}|' \ - ${WRKSRC}/plugins-src/TWPythonPlugin/TWPythonPlugin.pro -.if !${PORT_OPTIONS:MDOCS} - @${REINPLACE_CMD} -e '/INSTALLS/s|documentation manual ||' \ - ${WRKSRC}/TeXworks.pro -.endif -post-configure: -.if ${PORT_OPTIONS:MLUA} +post-configure-LUA-on: cd ${WRKSRC}/plugins-src/TWLuaPlugin && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} ${QMAKE_ARGS} -.endif -.if ${PORT_OPTIONS:MPYTHON} + ${QMAKE} ${QMAKE_ARGS} + +post-configure-PYTHON-on: cd ${WRKSRC}/plugins-src/TWPythonPlugin && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} ${QMAKE_ARGS} -.endif + ${QMAKE} ${QMAKE_ARGS} -post-build: -.if ${PORT_OPTIONS:MLUA} +post-build-LUA-on: cd ${WRKSRC}/plugins-src/TWLuaPlugin && ${MAKE} -.endif -.if ${PORT_OPTIONS:MPYTHON} + +post-build-PYTHON-on: cd ${WRKSRC}/plugins-src/TWPythonPlugin && ${MAKE} -.endif post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/texworks -.if ${PORT_OPTIONS:MLUA} + +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 - ${INSTALL_DATA} ${WRKSRC}/plugins-src/TWLuaPlugin/libTWLuaPlugin.so ${STAGEDIR}${PREFIX}/lib/texworks -.endif -.if ${PORT_OPTIONS:MPYTHON} - ${INSTALL_DATA} ${WRKSRC}/plugins-src/TWPythonPlugin/libTWPythonPlugin.so ${STAGEDIR}${PREFIX}/lib/texworks -.endif + cd ${WRKSRC}/plugins-src/TWPythonPlugin && \ + ${INSTALL_DATA} libTWPythonPlugin.so \ + ${STAGEDIR}${PREFIX}/lib/texworks .include Modified: head/editors/texworks/distinfo ============================================================================== --- head/editors/texworks/distinfo Sat Aug 22 17:48:35 2015 (r395047) +++ head/editors/texworks/distinfo Sat Aug 22 19:03:21 2015 (r395048) @@ -1,2 +1,2 @@ -SHA256 (texworks-0.4.5-r1281.tar.gz) = dd30ce417ff8241083b6894395489bc529660a46bcb45b7d82d4c6a3f8e6e2de -SIZE (texworks-0.4.5-r1281.tar.gz) = 5335925 +SHA256 (TeXworks-texworks-0.4.6-release-0.4.6_GH0.tar.gz) = 58650574c1e3234c38cddc3375f8043a83cc65075839030fc7089471af6a3bde +SIZE (TeXworks-texworks-0.4.6-release-0.4.6_GH0.tar.gz) = 11271881 Added: head/editors/texworks/files/patch-TeXworks.pro ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/texworks/files/patch-TeXworks.pro Sat Aug 22 19:03:21 2015 (r395048) @@ -0,0 +1,45 @@ +--- TeXworks.pro.orig 2015-04-03 18:05:39 UTC ++++ TeXworks.pro +@@ -108,7 +108,8 @@ unix:!macx { # on Unix-ish platforms we + CONFIG += link_pkgconfig + PKGCONFIG += hunspell + PKGCONFIG += poppler-qt4 +- PKGCONFIG += zlib ++ PKGCONFIG += synctex ++ LIBS += -lz + + # 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