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-assistant | |
| 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-assistant')
| -rw-r--r-- | devel/qt4-assistant/Makefile | 11 | ||||
| -rw-r--r-- | devel/qt4-assistant/pkg-plist | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/devel/qt4-assistant/Makefile b/devel/qt4-assistant/Makefile index 2d6191f82950..5996b53ca788 100644 --- a/devel/qt4-assistant/Makefile +++ b/devel/qt4-assistant/Makefile @@ -8,7 +8,7 @@ PORTNAME= assistant PORTVERSION= 4.2.3 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- @@ -18,10 +18,10 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt documentation browser -BUILD_DEPENDS= moc4:${PORTSDIR}/devel/qt4-moc \ +BUILD_DEPENDS= moc-qt4:${PORTSDIR}/devel/qt4-moc \ qmake-qt4:${PORTSDIR}/devel/qmake4 \ rcc:${PORTSDIR}/devel/qt4-rcc \ - uic4:${PORTSDIR}/devel/qt4-uic + uic-qt4:${PORTSDIR}/devel/qt4-uic LIB_DEPENDS= Qt3Support:${PORTSDIR}/devel/qt4-qt3support \ QtCore:${PORTSDIR}/devel/qt4-corelib \ QtGui:${PORTSDIR}/x11-toolkits/qt4-gui \ @@ -64,11 +64,12 @@ CONFIGURE_WRKSRC=${WRKSRC}/../../ pre-configure: ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} ${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/bin|g' \ + -e 's|^TARGET.*|TARGET=assistant-qt4|g' \ ${WRKSRC}/${PORTNAME}.pro ${WRKSRC}/lib/lib.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/uic4 ${WRKSRC}/../../bin/uic + ${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../bin/moc + ${LN} -sf ${LOCALBASE}/bin/uic-qt4 ${WRKSRC}/../../bin/uic ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/../../bin/rcc .include <bsd.port.mk> diff --git a/devel/qt4-assistant/pkg-plist b/devel/qt4-assistant/pkg-plist index 07b9ded3764e..98334ee203db 100644 --- a/devel/qt4-assistant/pkg-plist +++ b/devel/qt4-assistant/pkg-plist @@ -1 +1 @@ -bin/assistant +bin/assistant-qt4 |