[csw-devel] SF.net SVN: gar:[9279] csw/mgar/pkg/expect/trunk
hson at users.sourceforge.net
hson at users.sourceforge.net
Sat Mar 20 11:59:19 CET 2010
Revision: 9279
http://gar.svn.sourceforge.net/gar/?rev=9279&view=rev
Author: hson
Date: 2010-03-20 10:59:18 +0000 (Sat, 20 Mar 2010)
Log Message:
-----------
Finally figured out how to build expect without having tcl and tk unpacked in
the same source tree.
Cleaned up Makefile
Added patches to get ried of some warnings.
Modified Paths:
--------------
csw/mgar/pkg/expect/trunk/Makefile
csw/mgar/pkg/expect/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/expect/trunk/files/Makefile.in.patch
csw/mgar/pkg/expect/trunk/files/license
csw/mgar/pkg/expect/trunk/files/solaris.patch
csw/mgar/pkg/expect/trunk/files/warnings.patch
Modified: csw/mgar/pkg/expect/trunk/Makefile
===================================================================
--- csw/mgar/pkg/expect/trunk/Makefile 2010-03-20 10:49:50 UTC (rev 9278)
+++ csw/mgar/pkg/expect/trunk/Makefile 2010-03-20 10:59:18 UTC (rev 9279)
@@ -15,14 +15,6 @@
you'll be able to do this automation quickly and easily.
endef
-# Build and package tcl
-# Build and package tk
-# "gmake extract" in expect
-# "cp -rp ../../tcl/trunk/work/.../tcl8.5.7 work/.../build.../"
-# "cp -rp ../../tk/trunk/work/.../tk8.5.7 work/.../build.../"
-# "gmake build package repackage"
-
-
# For some reason upstream have recalled 5.44.1 and has 5.43 as primary on
# homepage as expect.tar.gz
MASTER_SITES = http://expect.nist.gov/
@@ -30,10 +22,8 @@
DISTNAME = $(GARNAME)-$(GARVERSION)
DISTFILES = $(GARNAME).tar.gz
DISTFILES += expect.m4
+DISTFILES += license
-DISTFILES += tcl8.5.7-src.tar.gz
-DISTFILES += tk8.5.7-src.tar.gz
-
PATCHFILES += expect-5.39.0-libdir.patch
#PATCHFILES += expect-5.42.1-missing-includes.patch
#PATCHFILES += expect-5.42.1-multilib.patch
@@ -42,19 +32,45 @@
PATCHFILES += expect-5.43.0-multilib.patch
#PATCHFILES += expect-5.44.1-destdir.patch
#PATCHFILES += expect-5.44.1-gfbsd.patch
+PATCHFILES += Makefile.in.patch
+# Missing include files gives warnings
+PATCHFILES += solaris.patch
+# Fix some warnings
+PATCHFILES += warnings.patch
+LICENSE = license
+
+RUNTIME_DEP_PKGS_CSWexpect += CSWtcl
+RUNTIME_DEP_PKGS_CSWexpect += CSWtk
+RUNTIME_DEP_PKGS_CSWexpect += CSWfconfig
+RUNTIME_DEP_PKGS_CSWexpect += CSWftype2
+RUNTIME_DEP_PKGS_CSWexpect += CSWlibx11
+RUNTIME_DEP_PKGS_CSWexpect += CSWlibxft2
+RUNTIME_DEP_PKGS_CSWexpect += CSWlibxrender
+
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
-CONFIGURE_ARGS = $(DIRPATHS)
+EXTRA_INC = $(prefix)/X11/include
+EXTRA_LIB = $(prefix)/X11/lib
+EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
+#EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
+
+INSTALL_ROOT=$(DESTDIR)
+INSTALL_EXPORTS += INSTALL_ROOT
+INSTALL_EXPORTS += LD_OPTIONS
+
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include
+CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
CONFIGURE_ARGS += --enable-shared
-CONFIGURE_ARGS += --with-tcl=/opt/csw/lib --with-tk=/opt/csw/lib
-# CONFIGURE_ARGS += --with-tclinclude=$(WORKSRC)/../tcl8.5.7/generic/
-# CONFIGURE_ARGS += --with-tkinclude=$(WORKSRC)/../tk8.5.7/generic/
-CONFIGURE_ARGS += --with-tclinclude=$(abspath $(WORKDIR)/tcl8.5.7/unix)
-CONFIGURE_ARGS += --with-tkinclude=$(abspath $(WORKDIR)/tk8.5.7/unix)
+CONFIGURE_ARGS += --with-tcl=$(libdir) --with-tk=$(libdir)
+CONFIGURE_ARGS += --with-tclinclude=$(includedir)
+CONFIGURE_ARGS += --with-tkinclude=$(includedir)
TEST_TARGET =
+BUILD64 = 1
+
include gar/category.mk
pre-configure-modulated:
Modified: csw/mgar/pkg/expect/trunk/checksums
===================================================================
--- csw/mgar/pkg/expect/trunk/checksums 2010-03-20 10:49:50 UTC (rev 9278)
+++ csw/mgar/pkg/expect/trunk/checksums 2010-03-20 10:59:18 UTC (rev 9279)
@@ -1,3 +1,4 @@
+c488d8e53c265fe25964a274ea4aff1e Makefile.in.patch
c458386d5502fab2b49da03d16fb108c expect-5.39.0-libdir.patch
5661004ca23ddc9592f488142367c2f5 expect-5.43.0-avoid-tcl-internals-1.patch
3d67a79c1d7790c7e49b5df7f57b0290 expect-5.43.0-missing-includes.patch
@@ -4,5 +5,6 @@
2103ff302f6e8a0dd748772f6512b3a5 expect-5.43.0-multilib.patch
595b7a7c63f7ddb42e19c2537bb2891b expect.m4
43e1dc0e0bc9492cf2e1a6f59f276bc3 expect.tar.gz
-f70ad8f78b5e4a9f792fe101f22b125f tcl8.5.7-src.tar.gz
-0764f63ae2106b4774c4ecb0ef391610 tk8.5.7-src.tar.gz
+040cd3fa024e1b8fb313da63db17f699 license
+9cd31c4268e88029322348a1ac13cffd solaris.patch
+21c1566a06d28c027a8cdf632b46fcb8 warnings.patch
Added: csw/mgar/pkg/expect/trunk/files/Makefile.in.patch
===================================================================
--- csw/mgar/pkg/expect/trunk/files/Makefile.in.patch (rev 0)
+++ csw/mgar/pkg/expect/trunk/files/Makefile.in.patch 2010-03-20 10:59:18 UTC (rev 9279)
@@ -0,0 +1,55 @@
+--- expect-5.43/Makefile.in.orig 2010-03-18 11:22:26.000000000 +0100
++++ expect-5.43/Makefile.in 2010-03-18 14:43:07.596140428 +0100
+@@ -101,7 +101,7 @@
+ # to be different than those used for actually reference files at
+ # run-time. INSTALL_ROOT is prepended to $prefix and $exec_prefix
+ # when installing files.
+-INSTALL_ROOT =
++#INSTALL_ROOT =
+
+ # The following Expect scripts are not necessary to have installed as
+ # commands, but are very useful. Edit out what you don't want installed.
+@@ -345,7 +345,7 @@
+ # build expect binary that does not depend on Expect's shared libs
+ # IFF static Tcl/Tk libraries are available.
+ expect: exp_main_exp.o $(EXP_UNSHARED_LIB_FILE)
+- $(CC) $(XCFLAGS) @TCL_LD_FLAGS@ -o expect exp_main_exp.o $(EXP_UNSHARED_LIB_FILE) $(TCLLIB) $(EXP_AND_TCL_LIBS)
++ $(CC) $(XCFLAGS) $(LDFLAGS) -o expect exp_main_exp.o $(EXP_UNSHARED_LIB_FILE) $(TCLLIB) $(EXP_AND_TCL_LIBS)
+ $(SETUID) expect
+
+ # install Expect library
+@@ -372,12 +372,12 @@
+ else true; fi
+
+ expect_installed: exp_main_exp.o $(EXP_LIB_FILE) install_shared_lib
+- $(CC) $(XCFLAGS) @EXP_SHLIB_CFLAGS@ @TCL_LD_FLAGS@ -o expect_installed exp_main_exp.o @EXP_LIB_SPEC@ $(TCLLIB_INSTALLED) $(EXP_AND_TCL_LIBS)
++ $(CC) $(XCFLAGS) @EXP_SHLIB_CFLAGS@ $(LDFLAGS) -o expect_installed exp_main_exp.o @EXP_LIB_SPEC@ $(TCLLIB_INSTALLED) $(EXP_AND_TCL_LIBS)
+ $(SETUID) expect_installed
+
+ # Build Expect with TestCenter
+ expect.tc: exp_main_exp.o $(OFILES)
+- proof $(CC) $(XCFLAGS) @EXP_SHLIB_CFLAGS@ @TCL_LD_FLAGS@ -o expect.tc $(OFILES) exp_main_exp.o $(TCLLIB) $(EXP_AND_TCL_LIBS)
++ proof $(CC) $(XCFLAGS) @EXP_SHLIB_CFLAGS@ $(LDFLAGS) -o expect.tc $(OFILES) exp_main_exp.o $(TCLLIB) $(EXP_AND_TCL_LIBS)
+ $(SETUID) expect.tc
+
+ # Build an executable with both Expect and Tk
+@@ -388,16 +388,16 @@
+ # configure) separately for Expectk, but as far as I know, it doesn't hurt
+ # anything here, so I'm not worrying about it.
+ expectk: exp_main_tk.o $(EXP_UNSHARED_LIB_FILE)
+- $(CC) $(XCFLAGS) @TCL_LD_FLAGS@ -o expectk exp_main_tk.o $(EXP_UNSHARED_LIB_FILE) $(TKLIB) $(TCLLIB) $(X11_LD_FLAGS) $(EXP_AND_TK_LIBS)
++ $(CC) $(XCFLAGS) $(LDFLAGS) -o expectk exp_main_tk.o $(EXP_UNSHARED_LIB_FILE) $(TKLIB) $(TCLLIB) $(X11_LD_FLAGS) $(EXP_AND_TK_LIBS)
+ $(SETUID) expectk
+
+ expectk_installed: exp_main_tk.o $(EXP_LIB_FILE)
+- $(CC) $(XCFLAGS) @EXP_SHLIB_CFLAGS@ @TCL_LD_FLAGS@ -o expectk_installed exp_main_tk.o @EXP_LIB_SPEC@ $(TKLIB_INSTALLED) $(TCLLIB_INSTALLED) $(X11_LD_FLAGS) $(EXP_AND_TK_LIBS)
++ $(CC) $(XCFLAGS) @EXP_SHLIB_CFLAGS@ $(LDFLAGS) -o expectk_installed exp_main_tk.o @EXP_LIB_SPEC@ $(TKLIB_INSTALLED) $(TCLLIB_INSTALLED) $(X11_LD_FLAGS) $(EXP_AND_TK_LIBS)
+ $(SETUID) expectk_installed
+
+ # Build Expectk with TestCenter
+ expectk.tc: exp_main_tk.o $(OFILES)
+- proof $(CC) $(XCFLAGS) @TCL_LD_FLAGS@ -o expectk.tc $(OFILES) exp_main_tk.o $(TKLIB) $(TCLLIB) $(X11_LD_FLAGS) $(EXP_AND_TK_LIBS)
++ proof $(CC) $(XCFLAGS) $(LDFLAGS) -o expectk.tc $(OFILES) exp_main_tk.o $(TKLIB) $(TCLLIB) $(X11_LD_FLAGS) $(EXP_AND_TK_LIBS)
+ $(SETUID) expectk.tc
+
+ expect-unshared-lib-file :: $(EXP_UNSHARED_LIB_FILE)
Added: csw/mgar/pkg/expect/trunk/files/license
===================================================================
--- csw/mgar/pkg/expect/trunk/files/license (rev 0)
+++ csw/mgar/pkg/expect/trunk/files/license 2010-03-20 10:59:18 UTC (rev 9279)
@@ -0,0 +1,35 @@
+Although I can't promise anything in the way of support, I'd be
+interested to hear about your experiences using it (good or bad). I'm
+also interested in hearing bug reports and suggestions for improvement
+even though I can't promise to implement them.
+
+If you send me a bug, fix, or question, include the version of Expect
+(as reported by expect -d), version of Tcl, and name and version of
+the OS that you are using. Before sending mail, it may be helpful to
+verify that your problem still exists in the latest version. You can
+check on the current release and whether it addresses your problems by
+retrieving the latest HISTORY file (see "History" above).
+
+
+Awards, love letters, and bug reports may be sent to:
+
+Don Libes
+National Institute of Standards and Technology
+Bldg 220, Rm A-127
+Gaithersburg, MD 20899
+(301) 975-3535
+libes at nist.gov
+
+I hereby place this software in the public domain. NIST and I would
+appreciate credit if this program or parts of it are used.
+
+Design and implementation of this program was funded primarily by
+myself. Funding contributors include the NIST Automated Manufacturing
+Research Facility (funded by the Navy Manufacturing Technology
+Program), the NIST Scientific and Technical Research Services, the
+ARPA Persistent Object Bases project and the Computer-aided
+Acquisition and the Logistic Support (CALS) program of the Office of
+the Secretary of Defense.
+
+Especially signicant contributions were made by John Ousterhout, Henry
+Spencer, and Rob Savoye. See the HISTORY file for others.
Added: csw/mgar/pkg/expect/trunk/files/solaris.patch
===================================================================
--- csw/mgar/pkg/expect/trunk/files/solaris.patch (rev 0)
+++ csw/mgar/pkg/expect/trunk/files/solaris.patch 2010-03-20 10:59:18 UTC (rev 9279)
@@ -0,0 +1,77 @@
+diff -Nru expect-5.43.orig/exp_clib.c expect-5.43/exp_clib.c
+--- expect-5.43.orig/exp_clib.c 2003-05-05 23:34:18.000000000 +0200
++++ expect-5.43/exp_clib.c 2010-03-20 06:10:27.258008060 +0100
+@@ -38,6 +38,9 @@
+ #endif
+
+ #ifdef HAVE_SYS_FCNTL_H
++#ifdef __sun
++# include <fcntl.h>
++#endif
+ # include <sys/fcntl.h>
+ #else
+ # include <fcntl.h>
+@@ -56,6 +59,9 @@
+
+ #include <errno.h>
+
++/* For read, write,execvp... */
++#include <unistd.h>
++
+ #ifdef NO_STDLIB_H
+
+ /*
+diff -Nru expect-5.43.orig/exp_main_tk.c expect-5.43/exp_main_tk.c
+--- expect-5.43.orig/exp_main_tk.c 2003-07-31 20:27:20.000000000 +0200
++++ expect-5.43/exp_main_tk.c 2010-03-20 06:11:38.913371288 +0100
+@@ -33,6 +33,8 @@
+ #endif /* not lint */
+
+ #include <ctype.h>
++/* For strrchr, strcpy */
++#include <string.h>
+
+ #include "tk.h"
+
+diff -Nru expect-5.43.orig/exp_pty.c expect-5.43/exp_pty.c
+--- expect-5.43.orig/exp_pty.c 2002-04-08 01:09:00.000000000 +0200
++++ expect-5.43/exp_pty.c 2010-03-20 06:07:09.035909728 +0100
+@@ -13,6 +13,10 @@
+ # include <unistd.h>
+ #endif
+ #ifdef HAVE_SYS_FCNTL_H
++/* open() is defined in fcntl.h not sys/fcntl.h */
++#ifdef __sun
++# include <fcntl.h>
++#endif
+ # include <sys/fcntl.h>
+ #else
+ # include <fcntl.h>
+diff -Nru expect-5.43.orig/exp_win.c expect-5.43/exp_win.c
+--- expect-5.43.orig/exp_win.c 2002-02-12 03:00:55.000000000 +0100
++++ expect-5.43/exp_win.c 2010-03-20 06:06:24.992305028 +0100
+@@ -10,6 +10,10 @@
+ #include "expect_cf.h"
+ #include "tcl.h"
+
++/* Needed for ioctl */
++#include <unistd.h>
++#include <stropts.h>
++
+ #ifdef NO_STDLIB_H
+ #include "../compat/stdlib.h"
+ #else
+diff -Nru expect-5.43.orig/pty_termios.c expect-5.43/pty_termios.c
+--- expect-5.43.orig/pty_termios.c 2010-03-20 03:14:25.000000000 +0100
++++ expect-5.43/pty_termios.c 2010-03-20 06:07:23.720256962 +0100
+@@ -10,6 +10,10 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <signal.h>
++/* for open() */
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <fcntl.h>
+
+ #if defined(SIGCLD) && !defined(SIGCHLD)
+ #define SIGCHLD SIGCLD
Added: csw/mgar/pkg/expect/trunk/files/warnings.patch
===================================================================
--- csw/mgar/pkg/expect/trunk/files/warnings.patch (rev 0)
+++ csw/mgar/pkg/expect/trunk/files/warnings.patch 2010-03-20 10:59:18 UTC (rev 9279)
@@ -0,0 +1,23 @@
+diff -Nru expect-5.43.orig/exp_command.c expect-5.43/exp_command.c
+--- expect-5.43.orig/exp_command.c 2010-03-20 03:14:24.000000000 +0100
++++ expect-5.43/exp_command.c 2010-03-20 05:44:02.753221464 +0100
+@@ -211,6 +211,7 @@
+ char *name;
+ int open;
+ int adjust;
++ int any;
+ char *msg;
+ {
+ ExpState *esPtr;
+diff -Nru expect-5.43.orig/expect.c expect-5.43/expect.c
+--- expect-5.43.orig/expect.c 2004-07-07 01:26:02.000000000 +0200
++++ expect-5.43/expect.c 2010-03-20 05:45:23.601023932 +0100
+@@ -343,7 +343,7 @@
+ /*
+ * Advance to the next command in the script.
+ */
+- next = parse.commandStart + parse.commandSize;
++ next = (char *) (parse.commandStart + parse.commandSize);
+ bytesLeft -= next - p;
+ p = next;
+ Tcl_FreeParse(&parse);
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