aboutsummaryrefslogtreecommitdiff
path: root/security/pssh
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 /security/pssh
parentb4be9b354e86bd790925c5a9a2e67df8ba20bc00 (diff)
downloadports-4942ce5a7d8a3d0cbebaf4d202011850d1f7569f.tar.gz
ports-4942ce5a7d8a3d0cbebaf4d202011850d1f7569f.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
Notes
Notes: svn path=/head/; revision=196700
Diffstat (limited to 'security/pssh')
-rw-r--r--security/pssh/Makefile18
-rw-r--r--security/pssh/pkg-plist4
2 files changed, 3 insertions, 19 deletions
diff --git a/security/pssh/Makefile b/security/pssh/Makefile
index e3a4d8daf00c..543dc2737c66 100644
--- a/security/pssh/Makefile
+++ b/security/pssh/Makefile
@@ -16,23 +16,9 @@ MASTER_SITE_SUBDIR= brooks
MAINTAINER= brooks@FreeBSD.org
COMMENT= Parallel versions of the openssh tools
-BUILD_DEPENDS= easy_install:${PORTSDIR}/devel/py-setuptools
-RUN_DEPENDS= easy_install:${PORTSDIR}/devel/py-setuptools \
- rsync:${PORTSDIR}/net/rsync
+RUN_DEPENDS= rsync:${PORTSDIR}/net/rsync
USE_PYTHON= YES
-USE_PYDISTUTILS=yes
-
-PLIST_SUB+= PSSH_EGG=${PSSH_EGG} \
- EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \
- PSSH_EGG=${PSSH_EGG} \
- EGG="pssh==${PORTVERSION}"
-
-PYDISTUTILS_BUILD_TARGET= bdist_egg
-PYDISTUTILS_INSTALL_TARGET= easy_install
-PYDISTUTILS_INSTALLARGS= -N -O1 -s ${PREFIX}/bin -S ${PYTHON_SITELIBDIR} dist/${PSSH_EGG}
-
-EASY_INSTALL_CMD= easy_install-${PYTHON_VER}
-PSSH_EGG= ${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}.egg
+USE_PYDISTUTILS=easy_install
.include <bsd.port.mk>
diff --git a/security/pssh/pkg-plist b/security/pssh/pkg-plist
index 0ac9198fbad4..251f21024f2a 100644
--- a/security/pssh/pkg-plist
+++ b/security/pssh/pkg-plist
@@ -1,8 +1,6 @@
-@unexec %%EASY_INSTALL_CMD%% -q -N -m -x -S %D/%%PYTHON_SITELIBDIR%% %%EGG%%
bin/prsync
bin/pnuke
bin/pslurp
bin/pssh
bin/pscp
-%%PYTHON_SITELIBDIR%%/%%PSSH_EGG%%
-@exec %%EASY_INSTALL_CMD%% -q -x -N -S %D/%%PYTHON_SITELIBDIR%% %%EGG%%
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%