pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/x11 qt5: update to 5.10.0



details:   https://anonhg.NetBSD.org/pkgsrc/rev/008066439ff9
branches:  trunk
changeset: 374179:008066439ff9
user:      markd <markd%pkgsrc.org@localhost>
date:      Wed Jan 17 19:30:46 2018 +0000

description:
qt5: update to 5.10.0

2+ years worth of bug fixes and feature enhancements

diffstat:

 x11/qt5-qtbase/Makefile                                                                              |   76 +-
 x11/qt5-qtbase/Makefile.common                                                                       |   14 +-
 x11/qt5-qtbase/PLIST                                                                                 |  900 ++++++---
 x11/qt5-qtbase/PLIST.Darwin                                                                          |   25 +
 x11/qt5-qtbase/PLIST.Linux                                                                           |   41 +-
 x11/qt5-qtbase/buildlink3.mk                                                                         |   16 +-
 x11/qt5-qtbase/distinfo                                                                              |   53 +-
 x11/qt5-qtbase/files/qmake.conf                                                                      |   40 +-
 x11/qt5-qtbase/files/qmake.conf.mac                                                                  |   44 +-
 x11/qt5-qtbase/options.mk                                                                            |   32 +-
 x11/qt5-qtbase/patches/patch-config.tests_unix_iconv_iconv.cpp                                       |   10 +-
 x11/qt5-qtbase/patches/patch-configure                                                               |   64 +-
 x11/qt5-qtbase/patches/patch-mkspecs_features_mac_objective__c.prf                                   |   17 -
 x11/qt5-qtbase/patches/patch-mkspecs_features_qt__module.prf                                         |   14 +
 x11/qt5-qtbase/patches/patch-mkspecs_features_qt__module__pris.prf                                   |   15 -
 x11/qt5-qtbase/patches/patch-mkspecs_features_simd.prf                                               |   38 -
 x11/qt5-qtbase/patches/patch-qmake_Makefile.unix                                                     |   53 +-
 x11/qt5-qtbase/patches/patch-qmake_generators_makefile.cpp                                           |   10 +-
 x11/qt5-qtbase/patches/patch-qmake_generators_unix_unixmake.cpp                                      |   78 -
 x11/qt5-qtbase/patches/patch-qmake_generators_unix_unixmake2.cpp                                     |   33 +-
 x11/qt5-qtbase/patches/patch-qmake_qmake.pri                                                         |   15 -
 x11/qt5-qtbase/patches/patch-src_concurrent_qtconcurrentiteratekernel.cpp                            |   24 -
 x11/qt5-qtbase/patches/patch-src_corelib_arch_sparc_arch.pri                                         |   15 -
 x11/qt5-qtbase/patches/patch-src_corelib_codecs_qiconvcodec.cpp                                      |   37 +-
 x11/qt5-qtbase/patches/patch-src_corelib_global_qsystemdetection.h                                   |   24 -
 x11/qt5-qtbase/patches/patch-src_corelib_io_io.pri                                                   |   10 +-
 x11/qt5-qtbase/patches/patch-src_corelib_io_qlockfile__unix.cpp                                      |   40 -
 x11/qt5-qtbase/patches/patch-src_corelib_io_qstorageinfo_unix.cpp                                    |   40 +-
 x11/qt5-qtbase/patches/patch-src_corelib_thread_qwaitcondition__unix.cpp                             |   20 +-
 x11/qt5-qtbase/patches/patch-src_network_kernel_qhostinfo__unix.cpp                                  |    8 +-
 x11/qt5-qtbase/patches/patch-src_openglextensions_openglextensions.pro                               |    8 +-
 x11/qt5-qtbase/patches/patch-src_platformsupport_devicediscovery_devicediscovery.pri                 |   12 -
 x11/qt5-qtbase/patches/patch-src_platformsupport_platformsupport.pro                                 |   15 -
 x11/qt5-qtbase/patches/patch-src_plugins_platforminputcontexts_compose_compose.pro                   |   10 +-
 x11/qt5-qtbase/patches/patch-src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp |    8 +-
 x11/qt5-qtbase/patches/patch-src_plugins_platforms_cocoa_qcocoahelpers.h                             |   16 -
 x11/qt5-qtbase/patches/patch-src_plugins_platforms_cocoa_qcocoahelpers.mm                            |   35 -
 x11/qt5-qtbase/patches/patch-src_tools_bootstrap_bootstrap.pro                                       |   12 -
 x11/qt5-qtbase/patches/patch-tests_auto_corelib_io_qprocess_qprocess.pro                             |    6 +-
 x11/qt5-qtdeclarative/Makefile                                                                       |    5 +-
 x11/qt5-qtdeclarative/PLIST                                                                          |  330 ++-
 x11/qt5-qtdeclarative/buildlink3.mk                                                                  |    6 +-
 x11/qt5-qtdeclarative/distinfo                                                                       |   13 +-
 x11/qt5-qtdeclarative/patches/patch-src_3rdparty_masm_wtf_MathExtras.h                               |   15 -
 x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4engine.cpp                                  |   29 -
 x11/qt5-qtdeclarative/patches/patch-src_qmldevtools_qmldevtools.pro                                  |   17 -
 x11/qt5-qtdoc/Makefile                                                                               |    5 +-
 x11/qt5-qtdoc/PLIST                                                                                  |   65 +-
 x11/qt5-qtdoc/distinfo                                                                               |   10 +-
 x11/qt5-qtgraphicaleffects/Makefile                                                                  |    5 +-
 x11/qt5-qtgraphicaleffects/PLIST                                                                     |   41 +-
 x11/qt5-qtgraphicaleffects/distinfo                                                                  |   10 +-
 x11/qt5-qtimageformats/Makefile                                                                      |    5 +-
 x11/qt5-qtimageformats/PLIST                                                                         |   18 +-
 x11/qt5-qtimageformats/buildlink3.mk                                                                 |    6 +-
 x11/qt5-qtimageformats/distinfo                                                                      |   10 +-
 x11/qt5-qtlocation/Makefile                                                                          |    5 +-
 x11/qt5-qtlocation/PLIST                                                                             |  101 +-
 x11/qt5-qtlocation/PLIST.Darwin                                                                      |    3 +
 x11/qt5-qtlocation/PLIST.Linux                                                                       |    3 +
 x11/qt5-qtlocation/buildlink3.mk                                                                     |    6 +-
 x11/qt5-qtlocation/distinfo                                                                          |   10 +-
 x11/qt5-qtmultimedia/Makefile                                                                        |    5 +-
 x11/qt5-qtmultimedia/PLIST                                                                           |   95 +-
 x11/qt5-qtmultimedia/PLIST.Darwin                                                                    |    5 +
 x11/qt5-qtmultimedia/buildlink3.mk                                                                   |    8 +-
 x11/qt5-qtmultimedia/distinfo                                                                        |   12 +-
 x11/qt5-qtmultimedia/patches/patch-config.tests_alsa_alsatest.cpp                                    |   15 -
 x11/qt5-qtmultimedia/patches/patch-qtmultimedia.pro                                                  |   26 -
 x11/qt5-qtquickcontrols/Makefile                                                                     |    5 +-
 x11/qt5-qtquickcontrols/PLIST                                                                        |  223 ++-
 x11/qt5-qtquickcontrols/buildlink3.mk                                                                |    6 +-
 x11/qt5-qtquickcontrols/distinfo                                                                     |   10 +-
 x11/qt5-qtscript/Makefile                                                                            |    5 +-
 x11/qt5-qtscript/PLIST                                                                               |   12 +-
 x11/qt5-qtscript/buildlink3.mk                                                                       |    6 +-
 x11/qt5-qtscript/distinfo                                                                            |   10 +-
 x11/qt5-qtsensors/Makefile                                                                           |    5 +-
 x11/qt5-qtsensors/PLIST                                                                              |   27 +-
 x11/qt5-qtsensors/PLIST.Darwin                                                                       |    3 +
 x11/qt5-qtsensors/buildlink3.mk                                                                      |    6 +-
 x11/qt5-qtsensors/distinfo                                                                           |   10 +-
 x11/qt5-qtserialport/Makefile                                                                        |    5 +-
 x11/qt5-qtserialport/PLIST                                                                           |    8 +-
 x11/qt5-qtserialport/buildlink3.mk                                                                   |    8 +-
 x11/qt5-qtserialport/distinfo                                                                        |   10 +-
 x11/qt5-qtsvg/Makefile                                                                               |    5 +-
 x11/qt5-qtsvg/PLIST                                                                                  |   12 +-
 x11/qt5-qtsvg/buildlink3.mk                                                                          |    8 +-
 x11/qt5-qtsvg/distinfo                                                                               |   10 +-
 x11/qt5-qttools/Makefile                                                                             |   14 +-
 x11/qt5-qttools/PLIST                                                                                |   58 +-
 x11/qt5-qttools/buildlink3.mk                                                                        |   15 +-
 x11/qt5-qttools/distinfo                                                                             |   17 +-
 x11/qt5-qttools/patches/patch-src_assistant_3rdparty_clucene_src_CLucene_index_SegmentMerger.cpp     |   13 -
 x11/qt5-qttools/patches/patch-src_assistant_3rdparty_clucene_src_CLucene_search_FieldCacheImpl.cpp   |   13 -
 x11/qt5-qttools/patches/patch-src_assistant_3rdparty_clucene_src_CLucene_util_Arrays.h               |   13 -
 x11/qt5-qttools/patches/patch-src_assistant_assistant_assistant.pro                                  |   19 +
 x11/qt5-qttools/patches/patch-src_assistant_clucene_qclucene-config__p.h                             |   24 -
 x11/qt5-qttools/patches/patch-src_designer_src_plugins_plugins.pro                                   |   14 +
 x11/qt5-qttools/patches/patch-src_designer_src_uitools_uitools.pro                                   |   13 -
 x11/qt5-qttranslations/Makefile                                                                      |    5 +-
 x11/qt5-qttranslations/PLIST                                                                         |   80 +-
 x11/qt5-qttranslations/distinfo                                                                      |   10 +-
 x11/qt5-qtwebchannel/Makefile                                                                        |    5 +-
 x11/qt5-qtwebchannel/PLIST                                                                           |    9 +-
 x11/qt5-qtwebchannel/buildlink3.mk                                                                   |    8 +-
 x11/qt5-qtwebchannel/distinfo                                                                        |   10 +-
 x11/qt5-qtwebsockets/Makefile                                                                        |    8 +-
 x11/qt5-qtwebsockets/PLIST                                                                           |   10 +-
 x11/qt5-qtwebsockets/buildlink3.mk                                                                   |   12 +-
 x11/qt5-qtwebsockets/distinfo                                                                        |   10 +-
 x11/qt5-qtx11extras/Makefile                                                                         |    5 +-
 x11/qt5-qtx11extras/PLIST                                                                            |    7 +-
 x11/qt5-qtx11extras/buildlink3.mk                                                                    |    6 +-
 x11/qt5-qtx11extras/distinfo                                                                         |   10 +-
 x11/qt5-qtxmlpatterns/Makefile                                                                       |    6 +-
 x11/qt5-qtxmlpatterns/PLIST                                                                          |    9 +-
 x11/qt5-qtxmlpatterns/buildlink3.mk                                                                  |    6 +-
 x11/qt5-qtxmlpatterns/distinfo                                                                       |   10 +-
 x11/qt5/Makefile                                                                                     |   11 +-
 x11/qt5/Makefile.common                                                                              |    6 +-
 122 files changed, 1868 insertions(+), 1794 deletions(-)

diffs (truncated from 7278 to 300 lines):

diff -r cc53f40a9a58 -r 008066439ff9 x11/qt5-qtbase/Makefile
--- a/x11/qt5-qtbase/Makefile   Wed Jan 17 19:21:20 2018 +0000
+++ b/x11/qt5-qtbase/Makefile   Wed Jan 17 19:30:46 2018 +0000
@@ -1,59 +1,60 @@
-# $NetBSD: Makefile,v 1.49 2017/11/30 16:45:12 adam Exp $
+# $NetBSD: Makefile,v 1.50 2018/01/17 19:30:46 markd Exp $
 
-DISTNAME=      qtbase-opensource-src-${QTVERSION}
+DISTNAME=      qtbase-everywhere-src-${QTVERSION}
 PKGNAME=       qt5-qtbase-${QTVERSION}
-PKGREVISION=   18
 COMMENT=       C++ X GUI toolkit
 
 .include "../../x11/qt5-qtbase/Makefile.common"
 
-.if defined(MAKE_JOBS)
-.  if !defined(MAKE_JOBS_SAFE) || empty(MAKE_JOBS_SAFE:M[nN][oO])
-CONFIGURE_ENV+=                MAKE_FLAGS=-j${MAKE_JOBS:Q}
-.  endif
-.endif
 HAS_CONFIGURE=         yes
-CONFIGURE_ARGS+=       -optimized-qmake
 CONFIGURE_ARGS+=       -prefix "${QTPREFIX}"
-CONFIGURE_ARGS+=       ${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-l*}
 CONFIGURE_ARGS+=       -opensource -confirm-license
 CONFIGURE_ARGS+=       -sysconfdir "${PKG_SYSCONFDIR}/xdg"
 CONFIGURE_ARGS+=       -accessibility
 CONFIGURE_ARGS+=       -dbus-linked
-CONFIGURE_ARGS+=       -fontconfig
-CONFIGURE_ARGS+=       -force-pkg-config
 CONFIGURE_ARGS+=       -icu
+CONFIGURE_ARGS+=       -libproxy
 CONFIGURE_ARGS+=       -openssl-linked
 CONFIGURE_ARGS+=       -nomake examples
 CONFIGURE_ARGS+=       -nomake tests
 CONFIGURE_ARGS+=       -no-pch
-CONFIGURE_ARGS+=        -no-sql-db2
-CONFIGURE_ARGS+=        -no-sql-ibase
+CONFIGURE_ARGS+=       -no-sql-db2
+CONFIGURE_ARGS+=       -no-sql-ibase
 CONFIGURE_ARGS+=       -no-sql-mysql
-CONFIGURE_ARGS+=        -no-sql-oci
-CONFIGURE_ARGS+=        -no-sql-odbc
+CONFIGURE_ARGS+=       -no-sql-oci
+CONFIGURE_ARGS+=       -no-sql-odbc
 CONFIGURE_ARGS+=       -no-sql-psql
-CONFIGURE_ARGS+=       -no-sql-sqlite
-CONFIGURE_ARGS+=        -no-sql-sqlite2
+#CONFIGURE_ARGS+=      -no-sql-sqlite
+CONFIGURE_ARGS+=       -no-sql-sqlite2
 CONFIGURE_ARGS+=       -no-sql-tds
 CONFIGURE_ARGS+=       -no-strip
+CONFIGURE_ARGS+=       -no-use-gold-linker
+CONFIGURE_ARGS+=       -pkg-config
+CONFIGURE_ARGS+=       -release
+CONFIGURE_ARGS+=       -shared
 CONFIGURE_ARGS+=       -system-harfbuzz
 CONFIGURE_ARGS+=       -system-libjpeg
 CONFIGURE_ARGS+=       -system-libpng
 CONFIGURE_ARGS+=       -system-pcre
 CONFIGURE_ARGS+=       -system-sqlite
 CONFIGURE_ARGS+=       -system-zlib
+.if defined(MAKE_JOBS)
+.  if !defined(MAKE_JOBS_SAFE) || empty(MAKE_JOBS_SAFE:M[nN][oO])
+CONFIGURE_ENV+=                MAKEFLAGS=-j${MAKE_JOBS}
+.  endif
+.endif
 
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} != "Darwin"
-CONFIGURE_ARGS+=       -iconv
+CONFIGURE_ARGS+=       -fontconfig
 QMAKE_CONF=            qmake.conf
 .  if ${OPSYS} != "SunOS" && \
       (!empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64))
 CONFIGURE_ARGS+=       -reduce-relocations
 .  endif
 .else
+CONFIGURE_ARGS+=       -no-rpath       # avoid @rpath in dylibs
 QMAKE_CONF=            qmake.conf.mac
 .endif
 
@@ -99,11 +100,10 @@
 .  endif
 LDFLAGS.FreeBSD+=      -lutil
 .endif
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
-LDFLAGS+=              -lkvm   # see patch-src_corelib_io_qlockfile__unix.cpp
-.endif
 
+REPLACE_PERL+=         bin/fixqt4headers.pl
 REPLACE_PERL+=         bin/syncqt.pl
+REPLACE_PERL+=         mkspecs/features/uikit/devices.pl
 
 PTHREAD_OPTS+=         require
 UNLIMIT_RESOURCES=     datasize
@@ -120,32 +120,36 @@
 CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/plugandpaintplugins/basictools/basictools.pro
 CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/plugandpaintplugins/extrafilters/extrafilters.pro
 CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/styleplugin/plugin/plugin.pro
+CHECK_INTERPRETER_SKIP+=qt5/mkspecs/features/data/mac/objc_namespace.sh
+CHECK_INTERPRETER_SKIP+=qt5/mkspecs/features/uikit/device_destinations.sh
+CHECK_INTERPRETER_SKIP+=qt5/mkspecs/features/uikit/devices.py
 CHECK_INTERPRETER_SKIP+=qt5/mkspecs/macx-ios-clang/rename_main.sh
 
-SUBST_CLASSES+=                opt path
+SUBST_CLASSES+=                opt
 SUBST_STAGE.opt=       pre-configure
 SUBST_MESSAGE.opt=     Removing some Qt5 default compiler flags.
 SUBST_FILES.opt=       mkspecs/common/gcc-base.conf
-SUBST_SED.opt=         -e 's,-O[23],,'
+SUBST_SED.opt=         -e 's,-O[s23],,'
 SUBST_SED.opt+=                -e 's,-fvisibility=hidden,,'
 
+SUBST_CLASSES+=                path
 SUBST_STAGE.path=      pre-configure
 SUBST_MESSAGE.path=    Add to default XDG path.
 SUBST_FILES.path=      src/corelib/io/qstandardpaths_unix.cpp
 SUBST_VARS.path=       LOCALBASE
 
 BROKEN_FILES=          qt5/mkspecs/modules/qt_lib_bootstrap_private.pri
+BROKEN_FILES1=         qt5/mkspecs/qmodule.pri
 
-PC_FILES=              Qt5Bootstrap.pc Qt5Concurrent.pc Qt5Core.pc \
+PC_FILES=              Qt5Concurrent.pc Qt5Core.pc Qt5DBus.pc \
                        Qt5Gui.pc Qt5Network.pc Qt5OpenGL.pc \
-                       Qt5OpenGLExtensions.pc Qt5PlatformSupport.pc \
+                       Qt5OpenGLExtensions.pc \
                        Qt5PrintSupport.pc Qt5Sql.pc Qt5Test.pc \
                        Qt5Widgets.pc Qt5Xml.pc
 
 pre-configure:
        ${SED}  -e 's:@LOCALBASE@:${LOCALBASE}:g' \
                -e 's:@X11BASE@:${X11BASE}:g' \
-               -e 's:@LIBTOOL@:${LIBTOOL:Q}:g' \
                -e 's:@CC@:${CC:Q}:g' \
                -e 's:@CXX@:${CXX:Q}:g' \
                -e 's:@LDFLAGS@:${LDFLAGS:Q}:g' \
@@ -167,10 +171,7 @@
                        rm -f $${dir}/*.orig; \
                done
        ${RM} -f ${WRKSRC}/mkspecs/features/mac/default_pre.prf
-       ${RM} -f ${WRKSRC}/mkspecs/features/mac/objective_c.prf.orig
-
-post-configure:
-       cd ${WRKSRC} && ./bin/qmake -o Makefile
+       ${RM} -f ${WRKSRC}/mkspecs/features/mac/default_post.prf
 
 post-install:
 .for i in ${PC_FILES}
@@ -185,13 +186,18 @@
                > ${DESTDIR}${PREFIX}/${BROKEN_FILES}.1
        ${MV} -f ${DESTDIR}${PREFIX}/${BROKEN_FILES}.1 \
                ${DESTDIR}${PREFIX}/${BROKEN_FILES}
+       ${SED} -e 's,PKG_CONFIG_EXECUTABLE = .*,PKG_CONFIG_EXECUTABLE = ${TOOLS_PATH.pkg-config},' \
+               ${DESTDIR}${PREFIX}/${BROKEN_FILES1} \
+               > ${DESTDIR}${PREFIX}/${BROKEN_FILES1}.1
+       ${MV} -f ${DESTDIR}${PREFIX}/${BROKEN_FILES1}.1 \
+               ${DESTDIR}${PREFIX}/${BROKEN_FILES1}
 
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pcre/buildlink3.mk"
+.include "../../devel/pcre2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../fonts/harfbuzz/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
@@ -200,7 +206,9 @@
 USE_DBUS-ARCH-DEPS_H=  yes
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
+.include "../../www/libproxy/buildlink3.mk"
 .if ${OPSYS} != "Darwin"
+.include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .  if !empty(MESALIB_SUPPORTS_EGL:Myes)
 PLIST.egl=     yes
@@ -209,12 +217,14 @@
 .include "../../x11/xcb-util/buildlink3.mk"
 .include "../../x11/xcb-util-image/buildlink3.mk"
 .include "../../x11/xcb-util-keysyms/buildlink3.mk"
+.include "../../x11/xcb-util-renderutil/buildlink3.mk"
 .include "../../x11/xcb-util-wm/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXcursor/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXi/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
diff -r cc53f40a9a58 -r 008066439ff9 x11/qt5-qtbase/Makefile.common
--- a/x11/qt5-qtbase/Makefile.common    Wed Jan 17 19:21:20 2018 +0000
+++ b/x11/qt5-qtbase/Makefile.common    Wed Jan 17 19:30:46 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2017/05/03 08:38:46 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.22 2018/01/17 19:30:46 markd Exp $
 # used by x11/qt5-mysql/Makefile
 # used by x11/qt5-odbc/Makefile
 # used by x11/qt5-psql/Makefile
@@ -32,7 +32,6 @@
 BUILDLINK_TRANSFORM+=  opt:-ldl:${BUILDLINK_LDADD.dl:M*}
 
 USE_LANGUAGES=         c c++11
-USE_LIBTOOL=           yes
 USE_TOOLS+=            gmake perl:build pkg-config
 
 # wcstof(3) etc. is used in C++ code.
@@ -46,19 +45,22 @@
 BUILDLINK_TRANSFORM.SunOS+=    rm:-Wl,-rpath-link,${WRKSRC}/lib
 
 MAKE_ENV+=             QTPREFIX=${QTPREFIX:Q}
-PLIST_VARS+=           mac unix
+PLIST_VARS+=           jit mac unix
 .if ${OPSYS} == "Darwin"
 PLIST.mac=             yes
 .else
 PLIST.unix=            yes
 .endif
+.if ${OPSYS} != "NetBSD"
+PLIST.jit=             yes
+.endif
 
 # avoid creating a .qt directory in the users home directory
 SCRIPTS_ENV+=          HOME=${WRKDIR}
 
-.if empty(PKGPATH:Mx11/qt5-qtbase) \
-       && empty(PKGPATH:Mx11/qt5-odbc) && empty(PKGPATH:Mx11/qt5-mysql) \
-       && empty(PKGPATH:Mx11/qt5-psql) && empty(PKGPATH:Mx11/qt5-sqlite3)
+.if empty(PKGPATH:Mwip/qt5-qtbase) \
+       && empty(PKGPATH:Mwip/qt5-odbc) && empty(PKGPATH:Mwip/qt5-mysql) \
+       && empty(PKGPATH:Mwip/qt5-psql) && empty(PKGPATH:Mwip/qt5-sqlite3)
 do-configure:
        cd ${WRKSRC} && ${QTPREFIX}/bin/qmake -o Makefile
 .endif
diff -r cc53f40a9a58 -r 008066439ff9 x11/qt5-qtbase/PLIST
--- a/x11/qt5-qtbase/PLIST      Wed Jan 17 19:21:20 2018 +0000
+++ b/x11/qt5-qtbase/PLIST      Wed Jan 17 19:30:46 2018 +0000
@@ -1,23 +1,23 @@
-@comment $NetBSD: PLIST,v 1.11 2016/01/18 20:52:43 nros Exp $
-lib/pkgconfig/Qt5Bootstrap.pc
+@comment $NetBSD: PLIST,v 1.12 2018/01/17 19:30:46 markd Exp $
 lib/pkgconfig/Qt5Concurrent.pc
 lib/pkgconfig/Qt5Core.pc
+lib/pkgconfig/Qt5DBus.pc
 lib/pkgconfig/Qt5Gui.pc
 lib/pkgconfig/Qt5Network.pc
 lib/pkgconfig/Qt5OpenGL.pc
 lib/pkgconfig/Qt5OpenGLExtensions.pc
-lib/pkgconfig/Qt5PlatformSupport.pc
 lib/pkgconfig/Qt5PrintSupport.pc
 lib/pkgconfig/Qt5Sql.pc
 lib/pkgconfig/Qt5Test.pc
 lib/pkgconfig/Qt5Widgets.pc
 lib/pkgconfig/Qt5Xml.pc
+qt5/bin/fixqt4headers.pl
 qt5/bin/moc
 qt5/bin/qdbuscpp2xml
 qt5/bin/qdbusxml2cpp
-qt5/bin/qdoc
 qt5/bin/qlalr
 qt5/bin/qmake
+qt5/bin/qvkgen
 qt5/bin/rcc
 qt5/bin/syncqt.pl
 qt5/bin/uic
@@ -39,6 +39,7 @@
 qt5/doc/global/macros.qdocconf
 qt5/doc/global/manifest-meta.qdocconf
 qt5/doc/global/qt-cpp-defines.qdocconf
+qt5/doc/global/qt-html-templates-offline-simple.qdocconf
 qt5/doc/global/qt-html-templates-offline.qdocconf
 qt5/doc/global/qt-html-templates-online.qdocconf
 qt5/doc/global/qt-module-defaults-offline.qdocconf
@@ -91,9 +92,16 @@
 qt5/doc/global/template/style/icomoon.ttf
 qt5/doc/global/template/style/icomoon.woff
 qt5/doc/global/template/style/list_arrow.png
+qt5/doc/global/template/style/list_expand.png
+qt5/doc/global/template/style/offline-simple.css
 qt5/doc/global/template/style/offline.css
 qt5/doc/global/template/style/online.css
 qt5/doc/global/template/style/theqtcompany.png
+qt5/include/QtAccessibilitySupport/${PKGVERSION}/QtAccessibilitySupport/private/qaccessiblebridgeutils_p.h
+qt5/include/QtAccessibilitySupport/QtAccessibilitySupport
+qt5/include/QtAccessibilitySupport/QtAccessibilitySupportDepends
+qt5/include/QtAccessibilitySupport/QtAccessibilitySupportVersion
+qt5/include/QtAccessibilitySupport/qtaccessibilitysupportversion.h
 qt5/include/QtConcurrent/QtConcurrent
 qt5/include/QtConcurrent/QtConcurrentDepends
 qt5/include/QtConcurrent/QtConcurrentFilter
@@ -117,6 +125,7 @@
 qt5/include/QtConcurrent/qtconcurrentthreadengine.h
 qt5/include/QtConcurrent/qtconcurrentversion.h



Home | Main Index | Thread Index | Old Index