NetBSD Problem Report #53973

From tsutsui@ceres.dti.ne.jp  Wed Feb 13 10:49:50 2019
Return-Path: <tsutsui@ceres.dti.ne.jp>
Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified))
	by mollari.NetBSD.org (Postfix) with ESMTPS id E5B257A1B6
	for <gnats-bugs@gnats.NetBSD.org>; Wed, 13 Feb 2019 10:49:50 +0000 (UTC)
Message-Id: <201902131049.x1DAnjZF008403@ceres.dti.ne.jp>
Date: Wed, 13 Feb 2019 19:49:45 +0900 (JST)
From: Izumi Tsutsui <tsutsui@ceres.dti.ne.jp>
Reply-To: tsutsui@ceres.dti.ne.jp
To: gnats-bugs@NetBSD.org
Cc: tsutsui@ceres.dti.ne.jp
Subject: pkgsrc/net/wpa_gui: switch to Qt5
X-Send-Pr-Version: 3.95

>Number:         53973
>Category:       pkg
>Synopsis:       pkgsrc/net/wpa_gui: switch to Qt5
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    tsutsui
>State:          closed
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Feb 13 10:50:00 +0000 2019
>Closed-Date:    Fri Feb 15 13:40:21 +0000 2019
>Last-Modified:  Fri Feb 15 13: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"

>Release-Note:

>Audit-Trail:
From: Thomas Klausner <wiz@NetBSD.org>
To: Izumi Tsutsui <tsutsui@ceres.dti.ne.jp>
Cc: NetBSD bugtracking <gnats-bugs@NetBSD.org>
Subject: Re: pkg/53973: pkgsrc/net/wpa_gui: switch to Qt5
Date: Wed, 13 Feb 2019 11:55:31 +0100

 On Wed, Feb 13, 2019 at 10:50:00AM +0000, Izumi Tsutsui wrote:
 > 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.

 Thanks for the patch. Please commit it!
  Thomas

Responsible-Changed-From-To: pkg-manager->tsutsui
Responsible-Changed-By: tsutsui@NetBSD.org
Responsible-Changed-When: Fri, 15 Feb 2019 13:40:21 +0000
Responsible-Changed-Why:


State-Changed-From-To: open->closed
State-Changed-By: tsutsui@NetBSD.org
State-Changed-When: Fri, 15 Feb 2019 13:40:21 +0000
State-Changed-Why:
Committed.


From: "Izumi Tsutsui" <tsutsui@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc: 
Subject: PR/53973 CVS commit: pkgsrc/net/wpa_gui
Date: Fri, 15 Feb 2019 13:38:53 +0000

 Module Name:	pkgsrc
 Committed By:	tsutsui
 Date:		Fri Feb 15 13:38:53 UTC 2019

 Modified Files:
 	pkgsrc/net/wpa_gui: Makefile

 Log Message:
 wpa_gui: switch to Qt5.

 Ok'ed by wiz@ in PR pkg/53973.


 To generate a diff of this commit:
 cvs rdiff -u -r1.29 -r1.30 pkgsrc/net/wpa_gui/Makefile

 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.

>Unformatted:

Home	PR Database Search