Index: Makefile
===================================================================
--- Makefile	(revision 526199)
+++ Makefile	(working copy)
@@ -2,28 +2,28 @@
 # $FreeBSD$
 
 PORTNAME=	x3270
-PORTVERSION=	3.3.15
-PORTREVISION=	3
+PORTVERSION=	3.6
 CATEGORIES=	x11 net
-MASTER_SITES=	http://x3270.bgp.nu/download/current/
-EXTRACT_SUFX=	ga7-src.tgz
+MASTER_SITES=	http://x3270.bgp.nu/download/03.06/
+DISTFILES=	suite3270-${PORTVERSION}ga8-src.tgz
 
 MAINTAINER=	ecrist@secure-computing.net
 COMMENT=	3270 Terminal emulator
 
-BROKEN=		unfetchable
-
 BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf \
-		mkfontscale:x11-fonts/mkfontscale
+		mkfontscale:x11-fonts/mkfontscale \
+		tclsh:lang/tcl-wrapper
 
+USES=		cpe iconv fonts gmake readline tcl xorg
+USE_XORG=	ice sm x11 xaw xext xmu xt xorgproto
+
 # Conflict due to x3270if
 CONFLICTS=	c3270-*
 
-USES=		cpe iconv fonts imake:env xorg
-USE_XORG=	ice sm x11 xaw xext xmu xt
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fontdir=${FONTSDIR} \
 		--disable-dbcs \
+		--with-x=${LOCALBASE} \
 		ac_cv_search_libiconv=${ICONV_LIB}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
@@ -41,27 +41,24 @@
 
 CPE_VENDOR=	paul_mattes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
+WRKSRC=		${WRKDIR}/suite3270-${PORTVERSION}
 
-PORTDOCS=	README README.dbcs
+#PORTDOCS=	x3270/README x3270/README.dbcs
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-post-patch:
-	${REINPLACE_CMD} -e 's|\$$(INSTALL) -c|$$(INSTALL) $$(INSTALLFLAGS)|g' \
-		${WRKSRC}/Imakefile.in
-
 post-install:
-.for m in x3270-script.man x3270.man x3270if.man
+.for m in x3270/x3270-script.man x3270/x3270.man s3270/x3270if.man
 	@(cd ${WRKSRC} ; ${INSTALL_MAN} ${m} ${STAGEDIR}${MAN1PREFIX}/man/man1/)
 .endfor
-	${INSTALL_MAN} ${WRKSRC}/ibm_hosts.man ${STAGEDIR}${MAN5PREFIX}/man/man5/
+	${INSTALL_MAN} ${WRKSRC}/c3270/ibm_hosts.man ${STAGEDIR}${MAN5PREFIX}/man/man5/
 
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/x3270/README ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/x3270/README.dbcs ${STAGEDIR}${DOCSDIR}
 
-	@(cd ${WRKSRC}/Examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} html ${STAGEDIR}${EXAMPLESDIR})
+	@(cd ${WRKSRC}/x3270/Examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
+	@(cd ${WRKSRC}/x3270 && ${COPYTREE_SHARE} html ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
--- distinfo	(revision 526199)
+++ distinfo	(working copy)
@@ -1,2 +1,3 @@
-SHA256 (x3270-3.3.15ga7-src.tgz) = 0914f5c360faf72eb5a5a764ddcbaf0ba4b195d1c166a65a057126f5f7b945c9
-SIZE (x3270-3.3.15ga7-src.tgz) = 1367615
+TIMESTAMP = 1581764930
+SHA256 (suite3270-3.6ga8-src.tgz) = a174114ba42fd1644e39adc532d893da8c40692cf46fd5ef02bb83d5704c66bf
+SIZE (suite3270-3.6ga8-src.tgz) = 3296047
Index: files/patch-c3270_screen.c
===================================================================
--- files/patch-c3270_screen.c	(nonexistent)
+++ files/patch-c3270_screen.c	(working copy)
@@ -0,0 +1,10 @@
+--- c3270/screen.c.orig	2018-02-10 22:07:45 UTC
++++ c3270/screen.c
+@@ -31,6 +31,7 @@
+  *		Screen drawing
+  */
+ 
++#include <wctype.h>
+ #include "globals.h"
+ #include <signal.h>
+ #include "appres.h"

Property changes on: files/patch-c3270_screen.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 526199)
+++ pkg-plist	(working copy)
@@ -1,3 +1,7 @@
+bin/c3270
+bin/pr3287
+bin/s3270
+bin/tcl3270
 bin/x3270
 bin/x3270if
 etc/x3270/ibm_hosts
@@ -23,3 +27,5 @@
 man/man1/x3270.man.gz
 man/man1/x3270if.man.gz
 man/man5/ibm_hosts.man.gz
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.dbcs