[csw-devel] SF.net SVN: gar:[20657] csw/mgar/pkg/expect/trunk

[wahwah at users.sourceforge.net]

Revision: 20657
          http://gar.svn.sourceforge.net/gar/?rev=20657&view=rev
Author:   wahwah
Date:     2013-04-10 07:57:56 +0000 (Wed, 10 Apr 2013)
Log Message:
-----------
Update to a newer version

Modified Paths:
--------------
    csw/mgar/pkg/expect/trunk/Makefile
    csw/mgar/pkg/expect/trunk/checksums
    csw/mgar/pkg/expect/trunk/files/solaris.patch

Modified: csw/mgar/pkg/expect/trunk/Makefile
===================================================================
--- csw/mgar/pkg/expect/trunk/Makefile	2013-04-09 18:24:40 UTC (rev 20656)
+++ csw/mgar/pkg/expect/trunk/Makefile	2013-04-10 07:57:56 UTC (rev 20657)
@@ -1,5 +1,7 @@
+# $Id$
+
 NAME = expect
-VERSION = 5.43
+VERSION = 5.45
 GARTYPE = v2
 
 DESCRIPTION = Tool for automating interactive applications
@@ -17,10 +19,9 @@
 
 # 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/
-MASTER_SITES += http://downloads.sourceforge.net/tcl/
-DISTNAME  = $(NAME)-$(VERSION)
-DISTFILES  = $(NAME).tar.gz
+MASTER_SITES = $(SF_MIRROR)
+DISTNAME  = $(NAME)$(VERSION)
+DISTFILES  = $(DISTNAME).tar.gz
 DISTFILES += expect.m4
 DISTFILES += license
 
@@ -40,37 +41,19 @@
 
 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
-RUNTIME_DEP_PKGS_CSWexpect += CSWlibxext
-RUNTIME_DEP_PKGS_CSWexpect += CSWlibxscrnsaver
-RUNTIME_DEP_PKGS_CSWexpect += CSWsunmath
+RUNTIME_DEP_PKGS_CSWexpect += CSWlibtcl8-5
 
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-
-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=$(libdir) --with-tk=$(libdir)
 CONFIGURE_ARGS += --with-tclinclude=$(includedir)
 CONFIGURE_ARGS += --with-tkinclude=$(includedir)
 
-TEST_TARGET = 
+TEST_TARGET =
 
 BUILD64_LIBS_ONLY = 1
 
@@ -80,7 +63,6 @@
 	( cd $(WORKSRC);	mv ../expect.m4 .; )
 	( cd $(WORKSRC);	\
 	gsed -i.orig 's#/usr/local/bin#/opt/csw/bin#' expect.man	; \
-	gsed -i.orig 's#/usr/local/bin#/opt/csw/bin#' expectk.man	; \
 	)
 	#stops any example scripts being installed by default
 	( cd $(WORKSRC);	\

Modified: csw/mgar/pkg/expect/trunk/checksums
===================================================================
--- csw/mgar/pkg/expect/trunk/checksums	2013-04-09 18:24:40 UTC (rev 20656)
+++ csw/mgar/pkg/expect/trunk/checksums	2013-04-10 07:57:56 UTC (rev 20657)
@@ -1,10 +1 @@
-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
-2103ff302f6e8a0dd748772f6512b3a5  expect-5.43.0-multilib.patch
-595b7a7c63f7ddb42e19c2537bb2891b  expect.m4
-43e1dc0e0bc9492cf2e1a6f59f276bc3  expect.tar.gz
-040cd3fa024e1b8fb313da63db17f699  license
-9cd31c4268e88029322348a1ac13cffd  solaris.patch
-21c1566a06d28c027a8cdf632b46fcb8  warnings.patch
+44e1a4f4c877e9ddc5a542dfa7ecc92b  expect5.45.tar.gz

Modified: csw/mgar/pkg/expect/trunk/files/solaris.patch
===================================================================
--- csw/mgar/pkg/expect/trunk/files/solaris.patch	2013-04-09 18:24:40 UTC (rev 20656)
+++ csw/mgar/pkg/expect/trunk/files/solaris.patch	2013-04-10 07:57:56 UTC (rev 20657)
@@ -21,18 +21,6 @@
  #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

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.