net/c3270: Make it a slave port of x11/x3270

Reviewed by:	krion, timur
Sponsored by:	BBOX.io
Differential Revision:	D28606

3 files changed, 67 insertions, 46 deletions

diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile
index 91c2fb481cb5..1a48628704b5 100644
--- a/x11/x3270/Makefile
+++ b/x11/x3270/Makefile
@@ -1,37 +1,30 @@
 # Created by: janek
 # $FreeBSD$
 
-PORTNAME=	x3270
+PORTNAME?=	x3270
 PORTVERSION=	4.0
-PORTREVISION=	1
-CATEGORIES=	x11 net
+PORTREVISION=	2
+CATEGORIES?=	x11 net
 MASTER_SITES=	http://x3270.bgp.nu/download/04.00/
-DISTFILES=	suite3270-${PORTVERSION}ga12-src.tgz
+DISTFILES=	suite3270-${PORTVERSION}ga14-src.tgz
 
 MAINTAINER=	kbowling@FreeBSD.org
-COMMENT=	3270 Terminal emulator
+COMMENT?=	3270 Terminal emulator
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf \
-		mkfontscale:x11-fonts/mkfontscale \
-		tclsh:lang/tcl-wrapper
+BUILD_DEPENDS=	tclsh:lang/tcl-wrapper
 LIB_DEPENDS=	libexpat.so:textproc/expat2
 
-USES=		cpe iconv fonts gmake readline shebangfix tcl xorg
-USE_XORG=	ice sm x11 xaw xext xmu xt xorgproto
+USES=		cpe iconv gmake readline shebangfix tcl
 
-# Conflict due to x3270if
-CONFLICTS=	c3270-*
+# x3270 includes c3270
+CONFLICTS_INSTALL?=	c3270
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-fontdir=${FONTSDIR} \
-		--disable-dbcs \
-		--with-x=${LOCALBASE} \
-		--enable-unix \
-		--enable-c3270
+CONFIGURE_ARGS=	--enable-unix
 .if defined(WITHOUT_OPENSSL)
-CONFIGURE_ARGS+=	--disable-ssl
+CONFIGURE_ARGS+=	--disable-tls
 .else
 USES+=	ssl
 .endif
@@ -42,9 +35,32 @@ WRKSRC=		${WRKDIR}/suite3270-${PORTVERSION}
 
 PORTEXAMPLES=	*
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
+OPTIONS_DEFINE=	DOCS EXAMPLES MDBCS
+
+.include <bsd.port.options.mk>
 
+.if ! defined(C3270)
+BUILD_DEPENDS+=	bdftopcf:x11-fonts/bdftopcf \
+		mkfontscale:x11-fonts/mkfontscale
+USES+=	fonts xorg
+USE_XORG=	ice sm x11 xaw xext xmu xt xorgproto
+CONFIGURE_ARGS+=	--with-fontdir=${FONTSDIR} \
+			--with-x=${LOCALBASE}
 SHEBANG_FILES=	x3270/x3270a.in
+PLIST_SUB+=	X3270=""
+.else
+CONFIGURE_ARGS+=	--disable-x3270 \
+			--disable-x3270if
+PLIST_SUB+=	X3270="@comment "
+.endif
+
+# EBCDIC double-byte character set support is disabled by default
+.if ${PORT_OPTIONS:MDBCS}
+CONFIGURE_ARGS+=	--enable-dbcs
+PLIST_SUB+=	DBCS=""
+.else
+PLIST_SUB+=	DBCS="@comment "
+.endif
 
 post-install:
 .for m in b3270/b3270.man c3270/c3270.man pr3287/pr3287.man s3270/s3270.man \
@@ -56,7 +72,9 @@ post-install:
 
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/x3270/README ${STAGEDIR}${DOCSDIR}
+.if ${PORT_OPTIONS:MDBCS}
 	${INSTALL_DATA} ${WRKSRC}/x3270/README.dbcs ${STAGEDIR}${DOCSDIR}
+.endif
 
 	@(cd ${WRKSRC}/x3270/Examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 	@(cd ${WRKSRC}/x3270 && ${COPYTREE_SHARE} html ${STAGEDIR}${EXAMPLESDIR})
diff --git a/x11/x3270/distinfo b/x11/x3270/distinfo
index a87942990f53..fa55f237add8 100644
--- a/x11/x3270/distinfo
+++ b/x11/x3270/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1601494109
-SHA256 (suite3270-4.0ga12-src.tgz) = d2e5030b67f01aed7c74dd906114d44dbc89a103d32ed0db564bf80033b8e4fb
-SIZE (suite3270-4.0ga12-src.tgz) = 3314085
+TIMESTAMP = 1612806290
+SHA256 (suite3270-4.0ga14-src.tgz) = 9796f2b47ed222776d4fe2756a0db3617f84dbbf02d0a9374c36a13b1b416375
+SIZE (suite3270-4.0ga14-src.tgz) = 3318277
diff --git a/x11/x3270/pkg-plist b/x11/x3270/pkg-plist
index a5ca6f9b7d36..f898213f71e9 100644
--- a/x11/x3270/pkg-plist
+++ b/x11/x3270/pkg-plist
@@ -3,36 +3,39 @@ bin/c3270
 bin/pr3287
 bin/s3270
 bin/tcl3270
-bin/x3270
-bin/x3270a
-bin/x3270if
+%%X3270%%bin/x3270
+%%X3270%%bin/x3270a
+%%X3270%%bin/x3270if
 etc/x3270/ibm_hosts
-%%FONTSDIR%%/3270-12.pcf.gz
-%%FONTSDIR%%/3270-12b.pcf.gz
-%%FONTSDIR%%/3270-20.pcf.gz
-%%FONTSDIR%%/3270-20b.pcf.gz
-%%FONTSDIR%%/3270.pcf.gz
-%%FONTSDIR%%/3270b.pcf.gz
-%%FONTSDIR%%/3270gr.pcf.gz
-%%FONTSDIR%%/3270gt12.pcf.gz
-%%FONTSDIR%%/3270gt12b.pcf.gz
-%%FONTSDIR%%/3270gt16.pcf.gz
-%%FONTSDIR%%/3270gt16b.pcf.gz
-%%FONTSDIR%%/3270gt24.pcf.gz
-%%FONTSDIR%%/3270gt24b.pcf.gz
-%%FONTSDIR%%/3270gt32.pcf.gz
-%%FONTSDIR%%/3270gt32b.pcf.gz
-%%FONTSDIR%%/3270gt8.pcf.gz
-%%FONTSDIR%%/3270h.pcf.gz
+%%X3270%%%%FONTSDIR%%/3270-12.pcf.gz
+%%X3270%%%%FONTSDIR%%/3270-12b.pcf.gz
+%%X3270%%%%FONTSDIR%%/3270-20.pcf.gz
+%%X3270%%%%FONTSDIR%%/3270-20b.pcf.gz
+%%X3270%%%%FONTSDIR%%/3270.pcf.gz
+%%X3270%%%%FONTSDIR%%/3270b.pcf.gz
+%%X3270%%%%FONTSDIR%%/3270gr.pcf.gz
+%%X3270%%%%FONTSDIR%%/3270gt12.pcf.gz
+%%X3270%%%%FONTSDIR%%/3270gt12b.pcf.gz
+%%X3270%%%%FONTSDIR%%/3270gt16.pcf.gz
+%%X3270%%%%FONTSDIR%%/3270gt16b.pcf.gz
+%%X3270%%%%FONTSDIR%%/3270gt24.pcf.gz
+%%X3270%%%%FONTSDIR%%/3270gt24b.pcf.gz
+%%X3270%%%%FONTSDIR%%/3270gt32.pcf.gz
+%%X3270%%%%FONTSDIR%%/3270gt32b.pcf.gz
+%%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
-man/man1/x3270-script.man.gz
-man/man1/x3270.man.gz
-man/man1/x3270if.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
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.dbcs
+%%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