From 3ab82e7420c35b294e6a42ae8ad0847cbb03ab8a Mon Sep 17 00:00:00 2001 From: lippe Date: Tue, 2 Sep 2008 21:55:40 +0000 Subject: - Update to 2.3. - Move pkg-message to FILESDIR. PR: ports/127025 Submitted by: Douglas William Thrift Approved by: Douglas William Thrift (maintainer) --- www/mod_wsgi/Makefile | 4 +++- www/mod_wsgi/distinfo | 6 +++--- www/mod_wsgi/files/patch-mod_wsgi.c | 29 +++++++++++------------------ www/mod_wsgi/files/pkg-message.in | 5 +++++ www/mod_wsgi/pkg-message | 5 ----- www/mod_wsgi3/Makefile | 4 +++- www/mod_wsgi3/distinfo | 6 +++--- www/mod_wsgi3/files/patch-mod_wsgi.c | 29 +++++++++++------------------ www/mod_wsgi3/files/pkg-message.in | 5 +++++ www/mod_wsgi3/pkg-message | 5 ----- 10 files changed, 44 insertions(+), 54 deletions(-) create mode 100644 www/mod_wsgi/files/pkg-message.in delete mode 100644 www/mod_wsgi/pkg-message create mode 100644 www/mod_wsgi3/files/pkg-message.in delete mode 100644 www/mod_wsgi3/pkg-message (limited to 'www') diff --git a/www/mod_wsgi/Makefile b/www/mod_wsgi/Makefile index 7edab77a9b06..9eb3cd605f05 100644 --- a/www/mod_wsgi/Makefile +++ b/www/mod_wsgi/Makefile @@ -6,7 +6,7 @@ # PORTNAME= mod_wsgi -PORTVERSION= 2.1 +PORTVERSION= 2.3 CATEGORIES= www python MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} @@ -21,6 +21,8 @@ USE_PYTHON= 2.3+ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-apxs="${APXS}" --with-python="${PYTHON_CMD}" +SUB_FILES= pkg-message + post-install: @${APXS} -e -a -n "${SHORTMODNAME}" "${APACHEMODDIR}/${MODULENAME}.so" @${CAT} ${PKGMESSAGE} diff --git a/www/mod_wsgi/distinfo b/www/mod_wsgi/distinfo index 0216014f2216..d3926d891fa2 100644 --- a/www/mod_wsgi/distinfo +++ b/www/mod_wsgi/distinfo @@ -1,3 +1,3 @@ -MD5 (mod_wsgi-2.1.tar.gz) = 4e0e8b5a13e0be2fc5b038f1e3e826a2 -SHA256 (mod_wsgi-2.1.tar.gz) = 7f1c28f1fbc585de2a15770c990e45b46d184245183775dd31e3a63bd30fc3a0 -SIZE (mod_wsgi-2.1.tar.gz) = 96635 +MD5 (mod_wsgi-2.3.tar.gz) = c686e1c498dbe5753fe491c3cf61cff4 +SHA256 (mod_wsgi-2.3.tar.gz) = 760f03e4d96dd0560717b06448af95bd79e91b59d31930171775a53bb7ec2375 +SIZE (mod_wsgi-2.3.tar.gz) = 96872 diff --git a/www/mod_wsgi/files/patch-mod_wsgi.c b/www/mod_wsgi/files/patch-mod_wsgi.c index c0de48092bdf..ffb512d0ad76 100644 --- a/www/mod_wsgi/files/patch-mod_wsgi.c +++ b/www/mod_wsgi/files/patch-mod_wsgi.c @@ -1,20 +1,13 @@ ---- mod_wsgi.c.orig 2008-06-18 16:35:40.000000000 +0200 -+++ mod_wsgi.c 2008-07-19 19:41:18.000000000 +0200 -@@ -7771,6 +7771,9 @@ - * is restricted, need to truncate display name if too long. - */ +Index: mod_wsgi.c +=================================================================== +--- mod_wsgi.c (revision 1007) ++++ mod_wsgi.c (revision 1008) +@@ -245,7 +245,7 @@ + /* Version and module information. */ -+#ifdef __FreeBSD__ -+ setproctitle(display_name); -+#else - argv0 = (char*)wsgi_server->process->argv[0]; + #define MOD_WSGI_MAJORVERSION_NUMBER 2 +-#define MOD_WSGI_MINORVERSION_NUMBER 2 ++#define MOD_WSGI_MINORVERSION_NUMBER 3 + #define MOD_WSGI_VERSION_STRING "2.3" - dlen = strlen(argv0); -@@ -7782,6 +7785,7 @@ - memcpy(argv0, display_name, slen); - else - memcpy(argv0, display_name, dlen); -+#endif - } - - static void wsgi_setup_access(WSGIDaemonProcess *daemon) + #if AP_SERVER_MAJORVERSION_NUMBER < 2 diff --git a/www/mod_wsgi/files/pkg-message.in b/www/mod_wsgi/files/pkg-message.in new file mode 100644 index 000000000000..dea5054f301f --- /dev/null +++ b/www/mod_wsgi/files/pkg-message.in @@ -0,0 +1,5 @@ +================================================================================ + +For more information, see http://www.modwsgi.org/. + +================================================================================ diff --git a/www/mod_wsgi/pkg-message b/www/mod_wsgi/pkg-message deleted file mode 100644 index dea5054f301f..000000000000 --- a/www/mod_wsgi/pkg-message +++ /dev/null @@ -1,5 +0,0 @@ -================================================================================ - -For more information, see http://www.modwsgi.org/. - -================================================================================ diff --git a/www/mod_wsgi3/Makefile b/www/mod_wsgi3/Makefile index 7edab77a9b06..9eb3cd605f05 100644 --- a/www/mod_wsgi3/Makefile +++ b/www/mod_wsgi3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= mod_wsgi -PORTVERSION= 2.1 +PORTVERSION= 2.3 CATEGORIES= www python MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} @@ -21,6 +21,8 @@ USE_PYTHON= 2.3+ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-apxs="${APXS}" --with-python="${PYTHON_CMD}" +SUB_FILES= pkg-message + post-install: @${APXS} -e -a -n "${SHORTMODNAME}" "${APACHEMODDIR}/${MODULENAME}.so" @${CAT} ${PKGMESSAGE} diff --git a/www/mod_wsgi3/distinfo b/www/mod_wsgi3/distinfo index 0216014f2216..d3926d891fa2 100644 --- a/www/mod_wsgi3/distinfo +++ b/www/mod_wsgi3/distinfo @@ -1,3 +1,3 @@ -MD5 (mod_wsgi-2.1.tar.gz) = 4e0e8b5a13e0be2fc5b038f1e3e826a2 -SHA256 (mod_wsgi-2.1.tar.gz) = 7f1c28f1fbc585de2a15770c990e45b46d184245183775dd31e3a63bd30fc3a0 -SIZE (mod_wsgi-2.1.tar.gz) = 96635 +MD5 (mod_wsgi-2.3.tar.gz) = c686e1c498dbe5753fe491c3cf61cff4 +SHA256 (mod_wsgi-2.3.tar.gz) = 760f03e4d96dd0560717b06448af95bd79e91b59d31930171775a53bb7ec2375 +SIZE (mod_wsgi-2.3.tar.gz) = 96872 diff --git a/www/mod_wsgi3/files/patch-mod_wsgi.c b/www/mod_wsgi3/files/patch-mod_wsgi.c index c0de48092bdf..ffb512d0ad76 100644 --- a/www/mod_wsgi3/files/patch-mod_wsgi.c +++ b/www/mod_wsgi3/files/patch-mod_wsgi.c @@ -1,20 +1,13 @@ ---- mod_wsgi.c.orig 2008-06-18 16:35:40.000000000 +0200 -+++ mod_wsgi.c 2008-07-19 19:41:18.000000000 +0200 -@@ -7771,6 +7771,9 @@ - * is restricted, need to truncate display name if too long. - */ +Index: mod_wsgi.c +=================================================================== +--- mod_wsgi.c (revision 1007) ++++ mod_wsgi.c (revision 1008) +@@ -245,7 +245,7 @@ + /* Version and module information. */ -+#ifdef __FreeBSD__ -+ setproctitle(display_name); -+#else - argv0 = (char*)wsgi_server->process->argv[0]; + #define MOD_WSGI_MAJORVERSION_NUMBER 2 +-#define MOD_WSGI_MINORVERSION_NUMBER 2 ++#define MOD_WSGI_MINORVERSION_NUMBER 3 + #define MOD_WSGI_VERSION_STRING "2.3" - dlen = strlen(argv0); -@@ -7782,6 +7785,7 @@ - memcpy(argv0, display_name, slen); - else - memcpy(argv0, display_name, dlen); -+#endif - } - - static void wsgi_setup_access(WSGIDaemonProcess *daemon) + #if AP_SERVER_MAJORVERSION_NUMBER < 2 diff --git a/www/mod_wsgi3/files/pkg-message.in b/www/mod_wsgi3/files/pkg-message.in new file mode 100644 index 000000000000..dea5054f301f --- /dev/null +++ b/www/mod_wsgi3/files/pkg-message.in @@ -0,0 +1,5 @@ +================================================================================ + +For more information, see http://www.modwsgi.org/. + +================================================================================ diff --git a/www/mod_wsgi3/pkg-message b/www/mod_wsgi3/pkg-message deleted file mode 100644 index dea5054f301f..000000000000 --- a/www/mod_wsgi3/pkg-message +++ /dev/null @@ -1,5 +0,0 @@ -================================================================================ - -For more information, see http://www.modwsgi.org/. - -================================================================================ -- cgit