Index: Mk/bsd.qt.mk =================================================================== RCS file: /home/pcvs/ports/Mk/bsd.qt.mk,v retrieving revision 1.12 diff -u -u -r1.12 bsd.qt.mk --- Mk/bsd.qt.mk 14 Feb 2009 22:58:49 -0000 1.12 +++ Mk/bsd.qt.mk 5 Jul 2009 14:11:55 -0000 @@ -21,11 +21,12 @@ .if defined(QT_DIST) #CONFLICTS+= Currently there are no conflicts \o/ -CONFIGURE_ARGS+=-fast ${CUPS} -platform ${QMAKESPEC} \ +CONFIGURE_ARGS+=-fast -platform ${QMAKESPEC} \ -L${PREFIX}/${QT_LIBDIR_REL} \ -qt-gif -system-libjpeg -system-libpng \ -system-libmng -system-libtiff -system-zlib \ - -confirm-license \ + -opensource -confirm-license \ + -no-pch \ -prefix ${PREFIX} \ -bindir ${PREFIX}/bin \ -libdir ${PREFIX}/${QT_LIBDIR_REL} \ @@ -42,9 +43,9 @@ CONFIGURE_ARGS+=-no-mmx -no-3dnow -no-sse -no-sse2 .endif #defined(PACKAGE_BUILDING) -.if defined(PORTNAME) && ${PORTNAME} != "xmlpatterns" -CONFIGURE_ARGS+=-no-exceptions -.endif +# .if defined(PORTNAME) && ${PORTNAME} != "xmlpatterns" +# CONFIGURE_ARGS+=-no-exceptions +# .endif .if defined(WANT_QT_DEBUG) CONFIGURE_ARGS+=-debug @@ -94,14 +95,14 @@ # QT4 version # Don't forget to update ${PORTSDIR}/devel/qt4/files/configure ! # -QT4_VERSION?= 4.4.3 +QT4_VERSION?= 4.5.2 _QT_COMPONENTS_ALL= accessible assistant assistant-adp assistantclient \ clucene codecs-cn codecs-jp codecs-kr codecs-tw corelib \ dbus designer doc help help-tools gui iconengines imageformats \ inputmethods linguist l10n makeqpf moc network opengl \ pixeltool porting phonon phonon-gst qdbusviewer \ - qmake qt3support qtconfig qtestlib qvfb rcc script \ + qmake qt3support qtconfig qtestlib qvfb rcc script scripttools \ sql svg uic uic3 webkit xml xmlpatterns xmlpatterns-tool accessible_DEPENDS= accessibility/qt4-accessible @@ -142,6 +143,7 @@ qvfb_DEPENDS= devel/qt4-qvfb rcc_DEPENDS= devel/qt4-rcc script_DEPENDS= devel/qt4-script +scripttools_DEPENDS= devel/qt4-scripttools sql_DEPENDS= databases/qt4-sql svg_DEPENDS= graphics/qt4-svg uic_DEPENDS= devel/qt4-uic @@ -151,104 +153,12 @@ xmlpatterns_DEPENDS= textproc/qt4-xmlpatterns xmlpatterns-tool_DEPENDS= textproc/qt4-xmlpatterns-tool -accessible_build_DEPENDS= ${accessible_DEPENDS} -assistant_build_DEPENDS= ${assistant_DEPENDS} -assistant-adp_build_DEPENDS= ${assistant-adp_DEPENDS} -assistantclient_build_DEPENDS= ${assistantclient_DEPENDS} -assistantclient_build_NAME= ${assistantclient_NAME} -clucene_build_DEPENDS= ${clucene_DEPENDS} -codecs-cn_build_DEPENDS= ${codecs-cn_DEPENDS} -codecs-jp_build_DEPENDS= ${codecs-jp_DEPENDS} -codecs-kr_build_DEPENDS= ${codecs-kr_DEPENDS} -codecs-tw_build_DEPENDS= ${codecs-tw_DEPENDS} -corelib_build_DEPENDS= ${corelib_DEPENDS} -dbus_build_DEPENDS= ${dbus_DEPENDS} -designer_build_DEPENDS= ${designer_DEPENDS} -doc_build_DEPENDS= ${doc_DEPENDS} -gui_build_DEPENDS= ${gui_DEPENDS} -help_build_DEPENDS= ${help_DEPENDS} -help-tools_build_DEPENDS= ${help-tools_DEPENDS} -iconengines_build_DEPENDS= ${iconengines_DEPENDS} -imageformats_build_DEPENDS= ${imageformats_DEPENDS} -inputmethods_build_DEPENDS= ${inputmethods_DEPENDS} -linguist_build_DEPENDS= ${linguist_DEPENDS} -l10n_build_DEPENDS= ${l10n_DEPENDS} -makeqpf_build_DEPENDS= ${makeqpf_DEPENDS} -moc_build_DEPENDS= ${moc_DEPENDS} -network_build_DEPENDS= ${network_DEPENDS} -opengl_build_DEPENDS= ${opengl_DEPENDS} -pixeltool_build_DEPENDS= ${pixeltool_DEPENDS} -phonon_build_DEPENDS= ${phonon_DEPENDS} -phonon-gst_build_DEPENDS= ${phonon-gst_DEPENDS} -porting_build_DEPENDS= ${porting_DEPENDS} -qdbusviewer_build_DEPENDS= ${qdbusviewer_DEPENDS} -qmake_build_DEPENDS= ${qmake_DEPENDS} -qt3support_build_DEPENDS= ${qt3support_DEPENDS} -qtconfig_build_DEPENDS= ${qtconfig_DEPENDS} -qtestlib_build_DEPENDS= ${qtestlib_DEPENDS} -qvfb_build_DEPENDS= ${qvfb_DEPENDS} -rcc_build_DEPENDS= ${rcc_DEPENDS} -script_build_DEPENDS= ${script_DEPENDS} -sql_build_DEPENDS= ${sql_DEPENDS} -svg_build_DEPENDS= ${svg_DEPENDS} -uic_build_DEPENDS= ${uic_DEPENDS} -uic3_build_DEPENDS= ${uic3_DEPENDS} -webkit_build_DEPENDS= ${webkit_DEPENDS} -xml_build_DEPENDS= ${xml_DEPENDS} -xmlpatterns_build_DEPENDS= ${xmlpatterns_DEPENDS} -xmlpatterns-tool_build_DEPENDS= ${xmlpatterns-tool_DEPENDS} - -accessible_run_DEPENDS= ${accessible_DEPENDS} -assistant_run_DEPENDS= ${assistant_DEPENDS} -assistant-adp_run_DEPENDS= ${assistant-adp_DEPENDS} -assistantclient_run_DEPENDS= ${assistantclient_DEPENDS} -assistantclient_run_NAME= ${assistantclient_NAME} -clucene_run_DEPENDS= ${clucene_DEPENDS} -codecs-cn_run_DEPENDS= ${codecs-cn_DEPENDS} -codecs-jp_run_DEPENDS= ${codecs-jp_DEPENDS} -codecs-kr_run_DEPENDS= ${codecs-kr_DEPENDS} -codecs-tw_run_DEPENDS= ${codecs-tw_DEPENDS} -corelib_run_DEPENDS= ${corelib_DEPENDS} -dbus_run_DEPENDS= ${dbus_DEPENDS} -designer_run_DEPENDS= ${designer_DEPENDS} -doc_run_DEPENDS= ${doc_DEPENDS} -gui_run_DEPENDS= ${gui_DEPENDS} -help_run_DEPENDS= ${help_DEPENDS} -help-tools_run_DEPENDS= ${help-tools_DEPENDS} -iconengines_run_DEPENDS= ${iconengines_DEPENDS} -imageformats_run_DEPENDS= ${imageformats_DEPENDS} -inputmethods_run_DEPENDS= ${inputmethods_DEPENDS} -linguist_run_DEPENDS= ${linguist_DEPENDS} -l10n_run_DEPENDS= ${l10n_DEPENDS} -makeqpf_run_DEPENDS= ${makeqpf_DEPENDS} -moc_run_DEPENDS= ${moc_DEPENDS} -network_run_DEPENDS= ${network_DEPENDS} -opengl_run_DEPENDS= ${opengl_DEPENDS} -pixeltool_run_DEPENDS= ${pixeltool_DEPENDS} -phonon_run_DEPENDS= ${phonon_DEPENDS} -phonon-gst_run_DEPENDS= ${phonon-gst_DEPENDS} -porting_run_DEPENDS= ${porting_DEPENDS} -qdbusviewer_run_DEPENDS= ${qdbusviewer_DEPENDS} -qmake_run_DEPENDS= ${qmake_DEPENDS} -qt3support_run_DEPENDS= ${qt3support_DEPENDS} -qtconfig_run_DEPENDS= ${qtconfig_DEPENDS} -qtestlib_run_DEPENDS= ${qtestlib_DEPENDS} -qvfb_run_DEPENDS= ${qvfb_DEPENDS} -rcc_run_DEPENDS= ${rcc_DEPENDS} -script_run_DEPENDS= ${script_DEPENDS} -sql_run_DEPENDS= ${sql_DEPENDS} -svg_run_DEPENDS= ${svg_DEPENDS} -uic_run_DEPENDS= ${uic_DEPENDS} -uic3_run_DEPENDS= ${uic3_DEPENDS} -webkit_run_DEPENDS= ${webkit_DEPENDS} -xml_run_DEPENDS= ${xml_DEPENDS} -xmlpatterns_run_DEPENDS= ${xmlpatterns_DEPENDS} -xmlpatterns-tool_run_DEPENDS= ${xmlpatterns-tool_DEPENDS} - .if defined(_POSTMKINCLUDED) && !defined(Qt_Post_Include) Qt_Post_Include= bsd.qt.mk .for component in ${_QT_COMPONENTS_ALL} +${component}_build_DEPENDS= ${${component}_DEPENDS} +${component}_run_DEPENDS= ${${component}_DEPENDS} _QT_COMPONENTS_SUFFIXED+=${component} ${component}_build ${component}_run .endfor Index: accessibility/qt4-accessible/Makefile =================================================================== RCS file: /home/pcvs/ports/accessibility/qt4-accessible/Makefile,v retrieving revision 1.12 diff -u -u -r1.12 Makefile --- accessibility/qt4-accessible/Makefile 4 Aug 2008 23:30:29 -0000 1.12 +++ accessibility/qt4-accessible/Makefile 24 Apr 2009 10:06:42 -0000 @@ -3,7 +3,7 @@ # Date created: Wed Jun 29 11:49:42 CEST 2005 # Whom: lofi@freebsd.org # -# $FreeBSD: ports/accessibility/qt4-accessible/Makefile,v 1.12 2008/08/04 23:30:29 miwi Exp $ +# $FreeBSD$ # PORTNAME= accessible @@ -22,6 +22,7 @@ QT_COMPONENTS= qmake_build moc_build qt3support corelib gui network sql xml QT_NONSTANDARD= yes QT_DIST= yes +MAKE_JOBS_SAVE= yes HAS_CONFIGURE= yes Index: accessibility/qt4-accessible/distinfo =================================================================== RCS file: /home/pcvs/ports/accessibility/qt4-accessible/distinfo,v retrieving revision 1.7 diff -u -u -r1.7 distinfo --- accessibility/qt4-accessible/distinfo 13 Jan 2009 20:34:39 -0000 1.7 +++ accessibility/qt4-accessible/distinfo 28 Jun 2009 13:11:45 -0000 @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0 -SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6 -SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803 +MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550 +SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2 +SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421 Index: chinese/qt4-codecs-cn/Makefile =================================================================== RCS file: /home/pcvs/ports/chinese/qt4-codecs-cn/Makefile,v retrieving revision 1.9 diff -u -u -r1.9 Makefile --- chinese/qt4-codecs-cn/Makefile 4 Aug 2008 23:30:29 -0000 1.9 +++ chinese/qt4-codecs-cn/Makefile 24 Apr 2009 10:06:46 -0000 @@ -3,7 +3,7 @@ # Date created: Wed Jun 29 11:49:42 CEST 2005 # Whom: lofi@freebsd.org # -# $FreeBSD: ports/chinese/qt4-codecs-cn/Makefile,v 1.9 2008/08/04 23:30:29 miwi Exp $ +# $FreeBSD$ # PORTNAME= codecs Index: chinese/qt4-codecs-cn/distinfo =================================================================== RCS file: /home/pcvs/ports/chinese/qt4-codecs-cn/distinfo,v retrieving revision 1.7 diff -u -u -r1.7 distinfo --- chinese/qt4-codecs-cn/distinfo 13 Jan 2009 20:34:39 -0000 1.7 +++ chinese/qt4-codecs-cn/distinfo 28 Jun 2009 13:12:54 -0000 @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0 -SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6 -SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803 +MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550 +SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2 +SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421 Index: chinese/qt4-codecs-tw/Makefile =================================================================== RCS file: /home/pcvs/ports/chinese/qt4-codecs-tw/Makefile,v retrieving revision 1.10 diff -u -u -r1.10 Makefile --- chinese/qt4-codecs-tw/Makefile 4 Aug 2008 23:30:30 -0000 1.10 +++ chinese/qt4-codecs-tw/Makefile 7 May 2009 15:48:33 -0000 @@ -3,7 +3,7 @@ # Date created: Wed Jun 29 11:49:42 CEST 2005 # Whom: lofi@freebsd.org # -# $FreeBSD: ports/chinese/qt4-codecs-tw/Makefile,v 1.10 2008/08/04 23:30:30 miwi Exp $ +# $FreeBSD$ # PORTNAME= codecs @@ -30,7 +30,7 @@ MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \ PATH=${WRKSRC}/bin:$$PATH -DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ +DO_NOT_EXTRACT= demos doc examples qmake tools translations \ src/dbus src/gui src/network src/opengl src/phonon \ src/qt3support src/script src/sql src/svg src/testlib \ src/tools src/xml src/xmlpatterns src/3rdparty/clucene \ @@ -48,4 +48,7 @@ ${MKDIR} ${WRKSRC}/../../../mkspecs ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../../../bin/qmake +post-configure: + ${REINPLACE_CMD} -e 's|(test -z.*||g' ${WRKSRC}/Makefile + .include Index: chinese/qt4-codecs-tw/distinfo =================================================================== RCS file: /home/pcvs/ports/chinese/qt4-codecs-tw/distinfo,v retrieving revision 1.7 diff -u -u -r1.7 distinfo --- chinese/qt4-codecs-tw/distinfo 13 Jan 2009 20:34:39 -0000 1.7 +++ chinese/qt4-codecs-tw/distinfo 28 Jun 2009 13:13:01 -0000 @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0 -SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6 -SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803 +MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550 +SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2 +SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421 Index: databases/qt4-ibase-plugin/Makefile =================================================================== RCS file: /home/pcvs/ports/databases/qt4-ibase-plugin/Makefile,v retrieving revision 1.11 diff -u -u -r1.11 Makefile --- databases/qt4-ibase-plugin/Makefile 4 Aug 2008 23:30:30 -0000 1.11 +++ databases/qt4-ibase-plugin/Makefile 5 Jul 2009 14:11:57 -0000 @@ -3,7 +3,7 @@ # Date created: 27 February 2004 # Whom: Michael Nottebrock # -# $FreeBSD: ports/databases/qt4-ibase-plugin/Makefile,v 1.11 2008/08/04 23:30:30 miwi Exp $ +# $FreeBSD$ # PORTNAME= qt4-${DB}-plugin @@ -22,6 +22,7 @@ USE_QT_VER= 4 QT_COMPONENTS= moc_build sql QT_NONSTANDARD= yes +MAKE_JOBS_SAFE= yes DRIVER= src/sql/drivers/${DB} PLUGIN= src/plugins/sqldrivers/${DB} @@ -33,7 +34,9 @@ MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \ PLUGIN="${PLUGIN}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" + PTHREAD_LIBS="${PTHREAD_LIBS}" \ + QT_INCDIR="${QT_INCDIR}" \ + QT_LIBDIR="${QT_LIBDIR}" PLIST_SUB= DB=${DB} .include Index: databases/qt4-ibase-plugin/distinfo =================================================================== RCS file: /home/pcvs/ports/databases/qt4-ibase-plugin/distinfo,v retrieving revision 1.7 diff -u -u -r1.7 distinfo --- databases/qt4-ibase-plugin/distinfo 13 Jan 2009 20:34:39 -0000 1.7 +++ databases/qt4-ibase-plugin/distinfo 28 Jun 2009 13:13:35 -0000 @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0 -SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6 -SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803 +MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550 +SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2 +SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421 Index: databases/qt4-ibase-plugin/files/Makefile.bsd =================================================================== RCS file: /home/pcvs/ports/databases/qt4-ibase-plugin/files/Makefile.bsd,v retrieving revision 1.4 diff -u -u -r1.4 Makefile.bsd --- databases/qt4-ibase-plugin/files/Makefile.bsd 4 Aug 2008 23:30:30 -0000 1.4 +++ databases/qt4-ibase-plugin/files/Makefile.bsd 5 Jul 2009 14:11:57 -0000 @@ -2,14 +2,15 @@ VPATH= ${PLUGIN}:${DRIVER} CXXFLAGS+= -I${DRIVER} -Iinclude \ - -I${PREFIX}/include/qt4 \ - -I${PREFIX}/include/qt4/Qt \ + -I${QT_INCDIR} \ + -I${QT_INCDIR}/Qt \ + -I${QT_INCDIR}/QtCore \ -I${LOCALBASE}/include \ ${PTHREAD_CFLAGS} -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${PREFIX}/lib/qt4 -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lgds +LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lgds SRCS= main.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp LIBDIR= ${PREFIX}/lib/qt4/plugins/sqldrivers Index: databases/qt4-mysql-plugin/Makefile =================================================================== RCS file: /home/pcvs/ports/databases/qt4-mysql-plugin/Makefile,v retrieving revision 1.10 diff -u -u -r1.10 Makefile --- databases/qt4-mysql-plugin/Makefile 4 Aug 2008 23:30:30 -0000 1.10 +++ databases/qt4-mysql-plugin/Makefile 5 Jul 2009 14:11:57 -0000 @@ -3,7 +3,7 @@ # Date created: 20 April 2003 # Whom: Kay Lehmann # -# $FreeBSD: ports/databases/qt4-mysql-plugin/Makefile,v 1.10 2008/08/04 23:30:30 miwi Exp $ +# $FreeBSD$ # PORTNAME= qt4-${DB}-plugin @@ -21,6 +21,7 @@ USE_QT_VER= 4 QT_COMPONENTS= moc_build sql QT_NONSTANDARD= yes +MAKE_JOBS_SAFE= yes USE_MYSQL= yes DRIVER= src/sql/drivers/${DB} @@ -32,7 +33,9 @@ MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \ PLUGIN="${PLUGIN}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" + PTHREAD_LIBS="${PTHREAD_LIBS}" \ + QT_INCDIR="${QT_INCDIR}" \ + QT_LIBDIR="${QT_LIBDIR}" PLIST_SUB= DB=${DB} .include Index: databases/qt4-mysql-plugin/distinfo =================================================================== RCS file: /home/pcvs/ports/databases/qt4-mysql-plugin/distinfo,v retrieving revision 1.7 diff -u -u -r1.7 distinfo --- databases/qt4-mysql-plugin/distinfo 13 Jan 2009 20:34:39 -0000 1.7 +++ databases/qt4-mysql-plugin/distinfo 28 Jun 2009 13:13:32 -0000 @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0 -SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6 -SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803 +MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550 +SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2 +SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421 Index: databases/qt4-mysql-plugin/files/Makefile.bsd =================================================================== RCS file: /home/pcvs/ports/databases/qt4-mysql-plugin/files/Makefile.bsd,v retrieving revision 1.4 diff -u -u -r1.4 Makefile.bsd --- databases/qt4-mysql-plugin/files/Makefile.bsd 4 Aug 2008 23:30:31 -0000 1.4 +++ databases/qt4-mysql-plugin/files/Makefile.bsd 5 Jul 2009 14:11:57 -0000 @@ -2,15 +2,15 @@ VPATH= ${PLUGIN}:${DRIVER} CXXFLAGS+= -I${DRIVER} \ - -I${PREFIX}/include/qt4 \ - -I${PREFIX}/include/qt4/Qt \ + -I${QT_INCDIR} \ + -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_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_SHARED -LDADD= -L${PREFIX}/lib/qt4 -L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql ${PTHREAD_LIBS} -lQtSql -lmysqlclient_r +LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql ${PTHREAD_LIBS} -lQtSql -lmysqlclient_r MOC?= ${LOCALBASE}/bin/moc-qt4 -SRCS= main.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp +SRCS= main.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp qsql_${DB}.moc LIBDIR= ${PREFIX}/lib/qt4/plugins/sqldrivers @@ -20,6 +20,9 @@ moc_qsql_${DB}.cpp: qsql_${DB}.h $(MOC) $(.ALLSRC) -o $(.TARGET) +qsql_${DB}.moc: qsql_${DB}.cpp + $(MOC) $(.ALLSRC) -o ${DRIVER}/$(.TARGET) + beforeinstall: ${LIBDIR} .include Index: databases/qt4-odbc-plugin/Makefile =================================================================== RCS file: /home/pcvs/ports/databases/qt4-odbc-plugin/Makefile,v retrieving revision 1.12 diff -u -u -r1.12 Makefile --- databases/qt4-odbc-plugin/Makefile 27 Jan 2009 05:13:10 -0000 1.12 +++ databases/qt4-odbc-plugin/Makefile 5 Jul 2009 14:11:57 -0000 @@ -3,12 +3,11 @@ # Date created: 31 December 2003 # Whom: Michael Nottebrock # -# $FreeBSD: ports/databases/qt4-odbc-plugin/Makefile,v 1.12 2009/01/27 05:13:10 fjoe Exp $ +# $FreeBSD$ # PORTNAME= qt4-${DB}-plugin PORTVERSION= ${QT4_VERSION} -PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_QT} DISTNAME= qt-x11-opensource-src-${PORTVERSION} @@ -20,11 +19,11 @@ DB= odbc LIB_DEPENDS+= odbc:${PORTSDIR}/databases/unixODBC -BUILD_DEPENDS= unixODBC>=2.2.14_1:${PORTSDIR}/databases/unixODBC USE_QT_VER= 4 QT_COMPONENTS= moc_build sql QT_NONSTANDARD= yes +MAKE_JOBS_SAFE= yes DRIVER= src/sql/drivers/${DB} PLUGIN= src/plugins/sqldrivers/${DB} @@ -35,7 +34,9 @@ MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \ PLUGIN="${PLUGIN}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" + PTHREAD_LIBS="${PTHREAD_LIBS}" \ + QT_INCDIR="${QT_INCDIR}" \ + QT_LIBDIR="${QT_LIBDIR}" PLIST_SUB= DB=${DB} .include Index: databases/qt4-odbc-plugin/distinfo =================================================================== RCS file: /home/pcvs/ports/databases/qt4-odbc-plugin/distinfo,v retrieving revision 1.7 diff -u -u -r1.7 distinfo --- databases/qt4-odbc-plugin/distinfo 13 Jan 2009 20:34:40 -0000 1.7 +++ databases/qt4-odbc-plugin/distinfo 28 Jun 2009 13:13:37 -0000 @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0 -SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6 -SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803 +MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550 +SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2 +SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421 Index: databases/qt4-odbc-plugin/files/Makefile.bsd =================================================================== RCS file: /home/pcvs/ports/databases/qt4-odbc-plugin/files/Makefile.bsd,v retrieving revision 1.4 diff -u -u -r1.4 Makefile.bsd --- databases/qt4-odbc-plugin/files/Makefile.bsd 4 Aug 2008 23:30:31 -0000 1.4 +++ databases/qt4-odbc-plugin/files/Makefile.bsd 5 Jul 2009 14:11:57 -0000 @@ -2,13 +2,15 @@ VPATH= ${PLUGIN}:${DRIVER} CXXFLAGS+= -I${DRIVER} \ - -I${PREFIX}/include/qt4 \ - -I${PREFIX}/include/qt4/Qt \ + -I${QT_INCDIR} \ + -I${QT_INCDIR}/Qt \ + -I${QT_INCDIR}/QtCore \ + -I${QT_INCDIR}/QtSql \ -I${LOCALBASE}/include \ ${PTHREAD_CFLAGS} -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${PREFIX}/lib/qt4 -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lodbc +LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lodbc MOC?= ${LOCALBASE}/bin/moc-qt4 SRCS= main.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp Index: databases/qt4-odbc-plugin/files/patch-src-sql-drivers-odbc-qsql_odbc.cpp =================================================================== RCS file: databases/qt4-odbc-plugin/files/patch-src-sql-drivers-odbc-qsql_odbc.cpp diff -N databases/qt4-odbc-plugin/files/patch-src-sql-drivers-odbc-qsql_odbc.cpp --- databases/qt4-odbc-plugin/files/patch-src-sql-drivers-odbc-qsql_odbc.cpp 27 Jan 2009 05:13:10 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ ---- src/sql/drivers/odbc/qsql_odbc.cpp.orig 2009-01-27 00:11:47.000000000 +0600 -+++ src/sql/drivers/odbc/qsql_odbc.cpp 2009-01-27 00:12:12.000000000 +0600 -@@ -64,17 +64,8 @@ - #endif - - // newer platform SDKs use SQLLEN instead of SQLINTEGER --#if defined(SQLLEN) || defined(Q_OS_WIN64) - # define QSQLLEN SQLLEN --#else --# define QSQLLEN SQLINTEGER --#endif -- --#if defined(SQLULEN) || defined(Q_OS_WIN64) - # define QSQLULEN SQLULEN --#else --# define QSQLULEN SQLUINTEGER --#endif - - static const int COLNAMESIZE = 256; - //Map Qt parameter types to ODBC types Index: databases/qt4-pgsql-plugin/Makefile =================================================================== RCS file: /home/pcvs/ports/databases/qt4-pgsql-plugin/Makefile,v retrieving revision 1.10 diff -u -u -r1.10 Makefile --- databases/qt4-pgsql-plugin/Makefile 4 Aug 2008 23:30:31 -0000 1.10 +++ databases/qt4-pgsql-plugin/Makefile 5 Jul 2009 14:11:57 -0000 @@ -3,7 +3,7 @@ # Date created: 5 August 2003 # Whom: Lauri Watts # -# $FreeBSD: ports/databases/qt4-pgsql-plugin/Makefile,v 1.10 2008/08/04 23:30:31 miwi Exp $ +# $FreeBSD$ # PORTNAME= qt4-${DB}-plugin @@ -21,6 +21,7 @@ USE_QT_VER= 4 QT_COMPONENTS= moc_build sql QT_NONSTANDARD= yes +MAKE_JOBS_SAFE= yes USE_PGSQL= yes DRIVER= src/sql/drivers/${DB} @@ -32,7 +33,9 @@ MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \ PLUGIN="${PLUGIN}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" + PTHREAD_LIBS="${PTHREAD_LIBS}" \ + QT_INCDIR="${QT_INCDIR}" \ + QT_LIBDIR="${QT_LIBDIR}" PLIST_SUB= DB=${DB} .include Index: databases/qt4-pgsql-plugin/distinfo =================================================================== RCS file: /home/pcvs/ports/databases/qt4-pgsql-plugin/distinfo,v retrieving revision 1.7 diff -u -u -r1.7 distinfo --- databases/qt4-pgsql-plugin/distinfo 13 Jan 2009 20:34:40 -0000 1.7 +++ databases/qt4-pgsql-plugin/distinfo 28 Jun 2009 13:13:40 -0000 @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0 -SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6 -SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803 +MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550 +SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2 +SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421 Index: databases/qt4-pgsql-plugin/files/Makefile.bsd =================================================================== RCS file: /home/pcvs/ports/databases/qt4-pgsql-plugin/files/Makefile.bsd,v retrieving revision 1.5 diff -u -u -r1.5 Makefile.bsd --- databases/qt4-pgsql-plugin/files/Makefile.bsd 4 Aug 2008 23:30:31 -0000 1.5 +++ databases/qt4-pgsql-plugin/files/Makefile.bsd 5 Jul 2009 14:11:57 -0000 @@ -2,15 +2,15 @@ VPATH= ${PLUGIN}:${DRIVER} CXXFLAGS+= -I${DRIVER} \ - -I${PREFIX}/include/qt4 \ - -I${PREFIX}/include/qt4/Qt \ + -I${QT_INCDIR} \ + -I${QT_INCDIR}/Qt \ -I${LOCALBASE}/include/postgresql/server \ -I${LOCALBASE}/include -I${X11BASE}/include \ ${PTHREAD_CFLAGS} -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${PREFIX}/lib/qt4 -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lpq +LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lpq SRCS= main.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp LIBDIR= ${PREFIX}/lib/qt4/plugins/sqldrivers Index: databases/qt4-sql/Makefile =================================================================== RCS file: /home/pcvs/ports/databases/qt4-sql/Makefile,v retrieving revision 1.12 diff -u -u -r1.12 Makefile --- databases/qt4-sql/Makefile 4 Aug 2008 23:30:30 -0000 1.12 +++ databases/qt4-sql/Makefile 24 Apr 2009 10:06:42 -0000 @@ -3,7 +3,7 @@ # Date created: Wed Jun 29 11:49:42 CEST 2005 # Whom: lofi@freebsd.org # -# $FreeBSD: ports/databases/qt4-sql/Makefile,v 1.12 2008/08/04 23:30:30 miwi Exp $ +# $FreeBSD$ # PORTNAME= sql @@ -22,6 +22,7 @@ QT_COMPONENTS= qmake_build moc_build corelib QT_NONSTANDARD= yes QT_DIST= yes +MAKE_JOBS_SAVE= yes HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/lib/qt4 Index: databases/qt4-sql/distinfo =================================================================== RCS file: /home/pcvs/ports/databases/qt4-sql/distinfo,v retrieving revision 1.7 diff -u -u -r1.7 distinfo --- databases/qt4-sql/distinfo 13 Jan 2009 20:34:40 -0000 1.7 +++ databases/qt4-sql/distinfo 28 Jun 2009 13:11:47 -0000 @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0 -SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6 -SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803 +MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550 +SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2 +SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421 Index: databases/qt4-sql/pkg-plist =================================================================== RCS file: /home/pcvs/ports/databases/qt4-sql/pkg-plist,v retrieving revision 1.9 diff -u -u -r1.9 pkg-plist --- databases/qt4-sql/pkg-plist 13 Jan 2009 20:34:40 -0000 1.9 +++ databases/qt4-sql/pkg-plist 28 Jun 2009 15:21:55 -0000 @@ -1,5 +1,8 @@ include/qt4/Qt/QtSql include/qt4/Qt/qsql.h +include/qt4/Qt/qsql_db2.h +include/qt4/Qt/qsql_oci.h +include/qt4/Qt/qsql_tds.h include/qt4/Qt/qsql_ibase.h include/qt4/Qt/qsql_mysql.h include/qt4/Qt/qsql_odbc.h @@ -52,6 +55,15 @@ include/qt4/QtSql/qsql.h include/qt4/QtSql/qsql_ibase.h include/qt4/QtSql/qsql_mysql.h +include/qt4/QtSql/qsql_db2.h +include/qt4/QtSql/qsql_oci.h +include/qt4/QtSql/qsql_tds.h +include/qt4/QtSql/QDB2Result +include/qt4/QtSql/QDB2Driver +include/qt4/QtSql/QOCIResult +include/qt4/QtSql/QOCIDriver +include/qt4/QtSql/QTDSResult +include/qt4/QtSql/QTDSDriver include/qt4/QtSql/qsql_odbc.h include/qt4/QtSql/qsql_psql.h include/qt4/QtSql/qsql_sqlite.h @@ -73,9 +85,9 @@ lib/qt4/libQtSql.prl lib/qt4/libQtSql.so lib/qt4/libQtSql.so.4 -lib/qt4/libQtSql.so.4.4 -lib/qt4/libQtSql.so.4.4.3 -%%DEBUG%%lib/qt4/libQtSql.so.4.4.3.debug +lib/qt4/libQtSql.so.4.5 +lib/qt4/libQtSql.so.4.5.2 +%%DEBUG%%lib/qt4/libQtSql.so.4.5.2.debug libdata/pkgconfig/QtSql.pc @dirrm include/qt4/QtSql @dirrmtry include/qt4/Qt Index: databases/qt4-sqlite-plugin/Makefile =================================================================== RCS file: /home/pcvs/ports/databases/qt4-sqlite-plugin/Makefile,v retrieving revision 1.10 diff -u -u -r1.10 Makefile --- databases/qt4-sqlite-plugin/Makefile 4 Aug 2008 23:30:31 -0000 1.10 +++ databases/qt4-sqlite-plugin/Makefile 5 Jul 2009 14:11:57 -0000 @@ -3,7 +3,7 @@ # Date created: 27 February 2004 # Whom: Michael Nottebrock # -# $FreeBSD: ports/databases/qt4-sqlite-plugin/Makefile,v 1.10 2008/08/04 23:30:31 miwi Exp $ +# $FreeBSD$ # PORTNAME= qt4-${DB}-plugin @@ -23,6 +23,7 @@ USE_QT_VER= 4 QT_COMPONENTS= moc_build sql QT_NONSTANDARD= yes +MAKE_JOBS_SAFE= yes DRIVER= src/sql/drivers/${DB} PLUGIN= src/plugins/sqldrivers/${DB} @@ -34,7 +35,9 @@ MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \ PLUGIN="${PLUGIN}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" + PTHREAD_LIBS="${PTHREAD_LIBS}" \ + QT_INCDIR="${QT_INCDIR}" \ + QT_LIBDIR="${QT_LIBDIR}" PLIST_SUB= DB=${DB} .include Index: databases/qt4-sqlite-plugin/distinfo =================================================================== RCS file: /home/pcvs/ports/databases/qt4-sqlite-plugin/distinfo,v retrieving revision 1.7 diff -u -u -r1.7 distinfo --- databases/qt4-sqlite-plugin/distinfo 13 Jan 2009 20:34:40 -0000 1.7 +++ databases/qt4-sqlite-plugin/distinfo 28 Jun 2009 13:13:43 -0000 @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0 -SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6 -SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803 +MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550 +SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2 +SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421 Index: databases/qt4-sqlite-plugin/files/Makefile.bsd =================================================================== RCS file: /home/pcvs/ports/databases/qt4-sqlite-plugin/files/Makefile.bsd,v retrieving revision 1.4 diff -u -u -r1.4 Makefile.bsd --- databases/qt4-sqlite-plugin/files/Makefile.bsd 4 Aug 2008 23:30:31 -0000 1.4 +++ databases/qt4-sqlite-plugin/files/Makefile.bsd 5 Jul 2009 14:11:57 -0000 @@ -2,14 +2,14 @@ VPATH= ${PLUGIN}:${DRIVER} CXXFLAGS+= -I${DRIVER} -Iinclude \ - -I${PREFIX}/include/qt4 \ - -I${PREFIX}/include/qt4/Qt \ + -I${QT_INCDIR} \ + -I${QT_INCDIR}/Qt \ -I${LOCALBASE}/include \ ${PTHREAD_CFLAGS} -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?= ${PREFIX}/bin/moc-qt4 -LDADD= -L${PREFIX}/lib/qt4 -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lsqlite +MOC?= ${LOCALBASE}/bin/moc-qt4 +LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lsqlite SRCS= smain.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp LIBDIR= ${PREFIX}/lib/qt4/plugins/sqldrivers Index: databases/qt4-sqlite3-plugin/Makefile =================================================================== RCS file: /home/pcvs/ports/databases/qt4-sqlite3-plugin/Makefile,v retrieving revision 1.10 diff -u -u -r1.10 Makefile --- databases/qt4-sqlite3-plugin/Makefile 4 Aug 2008 23:30:32 -0000 1.10 +++ databases/qt4-sqlite3-plugin/Makefile 5 Jul 2009 14:11:57 -0000 @@ -3,7 +3,7 @@ # Date created: 27 February 2004 # Whom: Michael Nottebrock # -# $FreeBSD: ports/databases/qt4-sqlite3-plugin/Makefile,v 1.10 2008/08/04 23:30:32 miwi Exp $ +# $FreeBSD$ # PORTNAME= qt4-${DB}-plugin @@ -23,6 +23,7 @@ USE_QT_VER= 4 QT_COMPONENTS= moc_build sql QT_NONSTANDARD= yes +MAKE_JOBS_SAFE= yes DRIVER= src/sql/drivers/${DB} PLUGIN= src/plugins/sqldrivers/${DB} @@ -34,7 +35,9 @@ MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \ PLUGIN="${PLUGIN}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" + PTHREAD_LIBS="${PTHREAD_LIBS}" \ + QT_INCDIR="${QT_INCDIR}" \ + QT_LIBDIR="${QT_LIBDIR}" PLIST_SUB= DB=${DB} .include Index: databases/qt4-sqlite3-plugin/distinfo =================================================================== RCS file: /home/pcvs/ports/databases/qt4-sqlite3-plugin/distinfo,v retrieving revision 1.7 diff -u -u -r1.7 distinfo --- databases/qt4-sqlite3-plugin/distinfo 13 Jan 2009 20:34:40 -0000 1.7 +++ databases/qt4-sqlite3-plugin/distinfo 28 Jun 2009 13:13:45 -0000 @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0 -SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6 -SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803 +MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550 +SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2 +SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421 Index: databases/qt4-sqlite3-plugin/files/Makefile.bsd =================================================================== RCS file: /home/pcvs/ports/databases/qt4-sqlite3-plugin/files/Makefile.bsd,v retrieving revision 1.4 diff -u -u -r1.4 Makefile.bsd --- databases/qt4-sqlite3-plugin/files/Makefile.bsd 4 Aug 2008 23:30:32 -0000 1.4 +++ databases/qt4-sqlite3-plugin/files/Makefile.bsd 5 Jul 2009 14:11:57 -0000 @@ -2,14 +2,14 @@ VPATH= ${PLUGIN}:${DRIVER} CXXFLAGS+= -I${DRIVER} -Iinclude \ - -I${PREFIX}/include/qt4 \ - -I${PREFIX}/include/qt4/Qt \ + -I${QT_INCDIR} \ + -I${QT_INCDIR}/Qt \ -I${LOCALBASE}/include \ ${PTHREAD_CFLAGS} -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${PREFIX}/lib/qt4 -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lsqlite3 +LDADD= -L${QT_LIBDIR} -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lsqlite3 SRCS= smain.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp LIBDIR= ${PREFIX}/lib/qt4/plugins/sqldrivers Index: devel/Makefile =================================================================== RCS file: /home/pcvs/ports/devel/Makefile,v retrieving revision 1.3548 diff -u -u -r1.3548 Makefile --- devel/Makefile 7 Jul 2009 19:28:05 -0000 1.3548 +++ devel/Makefile 8 Jul 2009 15:03:42 -0000 @@ -2517,6 +2517,7 @@ SUBDIR += qt4-qvfb SUBDIR += qt4-rcc SUBDIR += qt4-script + SUBDIR += qt4-scripttools SUBDIR += qt4-uic SUBDIR += qt4-uic3 SUBDIR += quilt Index: devel/dbus-qt4/Makefile =================================================================== RCS file: /home/pcvs/ports/devel/dbus-qt4/Makefile,v retrieving revision 1.16 diff -u -u -r1.16 Makefile --- devel/dbus-qt4/Makefile 15 Jun 2009 19:21:48 -0000 1.16 +++ devel/dbus-qt4/Makefile 24 Apr 2009 10:06:39 -0000 @@ -3,7 +3,7 @@ # Date created: Wed Jun 29 11:49:42 CEST 2005 # Whom: lofi@freebsd.org # -# $FreeBSD: ports/devel/dbus-qt4/Makefile,v 1.16 2009/06/15 19:21:48 makc Exp $ +# $FreeBSD$ # PORTNAME= dbus @@ -25,7 +25,6 @@ QT_NONSTANDARD= yes QT_DIST= yes MAKE_JOBS_UNSAFE= yes - HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/lib/qt4 Index: devel/dbus-qt4/distinfo =================================================================== RCS file: /home/pcvs/ports/devel/dbus-qt4/distinfo,v retrieving revision 1.7 diff -u -u -r1.7 distinfo --- devel/dbus-qt4/distinfo 13 Jan 2009 20:34:40 -0000 1.7 +++ devel/dbus-qt4/distinfo 28 Jun 2009 13:12:41 -0000 @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0 -SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6 -SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803 +MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550 +SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2 +SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421 Index: devel/dbus-qt4/pkg-plist =================================================================== RCS file: /home/pcvs/ports/devel/dbus-qt4/pkg-plist,v retrieving revision 1.9 diff -u -u -r1.9 pkg-plist --- devel/dbus-qt4/pkg-plist 13 Jan 2009 20:34:40 -0000 1.9 +++ devel/dbus-qt4/pkg-plist 28 Jun 2009 15:20:02 -0000 @@ -19,6 +19,8 @@ include/qt4/Qt/qdbusmetatype.h include/qt4/Qt/qdbusreply.h include/qt4/Qt/qdbusserver.h +include/qt4/Qt/qdbuspendingcall.h +include/qt4/Qt/qdbuspendingreply.h include/qt4/QtDBus/QDBusAbstractAdaptor include/qt4/QtDBus/QDBusAbstractInterface include/qt4/QtDBus/QDBusArgument @@ -35,6 +37,10 @@ include/qt4/QtDBus/QDBusSignature include/qt4/QtDBus/QDBusVariant include/qt4/QtDBus/QtDBus +include/qt4/QtDBus/QDBusPendingCall +include/qt4/QtDBus/QDBusPendingCallWatcher +include/qt4/QtDBus/QDBusPendingReplyData +include/qt4/QtDBus/QDBusPendingReply include/qt4/QtDBus/qdbusabstractadaptor.h include/qt4/QtDBus/qdbusabstractinterface.h include/qt4/QtDBus/qdbusargument.h @@ -47,15 +53,17 @@ include/qt4/QtDBus/qdbusmacros.h include/qt4/QtDBus/qdbusmessage.h include/qt4/QtDBus/qdbusmetatype.h +include/qt4/QtDBus/qdbuspendingcall.h +include/qt4/QtDBus/qdbuspendingreply.h include/qt4/QtDBus/qdbusreply.h include/qt4/QtDBus/qdbusserver.h lib/qt4/libQtDBus.la lib/qt4/libQtDBus.prl lib/qt4/libQtDBus.so lib/qt4/libQtDBus.so.4 -lib/qt4/libQtDBus.so.4.4 -lib/qt4/libQtDBus.so.4.4.3 -%%DEBUG%%lib/qt4/libQtDBus.so.4.4.3.debug +lib/qt4/libQtDBus.so.4.5 +lib/qt4/libQtDBus.so.4.5.2 +%%DEBUG%%lib/qt4/libQtDBus.so.4.5.2.debug libdata/pkgconfig/QtDBus.pc @dirrm include/qt4/QtDBus @dirrmtry include/qt4/Qt Index: devel/qmake4/Makefile =================================================================== RCS file: /home/pcvs/ports/devel/qmake4/Makefile,v retrieving revision 1.16 diff -u -u -r1.16 Makefile --- devel/qmake4/Makefile 13 Jan 2009 20:34:41 -0000 1.16 +++ devel/qmake4/Makefile 24 Apr 2009 10:06:38 -0000 @@ -3,7 +3,7 @@ # Whom: lofi@freebsd.org, # mi@aldan.algebra.com # -# $FreeBSD: ports/devel/qmake4/Makefile,v 1.16 2009/01/13 20:34:41 makc Exp $ +# $FreeBSD$ PORTNAME= qmake PORTVERSION= ${QT4_VERSION} @@ -23,6 +23,7 @@ MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV+= FILESDIR="${FILESDIR}" #USE_BZIP2= yes +MAKE_JOBS_SAFE= yes EXTRACT_AFTER_ARGS=| ${TAR} -xf - \ '${DISTNAME}/config.tests/unix/padstring' \ Index: devel/qmake4/distinfo =================================================================== RCS file: /home/pcvs/ports/devel/qmake4/distinfo,v retrieving revision 1.7 diff -u -u -r1.7 distinfo --- devel/qmake4/distinfo 13 Jan 2009 20:34:41 -0000 1.7 +++ devel/qmake4/distinfo 28 Jun 2009 13:12:00 -0000 @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 376c003317c4417326ba2116370227d0 -SHA256 (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 79ea9fb46d75c3759e3e98ab0064a47eaa5bdbbc2a53d923d60bd8e9cd0bc5c6 -SIZE (KDE/qt-x11-opensource-src-4.4.3.tar.gz) = 112939803 +MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550 +SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2 +SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421 Index: devel/qmake4/pkg-plist =================================================================== RCS file: /home/pcvs/ports/devel/qmake4/pkg-plist,v retrieving revision 1.6 diff -u -u -r1.6 pkg-plist --- devel/qmake4/pkg-plist 13 Jan 2009 20:34:41 -0000 1.6 +++ devel/qmake4/pkg-plist 2 Jul 2009 23:01:41 -0000 @@ -13,7 +13,9 @@ share/qt4/mkspecs/common/mac-g++.conf share/qt4/mkspecs/common/mac-llvm.conf share/qt4/mkspecs/common/mac.conf +share/qt4/mkspecs/common/qws.conf share/qt4/mkspecs/common/unix.conf +share/qt4/mkspecs/common/wince.conf share/qt4/mkspecs/cygwin-g++/qmake.conf share/qt4/mkspecs/cygwin-g++/qplatformdefs.h share/qt4/mkspecs/darwin-g++/qmake.conf @@ -31,6 +33,7 @@ share/qt4/mkspecs/features/dll.prf share/qt4/mkspecs/features/exclusive_builds.prf share/qt4/mkspecs/features/help.prf +share/qt4/mkspecs/features/include_source_dir.prf share/qt4/mkspecs/features/incredibuild_xge.prf share/qt4/mkspecs/features/lex.prf share/qt4/mkspecs/features/link_pkgconfig.prf @@ -45,6 +48,7 @@ share/qt4/mkspecs/features/mac/x86.prf share/qt4/mkspecs/features/mac/x86_64.prf share/qt4/mkspecs/features/moc.prf +share/qt4/mkspecs/features/no_debug_info.prf share/qt4/mkspecs/features/qdbus.prf share/qt4/mkspecs/features/qt.prf share/qt4/mkspecs/features/qt_config.prf @@ -73,17 +77,19 @@ share/qt4/mkspecs/features/unix/x11inc.prf share/qt4/mkspecs/features/unix/x11lib.prf share/qt4/mkspecs/features/unix/x11sm.prf +share/qt4/mkspecs/features/use_c_linker.prf share/qt4/mkspecs/features/warn_off.prf share/qt4/mkspecs/features/warn_on.prf share/qt4/mkspecs/features/win32/console.prf +share/qt4/mkspecs/features/win32/default_post.prf share/qt4/mkspecs/features/win32/default_pre.prf share/qt4/mkspecs/features/win32/dumpcpp.prf share/qt4/mkspecs/features/win32/embed_manifest_dll.prf share/qt4/mkspecs/features/win32/embed_manifest_exe.prf share/qt4/mkspecs/features/win32/exceptions.prf share/qt4/mkspecs/features/win32/exceptions_off.prf +share/qt4/mkspecs/features/win32/ltcg.prf share/qt4/mkspecs/features/win32/opengl.prf -share/qt4/mkspecs/features/win32/profiling.prf share/qt4/mkspecs/features/win32/qaxcontainer.prf share/qt4/mkspecs/features/win32/qaxserver.prf share/qt4/mkspecs/features/win32/qt_dll.prf @@ -159,6 +165,10 @@ share/qt4/mkspecs/macx-g++/Info.plist.lib share/qt4/mkspecs/macx-g++/qmake.conf share/qt4/mkspecs/macx-g++/qplatformdefs.h +share/qt4/mkspecs/macx-g++42/Info.plist.app +share/qt4/mkspecs/macx-g++42/Info.plist.lib +share/qt4/mkspecs/macx-g++42/qmake.conf +share/qt4/mkspecs/macx-g++42/qplatformdefs.h share/qt4/mkspecs/macx-icc/qmake.conf share/qt4/mkspecs/macx-icc/qplatformdefs.h share/qt4/mkspecs/macx-llvm/Info.plist.app @@ -182,12 +192,16 @@ share/qt4/mkspecs/qws/freebsd-generic-g++/qplatformdefs.h share/qt4/mkspecs/qws/linux-arm-g++/qmake.conf share/qt4/mkspecs/qws/linux-arm-g++/qplatformdefs.h +share/qt4/mkspecs/qws/linux-armv6-g++/qmake.conf +share/qt4/mkspecs/qws/linux-armv6-g++/qplatformdefs.h share/qt4/mkspecs/qws/linux-avr32-g++/qmake.conf share/qt4/mkspecs/qws/linux-avr32-g++/qplatformdefs.h share/qt4/mkspecs/qws/linux-cellon-g++/qmake.conf share/qt4/mkspecs/qws/linux-cellon-g++/qplatformdefs.h share/qt4/mkspecs/qws/linux-dm7000-g++/qmake.conf share/qt4/mkspecs/qws/linux-dm7000-g++/qplatformdefs.h +share/qt4/mkspecs/qws/linux-dm800-g++/qmake.conf +share/qt4/mkspecs/qws/linux-dm800-g++/qplatformdefs.h share/qt4/mkspecs/qws/linux-generic-g++-32/qmake.conf share/qt4/mkspecs/qws/linux-generic-g++-32/qplatformdefs.h share/qt4/mkspecs/qws/linux-generic-g++/qmake.conf @@ -198,6 +212,12 @@ share/qt4/mkspecs/qws/linux-lsb-g++/qplatformdefs.h share/qt4/mkspecs/qws/linux-mips-g++/qmake.conf share/qt4/mkspecs/qws/linux-mips-g++/qplatformdefs.h +share/qt4/mkspecs/qws/linux-ppc-g++/qmake.conf +share/qt4/mkspecs/qws/linux-ppc-g++/qplatformdefs.h +share/qt4/mkspecs/qws/linux-sh-g++/qmake.conf +share/qt4/mkspecs/qws/linux-sh-g++/qplatformdefs.h +share/qt4/mkspecs/qws/linux-sh4al-g++/qmake.conf +share/qt4/mkspecs/qws/linux-sh4al-g++/qplatformdefs.h share/qt4/mkspecs/qws/linux-sharp-g++/qmake.conf share/qt4/mkspecs/qws/linux-sharp-g++/qplatformdefs.h share/qt4/mkspecs/qws/linux-x86-g++/qmake.conf @@ -230,8 +250,12 @@ share/qt4/mkspecs/unixware-cc/qplatformdefs.h share/qt4/mkspecs/unixware-g++/qmake.conf share/qt4/mkspecs/unixware-g++/qplatformdefs.h +share/qt4/mkspecs/win32-borland/qmake.conf +share/qt4/mkspecs/win32-borland/qplatformdefs.h share/qt4/mkspecs/win32-g++/qmake.conf share/qt4/mkspecs/win32-g++/qplatformdefs.h +share/qt4/mkspecs/win32-icc/qmake.conf +share/qt4/mkspecs/win32-icc/qplatformdefs.h share/qt4/mkspecs/win32-msvc.net/qmake.conf share/qt4/mkspecs/win32-msvc.net/qplatformdefs.h share/qt4/mkspecs/win32-msvc/features/incremental.prf @@ -246,12 +270,16 @@ share/qt4/mkspecs/win32-msvc2005/qplatformdefs.h share/qt4/mkspecs/win32-msvc2008/qmake.conf share/qt4/mkspecs/win32-msvc2008/qplatformdefs.h +share/qt4/mkspecs/wince50standard-armv4i-msvc2005/default_post.prf share/qt4/mkspecs/wince50standard-armv4i-msvc2005/qmake.conf share/qt4/mkspecs/wince50standard-armv4i-msvc2005/qplatformdefs.h +share/qt4/mkspecs/wince50standard-armv4i-msvc2008/default_post.prf share/qt4/mkspecs/wince50standard-armv4i-msvc2008/qmake.conf share/qt4/mkspecs/wince50standard-armv4i-msvc2008/qplatformdefs.h +share/qt4/mkspecs/wince50standard-mipsii-msvc2005/default_post.prf share/qt4/mkspecs/wince50standard-mipsii-msvc2005/qmake.conf share/qt4/mkspecs/wince50standard-mipsii-msvc2005/qplatformdefs.h +share/qt4/mkspecs/wince50standard-mipsii-msvc2008/default_post.prf share/qt4/mkspecs/wince50standard-mipsii-msvc2008/qmake.conf share/qt4/mkspecs/wince50standard-mipsii-msvc2008/qplatformdefs.h share/qt4/mkspecs/wince50standard-mipsiv-msvc2005/qmake.conf @@ -262,26 +290,36 @@ share/qt4/mkspecs/wince50standard-sh4-msvc2005/qplatformdefs.h share/qt4/mkspecs/wince50standard-sh4-msvc2008/qmake.conf share/qt4/mkspecs/wince50standard-sh4-msvc2008/qplatformdefs.h +share/qt4/mkspecs/wince50standard-x86-msvc2005/default_post.prf share/qt4/mkspecs/wince50standard-x86-msvc2005/qmake.conf share/qt4/mkspecs/wince50standard-x86-msvc2005/qplatformdefs.h +share/qt4/mkspecs/wince50standard-x86-msvc2008/default_post.prf share/qt4/mkspecs/wince50standard-x86-msvc2008/qmake.conf share/qt4/mkspecs/wince50standard-x86-msvc2008/qplatformdefs.h share/qt4/mkspecs/wince60standard-armv4i-msvc2005/qmake.conf share/qt4/mkspecs/wince60standard-armv4i-msvc2005/qplatformdefs.h +share/qt4/mkspecs/wincewm50pocket-msvc2005/default_post.prf share/qt4/mkspecs/wincewm50pocket-msvc2005/qmake.conf share/qt4/mkspecs/wincewm50pocket-msvc2005/qplatformdefs.h +share/qt4/mkspecs/wincewm50pocket-msvc2008/default_post.prf share/qt4/mkspecs/wincewm50pocket-msvc2008/qmake.conf share/qt4/mkspecs/wincewm50pocket-msvc2008/qplatformdefs.h +share/qt4/mkspecs/wincewm50smart-msvc2005/default_post.prf share/qt4/mkspecs/wincewm50smart-msvc2005/qmake.conf share/qt4/mkspecs/wincewm50smart-msvc2005/qplatformdefs.h +share/qt4/mkspecs/wincewm50smart-msvc2008/default_post.prf share/qt4/mkspecs/wincewm50smart-msvc2008/qmake.conf share/qt4/mkspecs/wincewm50smart-msvc2008/qplatformdefs.h +share/qt4/mkspecs/wincewm60professional-msvc2005/default_post.prf share/qt4/mkspecs/wincewm60professional-msvc2005/qmake.conf share/qt4/mkspecs/wincewm60professional-msvc2005/qplatformdefs.h +share/qt4/mkspecs/wincewm60professional-msvc2008/default_post.prf share/qt4/mkspecs/wincewm60professional-msvc2008/qmake.conf share/qt4/mkspecs/wincewm60professional-msvc2008/qplatformdefs.h +share/qt4/mkspecs/wincewm60standard-msvc2005/default_post.prf share/qt4/mkspecs/wincewm60standard-msvc2005/qmake.conf share/qt4/mkspecs/wincewm60standard-msvc2005/qplatformdefs.h +share/qt4/mkspecs/wincewm60standard-msvc2008/default_post.prf share/qt4/mkspecs/wincewm60standard-msvc2008/qmake.conf share/qt4/mkspecs/wincewm60standard-msvc2008/qplatformdefs.h @dirrm share/qt4/mkspecs/wincewm60standard-msvc2008 @@ -310,7 +348,9 @@ @dirrm share/qt4/mkspecs/win32-msvc/features @dirrm share/qt4/mkspecs/win32-msvc.net @dirrm share/qt4/mkspecs/win32-msvc +@dirrm share/qt4/mkspecs/win32-icc @dirrm share/qt4/mkspecs/win32-g++ +@dirrm share/qt4/mkspecs/win32-borland @dirrm share/qt4/mkspecs/unixware-g++ @dirrm share/qt4/mkspecs/unixware-cc @dirrm share/qt4/mkspecs/tru64-g++ @@ -327,14 +367,19 @@ @dirrm share/qt4/mkspecs/qws/linux-x86_64-g++ @dirrm share/qt4/mkspecs/qws/linux-x86-g++ @dirrm share/qt4/mkspecs/qws/linux-sharp-g++ +@dirrm share/qt4/mkspecs/qws/linux-sh4al-g++ +@dirrm share/qt4/mkspecs/qws/linux-sh-g++ +@dirrm share/qt4/mkspecs/qws/linux-ppc-g++ @dirrm share/qt4/mkspecs/qws/linux-mips-g++ @dirrm share/qt4/mkspecs/qws/linux-lsb-g++ @dirrm share/qt4/mkspecs/qws/linux-ipaq-g++ @dirrm share/qt4/mkspecs/qws/linux-generic-g++-32 @dirrm share/qt4/mkspecs/qws/linux-generic-g++ +@dirrm share/qt4/mkspecs/qws/linux-dm800-g++ @dirrm share/qt4/mkspecs/qws/linux-dm7000-g++ @dirrm share/qt4/mkspecs/qws/linux-cellon-g++ @dirrm share/qt4/mkspecs/qws/linux-avr32-g++ +@dirrm share/qt4/mkspecs/qws/linux-armv6-g++ @dirrm share/qt4/mkspecs/qws/linux-arm-g++ @dirrm share/qt4/mkspecs/qws/freebsd-generic-g++ @dirrm share/qt4/mkspecs/qws @@ -345,6 +390,7 @@ @dirrm share/qt4/mkspecs/macx-pbuilder @dirrm share/qt4/mkspecs/macx-llvm @dirrm share/qt4/mkspecs/macx-icc +@dirrm share/qt4/mkspecs/macx-g++42 @dirrm share/qt4/mkspecs/macx-g++ @dirrm share/qt4/mkspecs/lynxos-g++ @dirrm share/qt4/mkspecs/linux-pgcc @@ -379,7 +425,7 @@ @dirrm share/qt4/mkspecs/features/win32 @dirrm share/qt4/mkspecs/features/unix @dirrm share/qt4/mkspecs/features/mac -@dirrm share/qt4/mkspecs/features +@dirrmtry share/qt4/mkspecs/features @dirrm share/qt4/mkspecs/darwin-g++ @dirrm share/qt4/mkspecs/cygwin-g++ @dirrm share/qt4/mkspecs/common Index: devel/qmake4/files/Makefile.bsd =================================================================== RCS file: /home/pcvs/ports/devel/qmake4/files/Makefile.bsd,v retrieving revision 1.8 diff -u -u -r1.8 Makefile.bsd --- devel/qmake4/files/Makefile.bsd 5 Aug 2008 00:20:35 -0000 1.8 +++ devel/qmake4/files/Makefile.bsd 24 Apr 2009 10:06:38 -0000 @@ -1,4 +1,4 @@ -# $FreeBSD: ports/devel/qmake4/files/Makefile.bsd,v 1.8 2008/08/05 00:20:35 miwi Exp $ +# $FreeBSD$ _OBJS!= ${MAKE} -f Makefile.unix -V OBJS -V QOBJS # We'd like to avoid using qconfig.cpp, but can't -- see the comment Index: devel/qmake4/files/qconfig.cpp =================================================================== RCS file: /home/pcvs/ports/devel/qmake4/files/qconfig.cpp,v retrieving revision 1.8 diff -u -u -r1.8 qconfig.cpp --- devel/qmake4/files/qconfig.cpp 5 Aug 2008 00:20:35 -0000 1.8 +++ devel/qmake4/files/qconfig.cpp 24 Apr 2009 10:06:38 -0000 @@ -1,5 +1,5 @@ /* - * $FreeBSD: ports/devel/qmake4/files/qconfig.cpp,v 1.8 2008/08/05 00:20:35 miwi Exp $ + * $FreeBSD$ * Hand-crafted... * The default prefix (/ usr / local) is dynamicly replaced * at configure time. Index: devel/qt4/Makefile =================================================================== RCS file: /home/pcvs/ports/devel/qt4/Makefile,v retrieving revision 1.16 diff -u -u -r1.16 Makefile --- devel/qt4/Makefile 13 Jan 2009 20:34:41 -0000 1.16 +++ devel/qt4/Makefile 7 May 2009 15:48:32 -0000 @@ -2,7 +2,7 @@ # Date created: 2007-01-25 # Whom: Michael Nottebrock # -# $FreeBSD: ports/devel/qt4/Makefile,v 1.16 2009/01/13 20:34:41 makc Exp $ +# $FreeBSD$ # PORTNAME= qt4 @@ -26,8 +26,8 @@ QT_COMPONENTS= accessible assistant assistant-adp assistantclient \ clucene corelib dbus designer doc help gui iconengines \ imageformats inputmethods network opengl qdbusviewer \ - qt3support qtestlib qvfb script sql svg webkit xml \ - xmlpatterns xmlpatterns-tool + qt3support qtestlib qvfb script scripttools sql svg webkit \ + xml xmlpatterns xmlpatterns-tool NO_BUILD= yes Index: devel/qt4/pkg-plist =================================================================== RCS file: /home/pcvs/ports/devel/qt4/pkg-plist,v retrieving revision 1.6 diff -u -u -r1.6 pkg-plist --- devel/qt4/pkg-plist 13 Mar 2008 17:57:11 -0000 1.6 +++ devel/qt4/pkg-plist 24 Apr 2009 10:06:41 -0000 @@ -1,2 +1,2 @@ -@comment $FreeBSD: ports/devel/qt4/pkg-plist,v 1.6 2008/03/13 17:57:11 lofi Exp $ +@comment $FreeBSD$ @comment This list intentionally empty Index: devel/qt4/files/Makefile.options =================================================================== RCS file: devel/qt4/files/Makefile.options diff -N devel/qt4/files/Makefile.options --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ devel/qt4/files/Makefile.options 5 Jun 2009 23:25:56 -0000 @@ -0,0 +1,15 @@ +#qt4-corelib and qt4-gui must recompiled both when changing options +QT4_OPTIONS_ALL=CUPS QGTKSTYLE NAS +QT4_OPTIONS?= +.if defined(PACKAGE_BUILDING) +QT4_OPTIONS+= CUPS +.endif + +.for opt in ${QT4_OPTIONS_ALL} +${opt}_REPLACE=\# +QT4_OPTIONS_REPLACE+= s,%%${opt}%%,${${opt}_REPLACE},g; +.endfor + +.for opt in ${QT4_OPTIONS} +${opt}_REPLACE= +.endfor Index: devel/qt4/files/configure =================================================================== RCS file: /home/pcvs/ports/devel/qt4/files/configure,v retrieving revision 1.7 diff -u -u -r1.7 configure --- devel/qt4/files/configure 13 Jan 2009 20:34:41 -0000 1.7 +++ devel/qt4/files/configure 2 Jul 2009 07:42:57 -0000 @@ -2,8 +2,8 @@ # # Configures to build the Qt library # -# Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). -# Contact: Qt Software Information (qt-info@nokia.com) +# Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +# Contact: Nokia Corporation (qt-info@nokia.com) # # This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE # WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. @@ -108,7 +108,7 @@ PLATFORM_MAC=no PLATFORM_QWS=no -if [ -f "$relpath"/src/gui/kernel/qapplication_mac.cpp ] && [ -d /System/Library/Frameworks/Carbon.framework ]; then +if [ -f "$relpath"/src/gui/kernel/qapplication_mac.mm ] && [ -d /System/Library/Frameworks/Carbon.framework ]; then # Qt/Mac # ~ the Carbon SDK exists # ~ src/gui/base/qapplication_mac.cpp is present @@ -119,7 +119,13 @@ # ~ src/gui/base/qapplication_qws.cpp is present # ~ this is the free or commercial edition # ~ this is the internal edition and Qt Embedded is explicitly enabled - PLATFORM_QWS=maybe + if [ -f "$relpath"/src/gui/kernel/qapplication_mac.mm ]; then + # This is a depot build, or an all-platforms package + PLATFORM_QWS=maybe + else + # This must be the embedded package, since the Qt/Mac source files are not present + PLATFORM_QWS=yes + fi fi #----------------------------------------------------------------------------- @@ -130,7 +136,7 @@ QT_MINOR_VERSION=0 QT_PATCH_VERSION=0 if [ -n "$QT_VERSION" ]; then - QT_VERSION=`echo $QT_VERSION | sed 's,^# *define *QT_VERSION_STR "*\([^ ]*\)"$,\1,'` + QT_VERSION=`echo $QT_VERSION | sed 's,^# *define *QT_VERSION_STR *"*\([^ ]*\)"$,\1,'` MAJOR=`echo $QT_VERSION | sed 's,^\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*,\1,'` if [ -n "$MAJOR" ]; then MINOR=`echo $QT_VERSION | sed 's,^\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*,\2,'` @@ -156,35 +162,144 @@ #------------------------------------------------------------------------------- # check the license #------------------------------------------------------------------------------- +COMMERCIAL_USER=no +CFG_DEV=no +CFG_NOKIA=no +CFG_EMBEDDED=no +EditionString=Commercial -if [ -f "$relpath"/LICENSE.Qtopia ]; then - # Qtopia Edition - [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes - Licensee="Qtopia" - Edition="Qtopia" - QT_EDITION="QT_EDITION_DESKTOP" -elif [ -f "$relpath"/LICENSE.GPL2 -o -f "$relpath"/LICENSE.GPL3 ]; then - # Open Source edition - may only be used under the terms of the GPL. - [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes - [ "$PLATFORM_QWS" = "maybe" ] && PLATFORM_QWS=yes - Licensee="Open Source" - Edition="OpenSource" - EditionString="Open Source" +earlyArgParse() +{ + # parse the arguments, setting things to "yes" or "no" + while [ "$#" -gt 0 ]; do + CURRENT_OPT="$1" + UNKNOWN_ARG=no + case "$1" in + #Autoconf style options + --enable-*) + VAR=`echo $1 | sed "s,^--enable-\(.*\),\1,"` + VAL=yes + ;; + --disable-*) + VAR=`echo $1 | sed "s,^--disable-\(.*\),\1,"` + VAL=no + ;; + --*=*) + VAR=`echo $1 | sed "s,^--\(.*\)=.*,\1,"` + VAL=`echo $1 | sed "s,^--.*=\(.*\),\1,"` + ;; + --no-*) + VAR=`echo $1 | sed "s,^--no-\(.*\),\1,"` + VAL=no + ;; + -embedded) + VAR=embedded + # this option may or may not be followed by an argument + if [ -z "$2" ] || echo "$2" | grep '^-' >/dev/null 2>&1; then + VAL=auto + else + shift; + VAL=$1 + fi + ;; + -h|help|--help|-help) + if [ "$VAL" = "yes" ]; then + OPT_HELP="$VAL" + COMMERCIAL_USER="no" #doesn't matter we will display the help + else + UNKNOWN_OPT=yes + COMMERCIAL_USER="no" #doesn't matter we will display the help + fi + ;; + --*) + VAR=`echo $1 | sed "s,^--\(.*\),\1,"` + VAL=yes + ;; + -*) + VAR=`echo $1 | sed "s,^-\(.*\),\1,"` + VAL="unknown" + ;; + *) + UNKNOWN_ARG=yes + ;; + esac + if [ "$UNKNOWN_ARG" = "yes" ]; then + shift + continue + fi + shift + + UNKNOWN_OPT=no + case "$VAR" in + embedded) + CFG_EMBEDDED="$VAL" + if [ "$PLATFORM_QWS" != "no" ]; then + if [ "$PLATFORM_QWS" = "maybe" ]; then + PLATFORM_X11=no + PLATFORM_MAC=no + PLATFORM_QWS=yes + fi + else + echo "No license exists to enable Qt for Embedded Linux. Disabling." + CFG_EMBEDDED=no + fi + ;; + developer-build) + CFG_DEV="yes" + ;; + nokia-developer) + CFG_DEV="yes" + CFG_NOKIA="yes" + COMMERCIAL_USER="no" + ;; + commercial) + COMMERCIAL_USER="yes" + ;; + opensource) + COMMERCIAL_USER="no" + ;; + *) + UNKNOWN_OPT=yes + ;; + esac + done +} + +earlyArgParse "$@" + +if [ "$COMMERCIAL_USER" = "ask" ]; then + while true; do + echo "Which edition of Qt do you want to use ?" + echo + echo "Type 'c' if you want to use the Commercial Edition." + echo "Type 'o' if you want to use the Open Source Edition." + echo + read commercial + echo + if [ "$commercial" = "c" ]; then + COMMERCIAL_USER="yes" + break + elif [ "$commercial" = "o" ]; then + COMMERCIAL_USER="no" + break + fi + done +fi + +if [ "$CFG_NOKIA" = "yes" ]; then + Licensee="Nokia" + Edition="NokiaInternalBuild" + EditionString="Nokia Internal Build" QT_EDITION="QT_EDITION_OPENSOURCE" -elif [ -f "$relpath"/.LICENSE ]; then - # Generic, non final license [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes - [ "$PLATFORM_QWS" = "maybe" ] && PLATFORM_QWS=yes - Edition=`sed 's/ LICENSE AGREEMENT//;q' .LICENSE` - Licensee="$Edition" - QT_EDITION="QT_EDITION_DESKTOP" -elif [ -f "$relpath"/LICENSE.TROLL ]; then - # internal Trolltech edition +elif [ -f "$relpath"/LICENSE.PREVIEW.COMMERCIAL ] && [ $COMMERCIAL_USER = "yes" ]; then + # Commercial preview release [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes - Licensee="Trolltech" - Edition="Trolltech" + Licensee="Preview" + Edition="Preview" QT_EDITION="QT_EDITION_DESKTOP" -else + LicenseType="Technology Preview" +elif [ $COMMERCIAL_USER = "yes" ]; then # one of commercial editions [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes [ "$PLATFORM_QWS" = "maybe" ] && PLATFORM_QWS=yes @@ -196,7 +311,7 @@ echo echo "You are using an old license file." echo - echo "Please install the license file supplied by Trolltech," + echo "Please install the license file supplied by Nokia," echo "or install the Qt Open Source Edition if you intend to" echo "develop free software." exit 1 @@ -331,6 +446,31 @@ ;; esac fi + + if test -r "$relpath/.LICENSE"; then + # Generic, non-final license + LICENSE_EXTENSION="" + line=`sed 'y/a-z/A-Z/;q' "$relpath"/.LICENSE` + case "$line" in + *BETA*) + Edition=Beta + ;; + *TECHNOLOGY?PREVIEW*) + Edition=Preview + ;; + *EVALUATION*) + Edition=Evaluation + ;; + *) + echo >&2 "Invalid license files; cannot continue" + exit 1 + ;; + esac + Licensee="$Edition" + EditionString="$Edition" + QT_EDITION="QT_EDITION_DESKTOP" + fi + case "$LicenseFeatureCode" in G|L) # US @@ -360,27 +500,8 @@ exit 1 ;; esac - case "$LicenseFeatureCode" in - G|2) - # delete qtusagereporter for non-metered licenses - rm -f "$relpath/bin/qtusagereporter" - ;; - L|5) - # copy qtusagereporter for metered licenses - if [ '!' -f "$outpath/bin/qtusagereporter" ]; then - mkdir -p "$outpath/bin" - cp -f "$relpath/bin/qtusagereporter" "$outpath/bin/qtusagereporter" - fi - QT_CONFIG="$QT_CONFIG qtusagereporter" - ;; - *) - echo - echo "Invalid license key. Please check the license key." - exit 1 - ;; - esac if [ '!' -f "$outpath/LICENSE" ]; then - echo "The LICENSE, LICENSE.GPL2, or LICENSE.GPL3 file shipped with" + echo "The LICENSE, LICENSE.GPL3 LICENSE.LGPL file shipped with" echo "this software has disappeared." echo echo "Sorry, you are not licensed to use this software." @@ -388,30 +509,29 @@ echo exit 1 fi +elif [ $COMMERCIAL_USER = "no" ]; then + # Open Source edition - may only be used under the terms of the GPL or LGPL. + [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes + Licensee="Open Source" + Edition="OpenSource" + EditionString="Open Source" + QT_EDITION="QT_EDITION_OPENSOURCE" fi -if [ "$PLATFORM_QWS" = "yes" ]; then - Platform="Qt for Embedded Linux" -elif [ "$PLATFORM_MAC" = "yes" ]; then - Platform="Qt/Mac" -else - PLATFORM_X11=yes - Platform="Qt/X11" -fi - -echo -echo "This is the $Platform ${EditionString-$Edition} Edition." -echo - #------------------------------------------------------------------------------- # initalize variables #------------------------------------------------------------------------------- SYSTEM_VARIABLES="CC CXX CFLAGS CXXFLAGS LDFLAGS" for varname in $SYSTEM_VARIABLES; do + qmakevarname="${varname}" + # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS + if [ "${varname}" = "LDFLAGS" ]; then + qmakevarname="LFLAGS" + fi cmd=`echo \ 'if [ -n "\$'${varname}'" ]; then - QMakeVar set QMAKE_'${varname}' "\$'${varname}'" + QMakeVar set QMAKE_'${qmakevarname}' "\$'${varname}'" fi'` eval "$cmd" done @@ -426,7 +546,7 @@ QMakeVar add kbd-drivers "tty" QMakeVar add mouse-drivers "pc linuxtp" -if [ "$Edition" = "Trolltech" ]; then +if [ "$CFG_DEV" = "yes" ]; then QMakeVar add kbd-drivers "um" fi @@ -440,10 +560,10 @@ CFG_CONFIGURE_EXIT_ON_ERROR=yes CFG_PROFILE=no CFG_EXCEPTIONS=unspecified +CFG_SCRIPTTOOLS=auto # (yes|no|auto) CFG_XMLPATTERNS=auto # (yes|no|auto) CFG_INCREMENTAL=auto CFG_QCONFIG=full -CFG_EMBEDDED=no CFG_DEBUG=auto CFG_MYSQL_CONFIG= CFG_DEBUG_RELEASE=no @@ -464,8 +584,9 @@ CFG_MNG=auto CFG_LIBMNG=auto CFG_XCURSOR=runtime -CFG_XRANDR=auto +CFG_XRANDR=runtime CFG_XRENDER=auto +CFG_MITSHM=auto CFG_OPENGL=auto CFG_SSE=auto CFG_FONTCONFIG=auto @@ -480,7 +601,6 @@ CFG_PHONON_BACKEND=yes CFG_SVG=yes CFG_WEBKIT=auto # (yes|no|auto) -CFG_ASSISTANT_WEBKIT=no CFG_GFX_AVAILABLE="linuxfb transformed qvfb vnc multiscreen" CFG_GFX_ON="linuxfb multiscreen" @@ -492,11 +612,6 @@ CFG_MOUSE_AVAILABLE="pc bus linuxtp yopy vr41xx tslib qvfb" CFG_MOUSE_ON="pc linuxtp" #default, see QMakeVar above -if [ "$Edition" = "Trolltech" ]; then - CFG_KBD_AVAILABLE="${CFG_KBD_AVAILABLE} um" - CFG_KBD_ON="${CFG_KBD_ON} um" -fi - CFG_ARCH= CFG_HOST_ARCH= CFG_KBD_PLUGIN_AVAILABLE= @@ -511,7 +626,7 @@ CFG_DECORATION_ON="${CFG_DECORATION_AVAILABLE}" # all on by default CFG_DECORATION_PLUGIN_AVAILABLE= CFG_DECORATION_PLUGIN= -CFG_TABLET=auto +CFG_XINPUT=runtime CFG_XKB=auto CFG_NIS=auto CFG_CUPS=auto @@ -519,8 +634,10 @@ CFG_DBUS=auto CFG_GLIB=auto CFG_GSTREAMER=auto +CFG_QGTKSTYLE=auto CFG_LARGEFILE=auto CFG_OPENSSL=auto +CFG_PTMALLOC=no CFG_STL=auto CFG_PRECOMPILE=auto CFG_SEPARATE_DEBUG_INFO=auto @@ -551,7 +668,12 @@ CFG_RPATH=yes CFG_FRAMEWORK=auto CFG_MAC_ARCHS= -CFG_MAC_DWARF2=no +MAC_ARCHS_COMMANDLINE= +CFG_MAC_DWARF2=auto +CFG_MAC_XARCH=auto +CFG_MAC_CARBON=yes +CFG_MAC_COCOA=auto +COMMANDLINE_MAC_COCOA=no CFG_SXE=no CFG_PREFIX_INSTALL=yes CFG_SDK= @@ -570,6 +692,7 @@ OPT_VERBOSE=no OPT_HELP= CFG_SILENT=no +CFG_GRAPHICS_SYSTEM=default # initalize variables used for installation QT_INSTALL_PREFIX= @@ -708,13 +831,10 @@ VAL=no ;; #Qt style yes options - -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-tablet|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-opengl|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-universal|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-xmlpatterns|-phonon|-phonon-backend|-svg|-webkit|-assistant-webkit) + -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xinput|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-universal|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-svg|-webkit|-scripttools|-rpath|-force-pkg-config) VAR=`echo $1 | sed "s,^-\(.*\),\1,"` VAL=yes ;; - -force-pkg-config) - QT_FORCE_PKGCONFIG=yes - ;; #Qt style options that pass an argument -qconfig) if [ "$PLATFORM_QWS" = "yes" ]; then @@ -756,6 +876,16 @@ VAL=$1 fi ;; + -opengl) + VAR=opengl + # this option may or may not be followed by an argument + if [ -z "$2" ] || echo "$2" | grep '^-' >/dev/null 2>&1; then + VAL=yes + else + shift; + VAL=$1 + fi + ;; -hostprefix) VAR=`echo $1 | sed "s,^-\(.*\),\1,"` # this option may or may not be followed by an argument @@ -779,6 +909,11 @@ shift VAL="$1" ;; + -graphicssystem) + VAR="graphicssystem" + shift + VAL=$1 + ;; -qtlibinfix) VAR="qtlibinfix" shift @@ -890,6 +1025,9 @@ hostprefix) QT_HOST_PREFIX="$VAL" ;; + force-pkg-config) + QT_FORCE_PKGCONFIG=yes + ;; docdir) QT_INSTALL_DOCS="$VAL" ;; @@ -984,12 +1122,32 @@ CFG_QWS_DEPTHS="$VAL" ;; opengl) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + if [ "$VAL" = "auto" ] || [ "$VAL" = "desktop" ] || + [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || + [ "$VAL" = "es1cl" ] || [ "$VAL" = "es1" ] || [ "$VAL" = "es2" ]; then CFG_OPENGL="$VAL" else UNKNOWN_OPT=yes fi ;; + graphicssystem) + if [ "$PLATFORM_QWS" = "yes" ]; then + echo "Error: Graphics System plugins are not supported on QWS." + echo " On QWS, the graphics system API is part of the QScreen plugin architecture " + echo " rather than existing as a separate plugin." + echo "" + UNKNOWN_OPT=yes + else + if [ "$VAL" = "opengl" ]; then + CFG_GRAPHICS_SYSTEM="opengl" + elif [ "$VAL" = "raster" ]; then + CFG_GRAPHICS_SYSTEM="raster" + else + UNKNOWN_OPT=yes + fi + fi + ;; + qvfb) # left for commandline compatibility, not documented if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then if [ "$VAL" = "yes" ]; then @@ -1052,6 +1210,14 @@ UNKNOWN_OPT=yes fi ;; + cocoa) + if [ "$PLATFORM_MAC" = "yes" ] && [ "$VAL" = "yes" ]; then + CFG_MAC_COCOA="$VAL" + COMMANDLINE_MAC_COCOA="$VAL" + else + UNKNOWN_OPT=yes + fi + ;; framework) if [ "$PLATFORM_MAC" = "yes" ]; then CFG_FRAMEWORK="$VAL" @@ -1176,6 +1342,9 @@ debug) CFG_DEBUG="$VAL" ;; + developer-build|commercial|opensource|nokia-developer) + # These switches have been dealt with already + ;; static) if [ "$VAL" = "yes" ]; then CFG_SHARED=no @@ -1250,9 +1419,9 @@ UNKNOWN_OPT=yes fi ;; - tablet) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_TABLET="$VAL" + xinput) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "runtime" ]; then + CFG_XINPUT="$VAL" else UNKNOWN_OPT=yes fi @@ -1402,7 +1571,7 @@ fi ;; xrandr) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "runtime" ]; then CFG_XRANDR="$VAL" else UNKNOWN_OPT=yes @@ -1415,6 +1584,13 @@ UNKNOWN_OPT=yes fi ;; + mitshm) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_MITSHM="$VAL" + else + UNKNOWN_OPT=yes + fi + ;; fontconfig) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_FONTCONFIG="$VAL" @@ -1457,6 +1633,13 @@ UNKNOWN_OPT=yes fi ;; + gtkstyle) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_QGTKSTYLE="$VAL" + else + UNKNOWN_OPT=yes + fi + ;; qdbus|dbus) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "linked" ]; then CFG_DBUS="$VAL" @@ -1501,6 +1684,14 @@ UNKNOWN_OPT=yes fi ;; + ptmalloc) + if [ "$VAL" = "yes" ]; then + CFG_PTMALLOC="yes" + else + UNKNOWN_OPT=yes + fi + ;; + xmlpatterns) if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ]; then CFG_XMLPATTERNS="yes" @@ -1512,6 +1703,17 @@ fi fi ;; + scripttools) + if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ]; then + CFG_SCRIPTTOOLS="yes" + else + if [ "$VAL" = "no" ]; then + CFG_SCRIPTTOOLS="no" + else + UNKNOWN_OPT=yes + fi + fi + ;; svg) if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ]; then CFG_SVG="yes" @@ -1534,17 +1736,6 @@ fi fi ;; - assistant-webkit) - if [ "$VAL" = "yes" ]; then - CFG_ASSISTANT_WEBKIT="yes" - else - if [ "$VAL" = "no" ]; then - CFG_ASSISTANT_WEBKIT="no" - else - UNKNOWN_OPT=yes - fi - fi - ;; confirm-license) if [ "$VAL" = "yes" ]; then OPT_CONFIRM_LICENSE="$VAL" @@ -1757,11 +1948,23 @@ CFG_QT3SUPPORT="no" fi -if [ "$CFG_ASSISTANT_WEBKIT" = "yes" ] && [ "$CFG_WEBKIT" = "no" ]; then - echo "Warning: WebKit cannot be used in Qt Assistant, since the Qt WebKit module" - echo "won't be built with the current configuration." - CFG_ASSISTANT_WEBKIT="no" -fi +# update QT_CONFIG to show our current predefined configuration +case "$CFG_QCONFIG" in +minimal|small|medium|large|full) + # these are a sequence of increasing functionality + for c in minimal small medium large full; do + QT_CONFIG="$QT_CONFIG $c-config" + [ "$CFG_QCONFIG" = $c ] && break + done + ;; +*) + # not known to be sufficient for anything + if [ '!' -f "$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h" ]; then + echo >&2 "Error: configuration file not found:" + echo >&2 " $relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h" + OPT_HELP=yes + fi +esac #------------------------------------------------------------------------------- # build tree initialization @@ -1772,7 +1975,7 @@ mactests="$relpath/config.tests/mac" WHICH="$unixtests/which.test" -PKG_CONFIG=`$WHICH pkg-config 2>/dev/null` +PERL=`$WHICH perl 2>/dev/null` # find out which awk we want to use, prefer gawk, then nawk, then regular awk AWK= @@ -1819,7 +2022,7 @@ if [ "$PLATFORM_MAC" = "yes" ]; then CFG_DEBUG_RELEASE=yes CFG_DEBUG=yes - elif [ "$Edition" = "Trolltech" ]; then + elif [ "$CFG_DEV" = "yes" ]; then CFG_DEBUG_RELEASE=no CFG_DEBUG=yes else @@ -1839,6 +2042,14 @@ # symlink or copy part of the sources if [ "$OPT_SHADOW" = "yes" ]; then echo "Preparing build tree..." + + if [ -z "$PERL" ]; then + echo + echo "You need perl in your PATH to make a shadow build." + echo "Cannot proceed." + exit 1 + fi + [ -d "$outpath/bin" ] || mkdir -p "$outpath/bin" # symlink the qmake directory @@ -1866,12 +2077,11 @@ # make a syncqt script that can be used in the shadow rm -f "$outpath/bin/syncqt" - if [ -x "/usr/bin/perl" ] && [ -x "$relpath/bin/syncqt" ]; then + if [ -x "$relpath/bin/syncqt" ]; then mkdir -p "$outpath/bin" echo "#!/bin/sh" >"$outpath/bin/syncqt" echo "QTDIR=\"$relpath\"; export QTDIR" >>"$outpath/bin/syncqt" - [ "$Edition" = "Trolltech" ] && echo "perl \"$relpath/bin/syncqt\" -outdir \"$relpath\" \$*" >>"$outpath/bin/syncqt" - echo "perl \"$relpath/bin/syncqt\" -outdir \"$outpath\"" >>"$outpath/bin/syncqt" + echo "perl \"$relpath/bin/syncqt\" -outdir \"$outpath\" $*" >>"$outpath/bin/syncqt" chmod 755 "$outpath/bin/syncqt" fi @@ -1886,7 +2096,7 @@ fi # symlink files from src/gui/embedded neccessary to build qvfb -if [ "$Edition" = "Trolltech" -o "$Edition" = "Qtopia" ]; then +if [ "$CFG_DEV" = "yes" ]; then for f in qvfbhdr.h qlock_p.h qlock.cpp qwssignalhandler_p.h qwssignalhandler.cpp; do dest="${relpath}/tools/qvfb/${f}" rm -f "$dest" @@ -1898,12 +2108,12 @@ if [ "$PLATFORM_QWS" = "yes" ] && [ ! -e "${outpath}/lib/fonts" ]; then if [ "$PLATFORM" = "$XPLATFORM" ]; then mkdir -p "${outpath}/lib" - ln -s "${relpath}/dist/embedded-linux/lib/fonts" "${outpath}/lib/fonts" + ln -s "${relpath}/lib/fonts" "${outpath}/lib/fonts" fi fi if [ "$OPT_FAST" = "auto" ]; then - if [ '!' -z "$AWK" ] && [ "$Edition" = "Trolltech" ]; then + if [ '!' -z "$AWK" ] && [ "$CFG_DEV" = "yes" ]; then OPT_FAST=yes else OPT_FAST=no @@ -1965,6 +2175,9 @@ *86_64) PLATFORM=qws/linux-x86_64-g++ ;; + *ppc) + PLATFORM=qws/linux-ppc-g++ + ;; *) PLATFORM=qws/linux-generic-g++ ;; @@ -1982,6 +2195,9 @@ *86_64) CFG_EMBEDDED=x86_64 ;; + *ppc) + CFG_EMBEDDED=ppc + ;; *) CFG_EMBEDDED=generic ;; @@ -2086,7 +2302,7 @@ ;; Linux:*) case "$UNAME_MACHINE" in - x86_64|s390x) + x86_64|s390x|ppc64) PLATFORM=linux-g++-64 ;; *) @@ -2391,6 +2607,15 @@ ipaq|sharp) CFG_ARCH=arm ;; + dm7000) + CFG_ARCH=powerpc + ;; + dm800) + CFG_ARCH=mips + ;; + sh4al) + CFG_ARCH=sh4a + ;; *) CFG_ARCH="$CFG_EMBEDDED" ;; @@ -2433,9 +2658,17 @@ # tests that don't need qmake (must be run before displaying help) #------------------------------------------------------------------------------- +if [ -z "$PKG_CONFIG" ]; then + # See if PKG_CONFIG is set in the mkspec: + PKG_CONFIG=`getQMakeConf "$XQMAKESPEC" | sed -n -e 's%PKG_CONFIG[^_].*=%%p' | tr '\n' ' '` +fi +if [ -z "$PKG_CONFIG" ]; then + PKG_CONFIG=`$WHICH pkg-config 2>/dev/null` +fi + # Work out if we can use pkg-config if [ "$QT_CROSS_COMPILE" = "yes" ]; then - if [ -n "$QT_FORCE_PKGCONFIG" ]; then + if [ "$QT_FORCE_PKGCONFIG" = "yes" ]; then echo >&2 "" echo >&2 "You have asked to use pkg-config and are cross-compiling." echo >&2 "Please make sure you have a correctly set-up pkg-config" @@ -2447,12 +2680,12 @@ echo >&2 "the host compiler's .pc files will be used. This is probably" echo >&2 "not what you want." echo >&2 "" - elif [ -z "$PKG_CONFIG_SYSROOT" ]; then + elif [ -z "$PKG_CONFIG_SYSROOT" ] && [ -z "$PKG_CONFIG_SYSROOT_DIR" ]; then echo >&2 "" - echo >&2 "Warning: PKG_CONFIG_SYSROOT has not been set. This means" - echo >&2 "your toolchain's .pc files must contain the paths to the" - echo >&2 "toolchain's libraries & headers. If configure tests are" - echo >&2 "failing, please check these files." + echo >&2 "Warning: PKG_CONFIG_SYSROOT/PKG_CONFIG_SYSROOT_DIR has not" + echo >&2 "been set. This means your toolchain's .pc files must contain" + echo >&2 "the paths to the toolchain's libraries & headers. If configure" + echo >&2 "tests are failing, please check these files." echo >&2 "" fi else @@ -2460,6 +2693,31 @@ fi fi +# process CFG_MAC_ARCHS +if [ "$PLATFORM_MAC" = "yes" ]; then +# check -arch arguments for validity. + ALLOWED="x86 ppc x86_64 ppc64 i386" + # Save the list so we can re-write it using only valid values + CFG_MAC_ARCHS_IN="$CFG_MAC_ARCHS" + CFG_MAC_ARCHS= + for i in $CFG_MAC_ARCHS_IN + do + if echo "$ALLOWED" | grep -w -v "$i" > /dev/null 2>&1; then + echo "Unknown architecture: \"$i\". Supported architectures: x86[i386] ppc x86_64 ppc64"; + exit 2; + fi + if [ "$i" = "i386" -o "$i" = "x86" ]; then + # These are synonymous values + # CFG_MAC_ARCHS requires x86 while GCC requires i386 + CFG_MAC_ARCHS="$CFG_MAC_ARCHS x86" + MAC_ARCHS_COMMANDLINE="$MAC_ARCHS_COMMANDLINE -arch i386" + else + CFG_MAC_ARCHS="$CFG_MAC_ARCHS $i" + MAC_ARCHS_COMMANDLINE="$MAC_ARCHS_COMMANDLINE -arch $i" + fi + done +fi + # find the default framework value if [ "$PLATFORM_MAC" = "yes" ] && [ "$PLATFORM" != "macx-xlc" ]; then if [ "$CFG_FRAMEWORK" = "auto" ]; then @@ -2495,14 +2753,23 @@ fi #auto-detect DWARF2 on the mac -if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" != "no" ]; then - if "$mactests/dwarf2.test" "$TEST_COMPILER" "$OPT_VERBOSE"; then +if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" == "auto" ]; then + if "$mactests/dwarf2.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then CFG_MAC_DWARF2=no else CFG_MAC_DWARF2=yes fi fi +# auto-detect support for -Xarch on the mac +if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" == "auto" ]; then + if "$mactests/xarch.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then + CFG_MAC_XARCH=no + else + CFG_MAC_XARCH=yes + fi +fi + # don't autodetect support for separate debug info on objcopy when # cross-compiling as lots of toolchains seems to have problems with this if [ "$QT_CROSS_COMPILE" = "yes" ] && [ "$CFG_SEPARATE_DEBUG_INFO" = "auto" ]; then @@ -2554,10 +2821,15 @@ CFG_USE_GNUMAKE=yes fi +# If -opengl wasn't specified, don't try to auto-detect +if [ "$PLATFORM_QWS" = "yes" ] && [ "$CFG_OPENGL" = "auto" ]; then + CFG_OPENGL=no +fi + # mac if [ "$PLATFORM_MAC" = "yes" ]; then - if [ "$CFG_OPENGL" = "auto" ]; then - CFG_OPENGL=yes + if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then + CFG_OPENGL=desktop fi fi @@ -2577,15 +2849,6 @@ # x11 tests are done after qmake is built -# embedded -if [ "$PLATFORM_QWS" = "yes" ]; then - - # No OpenGL by default for Qt Embedded - if [ "$CFG_OPENGL" = "auto" ]; then - CFG_OPENGL=no - fi - -fi # QWS #setup the build parts if [ -z "$CFG_BUILD_PARTS" ]; then @@ -2612,7 +2875,7 @@ #prefix if [ -z "$QT_INSTALL_PREFIX" ]; then - if [ "$Edition" = "Trolltech" ]; then + if [ "$CFG_DEV" = "yes" ]; then QT_INSTALL_PREFIX="$outpath" # At Trolltech, we use sandboxed builds by default elif [ "$PLATFORM_QWS" = "yes" ]; then QT_INSTALL_PREFIX="/usr/local/Trolltech/QtEmbedded-${QT_VERSION}" @@ -2786,26 +3049,28 @@ fi cat <] [-prefix-install] [-bindir ] [-libdir ] +Usage: $relconf [-h] [-prefix ] [-prefix-install] [-bindir ] [-libdir ] [-docdir ] [-headerdir ] [-plugindir ] [-datadir ] [-translationdir ] [-sysconfdir ] [-examplesdir ] [-demosdir ] [-buildkey ] [-release] [-debug] - [-debug-and-release] [-shared] [-static] [-no-fast] [-fast] [-no-largefile] + [-debug-and-release] [-developer-build] [-shared] [-static] [-no-fast] [-fast] [-no-largefile] [-largefile] [-no-exceptions] [-exceptions] [-no-accessibility] [-accessibility] [-no-stl] [-stl] [-no-sql-] [-sql-] [-plugin-sql-] [-system-sqlite] [-no-qt3support] [-qt3support] [-platform] [-D ] [-I ] [-L ] [-help] - [-qt-zlib] [-system-zlib] [-no-gif] [-qt-gif] [-no-libtiff] [-system-libtiff] + [-qt-zlib] [-system-zlib] [-no-gif] [-qt-gif] [-no-libtiff] [-qt-libtiff] [-system-libtiff] [-no-libpng] [-qt-libpng] [-system-libpng] [-no-libmng] [-qt-libmng] [-system-libmng] [-no-libjpeg] [-qt-libjpeg] [-system-libjpeg] [-make ] [-no-make ] [-R ] [-l ] [-no-rpath] [-rpath] [-continue] [-verbose] [-v] [-silent] [-no-nis] [-nis] [-no-cups] [-cups] [-no-iconv] [-iconv] [-no-pch] [-pch] [-no-dbus] [-dbus] [-dbus-linked] [-no-separate-debug-info] [-no-mmx] [-no-3dnow] [-no-sse] [-no-sse2] - [-qtnamespace ] [-separate-debug-info] [-armfpa] + [-qtnamespace ] [-qtlibinfix ] [-separate-debug-info] [-armfpa] [-no-optimized-qmake] [-optimized-qmake] [-no-xmlpatterns] [-xmlpatterns] - [-no-phonon] [-phonon-backend] [-no-phonon-backend] [-phonon-backend] [-no-svg] - [-svg] [-no-webkit] [-webkit] [-no-assistant-webkit] [-assistant-webkit] + [-no-phonon] [-phonon] [-no-phonon-backend] [-phonon-backend] + [-no-openssl] [-openssl] [-openssl-linked] + [-no-gtkstyle] [-gtkstyle] [-no-svg] [-svg] [-no-webkit] [-webkit] + [-no-scripttools] [-scripttools] [additional platform specific options (see below)] @@ -2875,6 +3140,12 @@ -debug-and-release . Compile and link two versions of Qt, with and without debugging turned on (Mac only). + -developer-build.... Compile and link Qt with Qt developer options (including auto-tests exporting) + + -opensource......... Compile and link the Open-Source Edition of Qt. + -commercial......... Compile and link the Commercial Edition of Qt. + + * -shared ............ Create and use shared Qt libraries. -static ............ Create and use static Qt libraries. @@ -2927,8 +3198,8 @@ -no-qt3support ..... Disables the Qt 3 support functionality. * -qt3support ........ Enables the Qt 3 support functionality. - -no-xmlpatterns..... Do not build the QtXmlPatterns module. - + -xmlpatterns........ Build the QtXmlPatterns module. + -no-xmlpatterns .... Do not build the QtXmlPatterns module. + + -xmlpatterns ....... Build the QtXmlPatterns module. QtXmlPatterns is built if a decent C++ compiler is used and exceptions are enabled. @@ -2944,17 +3215,24 @@ -no-webkit ......... Do not build the WebKit module. + -webkit ............ Build the WebKit module. WebKit is built if a decent C++ compiler is used. - - * -no-assistant-webkit Do not use WebKit as the html rendering engine in - Assistant. - -assistant-webkit Use WebKit as html rendering engine in Assistant. - This is only available if the WebKit module is built. + + -no-scripttools .... Do not build the QtScriptTools module. + + -scripttools ....... Build the QtScriptTools module. -platform target ... The operating system and compiler you are building on ($PLATFORM). See the README file for a list of supported operating systems and compilers. +EOF +if [ "${PLATFORM_QWS}" != "yes" ]; then +cat << EOF + -graphicssystem Sets an alternate graphics system. Available options are: + raster - Software rasterizer + opengl - Rendering via OpenGL, Experimental! +EOF +fi +cat << EOF -no-mmx ............ Do not compile with use of MMX instructions. -no-3dnow .......... Do not compile with use of 3DNOW instructions. @@ -3004,6 +3282,9 @@ + -openssl ........... Enable run-time OpenSSL support. -openssl-linked .... Enabled linked OpenSSL support. + -ptmalloc .......... Override the system memory allocator with ptmalloc. + (Experimental.) + Additional options: -make ....... Add part to the list of parts to be built at make time. @@ -3036,6 +3317,7 @@ $CUN -no-cups ........... Do not compile CUPS support. $CUY -cups .............. Compile CUPS support. + Requires cups/cups.h and libcups.so.2. $CIN -no-iconv .......... Do not compile support for iconv(3). $CIY -iconv ............. Compile support for iconv(3). @@ -3045,7 +3327,7 @@ $DBN -no-dbus ........... Do not compile the QtDBus module. $DBY -dbus .............. Compile the QtDBus module and dynamically load libdbus-1. - -dbus-linked........ Compile the QtDBus module and link to libdbus-1. + -dbus-linked ....... Compile the QtDBus module and link to libdbus-1. -reduce-relocations ..... Reduce relocations in the libraries through extra linker optimizations (Qt/X11 and Qt for Embedded Linux only; @@ -3095,11 +3377,11 @@ SHN=" " fi if [ "$CFG_XINERAMA" = "no" ]; then - XRY=" " - XRN="*" + XAY=" " + XAN="*" else - XRY="*" - XRN=" " + XAY="*" + XAN=" " fi if [ "$CFG_FONTCONFIG" = "no" ]; then FCGY=" " @@ -3115,6 +3397,13 @@ XCY="*" XCN=" " fi + if [ "$CFG_XFIXES" = "no" ]; then + XFY=" " + XFN="*" + else + XFY="*" + XFN=" " + fi if [ "$CFG_XRANDR" = "no" ]; then XZY=" " XZN="*" @@ -3129,7 +3418,14 @@ XRY="*" XRN=" " fi - if [ "$CFG_TABLET" = "no" ]; then + if [ "$CFG_MITSHM" = "no" ]; then + XMY=" " + XMN="*" + else + XMY="*" + XMN=" " + fi + if [ "$CFG_XINPUT" = "no" ]; then XIY=" " XIN="*" else @@ -3154,12 +3450,22 @@ Qt/X11 only: + -no-gtkstyle ....... Do not build the GTK theme integration. + + -gtkstyle .......... Build the GTK theme integration. + * -no-nas-sound ...... Do not compile in NAS sound support. -system-nas-sound .. Use NAS libaudio from the operating system. See http://radscan.com/nas.html -no-opengl ......... Do not support OpenGL. - + -opengl ............ Enable OpenGL support. + + -opengl ...... Enable OpenGL support. + With no parameter, this will auto-detect the "best" + OpenGL API to use. If desktop OpenGL is avaliable, it + will be used. Use desktop, es1, es1cl or es2 for + to force the use of the Desktop (OpenGL 1.x or 2.x), + OpenGL ES 1.x Common profile, 1.x Common Lite profile + or 2.x APIs instead. On X11, the EGL API will be used + to manage GL contexts in the case of OpenGL ES. $SMN -no-sm ............. Do not support X Session Management. $SMY -sm ................ Support X Session Management, links in -lSM -lICE. @@ -3168,8 +3474,8 @@ $SHY -xshape ............ Compile XShape support. Requires X11/extensions/shape.h. - $XRN -no-xinerama ....... Do not compile Xinerama (multihead) support. - $XRY -xinerama .......... Compile Xinerama support. + $XAN -no-xinerama ....... Do not compile Xinerama (multihead) support. + $XAY -xinerama .......... Compile Xinerama support. Requires X11/extensions/Xinerama.h and libXinerama. By default, Xinerama support will be compiled if available and the shared libraries are dynamically @@ -3182,8 +3488,8 @@ available and the shared libraries are dynamically loaded at runtime. - $XCN -no-xfixes ......... Do not compile Xfixes support. - $XCY -xfixes ............ Compile Xfixes support. + $XFN -no-xfixes ......... Do not compile Xfixes support. + $XFY -xfixes ............ Compile Xfixes support. Requires X11/extensions/Xfixes.h and libXfixes. By default, Xfixes support will be compiled if available and the shared libraries are dynamically @@ -3195,16 +3501,20 @@ $XRN -no-xrender ........ Do not compile Xrender support. $XRY -xrender ........... Compile Xrender support. - Requires X11/extensions/Xrender.h and libXrender + Requires X11/extensions/Xrender.h and libXrender. + + $XMN -no-mitshm ......... Do not compile MIT-SHM support. + $XMY -mitshm ............ Compile MIT-SHM support. + Requires sys/ipc.h, sys/shm.h and X11/extensions/XShm.h $FCGN -no-fontconfig ..... Do not compile FontConfig (anti-aliased font) support. $FCGY -fontconfig ........ Compile FontConfig support. Requires fontconfig/fontconfig.h, libfontconfig, freetype.h and libfreetype. - $XIN -no-tablet ......... Do not compile Tablet support. - $XIY -tablet ............ Compile Tablet support. - Requires IRIX with wacom.h and libXi or + $XIN -no-xinput.......... Do not compile Xinput support. + $XIY -xinput ............ Compile Xinput support. This also enabled tablet support + which requires IRIX with wacom.h and libXi or XFree86 with X11/extensions/XInput.h and libXi. $XKN -no-xkb ............ Do not compile XKB (X KeyBoard extension) support. @@ -3221,17 +3531,24 @@ -Fstring ........... Add an explicit framework path. -fw string ......... Add an explicit framework. + -cocoa ............. Build the Cocoa version of Qt. Note that -no-framework + and -static is not supported with -cocoa. Specifying + this option creates Qt binaries that requires Mac OS X + 10.5 or higher. + * -framework ......... Build Qt as a series of frameworks and link tools against those frameworks. -no-framework ...... Do not build Qt as a series of frameworks. - -dwarf2 ............ Enable dwarf2 debugging symbols. - * -no-dwarf2 ......... Disable dwarf2 debugging symbols. + * -dwarf2 ............ Enable dwarf2 debugging symbols. + -no-dwarf2 ......... Disable dwarf2 debugging symbols. -universal ......... Equivalent to -arch "ppc x86" -arch ....... Build Qt for Example values for : x86 ppc x86_64 ppc64 + Multiple -arch arguments can be specified, 64-bit archs + will be built with the Cocoa framework. -sdk ......... Build Qt using Apple provided SDK . This option requires gcc 4. To use a different SDK with gcc 3.3, set the SDKROOT environment variable. @@ -3272,7 +3589,7 @@ -no-freetype ........ Do not compile in Freetype2 support. -qt-freetype ........ Use the libfreetype bundled with Qt. - * -system-libfreetype. Use libfreetype from the operating system. + * -system-freetype .... Use libfreetype from the operating system. See http://www.freetype.org/ -qconfig local ...... Use src/corelib/global/qconfig-local.h rather than the @@ -3290,6 +3607,14 @@ -no-decoration-