Received: by mail.netbsd.org (Postfix, from userid 605)
	id B17CE84DF4; Thu,  5 Mar 2020 11:58:08 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
	by mail.netbsd.org (Postfix) with ESMTP id 39AD184DF2
	for <pkgsrc-changes@NetBSD.org>; Thu,  5 Mar 2020 11:58:08 +0000 (UTC)
X-Virus-Scanned: amavisd-new at netbsd.org
Received: from mail.netbsd.org ([IPv6:::1])
	by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025)
	with ESMTP id 8HPI18XIAFS0 for <pkgsrc-changes@netbsd.org>;
	Thu,  5 Mar 2020 11:58:07 +0000 (UTC)
Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984])
	by mail.netbsd.org (Postfix) with ESMTP id BA5A184CD3
	for <pkgsrc-changes@NetBSD.org>; Thu,  5 Mar 2020 11:58:07 +0000 (UTC)
Received: by cvs.NetBSD.org (Postfix, from userid 500)
	id B3FB6FA97; Thu,  5 Mar 2020 11:58:07 +0000 (UTC)
Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_158340948719600"
MIME-Version: 1.0
Date: Thu, 5 Mar 2020 11:58:07 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/x11/qt5-qtbase
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
X-Mailer: log_accum
Message-Id: <20200305115807.B3FB6FA97@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
List-Id: pkgsrc-changes.NetBSD.org
Precedence: bulk
List-Unsubscribe: <mailto:majordomo@NetBSD.org?subject=Unsubscribe%20pkgsrc-changes&body=unsubscribe%20pkgsrc-changes>

This is a multi-part message in MIME format.

--_----------=_158340948719600
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nia
Date:		Thu Mar  5 11:58:07 UTC 2020

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

Log Message:
qt5-qtbase: these options are only for the -base package


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 pkgsrc/x11/qt5-qtbase/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/x11/qt5-qtbase/Makefile.common

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


--_----------=_158340948719600
Content-Disposition: inline
Content-Length: 1530
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/x11/qt5-qtbase/Makefile
diff -u pkgsrc/x11/qt5-qtbase/Makefile:1.88 pkgsrc/x11/qt5-qtbase/Makefile:1.89
--- pkgsrc/x11/qt5-qtbase/Makefile:1.88	Tue Jan 21 20:25:37 2020
+++ pkgsrc/x11/qt5-qtbase/Makefile	Thu Mar  5 11:58:07 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2020/01/21 20:25:37 adam Exp $
+# $NetBSD: Makefile,v 1.89 2020/03/05 11:58:07 nia Exp $
 
 DISTNAME=	qtbase-everywhere-src-${QTVERSION}
 PKGNAME=	qt5-qtbase-${QTVERSION}
@@ -220,6 +220,7 @@ post-install:
 	${MV} -f ${DESTDIR}${PREFIX}/${BROKEN_FILES1}.1 \
 		${DESTDIR}${PREFIX}/${BROKEN_FILES1}
 
+.include "options.mk"
 .include "../../archivers/zstd/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"

Index: pkgsrc/x11/qt5-qtbase/Makefile.common
diff -u pkgsrc/x11/qt5-qtbase/Makefile.common:1.37 pkgsrc/x11/qt5-qtbase/Makefile.common:1.38
--- pkgsrc/x11/qt5-qtbase/Makefile.common:1.37	Wed Jan 22 14:06:08 2020
+++ pkgsrc/x11/qt5-qtbase/Makefile.common	Thu Mar  5 11:58:07 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.37 2020/01/22 14:06:08 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.38 2020/03/05 11:58:07 nia Exp $
 # used by x11/qt5-mysql/Makefile
 # used by x11/qt5-odbc/Makefile
 # used by x11/qt5-psql/Makefile
@@ -31,7 +31,6 @@
 # used by x11/qt5-qtxmlpatterns/Makefile
 
 .include "../../x11/qt5/Makefile.common"
-.include "options.mk"
 
 .include "../../mk/dlopen.buildlink3.mk"
 BUILDLINK_TRANSFORM+=	opt:-ldl:${BUILDLINK_LDADD.dl:Q}


--_----------=_158340948719600--