Date: Sat, 15 Dec 2001 00:08:06 -0800 (PST) From: KATO Tsuguru <tkato@prontomail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/32862: Update port: net/tn5250 to 0.16.3 Message-ID: <200112150808.fBF886K94091@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 32862
>Category: ports
>Synopsis: Update port: net/tn5250 to 0.16.3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Dec 15 00:10:03 PST 2001
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 0.16.3
Remove file:
files/patch-aa
files/patch-ab
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/net/tn5250/Makefile net/tn5250/Makefile
--- /usr/ports/net/tn5250/Makefile Sat Aug 25 13:37:22 2001
+++ net/tn5250/Makefile Fri Dec 14 21:42:54 2001
@@ -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,18 +23,24 @@
.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
diff -urN /usr/ports/net/tn5250/distinfo net/tn5250/distinfo
--- /usr/ports/net/tn5250/distinfo Sat Aug 25 13:37:22 2001
+++ net/tn5250/distinfo Thu Dec 13 05:58:40 2001
@@ -1 +1 @@
-MD5 (tn5250-0.16.2.tar.gz) = 9508690ee431814b2a9ff731191879b1
+MD5 (tn5250-0.16.3.tar.gz) = bf09402b03e2fcef5bf591005d5c4130
diff -urN /usr/ports/net/tn5250/files/patch-aa net/tn5250/files/patch-aa
--- /usr/ports/net/tn5250/files/patch-aa Tue Apr 18 09:11:35 2000
+++ net/tn5250/files/patch-aa Thu Jan 1 09:00:00 1970
@@ -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 -urN /usr/ports/net/tn5250/files/patch-ab net/tn5250/files/patch-ab
--- /usr/ports/net/tn5250/files/patch-ab Tue Apr 18 09:11:36 2000
+++ net/tn5250/files/patch-ab Thu Jan 1 09:00:00 1970
@@ -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 -urN /usr/ports/net/tn5250/files/patch-ac net/tn5250/files/patch-ac
--- /usr/ports/net/tn5250/files/patch-ac Tue Dec 19 17:07:57 2000
+++ net/tn5250/files/patch-ac Thu Jan 1 09:00:00 1970
@@ -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 -urN /usr/ports/net/tn5250/files/patch-ltmain.sh net/tn5250/files/patch-ltmain.sh
--- /usr/ports/net/tn5250/files/patch-ltmain.sh Thu Jan 1 09:00:00 1970
+++ net/tn5250/files/patch-ltmain.sh Thu Dec 13 06:40:32 2001
@@ -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"
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200112150808.fBF886K94091>