Hi, Could someone please commit the attached patches. The pkg-plist's has not been checked since Qt4.5 has very limited support for installing into a custom PREFIX (more about that later). Below are the details for each patch file (according to port):
databases/qt4-odbc-plugin:
- Add missing include to custom Makefile
devel/dbus-qt4:
- Mark MAKE_JOBS_UNSAFE [see below]
devel/qt4-corelib:
- Remove port revision
- Remove hack to hard-code the features of qconfig.h. The hack now appears
to do more damage that good. Attached is the qconfig.h generated by
configure (as apposed to the files/qconfig.h.in that has been removed).
- P.S. Please add USE_ICONV when the fix is committed
devel/qt4-linguist:
- Remove files/patch-0185-fix-format-strings.diff, API change, no longer
relevant.
- Re-role patch (with filename change):
files/patch-tools__linguist__linguist__trwindow.cpp =>
files/patch-tools__linguist__linguist__mainwindow.cpp
devel/qt4-scripttools:
- Add new port, required by misc/qt4-qtdemo. Based on qt4-script. pkg-plist
needs to be generated, will be done once installing into custom PREFIX has
been implemented.
devel/qt4-qvfb:
- Fix build with qt33 installed (remove stray -I${LOCALBASE}) [see below]
misc/qt4-qtdemo:
- Add missing dependency
multimedia_qt4-phonon:
- Have the final Makefile generated before patching it
www/qt4-webkit:
- Fix build with qt33 installed (remove stray -I${LOCALBASE}) [see below]
x11/qt4-opengl:
- Fix build with qt33 installed (remove stray -I${LOCALBASE}) [see below]
All ports have been build with FORCE_MAKE_JOBS as set, so MAKE_JOBS_SAFE could
be set for all ports (done on a quad-core system), except for dbus-qt4.
The fixes for build with qt33 are a result from -I{LOCALBASE} being included
way to early. How it gets there I do not know. It appears to be included
after the specific .pro file has been read and before some extra .prf files
are read (such as mkspecs/features/unix/hide_symbols.prf). Any idea as to
the root cause?
Currently qt4 (in area51) only supports installing the ports into the same
prefix as qmake4. This is since the install prefix is hard coded into
qmake4. I have found only one way to override this hard-code, that is to
recompile qmake4. configure does this by default so I intend to restore this
behaviour (when installing into a different PREFIX as to that by the system
qmake). This however will result in quite some growth in the Makefiles so I
propose to refractor the common code between the Makefiles (such as the
do-not-extract stuff). This would hopefully simplify maintenance.
I propose to add the file devel/qt4/Makefile.common and have the other ports
(such as devel/qt4-corelib) include it. If anyone has any objections or
alternative suggestions please let me know.
Regards,
David
/* Everything */ /* Qt Edition */ #ifndef QT_EDITION # define QT_EDITION QT_EDITION_OPENSOURCE #endif /* Machine byte-order */ #define Q_BIG_ENDIAN 4321 #define Q_LITTLE_ENDIAN 1234 #define QT_BUILD_KEY "i386 usr/local/share/qt4/mkspecs/freebsd g++-4 full-config" #define QT_BUILD_KEY_COMPAT "i386 FreeBSD g++-4 full-config" #ifdef QT_BOOTSTRAPPED #define Q_BYTE_ORDER Q_LITTLE_ENDIAN #else #define Q_BYTE_ORDER Q_LITTLE_ENDIAN #endif /* Machine Architecture */ #ifndef QT_BOOTSTRAPPED # define QT_ARCH_I386 #else # define QT_ARCH_I386 #endif /* Compile time features */ #define QT_LARGEFILE_SUPPORT 64 #define QT_POINTER_SIZE 4 #if defined(QT_BUILTIN_GIF_READER) && defined(QT_NO_BUILTIN_GIF_READER) # undef QT_BUILTIN_GIF_READER #elif !defined(QT_BUILTIN_GIF_READER) && !defined(QT_NO_BUILTIN_GIF_READER) # define QT_BUILTIN_GIF_READER 1 #endif #if defined(QT_NO_DBUS) && defined(QT_DBUS) # undef QT_NO_DBUS #elif !defined(QT_NO_DBUS) && !defined(QT_DBUS) # define QT_NO_DBUS #endif #if defined(QT_NO_EXCEPTIONS) && defined(QT_EXCEPTIONS) # undef QT_NO_EXCEPTIONS #elif !defined(QT_NO_EXCEPTIONS) && !defined(QT_EXCEPTIONS) # define QT_NO_EXCEPTIONS #endif #if defined(QT_NO_GSTREAMER) && defined(QT_GSTREAMER) # undef QT_NO_GSTREAMER #elif !defined(QT_NO_GSTREAMER) && !defined(QT_GSTREAMER) # define QT_NO_GSTREAMER #endif #if defined(QT_NO_ICONV) && defined(QT_ICONV) # undef QT_NO_ICONV #elif !defined(QT_NO_ICONV) && !defined(QT_ICONV) # define QT_NO_ICONV #endif #if defined(QT_NO_IMAGEFORMAT_JPEG) && defined(QT_IMAGEFORMAT_JPEG) # undef QT_NO_IMAGEFORMAT_JPEG #elif !defined(QT_NO_IMAGEFORMAT_JPEG) && !defined(QT_IMAGEFORMAT_JPEG) # define QT_NO_IMAGEFORMAT_JPEG #endif #if defined(QT_NO_IMAGEFORMAT_MNG) && defined(QT_IMAGEFORMAT_MNG) # undef QT_NO_IMAGEFORMAT_MNG #elif !defined(QT_NO_IMAGEFORMAT_MNG) && !defined(QT_IMAGEFORMAT_MNG) # define QT_NO_IMAGEFORMAT_MNG #endif #if defined(QT_NO_IMAGEFORMAT_TIFF) && defined(QT_IMAGEFORMAT_TIFF) # undef QT_NO_IMAGEFORMAT_TIFF #elif !defined(QT_NO_IMAGEFORMAT_TIFF) && !defined(QT_IMAGEFORMAT_TIFF) # define QT_NO_IMAGEFORMAT_TIFF #endif #if defined(QT_NO_INOTIFY) && defined(QT_INOTIFY) # undef QT_NO_INOTIFY #elif !defined(QT_NO_INOTIFY) && !defined(QT_INOTIFY) # define QT_NO_INOTIFY #endif #if defined(QT_NO_MREMAP) && defined(QT_MREMAP) # undef QT_NO_MREMAP #elif !defined(QT_NO_MREMAP) && !defined(QT_MREMAP) # define QT_NO_MREMAP #endif #if defined(QT_NO_NAS) && defined(QT_NAS) # undef QT_NO_NAS #elif !defined(QT_NO_NAS) && !defined(QT_NAS) # define QT_NO_NAS #endif #if defined(QT_NO_PHONON) && defined(QT_PHONON) # undef QT_NO_PHONON #elif !defined(QT_NO_PHONON) && !defined(QT_PHONON) # define QT_NO_PHONON #endif #if defined(QT_NO_STYLE_GTK) && defined(QT_STYLE_GTK) # undef QT_NO_STYLE_GTK #elif !defined(QT_NO_STYLE_GTK) && !defined(QT_STYLE_GTK) # define QT_NO_STYLE_GTK #endif #if defined(QT_NO_SXE) && defined(QT_SXE) # undef QT_NO_SXE #elif !defined(QT_NO_SXE) && !defined(QT_SXE) # define QT_NO_SXE #endif #if defined(QT_NO_XCURSOR) && defined(QT_XCURSOR) # undef QT_NO_XCURSOR #elif !defined(QT_NO_XCURSOR) && !defined(QT_XCURSOR) # define QT_NO_XCURSOR #endif #if defined(QT_NO_XMLPATTERNS) && defined(QT_XMLPATTERNS) # undef QT_NO_XMLPATTERNS #elif !defined(QT_NO_XMLPATTERNS) && !defined(QT_XMLPATTERNS) # define QT_NO_XMLPATTERNS #endif #if defined(QT_NO_XRANDR) && defined(QT_XRANDR) # undef QT_NO_XRANDR #elif !defined(QT_NO_XRANDR) && !defined(QT_XRANDR) # define QT_NO_XRANDR #endif #if defined(QT_NO_ZLIB) && defined(QT_ZLIB) # undef QT_NO_ZLIB #elif !defined(QT_NO_ZLIB) && !defined(QT_ZLIB) # define QT_NO_ZLIB #endif #if defined(QT_RUNTIME_XFIXES) && defined(QT_NO_RUNTIME_XFIXES) # undef QT_RUNTIME_XFIXES #elif !defined(QT_RUNTIME_XFIXES) && !defined(QT_NO_RUNTIME_XFIXES) # define QT_RUNTIME_XFIXES #endif #if defined(QT_RUNTIME_XINERAMA) && defined(QT_NO_RUNTIME_XINERAMA) # undef QT_RUNTIME_XINERAMA #elif !defined(QT_RUNTIME_XINERAMA) && !defined(QT_NO_RUNTIME_XINERAMA) # define QT_RUNTIME_XINERAMA #endif #if defined(QT_RUNTIME_XINPUT) && defined(QT_NO_RUNTIME_XINPUT) # undef QT_RUNTIME_XINPUT #elif !defined(QT_RUNTIME_XINPUT) && !defined(QT_NO_RUNTIME_XINPUT) # define QT_RUNTIME_XINPUT #endif #if defined(QT_USE_MATH_H_FLOATS) && defined(QT_NO_USE_MATH_H_FLOATS) # undef QT_USE_MATH_H_FLOATS #elif !defined(QT_USE_MATH_H_FLOATS) && !defined(QT_NO_USE_MATH_H_FLOATS) # define QT_USE_MATH_H_FLOATS #endif #define QT_VISIBILITY_AVAILABLE #define QT_VISIBILITY_AVAILABLE
Index: databases/qt4-odbc-plugin/files/Makefile.bsd
===================================================================
--- databases/qt4-odbc-plugin/files/Makefile.bsd (revision 4704)
+++ databases/qt4-odbc-plugin/files/Makefile.bsd (working copy)
@@ -4,6 +4,7 @@
CXXFLAGS+= -I${DRIVER} \
-I${PREFIX}/include/qt4 \
-I${PREFIX}/include/qt4/Qt \
+ -I${PREFIX}/include/qt4/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 \
Index: devel/dbus-qt4/Makefile
===================================================================
--- devel/dbus-qt4/Makefile (revision 4704)
+++ devel/dbus-qt4/Makefile (working copy)
@@ -27,6 +27,7 @@
HAS_CONFIGURE= yes
USE_LDCONFIG= ${PREFIX}/lib/qt4
+MAKE_JOBS_UNSAFE= yes
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
Index: devel/qt4-corelib/files/qconfig.h.in
===================================================================
--- devel/qt4-corelib/files/qconfig.h.in (revision 4704)
+++ devel/qt4-corelib/files/qconfig.h.in (working copy)
@@ -1,42 +0,0 @@
-#if defined(QT_NO_CLOCK_MONOTONIC) && defined(QT_CLOCK_MONOTONIC)
-# undef QT_NO_CLOCK_MONOTONIC
-#elif !defined(QT_NO_CLOCK_MONOTONIC) && !defined(QT_CLOCK_MONOTONIC)
-# define QT_NO_CLOCK_MONOTONIC
-#endif
-
-#if defined(QT_NO_EXCEPTIONS) && defined(QT_EXCEPTIONS)
-# undef QT_NO_EXCEPTIONS
-#elif !defined(QT_NO_EXCEPTIONS) && !defined(QT_EXCEPTIONS)
-# define QT_NO_EXCEPTIONS
-#endif
-
-#if defined(QT_NO_INOTIFY) && defined(QT_INOTIFY)
-# undef QT_NO_INOTIFY
-#elif !defined(QT_NO_INOTIFY) && !defined(QT_INOTIFY)
-# define QT_NO_INOTIFY
-#endif
-
-#if defined(QT_NO_MREMAP) && defined(QT_MREMAP)
-# undef QT_NO_MREMAP
-#elif !defined(QT_NO_MREMAP) && !defined(QT_MREMAP)
-# define QT_NO_MREMAP
-#endif
-
-#if defined(QT_NO_NAS) && defined(QT_NAS)
-# undef QT_NO_NAS
-#elif !defined(QT_NO_NAS) && !defined(QT_NAS)
-# define QT_NO_NAS
-#endif
-
-#if defined(QT_NO_SXE) && defined(QT_SXE)
-# undef QT_NO_SXE
-#elif !defined(QT_NO_SXE) && !defined(QT_SXE)
-# define QT_NO_SXE
-#endif
-
-#if defined(QT_USE_MATH_H_FLOATS) && defined(QT_NO_USE_MATH_H_FLOATS)
-# undef QT_USE_MATH_H_FLOATS
-#elif !defined(QT_USE_MATH_H_FLOATS) && !defined(QT_NO_USE_MATH_H_FLOATS)
-# define QT_USE_MATH_H_FLOATS
-#endif
-
Index: devel/qt4-corelib/Makefile
===================================================================
--- devel/qt4-corelib/Makefile (revision 4704)
+++ devel/qt4-corelib/Makefile (working copy)
@@ -8,7 +8,6 @@
PORTNAME= corelib
PORTVERSION= ${QT4_VERSION}
-PORTREVISION= 0
CATEGORIES?= devel
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -28,7 +27,6 @@
HAS_CONFIGURE= yes
USE_LDCONFIG= ${PREFIX}/lib/qt4
-
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
@@ -55,6 +53,7 @@
${MKDIR} ${WRKSRC}/../../mkspecs
${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../bin/qmake
${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../bin/moc
+
post-configure:
${REINPLACE_CMD} -e 's|${PREFIX}/lib/qt4/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
-e 's|.*$$(QMAKE).*||g' ${WRKSRC}/Makefile
@@ -62,10 +61,6 @@
-E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \
-E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \
${WRKSRC}/../../lib/pkgconfig/QtCore.pc
- #hack to hard-code the feature part of qconfig.h
- ${HEAD} -n 27 ${WRKSRC}/global/qconfig.h > ${WRKDIR}/qconfig.tmp
- ${CHMOD} 644 ${WRKSRC}/global/qconfig.h
- ${CAT} ${WRKDIR}/qconfig.tmp ${FILESDIR}/qconfig.h.in > ${WRKSRC}/global/qconfig.h
.if ${OSVERSION} >= 700042
${ECHO_CMD} "#define QT_VISIBILITY_AVAILABLE" >> ${WRKSRC}/global/qconfig.h
.endif
@@ -73,6 +68,7 @@
post-install:
${MKDIR} ${PREFIX}/lib/qt4/plugins
${TOUCH} ${PREFIX}/lib/qt4/plugins/.keep_me
+ ${MKDIR} ${PREFIX}/share/qt4/mkspecs
${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/mkspecs/qconfig.pri ${PREFIX}/share/qt4/mkspecs/
.include <bsd.port.post.mk>
Index: devel/qt4-linguist/files/patch-0185-fix-format-strings.diff
===================================================================
--- devel/qt4-linguist/files/patch-0185-fix-format-strings.diff (revision 4704)
+++ devel/qt4-linguist/files/patch-0185-fix-format-strings.diff (working copy)
@@ -1,16 +0,0 @@
---- tools/linguist/shared/profileevaluator.h.orig 2008-04-28 09:11:21.000000000 -0400
-+++ tools/linguist/shared/profileevaluator.h 2008-05-09 10:50:40.000000000 -0400
-@@ -112,7 +112,12 @@
- private:
- QStringList expandPattern(const QString &pattern);
- void logMessage(const QString &msg, MessageType mt = MT_DebugLevel2);
-- void logMessage(MessageType mt, const char *msg, ...);
-+ void logMessage(MessageType mt, const char *msg, ...)
-+#if defined(Q_CC_GNU) && !defined(__INSURE__)
-+ __attribute__ ((format (printf, 3, 4)))
-+#endif
-+ ;
-+
- QStringList expandVariableReferences(const QString &value);
- QStringList evaluateExpandFunction(const QByteArray &func, const QString &arguments);
-
Index: devel/qt4-linguist/files/patch-tools__linguist__linguist__mainwindow.cpp
===================================================================
--- devel/qt4-linguist/files/patch-tools__linguist__linguist__mainwindow.cpp (revision 0)
+++ devel/qt4-linguist/files/patch-tools__linguist__linguist__mainwindow.cpp (revision 0)
@@ -0,0 +1,11 @@
+--- tools/linguist/linguist/mainwindow.cpp~ 2009-04-02 12:17:18.000000000 +0200
++++ tools/linguist/linguist/mainwindow.cpp 2009-04-02 12:17:36.000000000 +0200
+@@ -1314,7 +1314,7 @@
+ if (m_assistantProcess->state() != QProcess::Running) {
+ QString app = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QDir::separator();
+ #if !defined(Q_OS_MAC)
+- app += QLatin1String("assistant");
++ app += QLatin1String("assistant-qt4");
+ #else
+ app += QLatin1String("Assistant.app/Contents/MacOS/Assistant");
+ #endif
Index: devel/qt4-linguist/files/patch-tools__linguist__linguist__trwindow.cpp
===================================================================
--- devel/qt4-linguist/files/patch-tools__linguist__linguist__trwindow.cpp (revision 4704)
+++ devel/qt4-linguist/files/patch-tools__linguist__linguist__trwindow.cpp (working copy)
@@ -1,11 +0,0 @@
---- ./tools/linguist/linguist/trwindow.cpp.orig 2008-04-28 17:11:21.000000000 +0400
-+++ ./tools/linguist/linguist/trwindow.cpp 2008-06-17 01:02:02.000000000 +0400
-@@ -939,7 +939,7 @@
- if (m_assistantProcess->state() != QProcess::Running) {
- QString app = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QDir::separator();
- #if !defined(Q_OS_MAC)
-- app += QLatin1String("assistant");
-+ app += QLatin1String("assistant-qt4");
- #else
- app += QLatin1String("Assistant.app/Contents/MacOS/Assistant");
- #endif
Index: devel/qt4-qvfb/Makefile
===================================================================
--- devel/qt4-qvfb/Makefile (revision 4704)
+++ devel/qt4-qvfb/Makefile (working copy)
@@ -54,4 +54,11 @@
${LN} -sf ${LOCALBASE}/bin/uic-qt4 ${WRKSRC}/../../bin/uic
${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/../../bin/rcc
+post-configure:
+ ${MAKE} -C ${WRKSRC} Makefile
+ ${REINPLACE_CMD} \
+ -e 's|-I[^ ]* -Wall|-Wall|g' \
+ ${WRKSRC}/Makefile
+
+
.include <bsd.port.mk>
Index: devel/qt4-scripttools/distinfo =================================================================== --- devel/qt4-scripttools/distinfo (revision 0) +++ devel/qt4-scripttools/distinfo (revision 0) @@ -0,0 +1,3 @@ +MD5 (KDE/qt-x11-opensource-src-4.5.0.tar.gz) = d6d1555b7a074e0a746f6247af402e11 +SHA256 (KDE/qt-x11-opensource-src-4.5.0.tar.gz) = 61831af6b71c7bd4e1ef542071225835d8c741fa8e079bceab8c83f712e396a1 +SIZE (KDE/qt-x11-opensource-src-4.5.0.tar.gz) = 123179308 Index: devel/qt4-scripttools/pkg-descr =================================================================== --- devel/qt4-scripttools/pkg-descr (revision 0) +++ devel/qt4-scripttools/pkg-descr (revision 0) @@ -0,0 +1,12 @@ +Qt is a C++ toolkit for application development. It lets application +developers target all major operating systems with a single application +source code. + +Qt provides a platform-independent API to all central platform functionality: +GUI, database access, networking, file handling, etc. The Qt library +encapsulates the different APIs of different operating systems, providing +the application programmer with a single, common API for all operating systems. +The native C APIs are encapsulated in a set of well-designed, fully +object-oriented C++ classes. + +WWW: http://www.trolltech.com/products/qt/index.html Index: devel/qt4-scripttools/pkg-plist =================================================================== --- devel/qt4-scripttools/pkg-plist (revision 0) +++ devel/qt4-scripttools/pkg-plist (revision 0) @@ -0,0 +1 @@ + Index: devel/qt4-scripttools/Makefile =================================================================== --- devel/qt4-scripttools/Makefile (revision 0) +++ devel/qt4-scripttools/Makefile (revision 0) @@ -0,0 +1,67 @@ +# -*-mode: makefile-*- +# New ports collection makefile for: qt40 +# Date created: Wed Jun 29 11:49:42 CEST 2005 +# Whom: l...@freebsd.org +# +# $FreeBSD$ +# + +PORTNAME= scripttools +PORTVERSION= ${QT4_VERSION} +PORTREVISION=0 +CATEGORIES?= devel +MASTER_SITES= ${MASTER_SITE_QT} +PKGNAMEPREFIX= qt4- +DISTNAME= qt-x11-opensource-src-${PORTVERSION} +DIST_SUBDIR= KDE + +MAINTAINER= k...@freebsd.org +COMMENT= Qt script + +USE_QT_VER= 4 +QT_COMPONENTS= qmake_build moc_build rcc_build corelib gui +QT_NONSTANDARD= yes +QT_DIST= yes + +HAS_CONFIGURE= yes +USE_LDCONFIG= ${PREFIX}/lib/qt4 + +ALL_TARGET= first +CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH +MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \ + PATH=${WRKSRC}/bin:$$PATH + +DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ + src/dbus src/network src/opengl src/phonon \ + src/qt3support src/sql src/svg src/testlib \ + src/tools src/xml src/xmlpatterns src/3rdparty/clucene \ + src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit +EXTRACT_AFTER_ARGS= | ${TAR} -xf - +.for dne in ${DO_NOT_EXTRACT} +EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' +.endfor + +WRKSRC= ${WRKDIR}/${DISTNAME}/src/${PORTNAME} +CONFIGURE_WRKSRC=${WRKSRC}/../../ +PATCH_WRKSRC=${WRKSRC}/../../ + +pre-configure: + ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} + ${MKDIR} ${WRKSRC}/../../mkspecs + ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../bin/qmake + ${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../bin/moc + ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/../../bin/rcc + +post-configure: + ${MAKE} -C ${WRKSRC} Makefile + ${REINPLACE_CMD} \ + -e 's|${PREFIX}/lib/qt4/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ + -e 's|.*$$(QMAKE).*||g' \ + ${WRKSRC}/Makefile + ${REINPLACE_CMD} \ + -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ + -E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \ + ${WRKSRC}/../../lib/pkgconfig/QtScriptTools.pc + + +.include <bsd.port.mk> Index: Mk/bsd.qt.mk =================================================================== --- Mk/bsd.qt.mk (revision 4704) +++ Mk/bsd.qt.mk (working copy) @@ -97,7 +97,8 @@ inputmethods linguist l10n makeqpf moc network opengl \ pixeltool porting phonon phonon-gst qdbusviewer \ qmake qt3support qtconfig qtestlib qvfb rcc script \ - sql svg uic uic3 webkit xml xmlpatterns xmlpatterns-tool + scripttools sql svg uic uic3 webkit xml xmlpatterns \ + xmlpatterns-tool accessible_DEPENDS= accessibility/qt4-accessible assistant_DEPENDS= devel/qt4-assistant @@ -137,6 +138,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 @@ -184,6 +186,7 @@ qvfb_build_DEPENDS= ${qvfb_DEPENDS} rcc_build_DEPENDS= ${rcc_DEPENDS} script_build_DEPENDS= ${script_DEPENDS} +scripttools_build_DEPENDS= ${scripttools_DEPENDS} sql_build_DEPENDS= ${sql_DEPENDS} svg_build_DEPENDS= ${svg_DEPENDS} uic_build_DEPENDS= ${uic_DEPENDS} @@ -231,6 +234,7 @@ qvfb_run_DEPENDS= ${qvfb_DEPENDS} rcc_run_DEPENDS= ${rcc_DEPENDS} script_run_DEPENDS= ${script_DEPENDS} +scripttools_run_DEPENDS= ${scripttools_DEPENDS} sql_run_DEPENDS= ${sql_DEPENDS} svg_run_DEPENDS= ${svg_DEPENDS} uic_run_DEPENDS= ${uic_DEPENDS}
Index: misc/qt4-qtdemo/Makefile =================================================================== --- misc/qt4-qtdemo/Makefile (revision 4704) +++ misc/qt4-qtdemo/Makefile (working copy) @@ -21,8 +21,8 @@ USE_QT_VER= 4 QT_COMPONENTS= qmake_build moc_build rcc_build uic_build assistantclient \ corelib designer gui network opengl sql svg qtestlib xml \ - imageformats_run dbus script webkit phonon help assistant_run \ - phonon-gst + imageformats_run dbus script scripttools webkit phonon help \ + assistant_run phonon-gst QT_NONSTANDARD= yes QT_DIST= yes
Index: www/qt4-webkit/Makefile
===================================================================
--- www/qt4-webkit/Makefile (revision 4704)
+++ www/qt4-webkit/Makefile (working copy)
@@ -53,6 +53,7 @@
post-configure:
${REINPLACE_CMD} \
-e 's|${PREFIX}/lib/qt4/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
+ -e 's|-I[^ ]* -fvisibility=hidden|-fvisibility=hidden|g' \
-e 's|.*$$(QMAKE).*||g' \
${WRKSRC}/Makefile
${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \
Index: multimedia/qt4-phonon/Makefile
===================================================================
--- multimedia/qt4-phonon/Makefile (revision 4704)
+++ multimedia/qt4-phonon/Makefile (working copy)
@@ -58,6 +58,7 @@
${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../bin/moc
post-configure:
+ ${MAKE} -C ${WRKSRC} Makefile
${REINPLACE_CMD} \
-e 's|${PREFIX}/lib/qt4/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
-e 's|.*$$(QMAKE).*||g' \
Index: x11/qt4-opengl/Makefile
===================================================================
--- x11/qt4-opengl/Makefile (revision 4704)
+++ x11/qt4-opengl/Makefile (working copy)
@@ -53,7 +53,9 @@
${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../bin/moc
post-configure:
- ${REINPLACE_CMD} -e 's|${PREFIX}/lib/qt4/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
+ ${REINPLACE_CMD} \
+ -e 's|${PREFIX}/lib/qt4/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
+ -e 's|-I[^ ]* -fvisibility=hidden|-fvisibility=hidden|g' \
-e 's|.*$$(QMAKE).*||g' ${WRKSRC}/Makefile
${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \
-E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ kde-freebsd mailing list kde-freebsd@kde.org https://mail.kde.org/mailman/listinfo/kde-freebsd See also http://freebsd.kde.org/ for latest information
