4 files changed, 34 insertions, 10 deletions

diff --git a/editors/texmakerx/Makefile b/editors/texmakerx/Makefile
index 06eb67eb5798..14f93e375948 100644
--- a/editors/texmakerx/Makefile
+++ b/editors/texmakerx/Makefile
@@ -6,20 +6,20 @@
 #
 
 PORTNAME=	texmakerx
-PORTVERSION=	1.9.9
-PORTREVISION=	1
+PORTVERSION=	2.0.0
 CATEGORIES=	editors
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/TexMakerX%20${PORTVERSION}
-DISTNAME=	${PORTNAME}${PORTVERSION}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S:.0::}
 
 MAINTAINER=	lx@FreeBSD.org
 COMMENT=	A LaTeX IDE derived from Texmaker
 
+LIB_DEPENDS=	poppler.6:${PORTSDIR}/graphics/poppler \
+		poppler-qt4.3:${PORTSDIR}/graphics/poppler-qt4
 RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base \
 		dvips:${PORTSDIR}/print/dvipsk-tetex \
 		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
-WRKSRC=		${WRKDIR}/${PORTVERSION}
 USE_GHOSTSCRIPT=yes
 USE_QT_VER=	4
 QT_COMPONENTS=	gui network xml moc_build qmake_build rcc_build \
@@ -31,8 +31,6 @@ MAKE_JOBS_UNSAFE=	yes
 OPTIONS=	XDVI "view dvi with xdvi" On \
 		GV "view ps with gv" On
 
-#WRKSRC=		${WRKDIR}/runk
-
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_XDVI)
@@ -45,10 +43,12 @@ RUN_DEPENDS+=	gv:${PORTSDIR}/print/gv
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,^\(utilities.path =\).*,\1 ${DATADIR},' \
+		-e 's,/usr/include,${LOCALBASE}/include,g' \
+		-e 's,/usr/lib,${LOCALBASE}/lib,g' \
 		${WRKSRC}/${PORTNAME}.pro
 
 do-configure:
 	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} -unix PREFIX=${PREFIX} ${PORTNAME}.pro
+		${QMAKE} PREFIX=${PREFIX} ${PORTNAME}.pro
 
 .include <bsd.port.post.mk>
diff --git a/editors/texmakerx/distinfo b/editors/texmakerx/distinfo
index 1d9d8fddc0f0..ccdccd03fc05 100644
--- a/editors/texmakerx/distinfo
+++ b/editors/texmakerx/distinfo
@@ -1,3 +1,2 @@
-MD5 (texmakerx1.9.9.tar.gz) = 96749a4f8789fdca8cf3f20c2bbe0536
-SHA256 (texmakerx1.9.9.tar.gz) = dcc4ce193ef03351ed0d21b8019319fd91a508a98353f75952a30f5a46143ec1
-SIZE (texmakerx1.9.9.tar.gz) = 10865517
+SHA256 (texmakerx-2.0.tar.gz) = bded3ad223fb493d21816f2b9bd24f33f979e265a09d95a1537df5c165cf66d2
+SIZE (texmakerx-2.0.tar.gz) = 11645643
diff --git a/editors/texmakerx/files/patch-texmaker.qrc b/editors/texmakerx/files/patch-texmaker.qrc
new file mode 100644
index 000000000000..9f956e22084f
--- /dev/null
+++ b/editors/texmakerx/files/patch-texmaker.qrc
@@ -0,0 +1,10 @@
+--- texmaker.qrc.orig	2010-12-15 21:30:17.000000000 +0300
++++ texmaker.qrc	2010-12-15 21:30:32.000000000 +0300
+@@ -1411,7 +1411,6 @@
+         <file>symbols/wasysym/img111wasysym.png</file>
+         <file>symbols/wasysym/img112wasysym.png</file>
+         <file>templates/template_Article.tex</file>
+-        <file>templates/template_Article(French).tex</file>
+         <file>templates/template_Beamer.tex</file>
+         <file>templates/template_Book.tex</file>
+         <file>templates/template_HA-prosper.tex</file>
diff --git a/editors/texmakerx/pkg-plist b/editors/texmakerx/pkg-plist
index 5ce2afe71d94..3a7312627562 100644
--- a/editors/texmakerx/pkg-plist
+++ b/editors/texmakerx/pkg-plist
@@ -58,5 +58,20 @@ share/applications/texmakerx.desktop
 %%DATADIR%%/th_en_US_v2.dat
 %%DATADIR%%/th_fr_FR_v2.dat
 %%DATADIR%%/th_de_DE_v2.dat
+%%DATADIR%%/configure_completion.png
+%%DATADIR%%/configure_customizeMenu.png
+%%DATADIR%%/configure_customToolbar.png
+%%DATADIR%%/configure_editor.png
+%%DATADIR%%/configure_general.png
+%%DATADIR%%/configure_shortcuts.png
+%%DATADIR%%/configure_svn.png
+%%DATADIR%%/template.png
+%%DATADIR%%/thesaurus.png
+%%DATADIR%%/texmakerx_cs.qm
+%%DATADIR%%/texmakerx_hu.qm
+%%DATADIR%%/qt_hu.qm
+%%DATADIR%%/qt_cs.qm
+%%DATADIR%%/en_US.aff
+%%DATADIR%%/en_US.dic
 @dirrm %%DATADIR%%
 @dirrmtry share/applications