Package the mod_proxy_uwsgi support separately from the main uwsgi

package.

5 files changed, 45 insertions, 18 deletions

diff --git a/www/ap-uwsgi/DESCR b/www/ap-uwsgi/DESCR
new file mode 100644
index 00000000000..c6b783ef95f
--- /dev/null
+++ b/www/ap-uwsgi/DESCR
@@ -0,0 +1,2 @@
+This package provides mod_proxy_uwsgi. It provides uwsgi-transport
+support for the Apache server.
diff --git a/www/ap-uwsgi/Makefile b/www/ap-uwsgi/Makefile
new file mode 100644
index 00000000000..f34b49ecc58
--- /dev/null
+++ b/www/ap-uwsgi/Makefile
@@ -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"
diff --git a/www/ap-uwsgi/PLIST b/www/ap-uwsgi/PLIST
new file mode 100644
index 00000000000..1342c401dd6
--- /dev/null
+++ b/www/ap-uwsgi/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2018/03/02 16:14:46 joerg Exp $
+lib/httpd/mod_proxy_uwsgi.so
diff --git a/www/py-uwsgi/Makefile b/www/py-uwsgi/Makefile
index 08f738824e9..81c5ccdf2e8 100644
--- a/www/py-uwsgi/Makefile
+++ b/www/py-uwsgi/Makefile
@@ -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
-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"
diff --git a/www/py-uwsgi/Makefile.common b/www/py-uwsgi/Makefile.common
new file mode 100644
index 00000000000..2ad4a692389
--- /dev/null
+++ b/www/py-uwsgi/Makefile.common
@@ -0,0 +1,23 @@
+# $NetBSD: Makefile.common,v 1.1 2018/03/02 16:15:35 joerg Exp $
+#
+# used by www/ap-uwsgi/Makefile
+# used by www/py-uwsgi/Makefile
+
+DISTNAME=	uwsgi-2.0.16
+CATEGORIES=	www python
+MASTER_SITES=	${MASTER_SITE_PYPI:=u/uwsgi/}
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://projects.unbit.it/uwsgi
+LICENSE=	gnu-gpl-v2 # with linking exception
+
+PATCHDIR=		${.CURDIR}/../../www/py-uwsgi/patches
+DISTINFO_FILE=		${.CURDIR}/../../www/py-uwsgi/distinfo
+
+USE_LANGUAGES=	c
+USE_TOOLS+=	pkg-config
+
+INSTALL_ENV+=		UWSGI_INCLUDES=${PREFIX}/include
+
+.include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"