5 files changed, 25 insertions, 47 deletions

diff --git a/net/tn5250/Makefile b/net/tn5250/Makefile
index 7f2b3d06b49d..148d668169e0 100644
--- a/net/tn5250/Makefile
+++ b/net/tn5250/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tn5250
-PORTVERSION=	0.16.5
+PORTVERSION=	0.17.3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,21 +14,26 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	5250 Telnet protocol and Terminal
 
-USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_GNOME=	gnomehack gnometarget pkgconfig
+USE_OPENSSL=	yes
+USE_GETOPT_LONG=	yes
+USE_LIBTOOL_VER=	15
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--enable-os-dir=no
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS=	--enable-os-dir=no --with-ssl=${OPENSSLBASE}
 INSTALLS_SHLIB=	yes
 
 MAN1=		lp5250d.1 scs2ascii.1 scs2pdf.1 scs2ps.1 tn5250.1
 MAN5=		tn5250rc.5
 
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
+
 .if defined(WITH_SLANG)
-LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang
+LIB_DEPENDS+=	slang.1:${PORTSDIR}/devel/libslang
 PKGNAMESUFFIX=	-slang
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DUSE_CURSES" \
-		LDFLAGS="-L${LOCALBASE}/lib -lcurses"
 CONFIGURE_ARGS+=	--with-slang=yes
+LDFLAGS+=	-lcurses
 .else
 CONFIGURE_ARGS+=	--with-slang=no
 .endif
@@ -41,10 +46,6 @@ pre-everything::
 	@${ECHO_MSG}
 .endif
 
-post-patch:
-	@${FIND} ${WRKSRC}/src -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} -e \
-		's|<malloc.h>|<stdlib.h>|g'
-
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/freebsd/5250keys ${PREFIX}/bin
 .for file in README sample.termcap us.5250.kbd
diff --git a/net/tn5250/distinfo b/net/tn5250/distinfo
index bd014ef233b6..db6c37070cf9 100644
--- a/net/tn5250/distinfo
+++ b/net/tn5250/distinfo
@@ -1,2 +1,2 @@
-MD5 (tn5250-0.16.5.tar.gz) = 2f9ef4509198e96bb184577fdddfce6d
-SIZE (tn5250-0.16.5.tar.gz) = 455546
+MD5 (tn5250-0.17.3.tar.gz) = f8c454334c63ed7b100e0b12160d93ea
+SIZE (tn5250-0.17.3.tar.gz) = 999938
diff --git a/net/tn5250/files/patch-configure b/net/tn5250/files/patch-configure
deleted file mode 100644
index b41979e4439c..000000000000
--- a/net/tn5250/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Tue May  7 12:35:51 2002
-+++ configure	Fri May 17 20:23:42 2002
-@@ -6193,6 +6193,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/net/tn5250/files/patch-src::tn5250.c b/net/tn5250/files/patch-src::tn5250.c
deleted file mode 100644
index 6d9b1d428915..000000000000
--- a/net/tn5250/files/patch-src::tn5250.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/tn5250.c.orig	Tue Jul 22 18:25:06 2003
-+++ src/tn5250.c	Tue Jul 22 18:25:31 2003
-@@ -179,7 +179,7 @@
-   tn5250 [options] HOST[:PORT]\n");
- #ifdef HAVE_LIBSSL
-    printf("\
--   To connect using ssl prefix HOST with 'ssl:'.  Example:
-+   To connect using ssl prefix HOST with 'ssl:'.  Example:\n\
-       tn5250 +ssl_verify_server ssl:as400.example.com\n");
- #endif
-    printf ("\n\
diff --git a/net/tn5250/pkg-plist b/net/tn5250/pkg-plist
index 63b3e72e0922..73f770fcd267 100644
--- a/net/tn5250/pkg-plist
+++ b/net/tn5250/pkg-plist
@@ -3,13 +3,10 @@ bin/lp5250d
 bin/scs2ascii
 bin/scs2pdf
 bin/scs2ps
-bin/tn3270d
 bin/tn5250
 bin/tn5250-config
-bin/tn5250d
 bin/xt5250
 include/tn5250/buffer.h
-include/tn5250/codes3270.h
 include/tn5250/codes5250.h
 include/tn5250/conf.h
 include/tn5250/config.h
@@ -18,28 +15,29 @@ include/tn5250/dbuffer.h
 include/tn5250/debug.h
 include/tn5250/display.h
 include/tn5250/field.h
-include/tn5250/host3270.h
-include/tn5250/host5250.h
+include/tn5250/macro.h
+include/tn5250/menu.h
 include/tn5250/printsession.h
 include/tn5250/record.h
+include/tn5250/scrollbar.h
 include/tn5250/scs.h
 include/tn5250/session.h
 include/tn5250/slangterm.h
 include/tn5250/stream.h
 include/tn5250/terminal.h
-include/tn5250/tn3270d.h
-include/tn5250/tn5250d.h
 include/tn5250/utility.h
+include/tn5250/window.h
 include/tn5250/wtd.h
 include/tn5250.h
 lib/lib5250.a
 lib/lib5250.so
 lib/lib5250.so.0
+libdata/pkgconfig/tn5250.pc
 share/aclocal/tn5250.m4
-share/tn5250/README
-share/tn5250/XTerm
-share/tn5250/dialogrc
-share/tn5250/sample.termcap
-share/tn5250/us.5250.kbd
-@dirrm share/tn5250
+%%DATADIR%%/README
+%%DATADIR%%/XTerm
+%%DATADIR%%/dialogrc
+%%DATADIR%%/sample.termcap
+%%DATADIR%%/us.5250.kbd
+@dirrm %%DATADIR%%
 @dirrm include/tn5250