aboutsummaryrefslogtreecommitdiffstats
path: root/chinese
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 /chinese
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 'chinese')
-rw-r--r--chinese/qt4-codecs-cn/Makefile2
-rw-r--r--chinese/qt4-codecs-tw/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/chinese/qt4-codecs-cn/Makefile b/chinese/qt4-codecs-cn/Makefile
index 08fb6b45bf0a..141f37341427 100644
--- a/chinese/qt4-codecs-cn/Makefile
+++ b/chinese/qt4-codecs-cn/Makefile
@@ -61,7 +61,7 @@ pre-configure:
${WRKSRC}/cn.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
post-configure:
${REINPLACE_CMD} -e 's|(test -z.*||g' ${WRKSRC}/Makefile
diff --git a/chinese/qt4-codecs-tw/Makefile b/chinese/qt4-codecs-tw/Makefile
index fdd3dc6e81b0..eb0839f53005 100644
--- a/chinese/qt4-codecs-tw/Makefile
+++ b/chinese/qt4-codecs-tw/Makefile
@@ -60,6 +60,6 @@ pre-configure:
${WRKSRC}/tw.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>