Upstream would like some feedback. Lightly tested so far. Index: Makefile =================================================================== RCS file: /cvs/ports/net/mosh/Makefile,v retrieving revision 1.7 diff -u -p -r1.7 Makefile --- Makefile 11 Sep 2015 17:57:13 -0000 1.7 +++ Makefile 6 Jun 2016 18:20:42 -0000 @@ -2,7 +2,10 @@ COMMENT = mobile shell -DISTNAME = mosh-1.2.5 +GH_ACCOUNT = mobile-shell +GH_PROJECT = mosh +GH_COMMIT = mosh-1.2.5.95rc1 +DISTNAME = mosh-1.2.5.95rc1 CATEGORIES = net @@ -16,15 +19,25 @@ PERMIT_PACKAGE_CDROM = Yes WANTLIB += c crypto m ncursesw protobuf pthread ssl stdc++ util WANTLIB += z -MASTER_SITES = ${HOMEPAGE} +#MASTER_SITES = ${HOMEPAGE} LIB_DEPENDS = devel/protobuf SEPARATE_BUILD = Yes -CONFIGURE_STYLE = gnu +CONFIGURE_STYLE = autoconf automake +AUTOCONF_VERSION = 2.69 +AUTOMAKE_VERSION = 1.14 # --enable-hardening forces PIE on, which doesn't work on all arches # pick only ld(1) -z now to match upstream CONFIGURE_ARGS = --disable-hardening CONFIGURE_ENV = LDFLAGS="-Wl,-z,now ${LDFLAGS}" + +WRKDIST = ${WRKDIR}/mosh-${DISTNAME} + +post-patch: + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ + AUTOCONF_VERSION=${AUTOCONF_VERSION} \ + AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \ + ./autogen.sh .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/net/mosh/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo 11 Sep 2015 17:57:13 -0000 1.3 +++ distinfo 6 Jun 2016 18:18:39 -0000 @@ -1,2 +1,2 @@ -SHA256 (mosh-1.2.5.tar.gz) = GvgJ5ddHwzOoUvv3rNv001TcS7woOeOv5c95gZAHS+M= -SIZE (mosh-1.2.5.tar.gz) = 308857 +SHA256 (mosh-1.2.5.95rc1.tar.gz) = +qChoH4eUNctPl0p9T9ixef/GjqW/LOuoKF0REQ90gM= +SIZE (mosh-1.2.5.95rc1.tar.gz) = 194022 Index: patches/patch-src_crypto_ocb_cc =================================================================== RCS file: /cvs/ports/net/mosh/patches/patch-src_crypto_ocb_cc,v retrieving revision 1.2 diff -u -p -r1.2 patch-src_crypto_ocb_cc --- patches/patch-src_crypto_ocb_cc 11 Sep 2015 11:47:41 -0000 1.2 +++ patches/patch-src_crypto_ocb_cc 6 Jun 2016 18:27:10 -0000 @@ -2,9 +2,9 @@ $OpenBSD: patch-src_crypto_ocb_cc,v 1.2 Use generic code on ARM instead of asm because of some unsupported instructions. Introduced by https://github.com/keithw/mosh/issues/86 ---- src/crypto/ocb.cc.orig Sat Jun 27 00:28:46 2015 -+++ src/crypto/ocb.cc Mon Jun 29 23:20:32 2015 -@@ -298,7 +298,7 @@ +--- src/crypto/ocb.cc.orig Wed May 25 06:13:12 2016 ++++ src/crypto/ocb.cc Mon Jun 6 18:20:54 2016 +@@ -320,7 +320,7 @@ return swap_if_le(rval); }
-- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE