svn commit: r565345 - head/x11/x3270

[Kevin Bowling]

Author: kbowling
Date: Mon Feb 15 21:42:48 2021
New Revision: 565345
URL: https://svnweb.freebsd.org/changeset/ports/565345

Log:
  x11/x3270: Fix manpage install and fix DBCS option
  
  Sponsored by:	BBOX.io

Modified:
  head/x11/x3270/Makefile
  head/x11/x3270/pkg-plist

Modified: head/x11/x3270/Makefile
==============================================================================
--- head/x11/x3270/Makefile	Mon Feb 15 21:39:06 2021	(r565344)
+++ head/x11/x3270/Makefile	Mon Feb 15 21:42:48 2021	(r565345)
@@ -3,7 +3,7 @@
 
 PORTNAME?=	x3270
 PORTVERSION=	4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES?=	x11 net
 MASTER_SITES=	http://x3270.bgp.nu/download/04.00/
 DISTFILES=	suite3270-${PORTVERSION}ga14-src.tgz
@@ -35,8 +35,10 @@ WRKSRC=		${WRKDIR}/suite3270-${PORTVERSION}
 
 PORTEXAMPLES=	*
 
-OPTIONS_DEFINE=	DOCS EXAMPLES MDBCS
+OPTIONS_DEFINE=	DOCS EXAMPLES DBCS
 
+DBCS_DESC=	EBCDIC double-byte character set support
+
 .include <bsd.port.options.mk>
 
 .if ! defined(C3270)
@@ -55,7 +57,7 @@ PLIST_SUB+=	X3270="@comment "
 .endif
 
 # EBCDIC double-byte character set support is disabled by default
-.if ${PORT_OPTIONS:MDBCS}
+.if ${PORT_OPTIONS:DBCS}
 CONFIGURE_ARGS+=	--enable-dbcs
 PLIST_SUB+=	DBCS=""
 .else
@@ -63,16 +65,19 @@ PLIST_SUB+=	DBCS="@comment "
 .endif
 
 post-install:
-.for m in b3270/b3270.man c3270/c3270.man pr3287/pr3287.man s3270/s3270.man \
-    tcl3270/tcl3270.man x3270/x3270-script.man x3270/x3270.man \
-    x3270if/x3270if.man
-	@(cd ${WRKSRC} ; ${INSTALL_MAN} ${m} ${STAGEDIR}${MAN1PREFIX}/man/man1/)
+.for m in b3270 c3270 pr3287 s3270 tcl3270
+	@(cd ${WRKSRC} ; ${INSTALL_MAN} ${m}/${m}.man ${STAGEDIR}${MAN1PREFIX}/man/man1/${m}.1)
 .endfor
-	${INSTALL_MAN} ${WRKSRC}/c3270/ibm_hosts.man ${STAGEDIR}${MAN5PREFIX}/man/man5/
+.if ! defined(C3270)
+	${INSTALL_MAN} ${WRKSRC}/x3270/x3270.man ${STAGEDIR}${MAN5PREFIX}/man/man1/x3270.1
+	${INSTALL_MAN} ${WRKSRC}/x3270if/x3270if.man ${STAGEDIR}${MAN5PREFIX}/man/man1/x3270if.1
+	${INSTALL_MAN} ${WRKSRC}/x3270/x3270-script.man ${STAGEDIR}${MAN5PREFIX}/man/man1/x3270-script.1
+.endif
+	${INSTALL_MAN} ${WRKSRC}/c3270/ibm_hosts.man ${STAGEDIR}${MAN5PREFIX}/man/man5/ibm_hosts.5
 
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/x3270/README ${STAGEDIR}${DOCSDIR}
-.if ${PORT_OPTIONS:MDBCS}
+.if ${PORT_OPTIONS:DBCS}
 	${INSTALL_DATA} ${WRKSRC}/x3270/README.dbcs ${STAGEDIR}${DOCSDIR}
 .endif
 

Modified: head/x11/x3270/pkg-plist
==============================================================================
--- head/x11/x3270/pkg-plist	Mon Feb 15 21:39:06 2021	(r565344)
+++ head/x11/x3270/pkg-plist	Mon Feb 15 21:42:48 2021	(r565345)
@@ -25,17 +25,14 @@ etc/x3270/ibm_hosts
 %%X3270%%%%FONTSDIR%%/3270gt8.pcf.gz
 %%X3270%%%%FONTSDIR%%/3270h.pcf.gz
 @comment %%FONTSDIR%%/fonts.dir
-man/man1/b3270.man.gz
-man/man1/c3270.man.gz
-man/man1/pr3287.man.gz
-man/man1/s3270.man.gz
-man/man1/tcl3270.man.gz
-%%X3270%%man/man1/x3270-script.man.gz
-%%X3270%%man/man1/x3270.man.gz
-%%X3270%%man/man1/x3270if.man.gz
-man/man5/ibm_hosts.man.gz
+man/man1/b3270.1.gz
+man/man1/c3270.1.gz
+man/man1/pr3287.1.gz
+man/man1/s3270.1.gz
+man/man1/tcl3270.1.gz
+%%X3270%%man/man1/x3270-script.1.gz
+%%X3270%%man/man1/x3270.1.gz
+%%X3270%%man/man1/x3270if.1.gz
+man/man5/ibm_hosts.5.gz
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%DBCS%%%%PORTDOCS%%%%DOCSDIR%%/README.dbcs
-%%DBCS%%etc/x3270/icudt28l_ibm-1027_P100-1995.cnv
-%%DBCS%%etc/x3270/icudt28l_ibm-300_P110-1997.cnv
-%%DBCS%%etc/x3270/icudt28l_ibm-837_P100-2000.cn