Attachment 185105 Details for Bug 213636 – Patch to make the port work with both Python 2 and 3.

[patch] Patch to make the port work with both Python 2 and 3.

python2and3.patch (text/plain), 1.57 KB, created by rsmith on 2017-08-06 21:18:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: rsmith

Created: 2017-08-06 21:18:41 UTC

Size: 1.57 KB

patch

obsolete

>--- Makefile.orig	2017-08-06 22:49:38.580647000 +0200
>+++ Makefile	2017-08-06 23:16:20.508477000 +0200
>@@ -1,9 +1,8 @@
>-# Created by: ijliao
> # $FreeBSD$
> 
> PORTNAME=	matplotlib
> PORTVERSION=	1.5.3
>-PORTREVISION=	2
>+PORTREVISION=	3
> DISTVERSIONPREFIX=	v
> CATEGORIES=	math python
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -27,13 +26,16 @@
> 
> USE_GITHUB=	yes
> 
>-USES=		compiler:c++11-lib gettext pkgconfig python:2.7 shebangfix uniquefiles:dirs
>+USES=		compiler:c++11-lib gettext pkgconfig python shebangfix uniquefiles:dirs
> USE_PYTHON=	autoplist distutils
> CFLAGS+=	-I${LOCALBASE}/include
> 
> OPTIONS_DEFINE=		EXAMPLES GTKBACKEND GTKAGGBACKEND QT4AGGBACKEND \
> 			QT5AGGBACKEND TKAGGBACKEND WXAGGBACKEND
>-OPTIONS_DEFAULT=	GTKBACKEND GTKAGGBACKEND TKAGGBACKEND
>+OPTIONS_DEFAULT=	TKAGGBACKEND
>+.if ${PYTHON_MAJOR_VER} == 2
>+OPTIONS_DEFAULT+=	GTKBACKEND GTKAGGBACKEND
>+.endif
> OPTIONS_SUB=		yes
> GTKBACKEND_DESC=	GTK backend support
> GTKBACKEND_VARS=	GTK_BACKEND=True
>@@ -67,6 +69,18 @@
> 
> PORTEXAMPLES=	*
> 
>+.include "bsd.port.options.mk"
>+
>+.if ${PYTHON_MAJOR_VER} == 3
>+.if ${PORT_OPTIONS:MGTKBACKEND}
>+BROKEN=	GTK backend does not work with Python 3
>+.elif ${PORT_OPTIONS:MGTKAGGBACKEND}
>+BROKEN=	GTKAgg backend does not work with Python 3
>+.endif
>+.endif
>+
>+.include "bsd.port.pre.mk"
>+
> .if defined(PACKAGE_BUILDING)
> GTKBACKEND_BUILD_DEPENDS=	Xvfb:x11-servers/xorg-vfbserver
> GTKAGGBACKEND_BUILD_DEPENDS=	Xvfb:x11-servers/xorg-vfbserver
>@@ -104,4 +118,4 @@
> 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
> 	${CP} -R ${WRKSRC}/examples/ ${STAGEDIR}${EXAMPLESDIR}
> 
>-.include <bsd.port.mk>
>+.include "bsd.port.post.mk"

Actions: View | Diff

Attachments on bug 213636: 178422 | 185105 | 185337 | 185389