svn commit: r359831 - in head/security/hotssh: . files

[Ashish SHUKLA]

Author: ashish
Date: Mon Jun 30 12:04:09 2014
New Revision: 359831
URL: http://svnweb.freebsd.org/changeset/ports/359831
QAT: https://qat.redports.org/buildarchive/r359831/

Log:
  - Add STAGE support
  - Add LICENSE information
  - Fix building on 10.x and later

Added:
  head/security/hotssh/files/patch-wscript   (contents, props changed)
Modified:
  head/security/hotssh/Makefile

Modified: head/security/hotssh/Makefile
==============================================================================
--- head/security/hotssh/Makefile	Mon Jun 30 11:43:58 2014	(r359830)
+++ head/security/hotssh/Makefile	Mon Jun 30 12:04:09 2014	(r359831)
@@ -3,7 +3,7 @@
 
 PORTNAME=	hotssh
 PORTVERSION=	0.2.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	security gnome
 MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -11,6 +11,9 @@ MASTER_SITE_SUBDIR=	sources/${PORTNAME}/
 MAINTAINER=	ashish at FreeBSD.org
 COMMENT=	HotSSH is an interface to Secure Shell, for GNOME and OpenSSH
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus \
 		${LOCALBASE}/libdata/pkgconfig/pygobject-2.0.pc:${PORTSDIR}/devel/py-gobject \
 		${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib \
@@ -30,20 +33,19 @@ USE_BZIP2=	yes
 B64DECODE?=	/usr/bin/b64decode
 BSPATCH?=	/usr/bin/bspatch
 
-NO_STAGE=	yes
 post-extract:
-	${GREP} -Rl '^#!/usr/bin/python$$' ${WRKSRC} |${XARGS} ${REINPLACE_CMD} -e 's|^#!/usr/bin/python$$|#!/usr/bin/env python|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"
+	@${GREP} -Rl '^#!/usr/bin/python$$' ${WRKSRC} |${XARGS} ${REINPLACE_CMD} -e 's|^#!/usr/bin/python$$|#!/usr/bin/env python|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"
 
 do-configure:
-	cd ${WRKSRC} && ./waf configure --prefix=${PREFIX}
+	@cd ${WRKSRC} && ./waf configure --prefix=${PREFIX}
 
 do-build:
-	cd ${WRKSRC} && ./waf
+	@cd ${WRKSRC} && ./waf
 
 do-install:
-	cd ${WRKSRC} && ./waf install
+	@cd ${WRKSRC} && ./waf install --destdir=${STAGEDIR}
 
 .include <bsd.port.mk>

Added: head/security/hotssh/files/patch-wscript
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/hotssh/files/patch-wscript	Mon Jun 30 12:04:09 2014	(r359831)
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- wscript.orig
++++ wscript
+@@ -14,7 +14,7 @@
+ 	opt.tool_options('python')
+ 
+ def configure(conf):
+-	conf.check_tool('gcc gnome python intltool misc')
++	conf.check_tool('cc gnome python intltool misc')
+ 	conf.check_python_version((2,4,2))
+ 
+ 	conf.check_python_module('dbus')