diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2015-10-18 17:33:20 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2015-10-18 17:33:20 +0000 |
| commit | 9190f2bec03cc294f3e8c5a65122f09894025eb5 (patch) | |
| tree | 0bd05dab8ebb0d9686c493bd52f35b3cda1e6477 /devel | |
| parent | b07cb2d3dd043e69d017972339bf5ed70ef15f21 (diff) | |
| download | ports-9190f2bec03cc294f3e8c5a65122f09894025eb5.tar.gz ports-9190f2bec03cc294f3e8c5a65122f09894025eb5.zip | |
Notes
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/drpython/Makefile | 27 | ||||
| -rw-r--r-- | devel/drpython/files/patch-drToolBarDialog.py | 4 | ||||
| -rw-r--r-- | devel/drpython/files/patch-drpython.lin | 7 |
3 files changed, 20 insertions, 18 deletions
diff --git a/devel/drpython/Makefile b/devel/drpython/Makefile index 545031710554..a3061d15f17d 100644 --- a/devel/drpython/Makefile +++ b/devel/drpython/Makefile @@ -3,7 +3,7 @@ PORTNAME= drpython PORTVERSION= 3.11.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel python MASTER_SITES= SF/${PORTNAME}/DrPython%20%283.x%29/${PORTVERSION} PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX} @@ -14,6 +14,9 @@ COMMENT= Highly customizable cross-platform ide to aid programming in Python LICENSE= GPLv2 +# fails to build in presence if installed self +CONFLICTS_BUILD= ${PORTNAME}${PYTHON_PKGNAMESUFFIX}-[0-9]* + BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:${PORTSDIR}/textproc/py-sphinx RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils @@ -21,7 +24,7 @@ NO_ARCH= yes WRKSRC= ${WRKDIR}/${PORTNAME} USES= compiler:c++11-lib python zip -USE_PYTHON= distutils autoplist +USE_PYTHON= autoplist distutils USE_WX= 3.0+ WX_COMPS= python:lib @@ -43,6 +46,7 @@ post-patch: @${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) @@ -50,24 +54,15 @@ pre-build: ${WRKSRC}/documentation) post-build: - @${MKDIR} ${WRKDIR}/wrappers - @${ECHO_CMD} -n \ - >> ${WRKDIR}/wrappers/drpython - @${ECHO_CMD} '#!/bin/sh' \ - >> ${WRKDIR}/wrappers/drpython + @${ECHO_CMD} '#!/bin/sh' > ${WRKDIR}/drpython.sh .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 + >> ${WRKDIR}/drpython.sh + @${ECHO_CMD} 'export LD_LIBRARY_PATH' >> ${WRKDIR}/drpython.sh .endif - @${ECHO_CMD} 'exec ${PYTHON_CMD} -m drpython.drpython' \ - >> ${WRKDIR}/wrappers/drpython + @${ECHO_CMD} 'exec ${PYTHON_CMD} -m drpython.drpython' >> ${WRKDIR}/drpython.sh post-install: - (cd ${WRKDIR}/wrappers && ${INSTALL_SCRIPT} drpython \ - ${STAGEDIR}${PREFIX}/bin) + ${INSTALL_SCRIPT} ${WRKDIR}/drpython.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .include <bsd.port.post.mk> diff --git a/devel/drpython/files/patch-drToolBarDialog.py b/devel/drpython/files/patch-drToolBarDialog.py index 5289021c5799..9a7c929b5a40 100644 --- a/devel/drpython/files/patch-drToolBarDialog.py +++ b/devel/drpython/files/patch-drToolBarDialog.py @@ -1,6 +1,6 @@ ---- drToolBarDialog.py.orig +--- drToolBarDialog.py.orig 2014-04-20 17:50:40 UTC +++ drToolBarDialog.py -@@ -36,7 +36,7 @@ +@@ -36,7 +36,7 @@ def GetToolBarLabels(filename, frame): text = f.read() f.close() except: diff --git a/devel/drpython/files/patch-drpython.lin b/devel/drpython/files/patch-drpython.lin new file mode 100644 index 000000000000..e6b029cb26e7 --- /dev/null +++ b/devel/drpython/files/patch-drpython.lin @@ -0,0 +1,7 @@ +--- drpython.lin.orig 2014-04-20 17:50:40 UTC ++++ drpython.lin +@@ -1,2 +1,2 @@ +-#!/bin/bash +-python ${0%/*}/drpython.pyw ++#!/bin/sh ++%%PYTHON%% ${0%/*}/drpython.pyw |