[csw-devel] SF.net SVN: gar:[12176] csw/mgar/pkg/x3270/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Tue Jan 4 16:50:16 CET 2011
Revision: 12176
http://gar.svn.sourceforge.net/gar/?rev=12176&view=rev
Author: dmichelsen
Date: 2011-01-04 15:50:16 +0000 (Tue, 04 Jan 2011)
Log Message:
-----------
x3270: Update to 3.3.11ga6 and removed conversions which have been in 3.3.5 but are no longer used
Modified Paths:
--------------
csw/mgar/pkg/x3270/trunk/Makefile
csw/mgar/pkg/x3270/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/x3270/trunk/files/0002-Propagate-CFLAGS-to-building-of-version.o.patch
csw/mgar/pkg/x3270/trunk/files/c3270-3.3_ncurses.patch
csw/mgar/pkg/x3270/trunk/files/x3270-3.3.6_DBCS.patch
Removed Paths:
-------------
csw/mgar/pkg/x3270/trunk/files/ibm-1027_P100-1995.cnv
csw/mgar/pkg/x3270/trunk/files/ibm-1385_P100-1997.cnv
csw/mgar/pkg/x3270/trunk/files/ibm-1388_P103-2001.cnv
csw/mgar/pkg/x3270/trunk/files/ibm-300_P110-1997.cnv
csw/mgar/pkg/x3270/trunk/files/ibm-837_P100-2000.cnv
Modified: csw/mgar/pkg/x3270/trunk/Makefile
===================================================================
--- csw/mgar/pkg/x3270/trunk/Makefile 2011-01-04 14:17:14 UTC (rev 12175)
+++ csw/mgar/pkg/x3270/trunk/Makefile 2011-01-04 15:50:16 UTC (rev 12176)
@@ -1,6 +1,6 @@
# $Id$
NAME = x3270
-VERSION = $(BASEREL).10ga5
+VERSION = $(BASEREL).11ga6
CATEGORIES = apps
DESCRIPTION = An IBM 3270 terminal emulator
@@ -11,15 +11,12 @@
DISTFILES = suite3270-$(VERSION)-src.tgz
DISTFILES += COPYING
-CONVERSIONS = ibm-1027_P100-1995.cnv
-CONVERSIONS += ibm-1385_P100-1997.cnv
-CONVERSIONS += ibm-1388_P103-2001.cnv
-CONVERSIONS += ibm-300_P110-1997.cnv
-CONVERSIONS += ibm-837_P100-2000.cnv
-DISTFILES += $(CONVERSIONS)
-
PATCHFILES = 0001-Add-Error-function.patch
+PATCHFILES += 0002-Propagate-CFLAGS-to-building-of-version.o.patch
+# PATCHFILES += x3270-3.3.6_DBCS.patch
+# PATCHFILES += c3270-3.3_ncurses.patch
+
# File name regex to get notifications about upstream software releases
UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*)-src.tar.gz
@@ -57,7 +54,7 @@
# EXTRA_PAX_ARGS = -s ",\./usr/openwin/bin/,.$(bindir)/,p"
-MIGRATE_FILES = $(addprefix x3270/,ibm_hosts $(CONVERSIONS))
+MIGRATE_FILES = x3270/ibm_hosts
PRESERVECONF = $(addprefix $(sysconfdir)/,$(MIGRATE_FILES))
#MANPAGES = s3270-$(BASEREL)/s3270
@@ -83,5 +80,5 @@
ginstall -d $(DESTDIR)$(mandir)/man5
ginstall $(WORKSRC)/x3270-$(BASEREL)/ibm_hosts.man $(DESTDIR)$(mandir)/man5/ibm_hosts.5
$(foreach S,$(SUBSYSTEMS),ginstall -d $(DESTDIR)$(docdir)/x3270/$S; cp -rp $(WORKSRC)/$S-$(BASEREL)/README $(WORKSRC)/$S-$(BASEREL)/html $(DESTDIR)$(docdir)/x3270/$S;)
- $(foreach C,$(CONVERSIONS),ginstall $(WORKDIR)/$C $(DESTDIR)$(sysconfdir)/x3270/$C;)
+ #$(foreach C,$(CONVERSIONS),ginstall $(WORKDIR)/$C $(DESTDIR)$(sysconfdir)/x3270/$C;)
@$(MAKECOOKIE)
Modified: csw/mgar/pkg/x3270/trunk/checksums
===================================================================
--- csw/mgar/pkg/x3270/trunk/checksums 2011-01-04 14:17:14 UTC (rev 12175)
+++ csw/mgar/pkg/x3270/trunk/checksums 2011-01-04 15:50:16 UTC (rev 12176)
@@ -1,8 +1 @@
-c44cd68f5450aec260ee3866ad0a7177 0001-Add-Error-function.patch
-63a33fe276b48131d50ee84e665f3a3e COPYING
-dd7f1ab9a53ab6ff17be8a7f328713cc ibm-1027_P100-1995.cnv
-6a04cfbfdda619ec2b1424a1168996f8 ibm-1385_P100-1997.cnv
-079111e619157e0f8d5156e6bafda225 ibm-1388_P103-2001.cnv
-2d8643cc3f22c60846e5bf980328c9b6 ibm-300_P110-1997.cnv
-3c2397ee0befcf53743faca9f351c902 ibm-837_P100-2000.cnv
-d373e5657d688d3e5ce35eb226ab19e8 suite3270-3.3.10ga5-src.tgz
+01d6d3809a457e6f6bd3731642e0c02d suite3270-3.3.11ga6-src.tgz
Added: csw/mgar/pkg/x3270/trunk/files/0002-Propagate-CFLAGS-to-building-of-version.o.patch
===================================================================
--- csw/mgar/pkg/x3270/trunk/files/0002-Propagate-CFLAGS-to-building-of-version.o.patch (rev 0)
+++ csw/mgar/pkg/x3270/trunk/files/0002-Propagate-CFLAGS-to-building-of-version.o.patch 2011-01-04 15:50:16 UTC (rev 12176)
@@ -0,0 +1,99 @@
+From 1abf9972f9939fa438dffe2007552fe80dddd086 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 4 Jan 2011 16:12:52 +0100
+Subject: [PATCH 2/2] Propagate CFLAGS to building of version.o
+
+---
+ c3270-3.3/mkversion.sh | 2 +-
+ pr3287-3.3/mkversion.sh | 2 +-
+ s3270-3.3/mkversion.sh | 2 +-
+ tcl3270-3.3/mkversion.sh | 2 +-
+ wc3270-3.3/mkversion.sh | 2 +-
+ wpr3287-3.3/mkversion.sh | 2 +-
+ ws3270-3.3/mkversion.sh | 2 +-
+ x3270-3.3/mkversion.sh | 2 +-
+ 8 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/c3270-3.3/mkversion.sh b/c3270-3.3/mkversion.sh
+index e9093e0..bc3c0c9 100755
+--- a/c3270-3.3/mkversion.sh
++++ b/c3270-3.3/mkversion.sh
+@@ -59,4 +59,4 @@ const char *build_rpq_timestamp = "$rpq_timestamp";
+ const char *build_rpq_version = "$version";
+ EOF
+
+-${1-cc} -c version.c
++${1-cc} ${CFLAGS} -c version.c
+diff --git a/pr3287-3.3/mkversion.sh b/pr3287-3.3/mkversion.sh
+index bcbd6bd..f5045bd 100755
+--- a/pr3287-3.3/mkversion.sh
++++ b/pr3287-3.3/mkversion.sh
+@@ -47,4 +47,4 @@ const char *app_defaults_version = "$adversion";
+ static const char sccsid[] = "@(#)${2-x3270} v$version $sccsdate $user";
+ EOF
+
+-${1-cc} -c version.c
++${1-cc} ${CFLAGS} -c version.c
+diff --git a/s3270-3.3/mkversion.sh b/s3270-3.3/mkversion.sh
+index e9093e0..bc3c0c9 100755
+--- a/s3270-3.3/mkversion.sh
++++ b/s3270-3.3/mkversion.sh
+@@ -59,4 +59,4 @@ const char *build_rpq_timestamp = "$rpq_timestamp";
+ const char *build_rpq_version = "$version";
+ EOF
+
+-${1-cc} -c version.c
++${1-cc} ${CFLAGS} -c version.c
+diff --git a/tcl3270-3.3/mkversion.sh b/tcl3270-3.3/mkversion.sh
+index e9093e0..bc3c0c9 100755
+--- a/tcl3270-3.3/mkversion.sh
++++ b/tcl3270-3.3/mkversion.sh
+@@ -59,4 +59,4 @@ const char *build_rpq_timestamp = "$rpq_timestamp";
+ const char *build_rpq_version = "$version";
+ EOF
+
+-${1-cc} -c version.c
++${1-cc} ${CFLAGS} -c version.c
+diff --git a/wc3270-3.3/mkversion.sh b/wc3270-3.3/mkversion.sh
+index e9093e0..bc3c0c9 100755
+--- a/wc3270-3.3/mkversion.sh
++++ b/wc3270-3.3/mkversion.sh
+@@ -59,4 +59,4 @@ const char *build_rpq_timestamp = "$rpq_timestamp";
+ const char *build_rpq_version = "$version";
+ EOF
+
+-${1-cc} -c version.c
++${1-cc} ${CFLAGS} -c version.c
+diff --git a/wpr3287-3.3/mkversion.sh b/wpr3287-3.3/mkversion.sh
+index bcbd6bd..f5045bd 100755
+--- a/wpr3287-3.3/mkversion.sh
++++ b/wpr3287-3.3/mkversion.sh
+@@ -47,4 +47,4 @@ const char *app_defaults_version = "$adversion";
+ static const char sccsid[] = "@(#)${2-x3270} v$version $sccsdate $user";
+ EOF
+
+-${1-cc} -c version.c
++${1-cc} ${CFLAGS} -c version.c
+diff --git a/ws3270-3.3/mkversion.sh b/ws3270-3.3/mkversion.sh
+index e9093e0..bc3c0c9 100755
+--- a/ws3270-3.3/mkversion.sh
++++ b/ws3270-3.3/mkversion.sh
+@@ -59,4 +59,4 @@ const char *build_rpq_timestamp = "$rpq_timestamp";
+ const char *build_rpq_version = "$version";
+ EOF
+
+-${1-cc} -c version.c
++${1-cc} ${CFLAGS} -c version.c
+diff --git a/x3270-3.3/mkversion.sh b/x3270-3.3/mkversion.sh
+index 31a9b41..e5eae74 100755
+--- a/x3270-3.3/mkversion.sh
++++ b/x3270-3.3/mkversion.sh
+@@ -60,4 +60,4 @@ const char *build_rpq_timestamp = "$rpq_timestamp";
+ const char *build_rpq_version = "$version";
+ EOF
+
+-${1-cc} -c version.c
++${1-cc} ${CFLAGS} -c version.c
+--
+1.7.3.2
+
Copied: csw/mgar/pkg/x3270/trunk/files/c3270-3.3_ncurses.patch (from rev 10463, csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/c3270-3.3_ncurses.patch)
===================================================================
--- csw/mgar/pkg/x3270/trunk/files/c3270-3.3_ncurses.patch (rev 0)
+++ csw/mgar/pkg/x3270/trunk/files/c3270-3.3_ncurses.patch 2011-01-04 15:50:16 UTC (rev 12176)
@@ -0,0 +1,58 @@
+--- c3270-3.3/configure.in-orig Sat Jan 1 09:02:25 2005
++++ c3270-3.3/configure.in Wed Oct 11 21:13:00 2006
+@@ -85,7 +85,7 @@
+ AC_CHECK_HEADERS(libutil.h)
+ AC_CHECK_HEADERS(util.h)
+ AC_CHECK_HEADERS(getopt.h)
+-AC_CHECK_HEADERS(ncurses.h, , [AC_CHECK_HEADERS(curses.h, , [AC_MSG_ERROR(Can't find ncurses.h or curses.h)])])
++AC_CHECK_HEADERS(ncurses.h ncurses/ncurses.h, , [AC_CHECK_HEADERS(curses.h, , [AC_MSG_ERROR(Can't find ncurses.h or curses.h)])])
+
+ dnl Check for libncurses/ncurses.h inconsistency
+ if test $ac_cv_lib_ncurses_newterm != $ac_cv_header_ncurses_h
+--- c3270-3.3/conf.h.in-orig Tue Dec 24 16:14:31 2002
++++ c3270-3.3/conf.h.in Tue Oct 10 23:35:16 2006
+@@ -28,6 +28,7 @@
+ #undef HAVE_LIBSSL
+
+ /* Header files. */
++#undef HAVE_NCURSES_NCURSES_H
+ #undef HAVE_NCURSES_H
+ #undef HAVE_CURSES_H
+ #undef HAVE_SYS_SELECT_H
+--- c3270-3.3/configure-orig Sat Jan 1 09:02:45 2005
++++ c3270-3.3/configure Tue Oct 10 23:24:18 2006
+@@ -3653,7 +3653,7 @@
+ done
+
+
+-for ac_header in ncurses.h
++for ac_header in ncurses/ncurses.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+--- c3270-3.3/keymap.c-orig Thu Apr 10 10:24:01 2003
++++ c3270-3.3/keymap.c Tue Oct 10 23:29:24 2006
+@@ -40,7 +40,9 @@
+ #undef COLOR_YELLOW
+ #undef COLOR_BLUE
+ #undef COLOR_WHITE
+-#if defined(HAVE_NCURSES_H) /*[*/
++#if defined(HAVE_NCURSES_NCURSES_H)
++#include <ncurses/ncurses.h>
++#elif defined(HAVE_NCURSES_H) /*[*/
+ #include <ncurses.h>
+ #else /*][*/
+ #include <curses.h>
+--- c3270-3.3/screen.c-orig Mon Apr 4 14:34:58 2005
++++ c3270-3.3/screen.c Tue Oct 10 23:29:30 2006
+@@ -46,7 +46,9 @@
+ #undef COLOR_YELLOW
+ #undef COLOR_BLUE
+ #undef COLOR_WHITE
+-#if defined(HAVE_NCURSES_H) /*[*/
++#if defined(HAVE_NCURSES_NCURSES_H)
++#include <ncurses/ncurses.h>
++#elif defined(HAVE_NCURSES_H) /*[*/
+ #include <ncurses.h>
+ #else /*][*/
+ #include <curses.h>
Deleted: csw/mgar/pkg/x3270/trunk/files/ibm-1027_P100-1995.cnv
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/x3270/trunk/files/ibm-1385_P100-1997.cnv
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/x3270/trunk/files/ibm-1388_P103-2001.cnv
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/x3270/trunk/files/ibm-300_P110-1997.cnv
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/x3270/trunk/files/ibm-837_P100-2000.cnv
===================================================================
(Binary files differ)
Copied: csw/mgar/pkg/x3270/trunk/files/x3270-3.3.6_DBCS.patch (from rev 10463, csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/x3270-3.3.6_DBCS.patch)
===================================================================
--- csw/mgar/pkg/x3270/trunk/files/x3270-3.3.6_DBCS.patch (rev 0)
+++ csw/mgar/pkg/x3270/trunk/files/x3270-3.3.6_DBCS.patch 2011-01-04 15:50:16 UTC (rev 12176)
@@ -0,0 +1,156 @@
+--- c3270-3.3/configure-orig Sat Aug 4 21:01:30 2007
++++ c3270-3.3/configure Sat Aug 4 22:12:23 2007
+@@ -5524,14 +5524,14 @@
+ then LDFLAGS="$orig_LDFLAGS -L$dir/lib"
+ fi
+
+-as_ac_Lib=`echo "ac_cv_lib_icui18n_ucnv_open${icu_suffix}" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for ucnv_open${icu_suffix} in -licui18n" >&5
+-echo $ECHO_N "checking for ucnv_open${icu_suffix} in -licui18n... $ECHO_C" >&6
++as_ac_Lib=`echo "ac_cv_lib_icuuc_ucnv_open${icu_suffix}" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for ucnv_open${icu_suffix} in -licuuc" >&5
++echo $ECHO_N "checking for ucnv_open${icu_suffix} in -licuuc... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-licui18n $LIBS"
++LIBS="-licuuc $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -5594,7 +5594,7 @@
+ #define HAVE_LIBICUI18N 1
+ _ACEOF
+
+- LIBS="-licui18n $LIBS"
++ LIBS="-licuuc $LIBS"
+
+ else
+ lib_fail=1
+@@ -5603,7 +5603,7 @@
+ if test "$lib_fail" -eq 0
+ then break
+ fi
+- unset `echo ac_cv_lib_icui18n_ucnv_open${icu_suffix} | $as_tr_sh`
++ unset `echo ac_cv_lib_icuuc_ucnv_open${icu_suffix} | $as_tr_sh`
+ LDFLAGS="$orig_LDFLAGS"
+ any=1
+ done
+--- pr3287-3.3/configure-orig Sat Jun 23 13:05:46 2007
++++ pr3287-3.3/configure Sat Aug 4 22:12:27 2007
+@@ -3675,14 +3675,14 @@
+ then LDFLAGS="$orig_LDFLAGS -L$dir/lib"
+ fi
+
+-as_ac_Lib=`echo "ac_cv_lib_icui18n_ucnv_open${icu_suffix}" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for ucnv_open${icu_suffix} in -licui18n" >&5
+-echo $ECHO_N "checking for ucnv_open${icu_suffix} in -licui18n... $ECHO_C" >&6
++as_ac_Lib=`echo "ac_cv_lib_icuuc_ucnv_open${icu_suffix}" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for ucnv_open${icu_suffix} in -licuuc" >&5
++echo $ECHO_N "checking for ucnv_open${icu_suffix} in -licuuc... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-licui18n $LIBS"
++LIBS="-licuuc $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -3745,7 +3745,7 @@
+ #define HAVE_LIBICUI18N 1
+ _ACEOF
+
+- LIBS="-licui18n $LIBS"
++ LIBS="-licuuc $LIBS"
+
+ else
+ lib_fail=1
+@@ -3754,7 +3754,7 @@
+ if test "$lib_fail" -eq 0
+ then break
+ fi
+- unset `echo ac_cv_lib_icui18n_ucnv_open${icu_suffix} | $as_tr_sh`
++ unset `echo ac_cv_lib_icuuc_ucnv_open${icu_suffix} | $as_tr_sh`
+ LDFLAGS="$orig_LDFLAGS"
+ any=1
+ done
+--- s3270-3.3/configure-orig Mon Jun 18 08:29:58 2007
++++ s3270-3.3/configure Sat Aug 4 22:12:31 2007
+@@ -4793,14 +4793,14 @@
+ then LDFLAGS="$orig_LDFLAGS -L$dir/lib"
+ fi
+
+-as_ac_Lib=`echo "ac_cv_lib_icui18n_ucnv_open${icu_suffix}" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for ucnv_open${icu_suffix} in -licui18n" >&5
+-echo $ECHO_N "checking for ucnv_open${icu_suffix} in -licui18n... $ECHO_C" >&6
++as_ac_Lib=`echo "ac_cv_lib_icuuc_ucnv_open${icu_suffix}" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for ucnv_open${icu_suffix} in -licuuc" >&5
++echo $ECHO_N "checking for ucnv_open${icu_suffix} in -licuuc... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-licui18n $LIBS"
++LIBS="-licuuc $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -4863,7 +4863,7 @@
+ #define HAVE_LIBICUI18N 1
+ _ACEOF
+
+- LIBS="-licui18n $LIBS"
++ LIBS="-licuuc $LIBS"
+
+ else
+ lib_fail=1
+@@ -4872,7 +4872,7 @@
+ if test "$lib_fail" -eq 0
+ then break
+ fi
+- unset `echo ac_cv_lib_icui18n_ucnv_open${icu_suffix} | $as_tr_sh`
++ unset `echo ac_cv_lib_icuuc_ucnv_open${icu_suffix} | $as_tr_sh`
+ LDFLAGS="$orig_LDFLAGS"
+ any=1
+ done
+--- tcl3270-3.3/configure-orig Mon Jun 18 08:21:23 2007
++++ tcl3270-3.3/configure Sat Aug 4 22:12:37 2007
+@@ -5327,14 +5327,14 @@
+ then LDFLAGS="$orig_LDFLAGS -L$dir/lib"
+ fi
+
+-as_ac_Lib=`echo "ac_cv_lib_icui18n_ucnv_open${icu_suffix}" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for ucnv_open${icu_suffix} in -licui18n" >&5
+-echo $ECHO_N "checking for ucnv_open${icu_suffix} in -licui18n... $ECHO_C" >&6
++as_ac_Lib=`echo "ac_cv_lib_icuuc_ucnv_open${icu_suffix}" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for ucnv_open${icu_suffix} in -licuuc" >&5
++echo $ECHO_N "checking for ucnv_open${icu_suffix} in -licuuc... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-licui18n $LIBS"
++LIBS="-licuuc $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -5397,7 +5397,7 @@
+ #define HAVE_LIBICUI18N 1
+ _ACEOF
+
+- LIBS="-licui18n $LIBS"
++ LIBS="-licuuc $LIBS"
+
+ else
+ lib_fail=1
+@@ -5406,7 +5406,7 @@
+ if test "$lib_fail" -eq 0
+ then break
+ fi
+- unset `echo ac_cv_lib_icui18n_ucnv_open${icu_suffix} | $as_tr_sh`
++ unset `echo ac_cv_lib_icuuc_ucnv_open${icu_suffix} | $as_tr_sh`
+ LDFLAGS="$orig_LDFLAGS"
+ any=1
+ done
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list