aboutsummaryrefslogtreecommitdiffstats
path: root/devel/qt4-qvfb
diff options
context:
space:
mode:
authorlofi <lofi@FreeBSD.org>2007-04-20 01:08:04 +0800
committerlofi <lofi@FreeBSD.org>2007-04-20 01:08:04 +0800
commit43404bb558fdbf21dfea86b33ff69de82991385e (patch)
tree7a31726ac01ff730b15d92e60de131efbdf5a4c4 /devel/qt4-qvfb
parent18159a3ac1812e45272d9372ab81e073abaedba1 (diff)
downloadfreebsd-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-qvfb')
-rw-r--r--devel/qt4-qvfb/Makefile12
-rw-r--r--devel/qt4-qvfb/pkg-plist4
2 files changed, 9 insertions, 7 deletions
diff --git a/devel/qt4-qvfb/Makefile b/devel/qt4-qvfb/Makefile
index afde843a08d2..3033cc85f83d 100644
--- a/devel/qt4-qvfb/Makefile
+++ b/devel/qt4-qvfb/Makefile
@@ -8,7 +8,7 @@
PORTNAME= qvfb
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 virtual framebuffer utility
-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= QtCore:${PORTSDIR}/devel/qt4-corelib \
QtGui:${PORTSDIR}/x11-toolkits/qt4-gui \
QtOpenGL:${PORTSDIR}/x11/qt4-opengl
@@ -61,9 +61,11 @@ CONFIGURE_WRKSRC=${WRKSRC}/../../
pre-configure:
${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
${MKDIR} ${WRKSRC}/../../mkspecs
+ ${REINPLACE_CMD} -e 's|^TARGET.*|TARGET=qvfb-qt4|g' \
+ ${WRKSRC}/qvfb.pro
${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
post-install:
diff --git a/devel/qt4-qvfb/pkg-plist b/devel/qt4-qvfb/pkg-plist
index 919c78fd9357..9da8e06f6cf8 100644
--- a/devel/qt4-qvfb/pkg-plist
+++ b/devel/qt4-qvfb/pkg-plist
@@ -1,5 +1,5 @@
-bin/qvfb
-bin/qvfb.debug
+bin/qvfb-qt4
+bin/qvfb-qt4.debug
share/qvfb/ClamshellPhone.skin/ClamshellPhone.skin
share/qvfb/ClamshellPhone.skin/ClamshellPhone1-5-closed.png
share/qvfb/ClamshellPhone.skin/ClamshellPhone1-5-pressed.png