Revision: 25813
http://sourceforge.net/p/gar/code/25813
Author: dmichelsen
Date: 2016-07-08 20:38:52 +0000 (Fri, 08 Jul 2016)
Log Message:
-----------
mosh/trunk: Update to 1.2.5.95rc1
Modified Paths:
--------------
csw/mgar/pkg/mosh/trunk/Makefile
csw/mgar/pkg/mosh/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/mosh/trunk/files/0001-Add-missing-include.patch
Modified: csw/mgar/pkg/mosh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mosh/trunk/Makefile 2016-07-08 12:53:43 UTC (rev 25812)
+++ csw/mgar/pkg/mosh/trunk/Makefile 2016-07-08 20:38:52 UTC (rev 25813)
@@ -2,24 +2,29 @@
# TODO (release-critical prefixed with !, non release-critical with *)
#
NAME = mosh
-VERSION = 1.2.4
+#VERSION = 1.2.5
+VERSION = 1.2.5.95rc1
GARTYPE = v2
DESCRIPTION = Mobile shell
MASTER_SITES += http://mosh.mit.edu/
-DISTFILES += $(DISTNAME).tar.gz
+MASTER_SITES += https://github.com/keithw/mosh/archive/
+MASTER_SITES +=
https://github.com/mobile-shell/mosh/releases/download/untagged-0d43a0f73825e9952677/
+DISTNAME = mosh-mosh-$(VERSION)
+DISTFILES += $(NAME)-$(VERSION).tar.gz
-#PATCHFILES += 0001-Add-missing-include.patch
-
VENDOR_URL = http://mosh.mit.edu
+# boost gxx is only available on Solaris 10
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+
BUILD_DEP_PKGS += CSWboost-gcc-dev
-BUILD_DEP_PKGS += CSWprotobuf-gxx-dev
+#BUILD_DEP_PKGS += CSWprotobuf-gxx-dev
PACKAGES += CSWmosh
SPKG_DESC_CSWmypkg = Mobile shell
-RUNTIME_DEP_PKGS_CSWmosh += CSWlibncursesw5
+RUNTIME_DEP_PKGS_CSWmosh += CSWlibncursesw6
RUNTIME_DEP_PKGS_CSWmosh += CSWlibstdc++6
RUNTIME_DEP_PKGS_CSWmosh += CSWlibprotobuf7-gxx
RUNTIME_DEP_PKGS_CSWmosh += CSWlibgcc-s1
@@ -36,16 +41,22 @@
REINPLACE_WITH_cswperl = $(bindir)/perl
REINPLACE_FILES_cswperl += scripts/mosh
-# boost gxx is only available on Solaris 10
-PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+REINPLACEMENTS += bash
+REINPLACE_MATCH_bash = /bin/sh
+REINPLACE_WITH_bash = /bin/bash
+REINPLACE_FILES_bash += src/tests/e2e-test
+REINPLACE_FILES_bash += src/tests/*.test
-GARCOMPILER = GCC4
+GARCOMPILER = GNU
-EXTRA_CONFIGURE_EXPORTS += PROTOC
-CONFIGURE_ENV_PROTOC = $(prefix)/gxx/bin/protoc
+# We need 'grep -q' and GREP is not honoured at this place
+CONFIGURE_ENV_PATH = /opt/csw/gnu:$(PATH)
EXTRA_INC += $(prefix)/gxx/include
EXTRA_LIB += $(prefix)/gxx/lib
include gar/category.mk
+post-extract:
+ cd $(WORKSRC) && ./autogen.sh
+ @$(MAKECOOKIE)
Modified: csw/mgar/pkg/mosh/trunk/checksums
===================================================================
--- csw/mgar/pkg/mosh/trunk/checksums 2016-07-08 12:53:43 UTC (rev 25812)
+++ csw/mgar/pkg/mosh/trunk/checksums 2016-07-08 20:38:52 UTC (rev 25813)
@@ -1 +1 @@
-c2d918f4d91fdc32546e2e089f9281b2 mosh-1.2.4.tar.gz
+0297d8891e696c65629ecc7f54676801 mosh-1.2.5.95rc1.tar.gz
Deleted: csw/mgar/pkg/mosh/trunk/files/0001-Add-missing-include.patch
===================================================================
--- csw/mgar/pkg/mosh/trunk/files/0001-Add-missing-include.patch
2016-07-08 12:53:43 UTC (rev 25812)
+++ csw/mgar/pkg/mosh/trunk/files/0001-Add-missing-include.patch
2016-07-08 20:38:52 UTC (rev 25813)
@@ -1,24 +0,0 @@
-From 6cd8c0b45a4ae3ebad473ca00156b74cbff8b1a8 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <d...@opencsw.org>
-Date: Mon, 28 Jan 2013 09:21:19 +0100
-Subject: [PATCH] Add missing include
-
----
- src/frontend/mosh-client.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/frontend/mosh-client.cc b/src/frontend/mosh-client.cc
-index a9644e3..cc9d6a0 100644
---- a/src/frontend/mosh-client.cc
-+++ b/src/frontend/mosh-client.cc
-@@ -41,6 +41,7 @@
- #include "locale_utils.h"
-
- /* these need to be included last because of conflicting defines */
-+#include <sys/termio.h>
- #include <curses.h>
- #include <term.h>
-
---
-1.8.1
-
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
