Hi, I'm planning to commit this along with the zope/plone removal. Comments? OKs?
f.- Index: databases/Makefile =================================================================== RCS file: /cvs/ports/databases/Makefile,v retrieving revision 1.201 diff -u -p -r1.201 Makefile --- databases/Makefile 12 Nov 2011 17:18:55 -0000 1.201 +++ databases/Makefile 15 Dec 2011 02:14:31 -0000 @@ -134,12 +134,10 @@ SUBDIR += py-cdb SUBDIR += py-couchdb SUBDIR += py-elixir - SUBDIR += py-ldap,python2.4 SUBDIR += py-ldap SUBDIR += py-mysql SUBDIR += py-odbc SUBDIR += py-pgsql - SUBDIR += py-psycopg,python2.4 SUBDIR += py-psycopg SUBDIR += py-psycopg2 SUBDIR += py-pygresql Index: databases/py-ldap/Makefile =================================================================== RCS file: /cvs/ports/databases/py-ldap/Makefile,v retrieving revision 1.32 diff -u -p -r1.32 Makefile --- databases/py-ldap/Makefile 17 Oct 2011 13:57:59 -0000 1.32 +++ databases/py-ldap/Makefile 15 Dec 2011 02:14:32 -0000 @@ -8,7 +8,7 @@ COMMENT-examples= example programs for t V= 2.3.1 DISTNAME= python-ldap-${V} PKGNAME-main= py-ldap-${V} -REVISION-main = 9 +REVISION-main = 10 FULLPKGNAME-examples= py-ldap-examples-${V} REVISION-examples = 9 FULLPKGPATH-examples= databases/py-ldap,-examples @@ -28,24 +28,12 @@ WANTLIB-main= crypto ssl ${MODPY_WANTLI MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=python-ldap/} MODULES= lang/python -MODPY_VERSION= ${FLAVOR:S/python//} LIB_DEPENDS-main= databases/openldap \ security/cyrus-sasl2 WANTLIB-main += ldap_r>=7 lber>=7 sasl2>=2 -FLAVORS= python2.4 python2.7 -.if !defined(FLAVOR) || empty(FLAVOR) -FLAVOR= python2.7 -.endif - -.if ${FLAVOR} == "python2.4" -MULTI_PACKAGES= -main -.elif ${FLAVOR} == "python2.7" MULTI_PACKAGES= -main -examples -.else -ERRORS+= "Fatal: You must select one version: ${FLAVORS}" -.endif EXAMPLESDIR= ${PREFIX}/share/examples/py-ldap Index: databases/py-ldap/pkg/PFRAG.python2.7-main =================================================================== RCS file: databases/py-ldap/pkg/PFRAG.python2.7-main diff -N databases/py-ldap/pkg/PFRAG.python2.7-main --- databases/py-ldap/pkg/PFRAG.python2.7-main 12 Jun 2011 09:02:32 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,2 +0,0 @@ -@comment $OpenBSD: PFRAG.python2.7-main,v 1.1 2011/06/12 09:02:32 rpointel Exp $ -@pkgpath databases/py-ldap,-main[,python2.5][,python2.6] Index: databases/py-ldap/pkg/PLIST-main =================================================================== RCS file: /cvs/ports/databases/py-ldap/pkg/PLIST-main,v retrieving revision 1.5 diff -u -p -r1.5 PLIST-main --- databases/py-ldap/pkg/PLIST-main 12 Jun 2011 09:02:32 -0000 1.5 +++ databases/py-ldap/pkg/PLIST-main 15 Dec 2011 02:14:32 -0000 @@ -1,8 +1,6 @@ @comment $OpenBSD: PLIST-main,v 1.5 2011/06/12 09:02:32 rpointel Exp $ -@option no-default-conflict -@conflict py-ldap-*-python${MODPY_VERSION} @pkgpath databases/py-ldap -%%python2.7%% +@pkgpath databases/py-ldap,-main[,python2.5][,python2.6][,python2.7] lib/python${MODPY_VERSION}/site-packages/_ldap.so lib/python${MODPY_VERSION}/site-packages/dsml.py lib/python${MODPY_VERSION}/site-packages/dsml.pyc Index: databases/py-psycopg/Makefile =================================================================== RCS file: /cvs/ports/databases/py-psycopg/Makefile,v retrieving revision 1.48 diff -u -p -r1.48 Makefile --- databases/py-psycopg/Makefile 18 Nov 2011 00:35:08 -0000 1.48 +++ databases/py-psycopg/Makefile 15 Dec 2011 02:14:32 -0000 @@ -4,19 +4,15 @@ SHARED_ONLY= Yes COMMENT-main= PostgreSQL database adapter for Python COMMENT-examples= examples for PostgreSQL database adapter for Python -COMMENT-zope= database adapter for Zope VERSION= 1.1.21 DISTNAME= psycopg-${VERSION} PKGNAME= py-${DISTNAME} PKGNAME-main= py-${DISTNAME} -REVISION-main = 13 +REVISION-main = 14 FULLPKGNAME-examples= py-psycopg-examples-${VERSION} REVISION-examples = 6 FULLPKGPATH-examples= databases/py-psycopg,-examples -FULLPKGNAME-zope= py-psycopg-zope-${VERSION} -REVISION-zope = 7 -FULLPKGPATH-zope= databases/py-psycopg,-zope,python2.4 CATEGORIES= databases HOMEPAGE= http://initd.org/projects/psycopg1 @@ -37,41 +33,20 @@ MODULES= lang/python BUILD_DEPENDS= databases/postgresql,-server RUN_DEPENDS= databases/postgresql -FLAVORS= python2.4 python2.7 -.if !defined(FLAVOR) || empty(FLAVOR) -FLAVOR= python2.7 -.endif - -.if ${FLAVOR} == "python2.4" -MULTI_PACKAGES= -main -examples -zope -.elif ${FLAVOR} == "python2.7" MULTI_PACKAGES= -main -examples -.else -ERRORS+= "Fatal: You must select one version: ${FLAVORS}" -.endif - -MODPY_VERSION= ${FLAVOR:S/python//} -BUILD_DEPENDS+= py-mxDateTime->=2.0.0-${FLAVOR}:devel/py-mxDateTime,${FLAVOR} -RUN_DEPENDS+= py-mxDateTime->=2.0.0-${FLAVOR}:devel/py-mxDateTime,${FLAVOR} + +BUILD_DEPENDS+= py-mxDateTime->=2.0.0:devel/py-mxDateTime +RUN_DEPENDS+= py-mxDateTime->=2.0.0:devel/py-mxDateTime RUN_DEPENDS-examples= py-psycopg-${VERSION}:${PKGPATH} PKG_ARCH-examples= * -RUN_DEPENDS-zope= py-psycopg-${VERSION}-python2.4:${BUILD_PKGPATH} \ - ${MODPY_RUN_DEPENDS} -PKG_ARCH-zope= * - CONFIGURE_STYLE=gnu CONFIGURE_ARGS= --with-mxdatetime-includes=${MODPY_SITEPKG}/mx/DateTime/mxDateTime NO_REGRESS= Yes post-install: -.if ${MULTI_PACKAGES:M-zope} - ${INSTALL_DATA_DIR} ${PREFIX}/lib/zope/lib/python/Products/ - cd ${WRKSRC}; tar cf - ZPsycopgDA | tar xf - -C ${PREFIX}/lib/zope/lib/python/Products - chown -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/zope/lib/python/Products/ZPsycopgDA -.endif ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/py-psycopg/ ${INSTALL_DATA} ${WRKSRC}/doc/examples/* \ ${PREFIX}/share/examples/py-psycopg/ Index: databases/py-psycopg/pkg/DESCR-zope =================================================================== RCS file: databases/py-psycopg/pkg/DESCR-zope diff -N databases/py-psycopg/pkg/DESCR-zope --- databases/py-psycopg/pkg/DESCR-zope 25 Oct 2004 16:02:30 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1 +0,0 @@ -PostgreSQL database adapter for Zope. Index: databases/py-psycopg/pkg/PFRAG.python2.7-main =================================================================== RCS file: databases/py-psycopg/pkg/PFRAG.python2.7-main diff -N databases/py-psycopg/pkg/PFRAG.python2.7-main --- databases/py-psycopg/pkg/PFRAG.python2.7-main 12 Jun 2011 09:36:56 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,2 +0,0 @@ -@comment $OpenBSD: PFRAG.python2.7-main,v 1.1 2011/06/12 09:36:56 rpointel Exp $ -@pkgpath databases/py-psycopg,-main[,python2.5][,python2.6] Index: databases/py-psycopg/pkg/PLIST-examples =================================================================== RCS file: /cvs/ports/databases/py-psycopg/pkg/PLIST-examples,v retrieving revision 1.4 diff -u -p -r1.4 PLIST-examples --- databases/py-psycopg/pkg/PLIST-examples 12 Jun 2011 09:36:56 -0000 1.4 +++ databases/py-psycopg/pkg/PLIST-examples 15 Dec 2011 02:14:32 -0000 @@ -1,22 +1,22 @@ @comment $OpenBSD: PLIST-examples,v 1.4 2011/06/12 09:36:56 rpointel Exp $ @pkgpath databases/py-psycopg,-examples[,python2.4][,python2.5][,python2.6] -share/examples/py-psycopg/ -share/examples/py-psycopg/binary.py -share/examples/py-psycopg/bool.py -share/examples/py-psycopg/bounded.py -share/examples/py-psycopg/commit.py -share/examples/py-psycopg/copy_from.py -share/examples/py-psycopg/copy_from2.py -share/examples/py-psycopg/copy_to.py -share/examples/py-psycopg/dictfetch.py -share/examples/py-psycopg/dt.py -share/examples/py-psycopg/first.py -share/examples/py-psycopg/integrity.py -share/examples/py-psycopg/interval.py -share/examples/py-psycopg/notify.py -share/examples/py-psycopg/oid.py -share/examples/py-psycopg/somehackers.jpg -share/examples/py-psycopg/threads.py -share/examples/py-psycopg/usercast.py -share/examples/py-psycopg/whereareyou.jpg -share/examples/py-psycopg/work.py +share/examples/${MODPY_PY_PREFIX}psycopg/ +share/examples/${MODPY_PY_PREFIX}psycopg/binary.py +share/examples/${MODPY_PY_PREFIX}psycopg/bool.py +share/examples/${MODPY_PY_PREFIX}psycopg/bounded.py +share/examples/${MODPY_PY_PREFIX}psycopg/commit.py +share/examples/${MODPY_PY_PREFIX}psycopg/copy_from.py +share/examples/${MODPY_PY_PREFIX}psycopg/copy_from2.py +share/examples/${MODPY_PY_PREFIX}psycopg/copy_to.py +share/examples/${MODPY_PY_PREFIX}psycopg/dictfetch.py +share/examples/${MODPY_PY_PREFIX}psycopg/dt.py +share/examples/${MODPY_PY_PREFIX}psycopg/first.py +share/examples/${MODPY_PY_PREFIX}psycopg/integrity.py +share/examples/${MODPY_PY_PREFIX}psycopg/interval.py +share/examples/${MODPY_PY_PREFIX}psycopg/notify.py +share/examples/${MODPY_PY_PREFIX}psycopg/oid.py +share/examples/${MODPY_PY_PREFIX}psycopg/somehackers.jpg +share/examples/${MODPY_PY_PREFIX}psycopg/threads.py +share/examples/${MODPY_PY_PREFIX}psycopg/usercast.py +share/examples/${MODPY_PY_PREFIX}psycopg/whereareyou.jpg +share/examples/${MODPY_PY_PREFIX}psycopg/work.py Index: databases/py-psycopg/pkg/PLIST-main =================================================================== RCS file: /cvs/ports/databases/py-psycopg/pkg/PLIST-main,v retrieving revision 1.5 diff -u -p -r1.5 PLIST-main --- databases/py-psycopg/pkg/PLIST-main 12 Jun 2011 09:36:56 -0000 1.5 +++ databases/py-psycopg/pkg/PLIST-main 15 Dec 2011 02:14:32 -0000 @@ -1,7 +1,5 @@ @comment $OpenBSD: PLIST-main,v 1.5 2011/06/12 09:36:56 rpointel Exp $ -@option no-default-conflict -@conflict py-psycopg-*-python${MODPY_VERSION} @pkgpath databases/py-psycopg,no_zope @pkgpath databases/py-psycopg -%%python2.7%% +@pkgpath databases/py-psycopg,-main[,python2.5][,python2.6][,python2.7] lib/python${MODPY_VERSION}/lib-dynload/psycopgmodule.so Index: databases/py-psycopg/pkg/PLIST-zope =================================================================== RCS file: databases/py-psycopg/pkg/PLIST-zope diff -N databases/py-psycopg/pkg/PLIST-zope --- databases/py-psycopg/pkg/PLIST-zope 24 Oct 2004 20:44:36 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,28 +0,0 @@ -@comment $OpenBSD: PLIST-zope,v 1.1 2004/10/24 20:44:36 alek Exp $ -lib/zope/ -lib/zope/lib/ -lib/zope/lib/python/ -lib/zope/lib/python/Products/ -@unexec rm -f %D/lib/zope/lib/python/Products/ZPsycopgDA/*.pyo -lib/zope/lib/python/Products/ZPsycopgDA/ -lib/zope/lib/python/Products/ZPsycopgDA/DA.py -lib/zope/lib/python/Products/ZPsycopgDA/DABase.py -lib/zope/lib/python/Products/ZPsycopgDA/__init__.py -lib/zope/lib/python/Products/ZPsycopgDA/browse.dtml -lib/zope/lib/python/Products/ZPsycopgDA/connectionAdd.dtml -lib/zope/lib/python/Products/ZPsycopgDA/connectionEdit.dtml -lib/zope/lib/python/Products/ZPsycopgDA/db.py -lib/zope/lib/python/Products/ZPsycopgDA/icons/ -lib/zope/lib/python/Products/ZPsycopgDA/icons/bin.gif -lib/zope/lib/python/Products/ZPsycopgDA/icons/date.gif -lib/zope/lib/python/Products/ZPsycopgDA/icons/datetime.gif -lib/zope/lib/python/Products/ZPsycopgDA/icons/field.gif -lib/zope/lib/python/Products/ZPsycopgDA/icons/float.gif -lib/zope/lib/python/Products/ZPsycopgDA/icons/int.gif -lib/zope/lib/python/Products/ZPsycopgDA/icons/stable.gif -lib/zope/lib/python/Products/ZPsycopgDA/icons/table.gif -lib/zope/lib/python/Products/ZPsycopgDA/icons/text.gif -lib/zope/lib/python/Products/ZPsycopgDA/icons/time.gif -lib/zope/lib/python/Products/ZPsycopgDA/icons/view.gif -lib/zope/lib/python/Products/ZPsycopgDA/icons/what.gif -lib/zope/lib/python/Products/ZPsycopgDA/table_info.dtml Index: devel/Makefile =================================================================== RCS file: /cvs/ports/devel/Makefile,v retrieving revision 1.1003 diff -u -p -r1.1003 Makefile --- devel/Makefile 14 Dec 2011 20:37:02 -0000 1.1003 +++ devel/Makefile 15 Dec 2011 02:14:32 -0000 @@ -974,7 +974,6 @@ SUBDIR += py-modulegraph SUBDIR += py-monthdelta SUBDIR += py-mox - SUBDIR += py-mxDateTime,python2.4 SUBDIR += py-mxDateTime SUBDIR += py-nose SUBDIR += py-notify Index: devel/py-mxDateTime/Makefile =================================================================== RCS file: /cvs/ports/devel/py-mxDateTime/Makefile,v retrieving revision 1.34 diff -u -p -r1.34 Makefile --- devel/py-mxDateTime/Makefile 13 Nov 2011 17:32:12 -0000 1.34 +++ devel/py-mxDateTime/Makefile 15 Dec 2011 02:14:37 -0000 @@ -7,6 +7,7 @@ COMMENT = date and time types for Python MODPY_EGG_VERSION = 3.2.1 DISTNAME = egenix-mx-base-${MODPY_EGG_VERSION} PKGNAME = py-mxDateTime-${MODPY_EGG_VERSION} +REVISION = 0 CATEGORIES = devel HOMEPAGE = http://www.egenix.com/products/python/mxBase/ @@ -19,16 +20,7 @@ PERMIT_DISTFILES_FTP = Yes MASTER_SITES = http://downloads.egenix.com/python/ -FLAVORS = python2.4 python2.7 # 2.4 needed for Zope, e.g. -FLAVOR ?= python2.7 - WANTLIB += m ${MODPY_WANTLIB} - -.if !${FLAVOR} || ${FLAVOR:L:Npython?.?} -ERRORS += "Fatal: You must select one version: ${FLAVORS}" -.endif - -MODPY_VERSION = ${FLAVOR:S/python//} MODULES = lang/python Index: devel/py-mxDateTime/pkg/PFRAG.no-python2.4 =================================================================== RCS file: devel/py-mxDateTime/pkg/PFRAG.no-python2.4 diff -N devel/py-mxDateTime/pkg/PFRAG.no-python2.4 --- devel/py-mxDateTime/pkg/PFRAG.no-python2.4 15 May 2011 19:48:59 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,2 +0,0 @@ -@comment $OpenBSD: PFRAG.no-python2.4,v 1.1 2011/05/15 19:48:59 rpointel Exp $ -lib/python${MODPY_VERSION}/site-packages/egenix_mx_base-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info Index: devel/py-mxDateTime/pkg/PFRAG.python2.7 =================================================================== RCS file: devel/py-mxDateTime/pkg/PFRAG.python2.7 diff -N devel/py-mxDateTime/pkg/PFRAG.python2.7 --- devel/py-mxDateTime/pkg/PFRAG.python2.7 11 Jun 2011 12:34:33 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,2 +0,0 @@ -@comment $OpenBSD: PFRAG.python2.7,v 1.1 2011/06/11 12:34:33 rpointel Exp $ -@pkgpath devel/py-mxDateTime[,python2.5][,python2.6] Index: devel/py-mxDateTime/pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/py-mxDateTime/pkg/PLIST,v retrieving revision 1.16 diff -u -p -r1.16 PLIST --- devel/py-mxDateTime/pkg/PLIST 13 Nov 2011 17:32:12 -0000 1.16 +++ devel/py-mxDateTime/pkg/PLIST 15 Dec 2011 02:14:37 -0000 @@ -1,8 +1,6 @@ @comment $OpenBSD: PLIST,v 1.16 2011/11/13 17:32:12 rpointel Exp $ -@option no-default-conflict -@conflict py-mxDateTime-*-python${MODPY_VERSION} -%%python2.7%% -!%%python2.4%% +@pkgpath devel/py-mxDateTime[,python2.5][,python2.6][,python2.7] +lib/python${MODPY_VERSION}/site-packages/egenix_mx_base-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info lib/python${MODPY_VERSION}/site-packages/mx/ lib/python${MODPY_VERSION}/site-packages/mx/BeeBase/ lib/python${MODPY_VERSION}/site-packages/mx/BeeBase/BeeBase.py Index: devel/py-nose/Makefile =================================================================== RCS file: /cvs/ports/devel/py-nose/Makefile,v retrieving revision 1.17 diff -u -p -r1.17 Makefile --- devel/py-nose/Makefile 2 Nov 2011 23:06:02 -0000 1.17 +++ devel/py-nose/Makefile 15 Dec 2011 02:14:37 -0000 @@ -37,8 +37,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/README.txt ${PREFIX}/share/doc/py-nose/ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/py-nose cd ${WRKSRC}/examples && \ - find . -type d -exec ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/py-nose/{} \; && \ - find . ! -type d -exec ${INSTALL_DATA} {} ${PREFIX}/share/examples/py-nose/{} \; + pax -rw * ${PREFIX}/share/examples/py-nose do-regress: cd ${WRKSRC}/functional_tests && nosetests -v Index: graphics/Makefile =================================================================== RCS file: /cvs/ports/graphics/Makefile,v retrieving revision 1.308 diff -u -p -r1.308 Makefile --- graphics/Makefile 14 Nov 2011 11:01:54 -0000 1.308 +++ graphics/Makefile 15 Dec 2011 02:14:37 -0000 @@ -195,7 +195,6 @@ SUBDIR += potrace SUBDIR += povray SUBDIR += pstoedit - SUBDIR += py-Imaging,python2.4 SUBDIR += py-Imaging SUBDIR += py-cairo SUBDIR += py-dot Index: graphics/py-Imaging/Makefile =================================================================== RCS file: /cvs/ports/graphics/py-Imaging/Makefile,v retrieving revision 1.56 diff -u -p -r1.56 Makefile --- graphics/py-Imaging/Makefile 2 Dec 2011 14:36:14 -0000 1.56 +++ graphics/py-Imaging/Makefile 15 Dec 2011 02:14:38 -0000 @@ -17,9 +17,9 @@ PKGNAME-bin= py-Imaging-bin-${MODPY_EGG FULLPKGNAME-docs= py-Imaging-docs-${MODPY_EGG_VERSION} FULLPKGPATH-docs= graphics/py-Imaging,-docs -REVISION-main= 5 +REVISION-main= 6 REVISION-examples= 4 -REVISION-bin= 4 +REVISION-bin= 5 REVISION-docs= 4 CATEGORIES= graphics @@ -48,20 +48,8 @@ LIB_DEPENDS-main= graphics/jpeg \ graphics/lcms \ ${MODTK_LIB_DEPENDS} -FLAVORS= python2.4 python2.7 -.if !defined(FLAVOR) || empty(FLAVOR) -FLAVOR= python2.7 -.endif - -.if ${FLAVOR:Mpython2.4} && !${FLAVOR:Npython2.4} -MULTI_PACKAGES= -main -.elif ${FLAVOR:Mpython2.7} && !${FLAVOR:Npython2.7} MULTI_PACKAGES= -main -examples -bin -docs -.else -ERRORS+= "Fatal: You must select one version: ${FLAVORS}" -.endif -MODPY_VERSION= ${FLAVOR:S/python//} MODPY_ADJ_FILES= Scripts/pil*.py INCDIR=${PREFIX}/include/python${MODPY_VERSION} Index: graphics/py-Imaging/pkg/PFRAG.python2.7-bin =================================================================== RCS file: graphics/py-Imaging/pkg/PFRAG.python2.7-bin diff -N graphics/py-Imaging/pkg/PFRAG.python2.7-bin --- graphics/py-Imaging/pkg/PFRAG.python2.7-bin 12 Jun 2011 08:44:44 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,2 +0,0 @@ -@comment $OpenBSD: PFRAG.python2.7-bin,v 1.1 2011/06/12 08:44:44 rpointel Exp $ -@pkgpath graphics/py-Imaging,-bin[,python2.5][,python2.6] Index: graphics/py-Imaging/pkg/PFRAG.python2.7-main =================================================================== RCS file: graphics/py-Imaging/pkg/PFRAG.python2.7-main diff -N graphics/py-Imaging/pkg/PFRAG.python2.7-main --- graphics/py-Imaging/pkg/PFRAG.python2.7-main 12 Jun 2011 08:44:44 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,3 +0,0 @@ -@comment $OpenBSD: PFRAG.python2.7-main,v 1.1 2011/06/12 08:44:44 rpointel Exp $ -@pkgpath graphics/py-Imaging,-main[,python2.5][,python2.6] -lib/python${MODPY_VERSION}/site-packages/PIL/PIL-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info Index: graphics/py-Imaging/pkg/PLIST-bin =================================================================== RCS file: /cvs/ports/graphics/py-Imaging/pkg/PLIST-bin,v retrieving revision 1.3 diff -u -p -r1.3 PLIST-bin --- graphics/py-Imaging/pkg/PLIST-bin 12 Jun 2011 08:44:44 -0000 1.3 +++ graphics/py-Imaging/pkg/PLIST-bin 15 Dec 2011 02:14:38 -0000 @@ -1,5 +1,5 @@ @comment $OpenBSD: PLIST-bin,v 1.3 2011/06/12 08:44:44 rpointel Exp $ -%%python2.7%% +@pkgpath graphics/py-Imaging,-bin[,python2.5][,python2.6][,python2.7] bin/pilconvert bin/pildriver bin/pilfile Index: graphics/py-Imaging/pkg/PLIST-docs =================================================================== RCS file: /cvs/ports/graphics/py-Imaging/pkg/PLIST-docs,v retrieving revision 1.1 diff -u -p -r1.1 PLIST-docs --- graphics/py-Imaging/pkg/PLIST-docs 15 Nov 2010 20:57:10 -0000 1.1 +++ graphics/py-Imaging/pkg/PLIST-docs 15 Dec 2011 02:14:38 -0000 @@ -1,77 +1,77 @@ @comment $OpenBSD: PLIST-docs,v 1.1 2010/11/15 20:57:10 sthen Exp $ -share/doc/py-Imaging/ -share/doc/py-Imaging/effbot.css -share/doc/py-Imaging/index.html -share/doc/py-Imaging/pythondoc-PIL.ArgImagePlugin.html -share/doc/py-Imaging/pythondoc-PIL.BdfFontFile.html -share/doc/py-Imaging/pythondoc-PIL.BmpImagePlugin.html -share/doc/py-Imaging/pythondoc-PIL.BufrStubImagePlugin.html -share/doc/py-Imaging/pythondoc-PIL.ContainerIO.html -share/doc/py-Imaging/pythondoc-PIL.CurImagePlugin.html -share/doc/py-Imaging/pythondoc-PIL.DcxImagePlugin.html -share/doc/py-Imaging/pythondoc-PIL.EpsImagePlugin.html -share/doc/py-Imaging/pythondoc-PIL.ExifTags.html -share/doc/py-Imaging/pythondoc-PIL.FitsStubImagePlugin.html -share/doc/py-Imaging/pythondoc-PIL.FliImagePlugin.html -share/doc/py-Imaging/pythondoc-PIL.FontFile.html -share/doc/py-Imaging/pythondoc-PIL.FpxImagePlugin.html -share/doc/py-Imaging/pythondoc-PIL.GbrImagePlugin.html -share/doc/py-Imaging/pythondoc-PIL.GdImageFile.html -share/doc/py-Imaging/pythondoc-PIL.GifImagePlugin.html -share/doc/py-Imaging/pythondoc-PIL.GimpGradientFile.html -share/doc/py-Imaging/pythondoc-PIL.GimpPaletteFile.html -share/doc/py-Imaging/pythondoc-PIL.GribStubImagePlugin.html -share/doc/py-Imaging/pythondoc-PIL.Hdf5StubImagePlugin.html -share/doc/py-Imaging/pythondoc-PIL.IcnsImagePlugin.html -share/doc/py-Imaging/pythondoc-PIL.IcoImagePlugin.html -share/doc/py-Imaging/pythondoc-PIL.ImImagePlugin.html -share/doc/py-Imaging/pythondoc-PIL.Image.html -share/doc/py-Imaging/pythondoc-PIL.ImageChops.html -share/doc/py-Imaging/pythondoc-PIL.ImageColor.html -share/doc/py-Imaging/pythondoc-PIL.ImageDraw.html -share/doc/py-Imaging/pythondoc-PIL.ImageEnhance.html -share/doc/py-Imaging/pythondoc-PIL.ImageFile.html -share/doc/py-Imaging/pythondoc-PIL.ImageFileIO.html -share/doc/py-Imaging/pythondoc-PIL.ImageFilter.html -share/doc/py-Imaging/pythondoc-PIL.ImageFont.html -share/doc/py-Imaging/pythondoc-PIL.ImageGL.html -share/doc/py-Imaging/pythondoc-PIL.ImageGrab.html -share/doc/py-Imaging/pythondoc-PIL.ImageOps.html -share/doc/py-Imaging/pythondoc-PIL.ImagePalette.html -share/doc/py-Imaging/pythondoc-PIL.ImagePath.html -share/doc/py-Imaging/pythondoc-PIL.ImageSequence.html -share/doc/py-Imaging/pythondoc-PIL.ImageStat.html -share/doc/py-Imaging/pythondoc-PIL.ImageTk.html -share/doc/py-Imaging/pythondoc-PIL.ImageTransform.html -share/doc/py-Imaging/pythondoc-PIL.ImageWin.html -share/doc/py-Imaging/pythondoc-PIL.ImtImagePlugin.html -share/doc/py-Imaging/pythondoc-PIL.IptcImagePlugin.html -share/doc/py-Imaging/pythondoc-PIL.JpegImagePlugin.html -share/doc/py-Imaging/pythondoc-PIL.McIdasImagePlugin.html -share/doc/py-Imaging/pythondoc-PIL.MicImagePlugin.html -share/doc/py-Imaging/pythondoc-PIL.MpegImagePlugin.html -share/doc/py-Imaging/pythondoc-PIL.MspImagePlugin.html -share/doc/py-Imaging/pythondoc-PIL.OleFileIO.html -share/doc/py-Imaging/pythondoc-PIL.PSDraw.html -share/doc/py-Imaging/pythondoc-PIL.PaletteFile.html -share/doc/py-Imaging/pythondoc-PIL.PalmImagePlugin.html -share/doc/py-Imaging/pythondoc-PIL.PcdImagePlugin.html -share/doc/py-Imaging/pythondoc-PIL.PcfFontFile.html -share/doc/py-Imaging/pythondoc-PIL.PcxImagePlugin.html -share/doc/py-Imaging/pythondoc-PIL.PdfImagePlugin.html -share/doc/py-Imaging/pythondoc-PIL.PixarImagePlugin.html -share/doc/py-Imaging/pythondoc-PIL.PngImagePlugin.html -share/doc/py-Imaging/pythondoc-PIL.PpmImagePlugin.html -share/doc/py-Imaging/pythondoc-PIL.PsdImagePlugin.html -share/doc/py-Imaging/pythondoc-PIL.SgiImagePlugin.html -share/doc/py-Imaging/pythondoc-PIL.SpiderImagePlugin.html -share/doc/py-Imaging/pythondoc-PIL.SunImagePlugin.html -share/doc/py-Imaging/pythondoc-PIL.TarIO.html -share/doc/py-Imaging/pythondoc-PIL.TgaImagePlugin.html -share/doc/py-Imaging/pythondoc-PIL.TiffImagePlugin.html -share/doc/py-Imaging/pythondoc-PIL.TiffTags.html -share/doc/py-Imaging/pythondoc-PIL.WalImageFile.html -share/doc/py-Imaging/pythondoc-PIL.WmfImagePlugin.html -share/doc/py-Imaging/pythondoc-PIL.XVThumbImagePlugin.html -share/doc/py-Imaging/pythondoc-PIL.XbmImagePlugin.html -share/doc/py-Imaging/pythondoc-PIL.XpmImagePlugin.html +share/doc/${MODPY_PY_PREFIX}Imaging/ +share/doc/${MODPY_PY_PREFIX}Imaging/effbot.css +share/doc/${MODPY_PY_PREFIX}Imaging/index.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.ArgImagePlugin.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.BdfFontFile.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.BmpImagePlugin.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.BufrStubImagePlugin.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.ContainerIO.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.CurImagePlugin.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.DcxImagePlugin.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.EpsImagePlugin.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.ExifTags.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.FitsStubImagePlugin.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.FliImagePlugin.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.FontFile.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.FpxImagePlugin.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.GbrImagePlugin.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.GdImageFile.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.GifImagePlugin.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.GimpGradientFile.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.GimpPaletteFile.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.GribStubImagePlugin.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.Hdf5StubImagePlugin.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.IcnsImagePlugin.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.IcoImagePlugin.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.ImImagePlugin.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.Image.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.ImageChops.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.ImageColor.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.ImageDraw.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.ImageEnhance.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.ImageFile.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.ImageFileIO.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.ImageFilter.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.ImageFont.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.ImageGL.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.ImageGrab.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.ImageOps.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.ImagePalette.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.ImagePath.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.ImageSequence.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.ImageStat.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.ImageTk.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.ImageTransform.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.ImageWin.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.ImtImagePlugin.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.IptcImagePlugin.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.JpegImagePlugin.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.McIdasImagePlugin.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.MicImagePlugin.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.MpegImagePlugin.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.MspImagePlugin.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.OleFileIO.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.PSDraw.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.PaletteFile.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.PalmImagePlugin.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.PcdImagePlugin.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.PcfFontFile.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.PcxImagePlugin.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.PdfImagePlugin.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.PixarImagePlugin.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.PngImagePlugin.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.PpmImagePlugin.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.PsdImagePlugin.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.SgiImagePlugin.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.SpiderImagePlugin.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.SunImagePlugin.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.TarIO.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.TgaImagePlugin.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.TiffImagePlugin.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.TiffTags.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.WalImageFile.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.WmfImagePlugin.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.XVThumbImagePlugin.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.XbmImagePlugin.html +share/doc/${MODPY_PY_PREFIX}Imaging/pythondoc-PIL.XpmImagePlugin.html Index: graphics/py-Imaging/pkg/PLIST-examples =================================================================== RCS file: /cvs/ports/graphics/py-Imaging/pkg/PLIST-examples,v retrieving revision 1.8 diff -u -p -r1.8 PLIST-examples --- graphics/py-Imaging/pkg/PLIST-examples 12 Jun 2011 08:44:44 -0000 1.8 +++ graphics/py-Imaging/pkg/PLIST-examples 15 Dec 2011 02:14:38 -0000 @@ -1,16 +1,16 @@ @comment $OpenBSD: PLIST-examples,v 1.8 2011/06/12 08:44:44 rpointel Exp $ @pkgpath graphics/py-Imaging,-examples[,python2.4][,python2.5][,python2.6] -share/examples/py-Imaging/ -share/examples/py-Imaging/README -share/examples/py-Imaging/enhancer.py -share/examples/py-Imaging/explode.py -share/examples/py-Imaging/gifmaker.py -share/examples/py-Imaging/painter.py -share/examples/py-Imaging/pilconvert.py -share/examples/py-Imaging/pildriver.py -share/examples/py-Imaging/pilfile.py -share/examples/py-Imaging/pilfont.py -share/examples/py-Imaging/pilprint.py -share/examples/py-Imaging/player.py -share/examples/py-Imaging/thresholder.py -share/examples/py-Imaging/viewer.py +share/examples/${MODPY_PY_PREFIX}Imaging/ +share/examples/${MODPY_PY_PREFIX}Imaging/README +share/examples/${MODPY_PY_PREFIX}Imaging/enhancer.py +share/examples/${MODPY_PY_PREFIX}Imaging/explode.py +share/examples/${MODPY_PY_PREFIX}Imaging/gifmaker.py +share/examples/${MODPY_PY_PREFIX}Imaging/painter.py +share/examples/${MODPY_PY_PREFIX}Imaging/pilconvert.py +share/examples/${MODPY_PY_PREFIX}Imaging/pildriver.py +share/examples/${MODPY_PY_PREFIX}Imaging/pilfile.py +share/examples/${MODPY_PY_PREFIX}Imaging/pilfont.py +share/examples/${MODPY_PY_PREFIX}Imaging/pilprint.py +share/examples/${MODPY_PY_PREFIX}Imaging/player.py +share/examples/${MODPY_PY_PREFIX}Imaging/thresholder.py +share/examples/${MODPY_PY_PREFIX}Imaging/viewer.py Index: graphics/py-Imaging/pkg/PLIST-main =================================================================== RCS file: /cvs/ports/graphics/py-Imaging/pkg/PLIST-main,v retrieving revision 1.6 diff -u -p -r1.6 PLIST-main --- graphics/py-Imaging/pkg/PLIST-main 12 Jun 2011 08:44:44 -0000 1.6 +++ graphics/py-Imaging/pkg/PLIST-main 15 Dec 2011 02:14:38 -0000 @@ -1,8 +1,6 @@ @comment $OpenBSD: PLIST-main,v 1.6 2011/06/12 08:44:44 rpointel Exp $ -@option no-default-conflict -@conflict py-Imaging-*-python${MODPY_VERSION} @pkgpath graphics/py-Imaging -%%python2.7%% +@pkgpath graphics/py-Imaging,-main[,python2.5][,python2.6][,python2.7] include/python${MODPY_VERSION}/ImPlatform.h include/python${MODPY_VERSION}/Imaging.h lib/python${MODPY_VERSION}/site-packages/PIL/ @@ -119,6 +117,7 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/PIL/MspImagePlugin.pyc lib/python${MODPY_VERSION}/site-packages/PIL/OleFileIO.py lib/python${MODPY_VERSION}/site-packages/PIL/OleFileIO.pyc +lib/python${MODPY_VERSION}/site-packages/PIL/PIL-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info lib/python${MODPY_VERSION}/site-packages/PIL/PSDraw.py lib/python${MODPY_VERSION}/site-packages/PIL/PSDraw.pyc lib/python${MODPY_VERSION}/site-packages/PIL/PaletteFile.py