aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorleeym <leeym@FreeBSD.org>2015-08-23 18:38:23 +0800
committerleeym <leeym@FreeBSD.org>2015-08-23 18:38:23 +0800
commit35dcac4e32d3f511386244d20aac2ad6d2322be4 (patch)
treea6dfee813f40a8b7f494699e1025bcd184e2d913
parenteb0d46a11c2add618cf469d14a0e7cbb087fd54b (diff)
downloadfreebsd-ports-gnome-35dcac4e32d3f511386244d20aac2ad6d2322be4.tar.gz
freebsd-ports-gnome-35dcac4e32d3f511386244d20aac2ad6d2322be4.tar.zst
freebsd-ports-gnome-35dcac4e32d3f511386244d20aac2ad6d2322be4.zip
- update to 1.4e
- add SSH_PORTABLE option - drop maintainership PR: 201798 Submitted by: franco@opnsense.org
-rw-r--r--security/autossh/Makefile19
-rw-r--r--security/autossh/distinfo4
-rw-r--r--security/autossh/files/patch-Makefile.in14
3 files changed, 16 insertions, 21 deletions
diff --git a/security/autossh/Makefile b/security/autossh/Makefile
index 2bd5f457c4a2..8f9463cc047f 100644
--- a/security/autossh/Makefile
+++ b/security/autossh/Makefile
@@ -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@FreeBSD.org
+MAINTAINER= ports@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>
diff --git a/security/autossh/distinfo b/security/autossh/distinfo
index d83dd826301b..1c0553ba876b 100644
--- a/security/autossh/distinfo
+++ b/security/autossh/distinfo
@@ -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
diff --git a/security/autossh/files/patch-Makefile.in b/security/autossh/files/patch-Makefile.in
index bc82b22b9931..beb8590ccc31 100644
--- a/security/autossh/files/patch-Makefile.in
+++ b/security/autossh/files/patch-Makefile.in
@@ -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