- Update to 1.6

- Use DATADIR
- Make runtime dependency optional (default on)
- Pass maintainership to submitter

PR:		ports/114339
Submitted by:	Max Brazhnikov <makc at issp.ac.ru>

4 files changed, 76 insertions, 58 deletions

diff --git a/editors/texmaker/Makefile b/editors/texmaker/Makefile
index 9278ea97057f..b02ada04a677 100644
--- a/editors/texmaker/Makefile
+++ b/editors/texmaker/Makefile
@@ -7,30 +7,45 @@
 #
 
 PORTNAME=	texmaker
-PORTVERSION=	1.5
-PORTREVISION=	1
+PORTVERSION=	1.6
 PORTEPOCH=	1
 CATEGORIES=	editors
 MASTER_SITES=	http://www.xm1math.net/texmaker/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	makc@issp.ac.ru
 COMMENT=	LaTeX Development Environment
 
 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
+		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
 USE_BZIP2=	yes
 USE_GHOSTSCRIPT=yes
 USE_QT_VER=	4
 QT_COMPONENTS=	gui moc qmake rcc uic
 HAS_CONFIGURE=	yes
+INSTALLS_ICONS=	yes
+
+OPTIONS=	XDVI "view dvi with xdvi" On \
+		GV "view ps with gv" On \
+		XPDF "view pdf with xpdf" On
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_XDVI)
+RUN_DEPENDS+=	xdvi:${PORTSDIR}/print/xdvik
+.endif
+
+.if !defined(WITHOUT_GV)
+RUN_DEPENDS+=	gv:${PORTSDIR}/print/gv
+.endif
+
+.if !defined(WITHOUT_XPDF)
+RUN_DEPENDS+=	xpdf:${PORTSDIR}/graphics/xpdf
+.endif
 
 do-configure:
 	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
 		${QMAKE} -unix PREFIX=${PREFIX} texmaker.pro
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/editors/texmaker/distinfo b/editors/texmaker/distinfo
index 3fcd2a31b0a1..4e1dfd1a0125 100644
--- a/editors/texmaker/distinfo
+++ b/editors/texmaker/distinfo
@@ -1,3 +1,3 @@
-MD5 (texmaker-1.5.tar.bz2) = 323d097806fa9f8474b4c92edc26cd6b
-SHA256 (texmaker-1.5.tar.bz2) = ff0417ee53fd60594c48cd1b96f061fb1744ca92dcf642a73479001f9f0f5ad3
-SIZE (texmaker-1.5.tar.bz2) = 760314
+MD5 (texmaker-1.6.tar.bz2) = 941ac678dad630d686dbee3ecd75039a
+SHA256 (texmaker-1.6.tar.bz2) = d49e7df506ef79e02a2382ad261760976f1e16cd5f42eea8308bb6710aaf832e
+SIZE (texmaker-1.6.tar.bz2) = 853418
diff --git a/editors/texmaker/files/patch-texmaker.pro b/editors/texmaker/files/patch-texmaker.pro
index ba80e8ede8a6..036078a5b6c1 100644
--- a/editors/texmaker/files/patch-texmaker.pro
+++ b/editors/texmaker/files/patch-texmaker.pro
@@ -1,10 +1,9 @@
---- 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 \
+--- ./texmaker.pro.orig	Fri Jun 15 14:03:47 2007
++++ ./texmaker.pro	Thu Jul  5 01:08:44 2007
+@@ -139,16 +139,26 @@
  	utilities/AUTHORS \
  	utilities/COPYING \
--	utilities/CHANGELOG.txt \
+ 	utilities/CHANGELOG.txt \
 -	utilities/texmaker16x16.png \
 -	utilities/texmaker22x22.png \
 -	utilities/texmaker32x32.png \
@@ -12,8 +11,8 @@
 -	utilities/texmaker64x64.png \
 -	utilities/texmaker128x128.png \
 -	utilities/texmaker.desktop \
--	utilities/texmaker.svg
-+	utilities/CHANGELOG.txt
+-	utilities/texmaker.svg \
+ 	utilities/xpdf_texmaker_sh.txt
  INSTALLS += utilities
 +icon16.path = $${PREFIX}/share/icons/hicolor/16x16/apps
 +icon16.files= utilities/texmaker16x16.png
@@ -33,6 +32,6 @@
 +desktop.path = $${PREFIX}/share/applications
 +desktop.files= utilities/texmaker.desktop
 +INSTALLS += desktop
- HEADERS	= texmaker.h \
- 	symbollistwidget.h \
- 	icondelegate.h \
+ }
+ ################################
+ win32 {
diff --git a/editors/texmaker/pkg-plist b/editors/texmaker/pkg-plist
index 45260d2b00fc..d2d835105732 100644
--- a/editors/texmaker/pkg-plist
+++ b/editors/texmaker/pkg-plist
@@ -7,41 +7,45 @@ 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
+%%DATADIR%%/AUTHORS
+%%DATADIR%%/CHANGELOG.txt
+%%DATADIR%%/COPYING
+%%DATADIR%%/blank.png
+%%DATADIR%%/doc1.png
+%%DATADIR%%/doc10.png
+%%DATADIR%%/doc11.png
+%%DATADIR%%/doc12.png
+%%DATADIR%%/doc13.png
+%%DATADIR%%/doc14.png
+%%DATADIR%%/doc15.png
+%%DATADIR%%/doc16.png
+%%DATADIR%%/doc17.png
+%%DATADIR%%/doc18.png
+%%DATADIR%%/doc19.png
+%%DATADIR%%/doc2.png
+%%DATADIR%%/doc20.png
+%%DATADIR%%/doc3.png
+%%DATADIR%%/doc4.png
+%%DATADIR%%/doc5.png
+%%DATADIR%%/doc6.png
+%%DATADIR%%/doc7.png
+%%DATADIR%%/doc8.png
+%%DATADIR%%/doc9.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_de.qm
+%%DATADIR%%/texmaker_fr.qm
+%%DATADIR%%/texmaker_ru.qm
+%%DATADIR%%/texmaker_zh.qm
+%%DATADIR%%/up.gif
+%%DATADIR%%/up_d.gif
+%%DATADIR%%/usermanual_en.html
+%%DATADIR%%/usermanual_fr.html
+%%DATADIR%%/xpdf_texmaker_sh.txt
+@dirrm %%DATADIR%%
 @dirrmtry share/applications