View | Details | Raw Unified | Return to bug 225752 | Differences between
and this patch

Collapse All | Expand All

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

Return to bug 225752