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 /accessibility | |
| 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 'accessibility')
| -rw-r--r-- | accessibility/qt4-accessible/Makefile | 9 | ||||
| -rw-r--r-- | accessibility/qt4-accessible/pkg-plist | 4 |
2 files changed, 4 insertions, 9 deletions
diff --git a/accessibility/qt4-accessible/Makefile b/accessibility/qt4-accessible/Makefile index 33fe86a435f4..2e812511a2cb 100644 --- a/accessibility/qt4-accessible/Makefile +++ b/accessibility/qt4-accessible/Makefile @@ -19,7 +19,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt accessibility widgets USE_QT_VER= 4 -QT_COMPONENTS= qmake moc qt3support corelib gui network sql xml +QT_COMPONENTS= qmake_build moc_build qt3support corelib gui network sql xml QT_NONSTANDARD= yes QT_DIST= yes @@ -42,8 +42,6 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf - \ WRKSRC= ${WRKDIR}/${DISTNAME}/src/plugins/${PORTNAME} CONFIGURE_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/plugins/accessible|g' \ @@ -52,7 +50,4 @@ pre-configure: ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../../bin/qmake ${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../../bin/moc -post-configure: - ${REINPLACE_CMD} -e 's|(test -z.*||g' ${WRKSRC}/Makefile - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/accessibility/qt4-accessible/pkg-plist b/accessibility/qt4-accessible/pkg-plist index 36f86b8b0a6e..5115727c69d3 100644 --- a/accessibility/qt4-accessible/pkg-plist +++ b/accessibility/qt4-accessible/pkg-plist @@ -1,5 +1,5 @@ lib/plugins/accessible/libqtaccessiblecompatwidgets.so -lib/plugins/accessible/libqtaccessiblecompatwidgets.so.debug +%%DEBUG%%lib/plugins/accessible/libqtaccessiblecompatwidgets.so.debug lib/plugins/accessible/libqtaccessiblewidgets.so -lib/plugins/accessible/libqtaccessiblewidgets.so.debug +%%DEBUG%%lib/plugins/accessible/libqtaccessiblewidgets.so.debug @dirrm lib/plugins/accessible |