# HG changeset patch # User Franz Glasner # Date 1592216002 -7200 # Node ID 40e8d1ee1651c9c04ba05bd5b14582f18935f9b8 # Parent 098130d0f0f0a1434e5bf1ee077b1dd18a200781 Use current GitHub head of trunk with master ports py3 and pypy3 also. Implemented by including a common Makefile snippen from uwsginl. diff -r 098130d0f0f0 -r 40e8d1ee1651 uwsginl-plugin-lang-py3/Makefile --- a/uwsginl-plugin-lang-py3/Makefile Mon Jun 15 09:42:50 2020 +0200 +++ b/uwsginl-plugin-lang-py3/Makefile Mon Jun 15 12:13:22 2020 +0200 @@ -5,8 +5,9 @@ DISTVERSION= 2.0.18 PORTREVISION?= 0 CATEGORIES?= www python -MASTER_SITES= https://projects.unbit.it/downloads/ -DISTNAME= uwsgi-${DISTVERSION} +# Use GitHub id for now (before official 2.1); see below +#MASTER_SITES= https://projects.unbit.it/downloads/ +#DISTNAME= uwsgi-${DISTVERSION} MAINTAINER?= freebsd-dev@dom66.de COMMENT?= Language plugin for Python 3 (OS default) @@ -25,6 +26,8 @@ # Some python version is needed when building USES+= python:build pkgconfig +.include "${.CURDIR}/../uwsginl/Makefile.gh" + PLIST_FILES= ${PLUGIN_DIR}/${PLUGIN_FILENAME} MAKE_ENV+= UWSGI_PROFILE_OVERRIDE="plugin_build_dir=${STAGEDIR}${PREFIX}/${PLUGIN_DIR};plugin_dir=${PREFIX}/${PLUGIN_DIR}" PYTHON=${PYTHON_CMD} diff -r 098130d0f0f0 -r 40e8d1ee1651 uwsginl-plugin-lang-py3/distinfo --- a/uwsginl-plugin-lang-py3/distinfo Mon Jun 15 09:42:50 2020 +0200 +++ b/uwsginl-plugin-lang-py3/distinfo Mon Jun 15 12:13:22 2020 +0200 @@ -1,3 +1,3 @@ -TIMESTAMP = 1552136313 -SHA256 (uwsgi-2.0.18.tar.gz) = 4972ac538800fb2d421027f49b4a1869b66048839507ccf0aa2fda792d99f583 -SIZE (uwsgi-2.0.18.tar.gz) = 801555 +TIMESTAMP = 1592206726 +SHA256 (unbit-uwsgi-2.0.18-95d1d7498bfb9010467edf43fdd00eeed60e4d59_GH0.tar.gz) = f7fa5d7d44983877495bedfa4ecb2b38a24c79576f471632630c6be9dd36105f +SIZE (unbit-uwsgi-2.0.18-95d1d7498bfb9010467edf43fdd00eeed60e4d59_GH0.tar.gz) = 857624 diff -r 098130d0f0f0 -r 40e8d1ee1651 uwsginl-plugin-lang-pypy3/Makefile --- a/uwsginl-plugin-lang-pypy3/Makefile Mon Jun 15 09:42:50 2020 +0200 +++ b/uwsginl-plugin-lang-pypy3/Makefile Mon Jun 15 12:13:22 2020 +0200 @@ -4,8 +4,9 @@ PORTNAME= ${UWSGI_NAME}-plugin-lang-pypy3 DISTVERSION= 2.0.18 CATEGORIES= www python -MASTER_SITES= https://projects.unbit.it/downloads/ -DISTNAME= uwsgi-${DISTVERSION} +# Use GitHub id for now (before official 2.1); see below +#MASTER_SITES= https://projects.unbit.it/downloads/ +#DISTNAME= uwsgi-${DISTVERSION} MAINTAINER= freebsd-dev@dom66.de COMMENT= Language plugin for PyPy 3 @@ -23,6 +24,8 @@ USES= gettext-runtime pkgconfig +.include "${.CURDIR}/../uwsginl/Makefile.gh" + PLIST_FILES= ${PLUGIN_DIR}/${PLUGIN_FILENAME} MAKE_ENV+= UWSGI_PROFILE_OVERRIDE="plugin_build_dir=${STAGEDIR}${PREFIX}/${PLUGIN_DIR};plugin_dir=${PREFIX}/${PLUGIN_DIR}" PYTHON=/usr/local/bin/pypy3 diff -r 098130d0f0f0 -r 40e8d1ee1651 uwsginl-plugin-lang-pypy3/distinfo --- a/uwsginl-plugin-lang-pypy3/distinfo Mon Jun 15 09:42:50 2020 +0200 +++ b/uwsginl-plugin-lang-pypy3/distinfo Mon Jun 15 12:13:22 2020 +0200 @@ -1,3 +1,3 @@ -TIMESTAMP = 1552136313 -SHA256 (uwsgi-2.0.18.tar.gz) = 4972ac538800fb2d421027f49b4a1869b66048839507ccf0aa2fda792d99f583 -SIZE (uwsgi-2.0.18.tar.gz) = 801555 +TIMESTAMP = 1592206726 +SHA256 (unbit-uwsgi-2.0.18-95d1d7498bfb9010467edf43fdd00eeed60e4d59_GH0.tar.gz) = f7fa5d7d44983877495bedfa4ecb2b38a24c79576f471632630c6be9dd36105f +SIZE (unbit-uwsgi-2.0.18-95d1d7498bfb9010467edf43fdd00eeed60e4d59_GH0.tar.gz) = 857624 diff -r 098130d0f0f0 -r 40e8d1ee1651 uwsginl/Makefile --- a/uwsginl/Makefile Mon Jun 15 09:42:50 2020 +0200 +++ b/uwsginl/Makefile Mon Jun 15 12:13:22 2020 +0200 @@ -21,10 +21,7 @@ USES= pkgconfig python:build USE_RC_SUBR= uwsginl -USE_GITHUB= yes -GH_ACCOUNT= unbit -GH_PROJECT= uwsgi -GH_TAGNAME= 95d1d7498bfb9010467edf43fdd00eeed60e4d59 +.include "Makefile.gh" MAKE_ENV+= CPUCOUNT=${MAKE_JOBS_NUMBER} UWSGI_PROFILE=nolang.ini UWSGI_BIN_NAME=${PORTNAME} UWSGI_EMBED_PLUGINS=cgi,clock_realtime,clock_monotonic,echo,logpipe,pty,forkptyrouter UWSGI_PROFILE_OVERRIDE="plugin_dir=${PREFIX}/${PLUGIN_DIR};${EXTRA_PROFILE_OVERRIDE:S/ /;/gW}" diff -r 098130d0f0f0 -r 40e8d1ee1651 uwsginl/Makefile.gh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/uwsginl/Makefile.gh Mon Jun 15 12:13:22 2020 +0200 @@ -0,0 +1,6 @@ +# Common GitHug-related definitions for uwsginl and related plugin builds when plugins are **not** slave builds + +USE_GITHUB= yes +GH_ACCOUNT= unbit +GH_PROJECT= uwsgi +GH_TAGNAME= 95d1d7498bfb9010467edf43fdd00eeed60e4d59