Date: Mon, 19 Feb 2018 13:18:57 +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: r462316 - in head: misc/pylize multimedia/py-mlt net-im/mastodon sysutils/azure-agent textproc/doclifter www/mod_spdy Message-ID: <201802191318.w1JDIvsJ086828@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Mon Feb 19 13:18:57 2018 New Revision: 462316 URL: https://svnweb.freebsd.org/changeset/ports/462316 Log: Remove dependency on the python metaports PR: 225752 Submitted by: Yasuhiro KIMURA Modified: head/misc/pylize/Makefile head/multimedia/py-mlt/Makefile head/net-im/mastodon/Makefile head/sysutils/azure-agent/Makefile head/textproc/doclifter/Makefile head/www/mod_spdy/Makefile Modified: head/misc/pylize/Makefile ============================================================================== --- head/misc/pylize/Makefile Mon Feb 19 13:06:40 2018 (r462315) +++ head/misc/pylize/Makefile Mon Feb 19 13:18:57 2018 (r462316) @@ -3,7 +3,7 @@ PORTNAME= pylize PORTVERSION= 1.3.b -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= misc textproc MASTER_SITES= http://www.chrisarndt.de/en/software/pylize/download/ \ http://dryice.name/computer/FreeBSD/distfiles/ @@ -12,13 +12,12 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E} MAINTAINER= dryice@dryice.name COMMENT= Presentation generation tool -BUILD_DEPENDS= python:lang/python \ - ${PYTHON_SITELIBDIR}/HTMLgen.py:www/py-HTMLgen@${FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/HTMLgen.py:www/py-HTMLgen@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} \ ${PYTHON_SITELIBDIR}/em.py:textproc/py-empy@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= python:2 tar:bzip2 +USES= python:2.7 tar:bzip2 USE_PYTHON= autoplist distutils do-configure: Modified: head/multimedia/py-mlt/Makefile ============================================================================== --- head/multimedia/py-mlt/Makefile Mon Feb 19 13:06:40 2018 (r462315) +++ head/multimedia/py-mlt/Makefile Mon Feb 19 13:18:57 2018 (r462316) @@ -1,13 +1,11 @@ # Created by: Charlie Kester <corky1951@comcast.net> # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -BUILD_DEPENDS= python:lang/python - -USES= python:2 +USES= python:2.7 USE_PYTHON= flavors MASTERDIR= ${.CURDIR:H}/mlt SLAVEPORT= swig Python @@ -15,6 +13,10 @@ SLAVEPORT= swig Python PORTEXAMPLES= * OPTIONS_DEFINE= EXAMPLES + +post-patch: + @${REINPLACE_CMD} -e 's,which python,which ${PYTHON_VERSION},' -e 's,python -c,${PYTHON_VERSION} -c,' \ + -e 's,python-config,${PYTHON_VERSION}-config,' ${WRKSRC}/src/swig/python/build do-install: @${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} Modified: head/net-im/mastodon/Makefile ============================================================================== --- head/net-im/mastodon/Makefile Mon Feb 19 13:06:40 2018 (r462315) +++ head/net-im/mastodon/Makefile Mon Feb 19 13:18:57 2018 (r462316) @@ -90,7 +90,7 @@ BR_DEPENDS= ffmpeg>0:multimedia/ffmpeg\ rubygem-lograge-rails5>=0.7:www/rubygem-lograge-rails5\ rubygem-redis-rails-rails5>=5.0.2:www/rubygem-redis-rails-rails5 -USES= gmake gnome pgsql python:build,2 shebangfix +USES= gmake gnome pgsql python:2.7,build shebangfix USE_GITHUB= yes GH_ACCOUNT= tootsuite jehops:mn GH_PROJECT= mastodon_node:mn @@ -119,6 +119,7 @@ do-build: @${RM} ${WRKSRC}/Gemfile.lock HOME=${WRKSRC_mn} yarn config set yarn-offline-mirror ${WRKSRC_mn} --offline HOME=${WRKSRC_mn} yarn config set nodedir ${LOCALBASE} --offline + HOME=${WRKSRC_mn} yarn config set python ${PYTHON_CMD} @${CP} ${FILESDIR}/yarn.lock.in ${WRKSRC}/yarn.lock (cd ${WRKSRC};\ HOME=${WRKSRC_mn} yarn --offline;\ Modified: head/sysutils/azure-agent/Makefile ============================================================================== --- head/sysutils/azure-agent/Makefile Mon Feb 19 13:06:40 2018 (r462315) +++ head/sysutils/azure-agent/Makefile Mon Feb 19 13:18:57 2018 (r462316) @@ -3,7 +3,7 @@ PORTNAME= azure-agent PORTVERSION= 2.2.14 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MAINTAINER= honzhan@microsoft.com @@ -11,8 +11,7 @@ COMMENT= Microsoft Azure Linux Agent LICENSE= APACHE20 -RUN_DEPENDS= python:lang/python \ - sudo:security/sudo \ +RUN_DEPENDS= sudo:security/sudo \ bash:shells/bash \ base64:converters/base64 \ dmidecode:sysutils/dmidecode \ @@ -20,10 +19,9 @@ RUN_DEPENDS= python:lang/python \ ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss NO_BUILD= yes -USES= python:2 shebangfix +USES= python:2.7 shebangfix SHEBANG_FILES= bin/waagent bin/waagent2.0 -python_OLD_CMD= "/usr/bin/env python" USE_GITHUB= yes GH_ACCOUNT= Azure @@ -31,24 +29,27 @@ GH_PROJECT= WALinuxAgent USE_PYTHON= autoplist distutils post-patch: - ${REINPLACE_CMD} -e "s,/usr/sbin/waagent,${PREFIX}/sbin/waagent,g" \ - ${WRKSRC}/bin/waagent2.0 - ${REINPLACE_CMD} -e "s,/usr/sbin,${PREFIX}/sbin/,g" \ - ${WRKSRC}/init/waagent ${WRKSRC}/init/waagent.service \ - ${WRKSRC}/setup.py - ${REINPLACE_CMD} -e "s,/etc,${PREFIX}/etc,g" \ - -e "/set_conf_files.*freebsd\/waagent.conf/ s/^/#/" \ - ${WRKSRC}/setup.py ${REINPLACE_CMD} -e "s,/etc/waagent,${PREFIX}/etc/waagent,g" \ - ${WRKSRC}/bin/waagent2.0 \ - ${WRKSRC}/azurelinuxagent/common/osutil/default.py \ - ${WRKSRC}/init/waagent.service + ${WRKSRC}/azurelinuxagent/common/osutil/default.py ${REINPLACE_CMD} -e "s,/etc/rc.d/waagent,${PREFIX}/etc/rc.d/waagent,g" \ + -e "s,/etc/waagent,${PREFIX}/etc/waagent,g" \ + -e "s,#!/usr/bin/env python,#!${PYTHON_CMD},g" \ + -e "/command_interpreter/ s,/usr/local/bin/python,${PYTHON_CMD}," \ + -e "s,/usr/sbin/waagent,${PREFIX}/sbin/waagent,g" \ ${WRKSRC}/bin/waagent2.0 - ${REINPLACE_CMD} -e "s,/usr/bin/python,${PREFIX}/bin/python,g" \ - ${WRKSRC}/init/waagent.service ${REINPLACE_CMD} -e "s,:/usr/local/bin,:/usr/local/bin:/usr/local/sbin,g" \ + -e "s,python,${PYTHON_VERSION},g" \ ${WRKSRC}/init/freebsd/waagent + ${REINPLACE_CMD} -e "s,/usr/sbin,${PREFIX}/sbin,g" \ + ${WRKSRC}/init/waagent + ${REINPLACE_CMD} -e "s,/etc/waagent,${PREFIX}/etc/waagent,g" \ + -e "s,/usr/bin/python,${PYTHON_CMD},g" \ + -e "s,/usr/sbin,${PREFIX}/sbin,g" \ + ${WRKSRC}/init/waagent.service + ${REINPLACE_CMD} -e "s,/etc,${PREFIX}/etc,g" \ + -e "/set_conf_files.*freebsd\/waagent.conf/ s/^/#/" \ + -e "s,/usr/sbin,${PREFIX}/sbin,g" \ + ${WRKSRC}/setup.py post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc Modified: head/textproc/doclifter/Makefile ============================================================================== --- head/textproc/doclifter/Makefile Mon Feb 19 13:06:40 2018 (r462315) +++ head/textproc/doclifter/Makefile Mon Feb 19 13:18:57 2018 (r462316) @@ -3,16 +3,15 @@ PORTNAME= doclifter PORTVERSION= 2.17 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://www.catb.org/~esr/doclifter/ MAINTAINER= araujo@FreeBSD.org COMMENT= Translates documents written in troff macros to DocBook -RUN_DEPENDS+= python2:lang/python2 - -USES= python:2 shebangfix -SHEBANG_FILES= manlifter +USES= python:2.7 shebangfix +SHEBANG_FILES= doclifter manlifter NO_BUILD= yes NO_ARCH= yes @@ -20,9 +19,6 @@ PLIST_FILES= bin/doclifter \ bin/manlifter \ man/man1/doclifter.1.gz \ man/man1/manlifter.1.gz - -post-patch: - ${REINPLACE_CMD} '1s/python/python2/' ${WRKSRC}/doclifter do-install: ${INSTALL_SCRIPT} ${WRKSRC}/doclifter ${STAGEDIR}${PREFIX}/bin Modified: head/www/mod_spdy/Makefile ============================================================================== --- head/www/mod_spdy/Makefile Mon Feb 19 13:06:40 2018 (r462315) +++ head/www/mod_spdy/Makefile Mon Feb 19 13:18:57 2018 (r462316) @@ -3,7 +3,7 @@ PORTNAME= mod_spdy PORTVERSION= 0.9.4.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www MASTER_SITES= http://www.club.kyutech.ac.jp/~masaki/ports/:mod_spdy \ APACHE_HTTPD:apache22 @@ -17,8 +17,7 @@ COMMENT= SPDY module for the Apache HTTP server v2.2 LICENSE= APACHE20 -BUILD_DEPENDS= python:lang/python \ - greadlink:sysutils/coreutils \ +BUILD_DEPENDS= greadlink:sysutils/coreutils \ flock:sysutils/flock \ svn:devel/subversion \ curl:ftp/curl \ @@ -26,8 +25,9 @@ BUILD_DEPENDS= python:lang/python \ ONLY_FOR_ARCHS= amd64 i386 USE_APACHE= 22 -USES= compiler gmake python:2 ssl tar:xz +USES= compiler gmake python:2.7 ssl tar:xz REINPLACE_ARGS= -i "" +BINARY_ALIAS= python=${PYTHON_CMD} WRKSRC= ${WRKDIR}/${PORTNAME}_source_${PORTVERSION}/mod_spdy/src CFLAGS+= -fno-stack-protector -Wno-unknown-warning-option -Wno-c++11-extensions -I${OPENSSLINC}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802191318.w1JDIvsJ086828>