Attachment 187300 Details for Bug 223108 – Update patch

[patch] Update patch

uwsgi.patch (text/plain), 3.35 KB, created by schmidt on 2017-10-19 09:22:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: schmidt

Created: 2017-10-19 09:22:54 UTC

Size: 3.35 KB

patch

obsolete

>diff -Nur uwsgi.old/files/uwsgi.in uwsgi/files/uwsgi.in
>--- uwsgi.old/files/uwsgi.in	2017-08-21 19:49:01.000000000 +0200
>+++ uwsgi/files/uwsgi.in	2017-10-19 09:46:24.145758000 +0200
>@@ -51,7 +51,7 @@
> 
> load_rc_config $name
> 
>-command=%%PREFIX%%/bin/uwsgi
>+command=%%PREFIX%%/bin/uwsgi%%PYTHON_VER%%
> 
> : ${uwsgi_enable="NO"}
> : ${uwsgi_socket="/tmp/${name}.sock"}
>@@ -86,6 +86,7 @@
> 			echo "$0: no such profile defined in uwsgi_profiles."
> 		        exit 1
> 		fi
>+		eval uwsgi_program=\${uwsgi_${profile}_program:-""}
> 		eval uwsgi_socket=\${uwsgi_${profile}_socket:-"/tmp/${name}-${profile}.sock"}
> 		eval uwsgi_socket_mode=\${uwsgi_${profile}_socket_mode:-${uwsgi_socket_mode}}
> 		eval uwsgi_socket_owner=\${uwsgi_${profile}_socket_owner:-${uwsgi_socket_owner}}
>diff -Nur uwsgi.old/Makefile uwsgi/Makefile
>--- uwsgi.old/Makefile	2017-08-21 19:49:01.000000000 +0200
>+++ uwsgi/Makefile	2017-10-19 11:05:54.374215000 +0200
>@@ -1,21 +1,21 @@
> # Created by: Daniel Gerzo <danger@FreeBSD.org>
> # $FreeBSD: head/www/uwsgi/Makefile 448482 2017-08-21 17:49:01Z ultima $
> 
>-PORTNAME=	uwsgi
>+PORTNAME=	${PYTHON_PKGNAMEPREFIX}uwsgi
> PORTVERSION=	2.0.15
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	www python
> MASTER_SITES=	http://projects.unbit.it/downloads/
>+DISTNAME=       uwsgi-${PORTVERSION}
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	schmidt@ze.tum.de
> COMMENT=	Developer-friendly WSGI server which uses uwsgi protocol
> 
> LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-USES=		pkgconfig python ssl
>+USES=		pkgconfig python ssl gettext-runtime
> USE_PYTHON=	distutils
>-USE_RC_SUBR=	uwsgi
> 
> CFLAGS+=	-I${OPENSSLINC}
> LDFLAGS+=	${OPENSSL_LDFLAGS}
>@@ -28,7 +28,7 @@
> USERS=		uwsgi
> GROUPS=		uwsgi
> 
>-PLIST_FILES=	bin/uwsgi \
>+PLIST_FILES=	bin/uwsgi${PYTHON_VER} \
> 		%%PYTHON_SITELIBDIR%%/uwsgidecorators.py
> 
> OPTIONS_DEFINE=	DEBUG JSON PCRE XML
>@@ -46,6 +46,19 @@
> 
> LIB_DEPENDS+=	libjansson.so:devel/jansson libpcre.so:devel/pcre libxml2.so:textproc/libxml2
> 
>+MAKE_ARGS+= PYTHON=${PYTHON_VERSION}
>+
>+.include <bsd.port.pre.mk>
>+
>+.if ${PYTHON_DEFAULT} == ${PYTHON_VER}
>+INSTALL_RC=	yes
>+.endif
>+
>+.if defined(INSTALL_RC)  
>+USE_RC_SUBR=	uwsgi
>+SUB_LIST+=      PYTHON_VER=${PYTHON_VER}
>+.endif
>+
> .include <bsd.port.options.mk>
> 
> post-patch:
>@@ -54,11 +67,26 @@
> .endfor
> 
> do-configure:
>-	@${DO_NADA}
>+.if !defined(INSTALL_RC)
>+	@${ECHO_MSG} "/!\\ WARNING /!\\"
>+	@${ECHO_MSG} ""
>+	@${ECHO_MSG} "You are installing uWSGI using a different python version than the system" 
>+	@${ECHO_MSG} "default python version."
>+	@${ECHO_MSG} ""
>+	@${ECHO_MSG} "No startup script will be installed, as it should be installed with the"
>+	@${ECHO_MSG} "uWSIG using the default python version."
>+	@${ECHO_MSG} ""
>+	@${ECHO_MSG} "You can change the uWSGI executabel used by the startupscript by setting"
>+	@${ECHO_MSG} "by setting the uwsgi_program rc variable."
>+	@${ECHO_MSG} ""
>+	@${ECHO_MSG} "If you are only installing uWSGI with this python version, hit ctrl-c now"
>+	@${ECHO_MSG} "and add INSTALL_RC=yes to your build command to install the startup script."
>+	@sleep 5
>+.endif
> 
> do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
>+	${INSTALL_PROGRAM} ${WRKSRC}/uwsgi ${STAGEDIR}${PREFIX}/bin/uwsgi${PYTHON_VER}
> 	@${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
> 	${INSTALL_DATA} ${WRKSRC}/uwsgidecorators.py ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>

Actions: View | Diff

Attachments on bug 223108: 187300