[Midnightbsd-cvs] mports [19954] trunk/devel/qt4-help-tools: fix build

[laffer1 at midnightbsd.org]

Revision: 19954
          http://svnweb.midnightbsd.org/mports/?rev=19954
Author:   laffer1
Date:     2015-08-22 17:44:11 -0400 (Sat, 22 Aug 2015)
Log Message:
-----------
fix build

Modified Paths:
--------------
    trunk/devel/qt4-help-tools/Makefile
    trunk/devel/qt4-help-tools/pkg-plist

Removed Paths:
-------------
    trunk/devel/qt4-help-tools/distinfo

Modified: trunk/devel/qt4-help-tools/Makefile
===================================================================
--- trunk/devel/qt4-help-tools/Makefile	2015-08-22 21:43:08 UTC (rev 19953)
+++ trunk/devel/qt4-help-tools/Makefile	2015-08-22 21:44:11 UTC (rev 19954)
@@ -3,8 +3,7 @@
 
 PORTNAME=	help
 DISTVERSION=	${QT4_VERSION}
-CATEGORIES?=	devel
-MASTER_SITES=	${MASTER_SITE_QT}
+CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-
 PKGNAMESUFFIX=	-tools
 
@@ -14,9 +13,7 @@
 
 USE_QT4=	qmake_build moc_build rcc_build uic_build corelib \
 		gui sql xml doc help
-QT_NONSTANDARD=	yes
 QT_DIST=	yes
-MAKE_JOBS_SAFE=	yes
 
 HAS_CONFIGURE=	yes
 
@@ -40,15 +37,13 @@
 BUILD_WRKSRC=	${WRKSRC}/tools/assistant/tools
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
-EXTRA_PATCHES=	${.CURDIR}/../../devel/qt4/files/patch-configure
-
 pre-configure:
 	${REINPLACE_CMD} -e 's|assistant||' \
 		${BUILD_WRKSRC}/tools.pro
 	${MKDIR} ${WRKSRC}/mkspecs
-	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake
-	${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
+	${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake
+	${LN} -sf ${MOC} ${WRKSRC}/bin/moc
+	${LN} -sf ${UIC} ${WRKSRC}/bin/uic
+	${LN} -sf ${RCC} ${WRKSRC}/bin/rcc
 
 .include <bsd.port.mk>

Deleted: trunk/devel/qt4-help-tools/distinfo
===================================================================
--- trunk/devel/qt4-help-tools/distinfo	2015-08-22 21:43:08 UTC (rev 19953)
+++ trunk/devel/qt4-help-tools/distinfo	2015-08-22 21:44:11 UTC (rev 19954)
@@ -1,2 +0,0 @@
-SHA256 (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270
-SIZE (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 236593028

Modified: trunk/devel/qt4-help-tools/pkg-plist
===================================================================
--- trunk/devel/qt4-help-tools/pkg-plist	2015-08-22 21:43:08 UTC (rev 19953)
+++ trunk/devel/qt4-help-tools/pkg-plist	2015-08-22 21:44:11 UTC (rev 19954)
@@ -1,6 +1,6 @@
-bin/qhelpgenerator
-%%DEBUG%%bin/qhelpgenerator.debug
-bin/qcollectiongenerator
-%%DEBUG%%bin/qcollectiongenerator.debug
-bin/qhelpconverter
-%%DEBUG%%bin/qhelpconverter.debug
+%%QT_BINDIR%%/qhelpgenerator
+%%DEBUG%%%%QT_BINDIR%%/qhelpgenerator.debug
+%%QT_BINDIR%%/qcollectiongenerator
+%%DEBUG%%%%QT_BINDIR%%/qcollectiongenerator.debug
+%%QT_BINDIR%%/qhelpconverter
+%%DEBUG%%%%QT_BINDIR%%/qhelpconverter.debug