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 29 by douglas, 2008-07-15T15:14:42-07:00 vs.
Revision 144 by douglas, 2009-11-23T00:49:12-08:00

# Line 1 | Line 1
1   diff -Nrux .svn -x work /usr/ports/www/mod_wsgi/Makefile mod_wsgi/Makefile
2 < --- /usr/ports/www/mod_wsgi/Makefile    Fri Jun 20 16:12:20 2008
3 < +++ mod_wsgi/Makefile   Tue Jul 15 15:11:12 2008
2 > --- /usr/ports/www/mod_wsgi/Makefile    2009-11-21 02:51:19.000000000 -0800
3 > +++ mod_wsgi/Makefile   2009-11-23 00:47:08.000000000 -0800
4   @@ -6,7 +6,7 @@
5   #
6  
7   PORTNAME=      mod_wsgi
8 < -PORTVERSION=   2.0
9 < +PORTVERSION=   2.1
8 > -PORTVERSION=   2.6
9 > +PORTVERSION=   2.7
10   CATEGORIES=    www python
11 < MASTER_SITES=  ${MASTER_SITE_GOOGLE_CODE}
11 > MASTER_SITES=  ${MASTER_SITE_GOOGLE_CODE} \
12 >                http://apt.douglasthrift.net/files/${PORTNAME}/ \
13 > @@ -17,10 +17,13 @@
14  
15 + MAKE_JOBS_SAFE=        yes
16 +
17 + +LATEST_LINK=   mod_wsgi
18 + +CONFLICTS=     mod_wsgi-3.*
19 + +
20 + PROJECTHOST=   modwsgi
21 +
22 + USE_APACHE=    1.3+
23 + -USE_PYTHON=    2.3+
24 + +USE_PYTHON=    2.3-2.6
25 +
26 + GNU_CONFIGURE= yes
27 + CONFIGURE_ARGS+=--with-apxs="${APXS}" --with-python="${PYTHON_CMD}"
28   diff -Nrux .svn -x work /usr/ports/www/mod_wsgi/distinfo mod_wsgi/distinfo
29 < --- /usr/ports/www/mod_wsgi/distinfo    Fri Jun 20 16:12:20 2008
30 < +++ mod_wsgi/distinfo   Tue Jul 15 13:49:09 2008
29 > --- /usr/ports/www/mod_wsgi/distinfo    2009-10-11 05:19:17.000000000 -0700
30 > +++ mod_wsgi/distinfo   2009-11-21 04:50:56.000000000 -0800
31   @@ -1,3 +1,3 @@
32 < -MD5 (mod_wsgi-2.0.tar.gz) = 72e871d4fda1da33829ae3c7f3f2aeb6
33 < -SHA256 (mod_wsgi-2.0.tar.gz) = 6ccf94e88ecce945fe1c7bf1dd77abc725c8623b96b93a0cd9e3d0692b30500b
34 < -SIZE (mod_wsgi-2.0.tar.gz) = 96622
35 < +MD5 (mod_wsgi-2.1.tar.gz) = 4e0e8b5a13e0be2fc5b038f1e3e826a2
36 < +SHA256 (mod_wsgi-2.1.tar.gz) = 7f1c28f1fbc585de2a15770c990e45b46d184245183775dd31e3a63bd30fc3a0
37 < +SIZE (mod_wsgi-2.1.tar.gz) = 96635
32 > -MD5 (mod_wsgi-2.6.tar.gz) = c313cd7a662024866ce3376cb5a76cf6
33 > -SHA256 (mod_wsgi-2.6.tar.gz) = 70ca565528bdb29d1f0903e39827288dca5bff7ffccf090957dd4ed02b51e497
34 > -SIZE (mod_wsgi-2.6.tar.gz) = 99955
35 > +MD5 (mod_wsgi-2.7.tar.gz) = 60f3bf145eb804286b5fbf4e730a7ed1
36 > +SHA256 (mod_wsgi-2.7.tar.gz) = 5596b3968d4c90d667309f08f966e6f05b1bfae36b082783009af580aa5fa44b
37 > +SIZE (mod_wsgi-2.7.tar.gz) = 99956
38 > diff -Nrux .svn -x work /usr/ports/www/mod_wsgi/files/patch-configure mod_wsgi/files/patch-configure
39 > --- /usr/ports/www/mod_wsgi/files/patch-configure       1969-12-31 16:00:00.000000000 -0800
40 > +++ mod_wsgi/files/patch-configure      2009-11-23 00:40:04.000000000 -0800
41 > @@ -0,0 +1,28 @@
42 > +Index: configure
43 > +===================================================================
44 > +--- configure  (revision 1487)
45 > ++++ configure  (working copy)
46 > +@@ -1851,16 +1851,22 @@
47 > + fi
48 > +
49 > + CFLAGS1=""
50 > ++for arg in ${CFLAGS}
51 > ++do
52 > ++    CFLAGS1="${CFLAGS1} -Wc,$arg"
53 > ++done
54 > ++
55 > ++CFLAGS2=""
56 > + if test -x /usr/bin/lipo; then
57 > +     LDFLAGS3=""
58 > +     ARCHITECTURES=`/usr/bin/lipo -info $HTTPD | sed -e 's/.*://'`
59 > +     for ARCH in $ARCHITECTURES; do
60 > +-        CFLAGS1="${CFLAGS1} -Wc,'-arch ${ARCH}'"
61 > ++        CFLAGS2="${CFLAGS2} -Wc,'-arch ${ARCH}'"
62 > +         LDFLAGS3="${LDFLAGS3} -arch ${ARCH}"
63 > +     done
64 > + fi
65 > +
66 > +-CFLAGS="${CFLAGS} ${CFLAGS1}"
67 > ++CFLAGS="${CFLAGS1} ${CFLAGS2}"
68 > + LDFLAGS="${LDFLAGS} ${LDFLAGS1} ${LDFLAGS2} ${LDFLAGS3}"
69 > + LDLIBS="${LDLIBS} ${LDLIBS1} ${LDLIBS2} ${LDLIBS3}"

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines