[csw-devel] SF.net SVN: gar:[12178] csw/mgar/pkg/x3270/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Tue Jan 4 17:29:10 CET 2011
Revision: 12178
http://gar.svn.sourceforge.net/gar/?rev=12178&view=rev
Author: dmichelsen
Date: 2011-01-04 16:29:10 +0000 (Tue, 04 Jan 2011)
Log Message:
-----------
x3270: Remove unneeded stuff from older builds
Modified Paths:
--------------
csw/mgar/pkg/x3270/trunk/Makefile
Removed Paths:
-------------
csw/mgar/pkg/x3270/trunk/files/0001-Add-Error-function.patch
csw/mgar/pkg/x3270/trunk/files/COPYING
csw/mgar/pkg/x3270/trunk/files/c3270-3.3_ncurses.patch
csw/mgar/pkg/x3270/trunk/files/x3270-3.3.6_DBCS.patch
Modified: csw/mgar/pkg/x3270/trunk/Makefile
===================================================================
--- csw/mgar/pkg/x3270/trunk/Makefile 2011-01-04 16:25:56 UTC (rev 12177)
+++ csw/mgar/pkg/x3270/trunk/Makefile 2011-01-04 16:29:10 UTC (rev 12178)
@@ -9,9 +9,9 @@
MASTER_SITES = $(SF_MIRROR)
DISTFILES = suite3270-$(VERSION)-src.tgz
-DISTFILES += COPYING
-PATCHFILES = 0001-Add-Error-function.patch
+# Add patch until this bug is resolved:
+# https://sourceforge.net/tracker/?func=detail&aid=3151250&group_id=153338&atid=787364
PATCHFILES += 0002-Propagate-CFLAGS-to-building-of-version.o.patch
# PATCHFILES += x3270-3.3.6_DBCS.patch
@@ -29,6 +29,8 @@
# SUBSYSTEMS = c3270 pr3287 s3270 tcl3270 wc3270 wpr3287 ws3270 x3270
SUBSYSTEMS = c3270 pr3287 s3270 tcl3270 x3270
+LICENSE = c3270-$(BASEREL)/LICENSE
+
DEP_PKGS = CSWiconv CSWtcl CSWreadline CSWosslrt CSWncurses
EXTRA_LINKER_FLAGS = -liconv
@@ -39,7 +41,7 @@
sysconfdir = /etc/opt/csw
CONFIGURE_ARGS-tcl3270 = --with-tcl=8.4
-CONFIGURE_ARGS-x3270 = --without-pr3287 --with-fontdir=$(sharedstatedir)/x3270
+CONFIGURE_ARGS-x3270 = --with-fontdir=$(sharedstatedir)/x3270
CONFIGURE_ARGS = $(DIRPATHS)
BUILD_SCRIPTS = $(foreach S,$(SUBSYSTEMS),$(WORKDIR)/$S-$(BASEREL)/Makefile)
@@ -52,19 +54,9 @@
INSTALL_OVERRIDE_VAR_MANPATH = $(mandir)
INSTALL_OVERRIDE_VAR_BINDIR = $(bindir)
-# EXTRA_PAX_ARGS = -s ",\./usr/openwin/bin/,.$(bindir)/,p"
-
MIGRATE_FILES = x3270/ibm_hosts
PRESERVECONF = $(addprefix $(sysconfdir)/,$(MIGRATE_FILES))
-#MANPAGES = s3270-$(BASEREL)/s3270
-#MANPAGES += c3270-$(BASEREL)/c3270
-#MANPAGES += tcl3270-$(BASEREL)/tcl3270
-#MANPAGES += pr3287-$(BASEREL)/pr3287
-#MANPAGES += x3270-$(BASEREL)/x3270
-#MANPAGES += x3270-$(BASEREL)/x3270if
-#MANPAGES += x3270-$(BASEREL)/x3270-script
-
include gar/category.mk
configure-x3270-%:
@@ -75,10 +67,5 @@
post-install-modulated:
ginstall -d $(DESTDIR)$(libdir)/x3270
ginstall $(WORKSRC)/x3270-$(BASEREL)/x3270_glue.expect $(DESTDIR)$(libdir)/x3270/x3270_glue.expect
- #ginstall -d $(DESTDIR)$(mandir)/man1
- #$(foreach M,$(MANPAGES),ginstall $(WORKSRC)/$(M).man $(DESTDIR)$(mandir)/man1/$(notdir $M).1;)
- 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;)
- @$(MAKECOOKIE)
+ #@$(MAKECOOKIE)
Deleted: csw/mgar/pkg/x3270/trunk/files/0001-Add-Error-function.patch
===================================================================
--- csw/mgar/pkg/x3270/trunk/files/0001-Add-Error-function.patch 2011-01-04 16:25:56 UTC (rev 12177)
+++ csw/mgar/pkg/x3270/trunk/files/0001-Add-Error-function.patch 2011-01-04 16:29:10 UTC (rev 12178)
@@ -1,29 +0,0 @@
-From f17056fb38d8ad44449269999c7c272557f24960 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Thu, 24 Jun 2010 11:06:55 +0200
-Subject: [PATCH] Add Error function
-
----
- pr3287-3.3/pr3287.c | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/pr3287-3.3/pr3287.c b/pr3287-3.3/pr3287.c
-index 9f759c6..e749845 100644
---- a/pr3287-3.3/pr3287.c
-+++ b/pr3287-3.3/pr3287.c
-@@ -309,6 +309,12 @@ NewString(const char *s)
- }
-
- void
-+Warning(const char *msg)
-+{
-+ errmsg(msg);
-+}
-+
-+void
- Error(const char *msg)
- {
- errmsg(msg);
---
-1.7.1
-
Deleted: csw/mgar/pkg/x3270/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/x3270/trunk/files/COPYING 2011-01-04 16:25:56 UTC (rev 12177)
+++ csw/mgar/pkg/x3270/trunk/files/COPYING 2011-01-04 16:29:10 UTC (rev 12178)
@@ -1,83 +0,0 @@
-Licensing Information
-+++++++++++++++++++++
-
-Here is the official copyright notice for
-x3270 , c3270 , wc3270 , s3270 , tcl3270 and pr3287
-
-It is a standard 3-element BSD license.
-Copyright \xA9 1993-2009, Paul Mattes. Copyright \xA9 2004-2005, Don Russell.
-Copyright \xA9 2004, Dick Altenbern. Copyright \xA9 1990, Jeff Sparkes.
-Copyright \xA9 1989, Georgia Tech Research Corporation (GTRC), Atlanta, GA
-30332. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
- * Neither the names of Paul Mattes, Don Russell, Dick Altenbern,
- Jeff Sparkes, GTRC nor the names of their contributors may be used
- to endorse or promote products derived from this software without
- specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY PAUL MATTES, DON RUSSELL, DICK ALTENBERN,
-JEFF SPARKES AND GTRC "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-PAUL MATTES, DON RUSSELL, DICK ALTENBERN, JEFF SPARKES OR GTRC BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
-
-The 3270-20 font is derived from an NCD font, so it carries an
-additional notice (an MIT license):
-Copyright \xA9 1989-1991 Network Computing Devices, Inc. NCD is a
-registered trademark of Network Computing Devices, Inc.
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of NCD may not be used in
-advertising or publicity pertaining to distribution of the software
-without specific, written prior permission. NCD makes no representations
-about the suitability of this software for any purpose. It is provided
-``as is'' without express or implied warranty.
-
-NCD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL NCD
-BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
-DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-The ComplexMenu sources are derived from the MIT X11R5 Athena SimpleMenu
-widget, and carry an additional notice (another MIT license):
-Copyright \xA9 1989 Massachusetts Institute of Technology
-
-Permission to use, copy, modify, distribute, and sell this software and
-its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of M.I.T. not be used in
-advertising or publicity pertaining to distribution of the software
-without specific, written prior permission. M.I.T. makes no
-representations about the suitability of this software for any purpose.
-It is provided "as is" without express or implied warranty.
-
-M.I.T. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-M.I.T. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
Deleted: csw/mgar/pkg/x3270/trunk/files/c3270-3.3_ncurses.patch
===================================================================
--- csw/mgar/pkg/x3270/trunk/files/c3270-3.3_ncurses.patch 2011-01-04 16:25:56 UTC (rev 12177)
+++ csw/mgar/pkg/x3270/trunk/files/c3270-3.3_ncurses.patch 2011-01-04 16:29:10 UTC (rev 12178)
@@ -1,58 +0,0 @@
---- 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/x3270-3.3.6_DBCS.patch
===================================================================
--- csw/mgar/pkg/x3270/trunk/files/x3270-3.3.6_DBCS.patch 2011-01-04 16:25:56 UTC (rev 12177)
+++ csw/mgar/pkg/x3270/trunk/files/x3270-3.3.6_DBCS.patch 2011-01-04 16:29:10 UTC (rev 12178)
@@ -1,156 +0,0 @@
---- 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