ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/pack/freebsd/diff/www/mod_wsgi/mod_wsgi.2010-05-18T095906Z.diff
(Generate patch)

Comparing freebsd/www/mod_wsgi.patch (file contents):
Revision 28 by douglas, 2008-07-15T13:31:46-07:00 vs.
Revision 147 by douglas, 2009-11-27T19:43:03-08:00

# Line 1 | Line 1
1 < diff -Nrux .svn -x work /usr/ports/www/mod_wsgi/files/patch-mod_wsgi.c mod_wsgi/files/patch-mod_wsgi.c
2 < --- /usr/ports/www/mod_wsgi/files/patch-mod_wsgi.c      Wed Dec 31 16:00:00 1969
3 < +++ mod_wsgi/files/patch-mod_wsgi.c     Tue Jul 15 13:12:53 2008
4 < @@ -0,0 +1,33 @@
5 < +--- mod_wsgi.c.orig    Tue Jul 15 13:01:00 2008
6 < ++++ mod_wsgi.c Tue Jul 15 13:07:19 2008
7 < +@@ -7749,10 +7749,12 @@
8 < + {
9 < +     const char *display_name = NULL;
10 < +
11 < ++#ifndef __FreeBSD__
12 < +     int slen = 0;
13 < +     int dlen = 0;
14 < +
15 < +     char *argv0 = NULL;
16 < ++#endif
17 < +
18 < +     display_name = daemon->group->display_name;
19 < +
20 < +@@ -7771,6 +7773,9 @@
21 < +      * is restricted, need to truncate display name if too long.
22 < +      */
23 < +
24 < ++#ifdef __FreeBSD__
25 < ++    setproctitle("%s", display_name);
26 < ++#else
27 < +     argv0 = (char*)wsgi_server->process->argv[0];
28 < +
29 < +     dlen = strlen(argv0);
30 < +@@ -7782,6 +7787,7 @@
31 < +         memcpy(argv0, display_name, slen);
32 < +     else
33 < +         memcpy(argv0, display_name, dlen);
34 < ++#endif
35 < + }
36 < +
37 < + static void wsgi_setup_access(WSGIDaemonProcess *daemon)
1 > diff -Nrux .svn -x work /usr/ports/www/mod_wsgi/Makefile mod_wsgi/Makefile
2 > --- /usr/ports/www/mod_wsgi/Makefile    2009-11-23 02:34:40.000000000 -0800
3 > +++ mod_wsgi/Makefile   2009-11-27 19:42:35.000000000 -0800
4 > @@ -6,7 +6,7 @@
5 > #
6 >
7 > PORTNAME=      mod_wsgi
8 > -PORTVERSION=   2.7
9 > +PORTVERSION=   2.8
10 > CATEGORIES=    www python
11 > MASTER_SITES=  ${MASTER_SITE_GOOGLE_CODE} \
12 >                http://apt.douglasthrift.net/files/${PORTNAME}/ \
13 > @@ -23,7 +23,7 @@
14 > PROJECTHOST=   modwsgi
15 >
16 > USE_APACHE=    1.3+
17 > -USE_PYTHON=    2.5-2.6
18 > +USE_PYTHON=    2.3-2.6
19 >
20 > GNU_CONFIGURE= yes
21 > CONFIGURE_ARGS+=--with-apxs="${APXS}" --with-python="${PYTHON_CMD}"
22 > diff -Nrux .svn -x work /usr/ports/www/mod_wsgi/distinfo mod_wsgi/distinfo
23 > --- /usr/ports/www/mod_wsgi/distinfo    2009-11-23 02:34:40.000000000 -0800
24 > +++ mod_wsgi/distinfo   2009-11-27 19:24:28.000000000 -0800
25 > @@ -1,3 +1,3 @@
26 > -MD5 (mod_wsgi-2.7.tar.gz) = 60f3bf145eb804286b5fbf4e730a7ed1
27 > -SHA256 (mod_wsgi-2.7.tar.gz) = 5596b3968d4c90d667309f08f966e6f05b1bfae36b082783009af580aa5fa44b
28 > -SIZE (mod_wsgi-2.7.tar.gz) = 99956
29 > +MD5 (mod_wsgi-2.8.tar.gz) = f4d09ce314502f438af3155348cfc234
30 > +SHA256 (mod_wsgi-2.8.tar.gz) = 4c93167002d718c5899afb86495152acdc9f15f351e374a6886caff76b7f7d82
31 > +SIZE (mod_wsgi-2.8.tar.gz) = 99997
32 > diff -Nrux .svn -x work /usr/ports/www/mod_wsgi/files/patch-configure mod_wsgi/files/patch-configure
33 > --- /usr/ports/www/mod_wsgi/files/patch-configure       2009-11-23 02:34:40.000000000 -0800
34 > +++ mod_wsgi/files/patch-configure      1969-12-31 16:00:00.000000000 -0800
35 > @@ -1,28 +0,0 @@
36 > -Index: configure
37 > -===================================================================
38 > ---- configure  (revision 1487)
39 > -+++ configure  (working copy)
40 > -@@ -1851,16 +1851,22 @@
41 > - fi
42 > -
43 > - CFLAGS1=""
44 > -+for arg in ${CFLAGS}
45 > -+do
46 > -+    CFLAGS1="${CFLAGS1} -Wc,$arg"
47 > -+done
48 > -+
49 > -+CFLAGS2=""
50 > - if test -x /usr/bin/lipo; then
51 > -     LDFLAGS3=""
52 > -     ARCHITECTURES=`/usr/bin/lipo -info $HTTPD | sed -e 's/.*://'`
53 > -     for ARCH in $ARCHITECTURES; do
54 > --        CFLAGS1="${CFLAGS1} -Wc,'-arch ${ARCH}'"
55 > -+        CFLAGS2="${CFLAGS2} -Wc,'-arch ${ARCH}'"
56 > -         LDFLAGS3="${LDFLAGS3} -arch ${ARCH}"
57 > -     done
58 > - fi
59 > -
60 > --CFLAGS="${CFLAGS} ${CFLAGS1}"
61 > -+CFLAGS="${CFLAGS1} ${CFLAGS2}"
62 > - LDFLAGS="${LDFLAGS} ${LDFLAGS1} ${LDFLAGS2} ${LDFLAGS3}"
63 > - LDLIBS="${LDLIBS} ${LDLIBS1} ${LDLIBS2} ${LDLIBS3}"

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines