Wed Jan 10 22:09:02 2018 UTC ()
texmaker: default to qt5 now that poppler-qt4 is gone.


(wiz)
diff -r1.83 -r1.84 pkgsrc/editors/texmaker/Makefile
diff -r1.2 -r1.3 pkgsrc/editors/texmaker/options.mk
cvs diff -r1.83 -r1.84 pkgsrc/editors/texmaker/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/texmaker/Makefile 2017/12/08 08:52:56 1.83
+++ pkgsrc/editors/texmaker/Makefile 2018/01/10 22:09:02 1.84
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.83 2017/12/08 08:52:56 maya Exp $ 1# $NetBSD: Makefile,v 1.84 2018/01/10 22:09:02 wiz Exp $
2 2
3DISTNAME= texmaker-4.5 3DISTNAME= texmaker-4.5
4PKGREVISION= 26 4PKGREVISION= 27
5CATEGORIES= editors 5CATEGORIES= editors
6MASTER_SITES= http://www.xm1math.net/texmaker/ 6MASTER_SITES= http://www.xm1math.net/texmaker/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8EXTRACT_USING= bsdtar 8EXTRACT_USING= bsdtar
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.xm1math.net/texmaker/ 11HOMEPAGE= http://www.xm1math.net/texmaker/
12COMMENT= LaTeX editor and front end 12COMMENT= LaTeX editor and front end
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15USE_TOOLS+= pkg-config 15USE_TOOLS+= pkg-config
16USE_LANGUAGES= c++ c 16USE_LANGUAGES= c++ c
17USE_LIBTOOL= yes 17USE_LIBTOOL= yes
cvs diff -r1.2 -r1.3 pkgsrc/editors/texmaker/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/editors/texmaker/Attic/options.mk 2014/12/02 12:16:29 1.2
+++ pkgsrc/editors/texmaker/Attic/options.mk 2018/01/10 22:09:02 1.3
@@ -1,20 +1,13 @@ @@ -1,20 +1,13 @@
1# $NetBSD: options.mk,v 1.2 2014/12/02 12:16:29 mef Exp $ 1# $NetBSD: options.mk,v 1.3 2018/01/10 22:09:02 wiz Exp $
2# 
3 2
4PKG_OPTIONS_VAR= PKG_OPTIONS.texmaker 3PKG_OPTIONS_VAR= PKG_OPTIONS.texmaker
5PKG_OPTIONS_REQUIRED_GROUPS= qt 4PKG_OPTIONS_REQUIRED_GROUPS= qt
6PKG_OPTIONS_GROUP.qt = qt4 qt5 5PKG_OPTIONS_GROUP.qt = qt5
7PKG_SUGGESTED_OPTIONS= qt4 6PKG_SUGGESTED_OPTIONS= qt5
8.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
9 8
10.if !empty(PKG_OPTIONS:Mqt5) 9.if !empty(PKG_OPTIONS:Mqt5)
11.include "../../x11/qt5-qtscript/buildlink3.mk" 10.include "../../x11/qt5-qtscript/buildlink3.mk"
12.include "../../x11/qt5-qtwebkit/buildlink3.mk" 11.include "../../x11/qt5-qtwebkit/buildlink3.mk"
13.include "../../print/poppler-qt5/buildlink3.mk" 12.include "../../print/poppler-qt5/buildlink3.mk"
14.endif 13.endif
15 
16.if !empty(PKG_OPTIONS:Mqt4) 
17.include "../../x11/qt4-libs/buildlink3.mk" 
18.include "../../x11/qt4-tools/buildlink3.mk" 
19.include "../../print/poppler-qt4/buildlink3.mk" 
20.endif