CVS commit: pkgsrc/x11/qt5

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Wed Dec 26 11:48:27 UTC 2018

Modified Files:
        pkgsrc/x11/qt5: Makefile Makefile.common

Log Message:
Fix LICENSE and make pkglint happier


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/x11/qt5/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/qt5/Makefile.common

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

Modified files:

Index: pkgsrc/x11/qt5/Makefile
diff -u pkgsrc/x11/qt5/Makefile:1.14 pkgsrc/x11/qt5/Makefile:1.15
--- pkgsrc/x11/qt5/Makefile:1.14        Tue Dec 18 09:57:17 2018
+++ pkgsrc/x11/qt5/Makefile     Wed Dec 26 11:48:27 2018
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2018/12/18 09:57:17 adam Exp $
+# $NetBSD: Makefile,v 1.15 2018/12/26 11:48:27 ryoon Exp $
 
 DISTNAME=      qt5-${QTVERSION}
-CATEGORIES=    x11
-MASTER_SITES=  # none
 
 COMMENT=       "meta-package" for version 5 of the QT GUI C++ toolkit
 

Index: pkgsrc/x11/qt5/Makefile.common
diff -u pkgsrc/x11/qt5/Makefile.common:1.12 pkgsrc/x11/qt5/Makefile.common:1.13
--- pkgsrc/x11/qt5/Makefile.common:1.12 Tue Dec 18 09:57:17 2018
+++ pkgsrc/x11/qt5/Makefile.common      Wed Dec 26 11:48:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2018/12/18 09:57:17 adam Exp $
+# $NetBSD: Makefile.common,v 1.13 2018/12/26 11:48:27 ryoon Exp $
 # used by x11/qt5-qtbase/Makefile.common
 # used by inputmethod/qt5-uim/Makefile
 
@@ -13,6 +13,6 @@ EXTRACT_USING=        bsdtar
 
 MAINTAINER?=   ryoon%NetBSD.org@localhost
 HOMEPAGE=      http://qt-project.org/
-LICENSE=       gnu-lgpl-v2.1 AND gnu-gpl-v3
+LICENSE=       gnu-lgpl-v2.1 AND gnu-lgpl-v3 AND gnu-gpl-v2 AND gnu-gpl-v3
 
-QTPREFIX=      ${LOCALBASE}/qt5
+QTPREFIX=      ${PREFIX}/qt5