- Update to version 2.7

- Add option DOCS
- Switch to PLIST_FILES

PR:		ports/172220
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
Feature safe:	yes

4 files changed, 29 insertions, 57 deletions

diff --git a/comms/ser2net/Makefile b/comms/ser2net/Makefile
index 9923373e2d1d..3621037af052 100644
--- a/comms/ser2net/Makefile
+++ b/comms/ser2net/Makefile
@@ -2,29 +2,47 @@
 # $FreeBSD$
 
 PORTNAME=	ser2net
-PORTVERSION=	2.5
+PORTVERSION=	2.7
 CATEGORIES=	comms net
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Allows to access serial ports over IP
 
+LICENSE=	GPLv2 # (or later)
+
+OPTIONS_DEFINE=	DOCS
+
+USE_RC_SUBR=	${PORTNAME}
+
 GNU_CONFIGURE=	yes
+
 MAN8=		${PORTNAME}.8
-USE_RC_SUBR=	${PORTNAME}
+PORTDOCS=	AUTHORS ChangeLog INSTALL NEWS README
+PLIST_FILES=	sbin/${PORTNAME} etc/${PORTNAME}.conf.sample
 
-DOCS=		AUTHORS COPYING ChangeLog INSTALL NEWS README
+.include <bsd.port.options.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e's!/etc!${PREFIX}/etc!g' ${WRKSRC}/${PORTNAME}.c ${WRKSRC}/${PORTNAME}.8
+.for i in ${PORTNAME}.c ${PORTNAME}.8
+	@${REINPLACE_CMD} -e \
+		's!/etc!${PREFIX}/etc!g' ${WRKSRC}/${i}
+.endfor
+.for i in ${PORTNAME}.conf
+	@${REINPLACE_CMD} -e \
+		's!ttyS!cuad!g' ${WRKSRC}/${i}
+.endfor
 
 do-install:
-.if !defined(NOPORTDOCS)
+	(cd ${WRKSRC} \
+		&& ${INSTALL_PROGRAM} ${PORTNAME} ${PREFIX}/sbin \
+		&& ${INSTALL_MAN} ${PORTNAME}.8 ${MAN8PREFIX}/man/man8 \
+		&& ${INSTALL_DATA} ${PORTNAME}.conf ${PREFIX}/etc/${PORTNAME}.conf.sample)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
+.for i in ${PORTDOCS}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${DOCSDIR})
+.endfor
 .endif
-	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/sbin/
-	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${PREFIX}/etc/${PORTNAME}.conf.sample
-	@${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${MAN8PREFIX}/man/man8/
 
 .include <bsd.port.mk>
diff --git a/comms/ser2net/distinfo b/comms/ser2net/distinfo
index 96fde6fa8e85..a6b05c8d4029 100644
--- a/comms/ser2net/distinfo
+++ b/comms/ser2net/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ser2net-2.5.tar.gz) = fb7bf30c967b4d64f12e6d81f99df3d3e65bb31a919625ec2820e68f65dcef1c
-SIZE (ser2net-2.5.tar.gz) = 343105
+SHA256 (ser2net-2.7.tar.gz) = 620265d5d4a59714dbb8645d1698a34135077c735e018ef040d57e7d3a621088
+SIZE (ser2net-2.7.tar.gz) = 355064
diff --git a/comms/ser2net/files/patch-ser2net.conf b/comms/ser2net/files/patch-ser2net.conf
deleted file mode 100644
index 6ea46cf36219..000000000000
--- a/comms/ser2net/files/patch-ser2net.conf
+++ /dev/null
@@ -1,37 +0,0 @@
---- ser2net.conf.old	Sun Sep  3 16:41:58 2006
-+++ ser2net.conf	Sun Sep  3 16:42:58 2006
-@@ -69,19 +69,19 @@
- 
- BANNER:banner3:this is ser2net TCP port \p device \d  serial parms \s\r\n
- 
--2001:raw:600:/dev/ttyS0:9600 NONE 1STOPBIT 8DATABITS XONXOFF LOCAL -RTSCTS
--#2002:raw:600:/dev/ttyS1:9600 NONE 1STOPBIT 8DATABITS XONXOFF LOCAL -RTSCTS
--2003:raw:5:/dev/ttyS2:9600
--2004:raw:5:/dev/ttyS3:115200
--2005:raw:5:/dev/ttyS4:9600
--2006:raw:5:/dev/ttyS5:9600
--2007:raw:5:/dev/ttyS6:9600
--3001:telnet:0:/dev/ttyS0:19200 remctl banner1
--3011:telnet:3:/dev/ttyS0:19200 banner2
--#3002:telnet:0:/dev/ttyS1:9600
--3003:telnet:0:/dev/ttyS2:9600 banner3
--3004:telnet:0:/dev/ttyS3:115200
--3005:telnet:0:/dev/ttyS4:9600
--3006:telnet:0:/dev/ttyS5:9600
--3007:telnet:0:/dev/ttyS6:9600
-+2001:raw:600:/dev/cuad0:9600 NONE 1STOPBIT 8DATABITS XONXOFF LOCAL -RTSCTS
-+#2002:raw:600:/dev/cuad1:9600 NONE 1STOPBIT 8DATABITS XONXOFF LOCAL -RTSCTS
-+2003:raw:5:/dev/cuad2:9600
-+2004:raw:5:/dev/cuad3:115200
-+2005:raw:5:/dev/cuad4:9600
-+2006:raw:5:/dev/cuad5:9600
-+2007:raw:5:/dev/cuad6:9600
-+3001:telnet:0:/dev/cuad0:19200 remctl banner1
-+3011:telnet:3:/dev/cuad0:19200 banner2
-+#3002:telnet:0:/dev/cuad1:9600
-+3003:telnet:0:/dev/cuad2:9600 banner3
-+3004:telnet:0:/dev/cuad3:115200
-+3005:telnet:0:/dev/cuad4:9600
-+3006:telnet:0:/dev/cuad5:9600
-+3007:telnet:0:/dev/cuad6:9600
- 5001:rawlp:10:/dev/lp0
diff --git a/comms/ser2net/pkg-plist b/comms/ser2net/pkg-plist
deleted file mode 100644
index 050a80527b8d..000000000000
--- a/comms/ser2net/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-sbin/ser2net
-etc/ser2net.conf.sample
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%