4 files changed, 102 insertions, 54 deletions

diff --git a/editors/texmaker/Makefile b/editors/texmaker/Makefile
index e7a6fad8a3d8..53b3a1b0aec9 100644
--- a/editors/texmaker/Makefile
+++ b/editors/texmaker/Makefile
@@ -7,28 +7,29 @@
 #
 
 PORTNAME=	texmaker
-PORTVERSION=	1.12
+PORTVERSION=	1.5
 CATEGORIES=	editors
-MASTER_SITES=	http://ftp.citkit.ru/pub/texmaker1/ \
-		http://www.bsd-geek.de/FreeBSD/distfiles/
+MASTER_SITES=	http://www.xm1math.net/texmaker/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	LaTeX Development Environment
 
-BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
+RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base \
+		dvips:${PORTSDIR}/print/dvipsk-tetex \
+		xdvi:${PORTSDIR}/print/xdvik \
+		gv:${PORTSDIR}/print/gv \
+		xpdf:${PORTSDIR}/graphics/xpdf \
+${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
 USE_BZIP2=	yes
-USE_QT_VER=	3
-MAKE_ENV=	QTDIR="${QT_PREFIX}"
+USE_GHOSTSCRIPT=yes
+USE_QT_VER=	4
+QT_COMPONENTS=	gui moc qmake rcc uic
+HAS_CONFIGURE=	yes
 
 do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} qmake \
-		-spec ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ \
-		-unix PREFIX="${PREFIX}" texmaker.pro
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/texmaker ${PREFIX}/bin
-	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/utilities/*.* ${DATADIR}
+	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
+		${QMAKE} -unix PREFIX=${PREFIX} INCLUDEPATH+=/foo/bar/ZZZZZZZZZZZZZZZ \
+		LIBS+=-L/foo/bar/XXXXXXXXXXXXXXXXX texmaker.pro
 
 .include <bsd.port.mk>
diff --git a/editors/texmaker/distinfo b/editors/texmaker/distinfo
index 4fac2435845f..3fcd2a31b0a1 100644
--- a/editors/texmaker/distinfo
+++ b/editors/texmaker/distinfo
@@ -1,3 +1,3 @@
-MD5 (texmaker-1.12.tar.bz2) = af243a0506a296216b51aad80b244c63
-SHA256 (texmaker-1.12.tar.bz2) = 979dcb94851602feb780e831fbeee29064bafdf8a364f9c3c86a923bd1e4e33f
-SIZE (texmaker-1.12.tar.bz2) = 744742
+MD5 (texmaker-1.5.tar.bz2) = 323d097806fa9f8474b4c92edc26cd6b
+SHA256 (texmaker-1.5.tar.bz2) = ff0417ee53fd60594c48cd1b96f061fb1744ca92dcf642a73479001f9f0f5ad3
+SIZE (texmaker-1.5.tar.bz2) = 760314
diff --git a/editors/texmaker/files/patch-texmaker.pro b/editors/texmaker/files/patch-texmaker.pro
new file mode 100644
index 000000000000..ba80e8ede8a6
--- /dev/null
+++ b/editors/texmaker/files/patch-texmaker.pro
@@ -0,0 +1,38 @@
+--- texmaker.pro.orig	Mon Feb  5 20:14:21 2007
++++ texmaker.pro	Mon Feb  5 20:43:17 2007
+@@ -52,16 +52,26 @@
+ 	utilities/usermanual_fr.html \
+ 	utilities/AUTHORS \
+ 	utilities/COPYING \
+-	utilities/CHANGELOG.txt \
+-	utilities/texmaker16x16.png \
+-	utilities/texmaker22x22.png \
+-	utilities/texmaker32x32.png \
+-	utilities/texmaker48x48.png \
+-	utilities/texmaker64x64.png \
+-	utilities/texmaker128x128.png \
+-	utilities/texmaker.desktop \
+-	utilities/texmaker.svg
++	utilities/CHANGELOG.txt
+ INSTALLS += utilities
++icon16.path = $${PREFIX}/share/icons/hicolor/16x16/apps
++icon16.files= utilities/texmaker16x16.png
++icon22.path = $${PREFIX}/share/icons/hicolor/22x22/apps
++icon22.files= utilities/texmaker22x22.png
++icon32.path=  $${PREFIX}/share/icons/hicolor/32x32/apps
++icon32.files= utilities/texmaker32x32.png
++icon48.path=  $${PREFIX}/share/icons/hicolor/48x48/apps
++icon48.files=  utilities/texmaker48x48.png
++icon64.path=  $${PREFIX}/share/icons/hicolor/64x64/apps
++icon64.files= utilities/texmaker64x64.png
++icon128.path=  $${PREFIX}/share/icons/hicolor/128x128/apps
++icon128.files=utilities/texmaker128x128.png
++iconscale.path=$${PREFIX}/share/icons/hicolor/scalable/apps
++iconscale.files=utilities/texmaker.svg
++INSTALLS += icon16 icon22 icon32 icon48 icon64 icon128 iconscale
++desktop.path = $${PREFIX}/share/applications
++desktop.files= utilities/texmaker.desktop
++INSTALLS += desktop
+ HEADERS	= texmaker.h \
+ 	symbollistwidget.h \
+ 	icondelegate.h \
diff --git a/editors/texmaker/pkg-plist b/editors/texmaker/pkg-plist
index a10781a47acb..45260d2b00fc 100644
--- a/editors/texmaker/pkg-plist
+++ b/editors/texmaker/pkg-plist
@@ -1,38 +1,47 @@
 bin/texmaker
-%%DATADIR%%/application.icns
-%%DATADIR%%/blank.gif
-%%DATADIR%%/doc1.png
-%%DATADIR%%/doc11.png
-%%DATADIR%%/doc12.png
-%%DATADIR%%/doc13.png
-%%DATADIR%%/doc14.png
-%%DATADIR%%/doc15.png
-%%DATADIR%%/doc16.png
-%%DATADIR%%/doc17.png
-%%DATADIR%%/doc2.png
-%%DATADIR%%/doc3.png
-%%DATADIR%%/doc4.png
-%%DATADIR%%/doc5.png
-%%DATADIR%%/doc6.png
-%%DATADIR%%/doc7.png
-%%DATADIR%%/doc8.png
-%%DATADIR%%/latexhelp.html
-%%DATADIR%%/next.gif
-%%DATADIR%%/next_d.gif
-%%DATADIR%%/prev.gif
-%%DATADIR%%/prev_d.gif
-%%DATADIR%%/psheader.txt
-%%DATADIR%%/style.css
-%%DATADIR%%/texmaker.desktop
-%%DATADIR%%/texmaker.svg
-%%DATADIR%%/texmaker128x128.png
-%%DATADIR%%/texmaker16x16.png
-%%DATADIR%%/texmaker22x22.png
-%%DATADIR%%/texmaker32x32.png
-%%DATADIR%%/texmaker48x48.png
-%%DATADIR%%/texmaker64x64.png
-%%DATADIR%%/texmaker_fr.qm
-%%DATADIR%%/up.gif
-%%DATADIR%%/up_d.gif
-%%DATADIR%%/usermanual.html
-@dirrm %%DATADIR%%
+share/applications/texmaker.desktop
+share/icons/hicolor/128x128/apps/texmaker128x128.png
+share/icons/hicolor/16x16/apps/texmaker16x16.png
+share/icons/hicolor/22x22/apps/texmaker22x22.png
+share/icons/hicolor/32x32/apps/texmaker32x32.png
+share/icons/hicolor/48x48/apps/texmaker48x48.png
+share/icons/hicolor/64x64/apps/texmaker64x64.png
+share/icons/hicolor/scalable/apps/texmaker.svg
+share/texmaker/AUTHORS
+share/texmaker/CHANGELOG.txt
+share/texmaker/COPYING
+share/texmaker/blank.png
+share/texmaker/doc1.png
+share/texmaker/doc10.png
+share/texmaker/doc11.png
+share/texmaker/doc12.png
+share/texmaker/doc13.png
+share/texmaker/doc14.png
+share/texmaker/doc15.png
+share/texmaker/doc16.png
+share/texmaker/doc17.png
+share/texmaker/doc18.png
+share/texmaker/doc19.png
+share/texmaker/doc2.png
+share/texmaker/doc20.png
+share/texmaker/doc3.png
+share/texmaker/doc4.png
+share/texmaker/doc5.png
+share/texmaker/doc6.png
+share/texmaker/doc7.png
+share/texmaker/doc8.png
+share/texmaker/doc9.png
+share/texmaker/latexhelp.html
+share/texmaker/next.gif
+share/texmaker/next_d.gif
+share/texmaker/prev.gif
+share/texmaker/prev_d.gif
+share/texmaker/psheader.txt
+share/texmaker/style.css
+share/texmaker/texmaker_fr.qm
+share/texmaker/up.gif
+share/texmaker/up_d.gif
+share/texmaker/usermanual_en.html
+share/texmaker/usermanual_fr.html
+@dirrm share/texmaker
+@dirrmtry share/applications