SF.net SVN: gar:[22899] csw/mgar/pkg/mod_wsgi/trunk

[dmichelsen at users.sourceforge.net]

Revision: 22899
          http://sourceforge.net/p/gar/code/22899
Author:   dmichelsen
Date:     2014-01-27 13:06:30 +0000 (Mon, 27 Jan 2014)
Log Message:
-----------
mod_wsgi/trunk: Add support for Python 2.7

Modified Paths:
--------------
    csw/mgar/pkg/mod_wsgi/trunk/Makefile

Removed Paths:
-------------
    csw/mgar/pkg/mod_wsgi/trunk/files/space

Modified: csw/mgar/pkg/mod_wsgi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mod_wsgi/trunk/Makefile	2014-01-27 09:05:19 UTC (rev 22898)
+++ csw/mgar/pkg/mod_wsgi/trunk/Makefile	2014-01-27 13:06:30 UTC (rev 22899)
@@ -4,7 +4,6 @@
 VERSION = 3.4
 GARTYPE = v2
 
-
 DESCRIPTION = Apache/Python WSGI adapter module.
 define BLURB
   Mod_wsgi is a python WSGI adapter module for Apache.
@@ -12,31 +11,39 @@
 
 GOOGLE_PROJECT = modwsgi
 MASTER_SITES = $(GOOGLE_MIRROR)
-DISTFILES  = $(NAME)-$(VERSION).tar.gz
-DISTFILES += postinstall preremove space
+DISTFILES += $(DISTNAME).tar.gz
+DISTFILES += postinstall preremove
+
+VENDOR_URL = https://code.google.com/p/modwsgi/
 LICENSE = LICENCE
 
 PACKAGES = CSWap2modwsgi
-
-RUNTIME_DEP_PKGS_CSWap2modwsgi = CSWpython
 CATALOGNAME_CSWap2modwsgi   = ap2_modwsgi
+RUNTIME_DEP_PKGS_CSWap2modwsgi += CSWpython
+RUNTIME_DEP_PKGS_CSWap2modwsgi += CSWlibpython2-6-1-0
+RUNTIME_DEP_PKGS_CSWap2modwsgi += CSWapache2
 
+CHECKPKG_OVERRIDES_CSWap2modwsgi += catalogname-does-not-match-pkgname|pkgname=CSWap2modwsgi|catalogname=ap2_modwsgi|expected-catalogname=ap2modwsgi
+CHECKPKG_OVERRIDES_CSWap2modwsgi += surplus-dependency|CSWpython
+
+EXTRA_MODULATORS += PYTHON
+MODULATIONS_PYTHON = 2.6 2.7
+
+EXTRA_PAX_ARGS += -s ",^(.*)/mod_wsgi\.so,\1/mod_wsgi-$(PYTHON).so,"
+
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-apxs=$(prefix)/apache2/sbin/apxs
-CONFIGURE_ARGS += --with-python=$(bindir)/python
+CONFIGURE_ARGS += --with-python=$(bindir)/python$(PYTHON)
 CONFIGURE_ARGS += --with-python-src=../python
 
-## There are no tests for this
+# There are no tests for this
 TEST_SCRIPTS =
 
-RUNTIME_DEP_PKGS_CSWap2modwsgi += CSWlibpython2-6-1-0
-RUNTIME_DEP_PKGS_CSWap2modwsgi += CSWapache2
+MERGE_SCRIPTS_isa-default-python-2.6 = copy-all
+MERGE_SCRIPTS_isa-default-python-2.7 = copy-all
 
-# If the pkgname is CSWap2modwsgi, catalogname should be ap2modwsgi
-# If the catalogname is ap2_modwsgi, the pkgname should be CSWap2-modwsgi
-CHECKPKG_OVERRIDES_CSWap2modwsgi += catalogname-does-not-match-pkgname|pkgname=CSWap2modwsgi|catalogname=ap2_modwsgi|expected-catalogname=ap2modwsgi
+include gar/category.mk
 
-# checkpkg doesn't know why CSWpython is needed
-CHECKPKG_OVERRIDES_CSWap2modwsgi += surplus-dependency|CSWpython
-
-include gar/category.mk
+post-merge-all:
+	gln -s mod_wsgi-2.6.so $(PKGROOT)opt/csw/apache2/libexec/mod_wsgi.so
+	@$(MAKECOOKIE)

Deleted: csw/mgar/pkg/mod_wsgi/trunk/files/space
===================================================================
--- csw/mgar/pkg/mod_wsgi/trunk/files/space	2014-01-27 09:05:19 UTC (rev 22898)
+++ csw/mgar/pkg/mod_wsgi/trunk/files/space	2014-01-27 13:06:30 UTC (rev 22899)
@@ -1 +0,0 @@
-$BASEDIR 4

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.