diff options
| author | Michael Nottebrock <lofi@FreeBSD.org> | 2007-08-02 22:37:40 +0000 |
|---|---|---|
| committer | Michael Nottebrock <lofi@FreeBSD.org> | 2007-08-02 22:37:40 +0000 |
| commit | e332496be5f6fa4fa10c72920241b6910a69ca00 (patch) | |
| tree | 7c1e4ee6690abd492b16853205c1bf65c308e4fb /devel | |
| parent | a89bbaf869b99b813eb1a147e18884857d7e5495 (diff) | |
| download | ports-e332496be5f6fa4fa10c72920241b6910a69ca00.tar.gz ports-e332496be5f6fa4fa10c72920241b6910a69ca00.zip | |
- bsd.qt.mk:
QT_COMPONENTS can now be depended on at runtime or buildtime only by
specifiying them as <component>_build or <component>_run, respectively.
Specifying <component> without any suffix will depend on the component
at both build- and runtime just like before.
- Convert Qt core ports to use the new dependency switches.
- Add a patch to corelib to fix Qt4 on ARM, submitted by:
Björn König <bkoenig@alpha-tierchen.de>
Notes
Notes:
svn path=/head/; revision=196993
Diffstat (limited to 'devel')
35 files changed, 63 insertions, 60 deletions
diff --git a/devel/dbus-qt4/Makefile b/devel/dbus-qt4/Makefile index 52768b9b135e..a8efef71ebb1 100644 --- a/devel/dbus-qt4/Makefile +++ b/devel/dbus-qt4/Makefile @@ -21,7 +21,7 @@ COMMENT= Qt4 bindings for the D-BUS messaging system LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus USE_QT_VER= 4 -QT_COMPONENTS= qmake moc rcc corelib gui xml +QT_COMPONENTS= qmake_build moc_build rcc_build corelib gui xml QT_NONSTANDARD= yes QT_DIST= yes @@ -43,8 +43,6 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf - \ WRKSRC= ${WRKDIR}/${DISTNAME}/tools/qdbus CONFIGURE_WRKSRC=${WRKSRC}/../../ -.include <bsd.port.pre.mk> - pre-configure: ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} ${REINPLACE_CMD} -e 's|qdbusviewer||g' ${WRKSRC}/tools/tools.pro @@ -68,4 +66,4 @@ post-configure: -E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \ ${WRKSRC}/../../lib/pkgconfig/*Qt* -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/dbus-qt4/pkg-plist b/devel/dbus-qt4/pkg-plist index 9575b6c51744..0efee4443d78 100644 --- a/devel/dbus-qt4/pkg-plist +++ b/devel/dbus-qt4/pkg-plist @@ -1,9 +1,9 @@ bin/qdbus -bin/qdbus.debug +%%DEBUG%%bin/qdbus.debug bin/qdbuscpp2xml -bin/qdbuscpp2xml.debug +%%DEBUG%%bin/qdbuscpp2xml.debug bin/qdbusxml2cpp -bin/qdbusxml2cpp.debug +%%DEBUG%%bin/qdbusxml2cpp.debug include/QtDBus/QDBusAbstractAdaptor include/QtDBus/QDBusAbstractInterface include/QtDBus/QDBusArgument @@ -40,6 +40,6 @@ lib/libQtDBus.so lib/libQtDBus.so.4 lib/libQtDBus.so.4.3 lib/libQtDBus.so.4.3.0 -lib/libQtDBus.so.4.3.0.debug +%%DEBUG%%lib/libQtDBus.so.4.3.0.debug libdata/pkgconfig/QtDBus.pc @dirrm include/QtDBus diff --git a/devel/qt4-assistant/Makefile b/devel/qt4-assistant/Makefile index 023e78e550fe..949164b2cbe0 100644 --- a/devel/qt4-assistant/Makefile +++ b/devel/qt4-assistant/Makefile @@ -19,7 +19,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt documentation browser USE_QT_VER= 4 -QT_COMPONENTS= qmake moc rcc uic qt3support corelib gui network sql xml doc +QT_COMPONENTS= qmake_build moc_build rcc_build uic_build qt3support corelib \ + gui network sql xml doc QT_NONSTANDARD= yes QT_DIST= yes diff --git a/devel/qt4-assistant/pkg-plist b/devel/qt4-assistant/pkg-plist index 5d85d93372aa..fb8d73d1d7e1 100644 --- a/devel/qt4-assistant/pkg-plist +++ b/devel/qt4-assistant/pkg-plist @@ -1,2 +1,2 @@ bin/assistant-qt4 -bin/assistant-qt4.debug +%%DEBUG%%bin/assistant-qt4.debug diff --git a/devel/qt4-corelib/Makefile b/devel/qt4-corelib/Makefile index 657e94bd2541..600ffd7198f2 100644 --- a/devel/qt4-corelib/Makefile +++ b/devel/qt4-corelib/Makefile @@ -21,7 +21,7 @@ COMMENT= Qt core library LIB_DEPENDS= glib-2.0:${PORTSDIR}/devel/glib20 USE_QT_VER= 4 -QT_COMPONENTS= qmake moc +QT_COMPONENTS= qmake_build moc_build QT_NONSTANDARD= yes QT_DIST= yes @@ -47,8 +47,6 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src/${PORTNAME} CONFIGURE_WRKSRC=${WRKSRC}/../../ PATCH_WRKSRC=${CONFIGURE_WRKSRC} -.include <bsd.port.pre.mk> - pre-configure: ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} ${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib|g' \ @@ -60,16 +58,14 @@ pre-configure: ${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../bin/moc post-configure: ${REINPLACE_CMD} -e 's|${PREFIX}/lib/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ - -e 's|.*$$(QMAKE).*||g' -e 's|(test -z.*||g' ${WRKSRC}/Makefile + -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' \ -E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \ ${WRKSRC}/../../lib/pkgconfig/*Qt* -.if !defined(PKGNAMESUFFIX) post-install: ${MKDIR} ${PREFIX}/lib/plugins ${TOUCH} ${PREFIX}/lib/plugins/.keep_me -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/qt4-corelib/files/patch-src_corelib_arch_arm_arch.pri b/devel/qt4-corelib/files/patch-src_corelib_arch_arm_arch.pri new file mode 100644 index 000000000000..0cc60cd18225 --- /dev/null +++ b/devel/qt4-corelib/files/patch-src_corelib_arch_arm_arch.pri @@ -0,0 +1,9 @@ +--- src/corelib/arch/arm/arch.pri.orig 2007-05-25 15:24:41.000000000 +0200 ++++ src/corelib/arch/arm/arch.pri 2007-07-25 20:23:32.000000000 +0200 +@@ -1,5 +1,4 @@ + # + # ARM architecture + # +-SOURCES += $$QT_ARCH_CPP/qatomic.cpp \ +- $$QT_ARCH_CPP/malloc.c ++SOURCES += $$QT_ARCH_CPP/qatomic.cpp diff --git a/devel/qt4-corelib/pkg-plist b/devel/qt4-corelib/pkg-plist index d3d9433865ce..00c303d47d93 100644 --- a/devel/qt4-corelib/pkg-plist +++ b/devel/qt4-corelib/pkg-plist @@ -419,6 +419,7 @@ lib/libQtCore.so lib/libQtCore.so.4 lib/libQtCore.so.4.3 lib/libQtCore.so.4.3.0 +%%DEBUG%%lib/libQtCore.so.4.3.0.debug lib/plugins/.keep_me libdata/pkgconfig/QtCore.pc @dirrmtry share/qt4 diff --git a/devel/qt4-designer/Makefile b/devel/qt4-designer/Makefile index f1db40c8dad3..bfa83eefeb33 100644 --- a/devel/qt4-designer/Makefile +++ b/devel/qt4-designer/Makefile @@ -19,8 +19,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt ui editor USE_QT_VER= 4 -QT_COMPONENTS= qmake moc rcc uic assistantclient qt3support corelib gui network\ - script sql xml +QT_COMPONENTS= qmake_build moc_build rcc_build uic_build assistantclient \ + qt3support corelib gui network script sql xml QT_NONSTANDARD= yes QT_DIST= yes diff --git a/devel/qt4-designer/pkg-plist b/devel/qt4-designer/pkg-plist index 5441f3ec4714..42629782fa43 100644 --- a/devel/qt4-designer/pkg-plist +++ b/devel/qt4-designer/pkg-plist @@ -1,5 +1,5 @@ bin/designer-qt4 -bin/designer-qt4.debug +%%DEBUG%%bin/designer-qt4.debug include/QtDesigner/QAbstractExtensionFactory include/QtDesigner/QAbstractExtensionManager include/QtDesigner/QAbstractFormBuilder @@ -87,17 +87,17 @@ lib/libQtDesigner.so lib/libQtDesigner.so.4 lib/libQtDesigner.so.4.3 lib/libQtDesigner.so.4.3.0 -lib/libQtDesigner.so.4.3.0.debug +%%DEBUG%%lib/libQtDesigner.so.4.3.0.debug lib/libQtDesignerComponents.prl lib/libQtDesignerComponents.so lib/libQtDesignerComponents.so.4 lib/libQtDesignerComponents.so.4.3 lib/libQtDesignerComponents.so.4.3.0 -lib/libQtDesignerComponents.so.4.3.0.debug +%%DEBUG%%lib/libQtDesignerComponents.so.4.3.0.debug lib/libQtUiTools.a lib/libQtUiTools.prl lib/plugins/libqt3supportwidgets.so -lib/plugins/libqt3supportwidgets.so.debug +%%DEBUG%%lib/plugins/libqt3supportwidgets.so.debug libdata/pkgconfig/QtUiTools.pc @dirrm include/QtUiTools @dirrm include/QtDesigner diff --git a/devel/qt4-libqtassistantclient/Makefile b/devel/qt4-libqtassistantclient/Makefile index 255dfd469c26..947985cb065b 100644 --- a/devel/qt4-libqtassistantclient/Makefile +++ b/devel/qt4-libqtassistantclient/Makefile @@ -19,7 +19,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt documentation browser integration library USE_QT_VER= 4 -QT_COMPONENTS= qmake moc corelib gui network +QT_COMPONENTS= qmake_build moc_build corelib gui network QT_NONSTANDARD= yes QT_DIST= yes @@ -56,7 +56,7 @@ pre-configure: post-configure: ${REINPLACE_CMD} -e 's|${PREFIX}/lib/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ - -e 's|.*$$(QMAKE).*||g' -e 's|(test -z.*||g' ${WRKSRC}/Makefile + -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' \ -E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \ diff --git a/devel/qt4-libqtassistantclient/pkg-plist b/devel/qt4-libqtassistantclient/pkg-plist index 32f134063776..a371174cd079 100644 --- a/devel/qt4-libqtassistantclient/pkg-plist +++ b/devel/qt4-libqtassistantclient/pkg-plist @@ -7,5 +7,6 @@ lib/libQtAssistantClient.so lib/libQtAssistantClient.so.4 lib/libQtAssistantClient.so.4.3 lib/libQtAssistantClient.so.4.3.0 +%%DEBUG%%lib/libQtAssistantClient.so.4.3.0.debug libdata/pkgconfig/QtAssistantClient.pc @dirrm include/QtAssistant diff --git a/devel/qt4-linguist/Makefile b/devel/qt4-linguist/Makefile index f26d6431053b..0ae577b10cef 100644 --- a/devel/qt4-linguist/Makefile +++ b/devel/qt4-linguist/Makefile @@ -19,7 +19,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt localisation tool USE_QT_VER= 4 -QT_COMPONENTS= qmake designer moc rcc uic assistantclient gui network xml +QT_COMPONENTS= qmake_build designer moc_build rcc_build uic_build \ + assistantclient gui network xml QT_NONSTANDARD= yes QT_DIST= yes diff --git a/devel/qt4-linguist/pkg-plist b/devel/qt4-linguist/pkg-plist index e629ea1c49be..6c2d4046abce 100644 --- a/devel/qt4-linguist/pkg-plist +++ b/devel/qt4-linguist/pkg-plist @@ -1,9 +1,9 @@ bin/linguist-qt4 -bin/linguist-qt4.debug +%%DEBUG%%bin/linguist-qt4.debug bin/lrelease-qt4 -bin/lrelease-qt4.debug +%%DEBUG%%bin/lrelease-qt4.debug bin/lupdate-qt4 -bin/lupdate-qt4.debug +%%DEBUG%%bin/lupdate-qt4.debug share/qt4/phrasebooks/danish.qph share/qt4/phrasebooks/dutch.qph share/qt4/phrasebooks/finnish.qph diff --git a/devel/qt4-makeqpf/Makefile b/devel/qt4-makeqpf/Makefile index 85274db8ef62..bb0e1d2f44cd 100644 --- a/devel/qt4-makeqpf/Makefile +++ b/devel/qt4-makeqpf/Makefile @@ -19,7 +19,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt qtopia font creator USE_QT_VER= 4 -QT_COMPONENTS= qmake moc rcc uic corelib gui +QT_COMPONENTS= qmake_build moc_build rcc_build uic_build corelib gui QT_NONSTANDARD= yes QT_DIST= yes diff --git a/devel/qt4-makeqpf/pkg-plist b/devel/qt4-makeqpf/pkg-plist index e559beaa3c72..cc85d393c083 100644 --- a/devel/qt4-makeqpf/pkg-plist +++ b/devel/qt4-makeqpf/pkg-plist @@ -1,2 +1,2 @@ bin/makeqpf-qt4 -bin/makeqpf-qt4.debug +%%DEBUG%%bin/makeqpf-qt4.debug diff --git a/devel/qt4-moc/Makefile b/devel/qt4-moc/Makefile index 95224e8c61bc..8801e17136ae 100644 --- a/devel/qt4-moc/Makefile +++ b/devel/qt4-moc/Makefile @@ -19,7 +19,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt meta object compiler USE_QT_VER= 4 -QT_COMPONENTS= qmake +QT_COMPONENTS= qmake_build QT_NONSTANDARD= yes QT_DIST= yes diff --git a/devel/qt4-moc/pkg-plist b/devel/qt4-moc/pkg-plist index 9629ce043147..690446be106a 100644 --- a/devel/qt4-moc/pkg-plist +++ b/devel/qt4-moc/pkg-plist @@ -1,2 +1,2 @@ bin/moc-qt4 -bin/moc-qt4.debug +%%DEBUG%%bin/moc-qt4.debug diff --git a/devel/qt4-porting/Makefile b/devel/qt4-porting/Makefile index bea665729817..4d20c3b91c2a 100644 --- a/devel/qt4-porting/Makefile +++ b/devel/qt4-porting/Makefile @@ -18,7 +18,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt utility to assist with porting Qt3 applications to Qt4 USE_QT_VER= 4 -QT_COMPONENTS= qmake moc rcc uic corelib xml +QT_COMPONENTS= qmake_build moc_build rcc_build uic_build corelib xml QT_NONSTANDARD= yes QT_DIST= yes diff --git a/devel/qt4-porting/pkg-plist b/devel/qt4-porting/pkg-plist index cf760c8d2a95..be89f2cc9eb9 100644 --- a/devel/qt4-porting/pkg-plist +++ b/devel/qt4-porting/pkg-plist @@ -1,3 +1,3 @@ bin/qt3to4 -bin/qt3to4.debug +%%DEBUG%%bin/qt3to4.debug share/qt4/q3porting.xml diff --git a/devel/qt4-qdbusviewer/Makefile b/devel/qt4-qdbusviewer/Makefile index b5e988b6e5b3..8ddd75e24b86 100644 --- a/devel/qt4-qdbusviewer/Makefile +++ b/devel/qt4-qdbusviewer/Makefile @@ -21,7 +21,7 @@ COMMENT= Qt4 D-BUS viewer LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus USE_QT_VER= 4 -QT_COMPONENTS= qmake moc rcc corelib dbus gui xml +QT_COMPONENTS= qmake_build moc_build rcc_build corelib dbus gui xml QT_NONSTANDARD= yes QT_DIST= yes diff --git a/devel/qt4-qdbusviewer/pkg-plist b/devel/qt4-qdbusviewer/pkg-plist index 1eb0a48e3608..5a6cf015d441 100644 --- a/devel/qt4-qdbusviewer/pkg-plist +++ b/devel/qt4-qdbusviewer/pkg-plist @@ -1,2 +1,2 @@ bin/qdbusviewer -bin/qdbusviewer.debug +%%DEBUG%%bin/qdbusviewer.debug diff --git a/devel/qt4-qt3support/Makefile b/devel/qt4-qt3support/Makefile index 0c8dc2617a3b..a931e8221b1c 100644 --- a/devel/qt4-qt3support/Makefile +++ b/devel/qt4-qt3support/Makefile @@ -19,7 +19,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt3 compatibility library USE_QT_VER= 4 -QT_COMPONENTS= qmake moc corelib gui network sql xml +QT_COMPONENTS= qmake_build moc_build corelib gui network sql xml QT_NONSTANDARD= yes QT_DIST= yes @@ -45,8 +45,6 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src/${PORTNAME} CONFIGURE_WRKSRC=${WRKSRC}/../../ PATCH_WRKSRC=${CONFIGURE_WRKSRC} -.include <bsd.port.pre.mk> - pre-configure: ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} ${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib|g' \ @@ -64,4 +62,4 @@ post-configure: -E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \ ${WRKSRC}/../../lib/pkgconfig/*Qt* -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/qt4-qt3support/pkg-plist b/devel/qt4-qt3support/pkg-plist index 002aca07c933..107f8ab1edca 100644 --- a/devel/qt4-qt3support/pkg-plist +++ b/devel/qt4-qt3support/pkg-plist @@ -407,6 +407,6 @@ lib/libQt3Support.so lib/libQt3Support.so.4 lib/libQt3Support.so.4.3 lib/libQt3Support.so.4.3.0 -lib/libQt3Support.so.4.3.0.debug +%%DEBUG%%lib/libQt3Support.so.4.3.0.debug libdata/pkgconfig/Qt3Support.pc @dirrm include/Qt3Support diff --git a/devel/qt4-qtestlib/Makefile b/devel/qt4-qtestlib/Makefile index ee5d65d6c9fe..b784f4c1443a 100644 --- a/devel/qt4-qtestlib/Makefile +++ b/devel/qt4-qtestlib/Makefile @@ -19,7 +19,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt unit testing library USE_QT_VER= 4 -QT_COMPONENTS= qmake moc corelib +QT_COMPONENTS= qmake_build moc_build corelib QT_NONSTANDARD= yes QT_DIST= yes @@ -45,8 +45,6 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/tools/${PORTNAME} CONFIGURE_WRKSRC=${WRKSRC}/../../ PATCH_WRKSRC=${CONFIGURE_WRKSRC} -.include <bsd.port.pre.mk> - pre-configure: ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} ${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib|g' \ @@ -57,10 +55,10 @@ pre-configure: ${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../bin/moc post-configure: ${REINPLACE_CMD} -e 's|${PREFIX}/lib/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ - -e 's|.*$$(QMAKE).*||g' -e 's|(test -z.*||g' ${WRKSRC}/src/Makefile + -e 's|.*$$(QMAKE).*||g' ${WRKSRC}/src/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' \ -E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \ ${WRKSRC}/../../lib/pkgconfig/*Qt* -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/qt4-qtestlib/pkg-plist b/devel/qt4-qtestlib/pkg-plist index 373b663d75df..ce45c94cdeac 100644 --- a/devel/qt4-qtestlib/pkg-plist +++ b/devel/qt4-qtestlib/pkg-plist @@ -33,5 +33,6 @@ lib/libQtTest.so lib/libQtTest.so.4 lib/libQtTest.so.4.3 lib/libQtTest.so.4.3.0 +%%DEBUG%%lib/libQtTest.so.4.3.0.debug libdata/pkgconfig/QtTest.pc @dirrm include/QtTest diff --git a/devel/qt4-qvfb/Makefile b/devel/qt4-qvfb/Makefile index f12215ffc1a2..3cde459db48f 100644 --- a/devel/qt4-qvfb/Makefile +++ b/devel/qt4-qvfb/Makefile @@ -19,7 +19,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt virtual framebuffer utility USE_QT_VER= 4 -QT_COMPONENTS= qmake moc rcc uic corelib gui opengl +QT_COMPONENTS= qmake_build moc_build rcc_build uic_build corelib gui opengl QT_NONSTANDARD= yes QT_DIST= yes diff --git a/devel/qt4-qvfb/pkg-plist b/devel/qt4-qvfb/pkg-plist index ae5639ce4ec3..f31b576acbed 100644 --- a/devel/qt4-qvfb/pkg-plist +++ b/devel/qt4-qvfb/pkg-plist @@ -1,5 +1,5 @@ bin/qvfb-qt4 -bin/qvfb-qt4.debug +%%DEBUG%%bin/qvfb-qt4.debug %%DATADIR%%/ClamshellPhone.skin/ClamshellPhone.skin %%DATADIR%%/ClamshellPhone.skin/ClamshellPhone1-5-closed.png %%DATADIR%%/ClamshellPhone.skin/ClamshellPhone1-5-pressed.png diff --git a/devel/qt4-rcc/Makefile b/devel/qt4-rcc/Makefile index 0a276bf52905..9ae1ad4ce781 100644 --- a/devel/qt4-rcc/Makefile +++ b/devel/qt4-rcc/Makefile @@ -18,7 +18,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt resource compiler USE_QT_VER= 4 -QT_COMPONENTS= qmake +QT_COMPONENTS= qmake_build QT_NONSTANDARD= yes QT_DIST= yes diff --git a/devel/qt4-rcc/pkg-plist b/devel/qt4-rcc/pkg-plist index 8a57dd1cd7a4..f17a054adcb1 100644 --- a/devel/qt4-rcc/pkg-plist +++ b/devel/qt4-rcc/pkg-plist @@ -1,2 +1,2 @@ bin/rcc -bin/rcc.debug +%%DEBUG%%bin/rcc.debug diff --git a/devel/qt4-script/Makefile b/devel/qt4-script/Makefile index 28f1e68bc5c2..7ac82ce3cc17 100644 --- a/devel/qt4-script/Makefile +++ b/devel/qt4-script/Makefile @@ -19,7 +19,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt script USE_QT_VER= 4 -QT_COMPONENTS= qmake moc corelib +QT_COMPONENTS= qmake_build moc_build corelib QT_NONSTANDARD= yes QT_DIST= yes @@ -45,8 +45,6 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src/${PORTNAME} CONFIGURE_WRKSRC=${WRKSRC}/../../ PATCH_WRKSRC=${WRKSRC}/../../ -.include <bsd.port.pre.mk> - pre-configure: ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} ${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib|g' \ @@ -59,10 +57,10 @@ pre-configure: post-configure: ${REINPLACE_CMD} -e 's|${PREFIX}/lib/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ - -e 's|.*$$(QMAKE).*||g' -e 's|(test -z.*||g' ${WRKSRC}/Makefile + -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' \ -E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \ ${WRKSRC}/../../lib/pkgconfig/*Qt* -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/qt4-script/pkg-plist b/devel/qt4-script/pkg-plist index 9b91d242407b..142a03be8da1 100644 --- a/devel/qt4-script/pkg-plist +++ b/devel/qt4-script/pkg-plist @@ -28,5 +28,6 @@ lib/libQtScript.so lib/libQtScript.so.4 lib/libQtScript.so.4.3 lib/libQtScript.so.4.3.0 +%%DEBUG%%lib/libQtScript.so.4.3.0.debug libdata/pkgconfig/QtScript.pc @dirrm include/QtScript diff --git a/devel/qt4-uic/Makefile b/devel/qt4-uic/Makefile index bbadecde2553..940196e76a73 100644 --- a/devel/qt4-uic/Makefile +++ b/devel/qt4-uic/Makefile @@ -19,7 +19,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt user interface compiler USE_QT_VER= 4 -QT_COMPONENTS= qmake +QT_COMPONENTS= qmake_build QT_NONSTANDARD= yes QT_DIST= yes diff --git a/devel/qt4-uic/pkg-plist b/devel/qt4-uic/pkg-plist index 9ddcdc2a9202..b5060a2e10a1 100644 --- a/devel/qt4-uic/pkg-plist +++ b/devel/qt4-uic/pkg-plist @@ -1,2 +1,2 @@ bin/uic-qt4 -bin/uic-qt4.debug +%%DEBUG%%bin/uic-qt4.debug diff --git a/devel/qt4-uic3/Makefile b/devel/qt4-uic3/Makefile index b83d0c891af6..c2dae7cadf67 100644 --- a/devel/qt4-uic3/Makefile +++ b/devel/qt4-uic3/Makefile @@ -19,7 +19,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt backwards-compatible user interface compiler USE_QT_VER= 4 -QT_COMPONENTS= qmake qt3support corelib gui network sql xml +QT_COMPONENTS= qmake_build qt3support corelib gui network sql xml QT_NONSTANDARD= yes QT_DIST= yes diff --git a/devel/qt4-uic3/pkg-plist b/devel/qt4-uic3/pkg-plist index 36b661dbd7ba..9d3131c9d188 100644 --- a/devel/qt4-uic3/pkg-plist +++ b/devel/qt4-uic3/pkg-plist @@ -1,2 +1,2 @@ bin/uic3 -bin/uic3.debug +%%DEBUG%%bin/uic3.debug |