[Midnightbsd-cvs] mports [22404] trunk/misc/qt5-doc/Makefile: changeup so it can at least try to build

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Mar 21 07:52:48 EDT 2017


Revision: 22404
          http://svnweb.midnightbsd.org/mports/?rev=22404
Author:   laffer1
Date:     2017-03-21 07:52:48 -0400 (Tue, 21 Mar 2017)
Log Message:
-----------
changeup so it can at least try to build

Modified Paths:
--------------
    trunk/misc/qt5-doc/Makefile

Modified: trunk/misc/qt5-doc/Makefile
===================================================================
--- trunk/misc/qt5-doc/Makefile	2017-03-20 20:57:00 UTC (rev 22403)
+++ trunk/misc/qt5-doc/Makefile	2017-03-21 11:52:48 UTC (rev 22404)
@@ -15,58 +15,47 @@
 
 LICENSE=	gpl3
 
+USES=		gmake python:build qmake:norecursive,outsource tar:xz
+USE_QT5=	buildtools_build concurrent_build help_build qdoc_build \
+		sql_build sql-sqlite3_build
+QMAKE_SOURCE_PATH=	${WRKSRC}/qt.pro
+
+ALL_TARGET=	docs
+DESCR=		${.CURDIR:H:H}/devel/qt5/pkg-descr
 NO_ARCH=	yes
 
-USE_QT5=	help_build qdoc_build sql_build sql-sqlite3_build \
-		buildtools_build qmake_build
+# The default qconfig.pri that qmake reads comes from devel/qt5-core and thus
+# disables a lot of items. We re-enable the most important ones below so that
+# we do not end up without documentation for QtGui and QtWidgets.
+QMAKE_ARGS=	QT_CONFIG-="no-gui no-widgets"
 
-USES=		compiler:c++11-lib python:build tar:xz
+# We need to invoke the qmake symlink we create in the pre-configure target so
+# that it reads the qt.conf installed alongside it.
+_QMAKE=		${BUILD_WRKSRC}/qtbase/bin/qmake
 
-HAS_CONFIGURE=	yes
-CONFIGURE_OUTSOURCE=	yes
-QT_NONSTANDARD=	yes
-CONFIGURE_ARGS=	-opensource -confirm-license -developer-build -nomake tests
+SUB_FILES=	qt.conf
+SUB_LIST=	BUILD_WRKSRC=${BUILD_WRKSRC} \
+		QT_DOCDIR=${QT_DOCDIR}
 
-.include <bsd.port.pre.mk>
-# If we are on a system without gcc make qmake use the internal freebsd-clang
-# mkspec.
-.if ${COMPILER_TYPE:Mclang}
-CONFIGURE_ARGS+=	-platform unsupported/freebsd-clang
-.endif
-
-EXTRACT_AFTER_ARGS?=    ${DISTNAME:S,$,/qtwebkit,:S,^,--exclude ,} \
-                                ${DISTNAME:S,$,/qtwebkit-examples,:S,^,--exclude ,} \
-				${DISTNAME:S,$,/qtwebengine,:S,^,--exclude ,}
-
-DOCSDIR=	${PREFIX}/share/doc/qt5
-
-MAKE_JOBS_UNSAFE=	YES
-ALL_TARGET=		docs
-
-DESCR=		${.CURDIR:H:H}/devel/qt5/pkg-descr
-
-post-extract:
+pre-configure: apply-slist
 	${MKDIR} ${BUILD_WRKSRC}/qtbase/bin
 	${LN} -sf ${MOC} ${BUILD_WRKSRC}/qtbase/bin/moc
 	${LN} -sf ${UIC} ${BUILD_WRKSRC}/qtbase/bin/uic
 	${LN} -sf ${RCC} ${BUILD_WRKSRC}/qtbase/bin/rcc
+	${LN} -sf ${QMAKE} ${BUILD_WRKSRC}/qtbase/bin/qmake
 	${LN} -sf ${QT_BINDIR}/qdoc ${BUILD_WRKSRC}/qtbase/bin/qdoc
 	${LN} -sf ${QT_BINDIR}/qhelpgenerator ${BUILD_WRKSRC}/qtbase/bin/qhelpgenerator
+	${CP} -Rp ${QT_MKSPECDIR} ${BUILD_WRKSRC}/qtbase/mkspecs
+	${CP} ${WRKDIR}/qt.conf ${BUILD_WRKSRC}/qtbase/bin/qt.conf
 
 post-patch:
 # qtdeclarative.pro wants to run python, replace that with PYTHON_CMD
 	${REINPLACE_CMD} '/py_out/s#python#${PYTHON_CMD}#g' \
 		${WRKSRC}/qtdeclarative/qtdeclarative.pro
-# Make mkspecs/freebsd-g++ use the correct gcc for the build.
-.if ${COMPILER_TYPE:Mgcc}
-	${REINPLACE_CMD} -e 's#gcc#${CC}#g' \
-			 -e 's#g++#${CXX}#g' \
-			 ${PATCH_WRKSRC}/qtbase/mkspecs/common/g++-base.conf
-.endif
 
 do-install:
-	${MKDIR} ${STAGEDIR}${DOCSDIR} && \
+	${MKDIR} ${STAGEDIR}${QT_DOCDIR} && \
 		cd ${BUILD_WRKSRC}/qtbase/doc && \
-		${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}
+		${COPYTREE_SHARE} \* ${STAGEDIR}${QT_DOCDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>



More information about the Midnightbsd-cvs mailing list