# HG changeset patch
# User John Donoghue
# Date 1433785751 14400
# Node ID 76247f439f517d5a197d26aacd2b508eba0c85bb
# Parent  808ff354717a8f88e7f7165fce90e6f64ff7dd36
of-strings: update to v1.2.0

* src/of-strings.mk: update version, checksum, subdir

* src/of-strings-1-fixes.patch: update cross build patch

* build_packages.m: update strings version number

diff -r 808ff354717a -r 76247f439f51 build_packages.m
--- a/build_packages.m	Mon Jun 08 22:03:11 2015 -0400
+++ b/build_packages.m	Mon Jun 08 13:49:11 2015 -0400
@@ -57,6 +57,6 @@
 try_install queueing-1.2.3.tar.gz
 try_install nurbs-1.3.9.tar.gz
 try_install octcdf-1.1.8.tar.gz
-try_install strings-1.1.0.tar.gz
+try_install strings-1.2.0.tar.gz
 try_install ga-0.10.0.tar.gz
 
diff -r 808ff354717a -r 76247f439f51 src/of-strings-1-fixes.patch
--- a/src/of-strings-1-fixes.patch	Mon Jun 08 22:03:11 2015 -0400
+++ b/src/of-strings-1-fixes.patch	Mon Jun 08 13:49:11 2015 -0400
@@ -1,73 +1,16 @@
-diff -urN strings.orig/inst/strjoin.m strings/inst/strjoin.m
---- strings.orig/inst/strjoin.m	2015-04-13 21:40:26.000000000 -0400
-+++ strings/inst/strjoin.m	1969-12-31 19:00:00.000000000 -0500
-@@ -1,54 +0,0 @@
--## Copyright (C) 2007 Muthiah Annamalai <muthiah.annamalai@uta.edu>
--##
--## This program is free software; you can redistribute it and/or modify it under
--## the terms of the GNU General Public License as published by the Free Software
--## Foundation; either version 3 of the License, or (at your option) any later
--## version.
--##
--## This program is distributed in the hope that it will be useful, but WITHOUT
--## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
--## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
--## details.
--##
--## You should have received a copy of the GNU General Public License along with
--## this program; if not, see <http://www.gnu.org/licenses/>.
--
--## -*- texinfo -*-
--## @deftypefn {Function File} {@var{rval} =} strjoin (@var{prefixstr}, @var{stringcell})
--## @deftypefnx {Function File} {@var{rval} =} strjoin (@var{prefixstr}, @var{varargs})
--## Joins the strings in @var{stringcell} with the @var{prefixstr} like the list-join
--## function in Python; the second version allows usage with variable number of arguments.
--## Note that, if using cell-array as a second argument, only 2 arguments are accepted.
--## Also note that, both the arguments are strings or containers of strings (cells).
--##
--## @example
--## @group
--##           strjoin(' loves-> ','marie','amy','beth') 
--##           ##returns 'marie loves-> amy loves-> beth'
--##
--##           strjoin('*',@{'Octave','Scilab','Lush','Yorick'@})
--##           ##returns 'Octave*Scilab*Lush*Yorick'
--## @end group
--## @end example
--## @seealso {strcmp}
--## @end deftypefn
--
--function rval = strjoin (spacer, varargin)
--  if (nargin < 2) || (nargin > 2  && iscell(varargin{1}) )
--    print_usage();
--  end
--
--  if iscell(varargin{1})
--    varargin=varargin{1};
--  end
--
--  rval="";
--  L=length(varargin);
--  for idx=1:(L-1)
--    rval=strcat(rval,sprintf('%s%s',varargin{idx},spacer));
--  end
--  rval=strcat(rval,varargin{L});
--endfunction
--
--%!assert(strjoin("-","hello"),"hello")
--%!assert(strjoin('*',{'Octave','Scilab','Lush','Yorick'}),'Octave*Scilab*Lush*Yorick')
-diff -urN strings.orig/src/Makefile strings/src/Makefile
---- strings.orig/src/Makefile	2015-04-13 21:40:26.000000000 -0400
-+++ strings/src/Makefile	2015-04-13 21:40:48.000000000 -0400
-@@ -1,9 +1,10 @@
- MKOCTFILE = mkoctfile -Wall
-+PCRE_LIBS := $(shell pcre-config --libs)
+diff -ur strings-1.2.0.orig/src/Makefile strings-1.2.0/src/Makefile
+--- strings-1.2.0.orig/src/Makefile	2015-06-08 13:43:45.551556353 -0400
++++ strings-1.2.0/src/Makefile	2015-06-08 13:45:22.693478306 -0400
+@@ -1,11 +1,7 @@
+ OCTAVE ?= octave
+ MKOCTFILE ?= mkoctfile -Wall
  
- all: pcregexp.oct
+-PCRE_SWITCHES := $(shell $(OCTAVE) \
+-	--no-gui --no-init-file --no-site-file --silent --no-history \
+-	--eval 'disp (octave_config_info ("PCRE_LIBS"));' \
+-	--eval 'disp (octave_config_info ("PCRE_CPPFLAGS"));' \
+-	)
++PCRE_SWITCHES := $(shell pcre-config --libs)
  
- %.oct: %.cc
--	$(MKOCTFILE) $<
-+	$(MKOCTFILE) $< $(PCRE_LIBS)
- 
- clean:
- 	rm -f *.o octave-core core *.oct *~
+ pcregexp.oct: %.oct: %.cc
+ 	$(MKOCTFILE) $(PCRE_SWITCHES) -o $@ $<
diff -r 808ff354717a -r 76247f439f51 src/of-strings.mk
--- a/src/of-strings.mk	Mon Jun 08 22:03:11 2015 -0400
+++ b/src/of-strings.mk	Mon Jun 08 13:49:11 2015 -0400
@@ -3,10 +3,10 @@
 
 PKG             := of-strings
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.1.0
-$(PKG)_CHECKSUM := 55a77a68d3015d0aa471a723b099a9460838e82c
+$(PKG)_VERSION  := 1.2.0
+$(PKG)_CHECKSUM := 5db5442b62961a490526eec5d30e6db2a008914a
 $(PKG)_REMOTE_SUBDIR := 
-$(PKG)_SUBDIR   := strings
+$(PKG)_SUBDIR   := strings-$($(PKG)_VERSION)
 $(PKG)_FILE     := strings-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := '$(OCTAVE_FORGE_BASE_URL)/$($(PKG)_FILE)/download'
 $(PKG)_DEPS     :=