diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/accessibility/qt4-accessible/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/accessibility/qt4-accessible/Makefile --- /s/freebsd-ports/accessibility/qt4-accessible/Makefile 2013-08-15 18:12:27.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/accessibility/qt4-accessible/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -35,7 +35,7 @@ BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: ${MKDIR} ${WRKSRC}/mkspecs diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/chinese/qt4-codecs-cn/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/chinese/qt4-codecs-cn/Makefile --- /s/freebsd-ports/chinese/qt4-codecs-cn/Makefile 2013-04-29 23:36:10.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/chinese/qt4-codecs-cn/Makefile 2013-07-10 11:17:39.000000000 +0300 @@ -36,7 +36,7 @@ BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME}/cn INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: ${MKDIR} ${WRKSRC}/mkspecs diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/chinese/qt4-codecs-tw/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/chinese/qt4-codecs-tw/Makefile --- /s/freebsd-ports/chinese/qt4-codecs-tw/Makefile 2013-04-29 23:36:10.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/chinese/qt4-codecs-tw/Makefile 2013-07-10 11:17:39.000000000 +0300 @@ -36,7 +36,7 @@ BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME}/tw INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: ${MKDIR} ${WRKSRC}/mkspecs diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/databases/qt4-ibase-plugin/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/databases/qt4-ibase-plugin/Makefile --- /s/freebsd-ports/databases/qt4-ibase-plugin/Makefile 2013-08-15 18:12:05.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/databases/qt4-ibase-plugin/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -23,8 +23,6 @@ MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \ PLUGIN="${PLUGIN}" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ QT_INCDIR="${QT_INCDIR}" \ QT_LIBDIR="${QT_LIBDIR}" PLIST_SUB= DB=${DB} diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/databases/qt4-ibase-plugin/files/Makefile.bsd /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/databases/qt4-ibase-plugin/files/Makefile.bsd --- /s/freebsd-ports/databases/qt4-ibase-plugin/files/Makefile.bsd 2013-03-25 21:44:27.000000000 +0200 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/databases/qt4-ibase-plugin/files/Makefile.bsd 2013-05-04 17:21:02.000000000 +0300 @@ -6,11 +6,11 @@ -I${QT_INCDIR}/Qt \ -I${QT_INCDIR}/QtCore \ -I${LOCALBASE}/include \ - ${PTHREAD_CFLAGS} -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \ + -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \ -DQT_PLUGIN -DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE \ -D_LARGEFILE_SOURCE -DQT_SHARED MOC?= ${LOCALBASE}/bin/moc-qt4 -LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lgds +LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib -pthread -lQtSql -lgds SRCS= main.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp LIBDIR= ${PREFIX}/lib/qt4/plugins/sqldrivers diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/databases/qt4-mysql-plugin/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/databases/qt4-mysql-plugin/Makefile --- /s/freebsd-ports/databases/qt4-mysql-plugin/Makefile 2013-08-15 18:12:05.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/databases/qt4-mysql-plugin/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -22,8 +22,6 @@ MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \ PLUGIN="${PLUGIN}" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ QT_INCDIR="${QT_INCDIR}" \ QT_LIBDIR="${QT_LIBDIR}" PLIST_SUB= DB=${DB} diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/databases/qt4-mysql-plugin/files/Makefile.bsd /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/databases/qt4-mysql-plugin/files/Makefile.bsd --- /s/freebsd-ports/databases/qt4-mysql-plugin/files/Makefile.bsd 2013-03-25 21:44:23.000000000 +0200 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/databases/qt4-mysql-plugin/files/Makefile.bsd 2013-05-04 17:21:02.000000000 +0300 @@ -6,9 +6,9 @@ -I${QT_INCDIR}/Qt \ -I${LOCALBASE}/include/mysql \ -I${LOCALBASE}/include \ - ${PTHREAD_CFLAGS} -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII -DQT_PLUGIN \ + -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII -DQT_PLUGIN \ -DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_SHARED -LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql ${PTHREAD_LIBS} -lQtSql -lmysqlclient_r +LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql -pthread -lQtSql -lmysqlclient_r MOC?= ${LOCALBASE}/bin/moc-qt4 SRCS= main.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp qsql_${DB}.moc diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/databases/qt4-odbc-plugin/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/databases/qt4-odbc-plugin/Makefile --- /s/freebsd-ports/databases/qt4-odbc-plugin/Makefile 2013-08-15 18:12:05.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/databases/qt4-odbc-plugin/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -23,8 +23,6 @@ MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \ PLUGIN="${PLUGIN}" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ QT_INCDIR="${QT_INCDIR}" \ QT_LIBDIR="${QT_LIBDIR}" PLIST_SUB= DB=${DB} diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/databases/qt4-odbc-plugin/files/Makefile.bsd /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/databases/qt4-odbc-plugin/files/Makefile.bsd --- /s/freebsd-ports/databases/qt4-odbc-plugin/files/Makefile.bsd 2013-03-25 21:44:32.000000000 +0200 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/databases/qt4-odbc-plugin/files/Makefile.bsd 2013-05-04 17:21:02.000000000 +0300 @@ -7,10 +7,10 @@ -I${QT_INCDIR}/QtCore \ -I${QT_INCDIR}/QtSql \ -I${LOCALBASE}/include \ - ${PTHREAD_CFLAGS} -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \ + -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \ -DQT_PLUGIN -DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE \ -D_LARGEFILE_SOURCE -DQT_SHARED -DUNICODE -LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lodbc +LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib -pthread -lQtSql -lodbc MOC?= ${LOCALBASE}/bin/moc-qt4 SRCS= main.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/databases/qt4-pgsql-plugin/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/databases/qt4-pgsql-plugin/Makefile --- /s/freebsd-ports/databases/qt4-pgsql-plugin/Makefile 2013-08-15 18:12:05.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/databases/qt4-pgsql-plugin/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -22,8 +22,6 @@ MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \ PLUGIN="${PLUGIN}" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ QT_INCDIR="${QT_INCDIR}" \ QT_LIBDIR="${QT_LIBDIR}" PLIST_SUB= DB=${DB} diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/databases/qt4-pgsql-plugin/files/Makefile.bsd /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/databases/qt4-pgsql-plugin/files/Makefile.bsd --- /s/freebsd-ports/databases/qt4-pgsql-plugin/files/Makefile.bsd 2013-03-25 21:44:28.000000000 +0200 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/databases/qt4-pgsql-plugin/files/Makefile.bsd 2013-05-04 17:21:02.000000000 +0300 @@ -6,11 +6,11 @@ -I${QT_INCDIR}/Qt \ -I${LOCALBASE}/include/postgresql/server \ -I${LOCALBASE}/include \ - ${PTHREAD_CFLAGS} -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \ + -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \ -DQT_PLUGIN -DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE \ -D_LARGEFILE_SOURCE -DQT_SHARED MOC?= ${LOCALBASE}/bin/moc-qt4 -LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lpq +LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib -pthread -lQtSql -lpq SRCS= main.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp LIBDIR= ${PREFIX}/lib/qt4/plugins/sqldrivers diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/databases/qt4-sql/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/databases/qt4-sql/Makefile --- /s/freebsd-ports/databases/qt4-sql/Makefile 2013-08-15 18:12:05.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/databases/qt4-sql/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -36,7 +36,7 @@ BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: ${MKDIR} ${WRKSRC}/mkspecs diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/databases/qt4-sqlite-plugin/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/databases/qt4-sqlite-plugin/Makefile --- /s/freebsd-ports/databases/qt4-sqlite-plugin/Makefile 2013-08-15 18:12:05.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/databases/qt4-sqlite-plugin/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -24,8 +24,6 @@ MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \ PLUGIN="${PLUGIN}" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ QT_INCDIR="${QT_INCDIR}" \ QT_LIBDIR="${QT_LIBDIR}" PLIST_SUB= DB=${DB} diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/databases/qt4-sqlite-plugin/files/Makefile.bsd /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/databases/qt4-sqlite-plugin/files/Makefile.bsd --- /s/freebsd-ports/databases/qt4-sqlite-plugin/files/Makefile.bsd 2013-03-25 21:44:30.000000000 +0200 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/databases/qt4-sqlite-plugin/files/Makefile.bsd 2013-05-04 17:21:02.000000000 +0300 @@ -5,11 +5,11 @@ -I${QT_INCDIR} \ -I${QT_INCDIR}/Qt \ -I${LOCALBASE}/include \ - ${PTHREAD_CFLAGS} -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \ + -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \ -DQT_PLUGIN -DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE \ -D_LARGEFILE_SOURCE -DQT_SHARED MOC?= ${LOCALBASE}/bin/moc-qt4 -LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lsqlite +LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib -pthread -lQtSql -lsqlite SRCS= smain.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp LIBDIR= ${PREFIX}/lib/qt4/plugins/sqldrivers diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/databases/qt4-sqlite3-plugin/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/databases/qt4-sqlite3-plugin/Makefile --- /s/freebsd-ports/databases/qt4-sqlite3-plugin/Makefile 2013-08-15 18:12:05.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/databases/qt4-sqlite3-plugin/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -25,8 +25,6 @@ MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \ PLUGIN="${PLUGIN}" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ QT_INCDIR="${QT_INCDIR}" \ QT_LIBDIR="${QT_LIBDIR}" PLIST_SUB= DB=${DB} diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/databases/qt4-sqlite3-plugin/files/Makefile.bsd /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/databases/qt4-sqlite3-plugin/files/Makefile.bsd --- /s/freebsd-ports/databases/qt4-sqlite3-plugin/files/Makefile.bsd 2013-03-25 21:44:20.000000000 +0200 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/databases/qt4-sqlite3-plugin/files/Makefile.bsd 2013-05-04 17:21:02.000000000 +0300 @@ -5,11 +5,11 @@ -I${QT_INCDIR} \ -I${QT_INCDIR}/Qt \ -I${LOCALBASE}/include \ - ${PTHREAD_CFLAGS} -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \ + -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \ -DQT_PLUGIN -DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE \ -D_LARGEFILE_SOURCE -DQT_SHARED MOC?= ${LOCALBASE}/bin/moc-qt4 -LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lsqlite3 +LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib -pthread -lQtSql -lsqlite3 SRCS= smain.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp LIBDIR= ${PREFIX}/lib/qt4/plugins/sqldrivers diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/devel/dbus-qt4/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/dbus-qt4/Makefile --- /s/freebsd-ports/devel/dbus-qt4/Makefile 2013-09-07 00:48:36.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/dbus-qt4/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -40,7 +40,7 @@ BUILD_WRKSRC= ${WRKSRC}/tools/qdbus INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure .include diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/devel/qmake4/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qmake4/Makefile --- /s/freebsd-ports/devel/qmake4/Makefile 2013-08-31 18:00:05.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qmake4/Makefile 2013-09-08 01:19:17.000000000 +0300 @@ -3,7 +3,6 @@ PORTNAME= qmake DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/devel/qmake4/pkg-plist /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qmake4/pkg-plist --- /s/freebsd-ports/devel/qmake4/pkg-plist 2013-03-25 21:46:41.000000000 +0200 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qmake4/pkg-plist 2013-08-03 16:52:21.000000000 +0300 @@ -9,6 +9,10 @@ share/qt4/mkspecs/aix-xlc/qplatformdefs.h share/qt4/mkspecs/blackberry-armv7le-qcc/qmake.conf share/qt4/mkspecs/blackberry-armv7le-qcc/qplatformdefs.h +share/qt4/mkspecs/blackberry-playbook-armv7le-qcc/qmake.conf +share/qt4/mkspecs/blackberry-playbook-armv7le-qcc/qplatformdefs.h +share/qt4/mkspecs/blackberry-playbook-x86-qcc/qmake.conf +share/qt4/mkspecs/blackberry-playbook-x86-qcc/qplatformdefs.h share/qt4/mkspecs/blackberry-x86-qcc/qmake.conf share/qt4/mkspecs/blackberry-x86-qcc/qplatformdefs.h share/qt4/mkspecs/common/aix/qplatformdefs.h @@ -737,6 +741,8 @@ @dirrm share/qt4/mkspecs/common/aix @dirrm share/qt4/mkspecs/common @dirrm share/qt4/mkspecs/blackberry-x86-qcc +@dirrm share/qt4/mkspecs/blackberry-playbook-x86-qcc +@dirrm share/qt4/mkspecs/blackberry-playbook-armv7le-qcc @dirrm share/qt4/mkspecs/blackberry-armv7le-qcc @dirrm share/qt4/mkspecs/aix-xlc-64 @dirrm share/qt4/mkspecs/aix-xlc diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/devel/qt4/distinfo /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4/distinfo --- /s/freebsd-ports/devel/qt4/distinfo 2013-03-25 21:47:17.000000000 +0200 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4/distinfo 2013-08-03 15:52:36.000000000 +0300 @@ -1,2 +1,2 @@ -SHA256 (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 -SIZE (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 236593028 +SHA256 (KDE/qt-everywhere-opensource-src-4.8.5.tar.gz) = eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 +SIZE (KDE/qt-everywhere-opensource-src-4.8.5.tar.gz) = 241491467 diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/devel/qt4/files/patch-configure /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4/files/patch-configure --- /s/freebsd-ports/devel/qt4/files/patch-configure 2013-03-25 21:47:17.000000000 +0200 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4/files/patch-configure 2013-08-03 15:52:36.000000000 +0300 @@ -39,12 +39,13 @@ echo "Creating qmake. Please wait..." OLD_QCONFIG_H= -@@ -5831,14 +5826,6 @@ +@@ -5995,15 +5995,6 @@ + QMakeVar add QMAKE_CXXFLAGS -fpermissive X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive" fi - +- - # Check we actually have X11 :-) -- "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS +- compileTest x11/xlib "XLib" $X11TESTS_FLAGS - if [ $? != "0" ]; then - echo "Basic XLib functionality test failed!" - echo " You might need to modify the include and library search paths by editing" diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/devel/qt4-assistant/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-assistant/Makefile --- /s/freebsd-ports/devel/qt4-assistant/Makefile 2013-08-31 18:00:05.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-assistant/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -40,7 +40,7 @@ BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME}/tools/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: ${REINPLACE_CMD} \ diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/devel/qt4-corelib/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-corelib/Makefile --- /s/freebsd-ports/devel/qt4-corelib/Makefile 2013-09-09 04:01:20.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-corelib/Makefile 2013-09-08 01:21:10.000000000 +0300 @@ -3,7 +3,6 @@ PORTNAME= corelib DISTVERSION= ${QT4_VERSION} -PORTREVISION= 5 CATEGORIES?= devel PKGNAMEPREFIX= qt4- @@ -41,7 +40,7 @@ BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure .include "${.CURDIR}/../../devel/qt4/files/Makefile.options" diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/devel/qt4-corelib/files/patch-git_8d33f67 /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-corelib/files/patch-git_8d33f67 --- /s/freebsd-ports/devel/qt4-corelib/files/patch-git_8d33f67 2013-09-09 03:56:01.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-corelib/files/patch-git_8d33f67 1970-01-01 02:00:00.000000000 +0200 @@ -1,81 +0,0 @@ -From 8d33f673d3aaa7107c8e86d6591bd3f077f0313d Mon Sep 17 00:00:00 2001 -From: Raphael Kubo da Costa -Date: Fri, 10 May 2013 04:08:38 +0300 -Subject: [PATCH] Special-case the forward declaration of STL types for libc++. - -This is somewhat of a follow-up to 5210d47aa66214e3cb16f394d0510a91f770c1b1. -libc++ declares the STL types in an inline namespace within the "std" one if -clang is used. - -If one includes a header such as before a Qt one and builds with -QT_NO_STL, the following ends up happening: - - // - namespace std { - inline namespace __1 { - struct random_access_iterator ... ; - } - } - - // qiterator.h - #ifdef QT_NO_STL - namespace std { - struct random_access_iterator; - } - #endif - -qiterator.h's declaration shadows the original one, and the compiler -complains random_access_iterator lacks an actual declaration. - -Solve this by checking for libc++ and forward-declaring the iterator types -we need within the same inline namespace. - -Not backported from qtbase because QT_NO_STL does not exist in Qt 5. - -Change-Id: I6742d540f6538a30aa060a4447c288cfb9cd781d -Reviewed-by: Thiago Macieira ---- - src/corelib/tools/qiterator.h | 23 +++++++++++++++++++++++ - 1 file changed, 23 insertions(+) - -diff --git a/src/corelib/tools/qiterator.h b/src/corelib/tools/qiterator.h -index c859d37..54c331e 100644 ---- src/corelib/tools/qiterator.h -+++ src/corelib/tools/qiterator.h -@@ -47,10 +47,33 @@ - QT_BEGIN_HEADER - - #ifdef QT_NO_STL -+# include // No-op, indirectly include additional configuration headers. -+# if defined(_LIBCPP_VERSION) -+// libc++ may declare these structs in an inline namespace. Forward-declare -+// these iterators in the same namespace so that we do not shadow the original -+// declarations. -+ -+// Tell clang not to warn about the use of inline namespaces when not building -+// in C++11 mode. -+# if defined(Q_CC_CLANG) -+# pragma GCC diagnostic push -+# pragma GCC diagnostic ignored "-Wc++11-extensions" -+# endif -+ -+_LIBCPP_BEGIN_NAMESPACE_STD -+ struct bidirectional_iterator_tag; -+ struct random_access_iterator_tag; -+_LIBCPP_END_NAMESPACE_STD -+ -+# if defined(Q_CC_CLANG) -+# pragma GCC diagnostic pop -+# endif -+# else - namespace std { - struct bidirectional_iterator_tag; - struct random_access_iterator_tag; - } -+# endif - #endif - - QT_BEGIN_NAMESPACE --- -1.8.4 - diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/devel/qt4-corelib/files/patch-git_ccd1b2ee /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-corelib/files/patch-git_ccd1b2ee --- /s/freebsd-ports/devel/qt4-corelib/files/patch-git_ccd1b2ee 2013-05-11 20:11:23.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-corelib/files/patch-git_ccd1b2ee 1970-01-01 02:00:00.000000000 +0200 @@ -1,35 +0,0 @@ -commit ccd1b2ee01c193cd157978c1f9f08f87d0f9c94b -Author: Raphael Kubo da Costa -Date: Fri May 10 01:40:23 2013 +0300 - - Check that 3DNow! instructions are supported before including mm3dnow.h. - - Include mm3dnow.h the way we already include the (S)SSE{3,4} and AVX - instruction headers: by checking that the compiler is set to support those - instructions besides verifying that QT_HAVE_3DNOW evalues to true (which - only means the compiler supported them when the build was being configured). - - This has not caused a problem in most cases so far because GCC protects its - mm3dnow.h header with an #ifdef __3dNOW__ (contrary to what it does on, say, - pmmintrin.h). clang's mm3dnow.h, on the other hand, does not have that check - and can fail if -march is set to, for example, i386 or i486. - - Not backported from qt5 because qtbase because qsimd_p.h does not include - the 3DNow! headers after commit a1b30b49ef09bef2e97b9a0622bf7ad622678fee. - - Change-Id: I15ab5e936c71c55f89c3f25777ab27fbd262e9cd - Reviewed-by: Thiago Macieira - -diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h -index 87e26e1..6a32e8f 100644 ---- ./src/corelib/tools/qsimd_p.h -+++ ./src/corelib/tools/qsimd_p.h -@@ -199,7 +199,7 @@ QT_BEGIN_HEADER - #endif - - // 3D now intrinsics --#if defined(QT_HAVE_3DNOW) -+#if defined(QT_HAVE_3DNOW) && (defined(__3dNOW__) || defined(Q_CC_MSVC)) - #include - #endif - diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/devel/qt4-corelib/files/patch-src__corelib__animation__qpropertyanimation.cpp /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-corelib/files/patch-src__corelib__animation__qpropertyanimation.cpp --- /s/freebsd-ports/devel/qt4-corelib/files/patch-src__corelib__animation__qpropertyanimation.cpp 2013-07-10 01:12:22.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-corelib/files/patch-src__corelib__animation__qpropertyanimation.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,16 +0,0 @@ ---- src/corelib/animation/qpropertyanimation.cpp.orig -+++ src/corelib/animation/qpropertyanimation.cpp -@@ -136,8 +136,11 @@ void QPropertyAnimationPrivate::updateProperty(const QVariant &newValue) - - if (newValue.userType() == propertyType) { - //no conversion is needed, we directly call the QMetaObject::metacall -- void *data = const_cast(newValue.constData()); -- QMetaObject::metacall(targetValue, QMetaObject::WriteProperty, propertyIndex, &data); -+ //check QMetaProperty::write for an explanation of these -+ int status = -1; -+ int flags = 0; -+ void *argv[] = { const_cast(newValue.constData()), const_cast(&newValue), &status, &flags }; -+ QMetaObject::metacall(targetValue, QMetaObject::WriteProperty, propertyIndex, argv); - } else { - targetValue->setProperty(propertyName.constData(), newValue); - } diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/devel/qt4-corelib/pkg-plist /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-corelib/pkg-plist --- /s/freebsd-ports/devel/qt4-corelib/pkg-plist 2013-03-25 21:47:07.000000000 +0200 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-corelib/pkg-plist 2013-08-03 16:52:58.000000000 +0300 @@ -89,6 +89,7 @@ include/qt4/Qt/qlinkedlist.h include/qt4/Qt/qlist.h include/qt4/Qt/qlocale.h +include/qt4/Qt/qlocale_blackberry.h include/qt4/Qt/qmap.h include/qt4/Qt/qmargins.h include/qt4/Qt/qmath.h @@ -189,6 +190,7 @@ include/qt4/QtCore/QArgument include/qt4/QtCore/QAtomicInt include/qt4/QtCore/QAtomicPointer +include/qt4/QtCore/QBBSystemLocaleData include/qt4/QtCore/QBasicAtomicInt include/qt4/QtCore/QBasicAtomicPointer include/qt4/QtCore/QBasicTimer @@ -535,6 +537,7 @@ include/qt4/QtCore/qlinkedlist.h include/qt4/QtCore/qlist.h include/qt4/QtCore/qlocale.h +include/qt4/QtCore/qlocale_blackberry.h include/qt4/QtCore/qmap.h include/qt4/QtCore/qmargins.h include/qt4/QtCore/qmath.h diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/devel/qt4-declarative/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-declarative/Makefile --- /s/freebsd-ports/devel/qt4-declarative/Makefile 2013-08-31 18:00:06.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-declarative/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -35,7 +35,7 @@ BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: ${MKDIR} ${WRKSRC}/mkspecs diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/devel/qt4-declarative/files/patch-src-declarative-util-qdeclarativefontloader.cpp /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-declarative/files/patch-src-declarative-util-qdeclarativefontloader.cpp --- /s/freebsd-ports/devel/qt4-declarative/files/patch-src-declarative-util-qdeclarativefontloader.cpp 2013-04-27 20:38:05.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-declarative/files/patch-src-declarative-util-qdeclarativefontloader.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,20 +0,0 @@ ---- src/declarative/util/qdeclarativefontloader.cpp.orig 2013-04-24 09:08:17.000000000 +0800 -+++ src/declarative/util/qdeclarativefontloader.cpp 2013-04-24 09:09:13.000000000 +0800 -@@ -64,7 +64,7 @@ - Q_OBJECT - - public: -- QDeclarativeFontObject(int _id); -+ QDeclarativeFontObject(int _id = -1); - - void download(const QUrl &url, QNetworkAccessManager *manager); - -@@ -84,7 +84,7 @@ - Q_DISABLE_COPY(QDeclarativeFontObject) - }; - --QDeclarativeFontObject::QDeclarativeFontObject(int _id = -1) -+QDeclarativeFontObject::QDeclarativeFontObject(int _id) - : QObject(0), id(_id), reply(0), redirectCount(0) {} - - diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/devel/qt4-designer/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-designer/Makefile --- /s/freebsd-ports/devel/qt4-designer/Makefile 2013-08-31 18:00:05.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-designer/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -42,7 +42,7 @@ BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: ${REINPLACE_CMD} -e 's|^TARGET.*|TARGET=designer-qt4|g' \ diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/devel/qt4-help/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-help/Makefile --- /s/freebsd-ports/devel/qt4-help/Makefile 2013-08-31 18:00:05.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-help/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -37,7 +37,7 @@ BUILD_WRKSRC= ${WRKSRC}/tools/assistant/lib INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: ${MKDIR} ${WRKSRC}/mkspecs diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/devel/qt4-help-tools/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-help-tools/Makefile --- /s/freebsd-ports/devel/qt4-help-tools/Makefile 2013-08-31 18:00:06.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-help-tools/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -37,7 +37,7 @@ BUILD_WRKSRC= ${WRKSRC}/tools/assistant/tools INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: ${REINPLACE_CMD} -e 's|assistant||' \ diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/devel/qt4-linguist/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-linguist/Makefile --- /s/freebsd-ports/devel/qt4-linguist/Makefile 2013-08-31 18:00:05.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-linguist/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -40,7 +40,7 @@ BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: ${REINPLACE_CMD} -E -e 's|^TARGET[[:blank:]]*=[[:blank:]]*([a-z]+)|TARGET=\1-qt4|g' \ diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/devel/qt4-makeqpf/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-makeqpf/Makefile --- /s/freebsd-ports/devel/qt4-makeqpf/Makefile 2013-08-31 18:00:07.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-makeqpf/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -35,7 +35,7 @@ BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure .include diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/devel/qt4-moc/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-moc/Makefile --- /s/freebsd-ports/devel/qt4-moc/Makefile 2013-08-31 18:00:07.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-moc/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -35,7 +35,7 @@ BUILD_WRKSRC= ${WRKSRC}/src/tools/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: ${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/bin|g' \ diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/devel/qt4-moc/files/patch-src__tools__moc__main.cpp /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-moc/files/patch-src__tools__moc__main.cpp --- /s/freebsd-ports/devel/qt4-moc/files/patch-src__tools__moc__main.cpp 2013-03-25 21:46:55.000000000 +0200 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-moc/files/patch-src__tools__moc__main.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,10 +0,0 @@ ---- ./src/tools/moc/main.cpp.orig 2013-01-30 16:16:31.615488856 +0000 -+++ ./src/tools/moc/main.cpp 2013-01-30 16:16:52.991681291 +0000 -@@ -187,6 +187,7 @@ - Moc moc; - pp.macros["Q_MOC_RUN"]; - pp.macros["__cplusplus"]; -+ pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; - QByteArray filename; - QByteArray output; - FILE *in = 0; diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/devel/qt4-porting/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-porting/Makefile --- /s/freebsd-ports/devel/qt4-porting/Makefile 2013-08-31 18:00:06.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-porting/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -35,7 +35,7 @@ BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: ${MKDIR} ${WRKSRC}/mkspecs diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/devel/qt4-qdbusviewer/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-qdbusviewer/Makefile --- /s/freebsd-ports/devel/qt4-qdbusviewer/Makefile 2013-09-07 00:48:33.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-qdbusviewer/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -43,7 +43,7 @@ BUILD_WRKSRC= ${WRKSRC}/tools/qdbus/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure post-patch: ${MKDIR} ${WRKSRC}/mkspecs diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/devel/qt4-qdoc3/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-qdoc3/Makefile --- /s/freebsd-ports/devel/qt4-qdoc3/Makefile 2013-04-29 23:36:06.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-qdoc3/Makefile 2013-07-10 11:17:38.000000000 +0300 @@ -27,7 +27,7 @@ EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' .endfor -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/devel/qt4-qmlviewer/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-qmlviewer/Makefile --- /s/freebsd-ports/devel/qt4-qmlviewer/Makefile 2013-08-31 18:00:06.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-qmlviewer/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -41,7 +41,7 @@ BUILD_WRKSRC= ${WRKSRC}/tools/qml/ INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure post-patch: ${MKDIR} ${WRKSRC}/mkspecs diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/devel/qt4-qt3support/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-qt3support/Makefile --- /s/freebsd-ports/devel/qt4-qt3support/Makefile 2013-08-31 18:00:06.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-qt3support/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -36,7 +36,7 @@ BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: ${MKDIR} ${WRKSRC}/mkspecs diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/devel/qt4-qtestlib/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-qtestlib/Makefile --- /s/freebsd-ports/devel/qt4-qtestlib/Makefile 2013-08-31 18:00:05.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-qtestlib/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -36,7 +36,7 @@ BUILD_WRKSRC= ${WRKSRC}/src/testlib INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: ${MKDIR} ${WRKSRC}/mkspecs diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/devel/qt4-qvfb/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-qvfb/Makefile --- /s/freebsd-ports/devel/qt4-qvfb/Makefile 2013-08-31 18:00:05.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-qvfb/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -42,7 +42,7 @@ CONFIGURE_ARGS+= -I../../include/Qt -I../../include -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: ${MKDIR} ${WRKSRC}/mkspecs diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/devel/qt4-rcc/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-rcc/Makefile --- /s/freebsd-ports/devel/qt4-rcc/Makefile 2013-08-31 18:00:06.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-rcc/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -35,7 +35,7 @@ BUILD_WRKSRC= ${WRKSRC}/src/tools/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: ${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/bin|g' \ diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/devel/qt4-script/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-script/Makefile --- /s/freebsd-ports/devel/qt4-script/Makefile 2013-09-07 02:18:55.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-script/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -3,7 +3,6 @@ PORTNAME= script DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES?= devel PKGNAMEPREFIX= qt4- @@ -38,7 +37,7 @@ BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: ${MKDIR} ${WRKSRC}/mkspecs diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/devel/qt4-script/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__interpreter__Interpreter.cpp /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-script/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__interpreter__Interpreter.cpp --- /s/freebsd-ports/devel/qt4-script/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__interpreter__Interpreter.cpp 2013-03-25 21:46:53.000000000 +0200 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-script/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__interpreter__Interpreter.cpp 1970-01-01 02:00:00.000000000 +0200 @@ -1,13 +0,0 @@ ---- ./src/3rdparty/javascriptcore/JavaScriptCore/interpreter/Interpreter.cpp.orig 2011-06-30 00:43:03.155579428 +0200 -+++ ./src/3rdparty/javascriptcore/JavaScriptCore/interpreter/Interpreter.cpp 2011-06-30 00:43:34.275444696 +0200 -@@ -2493,8 +2493,10 @@ - vPC += OPCODE_LENGTH(op_get_by_pname); - NEXT_INSTRUCTION(); - } -+ { - Identifier propertyName(callFrame, subscript.toString(callFrame)); - result = baseValue.get(callFrame, propertyName); -+ } - CHECK_FOR_EXCEPTION(); - callFrame->r(dst) = result; - vPC += OPCODE_LENGTH(op_get_by_pname); diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/devel/qt4-scripttools/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-scripttools/Makefile --- /s/freebsd-ports/devel/qt4-scripttools/Makefile 2013-08-31 18:00:05.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-scripttools/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -35,7 +35,7 @@ BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: ${MKDIR} ${WRKSRC}/mkspecs diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/devel/qt4-uic/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-uic/Makefile --- /s/freebsd-ports/devel/qt4-uic/Makefile 2013-08-31 18:00:05.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-uic/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -35,7 +35,7 @@ BUILD_WRKSRC= ${WRKSRC}/src/tools/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: ${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/bin|g' \ diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/devel/qt4-uic3/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-uic3/Makefile --- /s/freebsd-ports/devel/qt4-uic3/Makefile 2013-08-31 18:00:06.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/devel/qt4-uic3/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -34,7 +34,7 @@ BUILD_WRKSRC= ${WRKSRC}/src/tools/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: ${MKDIR} ${WRKSRC}/mkspecs diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/graphics/qt4-iconengines/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/graphics/qt4-iconengines/Makefile --- /s/freebsd-ports/graphics/qt4-iconengines/Makefile 2013-08-15 18:12:08.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/graphics/qt4-iconengines/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -35,7 +35,7 @@ BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME}/svgiconengine INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: ${MKDIR} ${WRKSRC}/mkspecs diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/graphics/qt4-imageformats/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/graphics/qt4-imageformats/Makefile --- /s/freebsd-ports/graphics/qt4-imageformats/Makefile 2013-08-15 18:12:08.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/graphics/qt4-imageformats/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -40,7 +40,7 @@ BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: ${MKDIR} ${WRKSRC}/mkspecs diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/graphics/qt4-imageformats/files/patch-git_ccd1b2ee /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/graphics/qt4-imageformats/files/patch-git_ccd1b2ee --- /s/freebsd-ports/graphics/qt4-imageformats/files/patch-git_ccd1b2ee 2013-05-16 01:11:14.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/graphics/qt4-imageformats/files/patch-git_ccd1b2ee 1970-01-01 02:00:00.000000000 +0200 @@ -1,35 +0,0 @@ -commit ccd1b2ee01c193cd157978c1f9f08f87d0f9c94b -Author: Raphael Kubo da Costa -Date: Fri May 10 01:40:23 2013 +0300 - - Check that 3DNow! instructions are supported before including mm3dnow.h. - - Include mm3dnow.h the way we already include the (S)SSE{3,4} and AVX - instruction headers: by checking that the compiler is set to support those - instructions besides verifying that QT_HAVE_3DNOW evalues to true (which - only means the compiler supported them when the build was being configured). - - This has not caused a problem in most cases so far because GCC protects its - mm3dnow.h header with an #ifdef __3dNOW__ (contrary to what it does on, say, - pmmintrin.h). clang's mm3dnow.h, on the other hand, does not have that check - and can fail if -march is set to, for example, i386 or i486. - - Not backported from qt5 because qtbase because qsimd_p.h does not include - the 3DNow! headers after commit a1b30b49ef09bef2e97b9a0622bf7ad622678fee. - - Change-Id: I15ab5e936c71c55f89c3f25777ab27fbd262e9cd - Reviewed-by: Thiago Macieira - -diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h -index 87e26e1..6a32e8f 100644 ---- ./src/corelib/tools/qsimd_p.h -+++ ./src/corelib/tools/qsimd_p.h -@@ -199,7 +199,7 @@ QT_BEGIN_HEADER - #endif - - // 3D now intrinsics --#if defined(QT_HAVE_3DNOW) -+#if defined(QT_HAVE_3DNOW) && (defined(__3dNOW__) || defined(Q_CC_MSVC)) - #include - #endif - diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/graphics/qt4-pixeltool/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/graphics/qt4-pixeltool/Makefile --- /s/freebsd-ports/graphics/qt4-pixeltool/Makefile 2013-08-15 18:12:08.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/graphics/qt4-pixeltool/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -40,7 +40,7 @@ BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: ${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/bin|g' \ diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/graphics/qt4-svg/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/graphics/qt4-svg/Makefile --- /s/freebsd-ports/graphics/qt4-svg/Makefile 2013-08-15 18:12:09.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/graphics/qt4-svg/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -36,7 +36,7 @@ BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: ${MKDIR} ${WRKSRC}/mkspecs diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/graphics/qt4-svg/files/patch-git_ccd1b2ee /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/graphics/qt4-svg/files/patch-git_ccd1b2ee --- /s/freebsd-ports/graphics/qt4-svg/files/patch-git_ccd1b2ee 2013-05-16 01:11:14.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/graphics/qt4-svg/files/patch-git_ccd1b2ee 1970-01-01 02:00:00.000000000 +0200 @@ -1,35 +0,0 @@ -commit ccd1b2ee01c193cd157978c1f9f08f87d0f9c94b -Author: Raphael Kubo da Costa -Date: Fri May 10 01:40:23 2013 +0300 - - Check that 3DNow! instructions are supported before including mm3dnow.h. - - Include mm3dnow.h the way we already include the (S)SSE{3,4} and AVX - instruction headers: by checking that the compiler is set to support those - instructions besides verifying that QT_HAVE_3DNOW evalues to true (which - only means the compiler supported them when the build was being configured). - - This has not caused a problem in most cases so far because GCC protects its - mm3dnow.h header with an #ifdef __3dNOW__ (contrary to what it does on, say, - pmmintrin.h). clang's mm3dnow.h, on the other hand, does not have that check - and can fail if -march is set to, for example, i386 or i486. - - Not backported from qt5 because qtbase because qsimd_p.h does not include - the 3DNow! headers after commit a1b30b49ef09bef2e97b9a0622bf7ad622678fee. - - Change-Id: I15ab5e936c71c55f89c3f25777ab27fbd262e9cd - Reviewed-by: Thiago Macieira - -diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h -index 87e26e1..6a32e8f 100644 ---- ./src/corelib/tools/qsimd_p.h -+++ ./src/corelib/tools/qsimd_p.h -@@ -199,7 +199,7 @@ QT_BEGIN_HEADER - #endif - - // 3D now intrinsics --#if defined(QT_HAVE_3DNOW) -+#if defined(QT_HAVE_3DNOW) && (defined(__3dNOW__) || defined(Q_CC_MSVC)) - #include - #endif - diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/japanese/qt4-codecs-jp/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/japanese/qt4-codecs-jp/Makefile --- /s/freebsd-ports/japanese/qt4-codecs-jp/Makefile 2013-04-29 23:36:11.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/japanese/qt4-codecs-jp/Makefile 2013-07-10 11:17:39.000000000 +0300 @@ -37,7 +37,7 @@ BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME}/jp INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: ${MKDIR} ${WRKSRC}/mkspecs diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/korean/qt4-codecs-kr/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/korean/qt4-codecs-kr/Makefile --- /s/freebsd-ports/korean/qt4-codecs-kr/Makefile 2013-04-29 23:36:01.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/korean/qt4-codecs-kr/Makefile 2013-07-10 11:17:38.000000000 +0300 @@ -36,7 +36,7 @@ BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME}/kr INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: ${MKDIR} ${WRKSRC}/mkspecs diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/misc/qt4-doc/pkg-plist /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/misc/qt4-doc/pkg-plist --- /s/freebsd-ports/misc/qt4-doc/pkg-plist 2013-03-25 21:44:33.000000000 +0200 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/misc/qt4-doc/pkg-plist 2013-09-02 01:48:24.000000000 +0300 @@ -3078,7 +3078,6 @@ %%DOCSDIR%%/html/images/qvbox-m.png %%DOCSDIR%%/html/images/qvboxlayout-with-5-children.png %%DOCSDIR%%/html/images/qwebview-diagram.png -%%DOCSDIR%%/html/images/qwebview-url.png %%DOCSDIR%%/html/images/qwindowsstyle.png %%DOCSDIR%%/html/images/qwindowsxpstyle.png %%DOCSDIR%%/html/images/qwsserver_keyboardfilter.png @@ -7364,7 +7363,6 @@ %%DOCSDIR%%/html/stylesheet.html %%DOCSDIR%%/html/supported-platforms.html %%DOCSDIR%%/html/symbian-platform-security-requirements.html -%%DOCSDIR%%/html/symbian-support.html %%DOCSDIR%%/html/symbian-with-qt-introduction.html %%DOCSDIR%%/html/symbianexceptionsafety.html %%DOCSDIR%%/html/technology-apis.html diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/misc/qt4-qtconfig/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/misc/qt4-qtconfig/Makefile --- /s/freebsd-ports/misc/qt4-qtconfig/Makefile 2013-04-29 23:36:11.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/misc/qt4-qtconfig/Makefile 2013-07-10 11:17:39.000000000 +0300 @@ -53,7 +53,7 @@ BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: ${REINPLACE_CMD} -e 's|^TARGET.*|TARGET=qtconfig-qt4|g' \ diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/misc/qt4-qtdemo/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/misc/qt4-qtdemo/Makefile --- /s/freebsd-ports/misc/qt4-qtdemo/Makefile 2013-08-15 18:12:06.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/misc/qt4-qtdemo/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -40,7 +40,7 @@ BUILD_WRKSRC= ${WRKSRC}/demos INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure post-patch: ${REINPLACE_CMD} -e '/app +=/s|"assistant"|"assistant-qt4"|' \ diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/multimedia/qt4-multimedia/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/multimedia/qt4-multimedia/Makefile --- /s/freebsd-ports/multimedia/qt4-multimedia/Makefile 2013-08-15 18:12:26.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/multimedia/qt4-multimedia/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -35,7 +35,7 @@ BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: ${MKDIR} ${WRKSRC}/mkspecs diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/net/qt4-network/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/net/qt4-network/Makefile --- /s/freebsd-ports/net/qt4-network/Makefile 2013-08-15 18:12:03.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/net/qt4-network/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -39,7 +39,7 @@ BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: ${MKDIR} ${WRKSRC}/mkspecs diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/textproc/qt4-clucene/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/textproc/qt4-clucene/Makefile --- /s/freebsd-ports/textproc/qt4-clucene/Makefile 2013-08-31 18:00:08.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/textproc/qt4-clucene/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -36,7 +36,7 @@ BUILD_WRKSRC= ${WRKSRC}/tools/assistant/lib/fulltextsearch INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: ${MKDIR} ${WRKSRC}/mkspecs diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/textproc/qt4-xml/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/textproc/qt4-xml/Makefile --- /s/freebsd-ports/textproc/qt4-xml/Makefile 2013-08-31 18:00:08.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/textproc/qt4-xml/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -36,7 +36,7 @@ BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: ${MKDIR} ${WRKSRC}/mkspecs diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/textproc/qt4-xmlpatterns/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/textproc/qt4-xmlpatterns/Makefile --- /s/freebsd-ports/textproc/qt4-xmlpatterns/Makefile 2013-08-31 18:00:08.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/textproc/qt4-xmlpatterns/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -36,7 +36,7 @@ BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: ${MKDIR} ${WRKSRC}/mkspecs diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/textproc/qt4-xmlpatterns-tool/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/textproc/qt4-xmlpatterns-tool/Makefile --- /s/freebsd-ports/textproc/qt4-xmlpatterns-tool/Makefile 2013-08-31 18:00:08.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/textproc/qt4-xmlpatterns-tool/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -35,7 +35,7 @@ BUILD_WRKSRC= ${WRKSRC}/tools/xmlpatterns INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: ${MKDIR} ${WRKSRC}/mkspecs diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/www/qt4-webkit/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/www/qt4-webkit/Makefile --- /s/freebsd-ports/www/qt4-webkit/Makefile 2013-08-15 18:12:15.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/www/qt4-webkit/Makefile 2013-09-08 01:21:10.000000000 +0300 @@ -3,7 +3,6 @@ PORTNAME= webkit DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES?= www PKGNAMEPREFIX= qt4- @@ -40,7 +39,7 @@ CONFIGURE_ARGS+= -I../../../../include/Qt -I../../../../include -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure OPTIONS_DEFINE= GSTREAMER OPTIONS_DEFAULT= GSTREAMER diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/www/qt4-webkit/files/patch-git_ccd1b2ee /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/www/qt4-webkit/files/patch-git_ccd1b2ee --- /s/freebsd-ports/www/qt4-webkit/files/patch-git_ccd1b2ee 2013-05-16 01:11:15.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/www/qt4-webkit/files/patch-git_ccd1b2ee 1970-01-01 02:00:00.000000000 +0200 @@ -1,35 +0,0 @@ -commit ccd1b2ee01c193cd157978c1f9f08f87d0f9c94b -Author: Raphael Kubo da Costa -Date: Fri May 10 01:40:23 2013 +0300 - - Check that 3DNow! instructions are supported before including mm3dnow.h. - - Include mm3dnow.h the way we already include the (S)SSE{3,4} and AVX - instruction headers: by checking that the compiler is set to support those - instructions besides verifying that QT_HAVE_3DNOW evalues to true (which - only means the compiler supported them when the build was being configured). - - This has not caused a problem in most cases so far because GCC protects its - mm3dnow.h header with an #ifdef __3dNOW__ (contrary to what it does on, say, - pmmintrin.h). clang's mm3dnow.h, on the other hand, does not have that check - and can fail if -march is set to, for example, i386 or i486. - - Not backported from qt5 because qtbase because qsimd_p.h does not include - the 3DNow! headers after commit a1b30b49ef09bef2e97b9a0622bf7ad622678fee. - - Change-Id: I15ab5e936c71c55f89c3f25777ab27fbd262e9cd - Reviewed-by: Thiago Macieira - -diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h -index 87e26e1..6a32e8f 100644 ---- ./src/corelib/tools/qsimd_p.h -+++ ./src/corelib/tools/qsimd_p.h -@@ -199,7 +199,7 @@ QT_BEGIN_HEADER - #endif - - // 3D now intrinsics --#if defined(QT_HAVE_3DNOW) -+#if defined(QT_HAVE_3DNOW) && (defined(__3dNOW__) || defined(Q_CC_MSVC)) - #include - #endif - diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/www/qt4-webkit/pkg-plist /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/www/qt4-webkit/pkg-plist --- /s/freebsd-ports/www/qt4-webkit/pkg-plist 2013-03-25 21:46:06.000000000 +0200 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/www/qt4-webkit/pkg-plist 2013-08-03 17:47:34.000000000 +0300 @@ -64,7 +64,7 @@ lib/qt4/libQtWebKit.so lib/qt4/libQtWebKit.so.4 lib/qt4/libQtWebKit.so.4.9 -lib/qt4/libQtWebKit.so.4.9.3 +lib/qt4/libQtWebKit.so.4.9.4 libdata/pkgconfig/QtWebKit.pc share/qt4/mkspecs/modules/qt_webkit_version.pri @dirrmtry share/qt4/mkspecs/modules diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/x11-toolkits/qt4-gui/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/x11-toolkits/qt4-gui/Makefile --- /s/freebsd-ports/x11-toolkits/qt4-gui/Makefile 2013-08-31 18:02:29.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/x11-toolkits/qt4-gui/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -46,7 +46,7 @@ CONFIGURE_ARGS+= -I../../include/QtCore -I../../include/QtGui \ -I../../include/Qt -I../../include -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure FONTSCALE= ${LOCALBASE}/lib/X11/fonts/TTF/luximb.ttf FONTENCOD= ${LOCALBASE}/lib/X11/fonts/encodings/encodings.dir diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/x11-toolkits/qt4-gui/files/patch-git_ccd1b2ee /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/x11-toolkits/qt4-gui/files/patch-git_ccd1b2ee --- /s/freebsd-ports/x11-toolkits/qt4-gui/files/patch-git_ccd1b2ee 2013-05-16 01:11:17.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/x11-toolkits/qt4-gui/files/patch-git_ccd1b2ee 1970-01-01 02:00:00.000000000 +0200 @@ -1,35 +0,0 @@ -commit ccd1b2ee01c193cd157978c1f9f08f87d0f9c94b -Author: Raphael Kubo da Costa -Date: Fri May 10 01:40:23 2013 +0300 - - Check that 3DNow! instructions are supported before including mm3dnow.h. - - Include mm3dnow.h the way we already include the (S)SSE{3,4} and AVX - instruction headers: by checking that the compiler is set to support those - instructions besides verifying that QT_HAVE_3DNOW evalues to true (which - only means the compiler supported them when the build was being configured). - - This has not caused a problem in most cases so far because GCC protects its - mm3dnow.h header with an #ifdef __3dNOW__ (contrary to what it does on, say, - pmmintrin.h). clang's mm3dnow.h, on the other hand, does not have that check - and can fail if -march is set to, for example, i386 or i486. - - Not backported from qt5 because qtbase because qsimd_p.h does not include - the 3DNow! headers after commit a1b30b49ef09bef2e97b9a0622bf7ad622678fee. - - Change-Id: I15ab5e936c71c55f89c3f25777ab27fbd262e9cd - Reviewed-by: Thiago Macieira - -diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h -index 87e26e1..6a32e8f 100644 ---- ./src/corelib/tools/qsimd_p.h -+++ ./src/corelib/tools/qsimd_p.h -@@ -199,7 +199,7 @@ QT_BEGIN_HEADER - #endif - - // 3D now intrinsics --#if defined(QT_HAVE_3DNOW) -+#if defined(QT_HAVE_3DNOW) && (defined(__3dNOW__) || defined(Q_CC_MSVC)) - #include - #endif - diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/x11/qt4-graphicssystems-opengl/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/x11/qt4-graphicssystems-opengl/Makefile --- /s/freebsd-ports/x11/qt4-graphicssystems-opengl/Makefile 2013-08-15 18:12:11.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/x11/qt4-graphicssystems-opengl/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -36,7 +36,7 @@ BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME}/opengl INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: ${MKDIR} ${WRKSRC}/mkspecs diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/x11/qt4-graphicssystems-opengl/files/patch-git_ccd1b2ee /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/x11/qt4-graphicssystems-opengl/files/patch-git_ccd1b2ee --- /s/freebsd-ports/x11/qt4-graphicssystems-opengl/files/patch-git_ccd1b2ee 2013-05-16 01:11:14.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/x11/qt4-graphicssystems-opengl/files/patch-git_ccd1b2ee 1970-01-01 02:00:00.000000000 +0200 @@ -1,35 +0,0 @@ -commit ccd1b2ee01c193cd157978c1f9f08f87d0f9c94b -Author: Raphael Kubo da Costa -Date: Fri May 10 01:40:23 2013 +0300 - - Check that 3DNow! instructions are supported before including mm3dnow.h. - - Include mm3dnow.h the way we already include the (S)SSE{3,4} and AVX - instruction headers: by checking that the compiler is set to support those - instructions besides verifying that QT_HAVE_3DNOW evalues to true (which - only means the compiler supported them when the build was being configured). - - This has not caused a problem in most cases so far because GCC protects its - mm3dnow.h header with an #ifdef __3dNOW__ (contrary to what it does on, say, - pmmintrin.h). clang's mm3dnow.h, on the other hand, does not have that check - and can fail if -march is set to, for example, i386 or i486. - - Not backported from qt5 because qtbase because qsimd_p.h does not include - the 3DNow! headers after commit a1b30b49ef09bef2e97b9a0622bf7ad622678fee. - - Change-Id: I15ab5e936c71c55f89c3f25777ab27fbd262e9cd - Reviewed-by: Thiago Macieira - -diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h -index 87e26e1..6a32e8f 100644 ---- ./src/corelib/tools/qsimd_p.h -+++ ./src/corelib/tools/qsimd_p.h -@@ -199,7 +199,7 @@ QT_BEGIN_HEADER - #endif - - // 3D now intrinsics --#if defined(QT_HAVE_3DNOW) -+#if defined(QT_HAVE_3DNOW) && (defined(__3dNOW__) || defined(Q_CC_MSVC)) - #include - #endif - diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/x11/qt4-inputmethods/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/x11/qt4-inputmethods/Makefile --- /s/freebsd-ports/x11/qt4-inputmethods/Makefile 2013-08-15 18:12:11.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/x11/qt4-inputmethods/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -35,7 +35,7 @@ BUILD_WRKSRC= ${WRKSRC}/src/plugins/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: ${MKDIR} ${WRKSRC}/mkspecs diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/x11/qt4-opengl/Makefile /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/x11/qt4-opengl/Makefile --- /s/freebsd-ports/x11/qt4-opengl/Makefile 2013-08-15 18:12:11.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/x11/qt4-opengl/Makefile 2013-09-07 02:19:13.000000000 +0300 @@ -41,7 +41,7 @@ CONFIGURE_ARGS+= -I../../include/QtCore -I../../include/QtGui \ -I../../include/Qt -I../../include -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +EXTRA_PATCHES+= ${.CURDIR}/../../devel/qt4/files/patch-configure pre-configure: ${MKDIR} ${WRKSRC}/mkspecs diff -Nru -I '$FreeBSD.*$' /s/freebsd-ports/x11/qt4-opengl/files/patch-git_ccd1b2ee /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/x11/qt4-opengl/files/patch-git_ccd1b2ee --- /s/freebsd-ports/x11/qt4-opengl/files/patch-git_ccd1b2ee 2013-05-16 01:11:14.000000000 +0300 +++ /usr/home/rakuco/dev/freebsd/area51/trunk/area51/QT/x11/qt4-opengl/files/patch-git_ccd1b2ee 1970-01-01 02:00:00.000000000 +0200 @@ -1,35 +0,0 @@ -commit ccd1b2ee01c193cd157978c1f9f08f87d0f9c94b -Author: Raphael Kubo da Costa -Date: Fri May 10 01:40:23 2013 +0300 - - Check that 3DNow! instructions are supported before including mm3dnow.h. - - Include mm3dnow.h the way we already include the (S)SSE{3,4} and AVX - instruction headers: by checking that the compiler is set to support those - instructions besides verifying that QT_HAVE_3DNOW evalues to true (which - only means the compiler supported them when the build was being configured). - - This has not caused a problem in most cases so far because GCC protects its - mm3dnow.h header with an #ifdef __3dNOW__ (contrary to what it does on, say, - pmmintrin.h). clang's mm3dnow.h, on the other hand, does not have that check - and can fail if -march is set to, for example, i386 or i486. - - Not backported from qt5 because qtbase because qsimd_p.h does not include - the 3DNow! headers after commit a1b30b49ef09bef2e97b9a0622bf7ad622678fee. - - Change-Id: I15ab5e936c71c55f89c3f25777ab27fbd262e9cd - Reviewed-by: Thiago Macieira - -diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h -index 87e26e1..6a32e8f 100644 ---- ./src/corelib/tools/qsimd_p.h -+++ ./src/corelib/tools/qsimd_p.h -@@ -199,7 +199,7 @@ QT_BEGIN_HEADER - #endif - - // 3D now intrinsics --#if defined(QT_HAVE_3DNOW) -+#if defined(QT_HAVE_3DNOW) && (defined(__3dNOW__) || defined(Q_CC_MSVC)) - #include - #endif -