From 66e4562fc6374061f5cad5b803b3b0182dda10e9 Mon Sep 17 00:00:00 2001
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Mon, 9 Nov 2015 20:48:17 +0000
Subject: [PATCH] - Fix license - Switch to options helpers - Regenerate
 patches with `make makepatch`

---
 comms/tcpser/Makefile             | 9 +++++----
 comms/tcpser/files/patch-Makefile | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/comms/tcpser/Makefile b/comms/tcpser/Makefile
index 5a16c4bec655..0cd829f342ae 100644
--- a/comms/tcpser/Makefile
+++ b/comms/tcpser/Makefile
@@ -9,10 +9,7 @@ MASTER_SITES=	http://www.jbrain.com/pub/linux/serial/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	TCPSER turns serial port into an emulated Hayes compatible modem
 
-LICENSE=	GPLv2 GPLv3
-LICENSE_COMB=	dual
-
-OPTIONS_DEFINE=	DOCS
+LICENSE=	GPLv2 # or later
 
 LDFLAGS+=	-pthread
 USES=		dos2unix gmake
@@ -21,8 +18,12 @@ WRKSRC=		${WRKDIR}/tcpser
 PORTDOCS=	README CHANGES
 PLIST_FILES=	bin/tcpser
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tcpser ${STAGEDIR}${PREFIX}/bin
+
+do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/README ${WRKSRC}/CHANGES ${STAGEDIR}${DOCSDIR}
 
diff --git a/comms/tcpser/files/patch-Makefile b/comms/tcpser/files/patch-Makefile
index afd163d3ecc6..c98fc15ea037 100644
--- a/comms/tcpser/files/patch-Makefile
+++ b/comms/tcpser/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	2008-09-24 16:42:06.000000000 +0200
-+++ Makefile	2008-09-24 16:42:35.000000000 +0200
+--- Makefile.orig	2015-11-09 18:00:33 UTC
++++ Makefile
 @@ -1,10 +1,8 @@
  SRC=src
  SRCS = $(SRC)/bridge.c $(SRC)/debug.c $(SRC)/getcmd.c $(SRC)/ip.c $(SRC)/init.c $(SRC)/modem_core.c $(SRC)/nvt.c $(SRC)/serial.c $(SRC)/ip232.c $(SRC)/util.c $(SRC)/phone_book.c $(SRC)/shared.c $(SRC)/tcpser.c $(SRC)/line.c $(SRC)/dce.c