diff options
| author | Michael Nottebrock <lofi@FreeBSD.org> | 2007-04-19 17:08:04 +0000 |
|---|---|---|
| committer | Michael Nottebrock <lofi@FreeBSD.org> | 2007-04-19 17:08:04 +0000 |
| commit | 7aeef3e5194acb6b59e88472be78b4d7f2a7014f (patch) | |
| tree | 616dfe53e60011f08ba0fd9e44d23086ed7704a2 /x11/qt4-inputmethods | |
| parent | 70b438b4348e8e5786613051e3c8e890dd2d18f9 (diff) | |
| download | ports-7aeef3e5194acb6b59e88472be78b4d7f2a7014f.tar.gz ports-7aeef3e5194acb6b59e88472be78b4d7f2a7014f.zip | |
Rename all binaries in qt4 which conflict with binaries installed by
qt33 to ($binary)-qt4 and adjust dependencies accordingly. This
avoids conflicts once X11BASE has been changed to /usr/local and
incidentally makes the naming scheme of the qt4 executables in ports
equal to that of the Fedora Core and Debian packages.
Notes
Notes:
svn path=/head/; revision=190368
Diffstat (limited to 'x11/qt4-inputmethods')
| -rw-r--r-- | x11/qt4-inputmethods/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/x11/qt4-inputmethods/Makefile b/x11/qt4-inputmethods/Makefile index 95cd08c4b94c..8cd426d83e66 100644 --- a/x11/qt4-inputmethods/Makefile +++ b/x11/qt4-inputmethods/Makefile @@ -18,7 +18,7 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt input method plugins -BUILD_DEPENDS= moc4:${PORTSDIR}/devel/qt4-moc \ +BUILD_DEPENDS= moc-qt4:${PORTSDIR}/devel/qt4-moc \ qmake-qt4:${PORTSDIR}/devel/qmake4 LIB_DEPENDS= QtCore:${PORTSDIR}/devel/qt4-corelib \ QtGui:${PORTSDIR}/x11-toolkits/qt4-gui @@ -62,6 +62,6 @@ pre-configure: ${WRKSRC}/imsw-multi/imsw-multi.pro ${MKDIR} ${WRKSRC}/../../../mkspecs ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../../bin/qmake - ${LN} -sf ${LOCALBASE}/bin/moc4 ${WRKSRC}/../../../bin/moc + ${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../../bin/moc .include <bsd.port.post.mk> |