misc/susv*: fix fallout from PR#230864/c479406, misc fixes

susv2, update URLs to keep things downloadable
susv3, add a more direct access link
susv4, update to newer version (2018 edition), revise pkg-descr

susv2, susv3: add the file revision date to PORTVERSION for consistency and
transparency.

all: add OPTIONS_SLAVE=DOCS because it is no good installing an empty port,
systems that do not want documentation shall not install these ports.

all: Reshuffle Makefile lines to reduce number of portlint warnings.

5 files changed, 56 insertions, 22 deletions

diff --git a/misc/susv2/Makefile b/misc/susv2/Makefile
index 26749c2b6737..9df29dd94621 100644
--- a/misc/susv2/Makefile
+++ b/misc/susv2/Makefile
@@ -2,26 +2,34 @@
 # $FreeBSD$
 
 PORTNAME=	susv2
-PORTVERSION=	1.0
+PORTVERSION=	1.0.20010716
 CATEGORIES=	misc
 MASTER_SITES=	#
 DISTNAME=	susv2
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	Single UNIX Specification Version 2
 
-RESTRICTED=	Redistribution of the documents is not permitted
+LICENSE=	NONE
 
 USES=		tar:bzip2
+
+RESTRICTED=	Redistribution of the documents is not permitted
+
 NO_BUILD=	yes
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
+# Fix fallout of https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=230864 and force the option on;
+# meaning is to force this option on. The previous change around Sept 2018 introduced a regression in
+# that PORTDOCS only works if there is a DOCS option.  It does not, however, make sense to install
+# empty documentation ports.
+OPTIONS_SLAVE=	DOCS
 
 .include <bsd.port.pre.mk>
 
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
-IGNORE=		may not be redistributed because of licensing reasons. Please visit http://www.unix.org/version2/online.html to accept their license and download ${DISTFILES} into ${DISTDIR}
+IGNORE=		may not be redistributed because of licensing reasons. Please visit http://www.unix.org/version2/online.html or http://pubs.opengroup.org/onlinepubs/7908799/download/ to accept their license and download ${DISTFILES} into ${DISTDIR}
 .endif
 
 do-install:
diff --git a/misc/susv3/Makefile b/misc/susv3/Makefile
index e78307f40341..815737714b2c 100644
--- a/misc/susv3/Makefile
+++ b/misc/susv3/Makefile
@@ -2,26 +2,34 @@
 # $FreeBSD$
 
 PORTNAME=	susv3
-PORTVERSION=	1.2
+PORTVERSION=	1.2.20050121
 CATEGORIES=	misc
 MASTER_SITES=	#
 DISTNAME=	susv3
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	Single UNIX Specification Version 3
 
-RESTRICTED=	Redistribution of the documents is not permitted
+LICENSE=	NONE
 
 USES=		tar:bzip2
+
+RESTRICTED=	Redistribution of the documents is not permitted
+
 NO_BUILD=	yes
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
+# Fix fallout of https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=230864 and force the option on;
+# meaning is to force this option on. The previous change around Sept 2018 introduced a regression in
+# that PORTDOCS only works if there is a DOCS option.  It does not, however, make sense to install
+# empty documentation ports.
+OPTIONS_SLAVE=	DOCS
 
 .include <bsd.port.pre.mk>
 
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
-IGNORE=		may not be redistributed because of licensing reasons. Please visit http://www.unix.org/version3/online.html to accept their license and download ${DISTFILES} into ${DISTDIR}
+IGNORE=		may not be redistributed because of licensing reasons. Please visit http://www.unix.org/version3/online.html or https://publications.opengroup.org/t041 to accept their license and download ${DISTFILES} into ${DISTDIR} . You may need to choose "Read HTML Edition Online", navigate to it, and then find the Download link at the bottom right of the page
 .endif
 
 do-install:
diff --git a/misc/susv4/Makefile b/misc/susv4/Makefile
index 6c33773db9bd..ce793ff42117 100644
--- a/misc/susv4/Makefile
+++ b/misc/susv4/Makefile
@@ -1,26 +1,31 @@
-# Based on a port created by: Simon 'corecode' Schubert <corecode@corecode.ath.cx>
 # $FreeBSD$
 
 PORTNAME=	susv4
-PORTVERSION=	20160930
+PORTVERSION=	20180131
 CATEGORIES=	misc
 MASTER_SITES=	#
-DISTNAME=	susv4tc2
+DISTNAME=	susv4-2018
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	mandree@FreeBSD.org
-COMMENT=	Open Group Base Specifications Issue 7/IEEE Std 1003.1, 2016 Edition
+COMMENT=	Open Group Base Specifications Issue 7/IEEE Std 1003.1, 2018 Edition
 
 LICENSE=	NONE
 
+USES=		tar:bzip2
+
 RESTRICTED=	Redistribution of the documents is not permitted
 
-USES=		tar:bzip2
 NO_ARCH=	yes
 NO_BUILD=	yes
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
+# Fix fallout of https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=230864 and force the option on;
+# meaning is to force this option on. The previous change around Sept 2018 introduced a regression in
+# that PORTDOCS only works if there is a DOCS option.  It does not, however, make sense to install
+# empty documentation ports.
+OPTIONS_SLAVE=	DOCS
 
 .include <bsd.port.pre.mk>
 
@@ -30,6 +35,8 @@ IGNORE=		may not be redistributed because of licensing reasons. Please visit htt
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && \
+		${FIND} . -name '*~' -delete && \
+		${COPYTREE_SHARE} '*' ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/misc/susv4/distinfo b/misc/susv4/distinfo
index e84ce3b72a04..eb95ac96bb7d 100644
--- a/misc/susv4/distinfo
+++ b/misc/susv4/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1475876435
-SHA256 (susv4-20160930/susv4tc2.tar.bz2) = 9b50e290912dff356687b7585ea2d7a7e746231e1dd4adcb20833fa54e1f4d35
-SIZE (susv4-20160930/susv4tc2.tar.bz2) = 3649434
+TIMESTAMP = 1538830673
+SHA256 (susv4-20180131/susv4-2018.tar.bz2) = 73cc1347aa7e19d69265c62570696c8b9d2d06665c5d81d6acb1ea825b25534b
+SIZE (susv4-20180131/susv4-2018.tar.bz2) = 3665202
diff --git a/misc/susv4/pkg-descr b/misc/susv4/pkg-descr
index 66d1944ae3c0..f87ced3cc5fd 100644
--- a/misc/susv4/pkg-descr
+++ b/misc/susv4/pkg-descr
@@ -1,8 +1,19 @@
-The Single UNIX Specification Version 4, technically identical to IEEE
-Std 1003.1, 2016 Edition or The Open Group Base Specifications Issue 7
-is a technical standard. It includes IEEE Std 1003.1-2008/Cor 1-2013,
-the Technical Corrigenda No. 1 and No. 2 addressing problems discovered
-since the approval of the 2008 edition.
+The Single UNIX Specification Version 4, 2018 Edition, alias POSIX.1-2017,
+reference T101. Technically identical to IEEE Std 1003.1-2017 and ISO/IEC
+9945:2009 including ISO/IEC 9945:2009/Cor 1:2013(E) and ISO/IEC 9945:2009/Cor
+2:2017(E) with the addition of X/Open Curses.
+
+It is simultaneously The Open Group Base Specifications Issue 7.
+
+POSIX.1-2017 defines a standard operating system interface and environment,
+including a command interpreter (or “shell”), and common utility programs to
+support applications portability at the source code level. POSIX.1-2017 is
+intended to be used by both application developers and system implementors.
+
+This set consists of the Base Specifications, Issue 7 that make up the Single
+UNIX Specification, Version 4, together with X/Open Curses, Issue 7. The Base
+Specifications were developed by the Austin Group, a joint working group of the
+IEEE, The Open Group, and ISO/IEC JTC 1/SC22/WG15.
 
 This port permits to install and register the HTML personal copy
 that the user must download in .tar.bz2 format by himself.