Attachment 159489 Details for Bug 199224 – devel_drpython.diff

[patch] devel_drpython.diff

devel_drpython.diff (text/plain), 2.45 KB, created by tkato432 on 2015-08-03 10:47:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2015-08-03 10:47:04 UTC

Size: 2.45 KB

patch

obsolete

>diff -urN /usr/ports/devel/drpython/Makefile devel/drpython/Makefile
>--- /usr/ports/devel/drpython/Makefile	2015-06-16 16:43:50.273801000 +0900
>+++ devel/drpython/Makefile	2015-08-03 18:00:00.000000000 +0900
>@@ -20,7 +20,7 @@
> 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 @@
> 		"${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
>+	@${RM} ${WRKSRC}/setup.cfg
> 
> pre-build:
> 	@(cd ${WRKSRC}/docsrc && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} html)
>@@ -45,11 +50,24 @@
> 		${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>
>diff -urN /usr/ports/devel/drpython/files/patch-drpython.lin devel/drpython/files/patch-drpython.lin
>--- /usr/ports/devel/drpython/files/patch-drpython.lin	2015-06-12 05:51:05.088695000 +0900
>+++ devel/drpython/files/patch-drpython.lin	1970-01-01 09:00:00.000000000 +0900
>@@ -1,7 +0,0 @@
>---- 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

Actions: View | Diff

Attachments on bug 199224: 155262 | 159489