diff options
| -rw-r--r-- | Mk/bsd.qt.mk | 3 | ||||
| -rw-r--r-- | devel/qmake4/Makefile | 4 | ||||
| -rw-r--r-- | devel/qmake4/files/Makefile.bsd | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/Mk/bsd.qt.mk b/Mk/bsd.qt.mk index 99011b34980d..c538e6476ddf 100644 --- a/Mk/bsd.qt.mk +++ b/Mk/bsd.qt.mk @@ -100,7 +100,6 @@ pixeltool_DEPENDS= graphics/qt4-pixeltool porting_DEPENDS= devel/qt4-porting qdbusviewer_DEPENDS= devel/qt4-qdbusviewer qmake_DEPENDS= devel/qmake4 -qmake_QT4_PREFIX= # empty qt3support_DEPENDS= devel/qt4-qt3support qtconfig_DEPENDS= devel/qtconfig qtestlib_DEPENDS= devel/qt4-qtestlib @@ -138,7 +137,6 @@ pixeltool_build_DEPENDS= ${pixeltool_DEPENDS} porting_build_DEPENDS= ${porting_DEPENDS} qdbusviewer_build_DEPENDS= ${qdbusviewer_DEPENDS} qmake_build_DEPENDS= ${qmake_DEPENDS} -qmake_build_QT4_PREFIX= ${qmake_QT4_PREFIX} qt3support_build_DEPENDS= ${qt3support_DEPENDS} qtconfig_build_DEPENDS= ${qtconfig_DEPENDS} qtestlib_build_DEPENDS= ${qtestlib_DEPENDS} @@ -176,7 +174,6 @@ pixeltool_run_DEPENDS= ${pixeltool_DEPENDS} porting_run_DEPENDS= ${porting_DEPENDS} qdbusviewer_run_DEPENDS= ${qdbusviewer_DEPENDS} qmake_run_DEPENDS= ${qmake_DEPENDS} -qmake_run_QT4_PREFIX= ${qmake_QT4_PREFIX} qt3support_run_DEPENDS= ${qt3support_DEPENDS} qtconfig_run_DEPENDS= ${qtconfig_DEPENDS} qtestlib_run_DEPENDS= ${qtestlib_DEPENDS} diff --git a/devel/qmake4/Makefile b/devel/qmake4/Makefile index c2ee029ab910..63b444de1bdb 100644 --- a/devel/qmake4/Makefile +++ b/devel/qmake4/Makefile @@ -7,9 +7,10 @@ PORTNAME= qmake PORTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_QT} +PKGNAMEPREFIX= qt4- DISTNAME= qt-x11-opensource-src-${PORTVERSION} DIST_SUBDIR= KDE @@ -17,7 +18,6 @@ MAINTAINER= kde@FreeBSD.org COMMENT= The build utility of the Qt project QT_NONSTANDARD= yes -LATEST_LINK= qmake4 REINPLACE_ARGS= -i "" WRKSRC= ${WRKDIR}/${DISTNAME}/qmake MAKEFILE= ${FILESDIR}/Makefile.bsd diff --git a/devel/qmake4/files/Makefile.bsd b/devel/qmake4/files/Makefile.bsd index 7997e28d17d4..08ccc6fb6d8c 100644 --- a/devel/qmake4/files/Makefile.bsd +++ b/devel/qmake4/files/Makefile.bsd @@ -5,7 +5,7 @@ _OBJS!= ${MAKE} -f Makefile.unix -V OBJS -V QOBJS # next to -DHAVE_CONFIG_CPP below: #_OBJS:= ${_OBJS:S/qconfig.o//} SRCS:= ${_OBJS:.o=.cpp} -NOMAN= true # qmake.1 anyone? +NO_MAN= true # qmake.1 anyone? .PATH: ${.CURDIR} ${.CURDIR:H}/src/corelib/tools ${.CURDIR:H}/src/corelib/io \ ${.CURDIR:H}/src/corelib/global ${.CURDIR:H}/src/corelib/plugin \ |