Mon Mar 15 19:33:44 2021 UTC ()
qt5-qtbase: more than just linux needs QMAKE_PLATFORM set these days


(markd)
diff -r1.105 -r1.106 pkgsrc/x11/qt5-qtbase/Makefile
cvs diff -r1.105 -r1.106 pkgsrc/x11/qt5-qtbase/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtbase/Makefile 2020/11/29 22:33:21 1.105
+++ pkgsrc/x11/qt5-qtbase/Makefile 2021/03/15 19:33:44 1.106
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.105 2020/11/29 22:33:21 dbj Exp $ 1# $NetBSD: Makefile,v 1.106 2021/03/15 19:33:44 markd Exp $
2 2
3DISTNAME= qtbase-everywhere-src-${QTVERSION} 3DISTNAME= qtbase-everywhere-src-${QTVERSION}
4PKGNAME= qt5-qtbase-${QTVERSION} 4PKGNAME= qt5-qtbase-${QTVERSION}
5PKGREVISION= 1 5PKGREVISION= 2
6COMMENT= C++ X GUI toolkit 6COMMENT= C++ X GUI toolkit
7 7
8.include "../../x11/qt5-qtbase/Makefile.common" 8.include "../../x11/qt5-qtbase/Makefile.common"
9 9
10HAS_CONFIGURE= yes 10HAS_CONFIGURE= yes
11CONFIGURE_ARGS+= -prefix "${QTPREFIX}" 11CONFIGURE_ARGS+= -prefix "${QTPREFIX}"
12CONFIGURE_ARGS+= -I "${PREFIX}/include" 12CONFIGURE_ARGS+= -I "${PREFIX}/include"
13CONFIGURE_ARGS+= -L "${PREFIX}/lib" 13CONFIGURE_ARGS+= -L "${PREFIX}/lib"
14CONFIGURE_ARGS+= -opensource -confirm-license 14CONFIGURE_ARGS+= -opensource -confirm-license
15CONFIGURE_ARGS+= -sysconfdir "${PKG_SYSCONFDIR}/xdg" 15CONFIGURE_ARGS+= -sysconfdir "${PKG_SYSCONFDIR}/xdg"
16CONFIGURE_ARGS+= -accessibility 16CONFIGURE_ARGS+= -accessibility
17CONFIGURE_ARGS+= -icu 17CONFIGURE_ARGS+= -icu
18CONFIGURE_ARGS+= -libproxy 18CONFIGURE_ARGS+= -libproxy
@@ -153,26 +153,34 @@ SUBST_FILES.path= src/corelib/io/qstanda @@ -153,26 +153,34 @@ SUBST_FILES.path= src/corelib/io/qstanda
153SUBST_VARS.path= PREFIX 153SUBST_VARS.path= PREFIX
154 154
155BROKEN_FILES= qt5/mkspecs/modules/qt_lib_bootstrap_private.pri 155BROKEN_FILES= qt5/mkspecs/modules/qt_lib_bootstrap_private.pri
156BROKEN_FILES1= qt5/mkspecs/qmodule.pri 156BROKEN_FILES1= qt5/mkspecs/qmodule.pri
157 157
158PC_FILES= Qt5Concurrent.pc Qt5Core.pc \ 158PC_FILES= Qt5Concurrent.pc Qt5Core.pc \
159 Qt5Gui.pc Qt5Network.pc Qt5OpenGL.pc \ 159 Qt5Gui.pc Qt5Network.pc Qt5OpenGL.pc \
160 Qt5OpenGLExtensions.pc \ 160 Qt5OpenGLExtensions.pc \
161 Qt5PrintSupport.pc Qt5Sql.pc Qt5Test.pc \ 161 Qt5PrintSupport.pc Qt5Sql.pc Qt5Test.pc \
162 Qt5Widgets.pc Qt5Xml.pc 162 Qt5Widgets.pc Qt5Xml.pc
163 163
164.if ${OPSYS} == "Linux" 164.if ${OPSYS} == "Linux"
165QMAKE_EXTRA= QMAKE_PLATFORM += linux 165QMAKE_EXTRA= QMAKE_PLATFORM += linux
 166.elif ${OPSYS} == "NetBSD"
 167QMAKE_EXTRA= QMAKE_PLATFORM += netbsd
 168.elif ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
 169QMAKE_EXTRA= QMAKE_PLATFORM += freebsd
 170.elif ${OPSYS} == "OpenBSD"
 171QMAKE_EXTRA= QMAKE_PLATFORM += openbsd
 172.elif ${OPSYS} == "SunOS"
 173QMAKE_EXTRA= QMAKE_PLATFORM += solaris
166.else 174.else
167QMAKE_EXTRA= 175QMAKE_EXTRA=
168.endif 176.endif
169 177
170COMPILER= gcc 178COMPILER= gcc
171.if !empty(PKGSRC_COMPILER:Mclang) 179.if !empty(PKGSRC_COMPILER:Mclang)
172COMPILER+= clang llvm 180COMPILER+= clang llvm
173.endif 181.endif
174 182
175pre-configure: 183pre-configure:
176 ${SED} -e 's:@PREFIX@:${PREFIX}:g' \ 184 ${SED} -e 's:@PREFIX@:${PREFIX}:g' \
177 -e 's:@X11BASE@:${X11BASE}:g' \ 185 -e 's:@X11BASE@:${X11BASE}:g' \
178 -e 's:@COMPILER@:${COMPILER:Q}:g' \ 186 -e 's:@COMPILER@:${COMPILER:Q}:g' \