pkgsrc-Users archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: Python 2.3 support



On Wed, Aug 19, 2009 at 10:23:54PM +0900, OBATA Akio wrote:
> If no objection, I'll remove the restriction (and update to 2.7.11).

Can you (or someone else) test the attached patch for that?

Joerg
Index: Makefile
===================================================================
RCS file: /home/joerg/repo/netbsd/pkgsrc/www/ap-python/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile    14 Jun 2009 22:58:10 -0000      1.23
+++ Makefile    21 Aug 2009 17:23:04 -0000
@@ -1,9 +1,8 @@
 # $NetBSD: Makefile,v 1.23 2009/06/14 22:58:10 joerg Exp $
 #
 
-DISTNAME=              mod_python-2.7.10
-PKGNAME=               ap13-python-2.7.10
-PKGREVISION=           1
+DISTNAME=              mod_python-2.7.11
+PKGNAME=               ap13-python-2.7.11
 CATEGORIES=            www
 MASTER_SITES=          ${MASTER_SITE_APACHE:=httpd/modpython/}
 EXTRACT_SUFX=          .tgz
@@ -12,25 +11,41 @@ MAINTAINER=         pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://www.modpython.org/
 COMMENT=               Python interpreter embedded into Apache
 
-USE_TOOLS+=    pax
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 CONFLICTS=     ap-python-[0-9]*
 
-PLIST_SRC=             ${WRKDIR}/.PLIST_SRC
-
 GNU_CONFIGURE=         yes
 CONFIGURE_ENV+=                PYTHON_BIN=${PYTHONBIN:Q} ac_cv_path_MKDEP=
 MAKE_ENV+=             PYTHONBIN=${PYTHONBIN:Q}
-PYTHON_VERSIONS_ACCEPTED=      23
 
-post-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/ap-mod_python
-       cd ${WRKSRC} && pax -rw -s /doc-html/ap-mod_python/ \
-               -pe doc-html ${PREFIX}/share/doc/html
-       ${ECHO} lib/httpd/mod_python.so >${PLIST_SRC}
-       cd ${PREFIX} && ${FIND} ${PYSITELIB}/mod_python \
-               share/doc/html/ap-mod_python \
-               -type f -print >>${PLIST_SRC}
+INSTALLATION_DIRS=     ${PYSITELIB}/mod_python lib/httpd \
+                       share/doc/html/ap-mod_python/icons
+
+post-build:
+       cd ${WRKSRC}/lib/python/mod_python && ${PY_COMPILE_ALL} .
+       cd ${WRKSRC}/lib/python/mod_python && ${PY_COMPILE_O_ALL} .
+
+do-install:
+       ${INSTALL_LIB} ${WRKSRC}/src/mod_python.so \
+           ${DESTDIR}${PREFIX}/lib/httpd
+       for f in ${WRKSRC}/lib/python/mod_python/*.py; do \
+               ${INSTALL_DATA} $$f 
${DESTDIR}${PREFIX}/${PYSITELIB}/mod_python; \
+       done
+       for f in ${WRKSRC}/lib/python/mod_python/*.pyc; do \
+               ${INSTALL_DATA} $$f 
${DESTDIR}${PREFIX}/${PYSITELIB}/mod_python; \
+       done
+       for f in ${WRKSRC}/lib/python/mod_python/*.pyo; do \
+               ${INSTALL_DATA} $$f 
${DESTDIR}${PREFIX}/${PYSITELIB}/mod_python; \
+       done
+       ${INSTALL_DATA} ${WRKSRC}/doc-html/*.html \
+           ${DESTDIR}${PREFIX}/share/doc/html/ap-mod_python
+       ${INSTALL_DATA} ${WRKSRC}/doc-html/*.css \
+           ${DESTDIR}${PREFIX}/share/doc/html/ap-mod_python
+       ${INSTALL_DATA} ${WRKSRC}/doc-html/icons/*.gif \
+           ${DESTDIR}${PREFIX}/share/doc/html/ap-mod_python/icons
+       ${INSTALL_DATA} ${WRKSRC}/doc-html/icons/*.png \
+           ${DESTDIR}${PREFIX}/share/doc/html/ap-mod_python/icons
 
 .include "../../lang/python/extension.mk"
 .include "../../www/apache/buildlink3.mk"
Index: PLIST
===================================================================
RCS file: PLIST
diff -N PLIST
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ PLIST       21 Aug 2009 17:29:57 -0000
@@ -0,0 +1,121 @@
+@comment $NetBSD$
+lib/httpd/mod_python.so
+${PYSITELIB}/mod_python/__init__.py
+${PYSITELIB}/mod_python/__init__.pyc
+${PYSITELIB}/mod_python/__init__.pyo
+${PYSITELIB}/mod_python/apache.py
+${PYSITELIB}/mod_python/apache.pyc
+${PYSITELIB}/mod_python/apache.pyo
+${PYSITELIB}/mod_python/cgihandler.py
+${PYSITELIB}/mod_python/cgihandler.pyc
+${PYSITELIB}/mod_python/cgihandler.pyo
+${PYSITELIB}/mod_python/httpdapi.py
+${PYSITELIB}/mod_python/httpdapi.pyc
+${PYSITELIB}/mod_python/httpdapi.pyo
+${PYSITELIB}/mod_python/publisher.py
+${PYSITELIB}/mod_python/publisher.pyc
+${PYSITELIB}/mod_python/publisher.pyo
+${PYSITELIB}/mod_python/util.py
+${PYSITELIB}/mod_python/util.pyc
+${PYSITELIB}/mod_python/util.pyo
+${PYSITELIB}/mod_python/zhandler.py
+${PYSITELIB}/mod_python/zhandler.pyc
+${PYSITELIB}/mod_python/zhandler.pyo
+share/doc/html/ap-mod_python/about.html
+share/doc/html/ap-mod_python/app-vnsinst.html
+share/doc/html/ap-mod_python/app-wininst.html
+share/doc/html/ap-mod_python/contents.html
+share/doc/html/ap-mod_python/dir-handlers-ach.html
+share/doc/html/ap-mod_python/dir-handlers-auh.html
+share/doc/html/ap-mod_python/dir-handlers-fuh.html
+share/doc/html/ap-mod_python/dir-handlers-hph.html
+share/doc/html/ap-mod_python/dir-handlers-pch.html
+share/doc/html/ap-mod_python/dir-handlers-ph.html
+share/doc/html/ap-mod_python/dir-handlers-pih.html
+share/doc/html/ap-mod_python/dir-handlers-plh.html
+share/doc/html/ap-mod_python/dir-handlers-prrh.html
+share/doc/html/ap-mod_python/dir-handlers-syn.html
+share/doc/html/ap-mod_python/dir-handlers-th.html
+share/doc/html/ap-mod_python/dir-handlers-tph.html
+share/doc/html/ap-mod_python/dir-handlers.html
+share/doc/html/ap-mod_python/dir-other-epd.html
+share/doc/html/ap-mod_python/dir-other-ipd.html
+share/doc/html/ap-mod_python/dir-other-ipdv.html
+share/doc/html/ap-mod_python/dir-other-par.html
+share/doc/html/ap-mod_python/dir-other-pd.html
+share/doc/html/ap-mod_python/dir-other-phm.html
+share/doc/html/ap-mod_python/dir-other-pi.html
+share/doc/html/ap-mod_python/dir-other-po.html
+share/doc/html/ap-mod_python/dir-other-pomz.html
+share/doc/html/ap-mod_python/dir-other-pp.html
+share/doc/html/ap-mod_python/dir-other.html
+share/doc/html/ap-mod_python/directives.html
+share/doc/html/ap-mod_python/front.html
+share/doc/html/ap-mod_python/genindex.html
+share/doc/html/ap-mod_python/hand-cgi.html
+share/doc/html/ap-mod_python/hand-httpdapy.html
+share/doc/html/ap-mod_python/hand-pub-alg-args.html
+share/doc/html/ap-mod_python/hand-pub-alg-auth.html
+share/doc/html/ap-mod_python/hand-pub-alg-trav.html
+share/doc/html/ap-mod_python/hand-pub-alg.html
+share/doc/html/ap-mod_python/hand-pub-intro.html
+share/doc/html/ap-mod_python/hand-pub.html
+share/doc/html/ap-mod_python/hand-z.html
+share/doc/html/ap-mod_python/handlers.html
+share/doc/html/ap-mod_python/icons/blank.gif
+share/doc/html/ap-mod_python/icons/blank.png
+share/doc/html/ap-mod_python/icons/contents.gif
+share/doc/html/ap-mod_python/icons/contents.png
+share/doc/html/ap-mod_python/icons/index.gif
+share/doc/html/ap-mod_python/icons/index.png
+share/doc/html/ap-mod_python/icons/modules.gif
+share/doc/html/ap-mod_python/icons/modules.png
+share/doc/html/ap-mod_python/icons/next.gif
+share/doc/html/ap-mod_python/icons/next.png
+share/doc/html/ap-mod_python/icons/previous.gif
+share/doc/html/ap-mod_python/icons/previous.png
+share/doc/html/ap-mod_python/icons/up.gif
+share/doc/html/ap-mod_python/icons/up.png
+share/doc/html/ap-mod_python/index.html
+share/doc/html/ap-mod_python/inst-apacheconfig.html
+share/doc/html/ap-mod_python/inst-compiling.html
+share/doc/html/ap-mod_python/inst-configure.html
+share/doc/html/ap-mod_python/inst-installing.html
+share/doc/html/ap-mod_python/inst-make.html
+share/doc/html/ap-mod_python/inst-makeinstall.html
+share/doc/html/ap-mod_python/inst-prerequisites.html
+share/doc/html/ap-mod_python/inst-testing.html
+share/doc/html/ap-mod_python/inst-trouble.html
+share/doc/html/ap-mod_python/installation.html
+share/doc/html/ap-mod_python/intr-flexibility.html
+share/doc/html/ap-mod_python/intr-history.html
+share/doc/html/ap-mod_python/intr-performance.html
+share/doc/html/ap-mod_python/introduction.html
+share/doc/html/ap-mod_python/modpython.css
+share/doc/html/ap-mod_python/modpython.html
+share/doc/html/ap-mod_python/module-apache.html
+share/doc/html/ap-mod_python/node58.html
+share/doc/html/ap-mod_python/node74.html
+share/doc/html/ap-mod_python/pyapi-callback.html
+share/doc/html/ap-mod_python/pyapi-debug.html
+share/doc/html/ap-mod_python/pyapi-handler.html
+share/doc/html/ap-mod_python/pyapi-interps.html
+share/doc/html/ap-mod_python/pyapi-mpconn-mem.html
+share/doc/html/ap-mod_python/pyapi-mpconn.html
+share/doc/html/ap-mod_python/pyapi-mprequest-mem.html
+share/doc/html/ap-mod_python/pyapi-mprequest-meth.html
+share/doc/html/ap-mod_python/pyapi-mprequest.html
+share/doc/html/ap-mod_python/pyapi-mpserver.html
+share/doc/html/ap-mod_python/pyapi-mpsrv-mem.html
+share/doc/html/ap-mod_python/pyapi-mpsrv-meth.html
+share/doc/html/ap-mod_python/pyapi-mptable.html
+share/doc/html/ap-mod_python/pyapi-util-fstor-fld.html
+share/doc/html/ap-mod_python/pyapi-util-fstor.html
+share/doc/html/ap-mod_python/pyapi-util-funcs.html
+share/doc/html/ap-mod_python/pyapi-util.html
+share/doc/html/ap-mod_python/pythonapi.html
+share/doc/html/ap-mod_python/tut-more-complicated.html
+share/doc/html/ap-mod_python/tut-overview.html
+share/doc/html/ap-mod_python/tut-pub.html
+share/doc/html/ap-mod_python/tut-what-it-do.html
+share/doc/html/ap-mod_python/tutorial.html
Index: distinfo
===================================================================
RCS file: /home/joerg/repo/netbsd/pkgsrc/www/ap-python/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo    10 Jul 2008 14:59:57 -0000      1.5
+++ distinfo    21 Aug 2009 15:31:44 -0000
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.5 2008/07/10 14:59:57 joerg Exp $
 
-SHA1 (mod_python-2.7.10.tgz) = 1fcac8d268d836a7ba2cbdc8c5827f9fdce2b1ca
-RMD160 (mod_python-2.7.10.tgz) = b666f6172f534839bc33b797dd72d89a823d7de3
-Size (mod_python-2.7.10.tgz) = 175631 bytes
+SHA1 (mod_python-2.7.11.tgz) = 8c123359f98a7acf077e078226fccdb0ff51c4ce
+RMD160 (mod_python-2.7.11.tgz) = 1b34de01b3fa4bb27bb5a39396a2497db66fabd5
+Size (mod_python-2.7.11.tgz) = 175763 bytes
 SHA1 (patch-aa) = 43c2f7df1e2ad58cf8d334dde631990bc56ff3e9
 SHA1 (patch-ab) = b79f50bed5ad6bda8f5e6aef111fbc9b9aedf943
 SHA1 (patch-ac) = 1c2a5c1d961e9710561c406b60518fbfef4cb2cb


Home | Main Index | Thread Index | Old Index