6 files changed, 55 insertions, 59 deletions

diff --git a/net/tn5250/Makefile b/net/tn5250/Makefile
index e55d1c658f7b..e898c7b76424 100644
--- a/net/tn5250/Makefile
+++ b/net/tn5250/Makefile
@@ -6,16 +6,15 @@
 #
 
 PORTNAME=	tn5250
-PORTVERSION=	0.16.2
+PORTVERSION=	0.16.3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_AUTOMAKE=	yes
-AUTOMAKE_ARGS=	--include-deps
-USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-os-dir=no
 INSTALLS_SHLIB=	yes
 
@@ -24,19 +23,25 @@ MAN1=		scs2ascii.1 scs2pdf.1 tn5250.1 lp5250d.1
 .if defined(WITH_SLANG)
 LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang
 PKGNAMESUFFIX=	-slang
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS+=	--with-slang
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DUSE_CURSES" \
+		LDFLAGS="-L${LOCALBASE}/lib -lcurses"
+CONFIGURE_ARGS+=	--with-slang=yes
+.else
+CONFIGURE_ARGS+=	--with-slang=no
 .endif
 
+pre-everything::
 .if !defined(WITH_SLANG)
-pre-everything:
 	@${ECHO_MSG}
 	@${ECHO_MSG} "If you want to compile with S/Lang support,"
 	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_SLANG=yes\""
 	@${ECHO_MSG}
 .endif
 
+post-patch:
+	@find ${WRKSRC}/src -name '*.[ch]' | xargs ${PERL} -pi -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 25ec69a37302..bdd12a5ab4cd 100644
--- a/net/tn5250/distinfo
+++ b/net/tn5250/distinfo
@@ -1 +1 @@
-MD5 (tn5250-0.16.2.tar.gz) = 9508690ee431814b2a9ff731191879b1
+MD5 (tn5250-0.16.3.tar.gz) = bf09402b03e2fcef5bf591005d5c4130
diff --git a/net/tn5250/files/patch-aa b/net/tn5250/files/patch-aa
deleted file mode 100644
index 53699f0f6ed0..000000000000
--- a/net/tn5250/files/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/debug.c.orig	Fri Feb 18 06:59:19 2000
-+++ src/debug.c	Mon Apr 10 03:00:00 2000
-@@ -31,7 +31,6 @@
- #include <stdlib.h>
- #include <string.h>
- #include <ctype.h>
--#include <malloc.h>
- 
- #include "utility.h"
- #include "buffer.h"
diff --git a/net/tn5250/files/patch-ab b/net/tn5250/files/patch-ab
deleted file mode 100644
index cc41255556e6..000000000000
--- a/net/tn5250/files/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/tn5250-private.h.orig	Sun Feb 13 11:32:48 2000
-+++ src/tn5250-private.h	Mon Apr 10 03:00:00 2000
-@@ -29,7 +29,6 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
--#include <malloc.h>
- #include <ctype.h>
- #include <errno.h>
- #include <signal.h>
diff --git a/net/tn5250/files/patch-ac b/net/tn5250/files/patch-ac
deleted file mode 100644
index f8c4f6ca2141..000000000000
--- a/net/tn5250/files/patch-ac
+++ /dev/null
@@ -1,30 +0,0 @@
---- configure.in.orig	Wed Nov  1 04:09:17 2000
-+++ configure.in	Sat Dec 16 14:58:58 2000
-@@ -56,6 +56,7 @@
- if test "$with_slang" != "no"
- then
- 	USE_SLANG=1
-+	AC_DEFINE_UNQUOTED(USE_CURSES,1)
- 	AC_DEFINE_UNQUOTED(USE_SLANG,1)
- else
- 	USE_CURSES=1
-@@ -65,7 +66,7 @@
- USE_CURSES=1
- AC_DEFINE_UNQUOTED(USE_CURSES,1)
- ])
--if test "$USE_CURSES" = "1"
-+if test "$USE_CURSES" = "1" -o "$USE_SLANG" = "1"
- then
- 	AC_CHECK_LIB(ncurses, initscr)
- 	if test "$ac_cv_lib_ncurses_initscr" != "yes"
-@@ -103,7 +104,9 @@
- 		AC_DEFINE_UNQUOTED(attr_t,int)
- 	fi
- 	AC_MSG_RESULT($HAVE_ATTR_T)
--else
-+fi
-+if test "$USE_SLANG" = "1"
-+then
- 	AC_CHECK_LIB(slang, SLang_init_tty)
- 	if test "$ac_cv_lib_slang_SLang_init_tty" != "yes"
- 	then
diff --git a/net/tn5250/files/patch-ltmain.sh b/net/tn5250/files/patch-ltmain.sh
new file mode 100644
index 000000000000..f2d2551536eb
--- /dev/null
+++ b/net/tn5250/files/patch-ltmain.sh
@@ -0,0 +1,41 @@
+--- ltmain.sh.orig	Sat Dec  8 06:29:06 2001
++++ ltmain.sh	Thu Dec 13 06:40:22 2001
+@@ -1043,14 +1043,14 @@
+ 	    # These systems don't actually have a C library (as such)
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+ 	  esac
+ 	 elif test "X$arg" = "X-lc_r"; then
+ 	  case $host in
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc_r directly, use -pthread flag.
+ 	    continue
+ 	    ;;
+@@ -2441,7 +2441,7 @@
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
+-	  *-*-openbsd*)
++	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    ;;
+ 	  *)
+@@ -4210,10 +4210,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"