Date: Mon, 15 Feb 2021 18:43:44 +0000 (UTC) From: Kevin Bowling <kbowling@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r565323 - in head: net/c3270 x11/x3270 Message-ID: <202102151843.11FIhiRn043401@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kbowling Date: Mon Feb 15 18:43:44 2021 New Revision: 565323 URL: https://svnweb.freebsd.org/changeset/ports/565323 Log: net/c3270: Make it a slave port of x11/x3270 Reviewed by: krion, timur Sponsored by: BBOX.io Differential Revision: D28606 Deleted: head/net/c3270/distinfo head/net/c3270/pkg-plist Modified: head/net/c3270/Makefile head/net/c3270/pkg-descr head/x11/x3270/Makefile head/x11/x3270/distinfo head/x11/x3270/pkg-plist Modified: head/net/c3270/Makefile ============================================================================== --- head/net/c3270/Makefile Mon Feb 15 18:31:04 2021 (r565322) +++ head/net/c3270/Makefile Mon Feb 15 18:43:44 2021 (r565323) @@ -1,118 +1,14 @@ -# Created by: pdseniura@techie.com # $FreeBSD$ PORTNAME= c3270 -PORTVERSION= 3.3.14ga11 -PORTREVISION= 3 CATEGORIES= net -MASTER_SITES= http://x3270.bgp.nu/download/03.03.14/ -MASTER_SITES_VER_PATH= ${PORTVERSION:C/(0[0-9]\.0[0-9])/} -EXTRACT_SUFX= -src.tgz -MAINTAINER= kbowling@FreeBSD.org -COMMENT= Full-screen curses-based remote login to IBM mainframes +COMMENT= curses-based remote login to IBM mainframes without x3270 -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:C/([0-9]\.[0-9])(\..*)/\1/} +CONFLICTS_INSTALL= x3270 -GNU_CONFIGURE= yes -CONFIGURE_ARGS= ac_cv_search_libiconv=${ICONV_LIB} +C3270= YES -USES= iconv readline gmake +MASTERDIR= ${.CURDIR}/../../x11/x3270 -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib - -# c3270's ./configure script supports these. -# Within it all options except DBCS are enabled by default. - -OPTIONS_DEFINE= OPENSSL READLINE PR3287 ANSI APL DBCS FT LOCAL_PROCESS \ - PRINTER SCRIPT TN3270E TRACE DOCS -OPTIONS_DEFAULT= OPENSSL READLINE PR3287 ANSI APL FT LOCAL_PROCESS \ - PRINTER SCRIPT TN3270E TRACE -PR3287_DESC= Build pr3287 component -ANSI_DESC= Include NVT (ANSI) support -APL_DESC= Include APL support -DBCS_DESC= Include EBCDIC DBCS support -FT_DESC= Include IND\$$FILE support -LOCAL_PROCESS_DESC= Include Local Process support -PRINTER_DESC= Include printer session support -SCRIPT_DESC= Include scripting support -TN3270E_DESC= Include TN3270-Extended support -TRACE_DESC= Include trace support - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MDOCS} -PORTDOCS= * -.endif - -.if ! ${PORT_OPTIONS:MOPENSSL} -CONFIGURE_ARGS+= --disable-ssl -.else -USES+= ssl -.endif - -.if ! ${PORT_OPTIONS:MREADLINE} -CONFIGURE_ARGS+= --without-readline -.undef USE_READLINE -.endif - -.if ! ${PORT_OPTIONS:MANSI} -CONFIGURE_ARGS+= --disable-ansi -.endif - -.if ! ${PORT_OPTIONS:MAPL} -CONFIGURE_ARGS+= --disable-apl -.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 - -.if ! ${PORT_OPTIONS:MFT} -CONFIGURE_ARGS+= --disable-ft -.endif - -.if ! ${PORT_OPTIONS:MLOCAL_PROCESS} -CONFIGURE_ARGS+= --disable-local-process -.endif - -.if ! ${PORT_OPTIONS:MPRINTER} -CONFIGURE_ARGS+= --disable-printer -.endif - -.if ! ${PORT_OPTIONS:MSCRIPT} -CONFIGURE_ARGS+= --disable-script -.endif - -.if ! ${PORT_OPTIONS:MTN3270E} -CONFIGURE_ARGS+= --disable-tn3270e -.endif - -.if ! ${PORT_OPTIONS:MTRACE} -CONFIGURE_ARGS+= --disable-trace -.endif - -post-install: - @${INSTALL_MAN} ${WRKSRC}/c3270.man \ - ${STAGEDIR}${MANPREFIX}/man/man1/c3270.1 - @${INSTALL_MAN} ${WRKSRC}/x3270-script.man \ - ${STAGEDIR}${MANPREFIX}/man/man1/x3270-script.1 - @${INSTALL_MAN} ${WRKSRC}/x3270if.man \ - ${STAGEDIR}${MANPREFIX}/man/man1/x3270if.1 - @${INSTALL_MAN} ${WRKSRC}/ibm_hosts.man \ - ${STAGEDIR}${MANPREFIX}/man/man5/ibm_hosts.5 -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${STAGEDIR}${DOCSDIR} - @${MKDIR} ${STAGEDIR}${DOCSDIR}/html -.for i in ${PORTDOCS} - @${INSTALL_DATA} ${WRKSRC}/html/${i} ${STAGEDIR}${DOCSDIR}/${i} -.endfor - @${ECHO_MSG} "===> Extra Documentation installed in ${DOCSDIR}/html ." -.endif - -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" Modified: head/net/c3270/pkg-descr ============================================================================== --- head/net/c3270/pkg-descr Mon Feb 15 18:31:04 2021 (r565322) +++ head/net/c3270/pkg-descr Mon Feb 15 18:43:44 2021 (r565323) @@ -1,5 +1,6 @@ -c3270 is a curses-based IBM 3270 terminal emulator. It can be used to -communicate with any IBM host that supports 3270-style connections -over TELNET. It can also communicate with hosts that use line-by-line -ASCII mode to do initial login negotiation before switching to +c3270 is a curses-based IBM 3270 terminal emulator from the x3270 project. + +It can be used to communicate with any IBM host that supports 3270-style +connections over TELNET. It can also communicate with hosts that use +line-by-line ASCII mode to do initial login negotiation before switching to full-screen 3270 mode. Modified: head/x11/x3270/Makefile ============================================================================== --- head/x11/x3270/Makefile Mon Feb 15 18:31:04 2021 (r565322) +++ head/x11/x3270/Makefile Mon Feb 15 18:43:44 2021 (r565323) @@ -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,10 +35,33 @@ 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 \ tcl3270/tcl3270.man x3270/x3270-script.man x3270/x3270.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}) Modified: head/x11/x3270/distinfo ============================================================================== --- head/x11/x3270/distinfo Mon Feb 15 18:31:04 2021 (r565322) +++ head/x11/x3270/distinfo Mon Feb 15 18:43:44 2021 (r565323) @@ -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 Modified: head/x11/x3270/pkg-plist ============================================================================== --- head/x11/x3270/pkg-plist Mon Feb 15 18:31:04 2021 (r565322) +++ head/x11/x3270/pkg-plist Mon Feb 15 18:43:44 2021 (r565323) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202102151843.11FIhiRn043401>