Attachment 139600 Details for Bug 185884 – file.diff

[patch] file.diff

file.diff (text/plain), 1.81 KB, created by Nathan Whitehorn on 2014-01-19 17:20:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan Whitehorn

Created: 2014-01-19 17:20:00 UTC

Size: 1.81 KB

patch

obsolete

>Index: devel/llvm33/Makefile
>===================================================================
>--- devel/llvm33/Makefile	(revision 340317)
>+++ devel/llvm33/Makefile	(working copy)
>@@ -149,6 +149,8 @@
> CONFIGURE_ARGS+=	--with-optimize-option=-O2
> .endif
> 
>+CONFIGURE_ARGS+=	--with-python=/usr/local/bin/python2
>+
> post-patch:
> 	${REINPLACE_CMD} -e 's|${PORTVERSION}svn|${PORTVERSION}|g' \
> 	    ${WRKSRC}/configure
>Index: devel/py-qt4-core/Makefile
>===================================================================
>--- devel/py-qt4-core/Makefile	(revision 340317)
>+++ devel/py-qt4-core/Makefile	(working copy)
>@@ -53,8 +53,16 @@
> ARGS+=		--debug --trace
> .endif
> 
>+.include <bsd.port.pre.mk>
>+
>+.if ${PYTHON_MAJOR_VER} != "3"
>+BAD_UIC_PORT_DIR=	port_v3
>+.else
>+BAD_UIC_PORT_DIR=	port_v2
>+.endif
>+
> post-patch:
>-	${RM} -rf ${WRKSRC}/pyuic/uic/port_v3
>+	${RM} -rf ${WRKSRC}/pyuic/uic/${BAD_UIC_PORT_DIR}
> 
> do-configure:
> 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
>@@ -75,4 +83,4 @@
> 		${PYTHON_CMD} -O ${PYTHON_LIBDIR}/py_compile.py\
> 		`ls *.py */*.py */*/*.py`
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>Index: x11/libxcb/Makefile
>===================================================================
>--- x11/libxcb/Makefile	(revision 340317)
>+++ x11/libxcb/Makefile	(working copy)
>@@ -24,7 +24,7 @@
> USE_GNOME=	libxslt:build
> USE_LDCONFIG=	yes
> USE_XORG=	xau xdmcp
>-USE_PYTHON_BUILD=	yes
>+USE_PYTHON_BUILD=	2
> 
> GNU_CONFIGURE=	yes
> .for f in XPROTO_CFLAGS XPROTO_LIBS XDMCP_CFLAGS XDMCP_LIBS NEEDED_CFLAGS NEEDED_LIBS
>Index: x11/xcb-proto/Makefile
>===================================================================
>--- x11/xcb-proto/Makefile	(revision 340317)
>+++ x11/xcb-proto/Makefile	(working copy)
>@@ -13,7 +13,7 @@
> 
> USE_BZIP2=	yes
> USES=		pathfix
>-USE_PYTHON=	yes
>+USE_PYTHON=	2
> GNU_CONFIGURE=	yes
> 
> DATADIR=	${PREFIX}/share/xcb

Actions: View | Diff

Attachments on bug 185884: 139600 | 139601 | 139602 | 139603 | 143532