diff -r d3e65d761118 Mk/bsd.python.mk --- a/Mk/bsd.python.mk Sun Jul 15 16:12:18 2007 +0000 +++ b/Mk/bsd.python.mk Sun Jul 15 20:40:03 2007 +0900 @@ -81,6 +81,12 @@ Python_Include_MAINTAINER= python@FreeBS # want to build extensions with an older binary. # default: depends on the version of your python binary # +# PYTHON_DEFAULT_VERSION +# - Version of the default python binary in your ${PATH}, in +# the format "python2.5". Set this in your /etc/make.conf +# in case you want to use an older version as a default. +# default: python2.5 +# # PYTHON_WRKSRC - The ${WRKSRC} for your python version. Needed for # extensions like Tkinter, py-gdbm and py-expat, which # are built from sources contained in the Python @@ -122,6 +128,17 @@ Python_Include_MAINTAINER= python@FreeBS # USE_PYDISTUTILS - Use distutils as do-configure, do-build and do-install # targets. # +# PYSETUP - Name of the setup script used by the distutils package. +# default: setup.py +# +# PYDISTUTILS_PKGNAME +# - Internal name in the distutils for egg-info. +# default: ${PORTNAME} +# +# PYDISTUTILS_PKGVERSION +# - Internal version in the distutils for egg-info. +# default: ${PORTVERSION} +# # PYDISTUTILS_CONFIGURE_TARGET # - Pass this command to distutils on configure stage. # default: config @@ -146,8 +163,32 @@ Python_Include_MAINTAINER= python@FreeBS # - Arguments to install with distutils. # default: -c -O1 --prefix=${PREFIX} # -# PYSETUP - Name of the setup script used by the distutils package. -# default: setup.py +# PYDISTUTILS_EGGINFO +# - Canonical name for egg-info. +# default: ${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-${PYTHON_VERSION:S/thon//}.egg-info +# +# PYDISTUTILS_NOEGGINFO +# - Skip an egg-info entry from plist when defined. +# +# PYEASYINSTALL_EGG +# - Canonical directory name for easy_install egg packages. +# default: ${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-${PYTHON_VERSION:S/thon//}${PYEASYINSTALL_OSARCH}.egg +# +# PYEASYINSATLL_OSARCH +# - Platform identifier for easy_install. +# default: -${OPSYS:L}-${_OSRELEASE}-${ARCH} +# if PYEASYINSTALL_ARCHDEP is defined. +# +# PYEASYINSTALL_CMD - Full file path to easy_install command. +# default: ${LOCALBASE}/bin/easy_install-${PYTHON_VER} +# +# PYEASYINSTALL_INSTALL_ARGS +# - Arguments to easy_install command for egg installation. +# default: -q -N -S ${PYTHON_SITELIBDIR} ${PYDISTUTILS_PKGNAME}==${PYDISTUTILS_PKGVERSION} +# +# PYEASYINSTALL_UNINSTALL_ARGS +# - Arguments to easy_install command for egg uninstallation. +# default: -q -m -S ${PYTHON_SITELIBDIR} ${PYDISTUTILS_PKGNAME}==${PYDISTUTILS_PKGVERSION} # # USE_TWISTED - If this option is just yes then build and run # the dependence to twistedCore is added. Alternatively @@ -173,8 +214,8 @@ Python_Include_MAINTAINER= python@FreeBS # specific version of zope. # -_PYTHON_PORTBRANCH= 2.4 -_PYTHON_ALLBRANCHES= 2.4 2.5 2.3 # preferred first +_PYTHON_PORTBRANCH= 2.5 +_PYTHON_ALLBRANCHES= 2.5 2.4 2.3 # preferred first _ZOPE_PORTBRANCH= 2.7 _ZOPE_ALLBRANCHES= 2.7 2.8 2.9 2.10 3.2 @@ -237,22 +278,24 @@ PYTHON_VERSION= python2.4 # Determine version number of Python to use +.if !defined(PYTHON_DEFAULT_VERSION) +. if exists(${LOCALBASE}/bin/python) +_PYTHON_DEFAULT_VERSION!= (${LOCALBASE}/bin/python -c \ + 'import sys; print sys.version[:3]' 2> /dev/null \ + || ${ECHO_CMD} ${_PYTHON_PORTBRANCH}) | ${TAIL} -1 +. else +_PYTHON_DEFAULT_VERSION= ${_PYTHON_PORTBRANCH} +. endif +PYTHON_DEFAULT_VERSION= python${_PYTHON_DEFAULT_VERSION} +.endif + .if defined(PYTHON_VERSION) _PYTHON_VERSION:= ${PYTHON_VERSION:S/^python//} _PYTHON_CMD= ${LOCALBASE}/bin/${PYTHON_VERSION} .else -# Determine the currently installed version. If Python is not installed, a -# default version number is substituted and the corresponding Python -# distribution will be built through the dependency processing. -.if defined(PYTHON_CMD) -_PYTHON_CMD= ${PYTHON_CMD} -.else -_PYTHON_CMD= ${LOCALBASE}/bin/python -.endif -_PYTHON_VERSION!= (${_PYTHON_CMD} -c \ - 'import sys; print sys.version[:3]' 2> /dev/null \ - || ${ECHO_CMD} ${_PYTHON_PORTBRANCH}) | ${TAIL} -1 -.endif # defined(PYTHON_VERSION) +_PYTHON_VERSION:= ${PYTHON_DEFAULT_VERSION:S/^python//} +_PYTHON_CMD= ${LOCALBASE}/bin/${PYTHON_DEFAULT_VERSION} +.endif .if !defined(USE_PYTHON) .if defined(USE_PYTHON_BUILD) @@ -323,9 +366,9 @@ PYTHON_PORTVERSION= ${_PYTHON_PORTVERSIO # Python-2.5 .if ${PYTHON_VERSION} == "python2.5" -PYTHON_PORTVERSION?=2.5 +PYTHON_PORTVERSION?=2.5.1 PYTHON_PORTSDIR= ${PORTSDIR}/lang/python25 -PYTHON_REL= 250 +PYTHON_REL= 251 PYTHON_SUFFIX= 25 PYTHON_VER= 2.5 @@ -360,8 +403,8 @@ check-makevars:: @${ECHO} "Makefile error: bad value for PYTHON_VERSION: ${PYTHON_VERSION}." @${ECHO} "Legal values are:" @${ECHO} " python2.3" - @${ECHO} " python2.4 (default)" - @${ECHO} " python2.5" + @${ECHO} " python2.4" + @${ECHO} " python2.5 (default)" @${FALSE} .endif @@ -381,10 +424,58 @@ PYTHONPREFIX_LIBDIR= ${PYTHON_LIBDIR:S; PYTHONPREFIX_LIBDIR= ${PYTHON_LIBDIR:S;${PYTHONBASE};${PREFIX};} PYTHONPREFIX_SITELIBDIR= ${PYTHON_SITELIBDIR:S;${PYTHONBASE};${PREFIX};} +# setuptools support +.if defined(USE_PYDISTUTILS) && ${USE_PYDISTUTILS} == "easy_install" +BUILD_DEPENDS+= ${PYEASYINSTALL_CMD}:${PORTSDIR}/devel/py-setuptools +RUN_DEPENDS+= ${PYEASYINSTALL_CMD}:${PORTSDIR}/devel/py-setuptools + +PYDISTUTILS_BUILD_TARGET?= bdist_egg +PYDISTUTILS_INSTALL_TARGET?= easy_install +PYDISTUTILS_INSTALLARGS?= -O 1 -N -S ${PYTHON_SITELIBDIR} ${WRKSRC}/dist/${PYEASYINSTALL_EGG} + +.if defined(PYEASYINSTALL_ARCHDEP) +_OSRELEASE!= ${UNAME} -r +PYEASYINSTALL_OSARCH?= -${OPSYS:L}-${_OSRELEASE}-${ARCH} +.endif +PYEASYINSTALL_EGG?= ${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-${PYTHON_VERSION:S/thon//}${PYEASYINSTALL_OSARCH}.egg +PYEASYINSTALL_CMD?= ${LOCALBASE}/bin/easy_install-${PYTHON_VER} +PYEASYINSTALL_INSTALLARGS?= -q -N -S ${PYTHON_SITELIBDIR} \ + ${PYDISTUTILS_PKGNAME}==${PYDISTUTILS_PKGVERSION} +PYEASYINSTALL_UNINSTALLARGS?= -q -m -S ${PYTHON_SITELIBDIR} \ + ${PYDISTUTILS_PKGNAME}==${PYDISTUTILS_PKGVERSION} + +PLIST_SUB+= PYEASYINSTALL_EGG=${PYEASYINSTALL_EGG} + +add-plist-post: add-plist-easyinstall +add-plist-easyinstall: + @# @unexec line must be located before any other line while @exec must not. + @${CAT} ${TMPPLIST} > ${TMPPLIST}.pei_tmp + @${ECHO_CMD} "@unexec ${PYEASYINSTALL_CMD} ${PYEASYINSTALL_UNINSTALLARGS}" \ + > ${TMPPLIST} + @${CAT} ${TMPPLIST}.pei_tmp >> ${TMPPLIST} + @${ECHO_CMD} "@exec ${PYEASYINSTALL_CMD} ${PYEASYINSTALL_INSTALLARGS}" \ + >> ${TMPPLIST} +.endif # defined(USE_PYDISTUTILS) && ${USE_PYDISTUTILS} == "easy_install" + +# distutils support PYSETUP?= setup.py PYDISTUTILS_CONFIGUREARGS?= PYDISTUTILS_BUILDARGS?= PYDISTUTILS_INSTALLARGS?= -c -O1 --prefix=${PREFIX} +PYDISTUTILS_PKGNAME?= ${PORTNAME} +PYDISTUTILS_PKGVERSION?=${PORTVERSION} +PYDISTUTILS_EGGINFO?= ${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-${PYTHON_VERSION:S/thon//}.egg-info +PYDISTUTILS_EGGINFODIR?=${PYTHON_SITELIBDIR} + +.if !defined(PYDISTUTILS_NOEGGINFO) && \ + (defined(INSTALLS_EGGINFO) || \ + (defined(USE_PYDISTUTILS) && \ + ${USE_PYDISTUTILS} != "easy_install")) && \ + defined(PYTHON_REL) && ${PYTHON_REL} >= 250 +. for egg in ${PYDISTUTILS_EGGINFO} +PLIST_FILES+= ${PYDISTUTILS_EGGINFODIR:S;${PREFIX}/;;}/${egg} +. endfor +.endif # Fix for programs that build python from a GNU auto* enviornment CONFIGURE_ENV+= PYTHON="${PYTHON_CMD}" @@ -436,7 +527,7 @@ PYEXPAT= ${PYTHON_LIBDIR}/lib-dynload/p .if defined(PYTHON_REL) && ${PYTHON_REL} < 250 PYCTYPES= ${PYTHON_SITELIBDIR}/ctypes/__init__.py:${PORTSDIR}/devel/py-ctypes .else -PYCTYPES= ${PYTHON_LIBDIR}/ctypes/__init__py:${PYTHON_PORTSDIR} +PYCTYPES= ${PYTHON_LIBDIR}/ctypes/__init__.py:${PYTHON_PORTSDIR} .endif .if defined(PYTHON_REL) && ${PYTHON_REL} < 250 diff -r d3e65d761118 archivers/py-lzma/Makefile --- a/archivers/py-lzma/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/archivers/py-lzma/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -17,5 +17,6 @@ COMMENT= Python binding for the LZMA com USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= pylzma .include diff -r d3e65d761118 astro/py-metar/Makefile --- a/astro/py-metar/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/astro/py-metar/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -17,5 +17,6 @@ COMMENT= Python module that provides acc USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= pymetar .include diff -r d3e65d761118 astro/pyephem/Makefile --- a/astro/pyephem/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/astro/pyephem/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -16,10 +16,9 @@ COMMENT= Scientific-grade astronomical c COMMENT= Scientific-grade astronomical computations for Python USE_PYTHON= 2.4+ -NO_BUILD= yes +USE_PYDISTUTILS=yes -do-install: - (cd ${WRKSRC}; ${PYTHON_CMD} setup.py install) +post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/pyephem-manual.html ${DOCSDIR} diff -r d3e65d761118 audio/py-ao/Makefile --- a/audio/py-ao/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/audio/py-ao/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -20,6 +20,7 @@ PLIST_FILES= lib/%%PYTHON_VERSION%%/site PLIST_FILES= lib/%%PYTHON_VERSION%%/site-packages/aomodule.so USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= pyao do-configure: @cd ${WRKSRC} && ${PYTHON_CMD} config_unix.py --prefix "${LOCALBASE}" diff -r d3e65d761118 audio/py-apetag/Makefile --- a/audio/py-apetag/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/audio/py-apetag/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -17,5 +17,6 @@ COMMENT= Library for APE Tag written in USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= py-ApeTag .include diff -r d3e65d761118 audio/py-cddb/Makefile --- a/audio/py-cddb/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/audio/py-cddb/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -18,5 +18,6 @@ USE_PYTHON= yes USE_PYTHON= yes USE_PYDISTUTILS= yes USE_PYTHON_PREFIX= yes +PYDISTUTILS_PKGNAME= CDDB .include diff -r d3e65d761118 audio/py-eyed3/Makefile --- a/audio/py-eyed3/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/audio/py-eyed3/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -27,6 +27,9 @@ MAN1= eyeD3.1 MAN1= eyeD3.1 MANCOMPRESSED= yes +INSTALLS_EGGINFO= yes +PYDISTUTILS_PKGNAME= eyeD3 + post-patch: ${REINPLACE_CMD} -e 's,PYTHON="",,g' -e 's,/usr/local,${LOCALBASE},g' \ -e 's,2\\\.\[23456789\]\\\.,2.[23456789],g' \ diff -r d3e65d761118 audio/py-flac/Makefile --- a/audio/py-flac/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/audio/py-flac/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -21,6 +21,7 @@ USE_GMAKE= yes USE_GMAKE= yes USE_PYDISTUTILS= yes USE_PYTHON_PREFIX= yes +PYDISTUTILS_PKGNAME= pyflac do-build: @cd ${WRKSRC} && ${GMAKE} build diff -r d3e65d761118 audio/py-id3/Makefile --- a/audio/py-id3/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/audio/py-id3/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -19,5 +19,6 @@ USE_PYTHON= yes USE_PYTHON= yes USE_PYDISTUTILS= yes USE_PYTHON_PREFIX= yes +PYDISTUTILS_PKGNAME= ID3 .include diff -r d3e65d761118 audio/py-karaoke/Makefile --- a/audio/py-karaoke/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/audio/py-karaoke/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -26,5 +26,6 @@ USE_ZIP= yes USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= pykaraoke .include diff -r d3e65d761118 audio/py-libtunepimp/Makefile --- a/audio/py-libtunepimp/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/audio/py-libtunepimp/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -20,6 +20,7 @@ LIB_DEPENDS= tunepimp.5:${PORTSDIR}/audi USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= tunepimp BUILD_WRKSRC= ${WRKSRC}/python INSTALL_WRKSRC= ${BUILD_WRKSRC} diff -r d3e65d761118 audio/py-mad/Makefile --- a/audio/py-mad/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/audio/py-mad/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -20,6 +20,7 @@ USE_PYTHON= yes USE_PYTHON= yes USE_PYDISTUTILS= yes USE_PYTHON_PREFIX= yes +PYDISTUTILS_PKGNAME= pymad post-patch: @${REINPLACE_CMD} 's/^\(.*compile.*\)\?\(.*\)\?\(.*\)$$/\1\2\3/' \ diff -r d3e65d761118 audio/py-musepack/Makefile --- a/audio/py-musepack/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/audio/py-musepack/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -20,6 +20,8 @@ USE_PYTHON= yes USE_PYTHON= yes USE_PYDISTUTILS= yes USE_PYTHON_PREFIX= yes +PYDISTUTILS_PKGNAME= pymusepack +PYDISTUTILS_PKGVERSION= 0.3 MAKE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff -r d3e65d761118 audio/py-musicbrainz/Makefile --- a/audio/py-musicbrainz/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/audio/py-musicbrainz/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -28,6 +28,7 @@ EXAMPLES= cd2trm.py cdid.py cdlookup.py USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= python-musicbrainz PYDISTUTILS_BUILDARGS= build_ext -I${LOCALBASE}/include -L${LOCALBASE}/lib DESCR= ${PORTSDIR}/audio/libmusicbrainz/pkg-descr diff -r d3e65d761118 audio/py-musicbrainz2/Makefile --- a/audio/py-musicbrainz2/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/audio/py-musicbrainz2/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -21,5 +21,6 @@ LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/a USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= python-musicbrainz2 .include diff -r d3e65d761118 audio/py-ogg/Makefile --- a/audio/py-ogg/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/audio/py-ogg/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -20,6 +20,7 @@ LIB_DEPENDS= ogg.5:${PORTSDIR}/audio/lib USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= pyogg do-configure: @cd ${WRKSRC} && ${PYTHON_CMD} config_unix.py --prefix ${LOCALBASE} diff -r d3e65d761118 audio/py-openal/Makefile --- a/audio/py-openal/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/audio/py-openal/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -22,6 +22,7 @@ DIST_SUBDIR= python DIST_SUBDIR= python USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= PyOpenAL WRKSRC= ${WRKDIR}/PyOpenAL-${PORTVERSION} EXAMPLESDIR= ${PREFIX}/share/examples/py-openal diff -r d3e65d761118 audio/py-sdl_mixer/Makefile --- a/audio/py-sdl_mixer/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/audio/py-sdl_mixer/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -23,6 +23,7 @@ USE_SDL= sdl mixer USE_SDL= sdl mixer USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= pysdl_mixer WRKSRC= ${WRKDIR}/pysdl_mixer-${PORTVERSION} EXAMPLESDIR= ${PREFIX}/share/examples/py-sdl-mixer diff -r d3e65d761118 audio/py-speex/Makefile --- a/audio/py-speex/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/audio/py-speex/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -22,6 +22,7 @@ PLIST_FILES= lib/%%PYTHON_VERSION%%/site PLIST_FILES= lib/%%PYTHON_VERSION%%/site-packages/speex.so USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGVERSION= 1.0 post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ diff -r d3e65d761118 audio/py-taglib/Makefile --- a/audio/py-taglib/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/audio/py-taglib/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/python-taglib-${PORTV WRKSRC= ${WRKDIR}/python-taglib-${PORTVERSION} USE_AUTOTOOLS= libtool:15 -USE_PYTHON= yes +USE_PYTHON= -2.4 USE_PYTHON_PREFIX= yes GNU_CONFIGURE= yes USE_GMAKE= yes diff -r d3e65d761118 audio/py-vorbis/Makefile --- a/audio/py-vorbis/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/audio/py-vorbis/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -22,7 +22,8 @@ PLIST_FILES= lib/%%PYTHON_VERSION%%/site PLIST_FILES= lib/%%PYTHON_VERSION%%/site-packages/ogg/vorbis.so USE_PYTHON= yes USE_PYDISTUTILS= yes -USE_GCC= 3.4 +USE_GCC= 3.4 +PYDISTUTILS_PKGNAME= pyvorbis do-configure: @cd ${WRKSRC} && ${PYTHON_CMD} config_unix.py diff -r d3e65d761118 audio/py-xmms/Makefile --- a/audio/py-xmms/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/audio/py-xmms/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -21,6 +21,7 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimed USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= pyxmms USE_BZIP2= yes USE_GNOME= glib12 XMMS_CONFIG?= ${X11BASE}/bin/xmms-config diff -r d3e65d761118 audio/pysol-sound-server/Makefile --- a/audio/pysol-sound-server/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/audio/pysol-sound-server/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -24,5 +24,7 @@ USE_BZIP2= yes USE_BZIP2= yes USE_PYTHON= yes HAS_CONFIGURE= yes +INSTALLS_EGGINFO= yes +PYDISTUTILS_PKGNAME= pysolsoundserver .include diff -r d3e65d761118 audio/pytone/Makefile --- a/audio/pytone/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/audio/pytone/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -20,6 +20,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_bsddb USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= PyTone OPTIONS= MAD "MPEG Audio Decoder (libmad) support" On \ VORBIS "Ogg/Vorbis support" On \ diff -r d3e65d761118 audio/sonata/Makefile --- a/audio/sonata/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/audio/sonata/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -20,6 +20,7 @@ USE_GETTEXT= yes USE_GETTEXT= yes USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Sonata RM_OPTS= -R diff -r d3e65d761118 cad/pythoncad/Makefile --- a/cad/pythoncad/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/cad/pythoncad/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -20,6 +20,8 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pygtk. USE_PYTHON= 2.2+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= PythonCAD +PYDISTUTILS_PKGVERSION= DS1-R32 post-install: ${INSTALL_SCRIPT} ${WRKSRC}/gtkpycad.py ${PREFIX}/bin/gtkpycad diff -r d3e65d761118 comms/py-bulksms/Makefile --- a/comms/py-bulksms/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/comms/py-bulksms/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -16,6 +16,8 @@ COMMENT= Python client for the BulkSMS.c USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= BulkSMS +PYDISTUTILS_PKGVERSION= 1.0 WRKSRC= ${WRKDIR}/bulksms diff -r d3e65d761118 comms/py-lirc/Makefile --- a/comms/py-lirc/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/comms/py-lirc/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -28,5 +28,6 @@ USE_PYTHON= yes USE_PYTHON= yes USE_PYDISTUTILS= yes USE_PYTHON_PREFIX= yes +PYDISTUTILS_PKGNAME= pylirc .include diff -r d3e65d761118 comms/py-serial/Makefile --- a/comms/py-serial/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/comms/py-serial/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -21,5 +21,6 @@ USE_PYTHON= yes USE_PYTHON= yes USE_PYDISTUTILS= yes USE_PYTHON_PREFIX= yes +PYDISTUTILS_PKGNAME= pyserial .include diff -r d3e65d761118 databases/glom/files/patch-glom-libglom-python_embed-py_glom_record.cc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/databases/glom/files/patch-glom-libglom-python_embed-py_glom_record.cc Sun Jul 15 22:35:58 2007 +0900 @@ -0,0 +1,20 @@ +--- glom/libglom/python_embed/py_glom_record.cc.orig Sun Jul 15 13:34:18 2007 ++++ glom/libglom/python_embed/py_glom_record.cc Sun Jul 15 13:34:44 2007 +@@ -122,7 +122,7 @@ + + + +-static int ++static Py_ssize_t + Record_tp_as_mapping_length(PyGlomRecord *self) + { + return self->m_pMap_field_values->size(); +@@ -146,7 +146,7 @@ + } + else + { +- g_warning("Record_tp_as_mapping_getitem(): item not found in m_pMap_field_values. size=%d, item=%s", self->m_pMap_field_values->size(), pchKey); ++ g_warning("Record_tp_as_mapping_getitem(): item not found in m_pMap_field_values. size=%d, item=%s", (int)self->m_pMap_field_values->size(), pchKey); + } + } + else diff -r d3e65d761118 databases/hk_classes/Makefile --- a/databases/hk_classes/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/databases/hk_classes/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -33,6 +33,9 @@ CONFIGURE_ARGS+=--with-python-libdir=${P --with-fontconfig-libdir=${X11BASE}/lib INSTALLS_SHLIB= yes LDCONFIG_DIRS+= ${PREFIX}/lib/hk_classes/ + +INSTALLS_EGGINFO= yes +PYDISTUTILS_PKGVERSION= 1.1 NOT_FOR_ARCHS= ia64 NOT_FOR_ARCHS_REASON_ia64= Does not build diff -r d3e65d761118 databases/pgworksheet/Makefile --- a/databases/pgworksheet/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/databases/pgworksheet/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -22,6 +22,7 @@ USE_GNOME= pygtk2 USE_GNOME= pygtk2 USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGVERSION= 1.8 post-patch: ${REINPLACE_CMD} -e \ diff -r d3e65d761118 databases/py-Elixir/Makefile --- a/databases/py-Elixir/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/databases/py-Elixir/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -23,6 +23,7 @@ USE_PYTHON= yes USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's PYDISTUTILS_BUILD_TARGET= bdist_egg PYDISTUTILS_INSTALL_TARGET= easy_install PYDISTUTILS_INSTALLARGS= -O 1 -N -S ${PYTHON_SITELIBDIR} ${WRKSRC}/dist/${PYELIXIR_EGG} diff -r d3e65d761118 databases/py-MySQL/Makefile --- a/databases/py-MySQL/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/databases/py-MySQL/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -17,7 +17,8 @@ LIB_DEPENDS= mysqlclient.10:${PORTSDIR}/ LIB_DEPENDS= mysqlclient.10:${PORTSDIR}/databases/mysql323-client PLIST_FILES= lib/%%PYTHON_VERSION%%/site-packages/MySQLmodule.so -USE_PYTHON= yes +USE_PYTHON= -2.4 +MAKE_ENV= PYTHON=${PYTHON_CMD} .include diff -r d3e65d761118 databases/py-MySQL/files/Makefile.pre.in --- a/databases/py-MySQL/files/Makefile.pre.in Sun Jul 15 16:12:18 2007 +0000 +++ b/databases/py-MySQL/files/Makefile.pre.in Sun Jul 15 15:33:18 2007 +0900 @@ -92,7 +92,7 @@ TARGET= python TARGET= python # Installed python binary (used only by boot target) -PYTHON= python +PYTHON?= python # Add more -I and -D options here CFLAGS= $(OPT) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS) diff -r d3e65d761118 databases/py-MySQLdb-devel/Makefile --- a/databases/py-MySQLdb-devel/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/databases/py-MySQLdb-devel/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -21,6 +21,8 @@ USE_PYTHON= 2.3+ USE_PYTHON= 2.3+ USE_PYDISTUTILS= yes USE_MYSQL= yes +PYDISTUTILS_PKGNAME= MySQL-python${PYTHON_VER} +PYDISTUTILS_PKGVERSION= 1.2.2b2 CONFLICTS= py*-MySQLdb-[0-9]* diff -r d3e65d761118 databases/py-MySQLdb/Makefile --- a/databases/py-MySQLdb/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/databases/py-MySQLdb/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -19,6 +19,8 @@ USE_PYTHON= yes USE_PYTHON= yes USE_PYDISTUTILS= yes USE_MYSQL= yes +PYDISTUTILS_PKGNAME= MySQL-python +PYDISTUTILS_PKGVERSION= 1.2.2 CONFLICTS= py*-MySQLdb-devel-[0-9]* diff -r d3e65d761118 databases/py-PyGreSQL/Makefile --- a/databases/py-PyGreSQL/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/databases/py-PyGreSQL/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -22,6 +22,7 @@ USE_PGSQL= yes USE_PGSQL= yes USE_PYTHON= yes DATETIME_DEP= ${PYTHON_SITELIBDIR}/mx/DateTime/__init__.py +INSTALLS_EGGINFO= yes pre-build: @ cd ${WRKSRC} ; ${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' setup.py diff -r d3e65d761118 databases/py-PySQLite10/Makefile --- a/databases/py-PySQLite10/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/databases/py-PySQLite10/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -25,6 +25,7 @@ WRKSRC= ${WRKDIR}/pysqlite WRKSRC= ${WRKDIR}/pysqlite USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= pysqlite MAKE_ENV= LOCALBASE="${LOCALBASE}" PORTDOCS= * diff -r d3e65d761118 databases/py-PySQLite11/Makefile --- a/databases/py-PySQLite11/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/databases/py-PySQLite11/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -23,6 +23,7 @@ NO_LATEST_LINK= yes USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= pysqlite MAKE_ENV= LOCALBASE="${LOCALBASE}" PORTDOCS= * diff -r d3e65d761118 databases/py-axiom/Makefile --- a/databases/py-axiom/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/databases/py-axiom/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -24,5 +24,6 @@ USE_PYDISTUTILS= yes USE_PYDISTUTILS= yes USE_TWISTED= yes NO_BUILD= yes +PYDISTUTILS_PKGNAME= Axiom .include diff -r d3e65d761118 databases/py-bsddb/Makefile --- a/databases/py-bsddb/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/databases/py-bsddb/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -20,6 +20,8 @@ USE_BDB= yes USE_BDB= yes USE_PYTHON= 2.3+ USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= _bsddb +PYDISTUTILS_PKGVERSION= 0.0.0 DIST_SUBDIR= python WRKSRC= ${PYTHON_WRKSRC}/Modules MD5_FILE= ${PORTSDIR}/lang/python/distinfo diff -r d3e65d761118 databases/py-cdb/Makefile --- a/databases/py-cdb/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/databases/py-cdb/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -18,6 +18,7 @@ COMMENT= Python interface to DJB's const USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= python-cdb DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME} diff -r d3e65d761118 databases/py-dbutils/Makefile --- a/databases/py-dbutils/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/databases/py-dbutils/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -18,6 +18,7 @@ COMMENT= Providing solid, persistent and USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= DBUtils DOCSDIR= ${TARGETDIR}/share/doc/py-${PORTNAME} diff -r d3e65d761118 databases/py-forgetsql/Makefile --- a/databases/py-forgetsql/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/databases/py-forgetsql/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -25,6 +25,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/MySQLd USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= forgetSQL DOCS= BUGS README TODO diff -r d3e65d761118 databases/py-gdbm/Makefile --- a/databases/py-gdbm/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/databases/py-gdbm/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -22,6 +22,7 @@ DIST_SUBDIR= python DIST_SUBDIR= python USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGVERSION= 0.0.0 WRKSRC= ${PYTHON_WRKSRC}/Modules MD5_FILE= ${PORTSDIR}/lang/python/distinfo diff -r d3e65d761118 databases/py-memcached/Makefile --- a/databases/py-memcached/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/databases/py-memcached/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -18,5 +18,6 @@ COMMENT= Python API for memcached, a dis USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= python-memcached .include diff -r d3e65d761118 databases/py-mssql/Makefile --- a/databases/py-mssql/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/databases/py-mssql/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -20,6 +20,7 @@ LIB_DEPENDS= sybdb.5:${PORTSDIR}/databas USE_PYTHON= 2.4+ USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= pymssql post-patch: ${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \ diff -r d3e65d761118 databases/py-sqlalchemy/Makefile --- a/databases/py-sqlalchemy/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/databases/py-sqlalchemy/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -24,6 +24,7 @@ PLIST_SUB+= PORTVERSION=${PORTVERSION} \ EGG="SQLAlchemy==${PORTVERSION}" \ EXAMPLEDIR=share/examples/${PORTNAME} USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= SQLAlchemy BUILD_DEPENDS+= easy_install:${PORTSDIR}/devel/py-setuptools # make sure we have it @deinstall time to remove the egg diff -r d3e65d761118 databases/py-sqlite3/Makefile --- a/databases/py-sqlite3/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/databases/py-sqlite3/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -14,7 +14,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTFILES= ${PYTHON_DISTFILE} -MAINTAINER= perky@FreeBSD.org +MAINTAINER= python@FreeBSD.org COMMENT= Standard Python binding to the SQLite3 library LIB_DEPENDS= sqlite3.8:${PORTSDIR}/databases/sqlite3 @@ -26,6 +26,9 @@ WRKSRC= ${PYTHON_WRKSRC}/Modules WRKSRC= ${PYTHON_WRKSRC}/Modules MD5_FILE= ${PORTSDIR}/lang/python/distinfo +PYDISTUTILS_PKGNAME= _sqlite3 +PYDISTUTILS_PKGVERSION= 0.0.0 + pre-extract: @${CAT} ${PKGMESSAGE} diff -r d3e65d761118 databases/py-sqlobject/Makefile --- a/databases/py-sqlobject/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/databases/py-sqlobject/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -23,9 +23,11 @@ RUN_DEPENDS+= ${BUILD_DEPENDS} USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= SQLObject SQLOBJECTVER?= ${PORTVERSION} PYTHONVER?= ${PYTHON_VERSION:S/^python//} PLIST_SUB= PYSQLOBJECT_EGG=${PYSQLOBJECT_EGG} +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's SUB_FILES+= pkg-deinstall pkg-install SUB_LIST+= EGG="SQLObject==${SQLOBJECTVER}" \ diff -r d3e65d761118 databases/py-sqlrelay/Makefile --- a/databases/py-sqlrelay/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/databases/py-sqlrelay/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -43,7 +43,7 @@ do-extract: post-patch: ${PERL} -i -p \ - -e 's,"2\.1" "2\.0" "1\.6" "1\.5",${PYTHON_VERSION:S/^python//},g;' \ + -e 's,"2\.4" "2\.3" "2\.2" "2\.1",${PYTHON_VERSION:S/^python//},g;' \ ${WRKSRC}/configure ${CP} ${TEMPLATES}/config.sub ${WRKSRC} ${CP} ${TEMPLATES}/config.guess ${WRKSRC} diff -r d3e65d761118 databases/zodb3/Makefile --- a/databases/zodb3/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/databases/zodb3/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -18,5 +18,6 @@ COMMENT= The Z - Object Database for pyt USE_PYTHON= 2.3+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= ZODB3 .include diff -r d3e65d761118 deskutils/adesklets/Makefile --- a/deskutils/adesklets/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/deskutils/adesklets/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -32,6 +32,7 @@ INFO= adesklets \ adesklets_fr SUB_FILES= pkg-message +INSTALLS_EGGINFO= yes .include diff -r d3e65d761118 deskutils/ljcharm/Makefile --- a/deskutils/ljcharm/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/deskutils/ljcharm/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -19,6 +19,7 @@ MAN5=charmrc.5 USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGVERSION= 1.6.0 post-install: .if !defined(NOPORTDOCS) diff -r d3e65d761118 deskutils/py-dosage/Makefile --- a/deskutils/py-dosage/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/deskutils/py-dosage/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -16,6 +16,7 @@ COMMENT= An application to keep a local USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= Dosage MAN1= mainline.1 diff -r d3e65d761118 deskutils/py-tagfu/Makefile --- a/deskutils/py-tagfu/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/deskutils/py-tagfu/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -17,5 +17,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pysqli USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= TagFu +PYDISTUTILS_PKGVERSION= 0.1 .include diff -r d3e65d761118 deskutils/pybookreader/Makefile --- a/deskutils/pybookreader/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/deskutils/pybookreader/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -20,6 +20,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/libxml USE_PYTHON= 2.2+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= PyBookReader USE_GNOME= pygtk2 .include diff -r d3e65d761118 deskutils/pypanel/Makefile --- a/deskutils/pypanel/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/deskutils/pypanel/Makefile Sun Jul 15 15:33:18 2007 +0900 @@ -25,6 +25,7 @@ USE_X_PREFIX= yes USE_X_PREFIX= yes USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= PyPanel PORTDOCS= * diff -r d3e65d761118 devel/bazaar-ng/Makefile --- a/devel/bazaar-ng/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/bazaar-ng/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -19,6 +19,8 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cEleme USE_PYTHON= 2.4+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= bzr +PYDISTUTILS_PKGVERSION= ${PORTVERSION}.0 MAN1= bzr.1 diff -r d3e65d761118 devel/bisongen/Makefile --- a/devel/bisongen/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/bisongen/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -17,6 +17,7 @@ USE_BZIP2= yes USE_BZIP2= yes USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= BisonGen post-install: ${MKDIR} ${EXAMPLESDIR} diff -r d3e65d761118 devel/bzrtools/Makefile --- a/devel/bzrtools/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/bzrtools/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -20,5 +20,6 @@ WRKSRC= ${WRKDIR}/bzrtools WRKSRC= ${WRKDIR}/bzrtools USE_PYTHON= 2.4+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= BzrTools .include diff -r d3e65d761118 devel/codeville/Makefile --- a/devel/codeville/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/codeville/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -17,6 +17,7 @@ COMMENT= An "anarchic" control version s USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Codeville PORTDOCS= \ LICENSE.txt diff -r d3e65d761118 devel/ditrack/Makefile --- a/devel/ditrack/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/ditrack/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -17,8 +17,9 @@ RUN_DEPENDS= svn:${PORTSDIR}/devel/subve RUN_DEPENDS= svn:${PORTSDIR}/devel/subversion NO_BUILD= yes +USE_PYTHON= yes USE_PYDISTUTILS= yes -USE_PYTHON= yes +PYDISTUTILS_PKGNAME= DITrack WRKSRC= ${WRKDIR}/DITrack-${PORTVERSION} .include diff -r d3e65d761118 devel/drpython/Makefile --- a/devel/drpython/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/drpython/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -19,6 +19,7 @@ USE_ZIP= yes USE_ZIP= yes USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= DrPython USE_WX= 2.6 WX_COMPS= python diff -r d3e65d761118 devel/libredblack/Makefile --- a/devel/libredblack/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/libredblack/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -35,5 +35,7 @@ post-patch: post-patch: @${REINPLACE_CMD} -e \ 's|^CFLAGS =.*$$|CFLAGS = @CFLAGS@|g' ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e \ + 's|implemented.*Various||g' ${WRKSRC}/rbgen.in .include diff -r d3e65d761118 devel/nx/Makefile --- a/devel/nx/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/nx/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -26,6 +26,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS} USE_PYTHON= 2.3+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= networkx DOCSDIR= ${PREFIX}/share/doc/networkx-${PORTVERSION} PORTDOCS= * diff -r d3e65d761118 devel/py-Breve/Makefile --- a/devel/py-Breve/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-Breve/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -21,6 +21,7 @@ USE_PYTHON= 2.4+ USE_PYTHON= 2.4+ USE_PYDISTUTILS= yes +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's PYDISTUTILS_BUILD_TARGET= bdist_egg PYDISTUTILS_INSTALL_TARGET= easy_install PYDISTUTILS_INSTALLARGS= -N -s ${PREFIX}/bin -S ${PYTHON_SITELIBDIR} dist/${PYBREVE_EGG} diff -r d3e65d761118 devel/py-Jinja/Makefile --- a/devel/py-Jinja/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-Jinja/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -25,6 +25,7 @@ PLIST_SUB= EASY_INSTALL_CMD=${EASY_INSTA PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION} \ PYJINJA_EGG=${PYJINJA_EGG} +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's EASY_INSTALL_CMD?= easy_install-${PYTHON_VER} PYJINJA_EGG= ${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}.egg diff -r d3e65d761118 devel/py-asn1/Makefile --- a/devel/py-asn1/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-asn1/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -18,6 +18,7 @@ COMMENT= ASN.1 toolkit for Python USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= pyasn1 DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} diff -r d3e65d761118 devel/py-astng/Makefile --- a/devel/py-astng/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-astng/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -19,5 +19,6 @@ RUN_DEPENDS= ${PYTHONPREFIX_SITELIBDIR}/ USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= logilab-astng .include diff -r d3e65d761118 devel/py-bison/Makefile --- a/devel/py-bison/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-bison/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -21,6 +21,7 @@ RUN_DEPENDS= bison:${PORTSDIR}/devel/bis USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGVERSION= 0.1 .if !defined(NOPORTDOCS) DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} diff -r d3e65d761118 devel/py-celementtree/Makefile --- a/devel/py-celementtree/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-celementtree/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -20,6 +20,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/elemen USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGVERSION= 1.0.5-20051216 EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} diff -r d3e65d761118 devel/py-cheetah/Makefile --- a/devel/py-cheetah/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-cheetah/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -21,8 +21,11 @@ NO_PACKAGE= not yet NO_PACKAGE= not yet USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= Cheetah +PYDISTUTILS_PKGVERSION= 2.0rc7 MAKE_ENV= CHEETAH_USE_SETUPTOOLS=yes PYDISTUTILS_CONFIGUREARGS= bdist_egg --plat-name="" +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's CHEETAHVER= 2.0rc7 PYTHONVER?= ${_PYTHON_VERSION} PLIST_SUB= CHEETAHVER=${CHEETAHVER} \ diff -r d3e65d761118 devel/py-cjson/Makefile --- a/devel/py-cjson/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-cjson/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -17,6 +17,7 @@ COMMENT= Fast JSON encoder/decoder for P USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= python-cjson PLIST_FILES= %%PYTHON_SITELIBDIR%%/cjson.so diff -r d3e65d761118 devel/py-cxx/Makefile --- a/devel/py-cxx/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-cxx/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -20,6 +20,8 @@ USE_PYTHON= yes USE_PYTHON= yes USE_PYDISTUTILS= yes USE_PYTHON_PREFIX= yes +PYDISTUTILS_PKGNAME= CXX +PYDISTUTILS_PKGVERSION= 5.3 .if !defined(NOPORTDOCS) DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} diff -r d3e65d761118 devel/py-dateutil/Makefile --- a/devel/py-dateutil/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-dateutil/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -18,5 +18,6 @@ USE_BZIP2= yes USE_BZIP2= yes USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= python-dateutil .include diff -r d3e65d761118 devel/py-dialog/Makefile --- a/devel/py-dialog/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-dialog/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -23,6 +23,7 @@ USE_BZIP2= yes USE_BZIP2= yes USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= pythondialog EXAMPLESDIR= ${PREFIX}/share/examples/py-dialog diff -r d3e65d761118 devel/py-durus/Makefile --- a/devel/py-durus/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-durus/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -20,6 +20,7 @@ COMMENT= A persistent object storage sys USE_PYTHON= 2.4+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Durus MAN1= durus.1 .include diff -r d3e65d761118 devel/py-elementtree/Makefile --- a/devel/py-elementtree/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-elementtree/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -17,6 +17,7 @@ COMMENT= Container for hierarchical data USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGVERSION= 1.2.6-20050316 DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME} diff -r d3e65d761118 devel/py-epsilon/Makefile --- a/devel/py-epsilon/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-epsilon/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -18,6 +18,7 @@ COMMENT= Epsilon is a set of Python util USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Epsilon USE_TWISTED= yes NO_BUILD= yes diff -r d3e65d761118 devel/py-fam/Makefile --- a/devel/py-fam/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-fam/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -19,6 +19,7 @@ PLIST_FILES= %%PYTHON_SITELIBDIR%%/_fam. PLIST_FILES= %%PYTHON_SITELIBDIR%%/_fam.so USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGVERSION= 0.0.0 USE_FAM= yes pre-patch: diff -r d3e65d761118 devel/py-fileutils/Makefile --- a/devel/py-fileutils/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-fileutils/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -19,5 +19,6 @@ USE_BZIP2= yes USE_BZIP2= yes USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= FileUtils .include diff -r d3e65d761118 devel/py-flakes/Makefile --- a/devel/py-flakes/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-flakes/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -17,6 +17,7 @@ COMMENT= Pyflakes is a program that anal USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= pyflakes NO_BUILD= yes .include diff -r d3e65d761118 devel/py-fortran/Makefile --- a/devel/py-fortran/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-fortran/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -21,6 +21,7 @@ RUN_DEPENDS= ${PYNUMERIC} USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Pyfort WRKSRC= ${WRKDIR}/${DISTNAME:S/p/P/} .include diff -r d3e65d761118 devel/py-freebsd/Makefile --- a/devel/py-freebsd/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-freebsd/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -20,6 +20,7 @@ COMMENT= Python interface to FreeBSD-spe USE_PYTHON= 2.3+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= py-freebsd PLIST_FILES= %%PYTHON_SITELIBDIR%%/freebsd.so \ %%PYTHON_SITELIBDIR%%/freebsd_compat02.py \ diff -r d3e65d761118 devel/py-fusefs/Makefile --- a/devel/py-fusefs/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-fusefs/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -22,4 +22,7 @@ USE_PYDISTUTILS=yes USE_PYDISTUTILS=yes USE_GNOME= pkgconfig +PYDISTUTILS_PKGNAME= fuse-python +PYDISTUTILS_PKGVERSION= 0.2pre1 + .include diff -r d3e65d761118 devel/py-game/Makefile --- a/devel/py-game/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-game/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -25,6 +25,9 @@ USE_PYDISTUTILS=yes USE_PYDISTUTILS=yes USE_XLIB= yes +PYDISTUTILS_PKGNAME= pygame +PYDISTUTILS_PKGVERSION= 1.7.1release + do-configure: @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} config.py diff -r d3e65d761118 devel/py-generate/Makefile --- a/devel/py-generate/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-generate/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -21,5 +21,6 @@ PLIST_FILES= %%PYTHON_SITELIBDIR%%/gener PLIST_FILES= %%PYTHON_SITELIBDIR%%/generate.so USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGVERSION= 2.2 .include diff -r d3e65d761118 devel/py-grouch/Makefile --- a/devel/py-grouch/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-grouch/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -17,6 +17,7 @@ COMMENT= A system for describing and enf USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Grouch .include diff -r d3e65d761118 devel/py-icalendar/Makefile --- a/devel/py-icalendar/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-icalendar/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -23,6 +23,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS} USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} diff -r d3e65d761118 devel/py-instant/Makefile --- a/devel/py-instant/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-instant/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -20,6 +20,8 @@ RUN_DEPENDS= swig1.3:${PORTSDIR}/devel/s USE_PYTHON= 2.3+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Instant +PYDISTUTILS_PKGVERSION= 0.8 PLIST_FILES= %%PYTHON_SITELIBDIR%%/Instant.py \ %%PYTHON_SITELIBDIR%%/Instant.pyc \ diff -r d3e65d761118 devel/py-json-py/Makefile --- a/devel/py-json-py/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-json-py/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -19,7 +19,7 @@ COMMENT= A python implementation of a JS NO_WRKSUBDIR= yes -USE_PYTHON= 2.4 +USE_PYTHON= 2.4+ USE_ZIP= yes do-build: @@ -27,7 +27,7 @@ do-build: cd ${WRKDIR}; \ FILES=$$(${FIND} . -name "*.py" ); \ for FILE in $${FILES}; do \ - ${ECHO} import `basename $${FILE} .py` | python; \ + ${ECHO} import `basename $${FILE} .py` | ${PYTHON_CMD}; \ done; \ do-install: diff -r d3e65d761118 devel/py-kid/Makefile --- a/devel/py-kid/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-kid/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -27,6 +27,7 @@ USE_PYTHON= yes USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's PYDISTUTILS_BUILD_TARGET= bdist_egg PYDISTUTILS_INSTALL_TARGET= easy_install PYDISTUTILS_INSTALLARGS= -N -O1 -s ${PREFIX}/bin -S ${PYTHON_SITELIBDIR} dist/${PYKID_EGG} diff -r d3e65d761118 devel/py-kjbuckets/Makefile --- a/devel/py-kjbuckets/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-kjbuckets/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -19,6 +19,7 @@ COMMENT= Graph and set datatypes for Pyt USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGVERSION= 2.2 WRKSRC= ${WRKDIR}/${DISTNAME}/kjbuckets post-install: diff -r d3e65d761118 devel/py-kqueue/Makefile --- a/devel/py-kqueue/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-kqueue/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -21,6 +21,7 @@ USE_PYTHON= yes USE_PYTHON= yes FILES= kqsyscallmodule.so KQueue.py KQueue.pyc PLIST_FILES= ${FILES:S+^+%%PYTHON_SITELIBDIR%%/+g} +MAKE_ENV= MAINCC=${CC} .include diff -r d3e65d761118 devel/py-levenshtein/Makefile --- a/devel/py-levenshtein/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-levenshtein/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -22,5 +22,6 @@ USE_PYTHON= 2.2+ USE_PYTHON= 2.2+ USE_PYTHON_PREFIX= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= python-Levenshtein .include diff -r d3e65d761118 devel/py-ll-core/pkg-plist --- a/devel/py-ll-core/pkg-plist Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-ll-core/pkg-plist Sun Jul 15 15:33:19 2007 +0900 @@ -27,6 +27,8 @@ bin/ucp.py %%PYTHON_SITELIBDIR%%/ll/scripts/__init__.pyc %%PYTHON_SITELIBDIR%%/ll/scripts/__init__.pyo %%PYTHON_SITELIBDIR%%/ll/scripts/ucp.py +%%PYTHON_SITELIBDIR%%/ll/scripts/ucp.pyc +%%PYTHON_SITELIBDIR%%/ll/scripts/ucp.pyo %%PYTHON_SITELIBDIR%%/ll/sisyphus.py %%PYTHON_SITELIBDIR%%/ll/sisyphus.pyc %%PYTHON_SITELIBDIR%%/ll/sisyphus.pyo diff -r d3e65d761118 devel/py-lxml/Makefile --- a/devel/py-lxml/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-lxml/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -24,6 +24,7 @@ USE_PYTHON= 2.4+ USE_PYTHON= 2.4+ USE_PYDISTUTILS= yes MANUAL_PACKAGE_BUILD=Doesn't build in tinderbox environment +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} diff -r d3e65d761118 devel/py-magic/Makefile --- a/devel/py-magic/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-magic/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -18,6 +18,8 @@ COMMENT= Python module for determing fil USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Magic_file_extensions +PYDISTUTILS_PKGVERSION= 0.1 WRKSRC= ${WRKDIR}/file-${PORTVERSION}/python diff -r d3e65d761118 devel/py-mx-experimental/Makefile --- a/devel/py-mx-experimental/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-mx-experimental/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -21,6 +21,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/mx/Bee USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= egenix-mx-experimental post-patch: @${REINPLACE_CMD} -e "s|LIBGMPH|${PREFIX}/include|" ${WRKSRC}/mxEXPERIMENTAL.py diff -r d3e65d761118 devel/py-ncurses/Makefile --- a/devel/py-ncurses/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-ncurses/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -19,6 +19,7 @@ COMMENT= A ncurses binding for Python USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= pyncurses .include diff -r d3e65d761118 devel/py-notifier/Makefile --- a/devel/py-notifier/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-notifier/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -17,6 +17,7 @@ COMMENT= A generic notifier/event schedu USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= pynotifier EXAMPLESDIR= ${TARGETDIR}/share/examples/py-${PORTNAME} diff -r d3e65d761118 devel/py-ocempgui/Makefile --- a/devel/py-ocempgui/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-ocempgui/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -24,6 +24,7 @@ USE_GCC= 3.4+ USE_GCC= 3.4+ USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= OcempGUI post-patch: .if defined(NOPORTDOCS) diff -r d3e65d761118 devel/py-ode/Makefile --- a/devel/py-ode/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-ode/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -24,6 +24,7 @@ USE_BZIP2= yes USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= PyODE OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options diff -r d3e65d761118 devel/py-parsedatetime/Makefile --- a/devel/py-parsedatetime/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-parsedatetime/Makefile Sun Jul 15 15:33:19 2007 +0900 @@ -22,6 +22,7 @@ USE_PYTHON= yes USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's EASY_INSTALL_CMD?= easy_install-${PYTHON_VER} PYDISTUTILS_BUILD_TARGET= bdist_egg diff -r d3e65d761118 devel/py-parsing/Makefile --- a/devel/py-parsing/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-parsing/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -18,6 +18,7 @@ COMMENT= General parsing module for Pyth USE_PYTHON= 2.3+ USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= pyparsing DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} diff -r d3e65d761118 devel/py-pqueue/Makefile --- a/devel/py-pqueue/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-pqueue/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -19,6 +19,7 @@ USE_BZIP2= yes USE_BZIP2= yes USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGVERSION= 0.0.0 WRKSRC= ${WRKDIR}/PQueue diff -r d3e65d761118 devel/py-protocols-devel/Makefile --- a/devel/py-protocols-devel/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-protocols-devel/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -30,8 +30,10 @@ SUB_LIST+= EGG="PyProtocols==${PYPROTOCO USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGVERSION= 1.0a0 USE_ZIP= yes +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's PYPROTOCOLS_EGG= PyProtocols-${PYPROTOCOLS_VER}-py${PYTHON_VERSION:S/^python//}-${OPSYS:L}-${OSRELEASE}-${ARCH}.egg PYPROTOCOLS_VER?= 1.0a0 diff -r d3e65d761118 devel/py-protocols/Makefile --- a/devel/py-protocols/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-protocols/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -18,5 +18,6 @@ COMMENT= Python module extending the PEP USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= PyProtocols .include diff -r d3e65d761118 devel/py-pydasm/Makefile --- a/devel/py-pydasm/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-pydasm/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -18,6 +18,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/${PORTNAM WRKSRC= ${WRKDIR}/${DISTNAME}/${PORTNAME} USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGVERSION= 1.2 .if !defined(WITHOUT_EXAMPLES) PLIST_SUB+= EXAMPLES="" diff -r d3e65d761118 devel/py-pytz/Makefile --- a/devel/py-pytz/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-pytz/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -24,6 +24,7 @@ USE_PYDISTUTILS= yes EASY_INSTALL_CMD?= easy_install-${PYTHON_VER} +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's PYDISTUTILS_BUILD_TARGET= bdist_egg PYDISTUTILS_INSTALL_TARGET= easy_install PYDISTUTILS_INSTALLARGS= -O 1 -N -S ${PYTHON_SITELIBDIR} ${WRKSRC}/dist/${PYPYTZ_EGG} diff -r d3e65d761118 devel/py-pyutil/Makefile --- a/devel/py-pyutil/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-pyutil/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -17,28 +17,12 @@ MAINTAINER= quakelee@cn.FreeBSD.org MAINTAINER= quakelee@cn.FreeBSD.org COMMENT= A collection of mature utilities for Python programmers -BUILD_DEPENDS= ${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools -RUN_DEPENDS= ${BUILD_DEPENDS} - -EASY_INSTALL_CMD?= easy_install-${PYTHON_VER} - -USE_PYTHON= 2.4 -USE_PYDISTUTILS= yes -PYTHONVER?= ${_PYTHON_VERSION} - -PLIST_SUB+= EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \ - PYTHONVER=${PYTHONVER} \ - PYUTIL_EGG=${PYUTIL_EGG} \ - PYUTIL_EGG_VER="${PORTNAME}==${PORTVERSION}" -OSINFOS= ${OPSYS:L}-${OSRELEASE}-${ARCH} -PYUTIL_EGG= ${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}-${OSINFOS}.egg +USE_PYTHON= 2.4+ +USE_PYDISTUTILS=easy_install +PYEASYINSTALL_ARCHDEP= yes post-patch: @${REINPLACE_CMD} -e 's|^from\ ez\_setup|#from\ ez\_setup|' \ -e 's|^use_setuptools|#use_setuptools|' ${WRKSRC}/${PYSETUP} -.include - -OSRELEASE!= ${DESTDIR}/usr/bin/uname -r - -.include +.include diff -r d3e65d761118 devel/py-pyutil/pkg-plist --- a/devel/py-pyutil/pkg-plist Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-pyutil/pkg-plist Sun Jul 15 15:33:20 2007 +0900 @@ -1,2 +1,1 @@ -@unexec %%EASY_INSTALL_CMD%% -q -m -S %D/%%PYTHON_SITELIBDIR%% %%PYUTIL_EGG_VER%% -%%PYTHON_SITELIBDIR%%/%%PYUTIL_EGG%% +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%% diff -r d3e65d761118 devel/py-repl/Makefile --- a/devel/py-repl/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-repl/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -18,5 +18,6 @@ USE_PYTHON= yes USE_PYTHON= yes USE_PYDISTUTILS= yes USE_PYTHON_PREFIX= yes +PYDISTUTILS_PKGNAME= pyrepl .include diff -r d3e65d761118 devel/py-resourcepackage/Makefile --- a/devel/py-resourcepackage/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-resourcepackage/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -19,6 +19,7 @@ COMMENT= Automated resource-as-package e USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= ResourcePackage post-install: @${FIND} ${PYTHON_SITELIBDIR}/resourcepackage -type f | \ diff -r d3e65d761118 devel/py-reverse/Makefile --- a/devel/py-reverse/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-reverse/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -22,6 +22,7 @@ RUN_DEPENDS= ${PYXML} \ USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= pyreverse post-install: @${FIND} ${PYTHON_SITELIBDIR}/logilab/pyreverse ! -type d | \ diff -r d3e65d761118 devel/py-reverse/files/patch-setup.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/devel/py-reverse/files/patch-setup.py Mon Jul 16 03:15:18 2007 +0900 @@ -0,0 +1,15 @@ +--- setup.py.orig Fri Mar 30 08:39:28 2007 ++++ setup.py Fri Mar 30 08:39:37 2007 +@@ -16,11 +16,11 @@ + # You should have received a copy of the GNU General Public License along with + # this program; if not, write to the Free Software Foundation, Inc., + # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++from __future__ import nested_scopes + """ Generic Setup script, takes package info from __pkginfo__.py file """ + + __revision__ = '$Id: setup.py,v 1.17 2005/01/05 11:40:41 syt Exp $' + +-from __future__ import nested_scopes + import os + import sys + import shutil diff -r d3e65d761118 devel/py-ro/Makefile --- a/devel/py-ro/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-ro/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -19,6 +19,7 @@ COMMENT= Python Remote Objects USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Pyro DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME} diff -r d3e65d761118 devel/py-ruledispatch/Makefile --- a/devel/py-ruledispatch/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-ruledispatch/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -25,6 +25,7 @@ NO_PACKAGE= not yet USE_PYTHON= 2.3+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGVERSION= 0.5a0 PLIST_FILES+= lib/${PYTHON_VERSION}/site-packages/${PYRULEDISPATCH_EGG} @@ -32,6 +33,7 @@ SUB_LIST+= PYTHON_SITELIBDIR=${PYTHON_SI SUB_LIST+= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} \ EGG="RuleDispatch==${PYRULEDISPATCH_VER}" +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's OSINFOS= ${OPSYS:L}-${OSRELEASE}-${ARCH} PYRULEDISPATCH_EGG= ${PORTNAME}-${PYRULEDISPATCH_VER}-py${PYTHON_VERSION:S/^python//}-${OSINFOS}.egg PYRULEDISPATCH_VER?= 0.5a0 diff -r d3e65d761118 devel/py-sendfile/Makefile --- a/devel/py-sendfile/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-sendfile/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -18,6 +18,8 @@ USE_BZIP2= yes USE_BZIP2= yes USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= py-sendfile +PYDISTUTILS_PKGVERSION= 1.0 PLIST_FILES= %%PYTHON_SITELIBDIR%%/sendfile.so diff -r d3e65d761118 devel/py-setuptools/Makefile --- a/devel/py-setuptools/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-setuptools/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -17,6 +17,7 @@ DIST_SUBDIR= python DIST_SUBDIR= python USE_PYTHON= 2.3+ USE_PYDISTUTILS= yes +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's PLIST_SUB= VERSION=${PORTVERSION} PYVER=${PYTHON_VERSION:S/python//} .include diff -r d3e65d761118 devel/py-simplejson/Makefile --- a/devel/py-simplejson/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-simplejson/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -20,6 +20,7 @@ USE_PYTHON= yes USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_NOEGGINFO= yes # XXX use bsd.python.mk's PYSIMPLEJSON_EGG= ${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}-${OSINFOS}.egg OSINFOS= ${OPSYS:L}-${OSRELEASE}-${ARCH} diff -r d3e65d761118 devel/py-simpleparse/Makefile --- a/devel/py-simpleparse/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-simpleparse/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -21,5 +21,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/mx/Tex USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= SimpleParse +PYDISTUTILS_PKGVERSION= 2.1.0a1 .include diff -r d3e65d761118 devel/py-simpletal/Makefile --- a/devel/py-simpletal/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-simpletal/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -17,5 +17,6 @@ COMMENT= Stand alone TAL Python implemen USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= SimpleTAL .include diff -r d3e65d761118 devel/py-simpy/Makefile --- a/devel/py-simpy/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-simpy/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -18,6 +18,7 @@ COMMENT= Simulation in Python USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= SimPy OPTIONS= TKINTER "Install py-tkinter for plot" off OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options diff -r d3e65d761118 devel/py-statgrab/Makefile --- a/devel/py-statgrab/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-statgrab/Makefile Sun Jul 15 15:40:10 2007 +0900 @@ -24,5 +24,6 @@ DIST_SUBDIR= i-scream DIST_SUBDIR= i-scream USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= pystatgrab .include diff -r d3e65d761118 devel/py-tconfpy/Makefile --- a/devel/py-tconfpy/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-tconfpy/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -13,6 +13,9 @@ COMMENT= A Python Configuration File Par COMMENT= A Python Configuration File Parser USE_PYTHON= yes +INSTALLS_EGGINFO= yes +PYDISTUTILS_PKGNAME= tconfpy +PYDISTUTILS_PKGVERSION= 0.0.0 MANCOMPRESSED= yes MAN1= test-tc.1 diff -r d3e65d761118 devel/py-testgears/Makefile --- a/devel/py-testgears/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-testgears/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -16,15 +16,7 @@ MAINTAINER= nivit@FreeBSD.org MAINTAINER= nivit@FreeBSD.org COMMENT= Python module to run tests written as simple functions -BUILD_DEPENDS= easy_install:${PORTSDIR}/devel/py-setuptools -# need to remove the egg -RUN_DEPENDS= ${BUILD_DEPENDS} - USE_PYTHON= yes -USE_PYDISTUTILS= yes - -SUB_FILES= pkg-deinstall -SUB_LIST= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} \ - EGG="${PORTNAME}==${PORTVERSION}" +USE_PYDISTUTILS=easy_install .include diff -r d3e65d761118 devel/py-testgears/files/pkg-deinstall.in --- a/devel/py-testgears/files/pkg-deinstall.in Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-testgears/files/pkg-deinstall.in Sun Jul 15 15:33:20 2007 +0900 @@ -1,17 +0,0 @@ -#!/bin/sh -# $FreeBSD$ -PKGNAME=$1 -# -case $2 in - DEINSTALL) - easy_install -m -x -D -S %%PYTHON_SITELIBDIR%% %%EGG%% - ;; - POST-DEINSTALL) - exit 0 - ;; - *) - echo "Unexpected Argument $2!!!" - exit 1 - ;; -esac -exit 0 diff -r d3e65d761118 devel/py-testgears/pkg-plist --- a/devel/py-testgears/pkg-plist Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-testgears/pkg-plist Sun Jul 15 15:33:20 2007 +0900 @@ -1,2 +1,1 @@ -@comment $FreeBSD$ -%%PYTHON_SITELIBDIR%%/TestGears-0.2-py2.4.egg +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%% diff -r d3e65d761118 devel/py-trace2html/Makefile --- a/devel/py-trace2html/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-trace2html/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -22,6 +22,7 @@ USE_PYDISTUTILS= yes EASY_INSTALL_CMD?= easy_install-${PYTHON_VER} +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's PYDISTUTILS_BUILD_TARGET= bdist_egg PYDISTUTILS_INSTALL_TARGET= easy_install PYDISTUTILS_INSTALLARGS= -O 1 -N -S ${PYTHON_SITELIBDIR} ${WRKSRC}/dist/${PYTRACE2HTML_EGG} diff -r d3e65d761118 devel/py-turbokid/Makefile --- a/devel/py-turbokid/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-turbokid/Makefile Sun Jul 15 21:36:28 2007 +0900 @@ -6,7 +6,7 @@ # PORTNAME= TurboKid -PORTVERSION= 0.9.9 +PORTVERSION= 1.0.1 CATEGORIES= devel python MASTER_SITES= http://cheeseshop.python.org/packages/${PYTHON_VER}/T/TurboKid/ \ http://nivi.interfree.it/distfiles/${PORTNAME}/ @@ -21,7 +21,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS} RUN_DEPENDS= ${BUILD_DEPENDS} RUN_DEPENDS+= kid:${PORTSDIR}/devel/py-kid -USE_PYTHON= 2.4 +USE_PYTHON= 2.4+ NO_BUILD= yes diff -r d3e65d761118 devel/py-turbokid/distinfo --- a/devel/py-turbokid/distinfo Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-turbokid/distinfo Sun Jul 15 21:37:14 2007 +0900 @@ -1,3 +1,6 @@ MD5 (TurboKid-0.9.9-py2.4.egg) = 3c4cdcc -MD5 (TurboKid-0.9.9-py2.4.egg) = 3c4cdcc6716e6c2eeb5a3a6d5f16ac35 -SHA256 (TurboKid-0.9.9-py2.4.egg) = bec89877fdb30914799b2e030038e8742d5ea0a35ad6fdf52659519fa8eea08b -SIZE (TurboKid-0.9.9-py2.4.egg) = 7179 +MD5 (TurboKid-1.0.1-py2.4.egg) = 0e459c886ced830ba6c6dd0356536ed0 +MD5 (TurboKid-1.0.1-py2.5.egg) = 6fcb0d847e5cf8c13816433f75a95b4d +SHA256 (TurboKid-1.0.1-py2.4.egg) = c68ace1d90ad56107b5c5ac1d4bc8e3d9feb0cf6a63bb3d5fcf9f4804e99e8cd +SHA256 (TurboKid-1.0.1-py2.5.egg) = 5a2baafd41c767b520b7b7d4b3b6dafb9a2e0fbc1db19786c4f58b9862d266b3 +SIZE (TurboKid-1.0.1-py2.4.egg) = 7360 +SIZE (TurboKid-1.0.1-py2.5.egg) = 7271 diff -r d3e65d761118 devel/py-twisted/Makefile --- a/devel/py-twisted/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-twisted/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -27,6 +27,8 @@ USE_BZIP2= yes USE_BZIP2= yes USE_PYTHON= 2.2+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Twisted +PYDISTUTILS_PKGVERSION= 1.3.0rc1 PLIST_SUB+= S=${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} diff -r d3e65d761118 devel/py-twistedCore/Makefile --- a/devel/py-twistedCore/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-twistedCore/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -29,6 +29,7 @@ USE_BZIP2= yes USE_BZIP2= yes USE_PYTHON= 2.3+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Twisted MAN1= manhole.1 mktap.1 pyhtmlizer.1 tap2deb.1 tap2rpm.1 tapconvert.1 trial.1 twistd.1 diff -r d3e65d761118 devel/py-twistedFlow/Makefile --- a/devel/py-twistedFlow/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-twistedFlow/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -25,6 +25,7 @@ USE_BZIP2= yes USE_BZIP2= yes USE_PYTHON= 2.2+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Twisted_Flow PLIST_SUB+= S=${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} diff -r d3e65d761118 devel/py-twistedRunner/Makefile --- a/devel/py-twistedRunner/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-twistedRunner/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -23,6 +23,7 @@ USE_BZIP2= yes USE_BZIP2= yes USE_PYTHON= 2.3+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Twisted_Runner PLIST_SUB+= S=${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} diff -r d3e65d761118 devel/py-unit/Makefile --- a/devel/py-unit/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-unit/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -21,5 +21,6 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_tkint USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= PyUnit .include diff -r d3e65d761118 devel/py-utils/Makefile --- a/devel/py-utils/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-utils/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -17,6 +17,8 @@ COMMENT= General utility modules that si USE_PYTHON= 2.2+ USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= pythonutils +PYDISTUTILS_EGGINFODIR= ${PYTHONPREFIX_SITELIBDIR}/pythonutils WRKSRC= ${WRKDIR}/pythonutils-${PORTVERSION} USE_ZIP= yes diff -r d3e65d761118 devel/py-utils/files/patch-python25 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/devel/py-utils/files/patch-python25 Mon Jul 16 03:04:06 2007 +0900 @@ -0,0 +1,35 @@ +--- pythonutils/pathutils.py.orig Fri Mar 30 06:39:37 2007 ++++ pythonutils/pathutils.py Fri Mar 30 06:39:49 2007 +@@ -14,13 +14,13 @@ + # Scripts maintained at http://www.voidspace.org.uk/python/index.shtml + # E-mail fuzzyman@voidspace.org.uk + ++from __future__ import generators + """ + This module contains convenience functions for working with files and paths. + """ + + __version__ = '0.2.4' + +-from __future__ import generators + import os + import sys + import time +--- pythonutils/odict.py.orig Fri Mar 30 06:41:25 2007 ++++ pythonutils/odict.py Fri Mar 30 06:41:35 2007 +@@ -14,6 +14,7 @@ + # http://groups.google.com/group/pythonutils/ + # Comments, suggestions and bug reports welcome. + ++from __future__ import generators + """A dict that keeps keys in insertion order""" + + __author__ = ('Nicola Larosa ,' +@@ -27,7 +28,6 @@ + + __all__ = ['OrderedDict', 'SequenceOrderedDict'] + +-from __future__ import generators + from warnings import warn + from types import SliceType + diff -r d3e65d761118 devel/py-vmaps/Makefile --- a/devel/py-vmaps/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-vmaps/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -19,6 +19,8 @@ COMMENT= Python Arrays on mmap() USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Vmaps +PYDISTUTILS_PKGVERSION= 1.0 .if !defined(NOPORTDOCS) post-install: diff -r d3e65d761118 devel/py-wsgiutils/Makefile --- a/devel/py-wsgiutils/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-wsgiutils/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -21,6 +21,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS} USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= WSGIUtils PLIST_FILES= ${PYTHON_SITELIBDIR:S,${PREFIX}/,,}/${PYWSGIUTILS_EGG} PLIST_SUB= PYWSGIUTILS_EGG="${PYWSGIUTILS_EGG}" diff -r d3e65d761118 devel/py-xdg/Makefile --- a/devel/py-xdg/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-xdg/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -19,6 +19,7 @@ COMMENT= A python library to access free USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= pyxdg post-patch: @${REINPLACE_CMD} -e \ diff -r d3e65d761118 devel/py-yaml/Makefile --- a/devel/py-yaml/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-yaml/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -18,5 +18,6 @@ COMMENT= Python YAML parser USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= PyYAML .include diff -r d3e65d761118 devel/py-zconfig/Makefile --- a/devel/py-zconfig/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-zconfig/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -18,5 +18,6 @@ WRKSRC= ${WRKDIR}/ZConfig-${PORTVERSION USE_PYTHON= 2.2+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= ZConfig .include diff -r d3e65d761118 devel/py-zopeInterface/Makefile --- a/devel/py-zopeInterface/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/py-zopeInterface/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -22,6 +22,8 @@ MANUAL_PACKAGE_BUILD=Doesn't build in ti USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= zope.interface +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's EASY_INSTALL_CMD?= easy_install-${PYTHON_VER} diff -r d3e65d761118 devel/pychecker/Makefile --- a/devel/pychecker/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/pychecker/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -16,6 +16,7 @@ COMMENT= Python source code checking too USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= PyChecker DOCS= CHANGELOG COPYRIGHT KNOWN_BUGS MAINTAINERS README TODO VERSION diff -r d3e65d761118 devel/pymacs/Makefile --- a/devel/pymacs/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/pymacs/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -25,6 +25,12 @@ EMACS_PORT_NAME=xemacs21 EMACS_PORT_NAME=xemacs21 .endif +post-patch: +.for f in __init__.py pymacs.py + ${REINPLACE_CMD} -e 's,# Copyright,# coding:latin1 Copyright,g' \ + ${WRKSRC}/Pymacs/$f +.endfor + # Install the emacs side of things post-install: ${INSTALL_SCRIPT} ${WRKSRC}/pymacs.el ${PREFIX}/${EMACS_SITE_LISPDIR} diff -r d3e65d761118 devel/pyrex/Makefile --- a/devel/pyrex/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/pyrex/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -17,6 +17,7 @@ COMMENT= Programming Language for writin USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= Pyrex post-install: @# precompile lexicon pickle diff -r d3e65d761118 devel/scons/Makefile --- a/devel/scons/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/scons/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -18,6 +18,7 @@ MAN1= scons.1 sconsign.1 scons-time.1 USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_EGGINFODIR= ${PREFIX}/lib/scons-${PORTVERSION} PLIST_SUB= SCONS_VER=${PORTVERSION} diff -r d3e65d761118 devel/tpg/Makefile --- a/devel/tpg/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/devel/tpg/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -16,6 +16,7 @@ COMMENT= Parser generator in Python USE_PYTHON= 2.2+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= TPG NO_BUILD= yes diff -r d3e65d761118 dns/py-adns/Makefile --- a/dns/py-adns/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/dns/py-adns/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -19,6 +19,7 @@ LIB_DEPENDS= adns.1:${PORTSDIR}/dns/adns USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= adns-python PLIST_SUB+= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S/^${LOCALBASE}\///g} post-patch: diff -r d3e65d761118 dns/py-dns/Makefile --- a/dns/py-dns/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/dns/py-dns/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -20,6 +20,7 @@ COMMENT= DNS (Domain Name Service) libra USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= pydns DOCS= README.txt README-guido.txt DOCSDIR= ${PREFIX}/share/doc/py-dns diff -r d3e65d761118 dns/py-twistedNames/Makefile --- a/dns/py-twistedNames/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/dns/py-twistedNames/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -21,5 +21,6 @@ USE_BZIP2= yes USE_BZIP2= yes USE_PYTHON= 2.3+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Twisted_Names .include diff -r d3e65d761118 emulators/dynagen/Makefile --- a/emulators/dynagen/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/emulators/dynagen/Makefile Sun Jul 15 15:40:10 2007 +0900 @@ -18,6 +18,7 @@ RUN_DEPENDS= dynamips:${PORTSDIR}/emulat USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGVERSION= 0.4.4 ALL_TARGET= # empty USE_GCC= 3.4+ USE_DOS2UNIX= yes diff -r d3e65d761118 emulators/xgngeo/Makefile --- a/emulators/xgngeo/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/emulators/xgngeo/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -25,6 +25,7 @@ USE_PYTHON= yes USE_PYTHON= yes USE_GETTEXT= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= XGngeo NO_BUILD= yes .include diff -r d3e65d761118 finance/sabernetdcs-client/Makefile --- a/finance/sabernetdcs-client/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/finance/sabernetdcs-client/Makefile Sun Jul 15 18:55:50 2007 +0900 @@ -21,11 +21,13 @@ RUN_DEPENDS= pygtk-codegen-2.0:${PORTSDI ${PYTHONPREFIX_SITELIBDIR}/gtk-2.0/gobject/__init__.py:${PORTSDIR}/devel/py-gobject \ ${PYTHONPREFIX_SITELIBDIR}/Pyro/__init__.py:${PORTSDIR}/devel/py-ro -USE_PYTHON= 2.4 +USE_PYTHON= 2.4+ USE_PYDISTUTILS= yes USE_BZIP2= yes DOCSDIR= ${TARGETDIR}/share/doc/sndcs DATADIR= ${TARGETDIR}/share/sndcs + +PYDISTUTILS_PKGNAME= sndcs .if defined(NOPORTDOCS) EXTRA_PATCHES= ${FILESDIR}/extra-patch-setup.py diff -r d3e65d761118 finance/tinyerp-server/Makefile --- a/finance/tinyerp-server/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/finance/tinyerp-server/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -31,6 +31,7 @@ WRKSRC= ${WRKDIR}/server USE_PYTHON= 2.4+ USE_PYDISTUTILS=yes +PYDISTUTILS_PKGVERSION= 3.2.0 MAN1= tinyerp-server.1 diff -r d3e65d761118 ftp/py-curl/Makefile --- a/ftp/py-curl/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/ftp/py-curl/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -20,6 +20,7 @@ LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= pycurl USE_OPENSSL= yes DOCSDIR= ${TARGETDIR}/share/doc/py-curl diff -r d3e65d761118 games/adonthell/Makefile --- a/games/adonthell/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/games/adonthell/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -22,7 +22,7 @@ LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/ LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/libvorbis USE_SDL= mixer sdl -USE_PYTHON= yes +USE_PYTHON= -2.4 USE_GETTEXT= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff -r d3e65d761118 games/balazar/Makefile --- a/games/balazar/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/games/balazar/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -34,6 +34,8 @@ USE_SDL= sdl mixer USE_SDL= sdl mixer USE_GETTEXT= yes +PYDISTUTILS_PKGNAME= Balazar + post-patch: @${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/setup.cfg diff -r d3e65d761118 games/balazarbrothers/Makefile --- a/games/balazarbrothers/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/games/balazarbrothers/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -31,6 +31,7 @@ USE_GL= yes USE_GL= yes USE_GMAKE= yes +PYDISTUTILS_PKGNAME= BalazarBrothers DATADIR= share/balazar_brothers OPTIONS= OPENAL "Use openal sound system" on \ diff -r d3e65d761118 games/bubbros/files/patch-bubbob-statesaver.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/games/bubbros/files/patch-bubbob-statesaver.c Sun Jul 15 18:02:25 2007 +0900 @@ -0,0 +1,28 @@ +--- bubbob/statesaver.c.orig Sun Jul 15 08:59:52 2007 ++++ bubbob/statesaver.c Sun Jul 15 09:01:41 2007 +@@ -44,10 +44,12 @@ + Py_INCREF(g); /* exhausted -- can return 'g' itself */ + return g; + } ++#if PY_VERSION_HEX < 0x02050000 + if (f->f_nfreevars || f->f_ncells) { + PyErr_SetString(PyExc_ValueError, "generator has cell or free vars"); + return NULL; + } ++#endif + + dummy = (PyObject**) malloc(co->co_argcount * sizeof(PyObject*)); + if (dummy == NULL) +@@ -95,10 +97,12 @@ + return -1; + } + f2 = (PyFrameObject*) x; ++#if PY_VERSION_HEX < 0x02050000 + if (f2->f_stacksize != f->f_stacksize) { + PyErr_SetString(PyExc_TypeError, "stack size mismatch"); + return -1; + } ++#endif + + if (f2->f_stacktop != NULL) + while (f2->f_stacktop != f2->f_localsplus) diff -r d3e65d761118 games/gnomesudoku/Makefile --- a/games/gnomesudoku/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/games/gnomesudoku/Makefile Sun Jul 15 15:33:20 2007 +0900 @@ -31,6 +31,8 @@ USE_PYTHON= 2.4+ USE_PYTHON= 2.4+ USE_PYDISTUTILS=yes USE_GNOME= gnomehack gnomeprefix pygnome2 pygnomedesktop + +PYDISTUTILS_PKGNAME= gnome-sudoku .if !defined(DISPLAY) pre-configure: diff -r d3e65d761118 games/slune/Makefile --- a/games/slune/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/games/slune/Makefile Sun Jul 15 15:33:23 2007 +0900 @@ -30,6 +30,8 @@ USE_GL= yes USE_GL= yes USE_SDL= sdl mixer +PYDISTUTILS_PKGNAME= Slune + post-patch: @${REINPLACE_CMD} -i "" -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/setup.cfg diff -r d3e65d761118 graphics/crystalentitylayer-devel/Makefile --- a/graphics/crystalentitylayer-devel/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/graphics/crystalentitylayer-devel/Makefile Sun Jul 15 15:33:23 2007 +0900 @@ -50,7 +50,7 @@ CONFIGURE_ARGS+= --enable-debug=no .endif .if!defined(WITHOUT_PYTHON) -USE_PYTHON= yes +USE_PYTHON= -2.4 .include <${PORTSDIR}/Mk/bsd.python.mk> .else CONFIGURE_ARGS+= --without-python diff -r d3e65d761118 graphics/crystalentitylayer/Makefile --- a/graphics/crystalentitylayer/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/graphics/crystalentitylayer/Makefile Sun Jul 15 15:33:23 2007 +0900 @@ -52,7 +52,7 @@ CONFIGURE_ARGS+= --enable-debug=yes .endif .if!defined(WITHOUT_PYTHON) -USE_PYTHON= yes +USE_PYTHON= -2.4 .include <${PORTSDIR}/Mk/bsd.python.mk> .else CONFIGURE_ARGS+= --without-python diff -r d3e65d761118 graphics/driconf/Makefile --- a/graphics/driconf/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/graphics/driconf/Makefile Sun Jul 15 15:33:23 2007 +0900 @@ -19,6 +19,8 @@ USE_PYTHON= yes USE_PYTHON= yes NO_BUILD= yes USE_GETTEXT= yes +INSTALLS_EGGINFO= yes +PYDISTUTILS_EGGINFODIR= lib/driconf pre-patch: @${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} \ diff -r d3e65d761118 graphics/gnofract4d/Makefile --- a/graphics/gnofract4d/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/graphics/gnofract4d/Makefile Sun Jul 15 17:21:12 2007 +0900 @@ -22,6 +22,8 @@ USE_GCC= 3.4+ USE_GCC= 3.4+ PORTDOCS= * +INSTALLS_EGGINFO= yes +PYDISTUTILS_EGGINFODIR= ${PREFIX}/lib/gnofract4d .include diff -r d3e65d761118 graphics/mirage/Makefile --- a/graphics/mirage/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/graphics/mirage/Makefile Sun Jul 15 15:33:23 2007 +0900 @@ -20,4 +20,6 @@ USE_PYDISTUTILS=yes USE_PYDISTUTILS=yes USE_GETTEXT= yes +PYDISTUTILS_PKGNAME= Mirage + .include diff -r d3e65d761118 graphics/py-amanith/Makefile --- a/graphics/py-amanith/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/graphics/py-amanith/Makefile Sun Jul 15 15:33:23 2007 +0900 @@ -23,6 +23,7 @@ BUILD_DEPENDS= swig:${PORTSDIR}/devel/sw USE_PYTHON= 2.4+ USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= PyAmanith post-patch: ${REINPLACE_CMD} -i "" -e 's|^swig-cpp.*|swig-opts = -c++|g' ${WRKSRC}/setup.cfg diff -r d3e65d761118 graphics/py-cgkit/Makefile --- a/graphics/py-cgkit/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/graphics/py-cgkit/Makefile Sun Jul 15 15:33:23 2007 +0900 @@ -24,6 +24,7 @@ USE_XLIB= yes USE_XLIB= yes USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGVERSION= 2.0.0alpha7 .if defined(INSTALL_CGKIT_LIGHT) PLIST_SUB+= CGKIT_LIGHT="@comment " diff -r d3e65d761118 graphics/py-chart/Makefile --- a/graphics/py-chart/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/graphics/py-chart/Makefile Sun Jul 15 15:33:23 2007 +0900 @@ -21,6 +21,7 @@ USE_GHOSTSCRIPT_RUN= yes USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= PyChart pre-everything:: .if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes diff -r d3e65d761118 graphics/py-editobj/Makefile --- a/graphics/py-editobj/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/graphics/py-editobj/Makefile Sun Jul 15 15:33:23 2007 +0900 @@ -18,6 +18,7 @@ DIST_SUBDIR= python DIST_SUBDIR= python USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= EditObj WRKSRC= ${WRKDIR}/EditObj-${PORTVERSION} EXAMPLESDIR= ${PREFIX}/share/examples/py-editobj diff -r d3e65d761118 graphics/py-freeimagepy/Makefile --- a/graphics/py-freeimagepy/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/graphics/py-freeimagepy/Makefile Sun Jul 15 15:33:23 2007 +0900 @@ -22,5 +22,7 @@ USE_BZIP2= yes USE_BZIP2= yes USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= FreeImagePy +PYDISTUTILS_PKGVERSION= 1.0.0 .include diff -r d3e65d761118 graphics/py-gd/Makefile --- a/graphics/py-gd/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/graphics/py-gd/Makefile Sun Jul 15 15:33:23 2007 +0900 @@ -23,6 +23,7 @@ USE_PYTHON= yes USE_PYTHON= yes USE_PYDISTUTILS= yes USE_PYTHON_PREFIX= yes +PYDISTUTILS_PKGNAME= gdmodule DISABLE_SIZE= yes PYSETUP= Setup.py EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME} diff -r d3e65d761118 graphics/py-gdchart2/Makefile --- a/graphics/py-gdchart2/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/graphics/py-gdchart2/Makefile Sun Jul 15 15:33:23 2007 +0900 @@ -24,6 +24,8 @@ LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME} USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= pygdchart +PYDISTUTILS_PKGVERSION= 2.0.Beta post-patch: ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/setup.py diff -r d3e65d761118 graphics/py-graphviz/Makefile --- a/graphics/py-graphviz/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/graphics/py-graphviz/Makefile Sun Jul 15 15:33:23 2007 +0900 @@ -20,6 +20,7 @@ RUN_DEPENDS= dot:${PORTSDIR}/graphics/gr USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= pygraphviz PLIST_SUB= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S,^${LOCALBASE}/,,g} post-patch: diff -r d3e65d761118 graphics/py-imaging/Makefile --- a/graphics/py-imaging/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/graphics/py-imaging/Makefile Sun Jul 15 15:33:23 2007 +0900 @@ -25,6 +25,8 @@ DIST_SUBDIR= python DIST_SUBDIR= python USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= PIL +PYDISTUTILS_EGGINFODIR= ${PYTHON_SITELIBDIR}/PIL PORTDOCS= * diff -r d3e65d761118 graphics/py-ming/Makefile --- a/graphics/py-ming/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/graphics/py-ming/Makefile Sun Jul 15 15:33:23 2007 +0900 @@ -23,6 +23,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVER USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= mingc +PYDISTUTILS_PKGVERSION= 0.0.3a post-patch: @${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|g' ${WRKSRC}/setup.py diff -r d3e65d761118 graphics/py-opengl/Makefile --- a/graphics/py-opengl/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/graphics/py-opengl/Makefile Sun Jul 15 15:33:23 2007 +0900 @@ -30,6 +30,7 @@ USE_GL= yes USE_GL= yes USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= PyOpenGL .include diff -r d3e65d761118 graphics/py-soya3d/Makefile --- a/graphics/py-soya3d/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/graphics/py-soya3d/Makefile Sun Jul 15 15:33:23 2007 +0900 @@ -35,6 +35,8 @@ USE_GL= yes USE_GL= yes USE_GMAKE= yes USE_XLIB= yes + +PYDISTUTILS_PKGNAME= Soya MANDIR= ${WRKDIR}/${DISTNAME}/manpage/man1 MAN1= soya_editor.1 diff -r d3e65d761118 irc/py-irclib/Makefile --- a/irc/py-irclib/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/irc/py-irclib/Makefile Sun Jul 15 15:33:23 2007 +0900 @@ -18,6 +18,7 @@ COMMENT= IRC protocol client library for USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= python-irclib EXAMPLEFILES= irccat irccat2 servermap testbot.py \ dccreceive dccsend diff -r d3e65d761118 irc/py-supybot/Makefile --- a/irc/py-supybot/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/irc/py-supybot/Makefile Sun Jul 15 15:33:23 2007 +0900 @@ -19,6 +19,7 @@ USE_BZIP2= yes USE_BZIP2= yes USE_PYTHON= 2.3+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGVERSION= 0.83.1+darcs DOCS= ACKS ChangeLog INSTALL LICENSE README RELNOTES diff -r d3e65d761118 japanese/kana-no-quiz/Makefile --- a/japanese/kana-no-quiz/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/japanese/kana-no-quiz/Makefile Sun Jul 15 18:12:47 2007 +0900 @@ -25,8 +25,10 @@ RM_OPTS= -f USE_BZIP2= yes USE_GETTEXT= yes -USE_PYTHON= 2.4 +USE_PYTHON= 2.4+ USE_PYDISTUTILS=yes + +PYDISTUTILS_PKGNAME= Kana_no_quiz WRKSRC= "${WRKDIR}/Kana no quiz-${DISTVERSION}" diff -r d3e65d761118 japanese/pycodec/Makefile --- a/japanese/pycodec/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/japanese/pycodec/Makefile Sun Jul 15 15:33:23 2007 +0900 @@ -17,6 +17,7 @@ COMMENT= Python Unicode codecs for Japan USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= JapaneseCodecs DOCSDIR= ${PREFIX}/share/doc/ja-pycodec post-patch: diff -r d3e65d761118 japanese/trac/Makefile --- a/japanese/trac/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/japanese/trac/Makefile Sun Jul 15 15:33:23 2007 +0900 @@ -29,6 +29,8 @@ USE_ZIP= yes USE_ZIP= yes USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= trac +PYDISTUTILS_PKGVERSION= 0.10.3.1 MAN1= trac-admin.1 tracd.1 diff -r d3e65d761118 lang/f2py/Makefile --- a/lang/f2py/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/lang/f2py/Makefile Sun Jul 15 15:33:24 2007 +0900 @@ -25,6 +25,8 @@ EXPIRATION_DATE= 2007-04-01 USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= F2PY +PYDISTUTILS_PKGVERSION= 2.45.241_1926 PLIST_FILES= bin/f2py MAN1= f2py.1 diff -r d3e65d761118 lang/py-mx-base/Makefile --- a/lang/py-mx-base/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/lang/py-mx-base/Makefile Sun Jul 15 15:33:24 2007 +0900 @@ -23,6 +23,8 @@ USE_ZOPE= yes USE_ZOPE= yes .endif +PYDISTUTILS_PKGNAME= egenix-mx-base + DOCDIR= ${PREFIX}/share/doc/py-mx MXHDRDIR= ${PYTHONPREFIX_SITELIBDIR}/mx/stdlib diff -r d3e65d761118 lang/py-prolog/Makefile --- a/lang/py-prolog/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/lang/py-prolog/Makefile Sun Jul 15 15:33:24 2007 +0900 @@ -21,6 +21,7 @@ RUN_DEPENDS= pl:${PORTSDIR}/lang/swi-pl USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= PyProlog .include diff -r d3e65d761118 lang/python-doc-html/distinfo --- a/lang/python-doc-html/distinfo Sun Jul 15 16:12:18 2007 +0000 +++ b/lang/python-doc-html/distinfo Sun Jul 15 15:33:24 2007 +0900 @@ -18,6 +18,7 @@ MD5 (python/html-2.4.3.tar.bz2) = 86edf3 MD5 (python/html-2.4.3.tar.bz2) = 86edf38b83fde1ff44d0725acf90c95c MD5 (python/html-2.4.4.tar.bz2) = 21259033b5663533ed64b4592c6925e2 MD5 (python/html-2.4.tar.bz2) = 10cca09fcdf1b5ad269bc9edb652d76f +MD5 (python/html-2.5.1.tar.bz2) = 74e14b4713a1a43adebdcfe0191c20c8 MD5 (python/html-2.5.tar.bz2) = 3badfa2d460f52b7f9face12abdb2e91 MD5 (python/pdf-a4-2.0.1.tar.bz2) = fec4b5bcc4161bc82d1a4564fe71409a MD5 (python/pdf-a4-2.0.tar.bz2) = f11c5347eed19ffd012fddf1faa9ab22 @@ -38,6 +39,7 @@ MD5 (python/pdf-a4-2.4.3.tar.bz2) = 85f8 MD5 (python/pdf-a4-2.4.3.tar.bz2) = 85f82cb2df6872e4d6ef3652be184b50 MD5 (python/pdf-a4-2.4.4.tar.bz2) = 2b43ac2c9948af26af61c792397bc3fb MD5 (python/pdf-a4-2.4.tar.bz2) = 8f6b0a891dbff04f3b6ab07d9f8f6df6 +MD5 (python/pdf-a4-2.5.1.tar.bz2) = ade64ff41d24983ad2ea837525f5399a MD5 (python/pdf-a4-2.5.tar.bz2) = 9cc4e5a2992fb7be2373c3e03c765536 MD5 (python/pdf-letter-2.0.1.tar.bz2) = c31282a516b5b49b83cb7df3d3f23cb7 MD5 (python/pdf-letter-2.0.tar.bz2) = a0ae00f0e995ad912714ce15ff0ff401 @@ -58,6 +60,7 @@ MD5 (python/pdf-letter-2.4.3.tar.bz2) = MD5 (python/pdf-letter-2.4.3.tar.bz2) = 2f503f360ecd06fde2efdc61b4f1e644 MD5 (python/pdf-letter-2.4.4.tar.bz2) = 80da7a7611b11f4ac059a84d63af3b0e MD5 (python/pdf-letter-2.4.tar.bz2) = 46e9741fa8d42c813d02f2d7c3342c55 +MD5 (python/pdf-letter-2.5.1.tar.bz2) = bb77cbbf217dfe93fcbecd7256be33a3 MD5 (python/pdf-letter-2.5.tar.bz2) = e58eef4dcf9384ef7ee105068f7bc26e MD5 (python/postscript-a4-2.0.1.tar.bz2) = ef7b98c07ed7da1e91f2963c38a03b5c MD5 (python/postscript-a4-2.0.tar.bz2) = f9c6d47319cd2bb87df678e9fa429d72 @@ -78,6 +81,7 @@ MD5 (python/postscript-a4-2.4.3.tar.bz2) MD5 (python/postscript-a4-2.4.3.tar.bz2) = f71f0b6d77778ba57a4d7b8cf918bab0 MD5 (python/postscript-a4-2.4.4.tar.bz2) = 8680d3d6043a0dd3d6683e2fb727c2ab MD5 (python/postscript-a4-2.4.tar.bz2) = 261da37a6faf721846e27e44f3c12f62 +MD5 (python/postscript-a4-2.5.1.tar.bz2) = a3385edf8ca8749959caea9d653bb5e7 MD5 (python/postscript-a4-2.5.tar.bz2) = 831964fa3d53b3afe973995d7fcc05b2 MD5 (python/postscript-letter-2.0.1.tar.bz2) = 13365181bab30ca27c9d7b69c60e0f03 MD5 (python/postscript-letter-2.0.tar.bz2) = 103f3f67b1f4b47aae90fe68bedbd5f7 @@ -98,6 +102,7 @@ MD5 (python/postscript-letter-2.4.3.tar. MD5 (python/postscript-letter-2.4.3.tar.bz2) = ca001fb091019aadb66a25226768c523 MD5 (python/postscript-letter-2.4.4.tar.bz2) = 3daa1afbaff58db82b22b45efc528ccd MD5 (python/postscript-letter-2.4.tar.bz2) = a54ca46c53f0ed8e2f47e94286c7a419 +MD5 (python/postscript-letter-2.5.1.tar.bz2) = c72bd8f549745e75bfdb00b40eb05285 MD5 (python/postscript-letter-2.5.tar.bz2) = 9f5aaba82f37fce8435c2bcc9886e2bf SHA256 (python/html-2.0.1.tar.bz2) = d42308dda686cc3a27f11d93bdb05c400f4754f51c8e9734435a3b600ea0689e SHA256 (python/html-2.0.tar.bz2) = 0462f3ba3cea3867be268232e974e2de3b641a6408045ee7bfe94b790c973e1b @@ -119,7 +124,9 @@ SHA256 (python/html-2.4.3.tar.bz2) = 6fe SHA256 (python/html-2.4.3.tar.bz2) = 6fe6d1c4ee6fed254be260d25f5c44f550d7d634970d33c77dec5a438b1720e9 SHA256 (python/html-2.4.4.tar.bz2) = 6b1a6f1be187b1d0cab69ab7c8c436409468232d376419c978cbb1d019c6f465 SHA256 (python/html-2.4.tar.bz2) = 667d51b683549e708e271573e825d09e6db6a0d4bd97d31ddcad23b52cf1ee36 +SHA256 (python/html-2.5.1.tar.bz2) = 359e820e3af09dc90adddd4b27e18da9664120610cac486681fbb3c8f8240b9c SHA256 (python/html-2.5.tar.bz2) = 52a473258528bec3617da8cfd9188e8b7b2833ade61d705058ee5b0adef64a5b +SHA256 (python/latex-2.5.1.tar.bz2) = 3f54572af0acd81d20cb9c2685592371b5fa5cc084f8202306dcac4134206e9a SHA256 (python/pdf-a4-2.0.1.tar.bz2) = a938337ae963e3b4bfe667380a67dbf50cc4d07701dfcb6fbf33a996f7d79c0e SHA256 (python/pdf-a4-2.0.tar.bz2) = 829f90149931b8f198378f2dc9df2a3e2bcd02f6a8a67a05add9bf1c5f7079a2 SHA256 (python/pdf-a4-2.1.1.tar.bz2) = 598849b9d3be9745b1092f585299fb814bace5bb5da2d841d6deb51b56df5033 @@ -139,6 +146,7 @@ SHA256 (python/pdf-a4-2.4.3.tar.bz2) = b SHA256 (python/pdf-a4-2.4.3.tar.bz2) = b5d1d850ea60d7251d66e47a6918dc2852465a837ebf39588f561c9da9bd5b79 SHA256 (python/pdf-a4-2.4.4.tar.bz2) = d72bddbebc60430ee971d53e922cdf730c221b9aa610d4b52be3c3796fc8dc68 SHA256 (python/pdf-a4-2.4.tar.bz2) = 40d7fb2618d3a88cbe353fd9ce7ce04b30fc76c85da27c0e90b9f2c98f40a044 +SHA256 (python/pdf-a4-2.5.1.tar.bz2) = caddfc8988d837cdd58e519da5f8b0c29263e85554f6108d9fde1677612dcd22 SHA256 (python/pdf-a4-2.5.tar.bz2) = ac591b0d29276de9bf98c4d1240ac57c5ec55bb5e8bbf62b2888343a8eb1b111 SHA256 (python/pdf-letter-2.0.1.tar.bz2) = e29269a80b77fe8b65d759620dba3445bb67597ede477f6e5904062456a4baed SHA256 (python/pdf-letter-2.0.tar.bz2) = 278a6b52c7b970fe54eb47bc5bb2dd56ef86225aa5d0dcdc43c65a335c7e426e @@ -159,6 +167,7 @@ SHA256 (python/pdf-letter-2.4.3.tar.bz2) SHA256 (python/pdf-letter-2.4.3.tar.bz2) = a2aa3cf6334e64e3f025564a824017b7fb2f86344f00db21ea85cc06dafb80bd SHA256 (python/pdf-letter-2.4.4.tar.bz2) = 8ee0df31d5090b2c0a895854ec0700c49cc50f06dd8d3ff5f2151d7da23caada SHA256 (python/pdf-letter-2.4.tar.bz2) = e87c19834c20d8adb0b9ac90810d6c3d405e47bc075241fe17d19790c19de3aa +SHA256 (python/pdf-letter-2.5.1.tar.bz2) = 34cedf5ec3ca21b8e105adad07429e7c6dee49c4c17e7d1466655980b88ee906 SHA256 (python/pdf-letter-2.5.tar.bz2) = d7be3abd1ad5efc62ca0d7ace9165605e6f955b819d33082c73306871f3d8576 SHA256 (python/postscript-a4-2.0.1.tar.bz2) = 9a02e5812d81a9af10f159c463a55c36b2dea77808a5410859a33109dbea7da7 SHA256 (python/postscript-a4-2.0.tar.bz2) = 2d721139e00d745ffc373dbabd99c310d45945a043ccfff9abd38edcbcc7fd34 @@ -179,6 +188,7 @@ SHA256 (python/postscript-a4-2.4.3.tar.b SHA256 (python/postscript-a4-2.4.3.tar.bz2) = 7dd43824ee9e14db1c2ecb5f25ac6c0ad2618b2c8abd677a8f34f39b850b11c7 SHA256 (python/postscript-a4-2.4.4.tar.bz2) = ec1a4c256f733e0b5917bb5c951b042f39781afec5480b76c28f5a5544784b08 SHA256 (python/postscript-a4-2.4.tar.bz2) = 4530dee0c06486d6c13f19dbf05b8d01e7bb47faaf9855c44916d2e9e992e50f +SHA256 (python/postscript-a4-2.5.1.tar.bz2) = b00cad86c2da60c05866a23c60f071988ead370b416211c06d50f66b303a7787 SHA256 (python/postscript-a4-2.5.tar.bz2) = 6654fbce933aa2e47b94c5faf75e69036510a10f0e0fbd35108361a130103ab8 SHA256 (python/postscript-letter-2.0.1.tar.bz2) = 871bc7ed57b6dfb9b2f844fe6150204399dda73ebcafc47df4bbeb75b81fb9be SHA256 (python/postscript-letter-2.0.tar.bz2) = a5d46c151f2a299a208edb13ce362b4dd0f49af7e53beabe01167dcf97914c60 @@ -199,6 +209,7 @@ SHA256 (python/postscript-letter-2.4.3.t SHA256 (python/postscript-letter-2.4.3.tar.bz2) = ed242d9f6e2ceef2e79c10419a1966add922de573240383cd869779f0ecc3ff0 SHA256 (python/postscript-letter-2.4.4.tar.bz2) = 3f93c91d217ac8d90d4873dd0a62c4a88115f81707582424ab4d102b39a87bc7 SHA256 (python/postscript-letter-2.4.tar.bz2) = d9e89330107bb77e29e9e938b71b8f1ec1ac7e73021c1d284a8def95acb5c7f3 +SHA256 (python/postscript-letter-2.5.1.tar.bz2) = 10f4f80dd2f3ca0844f62faa2eaba3aac02690382abbe9996f43b49c6c4e601f SHA256 (python/postscript-letter-2.5.tar.bz2) = c2be9ac9cca88cebb2f48b4cc467f6d46a10997b2ad651c2047bf7cccf2ff656 SIZE (python/html-2.0.1.tar.bz2) = 704567 SIZE (python/html-2.0.tar.bz2) = 699404 @@ -220,7 +231,9 @@ SIZE (python/html-2.4.3.tar.bz2) = 13972 SIZE (python/html-2.4.3.tar.bz2) = 1397233 SIZE (python/html-2.4.4.tar.bz2) = 1398442 SIZE (python/html-2.4.tar.bz2) = 1390125 +SIZE (python/html-2.5.1.tar.bz2) = 1626532 SIZE (python/html-2.5.tar.bz2) = 1562256 +SIZE (python/latex-2.5.1.tar.bz2) = 1379960 SIZE (python/pdf-a4-2.0.1.tar.bz2) = 2297342 SIZE (python/pdf-a4-2.0.tar.bz2) = 2254712 SIZE (python/pdf-a4-2.1.1.tar.bz2) = 3557971 @@ -240,6 +253,7 @@ SIZE (python/pdf-a4-2.4.3.tar.bz2) = 425 SIZE (python/pdf-a4-2.4.3.tar.bz2) = 4258522 SIZE (python/pdf-a4-2.4.4.tar.bz2) = 5345687 SIZE (python/pdf-a4-2.4.tar.bz2) = 4203864 +SIZE (python/pdf-a4-2.5.1.tar.bz2) = 5578884 SIZE (python/pdf-a4-2.5.tar.bz2) = 5520351 SIZE (python/pdf-letter-2.0.1.tar.bz2) = 2182069 SIZE (python/pdf-letter-2.0.tar.bz2) = 2133980 @@ -260,6 +274,7 @@ SIZE (python/pdf-letter-2.4.3.tar.bz2) = SIZE (python/pdf-letter-2.4.3.tar.bz2) = 4279762 SIZE (python/pdf-letter-2.4.4.tar.bz2) = 5368031 SIZE (python/pdf-letter-2.4.tar.bz2) = 4226357 +SIZE (python/pdf-letter-2.5.1.tar.bz2) = 5604432 SIZE (python/pdf-letter-2.5.tar.bz2) = 5547378 SIZE (python/postscript-a4-2.0.1.tar.bz2) = 994104 SIZE (python/postscript-a4-2.0.tar.bz2) = 977851 @@ -280,6 +295,7 @@ SIZE (python/postscript-a4-2.4.3.tar.bz2 SIZE (python/postscript-a4-2.4.3.tar.bz2) = 1716850 SIZE (python/postscript-a4-2.4.4.tar.bz2) = 1699663 SIZE (python/postscript-a4-2.4.tar.bz2) = 1699997 +SIZE (python/postscript-a4-2.5.1.tar.bz2) = 1845800 SIZE (python/postscript-a4-2.5.tar.bz2) = 1816570 SIZE (python/postscript-letter-2.0.1.tar.bz2) = 941017 SIZE (python/postscript-letter-2.0.tar.bz2) = 923261 @@ -300,4 +316,5 @@ SIZE (python/postscript-letter-2.4.3.tar SIZE (python/postscript-letter-2.4.3.tar.bz2) = 1712719 SIZE (python/postscript-letter-2.4.4.tar.bz2) = 1695892 SIZE (python/postscript-letter-2.4.tar.bz2) = 1693474 +SIZE (python/postscript-letter-2.5.1.tar.bz2) = 1839274 SIZE (python/postscript-letter-2.5.tar.bz2) = 1813655 diff -r d3e65d761118 lang/python/Makefile --- a/lang/python/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/lang/python/Makefile Sun Jul 15 15:33:24 2007 +0900 @@ -6,43 +6,44 @@ # PORTNAME= python -PORTVERSION= 2.4.4 -PORTEPOCH= 1 +PORTVERSION= ${PYTHON_VER} +PORTEPOCH= 2 CATEGORIES= lang python ipv6 MASTER_SITES= # empty DISTFILES= # empty EXTRACT_ONLY= # empty MAINTAINER= python@FreeBSD.org -COMMENT= The "meta-port" for the stable version of Python interpreter +COMMENT= The "meta-port" for the default version of Python interpreter USE_PYTHON_RUN= yes -PYTHON_VERSION= python2.4 +PYTHON_VERSION= ${PYTHON_DEFAULT_VERSION} NO_BUILD= yes -do-install: # empty +do-install: + @${DO_NADA} # Major upgrade support PORTUPGRADE?= ${LOCALBASE}/sbin/portupgrade PKG_WHICH?= ${LOCALBASE}/sbin/pkg_which upgrade-site-packages: - @if [ -x ${PORTUPGRADE} ]; then \ - for ver in 2.1 2.2 2.3 2.5; do \ - if [ -d ${PREFIX}/lib/python$$ver ]; then \ - UPD=`${FIND} ${PREFIX}/lib/python$$ver \ - -type f -print0 | \ - ${XARGS} -0 ${PKG_WHICH} | \ - ${GREP} -Fv '?' | \ - ${EGREP} -v '^python2?[0-5]?-2' | \ - ${SORT} -u`; \ - if [ "$$UPD" ]; then \ - ${PORTUPGRADE} -f $$UPD; \ - fi; \ - fi; \ - done; \ - else \ + @if [ ! -x ${PORTUPGRADE} ]; then \ ${ECHO_MSG} "Please install ports-mgmt/portupgrade."; \ ${FALSE}; \ fi + @for ver in `echo ${_PYTHON_ALLBRANCHES}|${SED} 's/${PYTHON_VER}//'`; do \ + if [ -d ${PREFIX}/lib/python$$ver ]; then \ + UPD=`${FIND} ${PREFIX}/lib/python$$ver \ + -type f -print0 | \ + ${XARGS} -0 ${PKG_WHICH} | \ + ${GREP} -Fv '?' | \ + ${EGREP} -v '^python2?[0-5]?-2' | \ + ${SORT} -u`; \ + if [ "$$UPD" ]; then \ + ${PORTUPGRADE} -f $$UPD; \ + fi; \ + fi; \ + done \ + .include diff -r d3e65d761118 lang/python/distinfo --- a/lang/python/distinfo Sun Jul 15 16:12:18 2007 +0000 +++ b/lang/python/distinfo Sun Jul 15 15:33:24 2007 +0900 @@ -17,6 +17,7 @@ MD5 (python/Python-2.4.3.tgz) = edf99447 MD5 (python/Python-2.4.3.tgz) = edf994473a8c1a963aaa71e442b285b7 MD5 (python/Python-2.4.4.tgz) = 82d000617baaef269ad5795c595fdc58 MD5 (python/Python-2.4.tgz) = 149ad508f936eccf669d52682cf8e606 +MD5 (python/Python-2.5.1.tgz) = cca695828df8adc3e69b637af07522e1 MD5 (python/Python-2.5.tgz) = bc1b74f90a472a6c0a85481aaeb43f95 SHA256 (python/Python-2.1.1.tgz) = 6a5455b2ab72642feffc060a04e8ea543de2d0671a3f9c335b52f2e1e41edc5f SHA256 (python/Python-2.1.2.tgz) = 389c7badc61f9bdc50788b54dd3ffeaa4b559baf6a4de1425bf90b9c6b4ac66e @@ -37,6 +38,7 @@ SHA256 (python/Python-2.4.3.tgz) = 985a4 SHA256 (python/Python-2.4.3.tgz) = 985a413932f5e31e6280b37da6b285a3a0b2748c6786643989ed9b23de97e2d5 SHA256 (python/Python-2.4.4.tgz) = 92be6e20cbc3111d9dd0c016d72ef7914c23b879dc52df7ba28df97afbf12e2e SHA256 (python/Python-2.4.tgz) = ff746de0fae8691c082414b42a2bb172da8797e6e8ff66c9a39d2e452f7034e9 +SHA256 (python/Python-2.5.1.tgz) = 1f5caee846049ca30d996f9403eefdb996295c4af664867e35dcc5eb36e4e7e8 SHA256 (python/Python-2.5.tgz) = d7bbf42e36003c6065cd19f3e67d283521858515ee923220f654131cebe1d8f2 SIZE (python/Python-2.1.1.tgz) = 6187808 SIZE (python/Python-2.1.2.tgz) = 6189889 @@ -57,4 +59,5 @@ SIZE (python/Python-2.4.3.tgz) = 9348239 SIZE (python/Python-2.4.3.tgz) = 9348239 SIZE (python/Python-2.4.4.tgz) = 9531474 SIZE (python/Python-2.4.tgz) = 9198035 +SIZE (python/Python-2.5.1.tgz) = 11060830 SIZE (python/Python-2.5.tgz) = 11019675 diff -r d3e65d761118 lang/python23/Makefile --- a/lang/python23/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/lang/python23/Makefile Sun Jul 15 15:33:24 2007 +0900 @@ -7,7 +7,7 @@ PORTNAME= python23 PORTVERSION= 2.3.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -16,7 +16,6 @@ MAINTAINER= python@FreeBSD.org MAINTAINER= python@FreeBSD.org COMMENT?= An interpreted object-oriented programming language -CONFLICTS= stackless_python-* DIST_SUBDIR= python WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes @@ -38,6 +37,9 @@ DEMODIR= ${PREFIX}/share/examples/${PYTH DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION} TOOLSDIR= ${PREFIX}/share/${PYTHON_VERSION} +BIN_SCRIPTS= idle pydoc python python-shared +BINLINKS_SUB= -e 's,(idle|pydoc|python-shared|python),\1${PYTHON_VER},' + OPTIONS= THREADS "Enable thread support" on \ HUGE_STACK_SIZE "Use a larger thread stack" off \ UCS4 "Use UCS4 for unicode support" on \ @@ -45,6 +47,13 @@ OPTIONS= THREADS "Enable thread support" IPV6 "Enable IPv6 support" on .include + +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} +MLINKS= ${PYTHON_VERSION}.1 python.1 +PLIST_SUB+= IF_DEFAULT="" +.else +PLIST_SUB+= IF_DEFAULT="@comment " +.endif .if !defined(WITHOUT_THREADS) CONFIGURE_ARGS+= --with-threads @@ -171,6 +180,13 @@ post-install: ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.3 ${WRKDIR}/idle2.3 \ ${PREFIX}/bin +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} + for f in ${BIN_SCRIPTS}; do \ + TARGET=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB}`; \ + cd ${PREFIX}/bin && ${LN} -f $$TARGET $$f; \ + done +.endif + .if !defined(NOPORTDOCS) @${MKDIR} ${TOOLSDIR} @cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \ diff -r d3e65d761118 lang/python23/pkg-plist --- a/lang/python23/pkg-plist Sun Jul 15 16:12:18 2007 +0000 +++ b/lang/python23/pkg-plist Sun Jul 15 15:33:24 2007 +0900 @@ -1,6 +1,10 @@ bin/idle%%PYVER%% +%%IF_DEFAULT%%bin/idle bin/idle%%PYVER%% +%%IF_DEFAULT%%bin/pydoc bin/pydoc%%PYVER%% +%%IF_DEFAULT%%bin/python bin/python%%PYVER%% +%%IF_DEFAULT%%bin/python-shared bin/python-shared%%PYVER%% include/%%PYTHON_VERSION%%/Python.h include/%%PYTHON_VERSION%%/abstract.h diff -r d3e65d761118 lang/python24/Makefile --- a/lang/python24/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/lang/python24/Makefile Sun Jul 15 15:33:24 2007 +0900 @@ -7,12 +7,13 @@ PORTNAME= python24 PORTVERSION= 2.4.4 +PORTREVISION= 1 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} DISTFILES= ${PYTHON_DISTFILE} -MAINTAINER= perky@FreeBSD.org +MAINTAINER= python@FreeBSD.org COMMENT?= An interpreted object-oriented programming language DIST_SUBDIR= python @@ -22,8 +23,8 @@ CONFIGURE_ENV= OPT="${CFLAGS}" CONFIGURE_ENV= OPT="${CFLAGS}" MAKE_ENV= VPATH="${WRKSRC}" USE_LDCONFIG= yes -INSTALL_TARGET= install -MAN1= python.1 ${PYTHON_VERSION}.1 +INSTALL_TARGET= altinstall +MAN1= ${PYTHON_VERSION}.1 USE_PYTHON= yes PYTHON_VERSION= python2.4 @@ -35,11 +36,9 @@ DEMODIR= ${PREFIX}/share/examples/${PYTH DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION} TOOLSDIR= ${PREFIX}/share/${PYTHON_VERSION} -.if !exists(/usr/bin/ypcat) # the world with NO_NIS -PLISTCAT= ${GREP} -v 'nis.so$$' ${PKGDIR}/pkg-plist -.else -PLISTCAT= ${CAT} ${PKGDIR}/pkg-plist -.endif +BIN_SCRIPTS= idle pydoc python python-shared smtpd.py +BINLINKS_SUB= -e 's,smtpd,smtpd${PYTHON_VER},' \ + -e 's,(idle|pydoc|python-shared|python),\1${PYTHON_VER},' OPTIONS= THREADS "Enable thread support" on \ HUGE_STACK_SIZE "Use a larger thread stack" off \ @@ -50,6 +49,13 @@ OPTIONS= THREADS "Enable thread support" .include +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} +MLINKS= ${PYTHON_VERSION}.1 python.1 +PLIST_SUB+= IF_DEFAULT="" +.else +PLIST_SUB+= IF_DEFAULT="@comment " +.endif + # workaround for a bug in base curses.h. CFLAGS+= -D__wchar_t=wchar_t @@ -89,6 +95,12 @@ PLIST_SUB+= 32BIT_ONLY="" .endif .if ${ARCH} == sparc64 CFLAGS+= -DPYTHON_DEFAULT_RECURSION_LIMIT=900 +.endif + +.if !exists(/usr/bin/ypcat) # the world with NO_NIS +PLIST_SUB+= NO_NIS="@comment " +.else +PLIST_SUB+= NO_NIS="" .endif .if !defined(WITHOUT_IPV6) && ${OSVERSION} >= 400014 @@ -166,9 +178,9 @@ pre-su-install: .endfor pre-install: - ${PLISTCAT} | ${AWK} '{ print $$0; } \ - /LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }' \ - > ${PLIST} + ${AWK} '{ print $$0; } \ + /LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }' \ + ${PKGDIR}/pkg-plist > ${PLIST} post-install: @# shared version of executable and library @@ -180,8 +192,6 @@ post-install: ${INSTALL_PROGRAM} \ ${SHARED_WRKSRC}/${PYTHON_VERSION:S/thon/thon-shared/} \ ${PREFIX}/bin - cd ${PREFIX}/bin; \ - ${LN} -f ${PYTHON_VERSION:S/thon/thon-shared/} python-shared @# additional files installing by ports @${MKDIR} ${MANPREFIX}/man/man1 @@ -189,6 +199,13 @@ post-install: ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.4 ${WRKDIR}/idle2.4 \ ${WRKDIR}/smtpd2.4.py ${PREFIX}/bin + +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} + for f in ${BIN_SCRIPTS}; do \ + TARGET=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB}`; \ + cd ${PREFIX}/bin && ${LN} -f $$TARGET $$f; \ + done +.endif .if !defined(NOPORTDOCS) @${MKDIR} ${TOOLSDIR} diff -r d3e65d761118 lang/python24/files/patch-setup.py --- a/lang/python24/files/patch-setup.py Sun Jul 15 16:12:18 2007 +0000 +++ b/lang/python24/files/patch-setup.py Sun Jul 15 15:33:24 2007 +0900 @@ -1,5 +1,5 @@ ---- setup.py.orig Tue Feb 27 20:10:53 2007 -+++ setup.py Tue Feb 27 20:15:23 2007 +--- setup.py.orig Fri Mar 30 04:28:05 2007 ++++ setup.py Fri Mar 30 04:30:54 2007 @@ -15,7 +15,7 @@ from distutils.command.install_lib import install_lib @@ -52,3 +52,13 @@ libraries = [panel_library] + curses_libs) ) +@@ -1225,8 +1227,7 @@ + ext_modules=[Extension('struct', ['structmodule.c'])], + + # Scripts to install +- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle', +- 'Lib/smtpd.py'] ++ scripts = [] + ) + + # --install-platlib diff -r d3e65d761118 lang/python24/pkg-plist --- a/lang/python24/pkg-plist Sun Jul 15 16:12:18 2007 +0000 +++ b/lang/python24/pkg-plist Sun Jul 15 15:33:24 2007 +0900 @@ -1,13 +1,13 @@ bin/idle -bin/idle +%%IF_DEFAULT%%bin/idle bin/idle%%PYVER%% -bin/pydoc +%%IF_DEFAULT%%bin/pydoc bin/pydoc%%PYVER%% -bin/python +%%IF_DEFAULT%%bin/python bin/python%%PYVER%% -bin/python-shared +%%IF_DEFAULT%%bin/python-shared bin/python-shared%%PYVER%% +%%IF_DEFAULT%%bin/smtpd.py bin/smtpd%%PYVER%%.py -bin/smtpd.py %%PYTHON_INCLUDEDIR%%/Python.h %%PYTHON_INCLUDEDIR%%/Python-ast.h %%PYTHON_INCLUDEDIR%%/abstract.h @@ -574,7 +574,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/lib-dynload/math.so %%PYTHON_LIBDIR%%/lib-dynload/md5.so %%PYTHON_LIBDIR%%/lib-dynload/mmap.so -%%PYTHON_LIBDIR%%/lib-dynload/nis.so +%%NO_NIS%%%%PYTHON_LIBDIR%%/lib-dynload/nis.so %%PYTHON_LIBDIR%%/lib-dynload/operator.so %%PYTHON_LIBDIR%%/lib-dynload/ossaudiodev.so %%PYTHON_LIBDIR%%/lib-dynload/parser.so diff -r d3e65d761118 lang/python25/Makefile --- a/lang/python25/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/lang/python25/Makefile Sun Jul 15 15:33:24 2007 +0900 @@ -5,8 +5,7 @@ # $FreeBSD$ PORTNAME= python25 -PORTVERSION= 2.5 -PORTREVISION= 1 +PORTVERSION= 2.5.1 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -39,11 +38,10 @@ DEMODIR= ${PREFIX}/share/examples/${PYTH DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION} TOOLSDIR= ${PREFIX}/share/${PYTHON_VERSION} -.if !exists(/usr/bin/ypcat) # the world with NO_NIS -PLIST_EXCLUDE= 'nis.so$$' -.else -PLIST_EXCLUDE= '^$$' # nothing -.endif +BIN_SCRIPTS= idle pydoc python python-shared smtpd.py python-config \ + python-shared-config +BINLINKS_SUB= -e 's,smtpd,smtpd${PYTHON_VER},' \ + -e 's,(idle|pydoc|python-shared|python),\1${PYTHON_VER},' OPTIONS= THREADS "Enable thread support" on \ HUGE_STACK_SIZE "Use a larger thread stack" off \ @@ -54,6 +52,13 @@ OPTIONS= THREADS "Enable thread support" .include +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} +MLINKS= ${PYTHON_VERSION}.1 python.1 +PLIST_SUB+= IF_DEFAULT="" +.else +PLIST_SUB+= IF_DEFAULT="@comment " +.endif + # workaround for a bug in base curses.h. CFLAGS+= -D__wchar_t=wchar_t @@ -93,6 +98,12 @@ PLIST_SUB+= 32BIT_ONLY="" .endif .if ${ARCH} == sparc64 CFLAGS+= -DPYTHON_DEFAULT_RECURSION_LIMIT=900 +.endif + +.if !exists(/usr/bin/ypcat) # the world with NO_NIS +PLIST_SUB+= NO_NIS="@comment " +.else +PLIST_SUB+= NO_NIS="" .endif .if ${OSVERSION} < 400000 @@ -180,8 +191,7 @@ pre-su-install: .endfor pre-install: - ${EGREP} -v ${PLIST_EXCLUDE} ${PLIST_TEMPLATE} | \ - ${AWK} '{ print $$0; } \ + ${CAT} ${PLIST_TEMPLATE} | ${AWK} '{ print $$0; } \ /LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }' > ${PLIST} @# if openssl 0.9.8 is detected, _sha{256,512} module won't be installed @@ -211,6 +221,13 @@ post-install: ${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \ ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} + for f in ${BIN_SCRIPTS}; do \ + TARGET=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB}`; \ + cd ${PREFIX}/bin && ${LN} -f $$TARGET $$f; \ + done +.endif + .if !defined(NOPORTDOCS) @${MKDIR} ${TOOLSDIR} @cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \ diff -r d3e65d761118 lang/python25/distinfo --- a/lang/python25/distinfo Sun Jul 15 16:12:18 2007 +0000 +++ b/lang/python25/distinfo Sun Jul 15 15:33:24 2007 +0900 @@ -1,3 +1,3 @@ MD5 (python/Python-2.5.tgz) = bc1b74f90a -MD5 (python/Python-2.5.tgz) = bc1b74f90a472a6c0a85481aaeb43f95 -SHA256 (python/Python-2.5.tgz) = d7bbf42e36003c6065cd19f3e67d283521858515ee923220f654131cebe1d8f2 -SIZE (python/Python-2.5.tgz) = 11019675 +MD5 (python/Python-2.5.1.tgz) = cca695828df8adc3e69b637af07522e1 +SHA256 (python/Python-2.5.1.tgz) = 1f5caee846049ca30d996f9403eefdb996295c4af664867e35dcc5eb36e4e7e8 +SIZE (python/Python-2.5.1.tgz) = 11060830 diff -r d3e65d761118 lang/python25/pkg-plist --- a/lang/python25/pkg-plist Sun Jul 15 16:12:18 2007 +0000 +++ b/lang/python25/pkg-plist Sun Jul 15 15:33:24 2007 +0900 @@ -1,9 +1,16 @@ bin/idle%%PYVER%% +%%IF_DEFAULT%%bin/idle bin/idle%%PYVER%% +%%IF_DEFAULT%%bin/pydoc bin/pydoc%%PYVER%% +%%IF_DEFAULT%%bin/python bin/python%%PYVER%% +%%IF_DEFAULT%%bin/python-config bin/python%%PYVER%%-config +%%IF_DEFAULT%%bin/python-shared bin/python-shared%%PYVER%% +%%IF_DEFAULT%%bin/python-shared-config bin/python-shared%%PYVER%%-config +%%IF_DEFAULT%%bin/smtpd.py bin/smtpd%%PYVER%%.py %%PYTHON_INCLUDEDIR%%/Python-ast.h %%PYTHON_INCLUDEDIR%%/Python.h @@ -670,7 +677,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/lib-dynload/itertools.so %%PYTHON_LIBDIR%%/lib-dynload/math.so %%PYTHON_LIBDIR%%/lib-dynload/mmap.so -%%PYTHON_LIBDIR%%/lib-dynload/nis.so +%%NO_NIS%%%%PYTHON_LIBDIR%%/lib-dynload/nis.so %%PYTHON_LIBDIR%%/lib-dynload/operator.so %%PYTHON_LIBDIR%%/lib-dynload/ossaudiodev.so %%PYTHON_LIBDIR%%/lib-dynload/parser.so @@ -860,6 +867,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/test/exception_hierarchy.txt %%PYTHON_LIBDIR%%/test/fork_wait.py %%PYTHON_LIBDIR%%/test/greyrgb.uue +%%PYTHON_LIBDIR%%/test/infinite_reload.py %%PYTHON_LIBDIR%%/test/inspect_fodder.py %%PYTHON_LIBDIR%%/test/inspect_fodder2.py %%PYTHON_LIBDIR%%/test/list_tests.py @@ -984,6 +992,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/test/test_compile.py %%PYTHON_LIBDIR%%/test/test_compiler.py %%PYTHON_LIBDIR%%/test/test_complex.py +%%PYTHON_LIBDIR%%/test/test_complex_args.py %%PYTHON_LIBDIR%%/test/test_contains.py %%PYTHON_LIBDIR%%/test/test_contextlib.py %%PYTHON_LIBDIR%%/test/test_cookie.py @@ -1183,6 +1192,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/test/test_strop.py %%PYTHON_LIBDIR%%/test/test_strptime.py %%PYTHON_LIBDIR%%/test/test_struct.py +%%PYTHON_LIBDIR%%/test/test_structmembers.py %%PYTHON_LIBDIR%%/test/test_structseq.py %%PYTHON_LIBDIR%%/test/test_subprocess.py %%PYTHON_LIBDIR%%/test/test_sunaudiodev.py diff -r d3e65d761118 mail/gmail-notify/Makefile --- a/mail/gmail-notify/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/mail/gmail-notify/Makefile Sun Jul 15 18:26:45 2007 +0900 @@ -29,10 +29,11 @@ EXTRAS_WRKSRC!= cd ${PORTSDIR}/x11-toolk post-patch: ${SED} -e 's|@DATADIR@|${DATADIR}|' ${FILESDIR}/gmail-notifier > ${WRKSRC}/gmail-notifier + ${SED} -e 's|@PYTHON_INCLUDEDIR@|${PYTHON_INCLUDEDIR}|' ${FILESDIR}/Makefile.in > ${WRKSRC}/Makefile pre-configure: ${CP} ${EXTRAS_WRKSRC}/egg/tray/eggtrayicon.[ch] ${EXTRAS_WRKSRC}/egg/tray/trayicon* ${WRKSRC} - ${CP} ${FILESDIR}/config.h ${FILESDIR}/Makefile ${WRKSRC} + ${CP} ${FILESDIR}/config.h ${WRKSRC} ${RM} ${WRKSRC}/pytrayicon.so do-install: diff -r d3e65d761118 mail/gmail-notify/files/Makefile --- a/mail/gmail-notify/files/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -# $FreeBSD$ -# Makefile to build trayicon.so - -CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -I${LOCALBASE}/include/python2.4/ -I. -Wall -I${LOCALBASE}/share/pygtk/2.0 -I${LOCALBASE}/libdata/pkgconfig -DEGG_COMPILATION -fPIC -LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0` - -DEFS_DIR= ${LOCALBASE}/share/pygtk/2.0/defs/ - -CODEGEN = pygtk-codegen-2.0 - -all: trayicon.so - -trayicon.so: trayicon.o eggtrayicon.o trayiconmodule.o - $(CC) $(LDFLAGS) -shared $^ -o $@ - -trayicon.c: trayicon.defs eggtrayicon.h trayicon.override - $(CODEGEN) --prefix pytrayicon \ - --register $(DEFS_DIR)/gdk-types.defs \ - --register $(DEFS_DIR)/gtk-types.defs \ - --override trayicon.override \ - trayicon.defs > $@ - -clean: - rm -f *.o *.so trayicon.c *~ diff -r d3e65d761118 mail/gmail-notify/files/Makefile.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mail/gmail-notify/files/Makefile.in Sun Jul 15 18:27:00 2007 +0900 @@ -0,0 +1,24 @@ +# $FreeBSD$ +# Makefile to build trayicon.so + +CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -I@PYTHON_INCLUDEDIR@ -I. -Wall -I${LOCALBASE}/share/pygtk/2.0 -I${LOCALBASE}/libdata/pkgconfig -DEGG_COMPILATION -fPIC +LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0` + +DEFS_DIR= ${LOCALBASE}/share/pygtk/2.0/defs/ + +CODEGEN = pygtk-codegen-2.0 + +all: trayicon.so + +trayicon.so: trayicon.o eggtrayicon.o trayiconmodule.o + $(CC) $(LDFLAGS) -shared $^ -o $@ + +trayicon.c: trayicon.defs eggtrayicon.h trayicon.override + $(CODEGEN) --prefix pytrayicon \ + --register $(DEFS_DIR)/gdk-types.defs \ + --register $(DEFS_DIR)/gtk-types.defs \ + --override trayicon.override \ + trayicon.defs > $@ + +clean: + rm -f *.o *.so trayicon.c *~ diff -r d3e65d761118 mail/mailman/Makefile --- a/mail/mailman/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/mail/mailman/Makefile Sun Jul 15 15:33:24 2007 +0900 @@ -161,6 +161,7 @@ pre-install: @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: + @${RM} -f ${MAILMANDIR}/pythonlib/*.egg-info .for dir in cron scripts @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${MAILMANDIR}/${dir} .endfor diff -r d3e65d761118 mail/mixminion/Makefile --- a/mail/mixminion/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/mail/mixminion/Makefile Sun Jul 15 15:33:24 2007 +0900 @@ -15,6 +15,8 @@ COMMENT= A Type III Anonymous Remailer USE_OPENSSL= yes USE_PYTHON= 2.0+ +INSTALLS_EGGINFO= yes +PYDISTUTILS_PKGVERSION= ${DISTVERSION} MAN1= mixminion.1 MAN5= mixminiond.conf.5 mixminionrc.5 diff -r d3e65d761118 mail/py-spf/Makefile --- a/mail/py-spf/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/mail/py-spf/Makefile Sun Jul 15 15:33:24 2007 +0900 @@ -20,6 +20,7 @@ DIST_SUBDIR= python DIST_SUBDIR= python USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= pyspf DOCSDIR?= ${PREFIX}/share/doc/py-${PORTNAME} diff -r d3e65d761118 mail/py-turbomail/Makefile --- a/mail/py-turbomail/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/mail/py-turbomail/Makefile Sun Jul 15 15:33:24 2007 +0900 @@ -29,6 +29,8 @@ SUB_LIST= PYTHON_SITELIBDIR=${PYTHON_SIT USE_PYTHON= 2.4+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= TurboMail +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's EASY_INSTALL_CMD?= easy_install-${PYTHON_VER} PYTURBOMAIL_EGG= TurboMail-${PORTVERSION}-py${PYTHON_VER}.egg diff -r d3e65d761118 mail/py-twistedMail/Makefile --- a/mail/py-twistedMail/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/mail/py-twistedMail/Makefile Sun Jul 15 15:33:24 2007 +0900 @@ -22,5 +22,6 @@ USE_BZIP2= yes USE_BZIP2= yes USE_PYTHON= 2.3+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Twisted_Mail .include diff -r d3e65d761118 math/biggles/Makefile --- a/math/biggles/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/math/biggles/Makefile Sun Jul 15 15:33:24 2007 +0900 @@ -22,6 +22,7 @@ LIB_DEPENDS= plot:${PORTSDIR}/graphics/p USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= python2-biggles USE_LDCONFIG= yes post-patch: diff -r d3e65d761118 math/gracetmpl/Makefile --- a/math/gracetmpl/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/math/gracetmpl/Makefile Sun Jul 15 15:33:24 2007 +0900 @@ -34,6 +34,10 @@ ALL_TARGET= all pythonwrap ALL_TARGET= all pythonwrap INSTALL_TARGET= install pythonwrap_install +INSTALLS_EGGINFO= yes +PYDISTUTILS_PKGNAME= graceTMPL +PYDISTUTILS_EGGINFODIR= ${PYTHON_SITELIBDIR}/graceTMPL + post-extract: @${ECHO_CMD} -n > ${WRKSRC}/Makefile.defs diff -r d3e65d761118 math/py-bitvector/Makefile --- a/math/py-bitvector/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/math/py-bitvector/Makefile Sun Jul 15 15:33:24 2007 +0900 @@ -18,6 +18,7 @@ COMMENT= A pure-Python memory-efficient USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= BitVector PLIST_FILES= %%PYTHON_SITELIBDIR%%/BitVector.py \ %%PYTHON_SITELIBDIR%%/BitVector.pyc \ diff -r d3e65d761118 math/py-gato/Makefile --- a/math/py-gato/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/math/py-gato/Makefile Sun Jul 15 15:33:24 2007 +0900 @@ -24,6 +24,9 @@ GATO_DIR= ${PREFIX}/lib/${PYTHON_VERSION GATO_DIR= ${PREFIX}/lib/${PYTHON_VERSION}/site-packages/Gato EXAMPLESDIR= ${PREFIX}/share/examples/${PORTNAME} +post-patch: + @ ${REINPLACE_CMD} -e 's,^.*__future__.*$$,,' ${WRKSRC}/DataStructures.py + pre-build: @ ${TOUCH} ${WRKSRC}/__init__.py diff -r d3e65d761118 math/py-gnuplot/Makefile --- a/math/py-gnuplot/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/math/py-gnuplot/Makefile Sun Jul 15 15:33:24 2007 +0900 @@ -22,6 +22,7 @@ RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gn USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= gnuplot-py post-install: .if !defined(NOPORTDOCS) diff -r d3e65d761118 math/py-gsl/Makefile --- a/math/py-gsl/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/math/py-gsl/Makefile Sun Jul 15 15:33:24 2007 +0900 @@ -25,5 +25,6 @@ PLIST_SUB= PYTHON_SITELIBDIR=${PYTHON_SI PLIST_SUB= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S,^${LOCALBASE}/,,g} USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= pygsl .include diff -r d3e65d761118 math/py-mpz/Makefile --- a/math/py-mpz/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/math/py-mpz/Makefile Sun Jul 15 15:33:24 2007 +0900 @@ -24,6 +24,7 @@ DIST_SUBDIR= python DIST_SUBDIR= python USE_PYTHON= -2.3 USE_PYDISTUTILS=yes +PYDISTUTILS_PKGVERSION= 0.0.0 WRKSRC= ${PYTHON_WRKSRC}/Modules MD5_FILE= ${PORTSDIR}/lang/python/distinfo diff -r d3e65d761118 math/py-numeric/Makefile --- a/math/py-numeric/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/math/py-numeric/Makefile Sun Jul 15 21:02:07 2007 +0900 @@ -21,6 +21,8 @@ COMMENT= The Numeric Extension to Python USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= Numeric +PYDISTUTILS_EGGINFODIR= ${PYTHONPREFIX_SITELIBDIR}/Numeric WRKSRC= ${WRKDIR}/Numeric-${PORTVERSION} diff -r d3e65d761118 math/py-numeric17/Makefile --- a/math/py-numeric17/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/math/py-numeric17/Makefile Sun Jul 15 21:04:49 2007 +0900 @@ -18,6 +18,12 @@ COMMENT= The Numeric Extension to Python USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_EGGINFO= Numeric/Numeric-0.0.0-py${PYTHON_VER}.egg-info \ + Numeric/Numeric-${PORTVERSION}-py${PYTHON_VER}.egg-info \ + RNG-3.0-py${PYTHON_VER}.egg-info \ + MA-4.1.0-py${PYTHON_VER}.egg-info \ + FFTPACK-1.0-py${PYTHON_VER}.egg-info + PYSETUP= setup_all.py NO_LATEST_LINK= yes diff -r d3e65d761118 math/py-probstat/Makefile --- a/math/py-probstat/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/math/py-probstat/Makefile Sun Jul 15 15:33:24 2007 +0900 @@ -22,5 +22,6 @@ PLIST_SUB= PYTHON_SITELIBDIR=${PYTHON_SI PLIST_SUB= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S,^${LOCALBASE}/,,g} USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGVERSION= 0.9 .include diff -r d3e65d761118 math/py-scientific/Makefile --- a/math/py-scientific/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/math/py-scientific/Makefile Sun Jul 15 15:33:24 2007 +0900 @@ -22,6 +22,7 @@ RUN_DEPENDS= ${PYNUMERIC} USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= ScientificPython DOCDIR= ${PREFIX}/share/doc/py-scientific EXAMPLEDIR= ${PREFIX}/share/examples/py-scientific diff -r d3e65d761118 math/vtk-python/Makefile --- a/math/vtk-python/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/math/vtk-python/Makefile Mon Jul 16 01:21:11 2007 +0900 @@ -39,6 +39,7 @@ CMAKE_DEFS= -DVTK_WRAP_PYTHON:BOOL=ON \ -DEXPAT_INCLUDE_DIR:PATH=${LOCALBASE}/include \ -DCMAKE_BACKWARDS_COMPATIBILITY:STRING=2.2 +EXTRA_PATCHES+= ${.CURDIR}/files/extra-patch-Common-vtkPythonUtil.cxx PLIST_SUB+= VTK_PTH_LOCATION_DIR=${PYTHON_SITELIBDIR} .include "${MASTERDIR}/Makefile" diff -r d3e65d761118 misc/py-osd/Makefile --- a/misc/py-osd/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/misc/py-osd/Makefile Sun Jul 15 15:33:24 2007 +0900 @@ -22,6 +22,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/twistd:${P USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= pyosd PORTDOCS= AUTHORS ChangeLog ChangeLog.old README README.daemon pyosd.html DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} diff -r d3e65d761118 net-im/py-jabber/Makefile --- a/net-im/py-jabber/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net-im/py-jabber/Makefile Sun Jul 15 15:33:24 2007 +0900 @@ -21,6 +21,8 @@ RUN_DEPENDS= ${PYEXPAT} USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= jabber.py +PYDISTUTILS_PKGVERSION= 0.3-1 post-install: @${ECHO} "jabber" > ${PYTHON_SITELIBDIR}/jabber.pth diff -r d3e65d761118 net-im/py-msnp/Makefile --- a/net-im/py-msnp/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net-im/py-msnp/Makefile Sun Jul 15 15:33:24 2007 +0900 @@ -19,6 +19,7 @@ COMMENT= MSN messaging in Python USE_PYTHON= 2.3+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= msnp.py .if !defined(NOPORTDOCS) post-install: diff -r d3e65d761118 net-im/py-pyxmpp/Makefile --- a/net-im/py-pyxmpp/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net-im/py-pyxmpp/Makefile Sun Jul 15 15:33:24 2007 +0900 @@ -24,6 +24,9 @@ USE_PYTHON= 2.3+ #USE_PYDISTUTILS= yes USE_BZIP2= yes +INSTALLS_EGGINFO= yes +PYDISTUTILS_PKGVERSION= 1.0.0_svn + post-extract: @${MKDIR} ${WRKSRC}/.svn diff -r d3e65d761118 net-im/py-twistedWords/Makefile --- a/net-im/py-twistedWords/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net-im/py-twistedWords/Makefile Sun Jul 15 15:33:24 2007 +0900 @@ -21,5 +21,6 @@ USE_BZIP2= yes USE_BZIP2= yes USE_PYTHON= 2.3+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Twisted_Words .include diff -r d3e65d761118 net-mgmt/py-flowtools/Makefile --- a/net-mgmt/py-flowtools/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net-mgmt/py-flowtools/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -22,5 +22,6 @@ CFLAGS+= -I${LOCALBASE}/include -L${LOCA CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= pyflowtools .include diff -r d3e65d761118 net-mgmt/py-ipy/Makefile --- a/net-mgmt/py-ipy/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net-mgmt/py-ipy/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -19,6 +19,7 @@ COMMENT= A Python module for handling IP USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= IPy test: install ${PYTHON_CMD} ${WRKSRC}/test/test_IPy.py diff -r d3e65d761118 net-mgmt/py-snmp/Makefile --- a/net-mgmt/py-snmp/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net-mgmt/py-snmp/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -20,6 +20,7 @@ CONFLICTS= py??-snmp2-[0-9]* py??-snmp4- USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= pysnmp EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} diff -r d3e65d761118 net-mgmt/py-snmp2/Makefile --- a/net-mgmt/py-snmp2/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net-mgmt/py-snmp2/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -20,6 +20,7 @@ CONFLICTS= py??-snmp4-[0-9]* py??-snmp-3 USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= pysnmp EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} MYPORTDOCS= CHANGES LICENSE MANIFEST PKG-INFO README contribution/WARNING diff -r d3e65d761118 net-mgmt/py-snmp4-apps/Makefile --- a/net-mgmt/py-snmp4-apps/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net-mgmt/py-snmp4-apps/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -20,6 +20,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pysnmp USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= pysnmp-apps DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} diff -r d3e65d761118 net-mgmt/py-snmp4-mibs/Makefile --- a/net-mgmt/py-snmp4-mibs/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net-mgmt/py-snmp4-mibs/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -20,6 +20,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pyasn1 USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= pysnmp-mibs DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} diff -r d3e65d761118 net-mgmt/py-snmp4/Makefile --- a/net-mgmt/py-snmp4/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net-mgmt/py-snmp4/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -23,6 +23,7 @@ CONFLICTS= py??-snmp-[0-9]* py??-snmp2-[ USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= pysnmp EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} diff -r d3e65d761118 net-mgmt/py-twistedSNMP/Makefile --- a/net-mgmt/py-twistedSNMP/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net-mgmt/py-twistedSNMP/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -22,5 +22,6 @@ RUN_DEPENDS= ${BUILD_DEPENDS} USE_PYTHON= 2.4+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= TwistedSNMP .include diff -r d3e65d761118 net-mgmt/py-yapsnmp/files/patch-configure --- a/net-mgmt/py-yapsnmp/files/patch-configure Sun Jul 15 16:12:18 2007 +0000 +++ b/net-mgmt/py-yapsnmp/files/patch-configure Sun Jul 15 15:33:25 2007 +0900 @@ -5,7 +5,7 @@ -for PYTHONINCPATH in python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 -+for PYTHONINCPATH in python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 ++for PYTHONINCPATH in python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 do as_ac_Header=`echo "ac_cv_header_$PYTHONINCPATH/Python.h" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then diff -r d3e65d761118 net-p2p/btqueue/Makefile --- a/net-p2p/btqueue/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net-p2p/btqueue/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -20,6 +20,7 @@ CONFLICTS= py??-*[Bb]it[Tt]ornado* py??- CONFLICTS= py??-*[Bb]it[Tt]ornado* py??-*[Bb]it[Tt]orrent* USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= BTQueue DATADIR= ${PREFIX}/share/BTQueue DOCSDIR= ${PREFIX}/share/doc/BTQueue diff -r d3e65d761118 net-p2p/nicotine-plus/Makefile --- a/net-p2p/nicotine-plus/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net-p2p/nicotine-plus/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -26,6 +26,7 @@ USE_PYTHON= yes USE_PYTHON= yes USE_PYDISTUTILS= yes USE_GETTEXT= yes +PYDISTUTILS_PKGNAME= nicotine DOCSDIR= share/doc/${PKGNAMEPREFIX:S/-//} DATADIR= share/${PKGNAMEPREFIX:S/-//} diff -r d3e65d761118 net-p2p/py-bittornado/Makefile --- a/net-p2p/py-bittornado/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net-p2p/py-bittornado/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -24,6 +24,7 @@ CONFLICTS= py??-*[Bb]it[Tt]ornado-core-[ USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGVERSION= T-0.3.18._BitTornado_ WRKSRC= ${WRKDIR}/${PORTNAME}-CVS diff -r d3e65d761118 net-p2p/py-fngrab/Makefile --- a/net-p2p/py-fngrab/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net-p2p/py-fngrab/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -21,6 +21,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS} USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= FreenetGrab post-install: @${MV} ${PREFIX}/bin/fngrab.py ${PREFIX}/bin/fngrab diff -r d3e65d761118 net-p2p/py-kenosis-bittorrent/Makefile --- a/net-p2p/py-kenosis-bittorrent/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net-p2p/py-kenosis-bittorrent/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -23,6 +23,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/kenosi USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGVERSION= 0.95 WRKSRC= ${WRKDIR}/${DISTNAME}/bt diff -r d3e65d761118 net-p2p/py-py2play/Makefile --- a/net-p2p/py-py2play/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net-p2p/py-py2play/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -18,6 +18,7 @@ DIST_SUBDIR= python DIST_SUBDIR= python USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Py2Play EXAMPLESDIR= ${PREFIX}/share/examples/py-py2play post-install: diff -r d3e65d761118 net-p2p/py-vertex/Makefile --- a/net-p2p/py-vertex/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net-p2p/py-vertex/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -22,6 +22,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/epsilo USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Vertex USE_TWISTED= yes NO_BUILD= yes diff -r d3e65d761118 net/pdb/pkg-plist --- a/net/pdb/pkg-plist Sun Jul 15 16:12:18 2007 +0000 +++ b/net/pdb/pkg-plist Sun Jul 15 15:33:25 2007 +0900 @@ -1,11 +1,11 @@ bin/pdb.py bin/pdb.py -lib/python2.4/site-packages/pktdbg/__init__.py -lib/python2.4/site-packages/pktdbg/__init__.pyc -lib/python2.4/site-packages/pktdbg/__init__.pyo -lib/python2.4/site-packages/pktdbg/cli.py -lib/python2.4/site-packages/pktdbg/cli.pyc -lib/python2.4/site-packages/pktdbg/cli.pyo -lib/python2.4/site-packages/pktdbg/packetstream.py -lib/python2.4/site-packages/pktdbg/packetstream.pyc -lib/python2.4/site-packages/pktdbg/packetstream.pyo -@dirrm lib/python2.4/site-packages/pktdbg +%%PYTHON_SITELIBDIR%%/pktdbg/__init__.py +%%PYTHON_SITELIBDIR%%/pktdbg/__init__.pyc +%%PYTHON_SITELIBDIR%%/pktdbg/__init__.pyo +%%PYTHON_SITELIBDIR%%/pktdbg/cli.py +%%PYTHON_SITELIBDIR%%/pktdbg/cli.pyc +%%PYTHON_SITELIBDIR%%/pktdbg/cli.pyo +%%PYTHON_SITELIBDIR%%/pktdbg/packetstream.py +%%PYTHON_SITELIBDIR%%/pktdbg/packetstream.pyc +%%PYTHON_SITELIBDIR%%/pktdbg/packetstream.pyo +@dirrm %%PYTHON_SITELIBDIR%%/pktdbg diff -r d3e65d761118 net/py-GeoIP/Makefile --- a/net/py-GeoIP/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net/py-GeoIP/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -20,6 +20,7 @@ LIB_DEPENDS= GeoIP.5:${PORTSDIR}/net/Geo USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= GeoIP-Python EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME} EXAMPLE_FILES= README test.py test_city.py test_org.py test_region.py diff -r d3e65d761118 net/py-google/Makefile --- a/net/py-google/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net/py-google/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -20,6 +20,8 @@ RUN_DEPENDS= ${PYXML} USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= pygoogle +PYDISTUTILS_PKGVERSION= 0.5 .if !defined(NOPORTDOCS) PORTDOCS= * diff -r d3e65d761118 net/py-ldap2/Makefile --- a/net/py-ldap2/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net/py-ldap2/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -18,6 +18,7 @@ USE_PYTHON= yes USE_PYTHON= yes USE_PYDISTUTILS= yes USE_OPENLDAP= yes +PYDISTUTILS_PKGNAME= python-ldap REPLACE_ARGS= -e 's,/usr/local/openldap-2.3/lib,${LOCALBASE}/lib,' \ -e 's,/usr/local/openldap-2.3/include,${LOCALBASE}/include,' diff -r d3e65d761118 net/py-libdnet/Makefile --- a/net/py-libdnet/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net/py-libdnet/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -24,6 +24,8 @@ LIBDNET_SLAVE= yes USE_PYTHON= yes CONFIGURE_ARGS= --with-python +INSTALLS_EGGINFO= yes +PYDISTUTILS_PKGNAME= dnet .if defined(MAINTAINER_MODE) regression-test: install diff -r d3e65d761118 net/py-mantissa/Makefile --- a/net/py-mantissa/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net/py-mantissa/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -35,6 +35,7 @@ USE_PYDISTUTILS= yes USE_PYDISTUTILS= yes USE_TWISTED= yes NO_BUILD= yes +PYDISTUTILS_PKGNAME= Mantissa .include diff -r d3e65d761118 net/py-netstring/Makefile --- a/net/py-netstring/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net/py-netstring/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -16,5 +16,6 @@ COMMENT= Python module implenting the ne USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= python-netstring .include diff -r d3e65d761118 net/py-pcap/Makefile --- a/net/py-pcap/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net/py-pcap/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -24,6 +24,7 @@ USE_PYTHON= yes USE_PYTHON= yes USE_PYDISTUTILS= yes USE_PYTHON_PREFIX= yes +PYDISTUTILS_PKGNAME= pylibpcap WRKSRC= ${WRKDIR}/pylibpcap-${PORTVERSION} .include diff -r d3e65d761118 net/py-pypcap/Makefile --- a/net/py-pypcap/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net/py-pypcap/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -19,6 +19,8 @@ BUILD_DEPENDS= pyrexc:${PORTSDIR}/devel/ USE_PYTHON= yes USE_PYTHON_PREFIX= yes +INSTALLS_EGGINFO= yes +PYDISTUTILS_PKGNAME= pcap PLIST_FILES= %%PYTHON_SITELIBDIR%%/pcap.so diff -r d3e65d761118 net/py-rrdtool_lgpl/Makefile --- a/net/py-rrdtool_lgpl/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net/py-rrdtool_lgpl/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -20,6 +20,7 @@ LIB_DEPENDS= rrd:${PORTSDIR}/databases/r USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= py-rrdtool LIBDIR?= ${LOCALBASE}/lib # directory where librrd.so lives diff -r d3e65d761118 net/py-samba/Makefile --- a/net/py-samba/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net/py-samba/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -23,6 +23,8 @@ USE_PYTHON= 2.1+ USE_PYTHON= 2.1+ USE_PYDISTUTILS= yes PYSETUP= python/setup.py +PYDISTUTILS_PKGNAME= Samba_Python_Extensions +PYDISTUTILS_PKGVERSION= 0.1 CONFIGURE_ARGS+= --with-python diff -r d3e65d761118 net/py-soappy-devel/Makefile --- a/net/py-soappy-devel/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net/py-soappy-devel/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -19,6 +19,7 @@ COMMENT= A SOAP implementation USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= SOAPpy BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/fpconst.py:${PORTSDIR}/math/py-fpconst RUN_DEPENDS+= ${PYXML} \ diff -r d3e65d761118 net/py-soappy-devel/files/patch-python25 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net/py-soappy-devel/files/patch-python25 Mon Jul 16 03:17:46 2007 +0900 @@ -0,0 +1,56 @@ +--- ./SOAPpy/Client.py.orig Fri Mar 30 08:44:36 2007 ++++ ./SOAPpy/Client.py Fri Mar 30 08:44:40 2007 +@@ -40,10 +40,10 @@ + ################################################################################ + """ + ++from __future__ import nested_scopes + ident = '$Id: Client.py,v 1.27 2005/02/21 20:27:09 warnes Exp $' + from version import __version__ + +-from __future__ import nested_scopes + + #import xml.sax + import urllib +--- ./SOAPpy/GSIServer.py.orig Fri Mar 30 08:44:40 2007 ++++ ./SOAPpy/GSIServer.py Fri Mar 30 08:44:44 2007 +@@ -43,10 +43,10 @@ + ################################################################################ + """ + ++from __future__ import nested_scopes + ident = '$Id: GSIServer.py,v 1.5 2005/02/15 16:32:22 warnes Exp $' + from version import __version__ + +-from __future__ import nested_scopes + + #import xml.sax + import re +--- ./SOAPpy/Server.py.orig Fri Mar 30 08:44:49 2007 ++++ ./SOAPpy/Server.py Fri Mar 30 08:44:52 2007 +@@ -40,10 +40,10 @@ + ################################################################################ + """ + ++from __future__ import nested_scopes + ident = '$Id: Server.py,v 1.21 2005/02/15 16:32:22 warnes Exp $' + from version import __version__ + +-from __future__ import nested_scopes + + #import xml.sax + import re +--- ./SOAPpy/Types.py.orig Fri Mar 30 08:44:52 2007 ++++ ./SOAPpy/Types.py Fri Mar 30 08:44:56 2007 +@@ -33,10 +33,10 @@ + ################################################################################ + """ + ++from __future__ import nested_scopes + ident = '$Id: Types.py,v 1.19 2005/02/22 04:29:43 warnes Exp $' + from version import __version__ + +-from __future__ import nested_scopes + + import UserList + import base64 diff -r d3e65d761118 net/py-soappy/Makefile --- a/net/py-soappy/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net/py-soappy/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -18,6 +18,7 @@ COMMENT= A SOAP implementation USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= SOAPpy BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/fpconst.py:${PORTSDIR}/math/py-fpconst RUN_DEPENDS+= ${PYXML} \ diff -r d3e65d761118 net/py-soappy/files/patch-python25 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net/py-soappy/files/patch-python25 Mon Jul 16 03:18:13 2007 +0900 @@ -0,0 +1,56 @@ +--- ./SOAPpy/Client.py.orig Fri Mar 30 08:41:24 2007 ++++ ./SOAPpy/Client.py Fri Mar 30 08:41:31 2007 +@@ -40,10 +40,10 @@ + ################################################################################ + """ + ++from __future__ import nested_scopes + ident = '$Id: Client.py,v 1.20 2004/04/10 04:22:52 irjudson Exp $' + from version import __version__ + +-from __future__ import nested_scopes + + #import xml.sax + import urllib +--- ./SOAPpy/GSIServer.py.orig Fri Mar 30 08:41:46 2007 ++++ ./SOAPpy/GSIServer.py Fri Mar 30 08:42:16 2007 +@@ -43,10 +43,10 @@ + ################################################################################ + """ + ++from __future__ import nested_scopes + ident = '$Id: GSIServer.py,v 1.4 2004/02/04 03:21:02 irjudson Exp $' + from version import __version__ + +-from __future__ import nested_scopes + + #import xml.sax + import re +--- ./SOAPpy/Server.py.orig Fri Mar 30 08:41:53 2007 ++++ ./SOAPpy/Server.py Fri Mar 30 08:42:24 2007 +@@ -40,10 +40,10 @@ + ################################################################################ + """ + ++from __future__ import nested_scopes + ident = '$Id: Server.py,v 1.20 2004/04/28 21:47:10 warnes Exp $' + from version import __version__ + +-from __future__ import nested_scopes + + #import xml.sax + import re +--- ./SOAPpy/Types.py.orig Fri Mar 30 08:41:56 2007 ++++ ./SOAPpy/Types.py Fri Mar 30 08:42:29 2007 +@@ -33,10 +33,10 @@ + ################################################################################ + """ + ++from __future__ import nested_scopes + ident = '$Id: Types.py,v 1.17 2004/09/11 03:03:33 warnes Exp $' + from version import __version__ + +-from __future__ import nested_scopes + + import UserList + import base64 diff -r d3e65d761118 net/py-spreadmodule/Makefile --- a/net/py-spreadmodule/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net/py-spreadmodule/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -22,6 +22,7 @@ PLIST_FILES= %%PYTHON_SITELIBDIR%%/sprea PLIST_FILES= %%PYTHON_SITELIBDIR%%/spread.so USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= SpreadModule post-patch: @${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},g' ${WRKSRC}/setup.py diff -r d3e65d761118 net/py-tofu/Makefile --- a/net/py-tofu/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net/py-tofu/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -20,6 +20,7 @@ USE_PYTHON= yes USE_PYTHON= yes USE_TWISTED= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Tofu WRKSRC= ${WRKDIR}/Tofu-${PORTVERSION} EXAMPLESDIR= ${PREFIX}/share/examples/py-tofu diff -r d3e65d761118 net/py-twistedPair/Makefile --- a/net/py-twistedPair/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net/py-twistedPair/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -25,6 +25,7 @@ USE_BZIP2= yes USE_BZIP2= yes USE_PYTHON= 2.2+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Twisted_Pair PLIST_SUB+= S=${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} diff -r d3e65d761118 net/py-xmlrpc/Makefile --- a/net/py-xmlrpc/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net/py-xmlrpc/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -18,6 +18,7 @@ COMMENT= A fast implementation of the xm USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= py-xmlrpc EXAMPLESDIR= ${PREFIX}/share/examples/py-xmlrpc .if !defined(NOPORTDOCS) diff -r d3e65d761118 net/py-yadis/Makefile --- a/net/py-yadis/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net/py-yadis/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -17,5 +17,6 @@ COMMENT= Python support for the Yadis se USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= python-yadis .include diff -r d3e65d761118 net/py-zsi-devel/Makefile --- a/net/py-zsi-devel/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net/py-zsi-devel/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -26,6 +26,7 @@ CONFLICTS= py-zsi-1.* USE_PYTHON= 2.0+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGVERSION= 2.0_rc3 DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}${PKGNAMESUFFIX} EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME}${PKGNAMESUFFIX} diff -r d3e65d761118 net/py-zsi/Makefile --- a/net/py-zsi/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net/py-zsi/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -21,6 +21,7 @@ CONFLICTS= py-zsi-devel-2.* USE_PYTHON= 2.0+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= ZSI post-install: .if !defined(NOPORTDOCS) diff -r d3e65d761118 net/pygopherd/Makefile --- a/net/pygopherd/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net/pygopherd/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -18,6 +18,7 @@ COMMENT= Multiprotocol Information Serve USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGVERSION= 2.0.15 WRKSRC= ${WRKDIR}/${PORTNAME} MAN8= pygopherd.8 diff -r d3e65d761118 net/splatd/Makefile --- a/net/splatd/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net/splatd/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -22,6 +22,8 @@ WRKSRC= ${WRKDIR}/${DISTNAME} USE_PYTHON= 2.4+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= splat +PYDISTUTILS_PKGVERSION= 1.1-rc4 USE_RC_SUBR= splatd.sh SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} MAN5= splat.conf.5 diff -r d3e65d761118 net/straw/Makefile --- a/net/straw/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net/straw/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -24,6 +24,8 @@ USE_GNOME= gnomehier libglade2 pygnome2 USE_GNOME= gnomehier libglade2 pygnome2 pygnomeextras USE_PYTHON= 2.4+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Straw +PYDISTUTILS_EGGINFODIR= ${PREFIX}/share/gnome PYDISTUTILS_INSTALLARGS= -c -O1 --prefix=${PREFIX} \ --install-lib=${PREFIX}/share/gnome \ --with-desktop-file-dir=share/gnome/applications diff -r d3e65d761118 net/tcpwatch/Makefile --- a/net/tcpwatch/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/net/tcpwatch/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -21,5 +21,6 @@ PLIST_FILES= bin/tcpwatch.py USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGVERSION= 1.2.1 .include diff -r d3e65d761118 news/py-twistedNews/Makefile --- a/news/py-twistedNews/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/news/py-twistedNews/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -21,5 +21,6 @@ USE_BZIP2= yes USE_BZIP2= yes USE_PYTHON= 2.3+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Twisted_News .include diff -r d3e65d761118 news/pyne/Makefile --- a/news/pyne/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/news/pyne/Makefile Sun Jul 15 17:15:34 2007 +0900 @@ -21,6 +21,10 @@ USE_GNOME= pygtk2 USE_GNOME= pygtk2 USE_PYTHON= yes +post-patch: + @${REINPLACE_CMD} -e 's/# Originally/# coding:latin1/g' \ + ${WRKSRC}/src/po/pygettext.py + pre-build: @${ECHO_CMD} "#!/bin/sh" > ${WRKDIR}/pyne.sh @${ECHO_CMD} "exec ${PYTHON_CMD} -O ${PYTHON_SITELIBDIR}/pyne/pyne.py \$$*" >> ${WRKDIR}/pyne.sh diff -r d3e65d761118 ports-mgmt/pkg_trackinst/Makefile --- a/ports-mgmt/pkg_trackinst/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/ports-mgmt/pkg_trackinst/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -13,6 +13,7 @@ COMMENT= PkgDB/pkg-plist generator by tr COMMENT= PkgDB/pkg-plist generator by tracking installation USE_PYTHON= 2.3+ +INSTALLS_EGGINFO= yes MAKE_ENV= PYTHON_CMD=${PYTHON_CMD} .include diff -r d3e65d761118 print/hplip/Makefile --- a/print/hplip/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/print/hplip/Makefile Sun Jul 15 20:30:54 2007 +0900 @@ -30,6 +30,10 @@ USE_GHOSTSCRIPT_RUN= yes USE_GHOSTSCRIPT_RUN= yes USE_PYTHON= yes USE_RC_SUBR= hpiod.sh hpssd.sh + +INSTALLS_EGGINFO= yes +PYDISTUTILS_EGGINFO= pcardext-0.1-py${PYTHON_VER}.egg-info \ + cupsext-0.1-py${PYTHON_VER}.egg-info CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" diff -r d3e65d761118 print/py-fonttools/Makefile --- a/print/py-fonttools/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/print/py-fonttools/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -26,6 +26,9 @@ WRKSRC= ${WRKDIR}/fonttools USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_EGGINFODIR= ${PYTHON_SITELIBDIR}/FontTools +PYDISTUTILS_PKGNAME= FontTools +PYDISTUTILS_PKGVERSION= 1.0 DOCDIR= ${PREFIX}/share/doc/py-fonttools diff -r d3e65d761118 print/py-reportlab/Makefile --- a/print/py-reportlab/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/print/py-reportlab/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -21,6 +21,8 @@ COMMENT= Library to create PDF documents USE_PYTHON= 2.3+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Reportlab +PYDISTUTILS_PKGVERSION= 1.20 WRKSRC= ${WRKDIR}/reportlab_${PORTVERSION:S/./_/g}/reportlab MAKE_ENV= PACKAGE_PATH="${REPORTLABDIR}" diff -r d3e65d761118 print/py-reportlab2/Makefile --- a/print/py-reportlab2/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/print/py-reportlab2/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -20,6 +20,7 @@ COMMENT= Library to create PDF documents USE_PYTHON= 2.4+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Reportlab WRKSRC= ${WRKDIR}/reportlab_${PORTVERSION:S/./_/}/reportlab MAKE_ENV= PACKAGE_PATH="${REPORTLABDIR}" diff -r d3e65d761118 print/py-rtf/Makefile --- a/print/py-rtf/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/print/py-rtf/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -18,6 +18,7 @@ COMMENT= Library to create RTF documents USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= PyRTF EXAMPLESDIR= ${PREFIX}/share/examples/py-rtf diff -r d3e65d761118 print/ttfquery/Makefile --- a/print/ttfquery/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/print/ttfquery/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -21,5 +21,6 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/FontTo USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= TTFQuery .include diff -r d3e65d761118 science/mayavi/Makefile --- a/science/mayavi/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/science/mayavi/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -23,6 +23,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/vtk.pt USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= MayaVi CPIO_ARGS= --quiet -pdum -R post-install: diff -r d3e65d761118 science/py-paida/Makefile --- a/science/py-paida/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/science/py-paida/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -23,5 +23,6 @@ BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/_tk USE_PYTHON= 2.3+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGVERSION= 3.2.1_2.8 .include diff -r d3e65d761118 security/denyhosts/Makefile --- a/security/denyhosts/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/security/denyhosts/Makefile Sun Jul 15 15:33:25 2007 +0900 @@ -18,6 +18,7 @@ COMMENT= Script to thwart ssh attacks USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= DenyHosts USE_RC_SUBR= denyhosts SUB_FILES= pkg-message diff -r d3e65d761118 security/py-cerealizer/Makefile --- a/security/py-cerealizer/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/security/py-cerealizer/Makefile Sun Jul 15 15:33:26 2007 +0900 @@ -19,5 +19,6 @@ USE_BZIP2= yes USE_BZIP2= yes USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Cerealizer .include diff -r d3e65d761118 security/py-clamav/Makefile --- a/security/py-clamav/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/security/py-clamav/Makefile Sun Jul 15 15:33:26 2007 +0900 @@ -21,6 +21,7 @@ DIST_SUBDIR= python DIST_SUBDIR= python USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= pyclamav PYDISTUTILS_BUILDARGS= build_ext -I${LOCALBASE}/include -L${LOCALBASE}/lib diff -r d3e65d761118 security/py-crack/Makefile --- a/security/py-crack/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/security/py-crack/Makefile Sun Jul 15 15:33:26 2007 +0900 @@ -33,6 +33,10 @@ MAKE_ENV= "CPPFLAGS=-I${LOCALBASE}/inclu MAKE_ENV= "CPPFLAGS=-I${LOCALBASE}/include -fPIC" \ "LDFLAGS=-L${LOCALBASE}/lib" +post-patch: + ${REINPLACE_CMD} -e 's/setup(/setup(name="${PORTNAME}",version="${PORTVERSION}",/' \ + ${WRKSRC}/distutil.py + post-install: ${INSTALL_DATA} ${WRKSRC}/crack.py ${PYTHONPREFIX_SITELIBDIR} diff -r d3e65d761118 security/py-fchksum/Makefile --- a/security/py-fchksum/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/security/py-fchksum/Makefile Sun Jul 15 15:33:26 2007 +0900 @@ -19,5 +19,6 @@ PLIST_FILES= %%PYTHON_SITELIBDIR%%/fchks PLIST_FILES= %%PYTHON_SITELIBDIR%%/fchksum.so USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= python-fchksum .include diff -r d3e65d761118 security/py-gnupg/Makefile --- a/security/py-gnupg/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/security/py-gnupg/Makefile Sun Jul 15 15:33:26 2007 +0900 @@ -19,5 +19,6 @@ COMMENT= Python module for GnuPG interfa USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= GnuPGInterface .include diff -r d3e65d761118 security/py-gnutls/Makefile --- a/security/py-gnutls/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/security/py-gnutls/Makefile Sun Jul 15 15:33:26 2007 +0900 @@ -20,6 +20,7 @@ LIB_DEPENDS= gnutls.13:${PORTSDIR}/secur USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= python_gnutls EXAMPLESDIR= ${TARGETDIR}/share/examples/py-${PORTNAME} diff -r d3e65d761118 security/py-m2crypto/Makefile --- a/security/py-m2crypto/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/security/py-m2crypto/Makefile Sun Jul 15 15:33:26 2007 +0900 @@ -21,6 +21,7 @@ USE_PYDISTUTILS=yes USE_PYDISTUTILS=yes USE_OPENSSL= yes WITH_OPENSSL_PORT= yes +PYDISTUTILS_PKGNAME= M2Crypto .if defined(WITH_OPENSSL_PORT) PYDISTUTILS_BUILDARGS= --openssl="${LOCALBASE}" diff -r d3e65d761118 security/py-mcrypt/Makefile --- a/security/py-mcrypt/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/security/py-mcrypt/Makefile Sun Jul 15 15:33:26 2007 +0900 @@ -22,6 +22,7 @@ USE_PYTHON= yes USE_PYTHON= yes USE_PYDISTUTILS=yes PYDISTUTILS_BUILDARGS= -L${LOCALBASE}/lib +PYDISTUTILS_PKGNAME= python-mcrypt CFLAGS+= -I${LOCALBASE}/include PLIST_FILES= %%PYTHON_SITELIBDIR%%/mcrypt.so diff -r d3e65d761118 security/py-mhash/Makefile --- a/security/py-mhash/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/security/py-mhash/Makefile Sun Jul 15 15:33:26 2007 +0900 @@ -22,6 +22,7 @@ PLIST_FILES= %%PYTHON_SITELIBDIR%%/mhash PLIST_FILES= %%PYTHON_SITELIBDIR%%/mhash.so USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= python-mhash CFLAGS+= -I${LOCALBASE}/include MAKE_ENV= "LDFLAGS=-L${LOCALBASE}/lib" diff -r d3e65d761118 security/py-openid/Makefile --- a/security/py-openid/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/security/py-openid/Makefile Sun Jul 15 15:33:26 2007 +0900 @@ -20,5 +20,6 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/urljr: USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= python-openid .include diff -r d3e65d761118 security/py-openssl/Makefile --- a/security/py-openssl/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/security/py-openssl/Makefile Sun Jul 15 15:33:26 2007 +0900 @@ -20,6 +20,7 @@ USE_PYTHON= yes USE_PYTHON= yes USE_PYTHON_PREFIX= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= pyOpenSSL USE_OPENSSL= yes .include diff -r d3e65d761118 security/py-posix1e/Makefile --- a/security/py-posix1e/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/security/py-posix1e/Makefile Sun Jul 15 15:33:26 2007 +0900 @@ -18,6 +18,7 @@ COMMENT= Python module for manipulating USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= pylibacl .include diff -r d3e65d761118 security/py-pow/Makefile --- a/security/py-pow/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/security/py-pow/Makefile Sun Jul 15 15:33:26 2007 +0900 @@ -19,6 +19,7 @@ COMMENT= Python OpenSSL Wrappers USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= POW USE_OPENSSL= yes PORTDOCS= POW.pdf diff -r d3e65d761118 security/py-twistedConch/Makefile --- a/security/py-twistedConch/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/security/py-twistedConch/Makefile Sun Jul 15 15:33:26 2007 +0900 @@ -21,5 +21,6 @@ USE_BZIP2= yes USE_BZIP2= yes USE_PYTHON= 2.3+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Conch .include diff -r d3e65d761118 security/py-xmlsec/Makefile --- a/security/py-xmlsec/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/security/py-xmlsec/Makefile Sun Jul 15 15:33:26 2007 +0900 @@ -21,6 +21,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/libxml USE_PYTHON= 2.2+ USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= pyxmlsec DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} diff -r d3e65d761118 security/revelation/Makefile --- a/security/revelation/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/security/revelation/Makefile Mon Jul 16 01:38:09 2007 +0900 @@ -37,6 +37,8 @@ BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} .endif post-patch: + @${REINPLACE_CMD} -e 's|\(rvl_py_version=\)".*$$|\1""|' \ + ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|\(-Wl\)|$$(LDFLAGS) \1|' \ ${WRKSRC}/src/wrap/crack/Makefile.in @${REINPLACE_CMD} -e 's|#include ||' \ diff -r d3e65d761118 security/umit/Makefile --- a/security/umit/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/security/umit/Makefile Sun Jul 15 16:50:08 2007 +0900 @@ -23,6 +23,7 @@ USE_BZIP2= yes USE_BZIP2= yes USE_PYTHON= yes USE_GNOME= pygtk2 +INSTALLS_EGGINFO= yes .include diff -r d3e65d761118 security/vinetto/Makefile --- a/security/vinetto/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/security/vinetto/Makefile Sun Jul 15 15:33:26 2007 +0900 @@ -20,6 +20,7 @@ OPTIONS= IMAGING "Build with ability to USE_PYTHON= 2.3+ USE_PYDISTUTILS=yes +PYDISTUTILS_PKGVERSION= 0.06alpha .include diff -r d3e65d761118 sysutils/farbot/Makefile --- a/sysutils/farbot/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/sysutils/farbot/Makefile Sun Jul 15 15:33:26 2007 +0900 @@ -21,6 +21,8 @@ WRKSRC= ${WRKDIR}/${DISTNAME} USE_PYTHON= 2.4+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= farb +PYDISTUTILS_PKGVERSION= 0.1 post-install: ${INSTALL_DATA} ${WRKSRC}/farbot.conf ${PREFIX}/etc/farbot.conf.sample diff -r d3e65d761118 textproc/py-4suite-xml/Makefile --- a/textproc/py-4suite-xml/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/textproc/py-4suite-xml/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -20,6 +20,8 @@ REINPLACE_ARGS= -i "" -E REINPLACE_ARGS= -i "" -E USE_PYTHON= 2.2.1+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= 4Suite-XML +PYDISTUTILS_PKGVERSION= 1.0 CONFLICTS= py*-4suite-[01]* diff -r d3e65d761118 textproc/py-4suite/Makefile --- a/textproc/py-4suite/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/textproc/py-4suite/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -20,8 +20,10 @@ COMMENT= A collection of Python tools fo USE_BZIP2= yes REINPLACE_ARGS= -i "" -E -USE_PYTHON= 2.2.1+ +USE_PYTHON= 2.2-2.4 USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= 4Suite +PYDISTUTILS_PKGVERSION= 1.0b1 CONFLICTS= py*-4Suite-1* py*-xml-0.7* diff -r d3e65d761118 textproc/py-dsv/Makefile --- a/textproc/py-dsv/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/textproc/py-dsv/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -23,6 +23,7 @@ WX_COMPS= python USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= DSV DSV_BASEDIR= ${PYTHONPREFIX_SITELIBDIR}/DSV post-install: diff -r d3e65d761118 textproc/py-empy/Makefile --- a/textproc/py-empy/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/textproc/py-empy/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -17,5 +17,6 @@ COMMENT= A powerful and robust templatin USE_PYTHON= 1.5+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGVERSION= 3.1 .include diff -r d3e65d761118 textproc/py-enchant/Makefile --- a/textproc/py-enchant/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/textproc/py-enchant/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -25,6 +25,7 @@ USE_WX= 2.6 USE_WX= 2.6 WX_COMPS= python:run +PYDISTUTILS_PKGNAME= pyenchant PYDISTUTILS_INSTALL_TARGET= install_lib PYDISTUTILS_INSTALLARGS= diff -r d3e65d761118 textproc/py-excelerator/Makefile --- a/textproc/py-excelerator/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/textproc/py-excelerator/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -18,6 +18,7 @@ COMMENT= A Python library for generating USE_PYTHON= 2.4+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= pyExcelerator USE_ZIP= yes WRKSRC= ${WRKDIR}/pyExcelerator-${PORTVERSION} diff -r d3e65d761118 textproc/py-expat/Makefile --- a/textproc/py-expat/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/textproc/py-expat/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -23,6 +23,8 @@ PLIST_FILES= lib/%%PYTHON_VERSION%%/site PLIST_FILES= lib/%%PYTHON_VERSION%%/site-packages/pyexpat.so USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= pyexpat +PYDISTUTILS_PKGVERSION= 0.0.0 WRKSRC= ${PYTHON_WRKSRC}/Modules MD5_FILE= ${PORTSDIR}/lang/python/distinfo diff -r d3e65d761118 textproc/py-genshi/Makefile --- a/textproc/py-genshi/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/textproc/py-genshi/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -17,17 +17,7 @@ MAINTAINER= nivit@FreeBSD.org MAINTAINER= nivit@FreeBSD.org COMMENT= Python toolkit for stream-based generation of output for the web -BUILD_DEPENDS= ${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools -RUN_DEPENDS= ${BUILD_DEPENDS} - USE_PYTHON= yes -USE_PYDISTUTILS= yes - -PYGENSHI_EGG= ${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}.egg - -PLIST_SUB= EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \ - PYGENSHI_EGG=${PYGENSHI_EGG} - -EASY_INSTALL_CMD?= easy_install-${PYTHON_VER} +USE_PYDISTUTILS= easy_install .include diff -r d3e65d761118 textproc/py-genshi/pkg-plist --- a/textproc/py-genshi/pkg-plist Sun Jul 15 16:12:18 2007 +0000 +++ b/textproc/py-genshi/pkg-plist Sun Jul 15 15:33:27 2007 +0900 @@ -1,4 +1,1 @@ -@comment $FreeBSD$ -@unexec %%EASY_INSTALL_CMD%% -N -m %D/%%PYTHON_SITELIBDIR%%/%%PYGENSHI_EGG%% -%%PYTHON_SITELIBDIR%%/%%PYGENSHI_EGG%% -@exec %%EASY_INSTALL_CMD%% -N %D/%%PYTHON_SITELIBDIR%%/PYGENSHI_EGG%% +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%% diff -r d3e65d761118 textproc/py-hyperestraier-python/Makefile --- a/textproc/py-hyperestraier-python/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/textproc/py-hyperestraier-python/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -19,5 +19,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME} WRKSRC= ${WRKDIR}/${PORTNAME} USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGVERSION= 0.9.1 .include diff -r d3e65d761118 textproc/py-hyperestraier/Makefile --- a/textproc/py-hyperestraier/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/textproc/py-hyperestraier/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -18,6 +18,9 @@ LIB_DEPENDS= estraier.8:${PORTSDIR}/text LIB_DEPENDS= estraier.8:${PORTSDIR}/textproc/hyperestraier USE_PYTHON= yes +INSTALLS_EGGINFO= yes +PYDISTUTILS_PKGNAME= HyperEstraier +PYDISTUTILS_PKGVERSION= 0.01 MAKE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff -r d3e65d761118 textproc/py-ltxml/Makefile --- a/textproc/py-ltxml/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/textproc/py-ltxml/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -21,6 +21,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS} USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= PyLTXML USE_LDCONFIG= yes DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} diff -r d3e65d761118 textproc/py-reverend/Makefile --- a/textproc/py-reverend/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/textproc/py-reverend/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -18,6 +18,7 @@ COMMENT= A simple Bayesian classifier wr USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Reverend EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} diff -r d3e65d761118 textproc/py-rss2gen/Makefile --- a/textproc/py-rss2gen/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/textproc/py-rss2gen/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -17,5 +17,6 @@ COMMENT= A Python library for generating USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= PyRSS2Gen .include diff -r d3e65d761118 textproc/py-rxp/Makefile --- a/textproc/py-rxp/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/textproc/py-rxp/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -19,6 +19,8 @@ NO_WRKSUBDIR= yes NO_WRKSUBDIR= yes USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= pyRXP +PYDISTUTILS_PKGVERSION= 0.5 EXAMPLESDIR= ${PREFIX}/share/examples/py-rxp DOCSDIR= ${PREFIX}/share/doc/py-rxp diff -r d3e65d761118 textproc/py-sgrep/Makefile --- a/textproc/py-sgrep/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/textproc/py-sgrep/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -24,6 +24,8 @@ GNU_CONFIGURE= yes GNU_CONFIGURE= yes USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= pysgrep +PYDISTUTILS_PKGVERSION= 1.0a post-extract: @${TAR} -zxf ${DISTDIR}/pysgrep-${PORTVERSION}.tar.gz -C ${WRKSRC} diff -r d3e65d761118 textproc/py-syck/Makefile --- a/textproc/py-syck/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/textproc/py-syck/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -24,6 +24,8 @@ PLIST_FILES= ${PYFILES_} ${PYFILES_:S/$/ USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Syck +PYDISTUTILS_PKGVERSION= 1.0 WRKSRC= ${WRKDIR}/${DISTNAME}/ext/python .include diff -r d3e65d761118 textproc/py-tvgrab/Makefile --- a/textproc/py-tvgrab/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/textproc/py-tvgrab/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -22,6 +22,7 @@ USE_BZIP2= yes USE_BZIP2= yes USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= pytvgrab_lib PORTDOCS= README diff -r d3e65d761118 textproc/py-twistedLore/Makefile --- a/textproc/py-twistedLore/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/textproc/py-twistedLore/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -21,5 +21,6 @@ USE_BZIP2= yes USE_BZIP2= yes USE_PYTHON= 2.3+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Twisted_Lore .include diff -r d3e65d761118 textproc/py-wordnet/Makefile --- a/textproc/py-wordnet/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/textproc/py-wordnet/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -23,6 +23,7 @@ COMMENT= Python Interface to WordNet USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= pywordnet WRKSRC= ${WRKDIR}/py${PORTNAME}-${PORTVERSION} PLIST_SUB= WNDATA=${WORDNETDATA} diff -r d3e65d761118 textproc/py-xlwriter/Makefile --- a/textproc/py-xlwriter/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/textproc/py-xlwriter/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -19,6 +19,7 @@ USE_PYTHON= yes USE_PYTHON= yes USE_PYDISTUTILS= yes USE_ZIP= yes +PYDISTUTILS_PKGNAME= pyXLWriter post-install: ${MKDIR} ${EXAMPLESDIR} diff -r d3e65d761118 textproc/py-xml/Makefile --- a/textproc/py-xml/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/textproc/py-xml/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -18,6 +18,7 @@ COMMENT= PyXML: Python XML library enha USE_PYTHON= 2.1+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= PyXML .include diff -r d3e65d761118 textproc/py-xmltv/Makefile --- a/textproc/py-xmltv/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/textproc/py-xmltv/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -20,6 +20,7 @@ COMMENT= A Python module that provides a USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= python-xmltv .ifndef(NOPORTDOCS) PORTDOCS= README.txt diff -r d3e65d761118 textproc/py-zpt/Makefile --- a/textproc/py-zpt/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/textproc/py-zpt/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -19,6 +19,9 @@ COMMENT= A Zope-less version of Zope Pag USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= ZopePageTemplates +PYDISTUTILS_PKGVERSION= 0.0.0 +PYDISTUTILS_EGGINFODIR= ${PYTHONPREFIX_SITELIBDIR}/ZopePageTemplates WRKSRC= ${WRKDIR}/ZopePageTemplates .include diff -r d3e65d761118 textproc/py2html/Makefile --- a/textproc/py2html/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/textproc/py2html/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -16,7 +16,7 @@ COMMENT= Python Highlighter for HTML COMMENT= Python Highlighter for HTML USE_PYTHON= yes -PLIST_SUB+= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S,^${LOCALBASE}/,,g} MAKE_ENV= PORTSDIR=${PORTSDIR} +INSTALLS_EGGINFO= yes .include diff -r d3e65d761118 textproc/roap/Makefile --- a/textproc/roap/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/textproc/roap/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -18,6 +18,7 @@ COMMENT= Region Oriented Ascii Processor USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Region_Oriented_Ascii_Processor WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} DOCS= README README.ja USAGE USAGE.ja diff -r d3e65d761118 textproc/silvercity/Makefile --- a/textproc/silvercity/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/textproc/silvercity/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -18,6 +18,7 @@ COMMENT= A lexing package for over 20 pr USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= SilverCity USE_DOS2UNIX= yes .include diff -r d3e65d761118 textproc/xxdiff-scripts/Makefile --- a/textproc/xxdiff-scripts/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/textproc/xxdiff-scripts/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -20,5 +20,6 @@ USE_BZIP2= yes USE_BZIP2= yes USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= xxdiff-scripts .include diff -r d3e65d761118 www/feedjack/Makefile --- a/www/feedjack/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/www/feedjack/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -22,6 +22,8 @@ DIST_SUBDIR= python DIST_SUBDIR= python USE_PYTHON= 2.3+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Feedjack +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's PLIST_SUB= FEEDJACKVER=${PORTVERSION} \ PYTHONVER=${_PYTHON_VERSION} diff -r d3e65d761118 www/google-sitemapgen/Makefile --- a/www/google-sitemapgen/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/www/google-sitemapgen/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -17,5 +17,6 @@ COMMENT= Script to analyze web server an USE_PYTHON= YES USE_PYDISTUTILS=YES +PYDISTUTILS_PKGNAME= sitemap_gen .include diff -r d3e65d761118 www/mod_python3/Makefile --- a/www/mod_python3/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/www/mod_python3/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -18,6 +18,7 @@ USE_APACHE= 2.0+ USE_APACHE= 2.0+ USE_PYTHON= yes +INSTALLS_EGGINFO= yes LATEST_LINK= mod_python3 GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-apxs="${APXS}" --with-python="${PYTHON_CMD}" \ diff -r d3e65d761118 www/moinmoin/Makefile --- a/www/moinmoin/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/www/moinmoin/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -17,6 +17,7 @@ COMMENT= A Python clone of WikiWiki USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= moin PLIST_SUB+= PYTHON_SITELIB=${PYTHON_SITELIBDIR:S|^${LOCALBASE}/||} SUB_FILES= pkg-install diff -r d3e65d761118 www/newsfeed/Makefile --- a/www/newsfeed/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/www/newsfeed/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -23,6 +23,7 @@ USE_PYTHON= yes USE_PYTHON= yes USE_TK= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= NewsFeed post-patch: @${REINPLACE_CMD} -e '/py_modules=/s|,.*|],|;/sounds/s|d.*|)|' ${WRKSRC}/setup.py diff -r d3e65d761118 www/py-beautifulsoup/Makefile --- a/www/py-beautifulsoup/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/www/py-beautifulsoup/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -17,5 +17,6 @@ COMMENT= HTML/XML Parser for Python USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= BeautifulSoup .include diff -r d3e65d761118 www/py-cherrypy-old/Makefile --- a/www/py-cherrypy-old/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/www/py-cherrypy-old/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -20,6 +20,7 @@ COMMENT= A pythonic, object-oriented web USE_PYTHON= 2.3+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= CherryPy LN_OPTS= -sf RM_OPTS= -r diff -r d3e65d761118 www/py-cherrypy/Makefile --- a/www/py-cherrypy/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/www/py-cherrypy/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -18,6 +18,7 @@ COMMENT= A pythonic, object-oriented web USE_PYTHON= 2.3+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= CherryPy LN_OPTS= -sf RM_OPTS= -r diff -r d3e65d761118 www/py-clientform/Makefile --- a/www/py-clientform/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/www/py-clientform/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -21,6 +21,8 @@ RUN_DEPENDS= ${BUILD_DEPENDS} USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= ClientForm +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's PYCLIENTFORM_EGG= ClientForm-${PORTVERSION}-py${PYTHON_VER}.egg diff -r d3e65d761118 www/py-django-devel/Makefile --- a/www/py-django-devel/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/www/py-django-devel/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -23,6 +23,10 @@ USE_GETTEXT= yes USE_GETTEXT= yes USE_PYTHON= yes USE_PYDISTUTILS= yes + +INSTALLS_EGGINFO= yes +PYDISTUTILS_PKGNAME= Django +PYDISTUTILS_PKGVERSION= 0.97_pre CONFLICTS= py2[0-9]-django-[0-9]* diff -r d3e65d761118 www/py-django/Makefile --- a/www/py-django/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/www/py-django/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -20,6 +20,8 @@ USE_GETTEXT= yes USE_GETTEXT= yes USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Django +PYDISTUTILS_PKGVERSION= 0.96_None CONFLICTS= py2[0-9]-django-devel-[0-9]* diff -r d3e65d761118 www/py-flup/Makefile --- a/www/py-flup/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/www/py-flup/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -21,6 +21,8 @@ RUN_DEPENDS= ${BUILD_DEPENDES} USE_PYTHON= 2.4+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGVERSION= 0.5 +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's EASY_INSTALL_CMD?= easy_install-${PYTHON_VER} diff -r d3e65d761118 www/py-forgethtml/Makefile --- a/www/py-forgethtml/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/www/py-forgethtml/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -18,6 +18,8 @@ COMMENT= Python module for object-orient USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= forgetHTML +PYDISTUTILS_PKGVERSION= 0.8 WRKSRC= ${WRKDIR}/${PORTNAME} diff -r d3e65d761118 www/py-formencode/Makefile --- a/www/py-formencode/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/www/py-formencode/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -25,6 +25,9 @@ USE_PYDISTUTILS=yes USE_PYDISTUTILS=yes USE_GETTEXT= yes +PYDISTUTILS_PKGNAME= FormEncode +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's + DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} EXAMPLESSDIR= ${PREFIX}/share/examples/py-${PORTNAME} FORMENCODEVER?= ${PORTVERSION} diff -r d3e65d761118 www/py-imdbpy/Makefile --- a/www/py-imdbpy/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/www/py-imdbpy/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -18,6 +18,7 @@ COMMENT= Retrieve and manage the data of USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= IMDbPY .if !defined(NOPORTDOCS) DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} diff -r d3e65d761118 www/py-mechanize/Makefile --- a/www/py-mechanize/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/www/py-mechanize/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -24,6 +24,8 @@ RUN_DEPENDS= ${EASY_INSTALL_CMD}:${PORTS USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGVERSION= 0.1.6b +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's EASY_INSTALL_CMD?= easy_install-${PYTHON_VER} PYDISTUTILS_BUILD_TARGET= bdist_egg diff -r d3e65d761118 www/py-nevow/Makefile --- a/www/py-nevow/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/www/py-nevow/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -21,6 +21,7 @@ USE_TWISTED= yes USE_TWISTED= yes USE_GETTEXT= yes NO_BUILD= yes +PYDISTUTILS_PKGNAME= Nevow SUB_FILES= pkg-message PKGMESSAGE= ${WRKSRC}/pkg-message diff -r d3e65d761118 www/py-openssl-proxy/Makefile --- a/www/py-openssl-proxy/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/www/py-openssl-proxy/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -19,5 +19,6 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/OpenSS USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= pyOpenSSLProxy .include diff -r d3e65d761118 www/py-paste/Makefile --- a/www/py-paste/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/www/py-paste/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -22,6 +22,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS} USE_PYTHON= 2.3+ USE_PYDISTUTILS= yes +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's PASTEVER?= ${PORTVERSION} PYTHONVER?= ${_PYTHON_VERSION} PLIST_SUB= PASTEVER=${PASTEVER} \ diff -r d3e65d761118 www/py-pastedeploy/Makefile --- a/www/py-pastedeploy/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/www/py-pastedeploy/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -23,6 +23,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS} USE_PYTHON= 2.3+ USE_PYDISTUTILS= yes +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's PLIST_SUB= PYPASTEDEPLOY_EGG=${PYPASTEDEPLOY_EGG} diff -r d3e65d761118 www/py-pastescript/Makefile --- a/www/py-pastescript/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/www/py-pastescript/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -31,6 +31,7 @@ NO_PACKAGE= no, not yet USE_PYTHON= 2.3+ USE_PYDISTUTILS= yes +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's SUB_FILES+= pkg-deinstall pkg-install SUB_LIST+= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} \ diff -r d3e65d761118 www/py-pullparser/Makefile --- a/www/py-pullparser/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/www/py-pullparser/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -19,6 +19,7 @@ BUILD_DEPENDS= ${EASY_INSTALL_CMD}:${POR USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's EASY_INSTALL_CMD?= easy_install-${PYTHON_VER} PYDISTUTILS_BUILD_TARGET= bdist_egg diff -r d3e65d761118 www/py-pysearch/Makefile --- a/www/py-pysearch/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/www/py-pysearch/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -17,6 +17,7 @@ COMMENT= Yahoo Search Web Services SDK f USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= pYsearch DOCSDIR= ${TARGETDIR}/share/doc/py-${PORTNAME} EXAMPLESDIR= ${TARGETDIR}/share/examples/py-${PORTNAME} diff -r d3e65d761118 www/py-slimmer/Makefile --- a/www/py-slimmer/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/www/py-slimmer/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -19,6 +19,7 @@ WRKSRC= ${WRKDIR}/slimmer USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGVERSION= 0.1.19 PLIST_FILES= %%PYTHON_SITELIBDIR%%/slimmer.py \ %%PYTHON_SITELIBDIR%%/slimmer.pyc \ diff -r d3e65d761118 www/py-tgwebservices/Makefile --- a/www/py-tgwebservices/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/www/py-tgwebservices/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -23,6 +23,8 @@ RUN_DEPENDS= ${BUILD_DEPENDS} USE_PYTHON= 2.4+ USE_PYDISTUTILS= yes +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's +PYDISTUTILS_PKGNAME= TGWebServices PLIST_SUB= EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \ PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION} \ diff -r d3e65d761118 www/py-twistedWeb/Makefile --- a/www/py-twistedWeb/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/www/py-twistedWeb/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -21,5 +21,6 @@ USE_BZIP2= yes USE_BZIP2= yes USE_PYTHON= 2.3+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Twisted_Web .include diff -r d3e65d761118 www/py-twistedWeb2/Makefile --- a/www/py-twistedWeb2/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/www/py-twistedWeb2/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -22,5 +22,6 @@ USE_BZIP2= yes USE_BZIP2= yes USE_PYTHON= 2.3+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Twisted_Web2 .include diff -r d3e65d761118 www/py-urljr/Makefile --- a/www/py-urljr/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/www/py-urljr/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -19,5 +19,6 @@ BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/curl USE_PYTHON= 2.2+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= python-urljr .include diff -r d3e65d761118 www/quixote/Makefile --- a/www/quixote/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/www/quixote/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -17,6 +17,7 @@ COMMENT= A framework for developing web USE_PYTHON= 2.3-2.4 USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= Quixote .include diff -r d3e65d761118 www/session2/Makefile --- a/www/session2/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/www/session2/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -17,6 +17,7 @@ COMMENT= A quixote session manager with USE_PYTHON= 2.3+ USE_PYDISTUTILS= yes +PYDISTUTILS_PKGVERSION= 0.6 OPTIONS= MYSQL "MySQLdb support" on OPTIONS+= POSTGRESQL "psycopg support" on diff -r d3e65d761118 www/trac-accountmanager/Makefile --- a/www/trac-accountmanager/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/www/trac-accountmanager/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -24,6 +24,9 @@ RUN_DEPENDS= ${BUILD_DEPENDS} USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= TracAccountManager +PYDISTUTILS_PKGVERSION= 0.1.3 +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's WRKSRC= ${WRKDIR}/accountmanagerplugin EASY_INSTALL_CMD?= easy_install-${PYTHON_VER} diff -r d3e65d761118 www/trac-addcomment/Makefile --- a/www/trac-addcomment/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/www/trac-addcomment/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -23,6 +23,8 @@ NO_BUILD= yes NO_BUILD= yes USE_PYTHON= 2.3+ USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= TracAddCommentMacro +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION} .include diff -r d3e65d761118 www/trac-bzr/Makefile --- a/www/trac-bzr/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/www/trac-bzr/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -19,7 +19,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS} RUN_DEPENDS= ${BUILD_DEPENDS} RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac -USE_PYTHON= 2.4 +USE_PYTHON= 2.4+ USE_PYDISTUTILS= yes USE_BZIP2= yes diff -r d3e65d761118 www/trac-down/Makefile --- a/www/trac-down/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/www/trac-down/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -21,6 +21,9 @@ RUN_DEPENDS= ${EASY_INSTALL_CMD}:${PORTS USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= TracDown +PYDISTUTILS_PKGVERSION= 0.0.1 +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's EASY_INSTALL_CMD?= easy_install-${PYTHON_VER} diff -r d3e65d761118 www/trac-privatetickets/Makefile --- a/www/trac-privatetickets/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/www/trac-privatetickets/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -21,6 +21,8 @@ RUN_DEPENDS= ${EASY_INSTALL_CMD}:${PORTS USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= TracPrivateTickets +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's EASY_INSTALL_CMD?= easy_install-${PYTHON_VER} diff -r d3e65d761118 www/trac-tags/Makefile --- a/www/trac-tags/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/www/trac-tags/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -21,6 +21,7 @@ USE_PYTHON= 2.3+ USE_PYTHON= 2.3+ NO_BUILD= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= TracTags PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHONVERSION=${_PYTHON_VERSION} WRKSRC= ${WRKDIR}/${PORTNAME}plugin diff -r d3e65d761118 www/trac-webadmin/Makefile --- a/www/trac-webadmin/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/www/trac-webadmin/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -22,6 +22,9 @@ RUN_DEPENDS= ${BUILD_DEPENDS} USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= TracWebAdmin +PYDISTUTILS_PKGVERSION= 0.1.2 +PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's WRKSRC= ${WRKDIR}/${PORTNAME} EASY_INSTALL_CMD?= easy_install-${PYTHON_VER} diff -r d3e65d761118 www/xist/Makefile --- a/www/xist/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/www/xist/Makefile Sun Jul 15 15:33:27 2007 +0900 @@ -24,6 +24,7 @@ USE_PYTHON= 2.4+ USE_PYTHON= 2.4+ USE_PYDISTUTILS= yes USE_BZIP2= yes +PYDISTUTILS_PKGNAME= ll-xist post-install: .for file in doc2txt dtd2xsc tld2xsc diff -r d3e65d761118 x11-toolkits/py-fltk/Makefile --- a/x11-toolkits/py-fltk/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/x11-toolkits/py-fltk/Makefile Sun Jul 15 18:46:11 2007 +0900 @@ -19,9 +19,12 @@ COMMENT= Python interface to FLTK window LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk -USE_PYTHON= yes +USE_PYTHON= -2.4 USE_PYDISTUTILS= yes USE_XLIB= yes + +PYDISTUTILS_PKGNAME= pyFltk +PYDISTUTILS_PKGVERSION= 1.1b3 MAKE_ENV+= FLTK_HOME=${X11BASE}/include OPENGL_HOME=${X11BASE}/include DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} diff -r d3e65d761118 x11-toolkits/py-fox/Makefile --- a/x11-toolkits/py-fox/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/x11-toolkits/py-fox/Makefile Sun Jul 15 15:33:28 2007 +0900 @@ -24,6 +24,8 @@ USE_XLIB= yes USE_XLIB= yes USE_GL= yes +PYDISTUTILS_PKGNAME= FXPy + WRKSRC= ${WRKDIR}/FXPy-${PORTVERSION} DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} diff -r d3e65d761118 x11-toolkits/py-gtkextra/Makefile --- a/x11-toolkits/py-gtkextra/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/x11-toolkits/py-gtkextra/Makefile Sun Jul 15 15:33:28 2007 +0900 @@ -24,5 +24,6 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-1. USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= python-gtkextra .include diff -r d3e65d761118 x11-toolkits/py-gui/Makefile --- a/x11-toolkits/py-gui/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/x11-toolkits/py-gui/Makefile Sun Jul 15 15:33:28 2007 +0900 @@ -20,6 +20,8 @@ USE_PYTHON= yes USE_PYTHON= yes USE_PYDISTUTILS= yes USE_GNOME= pygtk2 + +PYDISTUTILS_PKGNAME= PyGUI DOCSDIR= share/doc/${PKGNAMEPREFIX}${PORTNAME} EXAMPLESDIR= share/examples/${PKGNAMEPREFIX}${PORTNAME} diff -r d3e65d761118 x11-toolkits/py-tkinter/Makefile --- a/x11-toolkits/py-tkinter/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/x11-toolkits/py-tkinter/Makefile Sun Jul 15 15:33:28 2007 +0900 @@ -23,6 +23,8 @@ PLIST_FILES= lib/%%PYTHON_VERSION%%/site PLIST_FILES= lib/%%PYTHON_VERSION%%/site-packages/_tkinter.so USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= Tkinter +PYDISTUTILS_PKGVERSION= 0.0.0 WRKSRC= ${PYTHON_WRKSRC}/Modules MD5_FILE= ${PORTSDIR}/lang/python/distinfo diff -r d3e65d761118 x11-toolkits/py-tktreectrl/Makefile --- a/x11-toolkits/py-tktreectrl/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/x11-toolkits/py-tktreectrl/Makefile Sun Jul 15 15:33:28 2007 +0900 @@ -24,5 +24,7 @@ USE_ZIP= yes USE_ZIP= yes USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= TkinterTreectrl +PYDISTUTILS_PKGVERSION= 0.4 .include diff -r d3e65d761118 x11-toolkits/py-wmdockapps/Makefile --- a/x11-toolkits/py-wmdockapps/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/x11-toolkits/py-wmdockapps/Makefile Sun Jul 15 15:33:28 2007 +0900 @@ -19,6 +19,7 @@ USE_XLIB= yes USE_XLIB= yes USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= pywmdockapps post-patch: ${REINPLACE_CMD} 's|/usr/X11R6|${X11BASE}|' ${WRKSRC}/setup.py diff -r d3e65d761118 x11-toolkits/py-xlib/Makefile --- a/x11-toolkits/py-xlib/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/x11-toolkits/py-xlib/Makefile Sun Jul 15 15:33:28 2007 +0900 @@ -18,5 +18,7 @@ COMMENT= X11 library for Python USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= python-xlib +PYDISTUTILS_PKGVERSION= 0.12 .include diff -r d3e65d761118 x11-wm/plwm/Makefile --- a/x11-wm/plwm/Makefile Sun Jul 15 16:12:18 2007 +0000 +++ b/x11-wm/plwm/Makefile Sun Jul 15 15:33:28 2007 +0900 @@ -22,6 +22,10 @@ USE_PYTHON= yes USE_PYTHON= yes GNU_CONFIGURE= yes +post-patch: + ${REINPLACE_CMD} -e 's,whrandom,random,g' ${WRKSRC}/plwm/inspect.py + ${REINPLACE_CMD} -e 's,$$Id,coding: utf-8 ,g' ${WRKSRC}/plwm/mw_apm.py + pre-install: makeinfo -o ${PREFIX}/info/plwm.info ${WRKSRC}/doc/plwm.texi