pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

pkg/53973: pkgsrc/net/wpa_gui: switch to Qt5



>Number:         53973
>Category:       pkg
>Synopsis:       pkgsrc/net/wpa_gui: switch to Qt5
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Feb 13 10:50:00 +0000 2019
>Originator:     Izumi Tsutsui
>Release:        NetBSD 8.0 + pkgsrc-2018Q4
>Organization:
>Environment:
System: NetBSD 8.0 (GENERIC)
Architecture: i386
Machine: i386
>Description:
Currently pkgsrc/net/wpa_gui depends on qt4, but it's better to switch
to newer Qt version as other applications, like ibus and mozc etc.

FreeBSD ports have already switched to using QT5
 https://svnweb.freebsd.org/ports?view=revision&revision=472340
and it looks no patch against upstream sources is required.

>How-To-Repeat:
Code inspection.

>Fix:

The following changes work for me.

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/wpa_gui/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile	12 Mar 2018 11:17:24 -0000	1.29
+++ Makefile	13 Feb 2019 10:03:59 -0000
@@ -2,7 +2,7 @@
 
 DISTNAME=	wpa_supplicant-2.6
 PKGNAME=	${DISTNAME:S/supplicant/gui/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://hostap.epitest.fi/releases/
 
@@ -18,6 +18,8 @@ USE_TOOLS+=	gmake
 
 LRELEASE=	${QTDIR}/bin/lrelease
 MAKE_ENV+=	LRELEASE=${LRELEASE}
+QMAKE=		${QTDIR}/bin/qmake
+MAKE_ENV+=	QMAKE=${QMAKE}
 
 INSTALLATION_DIRS=	sbin ${PKGMANDIR}/man8
 
@@ -27,6 +29,8 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/wpa_supplicant/doc/docbook/wpa_gui.8 \
                 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/
 
-.include "../../x11/qt4-tools/buildlink3.mk"
-.include "../../x11/qt4-libs/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qtsvg/buildlink3.mk"
+BUILDLINK_DEPMETHOD.qt5-qttools=	build
+.include "../../x11/qt5-qttools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index