Attachment 190839 Details for Bug 225752 – updated patch file

[patch] updated patch file

Mk_Uses_python.mk.patch (text/plain), 8.28 KB, created by Yasuhiro Kimura on 2018-02-21 00:17:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2018-02-21 00:17:56 UTC

Size: 8.28 KB

patch

obsolete

>Index: Mk/Uses/python.mk
>===================================================================
>--- Mk/Uses/python.mk	(revision 462454)
>+++ Mk/Uses/python.mk	(working copy)
>@@ -18,7 +18,6 @@
> #			USES=python:3.3+	# Use Python 3.3 or newer
> #			USES=python:3.3-3.4	# Use Python 3.3 or 3.4
> #			USES=python:-3.3	# Use any Python up to 3.3
>-#			USES=python:2		# Use the Python 2 meta port
> #			USES=python		# Use the set default Python
> #						# version
> #
>@@ -310,11 +309,11 @@
> .if ${_PYTHON_ARGS} == "2"
> _PYTHON_ARGS=		${PYTHON2_DEFAULT}
> _WANTS_META_PORT=	2
>-DEV_WARNING+=		"USES=python:2 is deprecated, use USES=python:2.7"
>+DEV_ERROR+=		"USES=python:2 is unsupported, use USES=python:2.7 instead"
> .elif ${_PYTHON_ARGS} == "3"
> _PYTHON_ARGS=		${PYTHON3_DEFAULT}
> _WANTS_META_PORT=	3
>-DEV_WARNING+=		"USES=python:3 is deprecated, use USES=python:3.4+ or an appropriate version range"
>+DEV_ERROR+=		"USES=python:3 is unsupported, use USES=python:3.4+ or an appropriate version range instead"
> .endif  # ${_PYTHON_ARGS} == "2"
> 
> .if defined(PYTHON_VERSION)
>Index: deskutils/nemo-extensions/Makefile
>===================================================================
>--- deskutils/nemo-extensions/Makefile	(revision 462454)
>+++ deskutils/nemo-extensions/Makefile	(working copy)
>@@ -12,7 +12,6 @@
> 
> BUILD_DEPENDS=	gnome-icon-theme>=0:misc/gnome-icon-theme \
> 		gtkdocize:textproc/gtk-doc \
>-		python:lang/python \
> 		rst2html:textproc/py-docutils \
> 		gnome-autogen.sh:devel/gnome-common \
> 		${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:devel/gsettings-desktop-schemas
>@@ -44,6 +43,7 @@
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
> INSTALL_TARGET=	install-strip
>+BINARY_ALIAS=	python=${PYTHON_CMD}
> 
> NON_AUTO_EXTENSIONS=	nemo-dropbox nemo-fileroller nemo-preview
> AUTO_EXTENSIONS=	nemo-share
>@@ -57,13 +57,13 @@
> 
> do-configure:
> .for i in ${NON_AUTO_EXTENSIONS}
>-	cd ${WRKSRC}/${i} && NOCONFIGURE=yes ${SH} autogen.sh && ./configure --prefix=${PREFIX} \
>+	cd ${WRKSRC}/${i} && NOCONFIGURE=yes ${SH} autogen.sh && ${SETENV} ${CONFIGURE_ENV} ./configure --prefix=${PREFIX} \
> 		--with-nemo-extension-dir=${PREFIX}/lib/nemo/extensions-3.0 \
> 		--mandir=${PREFIX}/man
> .endfor
> 
> .for i in ${AUTO_EXTENSIONS}
>-	cd ${WRKSRC}/${i} && ./configure --prefix=${PREFIX} \
>+	cd ${WRKSRC}/${i} && ${SETENV} ${CONFIGURE_ENV} ./configure --prefix=${PREFIX} \
> 		--with-nemo-extension-dir=${PREFIX}/lib/nemo/extensions-3.0 \
> 		--mandir=${PREFIX}/man
> .endfor
>Index: devel/grumpy/Makefile
>===================================================================
>--- devel/grumpy/Makefile	(revision 462454)
>+++ devel/grumpy/Makefile	(working copy)
>@@ -7,7 +7,7 @@
> MAINTAINER=	swills@FreeBSD.org
> COMMENT=	Python to Go source code transcompiler and runtime
> 
>-BUILD_DEPENDS=	go:lang/go python:lang/python
>+BUILD_DEPENDS=	go:lang/go
> RUN_DEPENDS:=	${BUILD_DEPENDS}
> 
> USE_GITHUB=	yes
>@@ -14,7 +14,9 @@
> GH_ACCOUNT=	google
> GH_TAGNAME=	348f038
> 
>-USES=		gmake python
>+USES=		gmake python:2.7 shebangfix
>+SHEBANG_FILES=	tools/benchcmp tools/coverparse tools/diffrange tools/grumpc
>+BINARY_ALIAS=	python=${PYTHON_CMD}
> 
> .include <bsd.port.options.mk>
> 
>Index: emulators/hatari/Makefile
>===================================================================
>--- emulators/hatari/Makefile	(revision 462454)
>+++ emulators/hatari/Makefile	(working copy)
>@@ -15,14 +15,12 @@
> 
> LIB_DEPENDS=	libportaudio.so:audio/portaudio \
> 		libpng.so:graphics/png
>-BUILD_DEPENDS=	python:lang/python
>-RUN_DEPENDS=	python:lang/python
> 
> USES=		cmake desktop-file-utils python:2.7 readline shared-mime-info \
> 		shebangfix tar:bzip2
> SHEBANG_FILES=	python-ui/*.py tools/atari-convert-dir.py \
> 		tools/debugger/hatari_profile.py tools/hconsole/*.py
>-python_OLD_CMD=	/usr/bin/python2
>+python_OLD_CMD=	/usr/local/bin/python2.7
> USE_GNOME=	pygtk2
> CMAKE_ARGS=	-DETCDIR:PATH="${PREFIX}/etc" \
> 		-DMANDIR:PATH="man/man1" \
>@@ -53,6 +51,9 @@
> .endfor
> 	@${REINPLACE_CMD} -e \
> 		's|-Wno-maybe-uninitialized||' ${WRKSRC}/src/cpu/CMakeLists.txt
>+	@${REINPLACE_CMD} -e \
>+		's|%%PYTHON_CMD%%|${PYTHON_CMD}| ; \
>+		 s|%%PYTHON_VERSION%%|${PYTHON_VERSION}|' ${WRKSRC}/tools/atari-hd-image.sh
> 
> post-install:
> 	@${MKDIR} ${STAGEDIR}${MANPREFIX}/man/fr/man1
>Index: emulators/hatari/files/patch-tools_atari-hd-image.sh
>===================================================================
>--- emulators/hatari/files/patch-tools_atari-hd-image.sh	(nonexistent)
>+++ emulators/hatari/files/patch-tools_atari-hd-image.sh	(working copy)
>@@ -0,0 +1,24 @@
>+--- tools/atari-hd-image.sh.orig	2018-02-20 07:08:43 UTC
>++++ tools/atari-hd-image.sh
>+@@ -33,8 +33,8 @@ PATH=/sbin:$PATH
>+ export PATH
>+ 
>+ # check tools
>+-if [ -z $(which mkdosfs) ] || [ -z $(which python) ]; then
>+-	echo "ERROR: either mkdosfs or python tool missing!"
>++if [ -z $(which mkdosfs) ] || [ -z $(which %%PYTHON_VERSION%%) ]; then
>++	echo "ERROR: either mkdosfs or %%PYTHON_VERSION%% tool missing!"
>+ 	exit 1
>+ fi
>+ 
>+@@ -147,8 +147,8 @@ echo "$step) Create DOS Master Boot Reco
>+ # - http://en.wikipedia.org/wiki/File_Allocation_Table#Boot_Sector
>+ # For DOS MBR, the values are little endian.
>+ # -----------
>+-python << EOF
>+-#!/usr/bin/env python
>++%%PYTHON_CMD%% << EOF
>++#!%%PYTHON_CMD%%
>+ mbr = bytearray(512)
>+ 
>+ def set_long(idx, value):
>Index: games/0ad/Makefile
>===================================================================
>--- games/0ad/Makefile	(revision 462454)
>+++ games/0ad/Makefile	(working copy)
>@@ -13,7 +13,6 @@
> COMMENT=	Real-time strategy (RTS) game of ancient warfare
> 
> BUILD_DEPENDS=	zip:archivers/zip \
>-		python:lang/python \
> 		cmake:devel/cmake
> LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
> 		libicui18n.so:devel/icu \
>@@ -31,7 +30,7 @@
> BUILD_WRKSRC=	${WRKSRC}/build/workspaces/gcc
> MAKE_ARGS=	config=release
> USES=		compiler:c++11-lib dos2unix gmake iconv jpeg openal:al \
>-		pkgconfig tar:xz
>+		pkgconfig python:build tar:xz
> USE_GNOME=	libxml2 gtk20
> USE_GL=		gl
> USE_SDL=	sdl2
>@@ -38,6 +37,7 @@
> USE_XORG=	x11 xcursor
> BUNDLE_LIBS=	yes
> DOS2UNIX_REGEX=	.*\.([ch]p{0,2}|make)
>+BINARY_ALIAS=	python=${PYTHON_CMD}
> 
> USE_WX=		2.8+
> WX_COMPS=	wx:lib
>Index: games/chocolate-doom/Makefile
>===================================================================
>--- games/chocolate-doom/Makefile	(revision 462454)
>+++ games/chocolate-doom/Makefile	(working copy)
>@@ -10,12 +10,12 @@
> 
> LICENSE=	GPLv2
> 
>-BUILD_DEPENDS=	python:lang/python
> LIB_DEPENDS=	libpng.so:graphics/png
> 
>-USES=		gmake
>+USES=		gmake python:build
> USE_SDL=	mixer net sdl
> GNU_CONFIGURE=	yes
>+BINARY_ALIAS=	python=${PYTHON_CMD}
> 
> PORTDOCS=	CMDLINE.doom ChangeLog INSTALL.doom NEWS.md NOT-BUGS.md PHILOSOPHY.md \
> 		README.md README.Music.md
>Index: lang/phantomjs/Makefile
>===================================================================
>--- lang/phantomjs/Makefile	(revision 462454)
>+++ lang/phantomjs/Makefile	(working copy)
>@@ -15,8 +15,7 @@
> NOT_FOR_ARCHS=		armv6 armv7
> NOT_FOR_ARCHS_REASON=	Platform.h: Not supported ARM architecture
> 
>-BUILD_DEPENDS=	bash:shells/bash \
>-		python:lang/python
>+BUILD_DEPENDS=	bash:shells/bash
> LIB_DEPENDS=	libfreetype.so:print/freetype2 \
> 		libfontconfig.so:x11-fonts/fontconfig \
> 		libicui18n.so:devel/icu \
>@@ -34,6 +33,7 @@
> RUBY_NO_RUN_DEPENDS=	yes
> PLIST_FILES=	bin/phantomjs
> NO_CCACHE=	yes
>+BINARY_ALIAS=	python=${PYTHON_CMD}
> 
> OPTIONS_DEFINE=	X11
> X11_USE=	XORG=x11
>Index: lang/swift/Makefile
>===================================================================
>--- lang/swift/Makefile	(revision 462454)
>+++ lang/swift/Makefile	(working copy)
>@@ -16,7 +16,6 @@
> BUILD_DEPENDS=	cmake:devel/cmake \
> 		bash:shells/bash \
> 		swig3.0:devel/swig30 \
>-		python:lang/python \
> 		sphinx-build:textproc/py-sphinx \
> 		binutils>=2.25.1:devel/binutils
> LIB_DEPENDS=	libicudata.so:devel/icu \
>@@ -25,7 +24,7 @@
> 
> REL_SNAP=	2017-04-22-a
> USE_GITHUB=	yes
>-BINARY_ALIAS=	swig=swig3.0
>+BINARY_ALIAS=	swig=swig3.0 python=${PYTHON_CMD}
> 
> GH_ACCOUNT=	apple:DEFAULT,llvm,clang,dispatch,lldb,cmark,llbuild,swiftpm,xctest,xcfound
> GH_PROJECT=	swift:DEFAULT swift-llvm:llvm swift-clang:clang swift-lldb:lldb \
>@@ -39,7 +38,8 @@
> 		swift-corelibs-libdispatch:dispatch
> 
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
>-USES=		autoreconf:build compiler:c++14-lang libtool localbase:ldflags iconv libedit ninja perl5 pkgconfig sqlite
>+USES=		autoreconf:build compiler:c++14-lang libtool localbase:ldflags iconv libedit \
>+		ninja perl5 pkgconfig python:build sqlite
> 
> USE_GNOME=	libxml2
> USE_LDCONFIG=	yes

Actions: View | Diff

Attachments on bug 225752: 190420 | 190473 | 190534 | 190778 | 190839