svn commit: r399624 - in head/devel/drpython: . files
Dmitry Marakasov
amdmi3 at FreeBSD.org
Sun Oct 18 17:33:22 UTC 2015
Author: amdmi3
Date: Sun Oct 18 17:33:20 2015
New Revision: 399624
URL: https://svnweb.freebsd.org/changeset/ports/399624
Log:
- Simplify wrapper script creation
- Fix shebang
- Add build conflict with itself
Added:
head/devel/drpython/files/patch-drpython.lin (contents, props changed)
Modified:
head/devel/drpython/Makefile
head/devel/drpython/files/patch-drToolBarDialog.py
Modified: head/devel/drpython/Makefile
==============================================================================
--- head/devel/drpython/Makefile Sun Oct 18 17:31:17 2015 (r399623)
+++ head/devel/drpython/Makefile Sun Oct 18 17:33:20 2015 (r399624)
@@ -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-platf
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>
Modified: head/devel/drpython/files/patch-drToolBarDialog.py
==============================================================================
--- head/devel/drpython/files/patch-drToolBarDialog.py Sun Oct 18 17:31:17 2015 (r399623)
+++ head/devel/drpython/files/patch-drToolBarDialog.py Sun Oct 18 17:33:20 2015 (r399624)
@@ -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:
Added: head/devel/drpython/files/patch-drpython.lin
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/drpython/files/patch-drpython.lin Sun Oct 18 17:33:20 2015 (r399624)
@@ -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
More information about the svn-ports-head
mailing list