Date: Mon, 3 Mar 2014 16:50:33 +0000 (UTC) From: Max Brazhnikov <makc@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r346930 - in head: . Mk databases databases/qt5-sql databases/qt5-sqldrivers-ibase databases/qt5-sqldrivers-mysql databases/qt5-sqldrivers-odbc databases/qt5-sqldrivers-pgsql databases/... Message-ID: <201403031650.s23GoXow011289@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: makc Date: Mon Mar 3 16:50:32 2014 New Revision: 346930 URL: http://svnweb.freebsd.org/changeset/ports/346930 QAT: https://qat.redports.org/buildarchive/r346930/ Log: KDE/FreeBSD team is happy to present Qt 5 in ports! Alberto Villa (avilla@) has done all the hard work to create Qt 5 ports. Trivial update from 5.2.0-beta1 to 5.2.1 by me. Special thanks for Adriaan de Groot <groot@kde.org> for his assistance for Qt-5.2.0 update. Approved by: portmgr (bapt) (for Mk/bsd.port.mk) Added: head/databases/qt5-sql/ head/databases/qt5-sql/Makefile (contents, props changed) head/databases/qt5-sql/pkg-message (contents, props changed) head/databases/qt5-sql/pkg-plist (contents, props changed) head/databases/qt5-sqldrivers-ibase/ head/databases/qt5-sqldrivers-ibase/Makefile (contents, props changed) head/databases/qt5-sqldrivers-mysql/ head/databases/qt5-sqldrivers-mysql/Makefile (contents, props changed) head/databases/qt5-sqldrivers-odbc/ head/databases/qt5-sqldrivers-odbc/Makefile (contents, props changed) head/databases/qt5-sqldrivers-pgsql/ head/databases/qt5-sqldrivers-pgsql/Makefile (contents, props changed) head/databases/qt5-sqldrivers-sqlite2/ head/databases/qt5-sqldrivers-sqlite2/Makefile (contents, props changed) head/databases/qt5-sqldrivers-sqlite3/ head/databases/qt5-sqldrivers-sqlite3/Makefile (contents, props changed) head/devel/dbus-qt5/ head/devel/dbus-qt5/Makefile (contents, props changed) head/devel/dbus-qt5/pkg-plist (contents, props changed) head/devel/qmake5/ head/devel/qmake5/Makefile (contents, props changed) head/devel/qmake5/files/ head/devel/qmake5/files/patch-configure (contents, props changed) head/devel/qmake5/files/patch-mkspecs__common__clang-unix.conf (contents, props changed) head/devel/qmake5/files/patch-mkspecs__common__freebsd.conf (contents, props changed) head/devel/qmake5/files/patch-mkspecs__features__qt_functions.prf (contents, props changed) head/devel/qmake5/files/patch-mkspecs__freebsd-g++__qmake.conf (contents, props changed) head/devel/qmake5/pkg-plist (contents, props changed) head/devel/qt5/ head/devel/qt5-assistant/ head/devel/qt5-assistant/Makefile (contents, props changed) head/devel/qt5-assistant/pkg-plist (contents, props changed) head/devel/qt5-buildtools/ head/devel/qt5-buildtools/Makefile (contents, props changed) head/devel/qt5-buildtools/pkg-plist (contents, props changed) head/devel/qt5-concurrent/ head/devel/qt5-concurrent/Makefile (contents, props changed) head/devel/qt5-concurrent/pkg-plist (contents, props changed) head/devel/qt5-core/ head/devel/qt5-core/Makefile (contents, props changed) head/devel/qt5-core/files/ head/devel/qt5-core/files/extrapatch-src__corelib__tools__qdatetime.cpp (contents, props changed) head/devel/qt5-core/pkg-plist (contents, props changed) head/devel/qt5-designer/ head/devel/qt5-designer/Makefile (contents, props changed) head/devel/qt5-designer/pkg-plist (contents, props changed) head/devel/qt5-help/ head/devel/qt5-help/Makefile (contents, props changed) head/devel/qt5-help/pkg-plist (contents, props changed) head/devel/qt5-linguist/ head/devel/qt5-linguist/Makefile (contents, props changed) head/devel/qt5-linguist/pkg-plist (contents, props changed) head/devel/qt5-linguisttools/ head/devel/qt5-linguisttools/Makefile (contents, props changed) head/devel/qt5-linguisttools/pkg-plist (contents, props changed) head/devel/qt5-qdbus/ head/devel/qt5-qdbus/Makefile (contents, props changed) head/devel/qt5-qdbus/pkg-plist (contents, props changed) head/devel/qt5-qdbusviewer/ head/devel/qt5-qdbusviewer/Makefile (contents, props changed) head/devel/qt5-qdbusviewer/pkg-plist (contents, props changed) head/devel/qt5-qmldevtools/ head/devel/qt5-qmldevtools/Makefile (contents, props changed) head/devel/qt5-qmldevtools/pkg-plist (contents, props changed) head/devel/qt5-script/ head/devel/qt5-script/Makefile (contents, props changed) head/devel/qt5-script/files/ head/devel/qt5-script/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__jit__JITStubs.cpp (contents, props changed) head/devel/qt5-script/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__runtime__JSValue.h (contents, props changed) head/devel/qt5-script/pkg-plist (contents, props changed) head/devel/qt5-scripttools/ head/devel/qt5-scripttools/Makefile (contents, props changed) head/devel/qt5-scripttools/pkg-plist (contents, props changed) head/devel/qt5-testlib/ head/devel/qt5-testlib/Makefile (contents, props changed) head/devel/qt5-testlib/pkg-plist (contents, props changed) head/devel/qt5-uitools/ head/devel/qt5-uitools/Makefile (contents, props changed) head/devel/qt5-uitools/pkg-plist (contents, props changed) head/devel/qt5/Makefile (contents, props changed) head/devel/qt5/Makefile.sqldrivers (contents, props changed) head/devel/qt5/distinfo (contents, props changed) head/devel/qt5/files/ head/devel/qt5/files/extrapatch-configure (contents, props changed) head/devel/qt5/files/pkg-deinstall.in (contents, props changed) head/devel/qt5/pkg-descr (contents, props changed) head/graphics/qt5-graphicaleffects/ head/graphics/qt5-graphicaleffects/Makefile (contents, props changed) head/graphics/qt5-graphicaleffects/pkg-plist (contents, props changed) head/graphics/qt5-imageformats/ head/graphics/qt5-imageformats/Makefile (contents, props changed) head/graphics/qt5-imageformats/pkg-plist (contents, props changed) head/graphics/qt5-opengl/ head/graphics/qt5-opengl/Makefile (contents, props changed) head/graphics/qt5-opengl/pkg-plist (contents, props changed) head/graphics/qt5-pixeltool/ head/graphics/qt5-pixeltool/Makefile (contents, props changed) head/graphics/qt5-pixeltool/pkg-plist (contents, props changed) head/graphics/qt5-svg/ head/graphics/qt5-svg/Makefile (contents, props changed) head/graphics/qt5-svg/pkg-plist (contents, props changed) head/lang/qt5-qml/ head/lang/qt5-qml/Makefile (contents, props changed) head/lang/qt5-qml/files/ head/lang/qt5-qml/files/patch-jsruntime__qv4alloca_p.h (contents, props changed) head/lang/qt5-qml/files/patch-jsruntime__qv4engine.cpp (contents, props changed) head/lang/qt5-qml/files/patch-jsruntime__qv4mm.cpp (contents, props changed) head/lang/qt5-qml/pkg-plist (contents, props changed) head/multimedia/qt5-multimedia/ head/multimedia/qt5-multimedia/Makefile (contents, props changed) head/multimedia/qt5-multimedia/pkg-plist (contents, props changed) head/net/qt5-network/ head/net/qt5-network/Makefile (contents, props changed) head/net/qt5-network/pkg-plist (contents, props changed) head/print/qt5-printsupport/ head/print/qt5-printsupport/Makefile (contents, props changed) head/print/qt5-printsupport/pkg-plist (contents, props changed) head/textproc/clucene-qt5/ head/textproc/clucene-qt5/Makefile (contents, props changed) head/textproc/clucene-qt5/files/ head/textproc/clucene-qt5/files/patch-3rdparty__clucene__src__CLucene__search__FieldCacheImpl.cpp (contents, props changed) head/textproc/clucene-qt5/pkg-plist (contents, props changed) head/textproc/qt5-xml/ head/textproc/qt5-xml/Makefile (contents, props changed) head/textproc/qt5-xml/pkg-plist (contents, props changed) head/textproc/qt5-xmlpatterns/ head/textproc/qt5-xmlpatterns/Makefile (contents, props changed) head/textproc/qt5-xmlpatterns/pkg-plist (contents, props changed) head/www/webkit-qt5/ head/www/webkit-qt5/Makefile (contents, props changed) head/www/webkit-qt5/files/ head/www/webkit-qt5/files/patch-Source__JavaScriptCore__runtime__JSCJSValueInlines.h (contents, props changed) head/www/webkit-qt5/files/patch-Source__WebCore__page__NavigatorBase.cpp (contents, props changed) head/www/webkit-qt5/files/patch-Source__WebCore__platform__graphics__surfaces__GraphicsSurface.h (contents, props changed) head/www/webkit-qt5/files/patch-Source__WebCore__platform__graphics__surfaces__GraphicsSurfaceToken.h (contents, props changed) head/www/webkit-qt5/pkg-plist (contents, props changed) head/x11-toolkits/qt5-declarative/ head/x11-toolkits/qt5-declarative/Makefile (contents, props changed) head/x11-toolkits/qt5-declarative/pkg-plist (contents, props changed) head/x11-toolkits/qt5-gui/ head/x11-toolkits/qt5-gui/Makefile (contents, props changed) head/x11-toolkits/qt5-gui/pkg-message (contents, props changed) head/x11-toolkits/qt5-gui/pkg-plist (contents, props changed) head/x11-toolkits/qt5-quick/ head/x11-toolkits/qt5-quick/Makefile (contents, props changed) head/x11-toolkits/qt5-quick/pkg-descr (contents, props changed) head/x11-toolkits/qt5-quick/pkg-plist (contents, props changed) head/x11-toolkits/qt5-widgets/ head/x11-toolkits/qt5-widgets/Makefile (contents, props changed) head/x11-toolkits/qt5-widgets/pkg-plist (contents, props changed) head/x11/qt5-qev/ head/x11/qt5-qev/Makefile (contents, props changed) head/x11/qt5-qev/pkg-plist (contents, props changed) Modified: head/CHANGES head/Mk/bsd.port.mk head/Mk/bsd.qt.mk head/databases/Makefile head/devel/Makefile head/graphics/Makefile head/lang/Makefile head/multimedia/Makefile head/net/Makefile head/print/Makefile head/textproc/Makefile head/www/Makefile head/x11-toolkits/Makefile head/x11/Makefile Modified: head/CHANGES ============================================================================== --- head/CHANGES Mon Mar 3 16:37:04 2014 (r346929) +++ head/CHANGES Mon Mar 3 16:50:32 2014 (r346930) @@ -10,6 +10,13 @@ in the release notes and/or placed into All ports committers are allowed to commit to this file. +20140303: +AUTHOR: kde@FreeBSD.org + + Add support for Qt 5 via USE_QT5. USE_QT5 is analogous to USE_QT4, + the only difference is the list of available components + (see Mk/bsd.qt.mk for details). USES=qmake supports Qt 5 as well. + 20140127: AUTHOR: mat@FreeBSD.org Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Mon Mar 3 16:37:04 2014 (r346929) +++ head/Mk/bsd.port.mk Mon Mar 3 16:50:32 2014 (r346930) @@ -435,16 +435,21 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # USE_WX - If set, this port uses the WxWidgets library and related # components. See bsd.wx.mk for more details. ## -# USE_KDE4 - A list of the KDE4 dependencies the port has (e.g., +# USE_KDE4 - A list of the KDE 4 dependencies the port has (e.g., # kdelibs, kdebase). Implies that the port needs KDE. # Implies inclusion of bsd.kde4.mk. See bsd.kde4.mk # for more details. # -# USE_QT4 - A list of the QT4 dependencies the port has (e.g, +# USE_QT4 - A list of the Qt 4 dependencies the port has (e.g, # corelib, webkit). Implies that the port needs Qt. # Implies the inclusion of bsd.qt.mk. See bsd.qt.mk # for more details. # +# USE_QT5 - A list of the Qt 5 dependencies the port has (e.g, +# core, webkit). Implies that the port needs Qt. +# Implies the inclusion of bsd.qt.mk. See bsd.qt.mk +# for more details. +# # USE_LINUX - Set to yes to say the port needs the default linux base port. # Set to value <X>, if the port needs emulators/linux_base-<X>. # Implies appropriate settings for STRIP and STRIP_CMD. @@ -1440,7 +1445,7 @@ PKGCOMPATDIR?= ${LOCALBASE}/lib/compat/ .include "${PORTSDIR}/Mk/bsd.apache.mk" .endif -.if defined(USE_QT4) +.if defined(USE_QT4) || defined(USE_QT5) .include "${PORTSDIR}/Mk/bsd.qt.mk" .endif @@ -1871,7 +1876,7 @@ IGNORE= Do not define STAGEDIR in comman .include "${PORTSDIR}/Mk/bsd.linux-apps.mk" .endif -.if defined(USE_QT4) +.if defined(USE_QT4) || defined(USE_QT5) .include "${PORTSDIR}/Mk/bsd.qt.mk" .endif Modified: head/Mk/bsd.qt.mk ============================================================================== --- head/Mk/bsd.qt.mk Mon Mar 3 16:37:04 2014 (r346929) +++ head/Mk/bsd.qt.mk Mon Mar 3 16:50:32 2014 (r346930) @@ -27,7 +27,7 @@ Qt_Pre_Include= bsd.qt.mk # Qt versions currently supported by the framework. _QT_SUPPORTED?= 4 5 QT4_VERSION?= 4.8.5 -QT5_VERSION?= 5.2.0-beta1 +QT5_VERSION?= 5.2.1 QT_PREFIX?= ${LOCALBASE} @@ -60,7 +60,6 @@ MASTER_SITES= ${MASTER_SITE_QT} # Useless, as it must be defined before including bsd.port.pre.mk (at least # because of bsd.options.mk). #PKGNAMEPREFIX?= ${_QT_RELNAME}- -DIST_SUBDIR= KDE DISTINFO_FILE= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/distinfo # Can go after a while. @@ -78,6 +77,7 @@ 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 . if ${_QT_VERSION:M*-*} # Pre-releases. @@ -87,6 +87,7 @@ MASTER_SITE_SUBDIR= official_releases/qt . endif DISTNAME= ${QT_DIST:S,^,qt,:S,$,-opensource-src-${_QT_VERSION},} DISTFILES= ${DISTNAME:S,$,${EXTRACT_SUFX},} +DIST_SUBDIR= KDE/Qt/${_QT_VERSION} USE_XZ= yes . if ${.TARGETS:Mmakesum} || ${.TARGETS:Mfetch} && \ @@ -551,8 +552,9 @@ _QT_TOOLS+= ${UIC} pre-configure: qtbase-pre-configure qtbase-pre-configure: . if ${PORTNAME} != "qmake" - @${RM} -rf ${CONFIGURE_WRKSRC}/mkspecs - @${MKDIR} ${CONFIGURE_WRKSRC}/mkspecs + @(cd ${WRKSRC} && ${SETENV} ${QMAKE_ENV} ${QMAKE} ${QMAKE_ARGS}) +# @${RM} -rf ${CONFIGURE_WRKSRC}/mkspecs +# @${MKDIR} ${CONFIGURE_WRKSRC}/mkspecs . endif . for tool in ${_QT_TOOLS} @${TEST} -e ${QT_BINDIR}/${tool:T} && \ Modified: head/databases/Makefile ============================================================================== --- head/databases/Makefile Mon Mar 3 16:37:04 2014 (r346929) +++ head/databases/Makefile Mon Mar 3 16:50:32 2014 (r346930) @@ -781,6 +781,13 @@ SUBDIR += qt4-sql SUBDIR += qt4-sqlite-plugin SUBDIR += qt4-sqlite3-plugin + SUBDIR += qt5-sql + SUBDIR += qt5-sqldrivers-ibase + SUBDIR += qt5-sqldrivers-mysql + SUBDIR += qt5-sqldrivers-odbc + SUBDIR += qt5-sqldrivers-pgsql + SUBDIR += qt5-sqldrivers-sqlite2 + SUBDIR += qt5-sqldrivers-sqlite3 SUBDIR += rdb SUBDIR += rdfdb SUBDIR += recutils Added: head/databases/qt5-sql/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/qt5-sql/Makefile Mon Mar 3 16:50:32 2014 (r346930) @@ -0,0 +1,20 @@ +# $FreeBSD$ + +PORTNAME= sql +DISTVERSION= ${QT5_VERSION} +CATEGORIES= databases +PKGNAMEPREFIX= qt5- + +MAINTAINER= kde@FreeBSD.org +COMMENT= Qt SQL database integration module + +USE_QT5= core qmake_build buildtools_build +QT_DIST= base +HAS_CONFIGURE= yes +CONFIGURE_ARGS= -no-gui -no-xcb +USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} + +BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +.include <bsd.port.mk> Added: head/databases/qt5-sql/pkg-message ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/qt5-sql/pkg-message Mon Mar 3 16:50:32 2014 (r346930) @@ -0,0 +1,12 @@ +====================================================================== + +To enable Qt database support, install the database plugin ports. The +following plugin ports are available: + - databases/qt5-sqldrivers-ibase InterBase/Firebird + - databases/qt5-sqldrivers-mysql MySQL + - databases/qt5-sqldrivers-odbc Open Database Connectivity + - databases/qt5-sqldrivers-pgsql PostgreSQL + - databases/qt5-sqldrivers-sqlite2 SQLite 2 + - databases/qt5-sqldrivers-sqlite3 SQLite 3 + +====================================================================== Added: head/databases/qt5-sql/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/qt5-sql/pkg-plist Mon Mar 3 16:50:32 2014 (r346930) @@ -0,0 +1,72 @@ +%%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsql_db2_p.h +%%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsql_ibase_p.h +%%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsql_mysql_p.h +%%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsql_oci_p.h +%%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsql_odbc_p.h +%%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsql_psql_p.h +%%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsql_sqlite2_p.h +%%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsql_sqlite_p.h +%%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsql_tds_p.h +%%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsqlcachedresult_p.h +%%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsqldriver_p.h +%%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsqlnulldriver_p.h +%%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsqlquerymodel_p.h +%%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsqlresult_p.h +%%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsqltablemodel_p.h +%%QT_INCDIR%%/QtSql/QSql +%%QT_INCDIR%%/QtSql/QSqlDatabase +%%QT_INCDIR%%/QtSql/QSqlDriver +%%QT_INCDIR%%/QtSql/QSqlDriverCreator +%%QT_INCDIR%%/QtSql/QSqlDriverCreatorBase +%%QT_INCDIR%%/QtSql/QSqlDriverPlugin +%%QT_INCDIR%%/QtSql/QSqlError +%%QT_INCDIR%%/QtSql/QSqlField +%%QT_INCDIR%%/QtSql/QSqlIndex +%%QT_INCDIR%%/QtSql/QSqlQuery +%%QT_INCDIR%%/QtSql/QSqlQueryModel +%%QT_INCDIR%%/QtSql/QSqlRecord +%%QT_INCDIR%%/QtSql/QSqlRelation +%%QT_INCDIR%%/QtSql/QSqlRelationalDelegate +%%QT_INCDIR%%/QtSql/QSqlRelationalTableModel +%%QT_INCDIR%%/QtSql/QSqlResult +%%QT_INCDIR%%/QtSql/QSqlTableModel +%%QT_INCDIR%%/QtSql/QtSql +%%QT_INCDIR%%/QtSql/QtSqlDepends +%%QT_INCDIR%%/QtSql/QtSqlVersion +%%QT_INCDIR%%/QtSql/qsql.h +%%QT_INCDIR%%/QtSql/qsqldatabase.h +%%QT_INCDIR%%/QtSql/qsqldriver.h +%%QT_INCDIR%%/QtSql/qsqldriverplugin.h +%%QT_INCDIR%%/QtSql/qsqlerror.h +%%QT_INCDIR%%/QtSql/qsqlfield.h +%%QT_INCDIR%%/QtSql/qsqlindex.h +%%QT_INCDIR%%/QtSql/qsqlquery.h +%%QT_INCDIR%%/QtSql/qsqlquerymodel.h +%%QT_INCDIR%%/QtSql/qsqlrecord.h +%%QT_INCDIR%%/QtSql/qsqlrelationaldelegate.h +%%QT_INCDIR%%/QtSql/qsqlrelationaltablemodel.h +%%QT_INCDIR%%/QtSql/qsqlresult.h +%%QT_INCDIR%%/QtSql/qsqltablemodel.h +%%QT_INCDIR%%/QtSql/qtsqlversion.h +%%QT_LIBDIR%%/cmake/Qt5Sql/Qt5SqlConfig.cmake +%%QT_LIBDIR%%/cmake/Qt5Sql/Qt5SqlConfigVersion.cmake +%%QT_LIBDIR%%/libQt5Sql.la +%%QT_LIBDIR%%/libQt5Sql.prl +%%QT_LIBDIR%%/libQt5Sql.so +%%QT_LIBDIR%%/libQt5Sql.so.5 +%%QT_LIBDIR%%/libQt5Sql.so.%%SHORTVER%% +%%QT_LIBDIR%%/libQt5Sql.so.%%FULLVER%% +%%DEBUG%%%%QT_LIBDIR%%/libQt5Sql.so.%%FULLVER%%.debug +%%QT_MKSPECDIR%%/modules/qt_lib_sql.pri +%%QT_MKSPECDIR%%/modules/qt_lib_sql_private.pri +libdata/pkgconfig/Qt5Sql.pc +@dirrmtry %%QT_MKSPECDIR%%/modules +@dirrmtry %%QT_MKSPECDIR%% +@dirrmtry %%QT_ARCHDIR%% +@dirrmtry %%QT_LIBDIR%%/cmake/Qt5Sql +@dirrmtry %%QT_LIBDIR%%/cmake +@dirrm %%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private +@dirrm %%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql +@dirrm %%QT_INCDIR%%/QtSql/%%FULLVER%% +@dirrm %%QT_INCDIR%%/QtSql +@dirrmtry %%QT_INCDIR%% Added: head/databases/qt5-sqldrivers-ibase/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/qt5-sqldrivers-ibase/Makefile Mon Mar 3 16:50:32 2014 (r346930) @@ -0,0 +1,8 @@ +# $FreeBSD$ + +DB= IBase +DB_DESC= InterBase/Firebird + +USE_FIREBIRD= yes + +.include "${.CURDIR:H:H}/devel/qt5/Makefile.sqldrivers" Added: head/databases/qt5-sqldrivers-mysql/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/qt5-sqldrivers-mysql/Makefile Mon Mar 3 16:50:32 2014 (r346930) @@ -0,0 +1,8 @@ +# $FreeBSD$ + +DB= MYSQL +DB_DESC= MySQL + +USE_MYSQL= yes + +.include "${.CURDIR:H:H}/devel/qt5/Makefile.sqldrivers" Added: head/databases/qt5-sqldrivers-odbc/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/qt5-sqldrivers-odbc/Makefile Mon Mar 3 16:50:32 2014 (r346930) @@ -0,0 +1,10 @@ +# $FreeBSD$ + +COMMENT= Qt ${DB_DESC} plugin + +DB= ODBC +DB_DESC= Open Database Connectivity + +LIB_DEPENDS= libiodbc.so:${PORTSDIR}/databases/libiodbc + +.include "${.CURDIR:H:H}/devel/qt5/Makefile.sqldrivers" Added: head/databases/qt5-sqldrivers-pgsql/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/qt5-sqldrivers-pgsql/Makefile Mon Mar 3 16:50:32 2014 (r346930) @@ -0,0 +1,10 @@ +# $FreeBSD$ + +PORTNAME= pgsql + +DB= PSQL +DB_DESC= PostgreSQL + +USE_PGSQL= yes + +.include "${.CURDIR:H:H}/devel/qt5/Makefile.sqldrivers" Added: head/databases/qt5-sqldrivers-sqlite2/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/qt5-sqldrivers-sqlite2/Makefile Mon Mar 3 16:50:32 2014 (r346930) @@ -0,0 +1,8 @@ +# $FreeBSD$ + +DB= SQLite2 +DB_DESC= SQLite 2 + +USE_SQLITE= 2 + +.include "${.CURDIR:H:H}/devel/qt5/Makefile.sqldrivers" Added: head/databases/qt5-sqldrivers-sqlite3/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/qt5-sqldrivers-sqlite3/Makefile Mon Mar 3 16:50:32 2014 (r346930) @@ -0,0 +1,11 @@ +# $FreeBSD$ + +PORTNAME= sqlite3 + +DB= SQLite +DB_DESC= SQLite 3 + +USE_SQLITE= 3 +CONFIGURE_ARGS= -system-sqlite + +.include "${.CURDIR:H:H}/devel/qt5/Makefile.sqldrivers" Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Mon Mar 3 16:37:04 2014 (r346929) +++ head/devel/Makefile Mon Mar 3 16:50:32 2014 (r346930) @@ -333,6 +333,7 @@ SUBDIR += dbus SUBDIR += dbus-glib SUBDIR += dbus-qt4 + SUBDIR += dbus-qt5 SUBDIR += dbus-sharp SUBDIR += dbus-sharp-glib SUBDIR += dcmtk @@ -3989,6 +3990,7 @@ SUBDIR += qjson SUBDIR += qmake SUBDIR += qmake4 + SUBDIR += qmake5 SUBDIR += qprog SUBDIR += qross SUBDIR += qscintilla2 @@ -4019,6 +4021,22 @@ SUBDIR += qt4-testlib SUBDIR += qt4-uic SUBDIR += qt4-uic3 + SUBDIR += qt5 + SUBDIR += qt5-assistant + SUBDIR += qt5-buildtools + SUBDIR += qt5-concurrent + SUBDIR += qt5-core + SUBDIR += qt5-designer + SUBDIR += qt5-help + SUBDIR += qt5-linguist + SUBDIR += qt5-linguisttools + SUBDIR += qt5-qdbus + SUBDIR += qt5-qdbusviewer + SUBDIR += qt5-qmldevtools + SUBDIR += qt5-script + SUBDIR += qt5-scripttools + SUBDIR += qt5-testlib + SUBDIR += qt5-uitools SUBDIR += qtcreator SUBDIR += qtscriptgenerator SUBDIR += quickcheck++ Added: head/devel/dbus-qt5/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/dbus-qt5/Makefile Mon Mar 3 16:50:32 2014 (r346930) @@ -0,0 +1,47 @@ +# $FreeBSD$ + +PORTNAME= dbus +DISTVERSION= ${QT5_VERSION} +CATEGORIES= devel +PKGNAMEPREFIX= qt5- + +MAINTAINER= kde@FreeBSD.org +COMMENT= Qt D-Bus inter-process communication module + +LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus + +USE_QT5= core qmake_build buildtools_build +QT_DIST= base +HAS_CONFIGURE= yes +CONFIGURE_ARGS= -no-gui -no-xcb +USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} + +BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +TOOLS= qdbuscpp2xml qdbusxml2cpp + +QT_DEFINES= DBUS +QT_CONFIG= dbus + +post-configure: +.for t in ${TOOLS} + @cd ${WRKSRC}/src/tools/${t} && \ + ${SETENV} ${QMAKE_ENV} ${WRKSRC}/bin/qmake ${QMAKE_ARGS} +.endfor + +post-build: +.for t in ${TOOLS} + @cd ${WRKSRC}/src/tools/${t} && \ + ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ + ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} +.endfor + +post-install: +.for t in ${TOOLS} + @cd ${WRKSRC}/src/tools/${t} && \ + ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ + ${MAKE_ARGS} ${INSTALL_TARGET} +.endfor + +.include <bsd.port.mk> Added: head/devel/dbus-qt5/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/dbus-qt5/pkg-plist Mon Mar 3 16:50:32 2014 (r346930) @@ -0,0 +1,90 @@ +%%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/qdbus_symbols_p.h +%%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/qdbusabstractadaptor_p.h +%%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/qdbusabstractinterface_p.h +%%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/qdbusargument_p.h +%%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/qdbusconnection_p.h +%%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/qdbusconnectionmanager_p.h +%%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/qdbuscontext_p.h +%%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/qdbusintegrator_p.h +%%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/qdbusinterface_p.h +%%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/qdbusintrospection_p.h +%%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/qdbusmessage_p.h +%%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/qdbusmetaobject_p.h +%%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/qdbusmetatype_p.h +%%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/qdbuspendingcall_p.h +%%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/qdbusthreaddebug_p.h +%%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/qdbusutil_p.h +%%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/qdbusxmlparser_p.h +%%QT_INCDIR%%/QtDBus/QDBusAbstractAdaptor +%%QT_INCDIR%%/QtDBus/QDBusAbstractInterface +%%QT_INCDIR%%/QtDBus/QDBusAbstractInterfaceBase +%%QT_INCDIR%%/QtDBus/QDBusArgument +%%QT_INCDIR%%/QtDBus/QDBusConnection +%%QT_INCDIR%%/QtDBus/QDBusConnectionInterface +%%QT_INCDIR%%/QtDBus/QDBusContext +%%QT_INCDIR%%/QtDBus/QDBusError +%%QT_INCDIR%%/QtDBus/QDBusInterface +%%QT_INCDIR%%/QtDBus/QDBusMessage +%%QT_INCDIR%%/QtDBus/QDBusMetaType +%%QT_INCDIR%%/QtDBus/QDBusObjectPath +%%QT_INCDIR%%/QtDBus/QDBusPendingCall +%%QT_INCDIR%%/QtDBus/QDBusPendingCallWatcher +%%QT_INCDIR%%/QtDBus/QDBusPendingReply +%%QT_INCDIR%%/QtDBus/QDBusPendingReplyData +%%QT_INCDIR%%/QtDBus/QDBusReply +%%QT_INCDIR%%/QtDBus/QDBusServer +%%QT_INCDIR%%/QtDBus/QDBusServiceWatcher +%%QT_INCDIR%%/QtDBus/QDBusSignature +%%QT_INCDIR%%/QtDBus/QDBusUnixFileDescriptor +%%QT_INCDIR%%/QtDBus/QDBusVariant +%%QT_INCDIR%%/QtDBus/QDBusVirtualObject +%%QT_INCDIR%%/QtDBus/QtDBus +%%QT_INCDIR%%/QtDBus/QtDBusDepends +%%QT_INCDIR%%/QtDBus/QtDBusVersion +%%QT_INCDIR%%/QtDBus/qdbusabstractadaptor.h +%%QT_INCDIR%%/QtDBus/qdbusabstractinterface.h +%%QT_INCDIR%%/QtDBus/qdbusargument.h +%%QT_INCDIR%%/QtDBus/qdbusconnection.h +%%QT_INCDIR%%/QtDBus/qdbusconnectioninterface.h +%%QT_INCDIR%%/QtDBus/qdbuscontext.h +%%QT_INCDIR%%/QtDBus/qdbuserror.h +%%QT_INCDIR%%/QtDBus/qdbusextratypes.h +%%QT_INCDIR%%/QtDBus/qdbusinterface.h +%%QT_INCDIR%%/QtDBus/qdbusmacros.h +%%QT_INCDIR%%/QtDBus/qdbusmessage.h +%%QT_INCDIR%%/QtDBus/qdbusmetatype.h +%%QT_INCDIR%%/QtDBus/qdbuspendingcall.h +%%QT_INCDIR%%/QtDBus/qdbuspendingreply.h +%%QT_INCDIR%%/QtDBus/qdbusreply.h +%%QT_INCDIR%%/QtDBus/qdbusserver.h +%%QT_INCDIR%%/QtDBus/qdbusservicewatcher.h +%%QT_INCDIR%%/QtDBus/qdbusunixfiledescriptor.h +%%QT_INCDIR%%/QtDBus/qdbusvirtualobject.h +%%QT_INCDIR%%/QtDBus/qtdbusversion.h +%%QT_LIBDIR%%/cmake/Qt5DBus/Qt5DBusConfig.cmake +%%QT_LIBDIR%%/cmake/Qt5DBus/Qt5DBusConfigExtras.cmake +%%QT_LIBDIR%%/cmake/Qt5DBus/Qt5DBusConfigVersion.cmake +%%QT_LIBDIR%%/cmake/Qt5DBus/Qt5DBusMacros.cmake +%%QT_LIBDIR%%/libQt5DBus.la +%%QT_LIBDIR%%/libQt5DBus.prl +%%QT_LIBDIR%%/libQt5DBus.so +%%QT_LIBDIR%%/libQt5DBus.so.5 +%%QT_LIBDIR%%/libQt5DBus.so.%%SHORTVER%% +%%QT_LIBDIR%%/libQt5DBus.so.%%FULLVER%% +%%DEBUG%%%%QT_LIBDIR%%/libQt5DBus.so.%%FULLVER%%.debug +%%QT_BINDIR%%/qdbuscpp2xml +%%QT_BINDIR%%/qdbusxml2cpp +%%QT_MKSPECDIR%%/modules/qt_lib_dbus.pri +%%QT_MKSPECDIR%%/modules/qt_lib_dbus_private.pri +libdata/pkgconfig/Qt5DBus.pc +@dirrmtry %%QT_MKSPECDIR%%/modules +@dirrmtry %%QT_MKSPECDIR%% +@dirrmtry %%QT_BINDIR%% +@dirrmtry %%QT_ARCHDIR%% +@dirrm %%QT_LIBDIR%%/cmake/Qt5DBus +@dirrmtry %%QT_LIBDIR%%/cmake +@dirrm %%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private +@dirrm %%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus +@dirrm %%QT_INCDIR%%/QtDBus/%%FULLVER%% +@dirrm %%QT_INCDIR%%/QtDBus +@dirrmtry %%QT_INCDIR%% Added: head/devel/qmake5/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/qmake5/Makefile Mon Mar 3 16:50:32 2014 (r346930) @@ -0,0 +1,64 @@ +# $FreeBSD$ + +PORTNAME= qmake +DISTVERSION= ${QT5_VERSION} +CATEGORIES= devel +PKGNAMEPREFIX= qt5- + +MAINTAINER= kde@FreeBSD.org +COMMENT= Qt Makefile generator + +USE_QT5= # empty +QT_DIST= base +REINPLACE_ARGS= -i "" +HAS_CONFIGURE= yes +# Disable everything to install minimal qconfig.pri. +CONFIGURE_ARGS= -no-accessibility -no-openssl -no-gui -no-cups \ + -no-iconv -no-icu -no-dbus -no-xcb -no-opengl \ + -no-glib -no-audio-backend -no-fontconfig \ + -no-gtkstyle -no-xinput2 -no-xrender \ + -no-xkbcommon +# Features yet to be removed from qconfig.pri. +TBR_CONFIG= alsa|concurrent|.*freetype|.*gif|.*gui|.*harfbuzz|inotify|.*jpeg|.*pkg-config|.*png|pulseaudio|.*widgets|xlib +QMAKESPEC= ${WRKSRC}/mkspecs/freebsd-${QMAKE_COMPILER} +INSTALL_TARGET= install_qmake install_mkspecs + +BUILD_WRKSRC= ${WRKSRC}/${PORTNAME} + +.include <bsd.port.pre.mk> + +# Needs bsd.port.pre.mk to override -dont-process from bsd.qt.mk. +CONFIGURE_ARGS+=-process + +post-patch: +# Prevent qconfig.pri from being module dependent. + @${REINPLACE_CMD} -E -e '/"\$$QT_CONFIG +(${TBR_CONFIG})"/ d' \ + ${WRKSRC}/configure + + @${RM} ${WRKSRC}/mkspecs/*/*.orig + + @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ + ${WRKSRC}/mkspecs/common/freebsd.conf + @${REINPLACE_CMD} -e 's|unix.conf|freebsd.conf|' \ + ${WRKSRC}/mkspecs/freebsd-icc/qmake.conf + +# Add mkspec for Clang. + @${CP} -a ${WRKSRC}/mkspecs/freebsd-g++ \ + ${WRKSRC}/mkspecs/freebsd-clang + @${REINPLACE_CMD} -e 's|g++|clang|g' \ + -e '/gcc-base-unix.conf/d' \ + ${WRKSRC}/mkspecs/freebsd-clang/qmake.conf + + @${RM} -Rf ${WRKSRC}/mkspecs/freebsd-g++46 + +post-build: +# Complete configure stage to generate *.pri files. + @cd ${WRKSRC} && \ + ${SETENV} CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \ + CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \ + ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} +# Cleanup qmodule.pri to make it module agnostic. + @${REINPLACE_CMD} -En -e '/^(CONFIG|QT_BUILD_PARTS|.*_DIR) / p' \ + ${WRKSRC}/mkspecs/qmodule.pri + +.include <bsd.port.post.mk> Added: head/devel/qmake5/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/qmake5/files/patch-configure Mon Mar 3 16:50:32 2014 (r346930) @@ -0,0 +1,25 @@ +--- ./configure.orig 2013-10-22 01:49:15.000000000 -0700 ++++ ./configure 2013-11-04 07:40:28.945418565 -0800 +@@ -4194,11 +4194,11 @@ + fi + echo "QMAKESPEC = $adjqmakespec" >> "$mkfile" + echo "QT_VERSION = $QT_VERSION" >> "$mkfile" +- echo "EXTRA_CFLAGS = $EXTRA_CFLAGS" >> "$mkfile" +- echo "EXTRA_CXXFLAGS = $EXTRA_CXXFLAGS" >> "$mkfile" ++ echo "EXTRA_CFLAGS = $EXTRA_CFLAGS $CFLAGS" >> "$mkfile" ++ echo "EXTRA_CXXFLAGS = $EXTRA_CXXFLAGS $CXXFLAGS" >> "$mkfile" + echo "QTOBJS =" $EXTRA_OBJS >> "$mkfile" + echo "QTSRCS =" $EXTRA_SRCS >> "$mkfile" +- echo "LFLAGS = $EXTRA_LFLAGS" >> "$mkfile" ++ echo "LFLAGS = $EXTRA_LFLAGS $LDFLAGS" >> "$mkfile" + echo "EXEEXT = $EXEEXT" >> "$mkfile" + echo "RM_F = rm -f" >> "$mkfile" + echo "RM_RF = rm -rf" >> "$mkfile" +@@ -4214,6 +4214,7 @@ + rm "$mkfile.tmp" + fi + done ++ exit 0 + + (cd "$outpath/qmake"; "$MAKE") || exit 2 + fi # Build qmake Added: head/devel/qmake5/files/patch-mkspecs__common__clang-unix.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/qmake5/files/patch-mkspecs__common__clang-unix.conf Mon Mar 3 16:50:32 2014 (r346930) @@ -0,0 +1,18 @@ +--- ./mkspecs/common/clang-unix.conf.orig 2013-12-05 17:44:20.215196720 +0000 ++++ ./mkspecs/common/clang-unix.conf 2013-12-05 17:47:19.015202020 +0000 +@@ -0,0 +1,15 @@ ++# ++# Qmake configuration for the Clang compiler on *nix-systems ++# ++# Before making changes to this file, please read the comment in ++# gcc-base.conf, to make sure the change goes in the right place. ++# ++# To verify that your change has the desired effect on the final configuration ++# you can use the manual test in tests/manual/mkspecs. ++# ++ ++include(gcc-base-unix.conf) ++include(clang.conf) ++ ++QMAKE_LFLAGS_RELEASE += -Wl,-O1 ++QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined Added: head/devel/qmake5/files/patch-mkspecs__common__freebsd.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/qmake5/files/patch-mkspecs__common__freebsd.conf Mon Mar 3 16:50:32 2014 (r346930) @@ -0,0 +1,41 @@ +--- ./mkspecs/common/freebsd.conf.orig 2013-12-05 17:36:29.064198097 +0000 ++++ ./mkspecs/common/freebsd.conf 2013-12-05 17:38:34.413200492 +0000 +@@ -0,0 +1,38 @@ ++# ++# qmake configuration for FreeBSD ++# ++ ++MAKEFILE_GENERATOR = UNIX ++QMAKE_PLATFORM = freebsd bsd ++ ++QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE ++ ++QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD ++ ++# Addon software goes into /usr/local on the BSDs, by default we will look there ++QMAKE_INCDIR = $$[QT_INSTALL_HEADERS] /usr/local/include ++QMAKE_LIBDIR = $$[QT_INSTALL_LIBS] /usr/local/lib ++QMAKE_INCDIR_X11 = /usr/local/include ++QMAKE_LIBDIR_X11 = /usr/local/lib ++QMAKE_INCDIR_OPENGL = /usr/local/include ++QMAKE_LIBDIR_OPENGL = /usr/local/lib ++ ++QMAKE_LFLAGS_THREAD = -pthread ++ ++QMAKE_LIBS = ++QMAKE_LIBS_DYNLOAD = ++QMAKE_LIBS_X11 = -lXext -lX11 -lm ++QMAKE_LIBS_OPENGL = -lGL ++QMAKE_LIBS_THREAD = ++ ++QMAKE_AR = ar cqs ++QMAKE_OBJCOPY = objcopy ++QMAKE_NM = nm -P ++QMAKE_RANLIB = ++ ++QMAKE_STRIP = strip ++QMAKE_STRIPFLAGS_LIB += --strip-unneeded ++QMAKE_INSTALL_FILE = install -m 644 -p ++QMAKE_INSTALL_PROGRAM = install -m 755 -p ++ ++include(unix.conf) Added: head/devel/qmake5/files/patch-mkspecs__features__qt_functions.prf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/qmake5/files/patch-mkspecs__features__qt_functions.prf Mon Mar 3 16:50:32 2014 (r346930) @@ -0,0 +1,11 @@ +--- ./mkspecs/features/qt_functions.prf.orig 2013-10-22 01:49:28.000000000 -0700 ++++ ./mkspecs/features/qt_functions.prf 2013-11-04 07:50:44.835414343 -0800 +@@ -193,7 +193,7 @@ + defineTest(qtPrepareTool) { + $$1 = $$eval(QT_TOOL.$${2}.binary) + isEmpty($$1) { +- $$1 = $$[QT_HOST_BINS]/$$2 ++ $$1 = $$[QT_HOST_BINS/get]/$$2 + exists($$eval($$1).pl) { + $$1 = perl -w $$eval($$1).pl + } else: contains(QMAKE_HOST.os, Windows) { Added: head/devel/qmake5/files/patch-mkspecs__freebsd-g++__qmake.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/qmake5/files/patch-mkspecs__freebsd-g++__qmake.conf Mon Mar 3 16:50:32 2014 (r346930) @@ -0,0 +1,40 @@ +--- ./mkspecs/freebsd-g++/qmake.conf.orig 2013-12-05 17:39:41.510199000 +0000 ++++ ./mkspecs/freebsd-g++/qmake.conf 2013-12-05 17:40:05.441200135 +0000 +@@ -2,36 +2,9 @@ + # qmake configuration for freebsd-g++ + # + +-MAKEFILE_GENERATOR = UNIX +-QMAKE_PLATFORM = freebsd bsd + CONFIG += gdb_dwarf_index + +-QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE +- +-QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD +- +-# Addon software goes into /usr/local on the BSDs, by default we will look there +-QMAKE_INCDIR = /usr/local/include +-QMAKE_LIBDIR = /usr/local/lib +-QMAKE_INCDIR_X11 = /usr/X11R6/include +-QMAKE_LIBDIR_X11 = /usr/X11R6/lib +-QMAKE_INCDIR_OPENGL = /usr/X11R6/include +-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib +- +-QMAKE_LFLAGS_THREAD = -pthread +- +-QMAKE_LIBS = +-QMAKE_LIBS_DYNLOAD = +-QMAKE_LIBS_X11 = -lXext -lX11 -lm +-QMAKE_LIBS_OPENGL = -lGL +-QMAKE_LIBS_THREAD = +- +-QMAKE_AR = ar cqs +-QMAKE_OBJCOPY = objcopy +-QMAKE_NM = nm -P +-QMAKE_RANLIB = +- +-include(../common/unix.conf) ++include(../common/freebsd.conf) + include(../common/gcc-base-unix.conf) + include(../common/g++-unix.conf) + load(qt_config) Added: head/devel/qmake5/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/qmake5/pkg-plist Mon Mar 3 16:50:32 2014 (r346930) @@ -0,0 +1,561 @@ +%%QT_BINDIR%%/qmake +%%QT_MKSPECDIR%%/aix-g++-64/qmake.conf +%%QT_MKSPECDIR%%/aix-g++-64/qplatformdefs.h +%%QT_MKSPECDIR%%/aix-g++/qmake.conf +%%QT_MKSPECDIR%%/aix-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/aix-xlc-64/qmake.conf +%%QT_MKSPECDIR%%/aix-xlc-64/qplatformdefs.h +%%QT_MKSPECDIR%%/aix-xlc/qmake.conf +%%QT_MKSPECDIR%%/aix-xlc/qplatformdefs.h +%%QT_MKSPECDIR%%/android-g++/qmake.conf +%%QT_MKSPECDIR%%/android-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/blackberry-armle-v7-qcc/qmake.conf +%%QT_MKSPECDIR%%/blackberry-armle-v7-qcc/qplatformdefs.h +%%QT_MKSPECDIR%%/blackberry-armv7le-qcc/qmake.conf +%%QT_MKSPECDIR%%/blackberry-armv7le-qcc/qplatformdefs.h +%%QT_MKSPECDIR%%/blackberry-x86-qcc/qmake.conf +%%QT_MKSPECDIR%%/blackberry-x86-qcc/qplatformdefs.h +%%QT_MKSPECDIR%%/common/aix/qplatformdefs.h +%%QT_MKSPECDIR%%/common/android/qplatformdefs.h +%%QT_MKSPECDIR%%/common/armcc.conf +%%QT_MKSPECDIR%%/common/c89/qplatformdefs.h +%%QT_MKSPECDIR%%/common/clang-mac.conf +%%QT_MKSPECDIR%%/common/clang-unix.conf +%%QT_MKSPECDIR%%/common/clang.conf +%%QT_MKSPECDIR%%/common/freebsd.conf +%%QT_MKSPECDIR%%/common/g++-base.conf +%%QT_MKSPECDIR%%/common/g++-macx.conf +%%QT_MKSPECDIR%%/common/g++-unix.conf +%%QT_MKSPECDIR%%/common/g++.conf +%%QT_MKSPECDIR%%/common/gcc-base-mac.conf +%%QT_MKSPECDIR%%/common/gcc-base-unix.conf +%%QT_MKSPECDIR%%/common/gcc-base.conf +%%QT_MKSPECDIR%%/common/ios.conf +%%QT_MKSPECDIR%%/common/ios/GLES2/gl2.h +%%QT_MKSPECDIR%%/common/ios/clang.conf +%%QT_MKSPECDIR%%/common/ios/qmake.conf +%%QT_MKSPECDIR%%/common/linux-android.conf +%%QT_MKSPECDIR%%/common/linux.conf +%%QT_MKSPECDIR%%/common/llvm.conf +%%QT_MKSPECDIR%%/common/mac.conf +%%QT_MKSPECDIR%%/common/mac/qplatformdefs.h +%%QT_MKSPECDIR%%/common/macx.conf +%%QT_MKSPECDIR%%/common/nacl/g++-nacl32.conf +%%QT_MKSPECDIR%%/common/nacl/g++-nacl64.conf +%%QT_MKSPECDIR%%/common/nacl/nacl-base.conf +%%QT_MKSPECDIR%%/common/nacl/qplatformdefs.h +%%QT_MKSPECDIR%%/common/posix/qplatformdefs.h +%%QT_MKSPECDIR%%/common/qcc-base-qnx-armv7le.conf +%%QT_MKSPECDIR%%/common/qcc-base-qnx-x86.conf +%%QT_MKSPECDIR%%/common/qcc-base-qnx.conf +%%QT_MKSPECDIR%%/common/qcc-base.conf +%%QT_MKSPECDIR%%/common/shell-unix.conf +%%QT_MKSPECDIR%%/common/shell-win32.conf +%%QT_MKSPECDIR%%/common/unix.conf +%%QT_MKSPECDIR%%/common/wince/qmake.conf +%%QT_MKSPECDIR%%/common/wince/qplatformdefs.h +%%QT_MKSPECDIR%%/common/winrt_winphone/qmake.conf +%%QT_MKSPECDIR%%/cygwin-g++/qmake.conf +%%QT_MKSPECDIR%%/cygwin-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/darwin-g++/qmake.conf +%%QT_MKSPECDIR%%/darwin-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/blackberry-playbook-armle-v7-qcc/qmake.conf +%%QT_MKSPECDIR%%/devices/blackberry-playbook-armle-v7-qcc/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/blackberry-playbook-armv7le-qcc/qmake.conf +%%QT_MKSPECDIR%%/devices/blackberry-playbook-armv7le-qcc/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/blackberry-playbook-x86-qcc/qmake.conf +%%QT_MKSPECDIR%%/devices/blackberry-playbook-x86-qcc/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/common/linux_arm_device_post.conf +%%QT_MKSPECDIR%%/devices/common/linux_device_post.conf +%%QT_MKSPECDIR%%/devices/common/linux_device_pre.conf +%%QT_MKSPECDIR%%/devices/linux-archos-gen8-g++/qmake.conf +%%QT_MKSPECDIR%%/devices/linux-archos-gen8-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/linux-arm-amlogic-8726M-g++/qeglfshooks_8726m.cpp +%%QT_MKSPECDIR%%/devices/linux-arm-amlogic-8726M-g++/qmake.conf +%%QT_MKSPECDIR%%/devices/linux-arm-amlogic-8726M-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/linux-arm-trident-pnx8473-g++/qmake.conf +%%QT_MKSPECDIR%%/devices/linux-arm-trident-pnx8473-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/linux-beagleboard-g++/qmake.conf +%%QT_MKSPECDIR%%/devices/linux-beagleboard-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/linux-imx53qsb-g++/qmake.conf +%%QT_MKSPECDIR%%/devices/linux-imx53qsb-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/linux-imx6-g++/qeglfshooks_imx6.cpp +%%QT_MKSPECDIR%%/devices/linux-imx6-g++/qmake.conf +%%QT_MKSPECDIR%%/devices/linux-imx6-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/linux-maemo-n9-g++/qmake.conf +%%QT_MKSPECDIR%%/devices/linux-maemo-n9-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/linux-mipsel-broadcom-97425-g++/qdirectfbeglhooks_bcm97425.cpp +%%QT_MKSPECDIR%%/devices/linux-mipsel-broadcom-97425-g++/qmake.conf +%%QT_MKSPECDIR%%/devices/linux-mipsel-broadcom-97425-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp +%%QT_MKSPECDIR%%/devices/linux-rasp-pi-g++/qmake.conf +%%QT_MKSPECDIR%%/devices/linux-rasp-pi-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf +%%QT_MKSPECDIR%%/devices/linux-sh4-stmicro-ST7108-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf +%%QT_MKSPECDIR%%/devices/linux-sh4-stmicro-ST7540-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/linux-snowball-g++/qmake.conf +%%QT_MKSPECDIR%%/devices/linux-snowball-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/linux-tegra2-g++/qmake.conf +%%QT_MKSPECDIR%%/devices/linux-tegra2-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/features/android/android.prf +%%QT_MKSPECDIR%%/features/android/android_deployment_settings.prf +%%QT_MKSPECDIR%%/features/build_pass.prf +%%QT_MKSPECDIR%%/features/c++11.prf +%%QT_MKSPECDIR%%/features/cmake_functions.prf +%%QT_MKSPECDIR%%/features/configure.prf +%%QT_MKSPECDIR%%/features/create_cmake.prf +%%QT_MKSPECDIR%%/features/ctest_testcase.prf +%%QT_MKSPECDIR%%/features/ctest_testcase_common.prf +%%QT_MKSPECDIR%%/features/ctest_testcase_installed.prf +%%QT_MKSPECDIR%%/features/data/android/dx.bat +%%QT_MKSPECDIR%%/features/data/cmake/ExtraSourceIncludes.cmake.in +%%QT_MKSPECDIR%%/features/data/cmake/Qt5BasicConfig.cmake.in +%%QT_MKSPECDIR%%/features/data/cmake/Qt5ConfigVersion.cmake.in +%%QT_MKSPECDIR%%/features/data/cmake/Qt5PluginTarget.cmake.in +%%QT_MKSPECDIR%%/features/data/headersclean/tst_headersclean.cpp.in +%%QT_MKSPECDIR%%/features/dbusadaptors.prf +%%QT_MKSPECDIR%%/features/dbuscommon.pri +%%QT_MKSPECDIR%%/features/dbusinterfaces.prf +%%QT_MKSPECDIR%%/features/declarative_debug.prf +%%QT_MKSPECDIR%%/features/default_post.prf +%%QT_MKSPECDIR%%/features/default_pre.prf +%%QT_MKSPECDIR%%/features/designer_defines.prf +%%QT_MKSPECDIR%%/features/device_config.prf +%%QT_MKSPECDIR%%/features/egl.prf +%%QT_MKSPECDIR%%/features/exceptions.prf +%%QT_MKSPECDIR%%/features/exceptions_off.prf +%%QT_MKSPECDIR%%/features/exclusive_builds.prf +%%QT_MKSPECDIR%%/features/exclusive_builds_post.prf +%%QT_MKSPECDIR%%/features/gcov.prf +%%QT_MKSPECDIR%%/features/include_source_dir.prf +%%QT_MKSPECDIR%%/features/incredibuild_xge.prf +%%QT_MKSPECDIR%%/features/java.prf +%%QT_MKSPECDIR%%/features/lex.prf +%%QT_MKSPECDIR%%/features/link_pkgconfig.prf +%%QT_MKSPECDIR%%/features/mac/default_post.prf +%%QT_MKSPECDIR%%/features/mac/default_pre.prf +%%QT_MKSPECDIR%%/features/mac/objective_c.prf +%%QT_MKSPECDIR%%/features/mac/rez.prf +%%QT_MKSPECDIR%%/features/mac/sdk.prf +%%QT_MKSPECDIR%%/features/moc.prf +%%QT_MKSPECDIR%%/features/no_debug_info.prf +%%QT_MKSPECDIR%%/features/opengles1.prf +%%QT_MKSPECDIR%%/features/qfeatures.prf +%%QT_MKSPECDIR%%/features/qml1_module.prf +%%QT_MKSPECDIR%%/features/qml1_plugin.prf +%%QT_MKSPECDIR%%/features/qml_debug.prf +%%QT_MKSPECDIR%%/features/qml_module.prf +%%QT_MKSPECDIR%%/features/qml_plugin.prf +%%QT_MKSPECDIR%%/features/qmltestcase.prf +%%QT_MKSPECDIR%%/features/qpa/basicunixfontdatabase.prf +%%QT_MKSPECDIR%%/features/qpa/genericunixfontdatabase.prf +%%QT_MKSPECDIR%%/features/qt.prf +%%QT_MKSPECDIR%%/features/qt_android_deps.prf +%%QT_MKSPECDIR%%/features/qt_app.prf +%%QT_MKSPECDIR%%/features/qt_build_config.prf +%%QT_MKSPECDIR%%/features/qt_build_paths.prf +%%QT_MKSPECDIR%%/features/qt_common.prf +%%QT_MKSPECDIR%%/features/qt_config.prf +%%QT_MKSPECDIR%%/features/qt_docs.prf +%%QT_MKSPECDIR%%/features/qt_docs_targets.prf +%%QT_MKSPECDIR%%/features/qt_example_installs.prf +%%QT_MKSPECDIR%%/features/qt_functions.prf +%%QT_MKSPECDIR%%/features/qt_headersclean.prf +%%QT_MKSPECDIR%%/features/qt_installs.prf +%%QT_MKSPECDIR%%/features/qt_module.prf +%%QT_MKSPECDIR%%/features/qt_module_headers.prf +%%QT_MKSPECDIR%%/features/qt_module_pris.prf +%%QT_MKSPECDIR%%/features/qt_parts.prf +%%QT_MKSPECDIR%%/features/qt_plugin.prf +%%QT_MKSPECDIR%%/features/qt_targets.prf +%%QT_MKSPECDIR%%/features/qt_tool.prf +%%QT_MKSPECDIR%%/features/resolve_config.prf +%%QT_MKSPECDIR%%/features/resolve_target.prf +%%QT_MKSPECDIR%%/features/resources.prf +%%QT_MKSPECDIR%%/features/silent.prf +%%QT_MKSPECDIR%%/features/simd.prf +%%QT_MKSPECDIR%%/features/spec_post.prf +%%QT_MKSPECDIR%%/features/spec_pre.prf +%%QT_MKSPECDIR%%/features/testcase.prf +%%QT_MKSPECDIR%%/features/testcase_targets.prf +%%QT_MKSPECDIR%%/features/testcocoon.prf +%%QT_MKSPECDIR%%/features/testlib_defines.prf +%%QT_MKSPECDIR%%/features/uic.prf +%%QT_MKSPECDIR%%/features/unix/bsymbolic_functions.prf +%%QT_MKSPECDIR%%/features/unix/dylib.prf +%%QT_MKSPECDIR%%/features/unix/gdb_dwarf_index.prf +%%QT_MKSPECDIR%%/features/unix/hide_symbols.prf +%%QT_MKSPECDIR%%/features/unix/largefile.prf +%%QT_MKSPECDIR%%/features/unix/opengl.prf +%%QT_MKSPECDIR%%/features/unix/openvg.prf +%%QT_MKSPECDIR%%/features/unix/separate_debug_info.prf +%%QT_MKSPECDIR%%/features/unix/thread.prf +%%QT_MKSPECDIR%%/features/unix/x11.prf +%%QT_MKSPECDIR%%/features/unix/x11inc.prf +%%QT_MKSPECDIR%%/features/unix/x11lib.prf +%%QT_MKSPECDIR%%/features/unix/x11sm.prf +%%QT_MKSPECDIR%%/features/use_c_linker.prf +%%QT_MKSPECDIR%%/features/vxworks.prf +%%QT_MKSPECDIR%%/features/warn_off.prf +%%QT_MKSPECDIR%%/features/warn_on.prf +%%QT_MKSPECDIR%%/features/wayland-scanner.prf +%%QT_MKSPECDIR%%/features/win32/console.prf +%%QT_MKSPECDIR%%/features/win32/default_pre.prf +%%QT_MKSPECDIR%%/features/win32/dumpcpp.prf +%%QT_MKSPECDIR%%/features/win32/idcidl.prf +%%QT_MKSPECDIR%%/features/win32/ltcg.prf +%%QT_MKSPECDIR%%/features/win32/msvc_mp.prf +%%QT_MKSPECDIR%%/features/win32/opengl.prf +%%QT_MKSPECDIR%%/features/win32/openvg.prf +%%QT_MKSPECDIR%%/features/win32/qt_dll.prf +%%QT_MKSPECDIR%%/features/win32/rtti.prf +%%QT_MKSPECDIR%%/features/win32/rtti_off.prf +%%QT_MKSPECDIR%%/features/win32/stl.prf +%%QT_MKSPECDIR%%/features/win32/stl_off.prf +%%QT_MKSPECDIR%%/features/win32/windows.prf +%%QT_MKSPECDIR%%/features/yacc.prf +%%QT_MKSPECDIR%%/freebsd-clang/qmake.conf +%%QT_MKSPECDIR%%/freebsd-clang/qplatformdefs.h +%%QT_MKSPECDIR%%/freebsd-g++/qmake.conf +%%QT_MKSPECDIR%%/freebsd-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/freebsd-icc/qmake.conf +%%QT_MKSPECDIR%%/freebsd-icc/qplatformdefs.h +%%QT_MKSPECDIR%%/hpux-acc-64/qmake.conf +%%QT_MKSPECDIR%%/hpux-acc-64/qplatformdefs.h +%%QT_MKSPECDIR%%/hpux-acc-o64/qmake.conf +%%QT_MKSPECDIR%%/hpux-acc-o64/qplatformdefs.h +%%QT_MKSPECDIR%%/hpux-acc/qmake.conf +%%QT_MKSPECDIR%%/hpux-acc/qplatformdefs.h +%%QT_MKSPECDIR%%/hpux-g++-64/qmake.conf +%%QT_MKSPECDIR%%/hpux-g++-64/qplatformdefs.h +%%QT_MKSPECDIR%%/hpux-g++/qmake.conf +%%QT_MKSPECDIR%%/hpux-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/hpuxi-acc-32/qmake.conf +%%QT_MKSPECDIR%%/hpuxi-acc-32/qplatformdefs.h +%%QT_MKSPECDIR%%/hpuxi-acc-64/qmake.conf +%%QT_MKSPECDIR%%/hpuxi-acc-64/qplatformdefs.h +%%QT_MKSPECDIR%%/hpuxi-g++-64/qmake.conf +%%QT_MKSPECDIR%%/hpuxi-g++-64/qplatformdefs.h +%%QT_MKSPECDIR%%/hurd-g++/qmake.conf +%%QT_MKSPECDIR%%/hurd-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/irix-cc-64/qmake.conf +%%QT_MKSPECDIR%%/irix-cc-64/qplatformdefs.h +%%QT_MKSPECDIR%%/irix-cc/qmake.conf +%%QT_MKSPECDIR%%/irix-cc/qplatformdefs.h +%%QT_MKSPECDIR%%/irix-g++-64/qmake.conf +%%QT_MKSPECDIR%%/irix-g++-64/qplatformdefs.h +%%QT_MKSPECDIR%%/irix-g++/qmake.conf +%%QT_MKSPECDIR%%/irix-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/linux-arm-gnueabi-g++/qmake.conf +%%QT_MKSPECDIR%%/linux-arm-gnueabi-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/linux-clang-libc++/qmake.conf +%%QT_MKSPECDIR%%/linux-clang-libc++/qplatformdefs.h +%%QT_MKSPECDIR%%/linux-clang/qmake.conf +%%QT_MKSPECDIR%%/linux-clang/qplatformdefs.h +%%QT_MKSPECDIR%%/linux-cxx/qmake.conf +%%QT_MKSPECDIR%%/linux-cxx/qplatformdefs.h +%%QT_MKSPECDIR%%/linux-g++-32/qmake.conf +%%QT_MKSPECDIR%%/linux-g++-32/qplatformdefs.h +%%QT_MKSPECDIR%%/linux-g++-64/qmake.conf +%%QT_MKSPECDIR%%/linux-g++-64/qplatformdefs.h +%%QT_MKSPECDIR%%/linux-g++-maemo/qmake.conf +%%QT_MKSPECDIR%%/linux-g++-maemo/qplatformdefs.h +%%QT_MKSPECDIR%%/linux-g++/qmake.conf +%%QT_MKSPECDIR%%/linux-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/linux-icc-32/qmake.conf +%%QT_MKSPECDIR%%/linux-icc-32/qplatformdefs.h +%%QT_MKSPECDIR%%/linux-icc-64/qmake.conf +%%QT_MKSPECDIR%%/linux-icc-64/qplatformdefs.h +%%QT_MKSPECDIR%%/linux-icc/qmake.conf +%%QT_MKSPECDIR%%/linux-icc/qplatformdefs.h +%%QT_MKSPECDIR%%/linux-kcc/qmake.conf +%%QT_MKSPECDIR%%/linux-kcc/qplatformdefs.h +%%QT_MKSPECDIR%%/linux-llvm/qmake.conf +%%QT_MKSPECDIR%%/linux-llvm/qplatformdefs.h +%%QT_MKSPECDIR%%/linux-lsb-g++/qmake.conf +%%QT_MKSPECDIR%%/linux-lsb-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/linux-pgcc/qmake.conf +%%QT_MKSPECDIR%%/linux-pgcc/qplatformdefs.h +%%QT_MKSPECDIR%%/lynxos-g++/qmake.conf +%%QT_MKSPECDIR%%/lynxos-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/macx-clang-32/Info.plist.app +%%QT_MKSPECDIR%%/macx-clang-32/Info.plist.lib +%%QT_MKSPECDIR%%/macx-clang-32/qmake.conf +%%QT_MKSPECDIR%%/macx-clang-32/qplatformdefs.h +%%QT_MKSPECDIR%%/macx-clang/Info.plist.app +%%QT_MKSPECDIR%%/macx-clang/Info.plist.lib *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403031650.s23GoXow011289>