Date: Wed, 21 Feb 2018 16:24:53 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r462532 - in head: deskutils/nemo-extensions devel/grumpy emulators/hatari emulators/hatari/files games/0ad games/chocolate-doom lang/phantomjs lang/swift Message-ID: <201802211624.w1LGOrHV058623@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Wed Feb 21 16:24:53 2018 New Revision: 462532 URL: https://svnweb.freebsd.org/changeset/ports/462532 Log: Remove dependency on the python metaport PR: 225752 Submitted by: Yasuhiro KIMURA Added: head/emulators/hatari/files/patch-tools_atari-hd-image.sh (contents, props changed) Modified: head/deskutils/nemo-extensions/Makefile head/devel/grumpy/Makefile head/emulators/hatari/Makefile head/games/0ad/Makefile head/games/chocolate-doom/Makefile head/lang/phantomjs/Makefile head/lang/swift/Makefile Modified: head/deskutils/nemo-extensions/Makefile ============================================================================== --- head/deskutils/nemo-extensions/Makefile Wed Feb 21 16:17:21 2018 (r462531) +++ head/deskutils/nemo-extensions/Makefile Wed Feb 21 16:24:53 2018 (r462532) @@ -12,7 +12,6 @@ COMMENT= File manager extensions for the Cinnamon desk 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 @@ USE_LDCONFIG= yes 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 @@ post-patch: 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 Modified: head/devel/grumpy/Makefile ============================================================================== --- head/devel/grumpy/Makefile Wed Feb 21 16:17:21 2018 (r462531) +++ head/devel/grumpy/Makefile Wed Feb 21 16:24:53 2018 (r462532) @@ -7,14 +7,16 @@ CATEGORIES= devel 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 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> Modified: head/emulators/hatari/Makefile ============================================================================== --- head/emulators/hatari/Makefile Wed Feb 21 16:17:21 2018 (r462531) +++ head/emulators/hatari/Makefile Wed Feb 21 16:24:53 2018 (r462532) @@ -3,7 +3,7 @@ PORTNAME= hatari PORTVERSION= 2.0.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators MASTER_SITES= http://download.tuxfamily.org/hatari/${PORTVERSION}/ @@ -15,14 +15,11 @@ LICENSE_FILE= ${WRKSRC}/gpl.txt 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 USE_GNOME= pygtk2 CMAKE_ARGS= -DETCDIR:PATH="${PREFIX}/etc" \ -DMANDIR:PATH="man/man1" \ @@ -53,6 +50,9 @@ post-patch: .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 Added: head/emulators/hatari/files/patch-tools_atari-hd-image.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/hatari/files/patch-tools_atari-hd-image.sh Wed Feb 21 16:24:53 2018 (r462532) @@ -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): Modified: head/games/0ad/Makefile ============================================================================== --- head/games/0ad/Makefile Wed Feb 21 16:17:21 2018 (r462531) +++ head/games/0ad/Makefile Wed Feb 21 16:24:53 2018 (r462532) @@ -13,7 +13,6 @@ MAINTAINER= madpilot@FreeBSD.org 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,13 +30,14 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-alpha 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 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 Modified: head/games/chocolate-doom/Makefile ============================================================================== --- head/games/chocolate-doom/Makefile Wed Feb 21 16:17:21 2018 (r462531) +++ head/games/chocolate-doom/Makefile Wed Feb 21 16:24:53 2018 (r462532) @@ -10,12 +10,12 @@ COMMENT= Doom/Heretic/Hexen/Strife engine port compati 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 Modified: head/lang/phantomjs/Makefile ============================================================================== --- head/lang/phantomjs/Makefile Wed Feb 21 16:17:21 2018 (r462531) +++ head/lang/phantomjs/Makefile Wed Feb 21 16:24:53 2018 (r462532) @@ -15,8 +15,7 @@ BROKEN_sparc64= does not link on sparc64 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 @@ GH_TUPLE= Vitallium:phantomjs-3rdparty-win:19051aa:msv RUBY_NO_RUN_DEPENDS= yes PLIST_FILES= bin/phantomjs NO_CCACHE= yes +BINARY_ALIAS= python=${PYTHON_CMD} OPTIONS_DEFINE= X11 X11_USE= XORG=x11 Modified: head/lang/swift/Makefile ============================================================================== --- head/lang/swift/Makefile Wed Feb 21 16:17:21 2018 (r462531) +++ head/lang/swift/Makefile Wed Feb 21 16:24:53 2018 (r462532) @@ -16,7 +16,6 @@ LICENSE_FILE= ${WRKSRC}/swift/LICENSE.txt 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 @@ LIB_DEPENDS= libicudata.so:devel/icu \ 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 @@ GH_SUBDIR= llvm:llvm clang:clang lldb:lldb cmark:cmark 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802211624.w1LGOrHV058623>