diff options
| author | Michael Nottebrock <lofi@FreeBSD.org> | 2007-04-19 17:08:04 +0000 |
|---|---|---|
| committer | Michael Nottebrock <lofi@FreeBSD.org> | 2007-04-19 17:08:04 +0000 |
| commit | 7aeef3e5194acb6b59e88472be78b4d7f2a7014f (patch) | |
| tree | 616dfe53e60011f08ba0fd9e44d23086ed7704a2 /devel/qmake4 | |
| parent | 70b438b4348e8e5786613051e3c8e890dd2d18f9 (diff) | |
| download | ports-7aeef3e5194acb6b59e88472be78b4d7f2a7014f.tar.gz ports-7aeef3e5194acb6b59e88472be78b4d7f2a7014f.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.
Notes
Notes:
svn path=/head/; revision=190368
Diffstat (limited to 'devel/qmake4')
| -rw-r--r-- | devel/qmake4/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/devel/qmake4/Makefile b/devel/qmake4/Makefile index 46496d9d918d..4ba4893d6eb6 100644 --- a/devel/qmake4/Makefile +++ b/devel/qmake4/Makefile @@ -7,6 +7,7 @@ PORTNAME= qmake PORTVERSION= 4.2.3 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_QT} DISTNAME= qt-x11-opensource-src-${PORTVERSION} @@ -52,8 +53,8 @@ post-patch: -e 's|release|release thread|' \ -e 's|-pthread -D_THREAD_SAFE|${PTHREAD_CFLAGS}|' \ -e 's|-pthread|${PTHREAD_LIBS}|' \ - -e 's|uic|uic4|' \ - -e 's|moc|moc4|' \ + -e 's|uic|uic-qt4|' \ + -e 's|moc|moc-qt4|' \ ${WRKSRC}/../mkspecs/freebsd-g++/qmake.conf \ ${WRKSRC}/../mkspecs/freebsd-g++34/qmake.conf @${REINPLACE_CMD} -e 's|@QMAKE_QTOBJS@||g' ${WRKSRC}/Makefile.unix |