changeset 87:e3249546c992

Make a new line of code with the current trunk. Using GH commit 95d1d7498bfb9010467edf43fdd00eeed60e4d59.
author Franz Glasner <fzglas.hg@dom66.de>
date Mon, 15 Jun 2020 09:41:15 +0200
parents 278470dc420d
children 098130d0f0f0
files uwsginl/Makefile uwsginl/distinfo uwsginl/files/patch-uwsgiconfig.py
diffstat 3 files changed, 15 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/uwsginl/Makefile	Sun Jun 14 20:03:33 2020 +0200
+++ b/uwsginl/Makefile	Mon Jun 15 09:41:15 2020 +0200
@@ -5,8 +5,9 @@
 PORTNAME=	uwsginl
 DISTVERSION=	2.0.18
 CATEGORIES=	www
-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=	WSGI server which uses the uwsgi protocol (nolang profile)
@@ -20,6 +21,11 @@
 USES=		pkgconfig python:build
 USE_RC_SUBR=	uwsginl
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	unbit
+GH_PROJECT=	uwsgi
+GH_TAGNAME=	95d1d7498bfb9010467edf43fdd00eeed60e4d59
+
 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}"
 
 USERS=		uwsgi
--- a/uwsginl/distinfo	Sun Jun 14 20:03:33 2020 +0200
+++ b/uwsginl/distinfo	Mon Jun 15 09:41:15 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
--- a/uwsginl/files/patch-uwsgiconfig.py	Sun Jun 14 20:03:33 2020 +0200
+++ b/uwsginl/files/patch-uwsgiconfig.py	Mon Jun 15 09:41:15 2020 +0200
@@ -1,6 +1,6 @@
---- uwsgiconfig.py.orig	2019-02-09 14:48:07 UTC
+--- uwsgiconfig.py.orig	2020-06-14 09:50:00 UTC
 +++ uwsgiconfig.py
-@@ -1457,7 +1457,8 @@ def build_plugin(path, uc, cflags, ldflags, libs, name
+@@ -1494,7 +1494,8 @@ def build_plugin(path, uc, cflags, ldflags, libs, name
              gcc_list.append(path + '/' + cfile)
      for bfile in up.get('BINARY_LIST', []):
          try:
@@ -10,7 +10,7 @@
              print(binary_link_cmd)
              if os.system(binary_link_cmd) != 0:
                  raise Exception('unable to link binary file')
-@@ -1550,6 +1551,17 @@ def build_plugin(path, uc, cflags, ldflags, libs, name
+@@ -1590,6 +1591,17 @@ def build_plugin(path, uc, cflags, ldflags, libs, name
  
      print("build time: %d seconds" % (time.time() - plugin_started_at))
      print("*** %s plugin built and available in %s ***" % (name, plugin_dest + '.so'))
@@ -26,5 +26,5 @@
 +        return "-m %s" % emul
 +    return ""
  
+ 
  def vararg_callback(option, opt_str, value, parser):
-     assert value is None