svn commit: r455856 - head/security/hotssh

Antoine Brodin antoine at FreeBSD.org
Sat Dec 9 13:12:14 UTC 2017


Author: antoine
Date: Sat Dec  9 13:12:12 2017
New Revision: 455856
URL: https://svnweb.freebsd.org/changeset/ports/455856

Log:
  - hotssh doesn't work with python3
  - add explicit FLAVOR to dependencies (useful when using
    DEFAULT_VERSIONS=python=3.x)
  - fix shebang

Modified:
  head/security/hotssh/Makefile

Modified: head/security/hotssh/Makefile
==============================================================================
--- head/security/hotssh/Makefile	Sat Dec  9 12:55:23 2017	(r455855)
+++ head/security/hotssh/Makefile	Sat Dec  9 13:12:12 2017	(r455856)
@@ -3,7 +3,7 @@
 
 PORTNAME=	hotssh
 PORTVERSION=	0.2.7
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	security gnome
 MASTER_SITES=	GNOME
 
@@ -13,18 +13,16 @@ COMMENT=	HotSSH is an interface to Secure Shell, for G
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus \
-		${LOCALBASE}/libdata/pkgconfig/pygobject-2.0.pc:devel/py-gobject \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \
 		${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc:devel/dbus-glib \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
-		${PYTHON_SITELIBDIR}/gtk-2.0/vtemodule.so:x11-toolkits/py-vte
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus \
-		${LOCALBASE}/libdata/pkgconfig/pygobject-2.0.pc:devel/py-gobject \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
-		${PYTHON_SITELIBDIR}/gtk-2.0/vtemodule.so:x11-toolkits/py-vte
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}vte>=0:x11-toolkits/py-vte@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}vte>=0:x11-toolkits/py-vte@${PY_FLAVOR}
 
-USE_GNOME=	pygtk2 gnomedocutils libxslt glib20 intltool
-USES=		gettext python tar:bzip2 waf
+USE_GNOME=	glib20 gnomedocutils intltool libxslt pygobject pygtk2
+USES=		gettext python:2.7 tar:bzip2 waf
 INSTALLS_ICONS=	yes
 NO_ARCH=	yes
 
@@ -32,7 +30,7 @@ B64DECODE?=	/usr/bin/b64decode
 BSPATCH?=	/usr/bin/bspatch
 
 post-extract:
-	@${GREP} -Rl '^#!/usr/bin/python$$' ${WRKSRC} |${XARGS} ${REINPLACE_CMD} -e 's|^#!/usr/bin/python$$|#!/usr/bin/env python|g'
+	@${GREP} -Rl '^#!/usr/bin/python$$' ${WRKSRC} |${XARGS} ${REINPLACE_CMD} -e 's|^#!/usr/bin/python$$|#!${PYTHON_CMD}|g'
 	@${MV} ${WRKSRC}/waf ${WRKSRC}/waf.beforepatch
 	@cd ${WRKSRC} && ${B64DECODE} -o waf.diff ${FILESDIR}/waf.diff && ${BSPATCH} waf.beforepatch waf waf.diff && ${CHMOD} 755 waf
 	@${GREP} -Rl '%%LOCALBASE%%' ${WRKSRC} |${XARGS} ${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g"


More information about the svn-ports-head mailing list