On 10/05 02:06, Jeremy Evans wrote:
> This is a fairly simple version bump for c3270. A few things of note:
>
> * Printer emulation has been moved into a separate package that there
> isn't currently a port for (pr3287). If anyone uses pr3287 and can test
> it, let me know and we can add it as a separate port (similar to how
> x3270 is a separate port).
>
> * Adding post-install to remove the x3270 configuration file that is
> part of the x3270 port, so make update-plist doesn't complain.
>
> * Remove patch committed upstream (use patch -E).
>
> Tested on i386. Compiles on amd64, but not tested there. Looking for
> OKs.
I've been running this for months and would like to get it in tree. Can
I get an OK?
Jeremy
Index: Makefile
===================================================================
RCS file: /cvs/ports/comms/c3270/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile 30 Jan 2009 20:26:17 -0000 1.2
+++ Makefile 14 Mar 2011 20:08:55 -0000
@@ -2,22 +2,21 @@
COMMENT= curses-based 3270 terminal editor
-V= c3270-3.3.8
-DISTNAME= ${V}p3
-PKGNAME= ${V}pl3
+DISTNAME= suite3270-3.3.11ga6-src
+PKGNAME= c3270-3.3.11.6
EXTRACT_SUFX= .tgz
CATEGORIES= comms
HOMEPAGE= http://x3270.bgp.nu/
-MAINTAINER= Jeremy Evans <[email protected]>
+MAINTAINER= Jeremy Evans <[email protected]>
# BSD-like
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c crypto ssl ncurses readline util
+WANTLIB= c crypto ssl ncursesw readline util
MODULES= converters/libiconv
@@ -27,6 +26,10 @@ WRKDIST= ${WRKDIR}/c3270-3.3
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+
+post-install:
+ rm ${WRKINST}/etc/x3270/ibm_hosts
+ rmdir ${WRKINST}/etc/x3270
NO_REGRESS= Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/comms/c3270/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 30 Jan 2009 20:26:17 -0000 1.2
+++ distinfo 14 Mar 2011 20:08:55 -0000
@@ -1,5 +1,5 @@
-MD5 (c3270-3.3.8p3.tgz) = GdMSMqM5CFqHQoX7lT0Tdw==
-RMD160 (c3270-3.3.8p3.tgz) = ZAlPwu/qlrexCcWo8ruMuk+ktpI=
-SHA1 (c3270-3.3.8p3.tgz) = ArBgUNl150vGO5XCzskmqHL/2b4=
-SHA256 (c3270-3.3.8p3.tgz) = Xi+yC2nW79AV0iS35x+2X/tdD1waa5hIkBL35A/06Co=
-SIZE (c3270-3.3.8p3.tgz) = 1103481
+MD5 (suite3270-3.3.11ga6-src.tgz) = AdbTgJpFfm9r03MWQuDALQ==
+RMD160 (suite3270-3.3.11ga6-src.tgz) = H1IUouGPLL6nqnodgflD8H6PDc4=
+SHA1 (suite3270-3.3.11ga6-src.tgz) = xyxPcjE2WYY+hxj/3NQ7A6p3uOU=
+SHA256 (suite3270-3.3.11ga6-src.tgz) =
Hu3intshIo+T6ifFei/xxZsl1AsldYrcDVCpYcTNn6k=
+SIZE (suite3270-3.3.11ga6-src.tgz) = 6470645
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in 30 Jan 2009 20:26:17 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.1 2009/01/30 20:26:17 naddy Exp $
---- Makefile.in.orig Mon Sep 22 18:57:55 2008
-+++ Makefile.in Tue Jan 27 14:54:50 2009
-@@ -23,7 +23,7 @@ SRCS = actions.c ansi.c apl.c c3270.c charset.c child.
- unicode.c unicode_dbcs.c utf8.c util.c xio.c XtGlue.c
- VOBJS = actions.o ansi.o apl.o c3270.o charset.o child.o ctlr.o fallbacks.o \
- ft.o ft_cut.o ft_dft.o glue.o help.o host.o icmd.o idle.o keymap.o \
-- kybd.o macros.o print.o printer.o proxy.o resolver.c resources.o \
-+ kybd.o macros.o print.o printer.o proxy.o resolver.o resources.o \
- rpq.o screen.o see.o sf.o tables.o telnet.o toggles.o trace_ds.o \
- unicode.o unicode_dbcs.o utf8.o util.o xio.o XtGlue.o
- OBJS1 = $(VOBJS) version.o
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/comms/c3270/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- pkg/DESCR 28 Nov 2007 21:16:59 -0000 1.1.1.1
+++ pkg/DESCR 14 Mar 2011 20:08:55 -0000
@@ -7,5 +7,4 @@ c3270 is a curses-based 3270 terminal em
DBCS Chinese and Japanese
- IND$FILE file transfer
- NVT mode (emulating a color xterm)
-- Printer session integration
- Extensive debugging and scripting facilities
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/comms/c3270/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 30 Jan 2009 20:26:17 -0000 1.2
+++ pkg/PLIST 14 Mar 2011 20:08:55 -0000
@@ -1,4 +1,3 @@
@comment $OpenBSD: PLIST,v 1.2 2009/01/30 20:26:17 naddy Exp $
@bin bin/c3270
-@bin bin/pr3287
@bin bin/x3270if