Attachment 159118 Details for Bug 201798 – patch against head

[patch] patch against head

autossh_portable.patch (text/plain), 2.53 KB, created by Franco Fichtner on 2015-07-23 17:38:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Franco Fichtner

Created: 2015-07-23 17:38:15 UTC

Size: 2.53 KB

patch

obsolete

>diff --git a/security/autossh/Makefile b/security/autossh/Makefile
>index 2bd5f45..e56f0ce 100644
>--- a/security/autossh/Makefile
>+++ b/security/autossh/Makefile
>@@ -5,25 +5,20 @@ PORTNAME=	autossh
> PORTVERSION=	1.4d
> CATEGORIES=	security
> MASTER_SITES=	http://www.harding.motd.ca/autossh/
>-EXTRACT_SUFX=	.tgz
> 
> MAINTAINER=	leeym@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/files/patch-Makefile.in b/security/autossh/files/patch-Makefile.in
>index bc82b22..beb8590 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

Actions: View | Diff

Attachments on bug 201798: 159118 | 159119