Date: Sat, 10 Oct 2015 10:23:54 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r398986 - in head/devel/drpython: . files Message-ID: <201510101023.t9AANso4048188@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Sat Oct 10 10:23:54 2015 New Revision: 398986 URL: https://svnweb.freebsd.org/changeset/ports/398986 Log: devel/drpython: Fix runtime error on F9 PR: 199224 Submitted by: ports fury Deleted: head/devel/drpython/files/patch-drpython.lin Modified: head/devel/drpython/Makefile Modified: head/devel/drpython/Makefile ============================================================================== --- head/devel/drpython/Makefile Sat Oct 10 10:13:50 2015 (r398985) +++ head/devel/drpython/Makefile Sat Oct 10 10:23:54 2015 (r398986) @@ -3,7 +3,7 @@ PORTNAME= drpython PORTVERSION= 3.11.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel python MASTER_SITES= SF/${PORTNAME}/DrPython%20%283.x%29/${PORTVERSION} PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX} @@ -20,7 +20,7 @@ RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/ NO_ARCH= yes WRKSRC= ${WRKDIR}/${PORTNAME} -USES= python zip +USES= compiler:c++11-lib python zip USE_PYTHON= distutils autoplist USE_WX= 3.0+ WX_COMPS= python:lib @@ -31,13 +31,18 @@ DESKTOP_ENTRIES="DrPython" "Python edito "${PYTHONPREFIX_SITELIBDIR}/drpython/bitmaps/drpython.png" \ "drpython" "Development;IDE;" "" +.include <bsd.port.pre.mk> + +.if ${OPSYS} == FreeBSD && ${CHOSEN_COMPILER_TYPE} == gcc +MAKE_ENV+= LD_LIBRARY_PATH="${LOCALBASE}/lib/${CC}:$$LD_LIBRARY_PATH" +.endif + post-patch: @${REINPLACE_CMD} -e \ '/postinst.py/d' ${WRKSRC}/setup.py @${RM} ${WRKSRC}/setup.cfg @${REINPLACE_CMD} -e \ 's|firefox|xdg-open|' ${WRKSRC}/drPreferences.py - @${REINPLACE_CMD} -e 's|%%PYTHON%%|${PYTHON_CMD}|' ${WRKSRC}/drpython.lin pre-build: @(cd ${WRKSRC}/docsrc && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} html) @@ -45,11 +50,24 @@ pre-build: ${WRKSRC}/documentation) post-build: - @${ECHO_CMD} '#!/bin/sh' > ${WRKDIR}/drpython.sh - @${ECHO_CMD} 'exec ${PYTHON_CMD} -m drpython.drpython' >> ${WRKDIR}/drpython.sh + @${MKDIR} ${WRKDIR}/wrappers + @${ECHO_CMD} -n \ + >> ${WRKDIR}/wrappers/drpython + @${ECHO_CMD} '#!/bin/sh' \ + >> ${WRKDIR}/wrappers/drpython +.if ${OPSYS} == FreeBSD && ${CHOSEN_COMPILER_TYPE} == gcc + @${ECHO_CMD} 'LD_LIBRARY_PATH="${LOCALBASE}/lib/${CC}:$$LD_LIBRARY_PATH"' \ + >> ${WRKDIR}/wrappers/drpython + @${ECHO_CMD} 'export LD_LIBRARY_PATH' \ + >> ${WRKDIR}/wrappers/drpython + @${ECHO_CMD} \ + >> ${WRKDIR}/wrappers/drpython +.endif + @${ECHO_CMD} 'exec ${PYTHON_CMD} -m drpython.drpython' \ + >> ${WRKDIR}/wrappers/drpython post-install: - (cd ${WRKDIR} && ${INSTALL_SCRIPT} drpython.sh \ - ${STAGEDIR}${PREFIX}/bin/drpython) + (cd ${WRKDIR}/wrappers && ${INSTALL_SCRIPT} drpython \ + ${STAGEDIR}${PREFIX}/bin) -.include <bsd.port.mk> +.include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510101023.t9AANso4048188>