Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/text
In directory vz-cvs-3.sog:/tmp/cvs-serv5298/stable/main/finkinfo/text
Modified Files:
recode.info recode.patch
Log Message:
sync recode build-fixes to stable
Index: recode.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/text/recode.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- recode.patch 16 Sep 2007 03:07:06 -0000 1.1
+++ recode.patch 21 Nov 2011 10:26:15 -0000 1.2
@@ -1,6 +1,52 @@
-diff -Naur recode-3.6/lib/error.c recode-new/lib/error.c
---- recode-3.6/lib/error.c 2000-08-02 21:21:13.000000000 -0400
-+++ recode-new/lib/error.c 2005-11-27 02:50:50.000000000 -0500
+diff -Nurd -x'*~' recode-3.6.orig/Makefile.am recode-3.6/Makefile.am
+--- recode-3.6.orig/Makefile.am 2000-12-06 15:03:24.000000000 -0500
++++ recode-3.6/Makefile.am 2011-09-14 03:41:59.000000000 -0400
+@@ -23,7 +23,7 @@
+
+ BABYL = ../rmail/* ../*/rmail/* ../*/*/RMAIL ../*/*/rmail/*
+ EXTRA_DIST = COPYING-LIB PATCHES-AC rebox.el recode.spec aclocal.sh
+-SUBDIRS = m4 doc lib libiconv i18n src tests contrib
++SUBDIRS = m4 doc lib i18n src tests contrib
+
+ POTFILES = src/main.c src/names.c src/outer.c src/recode.c \
+ src/request.c src/strip-data.c src/task.c src/testdump.c
+diff -Nurd -x'*~' recode-3.6.orig/configure.in recode-3.6/configure.in
+--- recode-3.6.orig/configure.in 2001-01-03 10:50:54.000000000 -0500
++++ recode-3.6/configure.in 2011-09-14 03:41:59.000000000 -0400
+@@ -7,6 +7,7 @@
+ AM_CONFIG_HEADER(config.h)
+ AM_INIT_AUTOMAKE(recode, 3.6)
+ AT_CONFIG(../src)
++AC_CONFIG_MACRO_DIR([m4])
+ ALL_LINGUAS="da de el es fr gl it nl pl pt sl sv"
+
+ AC_PROG_CC
+@@ -18,7 +19,7 @@
+ AM_C_PROTOTYPES
+ AC_C_CONST
+ AC_C_INLINE
+-ad_AC_PROG_FLEX
++AC_PROG_LEX
+
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS(limits.h locale.h memory.h stdbool.h stddef.h stdlib.h
string.h unistd.h utime.h)
+diff -Nurd -x'*~' recode-3.6.orig/lib/Makefile.am recode-3.6/lib/Makefile.am
+--- recode-3.6.orig/lib/Makefile.am 2000-10-24 15:48:40.000000000 -0400
++++ recode-3.6/lib/Makefile.am 2011-09-14 03:41:59.000000000 -0400
+@@ -20,8 +20,8 @@
+ AUTOMAKE_OPTIONS = gnits
+
+ noinst_LIBRARIES = libreco.a
+-noinst_HEADERS = error.h getopt.h gettext.h pathmax.h xstring.h
+-libreco_a_SOURCES = error.c getopt.c getopt1.c xstrdup.c
++noinst_HEADERS = error.h gettext.h pathmax.h xstring.h
++libreco_a_SOURCES = error.c xstrdup.c
+
+ EXTRA_DIST = alloca.c gettext.c malloc.c realloc.c strtol.c strtoul.c
+
+diff -Nurd -x'*~' recode-3.6.orig/lib/error.c recode-3.6/lib/error.c
+--- recode-3.6.orig/lib/error.c 2000-08-02 21:21:13.000000000 -0400
++++ recode-3.6/lib/error.c 2011-09-14 03:41:59.000000000 -0400
@@ -80,7 +80,7 @@
/* The calling program should define program_name and set it to the
@@ -10,9 +56,43 @@
# ifdef HAVE_STRERROR_R
# define __strerror_r strerror_r
-diff -Naur recode-3.6/src/hash.h recode-new/src/hash.h
---- recode-3.6/src/hash.h 2000-08-02 21:21:15.000000000 -0400
-+++ recode-new/src/hash.h 2005-11-27 01:59:59.000000000 -0500
+diff -Nurd -x'*~' recode-3.6.orig/src/Makefile.am recode-3.6/src/Makefile.am
+--- recode-3.6.orig/src/Makefile.am 2000-12-06 11:36:12.000000000 -0500
++++ recode-3.6/src/Makefile.am 2011-09-14 03:41:59.000000000 -0400
+@@ -43,14 +43,15 @@
+ L_SURFACES =
+
+ recode_SOURCES = main.c freeze.c mixed.c
+-recode_LDADD = librecode.la ../lib/libreco.a
++recode_LDADD = librecode.la
+
+ librecode_la_SOURCES = argmatch.c charname.c combine.c fr-charname.c \
+-hash.c iconv.c libiconv.c localcharset.c merged.c names.c outer.c quotearg.c \
++hash.c libiconv.c merged.c names.c outer.c quotearg.c \
+ recode.c request.c strip-pool.c task.c xmalloc.c $(C_STEPS)
+-librecode_la_LDFLAGS = -version-info 0:0:0
++librecode_la_LDFLAGS = -version-info 0:0:0 -no-undefined
++librecode_la_LIBADD = ../lib/libreco.a
+
+-INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/libiconv
++INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib
+ DEFS = -DLIBDIR=\"$(libdir)\" @DEFS@
+
+ ETAGS_ARGS = $(L_STEPS)
+diff -Nurd -x'*~' recode-3.6.orig/src/argmatch.c recode-3.6/src/argmatch.c
+--- recode-3.6.orig/src/argmatch.c 2000-08-02 21:21:15.000000000 -0400
++++ recode-3.6/src/argmatch.c 2011-09-14 03:41:59.000000000 -0400
+@@ -20,6 +20,7 @@
+
+ #include "argmatch.h"
+
++#include <stdlib.h>
+ #include <stdio.h>
+ #ifdef STDC_HEADERS
+ # include <string.h>
+diff -Nurd -x'*~' recode-3.6.orig/src/hash.h recode-3.6/src/hash.h
+--- recode-3.6.orig/src/hash.h 2000-08-02 21:21:15.000000000 -0400
++++ recode-3.6/src/hash.h 2011-09-14 03:41:59.000000000 -0400
@@ -21,6 +21,11 @@
/* Make sure USE_OBSTACK is defined to 1 if you want the allocator to use
obstacks instead of malloc, and recompile `hash.c' with same setting. */
@@ -25,9 +105,9 @@
#ifndef PARAMS
# if PROTOTYPES || __STDC__
# define PARAMS(Args) Args
-diff -Naur recode-3.6/src/libiconv.c recode-new/src/libiconv.c
---- recode-3.6/src/libiconv.c 2000-07-01 13:13:25.000000000 -0400
-+++ recode-new/src/libiconv.c 2005-11-27 01:59:59.000000000 -0500
+diff -Nurd -x'*~' recode-3.6.orig/src/libiconv.c recode-3.6/src/libiconv.c
+--- recode-3.6.orig/src/libiconv.c 2000-07-01 13:13:25.000000000 -0400
++++ recode-3.6/src/libiconv.c 2011-09-14 03:41:59.000000000 -0400
@@ -1,5 +1,5 @@
/* Conversion of files between different charsets and surfaces.
- Copyright © 1999, 2000 Free Software Foundation, Inc.
@@ -35,6 +115,24 @@
Contributed by François Pinard <pin...@iro.umontreal.ca>, 1999,
and Bruno Haible <hai...@clisp.cons.org>, 2000.
+@@ -37,7 +37,7 @@
+ char output_buffer[LIBICONV_BUFFER_SIZE];
+ size_t input_left;
+ size_t output_left;
+- const char *input;
++ char *input;
+ char *output;
+ char *cursor;
+ int transliterate;
+@@ -118,7 +118,7 @@
+ char tmp_buf[6];
+ size_t tmp_input_left;
+ size_t tmp_output_left;
+- const char *tmp_input;
++ char *tmp_input;
+ char *tmp_output;
+
+ RETURN_IF_NOGO (RECODE_INVALID_INPUT, subtask);
@@ -195,12 +195,17 @@
memcpy() doesn't do here, because the regions might overlap.
memmove() isn't worth it, because we rarely have to move more
@@ -58,9 +156,9 @@
}
}
-diff -Naur recode-3.6/src/recode.c recode-new/src/recode.c
---- recode-3.6/src/recode.c 2000-07-01 14:22:55.000000000 -0400
-+++ recode-new/src/recode.c 2005-11-27 02:03:47.000000000 -0500
+diff -Nurd -x'*~' recode-3.6.orig/src/recode.c recode-3.6/src/recode.c
+--- recode-3.6.orig/src/recode.c 2000-07-01 14:22:55.000000000 -0400
++++ recode-3.6/src/recode.c 2011-09-14 03:41:59.000000000 -0400
@@ -1,6 +1,6 @@
/* Conversion of files between different charsets and surfaces.
- Copyright © 1990,92,93,94,96,97,98,99,00 Free Software Foundation, Inc.
@@ -79,9 +177,9 @@
/* Error handling. */
-diff -Naur recode-3.6/src/request.c recode-new/src/request.c
---- recode-3.6/src/request.c 2000-06-28 14:40:21.000000000 -0400
-+++ recode-new/src/request.c 2005-11-27 01:59:59.000000000 -0500
+diff -Nurd -x'*~' recode-3.6.orig/src/request.c recode-3.6/src/request.c
+--- recode-3.6.orig/src/request.c 2000-06-28 14:40:21.000000000 -0400
++++ recode-3.6/src/request.c 2011-09-14 03:41:59.000000000 -0400
@@ -1073,7 +1073,7 @@
if (task->output.cursor + 4 >= task->output.limit)
{
@@ -91,9 +189,9 @@
size_t new_size = task->output.cursor + 4 - task->output.buffer;
/* FIXME: Rethink about how the error should be reported. */
-diff -Naur recode-3.6/src/task.c recode-new/src/task.c
---- recode-3.6/src/task.c 2000-07-01 13:50:43.000000000 -0400
-+++ recode-new/src/task.c 2005-11-27 01:59:59.000000000 -0500
+diff -Nurd -x'*~' recode-3.6.orig/src/task.c recode-3.6/src/task.c
+--- recode-3.6.orig/src/task.c 2000-07-01 13:50:43.000000000 -0400
++++ recode-3.6/src/task.c 2011-09-14 03:41:59.000000000 -0400
@@ -1198,6 +1198,8 @@
else
success = transform_mere_copy (subtask);
Index: recode.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/text/recode.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- recode.info 11 Apr 2011 13:56:25 -0000 1.4
+++ recode.info 21 Nov 2011 10:26:15 -0000 1.5
@@ -1,31 +1,48 @@
Package: recode
Version: 3.6
-Revision: 12
-Source: gnu
-Depends: %N-shlibs (= %v-%r), libgettext3-shlibs, libiconv
-BuildDepends:fink (>= 0.24.12), libgettext3-dev, libiconv-dev
-UpdateConfigGuess: true
-UpdateLibtool: true
-NoSetLDFLAGS: true
-SetLIBS: -L%p/lib -liconv -lintl
+Revision: 14
+Source: mirror:gnu:%n/%n-%v.tar.gz
+Depends: <<
+ %N-shlibs (= %v-%r),
+ libgettext8-shlibs,
+ libiconv
+<<
+BuildDepends: <<
+ autoconf2.6,
+ automake1.11,
+ fink (>= 0.24.12),
+ libgettext8-dev,
+ libiconv-dev,
+ libtool2
+<<
+SetLIBS: -liconv
PatchFile: %n.patch
-PatchFile-MD5: 078a1ab54654e6e6e63d9f9bd2c22cd5
+PatchFile-MD5: c81f1e07c7be638648fef6e3377d3936
PatchScript: <<
- patch -p1 < %{PatchFile}
- cp lib/error.c src
- cp lib/xstrdup.c src
- perl -pi.bak -e 's,quoted\$U.lo,quoted\$U.lo error.lo xstrdup.lo,g'
src/Makefile.in
- perl -pi.bak -e 's,../lib/libreco.a,,g' src/Makefile.in
- sed -i.bak -e 's/Mach-O dynamically linked shared library/dynamically
linked shared library/g' ltconfig ltmain.sh
+ patch -p1 < %{PatchFile}
+
+ perl -pi -e 's/(AC_DEFUN\()([^[]+)(,)/\1\[\2]\3/' m4/*.m4
+ rm acinclude.m4
+ glibtoolize
+ autoreconf -fi
+
+ mkdir lib/getopt_UNUSED
+ mv lib/getopt*.[ch] lib/getopt_UNUSED
+
+ mkdir src/iconv_UNUSED
+ mv src/iconv.c src/localcharset.c src/iconv_UNUSED
<<
-ConfigureParams: --mandir=%p/share/man --infodir=%p/share/info
+ConfigureParams: --mandir=%p/share/man --infodir=%p/share/info
--without-included-gettext
InstallScript: <<
make install DESTDIR=%d
- rm -f %i/lib/charset.alias
<<
SplitOff: <<
Package: %N-shlibs
Replaces: %N (<= 3.6-5)
+ Depends: <<
+ libgettext8-shlibs,
+ libiconv
+ <<
Files: lib/librecode.*.dylib
Shlibs: %p/lib/librecode.0.dylib 1.0.0 %n (>= 3.6-6)
DocFiles: README COPYING COPYING-LIB AUTHORS NEWS THANKS
@@ -35,7 +52,10 @@
BuildDependsOnly: True
Depends: %N-shlibs (= %v-%r)
Replaces: %N (<= 3.6-5)
- Files: include lib/*.a lib/*.la lib/librecode.dylib
+ Files: <<
+ include
+ lib
+ <<
DocFiles: README COPYING COPYING-LIB AUTHORS NEWS THANKS
<<
DocFiles: README COPYING COPYING-LIB AUTHORS NEWS THANKS
@@ -49,25 +69,26 @@
#
Description: Convert files between various charsets
DescPort: <<
-Uses autoconf and libtool. The usual fixes.
-
-The getopt functions are renamed via the preprocessor to avoid
-dynamic linking trouble.
+ Overhaul autotools to recognize modern platforms and use more
+ modern implementations of various macros.
-charset.alias is deleted because it is empty on Darwin anyway and
-causes unnecessary conflicts between packages.
+ Use system's getopt instead of rolling our own.
-Patched to make the in-memory conversions actually work. (patch
-taken from http://pybliographer.org/help/recode)
+ Use fink's gettext instead of rolling our own.
-Uses UpdateConfigGuess/UpdateLibtool, which are still
-newer than the files in the source package.
+ Use fink's iconv/charset instead of rolling our own (but just
+ hardcode what the const prototype behavior is and the -l flag
+ instead of the iconv ac macro that doesn't play nicely with
+ included .m4)
-Libtool is further updated to not break on the output
-of 'file' on a 64-bit dylib. Note that it still uses
--undefined dynamic_lookup.
+ Patched to make the in-memory conversions actually work.
+ (patch taken from http://pybliographer.org/help/recode)
+<<
+DescPackaging: <<
+ Clean up from back when this package installed charset.alias
+ (no longer allowed in this package)
<<
License: GPL/LGPL
Maintainer: None <fink-de...@lists.sourceforge.net>
-Homepage: http://www.iro.umontreal.ca/contrib/recode/HTML/
+Homepage: http://recode.progiciels-bpi.ca/index.html
Source-MD5: be3f40ad2e93dae5cd5f628264bf1877
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure
contains a definitive record of customers, application performance,
security threats, fraudulent activity, and more. Splunk takes this
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
