Sun Oct 27 14:51:51 2019 UTC ()
qjackctl: Switch from qt4 to qt5

Remove old qt4 options.


(kamil)
diff -r1.54 -r1.55 pkgsrc/audio/qjackctl/Makefile
diff -r1.2 -r1.3 pkgsrc/audio/qjackctl/options.mk
cvs diff -r1.54 -r1.55 pkgsrc/audio/qjackctl/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/qjackctl/Makefile 2019/09/18 14:17:06 1.54
+++ pkgsrc/audio/qjackctl/Makefile 2019/10/27 14:51:51 1.55
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.54 2019/09/18 14:17:06 ryoon Exp $ 1# $NetBSD: Makefile,v 1.55 2019/10/27 14:51:51 kamil Exp $
2# 2#
3 3
4DISTNAME= qjackctl-0.4.2 4DISTNAME= qjackctl-0.4.2
5PKGREVISION= 20 5PKGREVISION= 21
6CATEGORIES= audio 6CATEGORIES= audio
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qjackctl/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qjackctl/}
8EXTRACT_USING= bsdtar 8EXTRACT_USING= bsdtar
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://qjackctl.sourceforge.net/ 11HOMEPAGE= http://qjackctl.sourceforge.net/
12COMMENT= JACK Audio Connection Kit Qt GUI 12COMMENT= JACK Audio Connection Kit Qt GUI
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
17USE_TOOLS+= gmake 17USE_TOOLS+= gmake
18 18
cvs diff -r1.2 -r1.3 pkgsrc/audio/qjackctl/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/audio/qjackctl/Attic/options.mk 2016/07/09 11:44:23 1.2
+++ pkgsrc/audio/qjackctl/Attic/options.mk 2019/10/27 14:51:51 1.3
@@ -1,23 +1,16 @@ @@ -1,23 +1,16 @@
1# $NetBSD: options.mk,v 1.2 2016/07/09 11:44:23 rillig Exp $ 1# $NetBSD: options.mk,v 1.3 2019/10/27 14:51:51 kamil Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.qjackctl 3PKG_OPTIONS_VAR= PKG_OPTIONS.qjackctl
4PKG_OPTIONS_REQUIRED_GROUPS= qt 4PKG_OPTIONS_REQUIRED_GROUPS= qt
5PKG_OPTIONS_GROUP.qt= qt4 qt5 5PKG_OPTIONS_GROUP.qt= qt5
6PKG_SUGGESTED_OPTIONS= qt4 6PKG_SUGGESTED_OPTIONS= qt5
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9.if !empty(PKG_OPTIONS:Mqt5) 9.if !empty(PKG_OPTIONS:Mqt5)
10CONFIGURE_ARGS+= --with-qt5=${QTDIR} 10CONFIGURE_ARGS+= --with-qt5=${QTDIR}
11.include "../../x11/qt5-qtbase/buildlink3.mk" 11.include "../../x11/qt5-qtbase/buildlink3.mk"
12.include "../../x11/qt5-qttools/buildlink3.mk" 12.include "../../x11/qt5-qttools/buildlink3.mk"
13. if ${OPSYS} != "Darwin" 13. if ${OPSYS} != "Darwin"
14. include "../../x11/qt5-qtx11extras/buildlink3.mk" 14. include "../../x11/qt5-qtx11extras/buildlink3.mk"
15. endif 15. endif
16.endif 16.endif
17 
18.if !empty(PKG_OPTIONS:Mqt4) 
19CONFIGURE_ARGS+= --with-qt4=${QTDIR} 
20.include "../../x11/qt4-libs/buildlink3.mk" 
21.include "../../x11/qt4-tools/buildlink3.mk" 
22.include "../../x11/qt4-qdbus/buildlink3.mk" 
23.endif