summaryrefslogtreecommitdiff
path: root/misc/py-yolk
diff options
context:
space:
mode:
authorAlexander Botero-Lowry <alexbl@FreeBSD.org>2007-07-30 09:42:28 +0000
committerAlexander Botero-Lowry <alexbl@FreeBSD.org>2007-07-30 09:42:28 +0000
commit4942ce5a7d8a3d0cbebaf4d202011850d1f7569f (patch)
treedb1f21912f461000d609ddcd5d130946bcfe9e09 /misc/py-yolk
parentIn ATLAS/INSTALL.txt it is said that gcc42 is superior to both gcc3 and gcc41 (diff)
- 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
Notes
Notes: svn path=/head/; revision=196700
Diffstat (limited to 'misc/py-yolk')
-rw-r--r--misc/py-yolk/Makefile18
-rw-r--r--misc/py-yolk/pkg-plist4
2 files changed, 3 insertions, 19 deletions
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%%