CVS commit: pkgsrc/www

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Fri Mar  2 16:14:46 UTC 2018

Modified Files:
        pkgsrc/www/py-uwsgi: Makefile
Added Files:
        pkgsrc/www/ap-uwsgi: DESCR Makefile PLIST

Log Message:
Package the mod_proxy_uwsgi support separately from the main uwsgi
package.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/www/ap-uwsgi/DESCR pkgsrc/www/ap-uwsgi/Makefile \
    pkgsrc/www/ap-uwsgi/PLIST
cvs rdiff -u -r1.38 -r1.39 pkgsrc/www/py-uwsgi/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/py-uwsgi/Makefile
diff -u pkgsrc/www/py-uwsgi/Makefile:1.38 pkgsrc/www/py-uwsgi/Makefile:1.39
--- pkgsrc/www/py-uwsgi/Makefile:1.38   Tue Feb 13 08:34:03 2018
+++ pkgsrc/www/py-uwsgi/Makefile        Fri Mar  2 16:14:46 2018
@@ -1,25 +1,16 @@
-# $NetBSD: Makefile,v 1.38 2018/02/13 08:34:03 adam Exp $
+# $NetBSD: Makefile,v 1.39 2018/03/02 16:14:46 joerg Exp $
 
-DISTNAME=      uwsgi-2.0.16
-PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=    www python
-MASTER_SITES=  ${MASTER_SITE_PYPI:=u/uwsgi/}
+.include  "Makefile.common"
 
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://uwsgi-docs.readthedocs.io/
+PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 COMMENT=       Feature-rich WSGI server
-LICENSE=       gnu-gpl-v2 # with linking exception
-
-USE_TOOLS+=    pkg-config
 
 PLIST_SUBST+=  PYPKGPREFIX=${PYPKGPREFIX}
 EGG_NAME=      ${DISTNAME:S/uwsgi/uWSGI/}
 
 .include "options.mk"
 
-INSTALL_ENV+=  UWSGI_INCLUDES=${PREFIX}/include
-INSTALL_ENV+=  UWSGI_PROFILE_OVERRIDE="pcre=True;ssl=True;${UWSGI_DEBUG};${UWSGI_JSON};${UWSGI_UUID};${UWSGI_XML};${UWSGI_YAML}"
-
+INSTALL_ENV+=          UWSGI_PROFILE_OVERRIDE="${UWSGI_DEBUG}${UWSGI_JSON}${UWSGI_PCRE}${UWSGI_SSL}${UWSGI_UUID}${UWSGI_XML}${UWSGI_YAML}"
 INSTALLATION_DIRS+=    share/examples/${PYPKGPREFIX}-uwsgi
 
 post-install:
@@ -27,10 +18,5 @@ post-install:
        ${INSTALL_DATA} ${WRKSRC}/examples/* \
                ${DESTDIR}${PREFIX}/share/examples/${PYPKGPREFIX}-uwsgi
 
-.include "../../devel/pcre/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/dlopen.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Added files:

Index: pkgsrc/www/ap-uwsgi/DESCR
diff -u /dev/null pkgsrc/www/ap-uwsgi/DESCR:1.1
--- /dev/null   Fri Mar  2 16:14:46 2018
+++ pkgsrc/www/ap-uwsgi/DESCR   Fri Mar  2 16:14:46 2018
@@ -0,0 +1,2 @@
+This package provides mod_proxy_uwsgi. It provides uwsgi-transport
+support for the Apache server.
Index: pkgsrc/www/ap-uwsgi/Makefile
diff -u /dev/null pkgsrc/www/ap-uwsgi/Makefile:1.1
--- /dev/null   Fri Mar  2 16:14:46 2018
+++ pkgsrc/www/ap-uwsgi/Makefile        Fri Mar  2 16:14:46 2018
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1 2018/03/02 16:14:46 joerg Exp $
+
+.include  "../../www/py-uwsgi/Makefile.common"
+
+PKGNAME=       ${APACHE_PKG_PREFIX}-${DISTNAME}
+COMMENT=       Apache proxy backend for the uWSGI protocol
+
+APACHE_MODULE=         YES
+APACHE_MODULE_SRCDIR=  ${WRKSRC}/apache2
+APACHE_MODULE_SRC=     mod_proxy_uwsgi.c
+APACHE_MODULE_NAME=    mod_proxy_uwsgi.la
+
+.include "../../mk/apache.module.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/www/ap-uwsgi/PLIST
diff -u /dev/null pkgsrc/www/ap-uwsgi/PLIST:1.1
--- /dev/null   Fri Mar  2 16:14:46 2018
+++ pkgsrc/www/ap-uwsgi/PLIST   Fri Mar  2 16:14:46 2018
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2018/03/02 16:14:46 joerg Exp $
+lib/httpd/mod_proxy_uwsgi.so