Index: head/Mk/bsd.qt.mk =================================================================== --- head/Mk/bsd.qt.mk (revision 442739) +++ head/Mk/bsd.qt.mk (revision 442740) @@ -1,781 +1,783 @@ #-*- tab-width: 4; -*- # ex:ts=4 # # $FreeBSD$ # # Port variables: # USE_QT* - List of Qt modules to depend on, with optional '_build' # and '_run' suffixes. Define it empty to include this file # without depending on Qt ports. # QT_DIST - The port belongs to the Qt distribution. Set to 'yes' for # Qt 4, or to the distribution name(s) for newer versions. # QT_NONSTANDARD - Suppress modification of configure and make environment. # # Global switches (for inclusion into /etc/make.conf): # QT4_OPTIONS - A list of (Qt 4-only) global options; can be CUPS, NAS # and/or QGTKSTYLE. If set, Qt will be built with support # for: # * Common UNIX Printing System (CUPS); # * Network Audio System (NAS); # * GTK+-based Qt theme (QGTKSTYLE). .if !defined(_POSTMKINCLUDED) && !defined(Qt_Pre_Include) Qt_Include_MAINTAINER= kde@FreeBSD.org Qt_Pre_Include= bsd.qt.mk # Qt versions currently supported by the framework. _QT_SUPPORTED?= 4 5 QT4_VERSION?= 4.8.7 QT5_VERSION?= 5.7.1 _QT_RELNAME= qt${_QT_VERSION:R:R} _QT_VERSION= # empty .for ver in ${_QT_SUPPORTED} . if defined(USE_QT${ver}) . if empty(_QT_VERSION) _QT_VERSION= ${QT${ver}_VERSION} . else # Reject different USE_QT*. IGNORE?= can't be installed: different Qt versions specified via USE_QT[${_QT_SUPPORTED:S/ //g}] #' . endif . endif .endfor .if empty(_QT_VERSION) # The file was included without USE_QT*. IGNORE?= can't be installed: bsd.qt.mk may only be included via USE_QT[${_QT_SUPPORTED:S/ //g}] #' .endif .if defined(QT_DIST) QT_NONSTANDARD= yes MASTER_SITES= ${MASTER_SITE_QT} DISTINFO_FILE?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/distinfo LICENSE?= LGPL21 . if !exists(${PKGDIR}/pkg-descr) DESCR?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/pkg-descr . endif # Stage support. DESTDIRNAME= INSTALL_ROOT . if ${_QT_VERSION:M4*} MASTER_SITE_SUBDIR?= official_releases/qt/${_QT_VERSION:R}/${_QT_VERSION}/ DISTNAME= qt-everywhere-opensource-src-${_QT_VERSION} DIST_SUBDIR= KDE . else MASTER_SITE_SUBDIR?= official_releases/qt/${_QT_VERSION:R}/${_QT_VERSION}/submodules/ DISTNAME= ${QT_DIST:S,^,qt,:S,$,-opensource-src-${DISTVERSION},} DISTFILES= ${DISTNAME:S,$,${EXTRACT_SUFX},} DIST_SUBDIR= KDE/Qt/${_QT_VERSION} USES+= tar:xz # Qt (at least when used with qmake) has a tendency to overlink: some libraries # have dependencies on others in the mkspec configurations and the latter are # always passed to the linker even if they are not actually used. By passing # --as-needed to the linker by default when building the Qt ports we do not # have to declare a lot of unnecessary dependencies in USE_QT5. # This could arguably work for Qt4 too, but since it is maintenance mode it is # better not to fix what is not explicitly broken there. LDFLAGS+= -Wl,--as-needed . if ${.TARGETS:Mmakesum} || ${.TARGETS:Mfetch} && \ defined(DISABLE_SIZE) && defined(NO_CHECKSUM) # Ensure that the "makesum" target (with its inner "fetch" one) uses # devel/qt*/distinfo for every port. . if ${DISTINFO_FILE:H} == ${.CURDIR:H:H}/devel/${_QT_RELNAME} QT_DIST= 3d base canvas3d charts connectivity datavis3d declarative \ declarative-render2d gamepad graphicaleffects imageformats \ location multimedia quickcontrols quickcontrols2 script scxml \ sensors serialbus serialport svg tools translations \ virtualkeyboard webchannel webkit websockets x11extras \ xmlpatterns . endif . endif . if ${QT_DIST} == "base" && ${PORTNAME} != "qmake" # Qt configure requires pkg-config to detect dependencies. USES+= pkgconfig # Set QMAKESPEC when building qtbase so that qmake (called by the configure # script) can find the mkspecs we create ourselves in devel/qmake5. CONFIGURE_ENV+= QMAKESPEC="${QMAKESPEC}" MAKE_ENV+= QMAKESPEC="${QMAKESPEC}" . endif # -nomake is only used by qtbase's configure script. # Other ports from other Qt modules will automatically build examples and # tests if the directories exist because of mkspecs/features/qt_parts.prf. EXTRACT_AFTER_ARGS?= ${DISTNAME:S,$,/examples,:S,^,--exclude ,} \ ${DISTNAME:S,$,/tests,:S,^,--exclude ,} . endif # ! ${_QT_VERSION:M4*} CONFIGURE_ENV+= MAKE="${MAKE:T}" CONFIGURE_ARGS+=-opensource -confirm-license \ -platform ${QMAKESPEC} \ -no-pch \ -prefix ${PREFIX} \ -bindir ${PREFIX}/${QT_BINDIR_REL} \ -headerdir ${PREFIX}/${QT_INCDIR_REL} \ -libdir ${PREFIX}/${QT_LIBDIR_REL} \ -plugindir ${PREFIX}/${QT_PLUGINDIR_REL} \ -importdir ${PREFIX}/${QT_IMPORTDIR_REL} \ -datadir ${PREFIX}/${QT_DATADIR_REL} \ -docdir ${PREFIX}/${QT_DOCDIR_REL} \ -translationdir ${PREFIX}/${QT_L10NDIR_REL} \ -sysconfdir ${PREFIX}/${QT_ETCDIR_REL} . if ${_QT_VERSION:M4*} CONFIGURE_ARGS+=-fast \ -system-libjpeg -system-libpng \ -system-libmng -system-libtiff -system-zlib \ -no-phonon-backend \ -examplesdir ${PREFIX}/${QT_EXAMPLEDIR_REL}/examples \ -demosdir ${PREFIX}/${QT_EXAMPLEDIR_REL}/demos . else CONFIGURE_ARGS+=-nomake examples -nomake tests \ -archdatadir ${PREFIX}/${QT_ARCHDIR_REL} \ -libexecdir ${PREFIX}/${QT_LIBEXECDIR_REL} \ -qmldir ${PREFIX}/${QT_QMLDIR_REL} \ -examplesdir ${PREFIX}/${QT_EXAMPLEDIR_REL} \ -testsdir ${PREFIX}/${QT_TESTDIR_REL} . if ${ARCH} == i386 && empty(MACHINE_CPU:Msse2) CONFIGURE_ARGS+=-no-sse2 . endif # Work around a bug in current binutils, where the gold linker creates # duplicate symbols. See pr 218187. Disable the gold-linker for Qt5 ports. CONFIGURE_ARGS+= -no-use-gold-linker . endif . if defined(WANT_QT_DEBUG) || defined(WITH_DEBUG) WITH_DEBUG= yes STRIP= # It's done prior to bsd.qt.mk inclusion. CONFIGURE_ARGS+=-debug -separate-debug-info # Override configuration in global qconfig.pri. QMAKE_ARGS+= QT_CONFIG+="debug separate_debug_info" \ QT_CONFIG-="release" PLIST_SUB+= DEBUG="" . else CONFIGURE_ARGS+=-release -no-separate-debug-info QMAKE_ARGS+= QT_CONFIG+="release" \ QT_CONFIG-="debug separate_debug_info" PLIST_SUB+= DEBUG="@comment " . endif . if defined(WANT_QT_VERBOSE_CONFIGURE) CONFIGURE_ARGS+=-verbose . endif . if ${QT_DIST} == "base" || ${_QT_VERSION:M4*} . if ${_QT_VERSION:M4*} _EXTRA_PATCHES_QT4= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src-corelib-global-qglobal.h \ ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-libtool +# Patch in proper name for armv6 architecture: https://gcc.gnu.org/ml/gcc-patches/2015-06/msg01679.html +_EXTRA_PATCHES_QT4+= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-armv6 . else _EXTRA_PATCHES_QT5= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_create__cmake.prf \ ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf . endif EXTRA_PATCHES?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-configure \ ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-config.tests-unix-compile.test \ ${_EXTRA_PATCHES_QT4} ${_EXTRA_PATCHES_QT5} . endif # Override settings installed in qconfig.h and *.pri files. The flags will be # installed along with the port, but have to be passed as arguments while # building the port itself. Flags prefixed with "-" (e.g., "-CUPS" and "-cups") # are needed to disable some features. . if !defined(${QT_MODNAME}) || empty(${QT_MODNAME}) # Used for both qconfig-*.h and qt_config_*.pri; it can't be empty. QT_MODNAME= ${PORTNAME} . endif QT_DEFINES?= # For qconfig.h flags (without "QT_" prefix). QT_CONFIG?= # For *.pri files QT_CONFIG flags. . if ${QT_DEFINES} QMAKE_ARGS+= DEFINES+="${QT_DEFINES:O:u:C/^([^-])/QT_\1/:C/^-/QT_NO_/:O}" . if ${QT_DEFINES:N-*} # Use a script to cleanup qconfig-modules.h (see qt-post-install). PKGDEINSTALL= ${WRKDIR}/pkg-deinstall . endif . endif . if ${QT_CONFIG:N-*} QMAKE_ARGS+= QT_CONFIG+="${QT_CONFIG:N-*:O:u}" . endif . if ${QT_CONFIG:M-*} QMAKE_ARGS+= QT_CONFIG-="${QT_CONFIG:M-*:O:u:C/^-//}" . endif # Add a RUN_DEPENDS on misc/qtchooser to select the binaries. # The binaries of both supported Qt versions are installed to # ${LOCALBASE}/lib/qt[45]/bin. The port misc/qtchooser installs # wrapper binaries into ${LOCALBASE}/bin, and chooses the correct # one depending on the value of QT_SELECT (which we pass to both # CONFIGURE_ENV and MAKE_ENV). Therefore make all QT_DIST ports # RUN_DEPEND on it. RUN_DEPENDS+= qtchooser:misc/qtchooser PLIST_SUB+= SHORTVER=${DISTVERSION:R} \ FULLVER=${DISTVERSION:C/-.*//} .endif # defined(QT_DIST) # A wrapper (qtchooser) is used to invoke binaries. QT_BINDIR_REL?= ${QT_ARCHDIR_REL}/bin QT_INCDIR_REL?= include/${_QT_RELNAME} QT_LIBDIR_REL?= lib/${_QT_RELNAME} QT_ARCHDIR_REL?=${QT_LIBDIR_REL} QT_PLUGINDIR_REL?= ${QT_ARCHDIR_REL}/plugins QT_LIBEXECDIR_REL?= libexec/${_QT_RELNAME} QT_IMPORTDIR_REL?= ${QT_ARCHDIR_REL}/imports QT_QMLDIR_REL?= ${QT_ARCHDIR_REL}/qml QT_DATADIR_REL?=share/${_QT_RELNAME} QT_DOCDIR_REL?= share/doc/${_QT_RELNAME} QT_L10NDIR_REL?=${QT_DATADIR_REL}/translations QT_ETCDIR_REL?= etc/xdg QT_EXAMPLEDIR_REL?= share/examples/${_QT_RELNAME} QT_TESTDIR_REL?=${QT_DATADIR_REL}/tests QT_CMAKEDIR_REL?= lib/cmake QT_QTCHOOSERDIR_REL?= ${QT_ETCDIR_REL}/qtchooser # Not customizable. .if ${_QT_VERSION:M4*} QT_MKSPECDIR_REL= ${QT_DATADIR_REL}/mkspecs _QT_LIBVER= # empty .else QT_MKSPECDIR_REL= ${QT_ARCHDIR_REL}/mkspecs _QT_LIBVER= ${_QT_VERSION:R:R} .endif LRELEASE?= ${QT_BINDIR}/lrelease LUPDATE?= ${QT_BINDIR}/lupdate MOC?= ${QT_BINDIR}/moc RCC?= ${QT_BINDIR}/rcc UIC?= ${QT_BINDIR}/uic QMAKE?= ${QT_BINDIR}/qmake # Needed to redefine the qmake target for internal Qt configuration. _QMAKE?= ${QMAKE} QMAKESPEC?= ${QT_MKSPECDIR}/freebsd-${QMAKE_COMPILER} # The whole Qt distribution should be built with the same compiler, but it's # better to support custom settings. Dereferencing the detection allows to # avoid forking a shell on each inclusion of this file, and to catch any CXX # customization (via USE_GCC, etc.). QMAKE_COMPILER= $$(ccver="$$(${CXX} --version)"; case "$$ccver" in *clang*) echo clang ;; *) echo g++ ;; esac) # Import QMAKE_ENV and QMAKE_ARGS definitions. USES+= qmake:_env .for dir in BIN INC LIB ARCH PLUGIN LIBEXEC IMPORT \ QML DATA DOC L10N ETC EXAMPLE TEST MKSPEC \ CMAKE QTCHOOSER QT_${dir}DIR= ${PREFIX}/${QT_${dir}DIR_REL} # Export all directories to the plist substituion for QT_DIST ports. # For the others, exclude QT_CMAKEDIR and QT_ETCDIR. . if (${dir:NCMAKE} && ${dir:NETC}) || defined(QT_DIST) PLIST_SUB+= QT_${dir}DIR="${QT_${dir}DIR_REL}" . endif .endfor # Pass the chosen Qt version to the environment for qtchooser. CONFIGURE_ENV+= QT_SELECT=${_QT_RELNAME} MAKE_ENV+= QT_SELECT=${_QT_RELNAME} .endif # !defined(_POSTMKINCLUDED) && !defined(Qt_Pre_Include) .if defined(_POSTMKINCLUDED) && !defined(Qt_Post_Include) Qt_Post_Include= bsd.qt.mk .if !defined(QT_NONSTANDARD) CONFIGURE_ENV+= QTDIR="${QT_ARCHDIR}" QMAKE="${QMAKE}" \ MOC="${MOC}" RCC="${RCC}" UIC="${UIC}" \ QMAKESPEC="${QMAKESPEC}" CONFIGURE_ARGS+=--with-qt-includes=${QT_INCDIR} \ --with-qt-libraries=${QT_LIBDIR} \ --with-extra-includes=${LOCALBASE}/include \ --with-extra-libs=${LOCALBASE}/lib .endif # !defined(QT_NONSTANDARD) _USE_QT_ALL= assistant dbus declarative designer doc gui help \ imageformats l10n linguist linguisttools multimedia \ network opengl pixeltool qdbusviewer qmake script \ scripttools sql sql-ibase sql-mysql sql-odbc sql-pgsql \ sql-sqlite2 sql-sqlite3 svg testlib webkit \ xml xmlpatterns _USE_QT4_ONLY= accessible assistant-adp assistantclient clucene codecs-cn codecs-jp \ codecs-kr codecs-tw corelib demo graphicssystems-opengl \ help-tools iconengines inputmethods makeqpf moc phonon \ phonon-gst porting qdoc3 qmlviewer qt3support qtconfig \ qtestlib qvfb rcc uic uic3 xmlpatterns-tool _USE_QT5_ONLY= 3d buildtools canvas3d charts concurrent connectivity \ core datavis3d declarative-render2d examples gamepad \ graphicaleffects location paths phonon4 printsupport \ qdbus qdoc qdoc-data qev qml quick quickcontrols \ quickcontrols2 scxml sensors serialbus serialport \ sql-tds uiplugin uitools virtualkeyboard webchannel \ websockets widgets x11extras 3d_PORT= graphics/${_QT_RELNAME}-3d 3d_LIB= libQt${_QT_LIBVER}3DCore.so accessible_PORT= accessibility/${_QT_RELNAME}-accessible accessible_PATH= ${QT_PLUGINDIR}/accessible/libqtaccessiblewidgets.so assistant_PORT= devel/${_QT_RELNAME}-assistant assistant_PATH= ${QT_BINDIR}/assistant assistant-adp_PORT= devel/${_QT_RELNAME}-assistant-adp assistant-adp_PATH= ${PREFIX}/bin/assistant_adp assistantclient_PORT= devel/${_QT_RELNAME}-libqtassistantclient assistantclient_LIB= libQt${_QT_LIBVER}AssistantClient.so buildtools_PORT= devel/${_QT_RELNAME}-buildtools buildtools_PATH= ${MOC} canvas3d_PORT= x11-toolkits/${_QT_RELNAME}-canvas3d canvas3d_PATH= ${QT_QMLDIR}/QtCanvas3D/qmldir charts_PORT= x11-toolkits/${_QT_RELNAME}-charts charts_LIB= libQt${_QT_LIBVER}Charts.so clucene_PORT= textproc/${_QT_RELNAME}-clucene clucene_LIB= libQt${_QT_LIBVER}CLucene.so codecs-cn_PORT= chinese/${_QT_RELNAME}-codecs-cn codecs-cn_PATH= ${QT_PLUGINDIR}/codecs/libqcncodecs.so codecs-jp_PORT= japanese/${_QT_RELNAME}-codecs-jp codecs-jp_PATH= ${QT_PLUGINDIR}/codecs/libqjpcodecs.so codecs-kr_PORT= korean/${_QT_RELNAME}-codecs-kr codecs-kr_PATH= ${QT_PLUGINDIR}/codecs/libqkrcodecs.so codecs-tw_PORT= chinese/${_QT_RELNAME}-codecs-tw codecs-tw_PATH= ${QT_PLUGINDIR}/codecs/libqtwcodecs.so concurrent_PORT= devel/${_QT_RELNAME}-concurrent concurrent_LIB= libQt${_QT_LIBVER}Concurrent.so connectivity_PORT= comms/${_QT_RELNAME}-connectivity connectivity_LIB= libQt${_QT_LIBVER}Bluetooth.so core_PORT= devel/${_QT_RELNAME}-core core_LIB= libQt${_QT_LIBVER}Core.so corelib_PORT= devel/${_QT_RELNAME}-corelib corelib_LIB= ${core_LIB} datavis3d_PORT= x11-toolkits/${_QT_RELNAME}-datavis3d datavis3d_LIB= libQt${_QT_LIBVER}DataVisualization.so dbus_PORT= devel/${_QT_RELNAME}-dbus dbus_LIB= libQt${_QT_LIBVER}DBus.so declarative_PORT= x11-toolkits/${_QT_RELNAME}-declarative declarative_LIB= libQt${_QT_LIBVER}Declarative.so declarative-render2d_PORT= x11-toolkits/${_QT_RELNAME}-declarative-render2d declarative-render2d_PATH= ${QT_PLUGINDIR}/scenegraph/libsoftwarecontext.so demo_PORT= misc/${_QT_RELNAME}-qtdemo demo_PATH= ${QT_BINDIR}/qtdemo designer_PORT= devel/${_QT_RELNAME}-designer designer_PATH= ${QT_BINDIR}/designer doc_PORT= misc/${_QT_RELNAME}-doc doc_PATH= ${_QT_RELNAME}-doc>=${_QT_VERSION:R:R} examples_PORT= misc/${_QT_RELNAME}-examples examples_PATH= ${_QT_RELNAME}-examples>=${_QT_VERSION:R:R} gamepad_PORT= x11-toolkits/${_QT_RELNAME}-gamepad gamepad_LIB= libQt${_QT_LIBVER}Gamepad.so graphicaleffects_PORT= graphics/${_QT_RELNAME}-graphicaleffects graphicaleffects_PATH= ${QT_QMLDIR}/QtGraphicalEffects/qmldir graphicssystems-opengl_PORT= x11/${_QT_RELNAME}-graphicssystems-opengl graphicssystems-opengl_PATH= ${QT_PLUGINDIR}/graphicssystems/libqglgraphicssystem.so gui_PORT= x11-toolkits/${_QT_RELNAME}-gui gui_LIB= libQt${_QT_LIBVER}Gui.so help_PORT= devel/${_QT_RELNAME}-help help_LIB= libQt${_QT_LIBVER}Help.so help-tools_PORT= devel/${_QT_RELNAME}-help-tools help-tools_PATH= ${QT_BINDIR}/qhelpgenerator iconengines_PORT= graphics/${_QT_RELNAME}-iconengines iconengines_PATH= ${QT_PLUGINDIR}/iconengines/libqsvgicon.so imageformats_PORT= graphics/${_QT_RELNAME}-imageformats imageformats_PATH= ${QT_PLUGINDIR}/imageformats/libqtiff.so inputmethods_PORT= x11/${_QT_RELNAME}-inputmethods inputmethods_PATH= ${QT_PLUGINDIR}/inputmethods/libqimsw-multi.so linguist_PORT= devel/${_QT_RELNAME}-linguist linguist_PATH= ${QT_BINDIR}/linguist linguisttools_PORT= devel/${_QT_RELNAME}-linguisttools linguisttools_PATH= ${LRELEASE} location_PORT= devel/${_QT_RELNAME}-location location_LIB= libQt${_QT_LIBVER}Location.so l10n_PORT= misc/${_QT_RELNAME}-l10n l10n_PATH= ${_QT_RELNAME}-l10n>=${_QT_VERSION:R:R} makeqpf_PORT= devel/${_QT_RELNAME}-makeqpf makeqpf_PATH= ${QT_BINDIR}/makeqpf moc_PORT= devel/${_QT_RELNAME}-moc moc_PATH= ${MOC} multimedia_PORT= multimedia/${_QT_RELNAME}-multimedia multimedia_LIB= libQt${_QT_LIBVER}Multimedia.so network_PORT= net/${_QT_RELNAME}-network network_LIB= libQt${_QT_LIBVER}Network.so opengl_PORT= graphics/${_QT_RELNAME}-opengl opengl_LIB= libQt${_QT_LIBVER}OpenGL.so paths_PORT= sysutils/${_QT_RELNAME}-qtpaths paths_PATH= ${QT_BINDIR}/qtpaths pixeltool_PORT= graphics/${_QT_RELNAME}-pixeltool pixeltool_PATH= ${QT_BINDIR}/pixeltool phonon_PORT= multimedia/phonon phonon_LIB= libphonon.so phonon4_PORT= multimedia/${_QT_RELNAME}-phonon4 phonon4_LIB= libphonon4${_QT_RELNAME}.so phonon-gst_PORT= multimedia/phonon-gstreamer phonon-gst_PATH= ${QT_PLUGINDIR}/phonon_backend/libphonon_gstreamer.so porting_PORT= devel/${_QT_RELNAME}-porting porting_PATH= ${QT_BINDIR}/qt3to4 printsupport_PORT= print/${_QT_RELNAME}-printsupport printsupport_LIB= libQt${_QT_LIBVER}PrintSupport.so qdbus_PORT= devel/${_QT_RELNAME}-qdbus qdbus_PATH= ${QT_BINDIR}/qdbus qdbusviewer_PORT= devel/${_QT_RELNAME}-qdbusviewer qdbusviewer_PATH= ${QT_BINDIR}/qdbusviewer qdoc_PORT= devel/${_QT_RELNAME}-qdoc qdoc_PATH= ${QT_BINDIR}/qdoc qdoc-data_PORT= devel/${_QT_RELNAME}-qdoc-data qdoc-data_PATH= ${QT_DOCDIR}/global/config.qdocconf qdoc3_PORT= devel/${_QT_RELNAME}-qdoc3 qdoc3_PATH= ${QT_BINDIR}/qdoc3 qev_PORT= x11/${_QT_RELNAME}-qev qev_PATH= ${QT_BINDIR}/qev qmake_PORT= devel/${_QT_RELNAME}-qmake qmake_PATH= ${QMAKE} qml_PORT= lang/${_QT_RELNAME}-qml qml_LIB= libQt${_QT_LIBVER}Qml.so qmlviewer_PORT= devel/${_QT_RELNAME}-qmlviewer qmlviewer_PATH= ${QT_BINDIR}/qmlviewer qt3support_PORT= devel/${_QT_RELNAME}-qt3support qt3support_LIB= libQt${_QT_LIBVER}3Support.so qtconfig_PORT= misc/${_QT_RELNAME}-qtconfig qtconfig_PATH= ${QT_BINDIR}/qtconfig qtestlib_PORT= ${testlib_PORT} qtestlib_LIB= ${testlib_LIB} quick_PORT= x11-toolkits/${_QT_RELNAME}-quick quick_LIB= libQt${_QT_LIBVER}Quick.so quickcontrols_PORT= x11-toolkits/${_QT_RELNAME}-quickcontrols quickcontrols_PATH= ${QT_QMLDIR}/QtQuick/Controls/qmldir quickcontrols2_PORT= x11-toolkits/${_QT_RELNAME}-quickcontrols2 quickcontrols2_LIB= libQt${_QT_LIBVER}QuickControls2.so qvfb_PORT= devel/${_QT_RELNAME}-qvfb qvfb_PATH= ${QT_BINDIR}/qvfb rcc_PORT= devel/${_QT_RELNAME}-rcc rcc_PATH= ${RCC} sensors_PORT= comms/${_QT_RELNAME}-sensors sensors_LIB= libQt${_QT_LIBVER}Sensors.so script_PORT= devel/${_QT_RELNAME}-script script_LIB= libQt${_QT_LIBVER}Script.so scripttools_PORT= devel/${_QT_RELNAME}-scripttools scripttools_LIB= libQt${_QT_LIBVER}ScriptTools.so scxml_PORT= devel/${_QT_RELNAME}-scxml scxml_LIB= libQt${_QT_LIBVER}Scxml.so serialbus_PORT= comms/${_QT_RELNAME}-serialbus serialbus_LIB= libQt${_QT_LIBVER}SerialBus.so serialport_PORT= comms/${_QT_RELNAME}-serialport serialport_LIB= libQt${_QT_LIBVER}SerialPort.so sql_PORT= databases/${_QT_RELNAME}-sql sql_LIB= libQt${_QT_LIBVER}Sql.so sql-pgsql_PATH= ${QT_PLUGINDIR}/sqldrivers/libqsqlpsql.so . if ${_QT_VERSION:M4*} sql-sqlite2_PORT= databases/${_QT_RELNAME}-sqlite-plugin . endif sql-sqlite3_PATH= ${QT_PLUGINDIR}/sqldrivers/libqsqlite.so . for db in ibase mysql odbc pgsql sqlite2 sqlite3 tds . if ${_QT_VERSION:M4*} sql-${db}_PORT?= databases/${_QT_RELNAME}-${db}-plugin . else sql-${db}_PORT?= databases/${_QT_RELNAME}-sqldrivers-${db} . endif sql-${db}_PATH?= ${QT_PLUGINDIR}/sqldrivers/libqsql${db:C/^sql//}.so . endfor svg_PORT= graphics/${_QT_RELNAME}-svg svg_LIB= libQt${_QT_LIBVER}Svg.so testlib_PORT= devel/${_QT_RELNAME}-testlib testlib_LIB= libQt${_QT_LIBVER}Test.so uic_PORT= devel/${_QT_RELNAME}-uic uic_PATH= ${UIC} uic3_PORT= devel/${_QT_RELNAME}-uic3 uic3_PATH= ${QT_BINDIR}/uic3 uiplugin_PORT= x11-toolkits/${_QT_RELNAME}-uiplugin uiplugin_PATH= ${QT_INCDIR}/QtUiPlugin/QtUiPlugin uitools_PORT= devel/${_QT_RELNAME}-uitools uitools_PATH= ${QT_LIBDIR}/libQt${_QT_LIBVER}UiTools.a virtualkeyboard_PORT= x11-toolkits/${_QT_RELNAME}-virtualkeyboard virtualkeyboard_PATH= ${QT_PLUGINDIR}/platforminputcontexts/libqtvirtualkeyboardplugin.so webchannel_PORT= www/${_QT_RELNAME}-webchannel webchannel_LIB= libQt${_QT_LIBVER}WebChannel.so websockets_PORT= www/${_QT_RELNAME}-websockets websockets_LIB= libQt${_QT_LIBVER}WebSockets.so webkit_PORT= www/${_QT_RELNAME}-webkit webkit_LIB= libQt${_QT_LIBVER}WebKit.so widgets_PORT= x11-toolkits/${_QT_RELNAME}-widgets widgets_LIB= libQt${_QT_LIBVER}Widgets.so x11extras_PORT= x11/${_QT_RELNAME}-x11extras x11extras_LIB= libQt${_QT_LIBVER}X11Extras.so xml_PORT= textproc/${_QT_RELNAME}-xml xml_LIB= libQt${_QT_LIBVER}Xml.so xmlpatterns_PORT= textproc/${_QT_RELNAME}-xmlpatterns xmlpatterns_LIB= libQt${_QT_LIBVER}XmlPatterns.so xmlpatterns-tool_PORT= textproc/${_QT_RELNAME}-xmlpatterns-tool xmlpatterns-tool_PATH= ${QT_BINDIR}/xmlpatterns _USE_QT= ${USE_QT${_QT_VERSION:R:R}} _USE_QT_ALL+= ${_USE_QT${_QT_VERSION:R:R}_ONLY} # Iterate through components deprived of suffix. . for component in ${_USE_QT:O:u:C/_.+//} # Check that the component is valid. . if ${_USE_QT_ALL:M${component}} != "" # Skip meta-components (currently none). . if defined(${component}_PORT) && (defined(${component}_PATH) || defined(${component}_LIB)) # Check if a dependency type is explicitly requested. . if ${_USE_QT:M${component}_*} != "" && ${_USE_QT:M${component}} == "" ${component}_TYPE= # empty . if ${_USE_QT:M${component}_build} != "" ${component}_TYPE+= build . endif . if ${_USE_QT:M${component}_run} != "" ${component}_TYPE+= run . endif . endif # ${_USE_QT:M${component}_*} != "" && ${_USE_QT:M${component}} == "" # If no dependency type is set, default to full dependency. . if !defined(${component}_TYPE) ${component}_TYPE= build run . endif # Set real dependencies. . if defined(${component}_LIB) && ${${component}_TYPE:Mbuild} && ${${component}_TYPE:Mrun} LIB_DEPENDS+= ${${component}_LIB}:${${component}_PORT} . else ${component}_PATH?= ${QT_LIBDIR}/${${component}_LIB} ${component}_DEPENDS= ${${component}_PATH}:${${component}_PORT} . if ${${component}_TYPE:Mbuild} != "" BUILD_DEPENDS+= ${${component}_DEPENDS} . endif . if ${${component}_TYPE:Mrun} != "" RUN_DEPENDS+= ${${component}_DEPENDS} . endif . endif # ${${component}_LIB} && ${${component}_TYPE:Mbuild} && ${${component}_TYPE:Mrun} . endif # defined(${component}_PORT) && defined(${component}_PATH) . else # ! ${_USE_QT_ALL:M${component}} != "" IGNORE= cannot be installed: unknown USE_QT component '${component}' . endif # ${_USE_QT_ALL:M${component}} != "" . endfor .if defined(QT_DIST) && ! ${_QT_VERSION:M4*} . if ${QT_DIST} == "base" # qtbase requires some tools to be symlinked to the build directory. _QT_TOOLS= # empty . if ${PORTNAME} != "qmake" _QT_TOOLS+= ${QMAKE} . endif . if ${PORTNAME} != "buildtools" _QT_TOOLS+= ${MOC} ${RCC} . endif . if ${PORTNAME} != "qdoc" _QT_TOOLS+= qdoc . endif . if ${PORTNAME} != "dbus" _QT_TOOLS+= qdbuscpp2xml qdbusxml2cpp . endif . if ${PORTNAME} != "widgets" _QT_TOOLS+= ${UIC} . endif # The list of QtBase components that need to be linked into WRKSRC/lib for # other QtBase ports. See below. _QT5_BASE= core dbus gui network sql widgets pre-configure: qtbase-pre-configure qtbase-pre-configure: . for tool in ${_QT_TOOLS} @${TEST} -e ${QT_BINDIR}/${tool:T} && \ ${LN} -sf ${QT_BINDIR}/${tool:T} ${CONFIGURE_WRKSRC}/bin/${tool:T} || \ ${TRUE} . endfor # The following is a fix for the inplace upgrade problem we faced (see # QTBUG-40825 and ports bugs 194088, 195105 and 198720) previously, # which previously was adressed by making sure, that ${LOCALBASE}/lib, which # would often gets added by pkgconf for the dependencies, was passed after # ${WRKSRC}/lib. # * We fix the inplace upgrade problem by moving the Qt5 libraries into # ${LOCALBASE}/lib/qt5. Therefore a -L${LOCALBASE}/lib does no harm anymore. # * However, this means, that the ports belonging to the split up QtBase package # now no longer can find their depending QtBase libraries. We fix this by # linking these into ${CONFIGURE_WRKSRC}/lib if the given QtBase port depends # on them. . if ${QT_DIST:Mbase} . for basedep in ${_QT5_BASE} . if ${USE_QT5:M${basedep}} ${LN} -sf ${QT_LIBDIR}/${${basedep}_LIB} ${CONFIGURE_WRKSRC}/lib . endif . endfor . endif # # **** THIS PART IS OBSOLETE FOR THE NEXT QT UPGRADE **** # # Add ${LOCALBASE}/lib to DEFAULT_LIBDIRS, which we use to filter out # certain paths from pkg-config calls (see the explanation in # devel/qt5/files/patch-configure) as well as for setting # QMAKE_DEFAULT_LIBDIR in mkspecs/qconfig.pri. Part of the solution for # ports/194088. post-patch: qtbase-post-patch qtbase-post-patch: ${REINPLACE_CMD} -e "/DEFAULT_LIBDIRS=/ s,\\\\\"\\\\n,\\\\n${LOCALBASE}/lib&," \ ${WRKSRC}/configure . if ${PORTNAME} != "qmake" _QMAKE= ${CONFIGURE_WRKSRC}/bin/qmake post-configure: qmake-configure . endif . endif # ${QT_DIST} == "base" pre-configure: qt5-pre-configure qt5-pre-configure: # Qt 5.3.2 introduced a check in mkspecs/features/create_cmake.prf that # requires tests/auto/cmake to be present, otherwise the configure stage will # fail. # Since we cannot extract tests/auto/cmake/ and exclude tests/ at the same # time, we have to disable the check in a cache file (the only way to get this # value through to the configure script in qtbase). ${MKDIR} ${CONFIGURE_WRKSRC} ${ECHO_CMD} 'CMAKE_MODULE_TESTS = -' > ${CONFIGURE_WRKSRC}/.qmake.cache # # **** THIS PART IS OBSOLETE FOR THE NEXT QT UPGRADE **** # # We piggyback on QMAKE_LIBDIR_FLAGS to make sure -L${WRKSRC}/lib is passed to # the linker before -L/usr/local/lib. By default, the opposite happens, which # is a problem when a Qt port is being upgraded, since an existing library # would end up being picked up instead of those built in ${WRKSRC}/lib. Since # qmake appends the value of QMAKE_LIBDIR to QMAKE_LIBDIR_FLAGS, we can use the # latter to get the linker path order right. qmake is smart enough to strip # occurrences of ${WRKSRC}/lib from .pc and .prl files when installing them. # See QTBUG-40825 and ports bugs 194088, 195105 and 198720. ${ECHO_CMD} 'QMAKE_LIBDIR_FLAGS = -L${CONFIGURE_WRKSRC}/lib' >> ${CONFIGURE_WRKSRC}/.qmake.cache post-install: qt-post-install qt-post-install: . if ${QT_DEFINES:N-*} # We can't use SUB_FILES with a shared pkg-deinstall.in. # We need it to be a script instead of a group of @unexecs, otherwise # qconfig-modules.h cleanup will be run in pre-deinstall stage, which is # useless. This will probably be replaced by a Keywords/ script in the future. @${SED} -e 's,%%QT_MODNAME%%,${QT_MODNAME},g' \ -e 's,%%QT_INCDIR%%,${QT_INCDIR},g' \ ${.CURDIR:H:H}/devel/${_QT_RELNAME}/${FILESDIR:T}/${PKGDEINSTALL:T}.in > \ ${PKGDEINSTALL} @${MKDIR} ${STAGEDIR}${QT_INCDIR}/QtCore/modules @${ECHO_CMD} -n \ > ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h . for def in ${QT_DEFINES:N-*:O:u:C/=.*$//} @${ECHO_CMD} "#if !defined(QT_${def}) && !defined(QT_NO_${def})" \ >> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h ${ECHO_CMD} "# define QT_${def}" \ >> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h @${ECHO_CMD} "#endif" \ >> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h @${ECHO_CMD} \ >> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h . endfor @${ECHO_CMD} "${PREFIX}/${QT_INCDIR_REL}/QtCore/modules/qconfig-${QT_MODNAME}.h" \ >> ${TMPPLIST} @${ECHO_CMD} "@exec echo '#include ' >> ${PREFIX}/${QT_INCDIR_REL}/QtCore/qconfig-modules.h" \ >> ${TMPPLIST} . endif # ${QT_DEFINES:N-*} . if ${QT_CONFIG:N-*} @${MKDIR} ${STAGEDIR}${QT_MKSPECDIR}/modules ${ECHO_CMD} "QT_CONFIG += ${QT_CONFIG:N-*:O:u}" \ > ${STAGEDIR}${QT_MKSPECDIR}/modules/qt_config_${QT_MODNAME}.pri @${ECHO_CMD} "${PREFIX}/${QT_MKSPECDIR_REL}/modules/qt_config_${QT_MODNAME}.pri" \ >> ${TMPPLIST} . endif # ${QT_CONFIG:N-*} .endif # defined(QT_DIST) && ! ${_QT_VERSION:M4*} .endif # defined(_POSTMKINCLUDED) && !defined(Qt_Post_Include) Index: head/accessibility/qt4-accessible/Makefile =================================================================== --- head/accessibility/qt4-accessible/Makefile (revision 442739) +++ head/accessibility/qt4-accessible/Makefile (revision 442740) @@ -1,43 +1,43 @@ # Created by: lofi@FreeBSD.org # $FreeBSD$ PORTNAME= accessible DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= accessibility PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt accessibility widgets USE_QT4= qmake_build moc_build qt3support corelib gui network sql xml QT_DIST= yes HAS_CONFIGURE= yes ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/activeqt src/dbus src/multimedia src/network src/opengl \ src/openvg src/phonon src/s60installs src/s60main src/script \ src/scripttools src/sql src/svg src/testlib src/tools \ src/winmain src/xml src/xmlpatterns src/3rdparty/clucene \ src/3rdparty/freetype src/3rdparty/libjpeg src/3rdparty/libmng \ src/3rdparty/libpng src/3rdparty/libtiff src/3rdparty/phonon \ src/3rdparty/webkit .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} pre-configure: ${MKDIR} ${WRKSRC}/mkspecs ${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake ${LN} -sf ${MOC} ${WRKSRC}/bin/moc .include Index: head/chinese/qt4-codecs-cn/Makefile =================================================================== --- head/chinese/qt4-codecs-cn/Makefile (revision 442739) +++ head/chinese/qt4-codecs-cn/Makefile (revision 442740) @@ -1,46 +1,46 @@ # Created by: lofi@FreeBSD.org # $FreeBSD$ PORTNAME= codecs DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= chinese PKGNAMEPREFIX= qt4- PKGNAMESUFFIX= -cn MAINTAINER= kde@FreeBSD.org COMMENT= Qt GB 18030 codec plugin USE_QT4= qmake_build corelib QT_DIST= yes HAS_CONFIGURE= yes ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/activeqt src/dbus src/gui src/multimedia src/network \ src/opengl src/openvg src/phonon src/qt3support \ src/s60installs src/s60main src/script src/scripttools src/sql \ src/svg src/testlib src/tools src/winmain src/xml \ src/xmlpatterns src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME}/cn INSTALL_WRKSRC= ${BUILD_WRKSRC} pre-configure: ${MKDIR} ${WRKSRC}/mkspecs ${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake post-configure: ${REINPLACE_CMD} -e 's|(test -z.*||g' ${BUILD_WRKSRC}/Makefile .include Index: head/chinese/qt4-codecs-tw/Makefile =================================================================== --- head/chinese/qt4-codecs-tw/Makefile (revision 442739) +++ head/chinese/qt4-codecs-tw/Makefile (revision 442740) @@ -1,46 +1,46 @@ # Created by: lofi@FreeBSD.org # $FreeBSD$ PORTNAME= codecs DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= chinese PKGNAMEPREFIX= qt4- PKGNAMESUFFIX= -tw MAINTAINER= kde@FreeBSD.org COMMENT= Qt Big-5 codec plugin USE_QT4= qmake_build corelib QT_DIST= yes HAS_CONFIGURE= yes ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/activeqt src/dbus src/gui src/multimedia src/network \ src/opengl src/openvg src/phonon src/qt3support \ src/s60installs src/s60main src/script src/scripttools src/sql \ src/svg src/testlib src/tools src/winmain src/xml \ src/xmlpatterns src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME}/tw INSTALL_WRKSRC= ${BUILD_WRKSRC} pre-configure: ${MKDIR} ${WRKSRC}/mkspecs ${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake post-configure: ${REINPLACE_CMD} -e 's|(test -z.*||g' ${BUILD_WRKSRC}/Makefile .include Index: head/databases/qt4-mysql-plugin/Makefile =================================================================== --- head/databases/qt4-mysql-plugin/Makefile (revision 442739) +++ head/databases/qt4-mysql-plugin/Makefile (revision 442740) @@ -1,13 +1,13 @@ # Created by: Kay Lehmann # $FreeBSD$ -PORTREVISION= 2 +PORTREVISION= 3 COMMENT= Qt MySQL database plugin DB= mysql USE_MYSQL= yes CXXFLAGS+= -I${LOCALBASE}/include/mysql LDFLAGS+= -L${LOCALBASE}/lib/mysql .include "${.CURDIR:H:H}/devel/qt4/Makefile.sqldrivers" Index: head/databases/qt4-odbc-plugin/Makefile =================================================================== --- head/databases/qt4-odbc-plugin/Makefile (revision 442739) +++ head/databases/qt4-odbc-plugin/Makefile (revision 442740) @@ -1,13 +1,13 @@ # Created by: Michael Nottebrock # $FreeBSD$ -PORTREVISION= 3 +PORTREVISION= 4 DB= odbc COMMENT= Qt Open Database Connectivity plugin LIB_DEPENDS= libodbc.so:databases/unixODBC LDFLAGS+= -lodbc .include "${.CURDIR:H:H}/devel/qt4/Makefile.sqldrivers" Index: head/databases/qt4-pgsql-plugin/Makefile =================================================================== --- head/databases/qt4-pgsql-plugin/Makefile (revision 442739) +++ head/databases/qt4-pgsql-plugin/Makefile (revision 442740) @@ -1,10 +1,10 @@ # Created by: Lauri Watts # $FreeBSD$ -PORTREVISION= 2 +PORTREVISION= 3 COMMENT= Qt PostgreSQL database plugin DB= psql USES= pgsql .include "${.CURDIR:H:H}/devel/qt4/Makefile.sqldrivers" Index: head/databases/qt4-sql/Makefile =================================================================== --- head/databases/qt4-sql/Makefile (revision 442739) +++ head/databases/qt4-sql/Makefile (revision 442740) @@ -1,52 +1,52 @@ # Created by: lofi@FreeBSD.org # $FreeBSD$ PORTNAME= sql DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt SQL database integration module USE_QT4= qmake_build moc_build corelib QT_DIST= yes HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/activeqt src/dbus src/gui src/multimedia src/network \ src/opengl src/openvg src/phonon src/qt3support \ src/s60installs src/s60main src/script src/scripttools src/svg \ src/testlib src/tools src/winmain src/xml src/xmlpatterns \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} pre-configure: ${MKDIR} ${WRKSRC}/mkspecs ${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake ${LN} -sf ${MOC} ${WRKSRC}/bin/moc post-configure: ${REINPLACE_CMD} -e 's|${PREFIX}/${QT_LIBDIR_REL}/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ -e 's|.*$$(QMAKE).*||g' ${BUILD_WRKSRC}/Makefile ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ -E -e 's|(.*location=).*moc|\1${PREFIX}/${QT_BINDIR_REL}/${MOC:T}|g' \ -E -e 's|(.*location=).*uic|\1${PREFIX}/${QT_BINDIR_REL}/${UIC:T}|g' \ ${WRKSRC}/lib/pkgconfig/QtSql.pc .include Index: head/databases/qt4-sqlite-plugin/Makefile =================================================================== --- head/databases/qt4-sqlite-plugin/Makefile (revision 442739) +++ head/databases/qt4-sqlite-plugin/Makefile (revision 442740) @@ -1,10 +1,10 @@ # Created by: Michael Nottebrock # $FreeBSD$ -PORTREVISION= 2 +PORTREVISION= 3 COMMENT= Qt SQLite 2 database plugin DB= sqlite2 USES= sqlite:2 .include "${.CURDIR:H:H}/devel/qt4/Makefile.sqldrivers" Index: head/databases/qt4-sqlite3-plugin/Makefile =================================================================== --- head/databases/qt4-sqlite3-plugin/Makefile (revision 442739) +++ head/databases/qt4-sqlite3-plugin/Makefile (revision 442740) @@ -1,12 +1,12 @@ # Created by: Michael Nottebrock # $FreeBSD$ -PORTREVISION= 3 +PORTREVISION= 4 COMMENT= Qt SQLite 3 database plugin DB= sqlite USES= sqlite:3 LDFLAGS+= -lsqlite3 .include "${.CURDIR:H:H}/devel/qt4/Makefile.sqldrivers" Index: head/devel/qt4/files/extrapatch-armv6 =================================================================== --- head/devel/qt4/files/extrapatch-armv6 (nonexistent) +++ head/devel/qt4/files/extrapatch-armv6 (revision 442740) @@ -0,0 +1,28 @@ +Due to a misspelling in GCC [1] (probably) the check for the ARMv6KZ platform +used __ARM_ARCH_6ZK__ instead of __ARM_ARCH_6KZ__. + +Append the correct spellings to the checks for __ARM_ARCH_6ZK__. + + +[1] https://gcc.gnu.org/ml/gcc-patches/2015-06/msg01679.html + +--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.orig 2017-06-02 20:01:34.860331000 +0200 ++++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2017-06-02 20:02:08.715222000 +0200 +@@ -254,6 +254,7 @@ + #elif defined(__ARM_ARCH_6__) \ + || defined(__ARM_ARCH_6J__) \ + || defined(__ARM_ARCH_6K__) \ ++ || defined(__ARM_ARCH_6KZ__) \ + || defined(__ARM_ARCH_6Z__) \ + || defined(__ARM_ARCH_6ZK__) \ + || defined(__ARM_ARCH_6T2__) \ +--- src/corelib/arch/qatomic_arm.h.orig 2017-06-02 20:02:52.633112000 +0200 ++++ src/corelib/arch/qatomic_arm.h 2017-06-02 20:03:14.263677000 +0200 +@@ -57,6 +57,7 @@ + || defined(__ARM_ARCH_6T2__) \ + || defined(__ARM_ARCH_6Z__) \ + || defined(__ARM_ARCH_6K__) \ ++ || defined(__ARM_ARCH_6KZ__) \ + || defined(__ARM_ARCH_6ZK__) \ + || defined(__ARM_ARCH_6M__) \ + || (defined(__TARGET_ARCH_ARM) && (__TARGET_ARCH_ARM-0 >= 6)) Property changes on: head/devel/qt4/files/extrapatch-armv6 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/qt4-assistant-adp/Makefile =================================================================== --- head/devel/qt4-assistant-adp/Makefile (revision 442739) +++ head/devel/qt4-assistant-adp/Makefile (revision 442740) @@ -1,34 +1,34 @@ # Created by: lofi@FreeBSD.org # $FreeBSD$ PORTNAME= assistant PORTVERSION= 4.6.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= QT PKGNAMEPREFIX= qt4- PKGNAMESUFFIX= -adp DISTNAME= qt-assistant-qassistantclient-library-compat-src-${PORTVERSION} DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt *.adp-compatible documentation browser USE_QT4= moc_build rcc_build uic_build corelib \ gui network xml doc dbus USES= qmake QMAKE_ARGS= QT_CONFIG+="dbus" QT_PRODUCT="OpenSource" ALL_TARGET= first DESCR= ${.CURDIR:H:H}/devel/qt4/pkg-descr WRKSRC= ${WRKDIR}/${DISTNAME:C/src/version/} PLIST_FILES= bin/assistant_adp pre-configure: ${REINPLACE_CMD} -e 's|$$$$\[QT_INSTALL_BINS]|${PREFIX}/bin|g' \ ${WRKSRC}/compat.pro .include Index: head/devel/qt4-corelib/Makefile =================================================================== --- head/devel/qt4-corelib/Makefile (revision 442739) +++ head/devel/qt4-corelib/Makefile (revision 442740) @@ -1,83 +1,83 @@ # Created by: lofi@FreeBSD.org # $FreeBSD$ PORTNAME= corelib DISTVERSION= ${QT4_VERSION} -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= devel PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt core non-graphical module LIB_DEPENDS= libicui18n.so:devel/icu USE_GNOME= glib20 USE_QT4= qmake_build moc_build QT_DIST= yes USES= iconv pkgconfig HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/activeqt src/dbus src/gui src/multimedia src/network \ src/opengl src/openvg src/phonon src/qt3support \ src/s60installs src/s60main src/script src/scripttools src/sql \ src/svg src/testlib src/tools src/winmain src/xml \ src/xmlpatterns src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} .include "${.CURDIR:H:H}/devel/qt4/files/Makefile.options" .if empty(QT4_OPTIONS:MCUPS) CONFIGURE_ARGS+= -no-cups .endif .if empty(QT4_OPTIONS:MNAS) CONFIGURE_ARGS+= -no-nas-sound .endif .if empty(QT4_OPTIONS:MQGTKSTYLE) CONFIGURE_ARGS+= -no-gtkstyle .endif pre-everything:: @${CAT} ${PKGMESSAGE} post-patch: ${REINPLACE_CMD} -e '${QT4_OPTIONS_REPLACE}' ${WRKSRC}/configure pre-configure: ${MKDIR} ${WRKSRC}/mkspecs ${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake ${LN} -sf ${MOC} ${WRKSRC}/bin/moc post-configure: ${REINPLACE_CMD} -e 's|${PREFIX}/${QT_LIBDIR_REL}/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ -e 's|.*$$(QMAKE).*||g' \ ${BUILD_WRKSRC}/Makefile ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ -E -e 's|(.*location=).*moc|\1${PREFIX}/${QT_BINDIR_REL}/${MOC:T}|g' \ -E -e 's|(.*location=).*uic|\1${PREFIX}/${QT_BINDIR_REL}/${UIC:T}|g' \ ${WRKSRC}/lib/pkgconfig/QtCore.pc post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/${QT_PLUGINDIR_REL} ${TOUCH} ${STAGEDIR}${PREFIX}/${QT_PLUGINDIR_REL}/.keep_me ${MKDIR} ${STAGEDIR}${PREFIX}/${QT_MKSPECDIR_REL} ${INSTALL_DATA} ${WRKSRC}/mkspecs/qconfig.pri ${STAGEDIR}${PREFIX}/${QT_MKSPECDIR_REL}/ .include Index: head/devel/qt4-help/Makefile =================================================================== --- head/devel/qt4-help/Makefile (revision 442739) +++ head/devel/qt4-help/Makefile (revision 442740) @@ -1,56 +1,56 @@ # Created by: danny@ricin.com # $FreeBSD$ PORTNAME= help DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt online help integration module USE_QT4= qmake_build moc_build rcc_build corelib clucene \ gui sql sql-sqlite3_run xml network QT_DIST= yes HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ src/activeqt src/dbus src/multimedia src/opengl src/openvg \ src/phonon src/qt3support src/s60installs src/s60main \ src/script src/scripttools src/svg src/testlib src/tools \ src/winmain src/xmlpatterns src/3rdparty/clucene \ src/3rdparty/freetype src/3rdparty/libjpeg src/3rdparty/libmng \ src/3rdparty/libpng src/3rdparty/libtiff src/3rdparty/phonon \ src/3rdparty/webkit .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor BUILD_WRKSRC= ${WRKSRC}/tools/assistant/lib INSTALL_WRKSRC= ${BUILD_WRKSRC} pre-configure: ${MKDIR} ${WRKSRC}/mkspecs ${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake ${LN} -sf ${MOC} ${WRKSRC}/bin/moc ${LN} -sf ${RCC} ${WRKSRC}/bin/rcc post-configure: ${REINPLACE_CMD} \ -e 's|${PREFIX}/${QT_LIBDIR_REL}/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ -e 's|.*$$(QMAKE).*||g' \ ${BUILD_WRKSRC}/Makefile ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ -E -e 's|(.*location=).*moc|\1${PREFIX}/${QT_BINDIR_REL}/${MOC:T}|g' \ -E -e 's|(.*location=).*rcc|\1${PREFIX}/${QT_BINDIR_REL}/rcc|g' \ ${WRKSRC}/lib/pkgconfig/QtHelp.pc .include Index: head/devel/qt4-help-tools/Makefile =================================================================== --- head/devel/qt4-help-tools/Makefile (revision 442739) +++ head/devel/qt4-help-tools/Makefile (revision 442740) @@ -1,49 +1,49 @@ # Created by: danny@ricin.com # $FreeBSD$ PORTNAME= help DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt4- PKGNAMESUFFIX= -tools MAINTAINER= kde@FreeBSD.org COMMENT= Qt utilities for generating documentation USE_QT4= qmake_build moc_build rcc_build uic_build corelib \ gui sql xml doc help QT_DIST= yes HAS_CONFIGURE= yes ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ src/activeqt src/dbus src/multimedia src/network src/opengl \ src/openvg src/phonon src/qt3support src/s60installs \ src/s60main src/script src/scripttools src/sql src/svg \ src/testlib src/tools src/winmain src/xmlpatterns \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor BUILD_WRKSRC= ${WRKSRC}/tools/assistant/tools INSTALL_WRKSRC= ${BUILD_WRKSRC} pre-configure: ${REINPLACE_CMD} -e 's|assistant||' \ ${BUILD_WRKSRC}/tools.pro ${MKDIR} ${WRKSRC}/mkspecs ${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake ${LN} -sf ${MOC} ${WRKSRC}/bin/moc ${LN} -sf ${UIC} ${WRKSRC}/bin/uic ${LN} -sf ${RCC} ${WRKSRC}/bin/rcc .include Index: head/devel/qt4-libqtassistantclient/Makefile =================================================================== --- head/devel/qt4-libqtassistantclient/Makefile (revision 442739) +++ head/devel/qt4-libqtassistantclient/Makefile (revision 442740) @@ -1,52 +1,52 @@ # Created by: lofi@FreeBSD.org # $FreeBSD$ PORTNAME= libQtAssistantClient PORTVERSION= 4.6.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= QT PKGNAMEPREFIX= qt4- DISTNAME= qt-assistant-qassistantclient-library-compat-src-${PORTVERSION} DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt documentation browser integration module USE_QT4= moc_build rcc_build corelib gui network USES= qmake QMAKE_ARGS= CONFIG+="create_prl link_prl" VERSION="${PORTVERSION}" USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} ALL_TARGET= first DESCR= ${.CURDIR:H:H}/devel/qt4/pkg-descr WRKSRC= ${WRKDIR}/${DISTNAME:C/src/version/}/lib pre-configure: ${REINPLACE_CMD} -e 's|$$$$\[QT_INSTALL_HEADERS]|${PREFIX}/${QT_INCDIR_REL}|g' \ -e 's|$$$$\[QT_INSTALL_LIBS]|${PREFIX}/${QT_LIBDIR_REL}|g' \ ${WRKSRC}/lib.pro post-configure: ${REINPLACE_CMD} -e 's|${PREFIX}/${QT_LIBDIR_REL}/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ -e 's|.*$$(QMAKE).*||g' ${WRKSRC}/Makefile ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ -E -e 's|(.*location=).*moc|\1${PREFIX}/${QT_BINDIR_REL}/${MOC:T}|g' \ ${WRKSRC}/lib/pkgconfig/QtAssistantClient.pc pre-build: ${MKDIR} ${WRKSRC}/QtAssistant ${CP} ${WRKSRC}/qassistantclient_global.h \ ${WRKSRC}/QtAssistant post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtAssistant ${INSTALL_DATA} ${FILESDIR}/QAssistantClient ${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtAssistant ${INSTALL_DATA} ${FILESDIR}/QtAssistant ${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtAssistant ${MKDIR} ${STAGEDIR}${PREFIX}/${QT_MKSPECDIR_REL}/features ${INSTALL_DATA} ${WRKSRC:H}/features/assistant.prf ${STAGEDIR}${PREFIX}/${QT_MKSPECDIR_REL}/features .include Index: head/devel/qt4-linguisttools/Makefile =================================================================== --- head/devel/qt4-linguisttools/Makefile (revision 442739) +++ head/devel/qt4-linguisttools/Makefile (revision 442740) @@ -1,48 +1,48 @@ # $FreeBSD$ PORTNAME= linguisttools DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 4 localization tools USE_QT4= qmake_build xml QT_DIST= yes HAS_CONFIGURE= yes ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ src/activeqt src/dbus src/multimedia src/network src/opengl \ src/openvg src/phonon src/qt3support src/s60installs \ src/s60main src/script src/scripttools src/sql src/svg \ src/testlib src/tools src/winmain src/xmlpatterns \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor BUILD_WRKSRC= ${WRKSRC}/tools/linguist INSTALL_WRKSRC= ${BUILD_WRKSRC} pre-configure: ${REINPLACE_CMD} -E -e 's|^TARGET[[:blank:]]*=[[:blank:]]*([a-z]+)|TARGET=\1${_QT_BINSUFX}|g' \ ${BUILD_WRKSRC}/linguist.pro ${BUILD_WRKSRC}/linguist/linguist.pro \ ${BUILD_WRKSRC}/lrelease/lrelease.pro ${BUILD_WRKSRC}/lupdate/lupdate.pro ${MKDIR} ${WRKSRC}/mkspecs ${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake post-patch: @${REINPLACE_CMD} -e '/SUBDIRS.*linguist/ d' \ ${WRKSRC}/tools/linguist/linguist.pro .include Index: head/devel/qt4-makeqpf/Makefile =================================================================== --- head/devel/qt4-makeqpf/Makefile (revision 442739) +++ head/devel/qt4-makeqpf/Makefile (revision 442740) @@ -1,49 +1,49 @@ # Created by: lofi@FreeBSD.org # $FreeBSD$ PORTNAME= makeqpf DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt QPF2 font generator BROKEN_sparc64= does not compile USE_QT4= qmake_build moc_build rcc_build uic_build corelib gui QT_DIST= yes HAS_CONFIGURE= yes ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ src/activeqt src/dbus src/multimedia src/network src/opengl \ src/openvg src/phonon src/qt3support src/s60installs \ src/s60main src/script src/scripttools src/sql src/svg \ src/testlib src/tools src/winmain src/xml src/xmlpatterns \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} pre-configure: ${REINPLACE_CMD} -e 's|^TARGET[[:blank:]]*=[[:blank:]]*|TARGET=${PORTNAME}${_QT_BINSUFX}|g' \ ${BUILD_WRKSRC}/${PORTNAME}.pro ${MKDIR} ${WRKSRC}/mkspecs ${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake ${LN} -sf ${MOC} ${WRKSRC}/bin/moc ${LN} -sf ${UIC} ${WRKSRC}/bin/uic ${LN} -sf ${RCC} ${WRKSRC}/bin/rcc .include Index: head/devel/qt4-porting/Makefile =================================================================== --- head/devel/qt4-porting/Makefile (revision 442739) +++ head/devel/qt4-porting/Makefile (revision 442740) @@ -1,44 +1,44 @@ # Created by: lofi@FreeBSD.org # $FreeBSD$ PORTNAME= porting DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt utility to assist with porting from Qt 3 to Qt 4 USE_QT4= qmake_build moc_build rcc_build corelib xml QT_DIST= yes HAS_CONFIGURE= yes ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ src/activeqt src/dbus src/gui src/multimedia src/network \ src/opengl src/openvg src/phonon src/qt3support \ src/s60installs src/s60main src/script src/scripttools src/sql \ src/svg src/testlib src/tools src/winmain src/xmlpatterns \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} pre-configure: ${MKDIR} ${WRKSRC}/mkspecs ${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake ${LN} -sf ${MOC} ${WRKSRC}/bin/moc ${LN} -sf ${RCC} ${WRKSRC}/bin/rcc .include Index: head/devel/qt4-qdbusviewer/Makefile =================================================================== --- head/devel/qt4-qdbusviewer/Makefile (revision 442739) +++ head/devel/qt4-qdbusviewer/Makefile (revision 442740) @@ -1,57 +1,57 @@ # Created by: lofi@FreeBSD.org # $FreeBSD$ PORTNAME= qdbusviewer DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 4 graphical interface to D-Bus LIB_DEPENDS= libdbus-1.so:devel/dbus USES= pkgconfig USE_QT4= qmake_build moc_build rcc_build corelib dbus gui xml \ clucene QT_DIST= yes HAS_CONFIGURE= yes ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH DESKTOP_ENTRIES="Qt 4 D-Bus viewer" "" \ "${PREFIX}/share/pixmaps/qdbusviewer-qt4.png" \ "${PREFIX}/${QT_BINDIR_REL}/qdbusviewer" \ "Development;Qt;" true DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ src/activeqt src/multimedia src/network src/opengl src/openvg \ src/phonon src/qt3support src/s60installs src/s60main \ src/script src/scripttools src/sql src/svg src/testlib \ src/tools src/winmain src/xmlpatterns src/3rdparty/clucene \ src/3rdparty/freetype src/3rdparty/libjpeg src/3rdparty/libmng \ src/3rdparty/libpng src/3rdparty/libtiff src/3rdparty/phonon \ src/3rdparty/webkit .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor BUILD_WRKSRC= ${WRKSRC}/tools/qdbus/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} post-patch: ${MKDIR} ${WRKSRC}/mkspecs ${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake ${LN} -sf ${MOC} ${WRKSRC}/bin/moc ${LN} -sf ${RCC} ${WRKSRC}/bin/rcc post-install: ${INSTALL_DATA} ${INSTALL_WRKSRC}/images/qdbusviewer-128.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/qdbusviewer-qt4.png .include Index: head/devel/qt4-qdoc3/Makefile =================================================================== --- head/devel/qt4-qdoc3/Makefile (revision 442739) +++ head/devel/qt4-qdoc3/Makefile (revision 442740) @@ -1,37 +1,37 @@ # Created by: Maxim Ignatenko # $FreeBSD$ PORTNAME= qdoc3 DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel textproc PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt documentation generator USE_QT4= qmake_build corelib gui xml QT_DIST= yes HAS_CONFIGURE= yes ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ src/activeqt src/dbus src/multimedia src/opengl src/openvg \ src/s60installs src/s60main src/scripttools src/sql src/svg \ src/testlib src/winmain src/xmlpatterns .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} pre-configure: ${MKDIR} ${WRKSRC}/mkspecs/modules ${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake .include Index: head/devel/qt4-qmake/Makefile =================================================================== --- head/devel/qt4-qmake/Makefile (revision 442739) +++ head/devel/qt4-qmake/Makefile (revision 442740) @@ -1,82 +1,82 @@ # Created by: lofi@FreeBSD.org, mi@aldan.algebra.com # $FreeBSD$ PORTNAME= qmake DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt Makefile generator USE_QT4= # empty QT_DIST= yes REINPLACE_ARGS= -i "" WRKSRC_SUBDIR= ${PORTNAME} MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV+= FILESDIR="${FILESDIR}" \ QMAKE_COMPILER="${QMAKE_COMPILER}" \ QMAKE="${QMAKE}" \ QT_BINDIR_REL="${QT_BINDIR_REL}" \ QT_MKSPECDIR_REL="${QT_MKSPECDIR_REL}" TODAY_CMD= /bin/date +%Y-%m-%d SUB_FILES= qconfig.cpp SUB_LIST= TODAY="$$(${TODAY_CMD})" \ ${PLIST_SUB:NPREFIX=*} EXTRACT_AFTER_ARGS= \ '${DISTNAME}/mkspecs' \ '${DISTNAME}/include/*/*' \ '${DISTNAME}/src/*/*.h' \ '${DISTNAME}/qmake' \ '${DISTNAME}/src/corelib/tools' \ '${DISTNAME}/src/corelib/io' \ '${DISTNAME}/src/corelib/global' \ '${DISTNAME}/src/corelib/plugin' \ '${DISTNAME}/src/corelib/kernel' \ '${DISTNAME}/src/corelib/codecs' \ '${DISTNAME}/src/corelib/xml' \ '${DISTNAME}/src/3rdparty/md4' \ '${DISTNAME}/src/3rdparty/md5' \ '${DISTNAME}/src/3rdparty/sha1' \ '${DISTNAME}/tools/shared/symbian' \ '${DISTNAME}/tools/shared/windows' EXTRA_PATCHES= # empty post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ -e 's|release|release thread|' \ -e 's|uic|${UIC:T}|' \ -e 's|moc|${MOC:T}|' \ ${WRKSRC:H}/mkspecs/common/freebsd.conf @${REINPLACE_CMD} -e 's|@QMAKE_QTOBJS@||g' ${WRKSRC}/Makefile.unix @${REINPLACE_CMD} -e 's|unix.conf|freebsd.conf|' \ ${WRKSRC:H}/mkspecs/freebsd-icc/qmake.conf @${RM} -R ${WRKSRC:H}/mkspecs/freebsd-g++46 # Add mkspec for clang @${CP} -a ${WRKSRC:H}/mkspecs/freebsd-g++ \ ${WRKSRC:H}/mkspecs/freebsd-clang @${REINPLACE_CMD} -e 's|g++|clang|g' \ -e '/gcc-base-unix.conf/d' \ ${WRKSRC:H}/mkspecs/freebsd-clang/qmake.conf @${RM} ${WRKSRC:H}/mkspecs/*/*.orig do-configure: apply-slist ${MV} ${WRKDIR}/qconfig.cpp \ ${WRKSRC:H}/src/corelib/global/qconfig.cpp ${ECHO} '/* empty */' > ${WRKSRC}/qconfig.h ${LN} ${WRKSRC}/qconfig.h ${WRKSRC:H}/src/corelib/global/qconfig.h do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/${QT_BINDIR_REL} ${INSTALL_PROGRAM} ${WRKSRC}/${QMAKE:T} ${STAGEDIR}${PREFIX}/${QT_BINDIR_REL} ${MKDIR} ${STAGEDIR}${PREFIX}/${QT_MKSPECDIR_REL:H} && \ cd ${WRKSRC}/.. && ${COPYTREE_SHARE} mkspecs ${STAGEDIR}${PREFIX}/${QT_MKSPECDIR_REL:H} ${LN} -sf freebsd-${QMAKE_COMPILER} ${STAGEDIR}${PREFIX}/share/qt4/mkspecs/default .include Index: head/devel/qt4-qt3support/Makefile =================================================================== --- head/devel/qt4-qt3support/Makefile (revision 442739) +++ head/devel/qt4-qt3support/Makefile (revision 442740) @@ -1,50 +1,50 @@ # Created by: lofi@FreeBSD.org # $FreeBSD$ PORTNAME= qt3support DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel x11-toolkits PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 3 compatibility module USE_QT4= qmake_build moc_build corelib gui network sql xml QT_DIST= yes USES= pkgconfig HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/activeqt src/dbus src/multimedia src/opengl src/openvg \ src/phonon src/s60installs src/s60main src/script \ src/scripttools src/svg src/testlib src/tools src/winmain \ src/xmlpatterns src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} pre-configure: ${MKDIR} ${WRKSRC}/mkspecs ${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake ${LN} -sf ${MOC} ${WRKSRC}/bin/moc post-configure: ${REINPLACE_CMD} -e 's|${PREFIX}/${QT_LIBDIR_REL}/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ -e 's|.*$$(QMAKE).*||g' ${BUILD_WRKSRC}/Makefile ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ -E -e 's|(.*location=).*moc|\1${PREFIX}/${QT_BINDIR_REL}/${MOC:T}|g' \ ${WRKSRC}/lib/pkgconfig/Qt3Support.pc .include Index: head/devel/qt4-qvfb/Makefile =================================================================== --- head/devel/qt4-qvfb/Makefile (revision 442739) +++ head/devel/qt4-qvfb/Makefile (revision 442740) @@ -1,59 +1,59 @@ # Created by: lofi@FreeBSD.org # $FreeBSD$ PORTNAME= qvfb DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 4 virtual framebuffer utility USE_QT4= qmake_build moc_build rcc_build uic_build corelib gui opengl QT_DIST= yes USE_XORG= xtst HAS_CONFIGURE= yes ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH DESKTOP_ENTRIES="Qt 4 Virtual Framebuffer" "" \ "${PREFIX}/share/pixmaps/qvfb-qt4.png" \ "${PREFIX}/${QT_BINDIR_REL}/qvfb${_QT_BINSUFX}" \ "Development;Qt;" true DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ src/activeqt src/dbus src/multimedia src/network src/opengl \ src/openvg src/phonon src/qt3support src/s60installs \ src/s60main src/script src/scripttools src/sql src/svg \ src/testlib src/tools src/winmain src/xml src/xmlpatterns \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} CONFIGURE_ARGS+= -I../../include/Qt -I../../include pre-configure: ${MKDIR} ${WRKSRC}/mkspecs ${REINPLACE_CMD} -e 's|^TARGET.*|TARGET=qvfb${_QT_BINSUFX}|g' \ ${BUILD_WRKSRC}/qvfb.pro ${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake ${LN} -sf ${MOC} ${WRKSRC}/bin/moc ${LN} -sf ${UIC} ${WRKSRC}/bin/uic ${LN} -sf ${RCC} ${WRKSRC}/bin/rcc post-install: ${INSTALL_DATA} ${INSTALL_WRKSRC}/images/logo.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/qvfb-qt4.png .include Index: head/devel/qt4-script/Makefile =================================================================== --- head/devel/qt4-script/Makefile (revision 442739) +++ head/devel/qt4-script/Makefile (revision 442740) @@ -1,52 +1,52 @@ # Created by: lofi@FreeBSD.org # $FreeBSD$ PORTNAME= script DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt scripting module USES= pkgconfig USE_QT4= qmake_build moc_build corelib QT_DIST= yes HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH MAKEOBJDIR=. DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/activeqt src/dbus src/gui src/multimedia src/network \ src/opengl src/openvg src/phonon src/qt3support \ src/s60installs src/s60main src/scripttools src/sql src/svg \ src/testlib src/tools src/winmain src/xml src/xmlpatterns \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} pre-configure: ${MKDIR} ${WRKSRC}/mkspecs ${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake ${LN} -sf ${MOC} ${WRKSRC}/bin/moc post-configure: ${REINPLACE_CMD} -e 's|${PREFIX}/${QT_LIBDIR_REL}/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ -e 's|.*$$(QMAKE).*||g' ${BUILD_WRKSRC}/Makefile ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ -E -e 's|(.*location=).*moc|\1${PREFIX}/${QT_BINDIR_REL}/${MOC:T}|g' \ ${WRKSRC}/lib/pkgconfig/QtScript.pc .include Index: head/devel/qt4-testlib/Makefile =================================================================== --- head/devel/qt4-testlib/Makefile (revision 442739) +++ head/devel/qt4-testlib/Makefile (revision 442740) @@ -1,50 +1,50 @@ # Created by: lofi@FreeBSD.org # $FreeBSD$ PORTNAME= testlib DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt unit testing module USE_QT4= qmake_build moc_build corelib QT_DIST= yes HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/activeqt src/dbus src/gui src/multimedia src/network \ src/opengl src/openvg src/phonon src/qt3support \ src/s60installs src/s60main src/script src/scripttools src/sql \ src/svg src/tools src/winmain src/xml src/xmlpatterns \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor BUILD_WRKSRC= ${WRKSRC}/src/testlib INSTALL_WRKSRC= ${BUILD_WRKSRC} pre-configure: ${MKDIR} ${WRKSRC}/mkspecs ${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake ${LN} -sf ${MOC} ${WRKSRC}/bin/moc post-configure: ${REINPLACE_CMD} -e 's|${PREFIX}/${QT_LIBDIR_REL}/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ -e 's|.*$$(QMAKE).*||g' ${BUILD_WRKSRC}/Makefile ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ -E -e 's|(.*location=).*moc|\1${PREFIX}/${QT_BINDIR_REL}/${MOC:T}|g' \ ${WRKSRC}/lib/pkgconfig/QtTest.pc .include Index: head/devel/qt4-uic3/Makefile =================================================================== --- head/devel/qt4-uic3/Makefile (revision 442739) +++ head/devel/qt4-uic3/Makefile (revision 442740) @@ -1,41 +1,41 @@ # Created by: lofi@FreeBSD.org # $FreeBSD$ PORTNAME= uic3 DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 3-compatible User Interface Compiler USE_QT4= qmake_build qt3support corelib gui network sql xml porting QT_DIST= yes HAS_CONFIGURE= yes ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/activeqt src/dbus src/multimedia src/network src/opengl \ src/openvg src/phonon src/s60installs src/s60main src/script \ src/scripttools src/sql src/svg src/testlib src/winmain \ src/xmlpatterns src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor BUILD_WRKSRC= ${WRKSRC}/src/tools/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} pre-configure: ${MKDIR} ${WRKSRC}/mkspecs ${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake .include Index: head/graphics/qt4-iconengines/Makefile =================================================================== --- head/graphics/qt4-iconengines/Makefile (revision 442739) +++ head/graphics/qt4-iconengines/Makefile (revision 442740) @@ -1,44 +1,44 @@ # Created by: lofi@FreeBSD.org # $FreeBSD$ PORTNAME= iconengines DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt SVG icon engine USES= pkgconfig USE_QT4= qmake_build moc_build corelib gui svg xml QT_DIST= yes HAS_CONFIGURE= yes ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/activeqt src/dbus src/multimedia src/network src/opengl \ src/openvg src/phonon src/qt3support src/s60installs \ src/s60main src/script src/scripttools src/sql src/testlib \ src/tools src/winmain src/xml src/xmlpatterns \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME}/svgiconengine INSTALL_WRKSRC= ${BUILD_WRKSRC} pre-configure: ${MKDIR} ${WRKSRC}/mkspecs ${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake ${LN} -sf ${MOC} ${WRKSRC}/bin/moc .include Index: head/graphics/qt4-imageformats/Makefile =================================================================== --- head/graphics/qt4-imageformats/Makefile (revision 442739) +++ head/graphics/qt4-imageformats/Makefile (revision 442740) @@ -1,49 +1,49 @@ # Created by: lofi@FreeBSD.org # $FreeBSD$ PORTNAME= imageformats DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt plugins for several image formats LIB_DEPENDS= libmng.so:graphics/libmng \ libpng.so:graphics/png \ libtiff.so:graphics/tiff USES= jpeg pkgconfig USE_QT4= qmake_build moc_build rcc_build corelib gui svg xml QT_DIST= yes HAS_CONFIGURE= yes ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/activeqt src/dbus src/multimedia src/network src/opengl \ src/openvg src/phonon src/qt3support src/s60installs \ src/s60main src/script src/scripttools src/sql src/testlib \ src/tools src/winmain src/xml src/xmlpatterns \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} pre-configure: ${MKDIR} ${WRKSRC}/mkspecs ${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake ${LN} -sf ${MOC} ${WRKSRC}/bin/moc ${LN} -sf ${RCC} ${WRKSRC}/bin/rcc .include Index: head/graphics/qt4-opengl/Makefile =================================================================== --- head/graphics/qt4-opengl/Makefile (revision 442739) +++ head/graphics/qt4-opengl/Makefile (revision 442740) @@ -1,56 +1,56 @@ # Created by: lofi@FreeBSD.org # $FreeBSD$ PORTNAME= opengl DISTVERSION= ${QT4_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt OpenGL support module USE_QT4= qmake_build moc_build corelib gui QT_DIST= yes HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} USE_GL= gl USE_XORG= x11 ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/activeqt src/dbus src/multimedia src/network src/openvg \ src/phonon src/qt3support src/s60installs src/s60main \ src/script src/scripttools src/sql src/svg src/testlib \ src/tools src/winmain src/xml src/xmlpatterns \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} CONFIGURE_ARGS+= -I../../include/QtCore -I../../include/QtGui \ -I../../include/Qt -I../../include pre-configure: ${MKDIR} ${WRKSRC}/mkspecs ${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake ${LN} -sf ${MOC} ${WRKSRC}/bin/moc post-configure: ${REINPLACE_CMD} -e 's|${PREFIX}/${QT_LIBDIR_REL}/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ -e 's|.*$$(QMAKE).*||g' ${BUILD_WRKSRC}/Makefile ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ -E -e 's|(.*location=).*moc|\1${PREFIX}/${QT_BINDIR_REL}/${MOC:T}|g' \ ${WRKSRC}/lib/pkgconfig/QtOpenGL.pc .include Index: head/graphics/qt4-pixeltool/Makefile =================================================================== --- head/graphics/qt4-pixeltool/Makefile (revision 442739) +++ head/graphics/qt4-pixeltool/Makefile (revision 442740) @@ -1,49 +1,49 @@ # Created by: lofi@FreeBSD.org # $FreeBSD$ PORTNAME= pixeltool DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 4 screen magnifier USE_QT4= qmake_build moc_build corelib gui network QT_DIST= yes HAS_CONFIGURE= yes ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH # qtlogo.png is installed by qt4-gui DESKTOP_ENTRIES="Qt 4 PixelTool" "" \ "${PREFIX}/share/pixmaps/qtlogo.png" \ "${PREFIX}/${QT_BINDIR_REL}/pixeltool" \ "Graphics;Qt;" true DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ src/activeqt src/dbus src/multimedia src/network src/opengl \ src/openvg src/phonon src/qt3support src/s60installs \ src/s60main src/script src/scripttools src/sql src/svg \ src/testlib src/tools src/winmain src/xml src/xmlpatterns \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} pre-configure: ${MKDIR} ${WRKSRC}/mkspecs ${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake ${LN} -sf ${MOC} ${WRKSRC}/bin/moc .include Index: head/graphics/qt4-svg/Makefile =================================================================== --- head/graphics/qt4-svg/Makefile (revision 442739) +++ head/graphics/qt4-svg/Makefile (revision 442740) @@ -1,51 +1,51 @@ # Created by: lofi@FreeBSD.org # $FreeBSD$ PORTNAME= svg DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt SVG support module USE_QT4= qmake_build moc_build corelib gui QT_DIST= yes HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/activeqt src/dbus src/multimedia src/network src/opengl \ src/openvg src/phonon src/qt3support src/s60installs \ src/s60main src/script src/scripttools src/sql src/testlib \ src/tools src/winmain src/xmlpatterns src/3rdparty/clucene \ src/3rdparty/freetype src/3rdparty/libjpeg src/3rdparty/libmng \ src/3rdparty/libpng src/3rdparty/libtiff src/3rdparty/phonon \ src/3rdparty/webkit .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} pre-configure: ${MKDIR} ${WRKSRC}/mkspecs ${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake ${LN} -sf ${MOC} ${WRKSRC}/bin/moc post-configure: ${REINPLACE_CMD} -e 's|${PREFIX}/${QT_LIBDIR_REL}/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ -e 's|.*$$(QMAKE).*||g' ${BUILD_WRKSRC}/Makefile ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ -E -e 's|(.*location=).*moc|\1${PREFIX}/${QT_BINDIR_REL}/${MOC:T}|g' \ ${WRKSRC}/lib/pkgconfig/QtSvg.pc .include Index: head/korean/qt4-codecs-kr/Makefile =================================================================== --- head/korean/qt4-codecs-kr/Makefile (revision 442739) +++ head/korean/qt4-codecs-kr/Makefile (revision 442740) @@ -1,43 +1,43 @@ # Created by: lofi@FreeBSD.org # $FreeBSD$ PORTNAME= codecs DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= korean PKGNAMEPREFIX= qt4- PKGNAMESUFFIX= -kr MAINTAINER= kde@FreeBSD.org COMMENT= Qt EUC-KR codec plugin USE_QT4= qmake_build corelib QT_DIST= yes HAS_CONFIGURE= yes ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/activeqt src/dbus src/gui src/multimedia src/network \ src/opengl src/openvg src/phonon src/qt3support \ src/s60installs src/s60main src/script src/scripttools src/sql \ src/svg src/testlib src/tools src/winmain src/xml \ src/xmlpatterns src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME}/kr INSTALL_WRKSRC= ${BUILD_WRKSRC} pre-configure: ${MKDIR} ${WRKSRC}/mkspecs ${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake .include Index: head/multimedia/qt4-multimedia/Makefile =================================================================== --- head/multimedia/qt4-multimedia/Makefile (revision 442739) +++ head/multimedia/qt4-multimedia/Makefile (revision 442740) @@ -1,53 +1,53 @@ # $FreeBSD$ PORTNAME= multimedia DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt low-level multimedia API USE_QT4= qmake_build moc_build uic_build corelib gui QT_DIST= yes HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/activeqt src/dbus src/opengl src/openvg src/phonon \ src/qt3support src/s60installs src/s60main src/script \ src/scripttools src/sql src/svg src/testlib src/tools \ src/winmain src/xml src/xmlpatterns src/3rdparty/clucene \ src/3rdparty/freetype src/3rdparty/libjpeg src/3rdparty/libmng \ src/3rdparty/libpng src/3rdparty/libtiff src/3rdparty/phonon \ src/3rdparty/webkit .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} pre-configure: ${MKDIR} ${WRKSRC}/mkspecs ${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake ${LN} -sf ${MOC} ${WRKSRC}/bin/moc ${LN} -sf ${UIC} ${WRKSRC}/bin/uic post-configure: ${REINPLACE_CMD} \ -e 's|${PREFIX}/${QT_LIBDIR_REL}/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ -e 's|.*$$(QMAKE).*||g' ${BUILD_WRKSRC}/Makefile ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ -E -e 's|(.*location=).*moc|\1${PREFIX}/${QT_BINDIR_REL}/${MOC:T}|g' \ -E -e 's|(.*location=).*uic|\1${PREFIX}/${QT_BINDIR_REL}/${UIC:T}|g' \ ${WRKSRC}/lib/pkgconfig/QtMultimedia.pc .include Index: head/net/qt4-network/Makefile =================================================================== --- head/net/qt4-network/Makefile (revision 442739) +++ head/net/qt4-network/Makefile (revision 442740) @@ -1,62 +1,62 @@ # Created by: lofi@FreeBSD.org # $FreeBSD$ PORTNAME= network DISTVERSION= ${QT4_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net ipv6 PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt network module LICENSE= GPLv3 LGPL21 LGPL3 GFDL LICENSE_COMB= dual RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss USES= ssl USE_QT4= qmake_build moc_build rcc_build corelib QT_DIST= yes HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/activeqt src/dbus src/gui src/multimedia src/opengl \ src/openvg src/phonon src/qt3support src/s60installs \ src/s60main src/script src/scripttools src/sql src/svg \ src/testlib src/tools src/winmain src/xml src/xmlpatterns \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} pre-configure: ${MKDIR} ${WRKSRC}/mkspecs ${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake ${LN} -sf ${MOC} ${WRKSRC}/bin/moc ${LN} -sf ${RCC} ${WRKSRC}/bin/rcc post-configure: ${REINPLACE_CMD} -e 's|${PREFIX}/${QT_LIBDIR_REL}/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ -e 's|.*$$(QMAKE).*||g' ${BUILD_WRKSRC}/Makefile ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ -E -e 's|(.*location=).*moc|\1${PREFIX}/${QT_BINDIR_REL}/${MOC:T}|g' \ -E -e 's|(.*location=).*uic|\1${PREFIX}/${QT_BINDIR_REL}/${UIC:T}|g' \ ${WRKSRC}/lib/pkgconfig/QtNetwork.pc ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/src/network/ssl/qsslsocket_openssl.cpp ${REINPLACE_CMD} -e 's|%%OPENSSLLIB%%|${OPENSSLLIB}|g' \ ${WRKSRC}/src/network/ssl/qsslsocket_openssl_symbols.cpp .include Index: head/textproc/qt4-xml/Makefile =================================================================== --- head/textproc/qt4-xml/Makefile (revision 442739) +++ head/textproc/qt4-xml/Makefile (revision 442740) @@ -1,54 +1,54 @@ # Created by: lofi@FreeBSD.org # $FreeBSD$ PORTNAME= xml DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt SAX and DOM implementations USE_QT4= qmake_build moc_build corelib QT_DIST= yes HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/activeqt src/dbus src/gui src/multimedia src/network \ src/opengl src/openvg src/phonon src/qt3support \ src/s60installs src/s60main src/script src/scripttools src/sql \ src/svg src/testlib src/tools src/winmain src/xmlpatterns \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} pre-configure: ${MKDIR} ${WRKSRC}/mkspecs ${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake ${LN} -sf ${MOC} ${WRKSRC}/bin/moc post-configure: ${REINPLACE_CMD} -e 's|${PREFIX}/${QT_LIBDIR_REL}/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ -e 's|.*$$(QMAKE).*||g' ${BUILD_WRKSRC}/Makefile ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ -E -e 's|(.*location=).*moc|\1${PREFIX}/${QT_BINDIR_REL}/${MOC:T}|g' \ -E -e 's|(.*location=).*uic|\1${PREFIX}/${QT_BINDIR_REL}/${UIC:T}|g' \ ${WRKSRC}/lib/pkgconfig/QtXml.pc #disable installation of include/Qt/qxmlstream.h, it handled by qt-corelib package ${REINPLACE_CMD} -e '\,stream/qxmlstream.h.*${QT_INCDIR}/Qt/,d' ${WRKSRC}/src/xml/Makefile .include Index: head/textproc/qt4-xmlpatterns/Makefile =================================================================== --- head/textproc/qt4-xmlpatterns/Makefile (revision 442739) +++ head/textproc/qt4-xmlpatterns/Makefile (revision 442740) @@ -1,55 +1,55 @@ # Created by: danny@ricin.com # $FreeBSD$ PORTNAME= xmlpatterns DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt support for XPath, XQuery, XSLT and XML Schema USE_QT4= qmake_build moc_build rcc_build corelib network QT_DIST= yes HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ src/activeqt src/dbus src/gui src/multimedia src/opengl \ src/openvg src/phonon src/qt3support src/s60installs \ src/s60main src/script src/scripttools src/sql src/svg \ src/testlib src/tools src/winmain src/3rdparty/clucene \ src/3rdparty/freetype src/3rdparty/libjpeg src/3rdparty/libmng \ src/3rdparty/libpng src/3rdparty/libtiff src/3rdparty/phonon \ src/3rdparty/webkit .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} pre-configure: ${MKDIR} ${WRKSRC}/mkspecs ${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake ${LN} -sf ${MOC} ${WRKSRC}/bin/moc ${LN} -sf ${RCC} ${WRKSRC}/bin/rcc post-configure: ${REINPLACE_CMD} \ -e 's|${PREFIX}/${QT_LIBDIR_REL}/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ -e 's|.*$$(QMAKE).*||g' \ -e 's|-fno-exceptions ||g' \ ${BUILD_WRKSRC}/Makefile ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ -E -e 's|(.*location=).*moc|\1${PREFIX}/${QT_BINDIR_REL}/${MOC:T}|g' \ ${WRKSRC}/lib/pkgconfig/QtXmlPatterns.pc .include Index: head/textproc/qt4-xmlpatterns-tool/Makefile =================================================================== --- head/textproc/qt4-xmlpatterns-tool/Makefile (revision 442739) +++ head/textproc/qt4-xmlpatterns-tool/Makefile (revision 442740) @@ -1,44 +1,44 @@ # Created by: danny@ricin.com # $FreeBSD$ PORTNAME= xmlpatterns-tool DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt command-line utility for running XQueries USE_QT4= qmake_build xmlpatterns QT_DIST= yes HAS_CONFIGURE= yes ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ src/activeqt src/dbus src/gui src/multimedia src/network \ src/opengl src/openvg src/phonon src/qt3support \ src/s60installs src/s60main src/script src/scripttools \ src/sql src/svg src/testlib src/tools src/winmain src/xml \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor BUILD_WRKSRC= ${WRKSRC}/tools/xmlpatterns INSTALL_WRKSRC= ${BUILD_WRKSRC} pre-configure: ${MKDIR} ${WRKSRC}/mkspecs # ${REINPLACE_CMD} -e 's|^TARGET.*|TARGET=xmlpatterns|g' \ # ${BUILD_WRKSRC}/xmlpatterns.pro ${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake .include Index: head/www/qt4-webkit/Makefile =================================================================== --- head/www/qt4-webkit/Makefile (revision 442739) +++ head/www/qt4-webkit/Makefile (revision 442740) @@ -1,98 +1,98 @@ # Created by: danny@ricin.com # $FreeBSD$ PORTNAME= webkit DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt WebKit implementation USE_QT4= corelib declarative gui network \ qmake_build moc_build rcc_build QT_DIST= yes USE_XORG= xrender USES= pkgconfig HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH MAKEOBJDIR=. DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/activeqt src/dbus src/opengl src/openvg src/qt3support \ src/s60installs src/s60main src/scripttools src/sql src/svg \ src/testlib src/tools src/winmain src/3rdparty/clucene \ src/3rdparty/freetype src/3rdparty/libjpeg src/3rdparty/libmng \ src/3rdparty/libpng src/3rdparty/libtiff .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor BUILD_WRKSRC= ${WRKSRC}/src/3rdparty/${PORTNAME}/Source INSTALL_WRKSRC= ${BUILD_WRKSRC} CONFIGURE_ARGS+= -I../../../../include/Qt -I../../../../include OPTIONS_DEFINE= GSTREAMER OPTIONS_DEFAULT=GSTREAMER GSTREAMER_USE= GSTREAMER=yes .include # Base ld(1) segfaults on PowerPC: # http://bugs.freebsd.org/173042 .if ${ARCH} == "powerpc" BUILD_DEPENDS+= ${LOCALBASE}/bin/ld:devel/binutils .endif .if ${ARCH} == powerpc64 CFLAGS+= -mminimal-toc .endif # Quick hack to avoid messing up qt_webkit_version.pri installation # directory. bsd.port.pre.mk is required to add the setting at the end. CONFIGURE_ENV+= QMAKEPATH="" MAKE_ENV+= QMAKEPATH="" pre-configure: ${MKDIR} ${WRKSRC}/mkspecs ${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake ${LN} -sf ${MOC} ${WRKSRC}/bin/moc ${LN} -sf ${RCC} ${WRKSRC}/bin/rcc ${REINPLACE_CMD} -e 's|linux-\*|unix|g' \ ${BUILD_WRKSRC}/WebCore/features.pri \ ${BUILD_WRKSRC}/JavaScriptCore/wtf/wtf.pri .if ! ${PORT_OPTIONS:MGSTREAMER} ${REINPLACE_CMD} -e 's|.*exists.*gstreamer.*|false {|' \ ${BUILD_WRKSRC}/WebCore/features.pri .endif # Avoid building and installing several tests. Should this be made an option? ${REINPLACE_CMD} -e '/WebKit\/qt\/tests/ d' \ ${BUILD_WRKSRC}/WebKit.pro post-configure: ${REINPLACE_CMD} \ -e 's|${PREFIX}/${QT_LIBDIR_REL}/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ -e 's|.*$$(QMAKE).*||g' \ -e '/^CFLAGS/ s|-I${LOCALBASE}/include ||g' \ -e '/^CXXFLAGS/ s|-I${LOCALBASE}/include ||g' \ ${BUILD_WRKSRC}/Makefile \ ${BUILD_WRKSRC}/WebCore/Makefile \ ${BUILD_WRKSRC}/WebKit/qt/Makefile ${CP} ${BUILD_WRKSRC}/WebKit/qt/Makefile \ ${BUILD_WRKSRC}/WebKit/qt/Makefile.QtWebKit ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ -E -e 's|(.*location=).*moc|\1${PREFIX}/${QT_BINDIR_REL}/${MOC:T}|g' \ ${WRKSRC}/lib/pkgconfig/QtWebKit.pc # QtWebKit is statically linked with jscore, remove the latest. ${REINPLACE_CMD} -e 's|-L../JavaScriptCore/release||; s|-ljscore||' \ ${WRKSRC}/lib/pkgconfig/QtWebKit.pc .include Index: head/x11/qt4-graphicssystems-opengl/Makefile =================================================================== --- head/x11/qt4-graphicssystems-opengl/Makefile (revision 442739) +++ head/x11/qt4-graphicssystems-opengl/Makefile (revision 442740) @@ -1,43 +1,43 @@ # $FreeBSD$ PORTNAME= graphicssystems DISTVERSION= ${QT4_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 PKGNAMEPREFIX= qt4- PKGNAMESUFFIX= -opengl MAINTAINER= kde@FreeBSD.org COMMENT= Qt OpenGL rendering engine (experimental) USE_QT4= qmake_build opengl QT_DIST= yes HAS_CONFIGURE= yes USE_GL= glu ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/activeqt src/dbus src/multimedia src/network src/openvg \ src/phonon src/qt3support src/s60installs src/s60main \ src/script src/scripttools src/sql src/svg src/testlib \ src/tools src/winmain src/xml src/xmlpatterns \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME}/opengl INSTALL_WRKSRC= ${BUILD_WRKSRC} pre-configure: ${MKDIR} ${WRKSRC}/mkspecs ${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake .include Index: head/x11/qt4-inputmethods/Makefile =================================================================== --- head/x11/qt4-inputmethods/Makefile (revision 442739) +++ head/x11/qt4-inputmethods/Makefile (revision 442740) @@ -1,43 +1,43 @@ # Created by: lofi@FreeBSD.org # $FreeBSD$ PORTNAME= inputmethods DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt input methods USE_QT4= qmake_build moc_build corelib gui QT_DIST= yes HAS_CONFIGURE= yes ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/activeqt src/dbus src/multimedia src/network src/opengl \ src/openvg src/phonon src/qt3support src/s60installs \ src/s60main src/script src/scripttools src/sql src/svg \ src/testlib src/tools src/winmain src/xml src/xmlpatterns \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} pre-configure: ${MKDIR} ${WRKSRC}/mkspecs ${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake ${LN} -sf ${MOC} ${WRKSRC}/bin/moc .include Index: head/x11-themes/qt4-style-Kvantum/Makefile =================================================================== --- head/x11-themes/qt4-style-Kvantum/Makefile (revision 442739) +++ head/x11-themes/qt4-style-Kvantum/Makefile (revision 442740) @@ -1,29 +1,30 @@ # $FreeBSD$ PORTNAME= Kvantum PORTVERSION= 0.10.4 DISTVERSIONPREFIX= V +PORTREVISION= 1 CATEGORIES= x11-themes PKGNAMEPREFIX= qt4-style- MAINTAINER= rezny@FreeBSD.org COMMENT= SVG-based theme engine for Qt4/5, KDE and LXQT LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING USE_GITHUB= yes GH_ACCOUNT= tsujan USES= compiler:c++11-lang qmake USE_QT4= corelib gui svg rcc_build uic_build moc_build USE_XORG= x11 xext WRKSRC_SUBDIR= ${PORTNAME} post-patch: @${REINPLACE_CMD} -e 's|/kde4/|/|g' ${WRKSRC}/style/style.pro @${REINPLACE_CMD} -e 's|/kde4/|/|g' -e 's|--no-preserve=mode||g' \ ${WRKSRC}/themes/themes.pro .include Index: head/x11-themes/qt4-style-float/Makefile =================================================================== --- head/x11-themes/qt4-style-float/Makefile (revision 442739) +++ head/x11-themes/qt4-style-float/Makefile (revision 442740) @@ -1,29 +1,29 @@ # Created by: Dmitry Marakasov # $FreeBSD$ PORTNAME= float PORTVERSION= 0.1a2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-themes MASTER_SITES= http://kde-look.org/CONTENT/content-files/ \ http://mirror.amdmi3.ru/distfiles/ PKGNAMEPREFIX= qt4-style- DISTNAME= 54477-floatstyle-${PORTVERSION} MAINTAINER= amdmi3@FreeBSD.org COMMENT= Style for Qt 4 and KDE LICENSE= GPLv2 USES= tar:bzip2 qmake USE_QT4= corelib gui moc_build rcc_build WRKSRC= ${WRKDIR}/floatstyle-${PORTVERSION} PLIST_FILES= ${QT_PLUGINDIR_REL}/styles/libfloatstyle.so do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/${QT_PLUGINDIR_REL}/styles/ ${INSTALL_PROGRAM} ${WRKSRC}/libfloatstyle.so ${STAGEDIR}${PREFIX}/${QT_PLUGINDIR_REL}/styles/ .include Index: head/x11-themes/qt4-style-phase/Makefile =================================================================== --- head/x11-themes/qt4-style-phase/Makefile (revision 442739) +++ head/x11-themes/qt4-style-phase/Makefile (revision 442740) @@ -1,29 +1,29 @@ # Created by: Dmitry Marakasov # $FreeBSD$ PORTNAME= phase PORTVERSION= 0.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-themes MASTER_SITES= http://kde-look.org/CONTENT/content-files/ \ http://mirror.amdmi3.ru/distfiles/ PKGNAMEPREFIX= qt4-style- DISTNAME= 11402-phase-${PORTVERSION} MAINTAINER= amdmi3@FreeBSD.org COMMENT= Widget style for Qt 4 and KDE 4 LICENSE= MIT USES= tar:bzip2 qmake USE_QT4= corelib gui moc_build WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} PLIST_FILES= ${QT_PLUGINDIR_REL}/styles/libphasestyle.so do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/${QT_PLUGINDIR_REL}/styles/ ${INSTALL_PROGRAM} ${WRKSRC}/libphasestyle.so ${STAGEDIR}${PREFIX}/${QT_PLUGINDIR_REL}/styles/ .include Index: head/x11-themes/qt4-style-quantumstyle/Makefile =================================================================== --- head/x11-themes/qt4-style-quantumstyle/Makefile (revision 442739) +++ head/x11-themes/qt4-style-quantumstyle/Makefile (revision 442740) @@ -1,30 +1,30 @@ # Created by: Dmitry Marakasov # $FreeBSD$ PORTNAME= quantumstyle DISTVERSION= rc6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-themes MASTER_SITES= http://saidlankri.free.fr/ \ http://mirror.amdmi3.ru/distfiles/ PKGNAMEPREFIX= qt4-style- DISTNAME= QuantumStyle-${DISTVERSION} MAINTAINER= amdmi3@FreeBSD.org COMMENT= SVG themeable style for Qt 4 and KDE LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING USES= qmake USE_QT4= corelib gui svg rcc_build uic_build moc_build WRKSRC= ${WRKDIR}/QuantumStyle PLIST_FILES= ${QT_PLUGINDIR_REL}/styles/libquantumstyle.so do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/${QT_PLUGINDIR_REL}/styles/ ${INSTALL_PROGRAM} ${WRKSRC}/style/libquantumstyle.so ${STAGEDIR}${PREFIX}/${QT_PLUGINDIR_REL}/styles/ .include Index: head/x11-themes/qtcurve-qt4/Makefile =================================================================== --- head/x11-themes/qtcurve-qt4/Makefile (revision 442739) +++ head/x11-themes/qtcurve-qt4/Makefile (revision 442740) @@ -1,12 +1,12 @@ # $FreeBSD$ PORTNAME= qtcurve -PORTREVISION= 0 +PORTREVISION= 1 COMMENT= QtCurve widget style for Qt 4 QTCURVE_SLAVE= qt4 MASTERDIR= ${.CURDIR}/../qtcurve .include "${MASTERDIR}/Makefile" Index: head/x11-toolkits/qt4-gui/Makefile =================================================================== --- head/x11-toolkits/qt4-gui/Makefile (revision 442739) +++ head/x11-toolkits/qt4-gui/Makefile (revision 442740) @@ -1,99 +1,99 @@ # Created by: lofi@FreeBSD.org # $FreeBSD$ PORTNAME= gui DISTVERSION= ${QT4_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt graphical user interface module LIB_DEPENDS= libpng.so:graphics/png \ libfontconfig.so:x11-fonts/fontconfig RUN_DEPENDS= xdg-open:devel/xdg-utils USE_QT4= qmake_build moc_build rcc_build uic_build corelib QT_DIST= yes USES= pkgconfig HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} USE_XORG= xrender xrandr xinerama inputproto xfixes \ sm xcursor xext x11 ice xi xt ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ PATH=${WRKSRC}/bin:$$PATH DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ src/activeqt src/dbus src/multimedia src/network src/opengl \ src/openvg src/phonon src/qt3support src/s60installs \ src/s60main src/script src/scripttools src/sql src/svg \ src/testlib src/tools src/winmain src/xml src/xmlpatterns \ src/3rdparty/clucene src/3rdparty/freetype \ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit .for dne in ${DO_NOT_EXTRACT} EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} CONFIGURE_ARGS+= -I../../include/QtCore -I../../include/QtGui \ -I../../include/Qt -I../../include FONTSCALE= ${LOCALBASE}/share/fonts/TTF/luximb.ttf FONTENCOD= ${LOCALBASE}/share/fonts/encodings/encodings.dir .include "${.CURDIR:H:H}/devel/qt4/files/Makefile.options" .if ${QT4_OPTIONS:MCUPS} LIB_DEPENDS+= libcups.so:print/cups CONFIGURE_ARGS+=-cups -L${LOCALBASE}/lib -I. -I${LOCALBASE}/include .endif .if ${QT4_OPTIONS:MNAS} LIB_DEPENDS+= libaudio.so:audio/nas CONFIGURE_ARGS+=-system-nas-sound .else CONFIGURE_ARGS+=-no-nas-sound .endif .if ${QT4_OPTIONS:MQGTKSTYLE} USE_GNOME= gtk20 CONFIGURE_ARGS+=-gtkstyle .else CONFIGURE_ARGS+=-no-gtkstyle .endif .if defined(PACKAGE_BUILDING) RUN_DEPENDS+= xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype \ ${FONTENCOD}:x11-fonts/encodings .endif CFLAGS_powerpc64= -mminimal-toc pre-configure: ${MKDIR} ${WRKSRC}/mkspecs ${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake ${LN} -sf ${MOC} ${WRKSRC}/bin/moc ${LN} -sf ${RCC} ${WRKSRC}/bin/rcc ${LN} -sf ${UIC} ${WRKSRC}/bin/uic post-configure: ${REINPLACE_CMD} -e 's|${PREFIX}/${QT_LIBDIR_REL}/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ -e 's|.*$$(QMAKE).*||g' ${BUILD_WRKSRC}/Makefile ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ -E -e 's|(.*location=).*moc|\1${PREFIX}/${QT_BINDIR_REL}/${MOC:T}|g' \ -E -e 's|(.*location=).*uic|\1${PREFIX}/${QT_BINDIR_REL}/${UIC:T}|g' \ ${WRKSRC}/lib/pkgconfig/QtGui.pc post-install: ${INSTALL_DATA} ${BUILD_WRKSRC}/dialogs/images/qtlogo-64.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/qtlogo.png .include