Date: Wed, 6 Nov 2013 22:48:02 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333044 - head/devel/qscintilla2-designerplugin Message-ID: <201311062248.rA6Mm2rr080491@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Wed Nov 6 22:48:02 2013 New Revision: 333044 URL: http://svnweb.freebsd.org/changeset/ports/333044 Log: Switch from the manual qmake logic to USES=qmake. Doing so correctly handles all the PREFIX, DESTDIR and stage directories logic that the previous code did not, and should make the package build fine on the cluster instead of failing at the "stage" stage. While here, simplify the bsd.port.{pre,post}.mk includes. Modified: head/devel/qscintilla2-designerplugin/Makefile Modified: head/devel/qscintilla2-designerplugin/Makefile ============================================================================== --- head/devel/qscintilla2-designerplugin/Makefile Wed Nov 6 22:19:18 2013 (r333043) +++ head/devel/qscintilla2-designerplugin/Makefile Wed Nov 6 22:48:02 2013 (r333044) @@ -15,23 +15,17 @@ COMMENT= Qt4 Designer plugin for QScinti LIB_DEPENDS= qscintilla2:${PORTSDIR}/devel/qscintilla2 DISTINFO_FILE= ${QSCI2_DISTINFO_FILE} +USES= qmake USE_QT4= qmake_build moc_build gui xml designer HAS_CONFIGURE= yes -QMAKE_ARGS= -unix PREFIX=${PREFIX} - WRKSRC= ${WRKDIR}/${DISTNAME}/designer-Qt4Qt5 .include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" -.include <bsd.port.pre.mk> pre-configure: ${REINPLACE_CMD} -e \ 's|$$$$\[QT_INSTALL_PLUGINS\]|${PREFIX}/${QT_PLUGINDIR_REL}|' \ ${WRKSRC}/designer.pro -do-configure: - cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS} designer.pro - -.include <bsd.port.post.mk> +.include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311062248.rA6Mm2rr080491>