Simple update to the latest version of c3270, a mainframe terminal
emulator.

Upsteam stopped offering a separate distfile for c3270, and now they
only off one distfile for the whole *3270 suite.  gmake is now required.

A patch is necessary because their OpenSSL detection appears to
think we support OpenSSL 1.1 API.

I don't plan on committing this for a week or so until I can test
connecting to a mainframe and make sure it still works.

Thanks,
Jeremy

Index: Makefile
===================================================================
RCS file: /cvs/ports/comms/c3270/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile    9 Apr 2016 20:14:48 -0000       1.6
+++ Makefile    4 Nov 2017 23:58:17 -0000
@@ -2,8 +2,8 @@
 
 COMMENT=       curses-based 3270 terminal editor
 
-DISTNAME=      suite3270-3.3.11ga6-src
-PKGNAME=       c3270-3.3.11.6
+DISTNAME=      suite3270-3.5ga11-src
+PKGNAME=       c3270-3.5.11
 EXTRACT_SUFX=  .tgz
 CATEGORIES=    comms
 
@@ -19,10 +19,24 @@ LIB_DEPENDS=                converters/libiconv
 
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=x3270/}
 
-WRKDIST=               ${WRKDIR}/c3270-3.3
+WRKDIST=               ${WRKDIR}/suite3270-3.5
+USE_GMAKE =            Yes
 CONFIGURE_STYLE=       gnu
 CONFIGURE_ENV=         CPPFLAGS="-I${LOCALBASE}/include" \
                        LDFLAGS="-L${LOCALBASE}/lib"
+
+CONFIGURE_ARGS=                --disable-unix \
+                       --disable-windows \
+                       --disable-x3270 \
+                       --enable-c3270 \
+                       --disable-s3270 \
+                       --disable-tcl3270 \
+                       --disable-pr3287 \
+                       --disable-lib \
+                       --disable-wc3270 \
+                       --disable-ws3270 \
+                       --disable-wpr3287 \
+                       --disable-windows-lib
 
 post-install:
        rm ${WRKINST}/etc/x3270/ibm_hosts
Index: distinfo
===================================================================
RCS file: /cvs/ports/comms/c3270/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo    18 Jan 2015 03:12:55 -0000      1.4
+++ distinfo    4 Nov 2017 23:58:17 -0000
@@ -1,2 +1,2 @@
-SHA256 (suite3270-3.3.11ga6-src.tgz) = 
Hu3intshIo+T6ifFei/xxZsl1AsldYrcDVCpYcTNn6k=
-SIZE (suite3270-3.3.11ga6-src.tgz) = 6470645
+SHA256 (suite3270-3.5ga11-src.tgz) = 
G+3KytCbHiUMKGgseTWxcw/YzvzF99Gzc1Qd7iy38uc=
+SIZE (suite3270-3.5ga11-src.tgz) = 3413903
Index: patches/patch-Common_telnet_c
===================================================================
RCS file: patches/patch-Common_telnet_c
diff -N patches/patch-Common_telnet_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-Common_telnet_c       4 Nov 2017 23:58:17 -0000
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+Work around bad SSL library detection.
+
+Index: Common/telnet.c
+--- Common/telnet.c.orig
++++ Common/telnet.c
+@@ -3688,7 +3688,7 @@ ssl_base_init(char *cl_hostname, bool *pending)
+       ssl_pending = pending;
+     }
+ 
+-#if !defined(_WIN32) && OPENSSL_VERSION_NUMBER < 0x10100000L /*[*/
++#if !defined(_WIN32)
+     SSL_load_error_strings();
+     SSL_library_init();
+ #else /*][*/
+@@ -3696,7 +3696,7 @@ ssl_base_init(char *cl_hostname, bool *pending)
+ #endif /*]*/
+ try_again:
+     ssl_passwd_gui_reset();
+-#if !defined(_WIN32) && OPENSSL_VERSION_NUMBER < 0x10100000L /*[*/
++#if !defined(_WIN32)
+     ssl_ctx = SSL_CTX_new(SSLv23_method());
+ #else /*][*/
+     ssl_ctx = SSL_CTX_new(TLS_method());
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/comms/c3270/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST   14 Mar 2011 23:26:48 -0000      1.3
+++ pkg/PLIST   4 Nov 2017 23:58:17 -0000
@@ -1,3 +1,2 @@
 @comment $OpenBSD: PLIST,v 1.3 2011/03/14 23:26:48 jeremy Exp $
 @bin bin/c3270
-@bin bin/x3270if

Reply via email to