diff options
| author | lofi <lofi@FreeBSD.org> | 2007-04-20 01:08:04 +0800 |
|---|---|---|
| committer | lofi <lofi@FreeBSD.org> | 2007-04-20 01:08:04 +0800 |
| commit | 43404bb558fdbf21dfea86b33ff69de82991385e (patch) | |
| tree | 7a31726ac01ff730b15d92e60de131efbdf5a4c4 /devel/qt4 | |
| parent | 18159a3ac1812e45272d9372ab81e073abaedba1 (diff) | |
| download | freebsd-ports-gnome-43404bb558fdbf21dfea86b33ff69de82991385e.tar.gz freebsd-ports-gnome-43404bb558fdbf21dfea86b33ff69de82991385e.tar.zst freebsd-ports-gnome-43404bb558fdbf21dfea86b33ff69de82991385e.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.
Diffstat (limited to 'devel/qt4')
| -rw-r--r-- | devel/qt4/Makefile | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/devel/qt4/Makefile b/devel/qt4/Makefile index 097c7d7f58d4..e8bff93b2bdb 100644 --- a/devel/qt4/Makefile +++ b/devel/qt4/Makefile @@ -7,6 +7,7 @@ PORTNAME= qt4 PORTVERSION= 4.2.3 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= # empty DISTFILES= # none @@ -23,17 +24,17 @@ RUN_DEPENDS= ${LOCALBASE}/lib/plugins/accessible/libqtaccessiblecompatwidgets.so ${LOCALBASE}/lib/libQtSql.so:${PORTSDIR}/databases/qt4-sql \ qdbus:${PORTSDIR}/devel/dbus-qt4 \ qmake-qt4:${PORTSDIR}/devel/qmake4 \ - ${LOCALBASE}/bin/assistant:${PORTSDIR}/devel/qt4-assistant \ + ${LOCALBASE}/bin/assistant-qt4:${PORTSDIR}/devel/qt4-assistant \ ${LOCALBASE}/lib/libQtCore.so:${PORTSDIR}/devel/qt4-corelib \ - ${LOCALBASE}/bin/designer:${PORTSDIR}/devel/qt4-designer \ + ${LOCALBASE}/bin/designer-qt4:${PORTSDIR}/devel/qt4-designer \ ${LOCALBASE}/lib/libQtAssistantClient.so:${PORTSDIR}/devel/qt4-libqtassistantclient \ - ${LOCALBASE}/bin/linguist:${PORTSDIR}/devel/qt4-linguist \ - ${LOCALBASE}/bin/moc4:${PORTSDIR}/devel/qt4-moc \ + ${LOCALBASE}/bin/linguist-qt4:${PORTSDIR}/devel/qt4-linguist \ + ${LOCALBASE}/bin/moc-qt4:${PORTSDIR}/devel/qt4-moc \ ${LOCALBASE}/bin/qt3to4:${PORTSDIR}/devel/qt4-porting \ ${LOCALBASE}/lib/libQt3Support.so:${PORTSDIR}/devel/qt4-qt3support \ ${LOCALBASE}/bin/rcc:${PORTSDIR}/devel/qt4-rcc \ - ${LOCALBASE}/bin/qvfb:${PORTSDIR}/devel/qt4-qvfb \ - ${LOCALBASE}/bin/uic4:${PORTSDIR}/devel/qt4-uic \ + ${LOCALBASE}/bin/qvfb-qt4:${PORTSDIR}/devel/qt4-qvfb \ + ${LOCALBASE}/bin/uic-qt4:${PORTSDIR}/devel/qt4-uic \ ${LOCALBASE}/bin/uic3:${PORTSDIR}/devel/qt4-uic3 \ ${LOCALBASE}/lib/libQtTest.so:${PORTSDIR}/devel/qt4-qtestlib \ ${LOCALBASE}/lib/plugins/imageformats/libqgif.so:${PORTSDIR}/graphics/qt4-imageformats \ |