svn commit: r395083 - in head/security/autossh: . files

[Yen-Ming Lee]

Author: leeym
Date: Sun Aug 23 10:38:23 2015
New Revision: 395083
URL: https://svnweb.freebsd.org/changeset/ports/395083

Log:
  - update to 1.4e
  - add SSH_PORTABLE option
  - drop maintainership
  
  PR:		201798
  Submitted by:	franco at opnsense.org

Modified:
  head/security/autossh/Makefile
  head/security/autossh/distinfo
  head/security/autossh/files/patch-Makefile.in

Modified: head/security/autossh/Makefile
==============================================================================
--- head/security/autossh/Makefile	Sun Aug 23 10:37:22 2015	(r395082)
+++ head/security/autossh/Makefile	Sun Aug 23 10:38:23 2015	(r395083)
@@ -2,28 +2,23 @@
 # $FreeBSD$
 
 PORTNAME=	autossh
-PORTVERSION=	1.4d
+PORTVERSION=	1.4e
 CATEGORIES=	security
 MASTER_SITES=	http://www.harding.motd.ca/autossh/
-EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	leeym at FreeBSD.org
+MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Automatically restart SSH sessions and tunnels
 
+USES=		tar:tgz
 GNU_CONFIGURE=	yes
 
 PORTDOCS=	CHANGES README
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS SSH_PORTABLE
 
-.include <bsd.port.options.mk>
+SSH_PORTABLE_DESC=	Default to ports openssh (instead of base)
 
-post-patch:
-	@${REINPLACE_CMD} -e 's,cp autossh.1 ,$$\{BSD_INSTALL_MAN\} autossh.1 ,g' ${WRKSRC}/${MAKEFILE}.in
-	@${REINPLACE_CMD} -e 's,cp autossh ,$$\{BSD_INSTALL_PROGRAM\} autossh ,g' ${WRKSRC}/${MAKEFILE}.in
-	@${REINPLACE_CMD} -e 's,cp ,$$\{BSD_INSTALL_DATA\} ,g' ${WRKSRC}/${MAKEFILE}.in
-.if empty(PORT_OPTIONS:MDOCS)
-	@${REINPLACE_CMD} -Ee '/doc/d' ${WRKSRC}/${MAKEFILE}.in
-.endif
+SSH_PORTABLE_CONFIGURE_ENV=	ac_cv_path_ssh=${LOCALBASE}/bin/ssh
+SSH_PORTABLE_RUN_DEPENDS=	${LOCALBASE}/bin/ssh:${PORTSDIR}/security/openssh-portable
 
 .include <bsd.port.mk>

Modified: head/security/autossh/distinfo
==============================================================================
--- head/security/autossh/distinfo	Sun Aug 23 10:37:22 2015	(r395082)
+++ head/security/autossh/distinfo	Sun Aug 23 10:38:23 2015	(r395083)
@@ -1,2 +1,2 @@
-SHA256 (autossh-1.4d.tgz) = 00008fe458bde4c94e98bfa96e1e6e18c4107a1f9fc8a538556b82e91ddedc16
-SIZE (autossh-1.4d.tgz) = 65637
+SHA256 (autossh-1.4e.tgz) = 9e8e10a59d7619176f4b986e256f776097a364d1be012781ea52e08d04679156
+SIZE (autossh-1.4e.tgz) = 65852

Modified: head/security/autossh/files/patch-Makefile.in
==============================================================================
--- head/security/autossh/files/patch-Makefile.in	Sun Aug 23 10:37:22 2015	(r395082)
+++ head/security/autossh/files/patch-Makefile.in	Sun Aug 23 10:38:23 2015	(r395083)
@@ -1,5 +1,5 @@
---- Makefile.in.orig	2014-06-06 09:42:44.484826074 +0800
-+++ Makefile.in	2014-06-06 09:43:35.132824906 +0800
+--- Makefile.in.orig	2014-09-10 01:59:17 UTC
++++ Makefile.in
 @@ -45,18 +45,18 @@ distclean:	allclean
  		- /bin/rm -f Makefile
  
@@ -23,11 +23,11 @@
 +		mkdir -p -m 755 $(DESTDIR)$(prefix)/share/doc/autossh
 +		mkdir -p -m 755 $(DESTDIR)$(datadir)/examples/autossh
 +		mkdir -p -m 755 $(DESTDIR)$(mandir)/man1
-+		cp $(TARGET) $(DESTDIR)$(bindir)
-+		cp CHANGES README $(DESTDIR)$(datadir)/doc/autossh
-+		cp autossh.host	$(DESTDIR)$(datadir)/examples/autossh
-+		cp rscreen $(DESTDIR)$(datadir)/examples/autossh
-+		cp autossh.1 $(DESTDIR)$(mandir)/man1
++		${BSD_INSTALL_PROGRAM} $(TARGET) $(DESTDIR)$(bindir)
++		${BSD_INSTALL_DATA} CHANGES README $(DESTDIR)$(datadir)/doc/autossh
++		${BSD_INSTALL_DATA} autossh.host $(DESTDIR)$(datadir)/examples/autossh
++		${BSD_INSTALL_DATA} rscreen $(DESTDIR)$(datadir)/examples/autossh
++		${BSD_INSTALL_MAN} autossh.1 $(DESTDIR)$(mandir)/man1
 +		chmod 755 $(DESTDIR)$(bindir)/$(TARGET)
 +		chmod 644 $(DESTDIR)$(datadir)/doc/autossh/CHANGES
 +		chmod 644 $(DESTDIR)$(datadir)/doc/autossh/README