diff options
| author | alexbl <alexbl@FreeBSD.org> | 2007-07-30 17:42:28 +0800 |
|---|---|---|
| committer | alexbl <alexbl@FreeBSD.org> | 2007-07-30 17:42:28 +0800 |
| commit | 7d749db4cf14f30613e9a53a08ffa3d3b4575146 (patch) | |
| tree | ad9062005432bbf28f5cce4ad3a1cd32a59dba69 /misc | |
| parent | 8e2da239f74a82ad1c98b69bd27abb3f4e40ecf3 (diff) | |
| download | freebsd-ports-gnome-7d749db4cf14f30613e9a53a08ffa3d3b4575146.tar.gz freebsd-ports-gnome-7d749db4cf14f30613e9a53a08ffa3d3b4575146.tar.zst freebsd-ports-gnome-7d749db4cf14f30613e9a53a08ffa3d3b4575146.zip | |
- Make Python 2.5.1 the default Python version
- Add significantly better support in bsd.python.mk for working with
Python Eggs and the easy_install system
Tested by: pointyhat runs
Approved by: pav (portmgr)
Most work by: perky
Thanks to: pav
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/pantry/Makefile | 1 | ||||
| -rw-r--r-- | misc/py-osd/Makefile | 1 | ||||
| -rw-r--r-- | misc/py-yolk/Makefile | 18 | ||||
| -rw-r--r-- | misc/py-yolk/pkg-plist | 4 | ||||
| -rw-r--r-- | misc/pylize/Makefile | 2 |
5 files changed, 7 insertions, 19 deletions
diff --git a/misc/pantry/Makefile b/misc/pantry/Makefile index 13059c13fe97..7fcdee3d880d 100644 --- a/misc/pantry/Makefile +++ b/misc/pantry/Makefile @@ -18,6 +18,7 @@ USE_PYTHON= yes USE_PYDISTUTILS=yes MAN1= ${PORTNAME}.1 PORTDATA= master +PYDISTUTILS_PKGVERSION= ${DISTVERSION} post-extract: @${MV} ${WRKSRC}/docs/${PORTNAME}.1 ${WRKSRC}/ diff --git a/misc/py-osd/Makefile b/misc/py-osd/Makefile index c782977a7c47..74204ef6572f 100644 --- a/misc/py-osd/Makefile +++ b/misc/py-osd/Makefile @@ -22,6 +22,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/twistd:${PORTSDIR}/devel/py-twisted 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 --git a/misc/py-yolk/Makefile b/misc/py-yolk/Makefile index b0772f66e495..fe0b10764aa3 100644 --- a/misc/py-yolk/Makefile +++ b/misc/py-yolk/Makefile @@ -16,31 +16,17 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= nivit@FreeBSD.org COMMENT= A Python tool for listing packages installed by setuptools -BUILD_DEPENDS+= ${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools -RUN_DEPENDS+= ${BUILD_DEPENDS} - OPTIONS= PYPI_RSS "Enable fetching PyPI RSS feed" On OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options USE_PYTHON= yes -USE_PYDISTUTILS= yes +USE_PYDISTUTILS= easy_install .if !defined (NO_INSTALL_MAN) MAN1= ${PORTNAME}.1 .endif -PYDISTUTILS_BUILD_TARGET= bdist_egg -PYDISTUTILS_INSTALL_TARGET= easy_install -PYDISTUTILS_INSTALLARGS= -N -s ${PREFIX}/bin -S ${PYTHON_SITELIBDIR} dist/${PYYOLK_EGG} - -PLIST_SUB= EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \ - PYYOLK_EGG=${PYYOLK_EGG} PYYOLK_EGG_VER=${PYYOLK_EGG_VER} \ - PORTEXAMPLES=${PORTEXAMPLES} - -EASY_INSTALL_CMD= easy_install-${PYTHON_VER} - -PYYOLK_EGG= ${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}.egg -PYYOLK_EGG_VER= "${PORTNAME}==${PORTVERSION}" +PLIST_SUB= PORTEXAMPLES=${PORTEXAMPLES} .include <bsd.port.pre.mk> diff --git a/misc/py-yolk/pkg-plist b/misc/py-yolk/pkg-plist index d807ab317ef4..a07205a75158 100644 --- a/misc/py-yolk/pkg-plist +++ b/misc/py-yolk/pkg-plist @@ -11,6 +11,4 @@ bin/yolk %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/plugins/yolk_portage %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/plugins %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% -@unexec %%EASY_INSTALL_CMD%% -q -x -m -N -S %D/%%PYTHON_SITELIBDIR%% %%PYYOLK_EGG_VER%% -%%PYTHON_SITELIBDIR%%/%%PYYOLK_EGG%% -@exec %%EASY_INSTALL_CMD%% -x -N -S %D/%%PYTHON_SITELIBDIR%% %%PYYOLK_EGG_VER%% +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%% diff --git a/misc/pylize/Makefile b/misc/pylize/Makefile index 2c28bb3cfea2..b7e76fa2535d 100644 --- a/misc/pylize/Makefile +++ b/misc/pylize/Makefile @@ -26,6 +26,8 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/HTMLgen.py:${PORTSDIR}/www/py-HTMLgen \ USE_BZIP2= yes USE_PYTHON= 2.0+ +INSTALLS_EGGINFO= yes +PYDISTUTILS_PKGVERSION= ${PORTVERSION:S/.b/b/} PLIST_FILES= bin/pylize |