(pkgsrc)

 - Update HOMEPAGE
 - Drop serveral patches, those were from git repository and now included in
   release.
(upstream)
 - Update 1.3 to 1.4
   ChangeLog unknown.

7 files changed, 11 insertions, 196 deletions

diff --git a/sysutils/amtterm/Makefile b/sysutils/amtterm/Makefile
index b787f526543..4a39efd493c 100644
--- a/sysutils/amtterm/Makefile
+++ b/sysutils/amtterm/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.23 2015/06/12 10:51:11 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2016/02/12 14:11:24 mef Exp $
 
-DISTNAME=		amtterm-1.3
-PKGREVISION=		18
+DISTNAME=		amtterm-1.4
 CATEGORIES=		sysutils
 MASTER_SITES=		http://www.kraxel.org/releases/amtterm/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		# empty
+HOMEPAGE=		https://www.kraxel.org/blog/linux/amtterm/
 COMMENT=		Active Management Technology (AMT) tools
 LICENSE=		gnu-gpl-v2
 
diff --git a/sysutils/amtterm/PLIST b/sysutils/amtterm/PLIST
index e4a850ac47c..1d6ee864a21 100644
--- a/sysutils/amtterm/PLIST
+++ b/sysutils/amtterm/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/05/13 13:24:01 obache Exp $
+@comment $NetBSD: PLIST,v 1.2 2016/02/12 14:11:24 mef Exp $
 bin/amtterm
 ${PLIST.gamt}bin/gamt
 bin/amttool
 man/man1/amtterm.1
 man/man1/amttool.1
-${PLIST.gamt}man/man1/gamt.1
+man/man1/gamt.1
 man/man7/amt-howto.7
-${PLIST.gamt}share/applications/gamt.desktop
+share/applications/gamt.desktop
diff --git a/sysutils/amtterm/distinfo b/sysutils/amtterm/distinfo
index 97250cc4bfe..daccc6e57db 100644
--- a/sysutils/amtterm/distinfo
+++ b/sysutils/amtterm/distinfo
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.5 2015/11/04 01:32:06 agc Exp $
+$NetBSD: distinfo,v 1.6 2016/02/12 14:11:24 mef Exp $
 
-SHA1 (amtterm-1.3.tar.gz) = cfd199cc870f48a59caa89408b039239eab85322
-RMD160 (amtterm-1.3.tar.gz) = 382f9869b849f7cf6180b68f2a2481225ca575af
-SHA512 (amtterm-1.3.tar.gz) = 04514b7d7a38f7e579739186829f1aba95b3580d24a47fe82382e1c85e8a24a11983117e5cc75c1f7e1f360927b40a5adc1d2ed65a2e325e7abcc01320aa654b
-Size (amtterm-1.3.tar.gz) = 37671 bytes
-SHA1 (patch-GNUmakefile) = f0ff91d80b01ea9d4b42ea752b786ce16a698c7d
-SHA1 (patch-RedirectionConstants.h) = 8124cf1f580d75f9b60ca6c34d576146b6d4e7fd
+SHA1 (amtterm-1.4.tar.gz) = 4a5ee5bf6fda4785708e4822954d1157d3e51d54
+RMD160 (amtterm-1.4.tar.gz) = fac39807990870f88884e541f4b062db8b8d1236
+SHA512 (amtterm-1.4.tar.gz) = 64bad394a2526291daa72fd211952caff20c0aa1f1c580dcbae3c92882c9fd57238c140e14749a9d58580e49890abd447e7ca466b39221301e4108c19298502f
+Size (amtterm-1.4.tar.gz) = 38445 bytes
 SHA1 (patch-mk_Variables.mk) = cb2d2fae3c0e650386308bd9290fa62c64a137f7
-SHA1 (patch-redir.c) = 930b9623d75e843a28708bbeb9c50e64332681e0
-SHA1 (patch-redir.h) = d910de3c4efd118b8d001cf17673c47857c72a3a
diff --git a/sysutils/amtterm/patches/patch-GNUmakefile b/sysutils/amtterm/patches/patch-GNUmakefile
deleted file mode 100644
index dc9afc55886..00000000000
--- a/sysutils/amtterm/patches/patch-GNUmakefile
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-GNUmakefile,v 1.1.1.1 2011/05/13 13:24:01 obache Exp $
-
-* not to install gamt related files if it is off.
-
---- GNUmakefile.orig	2008-10-30 09:59:57.000000000 +0000
-+++ GNUmakefile
-@@ -43,8 +43,10 @@ install: build
- 	$(INSTALL_DIR) $(bindir) $(appdir) $(mandir)/man1 $(mandir)/man7
- 	$(INSTALL_BINARY) $(TARGETS) $(bindir)
- 	$(INSTALL_SCRIPT) amttool $(bindir)
-+ifeq ($(HAVE_GTK)$(HAVE_VTE),yesyes)
- 	$(INSTALL_DATA) $(DESKTOP) $(appdir)
- 	$(INSTALL_DATA) gamt.man $(mandir)/man1/gamt.1
-+endif
- 	$(INSTALL_DATA) amtterm.man $(mandir)/man1/amtterm.1
- 	$(INSTALL_DATA) amttool.man $(mandir)/man1/amttool.1
- 	$(INSTALL_DATA) amt-howto.man $(mandir)/man7/amt-howto.7
diff --git a/sysutils/amtterm/patches/patch-RedirectionConstants.h b/sysutils/amtterm/patches/patch-RedirectionConstants.h
deleted file mode 100644
index b028c0880a5..00000000000
--- a/sysutils/amtterm/patches/patch-RedirectionConstants.h
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-RedirectionConstants.h,v 1.1 2015/03/16 19:19:58 tron Exp $
-
-Decode SOL_CONTROLS_FROM_HOST messages. This fixes compatiblity problems
-with the AMT interface of an Lenovo ThinkServer TS140.
-
-Patch taken from GIT repository:
-
-https://www.kraxel.org/cgit/amtterm/patch/?id=0ece5135fef56dbd0d94957c334655a57adb7212
-
---- RedirectionConstants.h.orig	2011-05-26 10:19:45.000000000 +0100
-+++ RedirectionConstants.h	2015-03-16 18:55:44.000000000 +0000
-@@ -24,6 +24,8 @@
- #define SOL_KEEP_ALIVE_PING                 0x24  //Console to Host
- #define SOL_KEEP_ALIVE_PONG                 0x25  //Host to Console
- #define SOL_DATA_TO_HOST                    0x28  //Console to host
-+#define SOL_CONTROLS_FROM_HOST              0x29  //Host to Console
-+
- #define SOL_DATA_FROM_HOST                  0x2A  //Host to Console
- #define SOL_HEARTBEAT                       0x2B
- 
-@@ -33,6 +35,19 @@
- #define END_SOL_REDIRECTION_LENGTH             8
- #define END_SOL_REDIRECTION_REPLY_LENGTH       8
- 
-+// Control message control bits (message 0x29)
-+#define RTS_CONTROL                            1
-+#define DTR_CONTROL                            2 
-+#define BREAK_CONTROL                          4
-+
-+// Control message status bits (message 0x29)
-+#define TX_OVERFLOW                            1
-+#define LOOPBACK_ACTIVE                        2
-+#define SYSTEM_POWER_STATE                     4
-+#define RX_FLUSH_TIMEOUT                       8
-+#define TESTMODE_ACTIVE                       16
-+
-+
- //IDER Messages Formats
- #define START_IDER_REDIRECTION              0x40
- #define START_IDER_REDIRECTION_REPLY        0x41
diff --git a/sysutils/amtterm/patches/patch-redir.c b/sysutils/amtterm/patches/patch-redir.c
deleted file mode 100644
index 6c7e153594c..00000000000
--- a/sysutils/amtterm/patches/patch-redir.c
+++ /dev/null
@@ -1,91 +0,0 @@
-$NetBSD: patch-redir.c,v 1.2 2015/03/16 19:19:58 tron Exp $
-
-Decode SOL_CONTROLS_FROM_HOST messages. This fixes compatiblity problems
-with the AMT interface of an Lenovo ThinkServer TS140.
-
-Patch taken from GIT repository:
-
-https://www.kraxel.org/cgit/amtterm/patch/?id=0ece5135fef56dbd0d94957c334655a57adb7212
-
---- redir.c.orig	2011-05-26 10:19:45.000000000 +0100
-+++ redir.c	2015-03-16 19:16:49.000000000 +0000
-@@ -281,8 +281,11 @@
- 
- 	switch (count) {
- 	case -1:
--	    snprintf(r->err, sizeof(r->err), "read(socket): %s", strerror(errno));
--	    return -1;
-+	    if (errno != EAGAIN) {
-+	      snprintf(r->err, sizeof(r->err), "read(socket): %s", strerror(errno));
-+	      return -1;
-+	    }
-+	    break;
- 	case 0:
- 	    snprintf(r->err, sizeof(r->err), "EOF from socket");
- 	    return -1;
-@@ -298,6 +301,9 @@
-     return bshift;
- }
- 
-+static int in_loopback_mode = 0;
-+static int powered_off = 0;
-+
- int redir_data(struct redir *r)
- {
-     int rc, bshift;
-@@ -382,6 +388,55 @@
- 		goto again;
- 	    redir_stop(r);
- 	    break;
-+	case SOL_CONTROLS_FROM_HOST: {
-+	  bshift = r->blen; /* FIXME */
-+	  if (r->blen < bshift)
-+	    goto again;
-+	  
-+	  /* Host sends this message to the Management Console when
-+	   * the host has changed its COM port control lines. This
-+	   * message is likely to be one of the first messages that
-+	   * the Host sends to the Console after it starts SOL
-+	   * redirection.
-+	   */
-+	  struct controls_from_host_message *msg = (struct controls_from_host_message *) r->buf;
-+	  //printf("Type %x, control %d, status %d\n", msg->type, msg->control, msg->status);
-+	  if (msg->status & LOOPBACK_ACTIVE) {
-+	    if (r->verbose)
-+	      fprintf (stderr, "Warning, SOL device is running in loopback mode.  Text input may not be accepted\n");
-+	    in_loopback_mode = 1;
-+	  } else if (in_loopback_mode) {
-+	    if (r->verbose)
-+	      fprintf (stderr, "SOL device is no longer running in loopback mode\n");
-+	    in_loopback_mode = 0;
-+	  }
-+
-+	  if (0 == (msg->status & SYSTEM_POWER_STATE))  {
-+	    if (r->verbose)
-+	      fprintf (stderr, "The system is powered off.\n");
-+	    powered_off = 1;
-+	  } else if (powered_off) {
-+	    if (r->verbose)
-+	      fprintf (stderr, "The system is powered on.\n");
-+	    powered_off = 0;
-+	  }
-+	  
-+	  if (r->verbose) {
-+	    if (msg->status & (TX_OVERFLOW|RX_FLUSH_TIMEOUT|TESTMODE_ACTIVE))
-+	      fprintf (stderr, "Other unhandled status condition\n");
-+	    
-+	    if (msg->control & RTS_CONTROL) 
-+	      fprintf (stderr, "RTS is asserted on the COM Port\n");
-+	    
-+	    if (msg->control & DTR_CONTROL) 
-+	      fprintf (stderr, "DTR is asserted on the COM Port\n");
-+	    
-+	    if (msg->control & BREAK_CONTROL) 
-+	      fprintf (stderr, "BREAK is asserted on the COM Port\n");
-+	  }
-+
-+	  break;
-+	}
- 	default:
- 	    snprintf(r->err, sizeof(r->err), "%s: unknown r->buf 0x%02x",
- 		     __FUNCTION__, r->buf[0]);
diff --git a/sysutils/amtterm/patches/patch-redir.h b/sysutils/amtterm/patches/patch-redir.h
deleted file mode 100644
index 63b70d303d1..00000000000
--- a/sysutils/amtterm/patches/patch-redir.h
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-redir.h,v 1.1 2015/03/16 19:19:58 tron Exp $
-
-Decode SOL_CONTROLS_FROM_HOST messages. This fixes compatiblity problems
-with the AMT interface of an Lenovo ThinkServer TS140.
-
-Patch taken from GIT repository:
-
-https://www.kraxel.org/cgit/amtterm/patch/?id=0ece5135fef56dbd0d94957c334655a57adb7212
-
---- redir.h.orig	2011-05-26 10:19:45.000000000 +0100
-+++ redir.h	2015-03-16 18:55:44.000000000 +0000
-@@ -1,4 +1,5 @@
- #include "RedirectionConstants.h"
-+#include <stdint.h>
- 
- enum redir_state {
-     REDIR_NONE      =  0,
-@@ -38,6 +39,14 @@
-     int (*cb_recv)(void *cb_data, unsigned char *buf, int len);
- };
- 
-+struct __attribute__ ((__packed__)) controls_from_host_message {
-+    unsigned char type; // 0x29
-+    unsigned char reserved[3];
-+    uint32_t      host_sequence_number;
-+    unsigned char control; 
-+    unsigned char status;
-+};
-+
- const char *redir_state_name(enum redir_state state);
- const char *redir_state_desc(enum redir_state state);
-