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 /databases/qt4-sql | |
| parent | Enable AfterImage's support by default. (diff) | |
- 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 'databases/qt4-sql')
| -rw-r--r-- | databases/qt4-sql/Makefile | 15 | ||||
| -rw-r--r-- | databases/qt4-sql/pkg-plist | 1 |
2 files changed, 4 insertions, 12 deletions
diff --git a/databases/qt4-sql/Makefile b/databases/qt4-sql/Makefile index e410c73b442a..bc98f436c464 100644 --- a/databases/qt4-sql/Makefile +++ b/databases/qt4-sql/Makefile @@ -19,7 +19,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt SQL library USE_QT_VER= 4 -QT_COMPONENTS= qmake moc corelib +QT_COMPONENTS= qmake_build moc_build corelib QT_NONSTANDARD= yes QT_DIST= yes @@ -45,15 +45,6 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf - \ WRKSRC= ${WRKDIR}/${DISTNAME}/src/${PORTNAME} CONFIGURE_WRKSRC=${WRKSRC}/../../ -.include <bsd.port.pre.mk> - -.if defined(PKGNAMESUFFIX) && (${PKGNAMESUFFIX} == "-debug" || ${PKGNAMESUFFIX} == "-static-debug") -CONFIGURE_ARGS+=-debug -.endif -.if defined(PKGNAMESUFFIX) && (${PKGNAMESUFFIX} == "-static" || ${PKGNAMESUFFIX} == "-static-debug") -CONFIGURE_ARGS+=-static -.endif - pre-configure: ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} ${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib|g' \ @@ -65,10 +56,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}/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/databases/qt4-sql/pkg-plist b/databases/qt4-sql/pkg-plist index 14c2bdc1da3c..8c219e9760dc 100644 --- a/databases/qt4-sql/pkg-plist +++ b/databases/qt4-sql/pkg-plist @@ -75,5 +75,6 @@ lib/libQtSql.so lib/libQtSql.so.4 lib/libQtSql.so.4.3 lib/libQtSql.so.4.3.0 +%%DEBUG%%lib/libQtSql.so.4.3.0.debug libdata/pkgconfig/QtSql.pc @dirrm include/QtSql |