From 7aeef3e5194acb6b59e88472be78b4d7f2a7014f Mon Sep 17 00:00:00 2001 From: Michael Nottebrock Date: Thu, 19 Apr 2007 17:08:04 +0000 Subject: 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. --- devel/qt4-libqtassistantclient/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'devel/qt4-libqtassistantclient') diff --git a/devel/qt4-libqtassistantclient/Makefile b/devel/qt4-libqtassistantclient/Makefile index 54ac7e7a6b49..8bdbef3ea817 100644 --- a/devel/qt4-libqtassistantclient/Makefile +++ b/devel/qt4-libqtassistantclient/Makefile @@ -8,7 +8,7 @@ PORTNAME= libQtAssistantClient PORTVERSION= 4.2.3 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- @@ -18,7 +18,7 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt documentation browser integration library -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 \ @@ -61,8 +61,10 @@ pre-configure: ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} ${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib|g' \ ${WRKSRC}/lib.pro + ${REINPLACE_CMD} -E -e 's|"(.*)assistant"|"\1assistant-qt4"|g' \ + ${WRKSRC}/qassistantclient.cpp ${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 -- cgit v1.2.3