Update of /cvsroot/fink/fink/10.4
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv11605
Modified Files:
dpkg.info dpkg.patch libgettext3-shlibs.info libiconv.info
libiconv.patch
Added Files:
libgettext3-shlibs.patch
Log Message:
patch gettext for environ
Index: dpkg.patch
===================================================================
RCS file: /cvsroot/fink/fink/10.4/dpkg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dpkg.patch 20 Jan 2006 20:59:55 -0000 1.1
+++ dpkg.patch 15 Aug 2006 02:57:59 -0000 1.2
@@ -1,3 +1,37 @@
+diff -ruN gettext-0.14.5/gettext-tools/lib/execute.c
gettext-0.14.5-patched/gettext-tools/lib/execute.c
+--- gettext-0.14.5/gettext-tools/lib/execute.c 2005-05-20 13:19:48.000000000
-0700
++++ gettext-0.14.5-patched/gettext-tools/lib/execute.c 2006-08-14
05:21:26.000000000 -0700
+@@ -62,7 +62,12 @@
+ #endif
+
+ #ifndef HAVE_ENVIRON_DECL
+-extern char **environ;
++# ifdef __APPLE__
++# include <crt_externs.h>
++# define environ (*_NSGetEnviron())
++# else
++ extern char **environ;
++# endif
+ #endif
+
+ #ifndef STDIN_FILENO
+diff -ruN gettext-0.14.5/gettext-tools/lib/pipe.c
gettext-0.14.5-patched/gettext-tools/lib/pipe.c
+--- gettext-0.14.5/gettext-tools/lib/pipe.c 2005-05-20 13:25:23.000000000
-0700
++++ gettext-0.14.5-patched/gettext-tools/lib/pipe.c 2006-08-14
05:22:02.000000000 -0700
+@@ -61,7 +61,12 @@
+ #endif
+
+ #ifndef HAVE_ENVIRON_DECL
+-extern char **environ;
++# ifdef __APPLE__
++# include <crt_externs.h>
++# define environ (*_NSGetEnviron())
++# else
++ extern char **environ;
++# endif
+ #endif
+
+ #ifndef STDIN_FILENO
diff -ruN dpkg-1.10.21/include/parsedump.h
dpkg-1.10.21-patched/include/parsedump.h
--- dpkg-1.10.21/include/parsedump.h 2002-05-06 12:18:16.000000000 -0400
+++ dpkg-1.10.21-patched/include/parsedump.h 2005-06-09 20:47:46.000000000
-0400
--- NEW FILE: libgettext3-shlibs.patch ---
diff -ruN gettext-0.14.5/gettext-tools/lib/execute.c
gettext-0.14.5-patched/gettext-tools/lib/execute.c
--- gettext-0.14.5/gettext-tools/lib/execute.c 2005-05-20 13:19:48.000000000
-0700
+++ gettext-0.14.5-patched/gettext-tools/lib/execute.c 2006-08-14
05:21:26.000000000 -0700
@@ -62,7 +62,12 @@
#endif
#ifndef HAVE_ENVIRON_DECL
-extern char **environ;
+# ifdef __APPLE__
+# include <crt_externs.h>
+# define environ (*_NSGetEnviron())
+# else
+ extern char **environ;
+# endif
#endif
#ifndef STDIN_FILENO
diff -ruN gettext-0.14.5/gettext-tools/lib/pipe.c
gettext-0.14.5-patched/gettext-tools/lib/pipe.c
--- gettext-0.14.5/gettext-tools/lib/pipe.c 2005-05-20 13:25:23.000000000
-0700
+++ gettext-0.14.5-patched/gettext-tools/lib/pipe.c 2006-08-14
05:22:02.000000000 -0700
@@ -61,7 +61,12 @@
#endif
#ifndef HAVE_ENVIRON_DECL
-extern char **environ;
+# ifdef __APPLE__
+# include <crt_externs.h>
+# define environ (*_NSGetEnviron())
+# else
+ extern char **environ;
+# endif
#endif
#ifndef STDIN_FILENO
Index: libiconv.patch
===================================================================
RCS file: /cvsroot/fink/fink/10.4/libiconv.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libiconv.patch 22 Jun 2006 16:13:53 -0000 1.2
+++ libiconv.patch 15 Aug 2006 02:57:59 -0000 1.3
@@ -1,3 +1,37 @@
+diff -ruN gettext-0.14.5/gettext-tools/lib/execute.c
gettext-0.14.5-patched/gettext-tools/lib/execute.c
+--- gettext-0.14.5/gettext-tools/lib/execute.c 2005-05-20 13:19:48.000000000
-0700
++++ gettext-0.14.5-patched/gettext-tools/lib/execute.c 2006-08-14
05:21:26.000000000 -0700
+@@ -62,7 +62,12 @@
+ #endif
+
+ #ifndef HAVE_ENVIRON_DECL
+-extern char **environ;
++# ifdef __APPLE__
++# include <crt_externs.h>
++# define environ (*_NSGetEnviron())
++# else
++ extern char **environ;
++# endif
+ #endif
+
+ #ifndef STDIN_FILENO
+diff -ruN gettext-0.14.5/gettext-tools/lib/pipe.c
gettext-0.14.5-patched/gettext-tools/lib/pipe.c
+--- gettext-0.14.5/gettext-tools/lib/pipe.c 2005-05-20 13:25:23.000000000
-0700
++++ gettext-0.14.5-patched/gettext-tools/lib/pipe.c 2006-08-14
05:22:02.000000000 -0700
+@@ -61,7 +61,12 @@
+ #endif
+
+ #ifndef HAVE_ENVIRON_DECL
+-extern char **environ;
++# ifdef __APPLE__
++# include <crt_externs.h>
++# define environ (*_NSGetEnviron())
++# else
++ extern char **environ;
++# endif
+ #endif
+
+ #ifndef STDIN_FILENO
diff -ruN libiconv-1.10/src/Makefile.in libiconv-1.10-patched/src/Makefile.in
--- libiconv-1.10/src/Makefile.in 2005-06-09 12:04:50.000000000 -0700
+++ libiconv-1.10-patched/src/Makefile.in 2005-09-02 09:16:02.000000000
-0700
Index: libgettext3-shlibs.info
===================================================================
RCS file: /cvsroot/fink/fink/10.4/libgettext3-shlibs.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- libgettext3-shlibs.info 14 Aug 2006 02:31:42 -0000 1.3
+++ libgettext3-shlibs.info 15 Aug 2006 02:57:59 -0000 1.4
@@ -4,10 +4,15 @@
#Source: mirror:gnu:gettext/gettext-%v.tar.gz
Source: mirror:sourceforge:fink/gettext-%v.tar.gz
Source-MD5: e2f6581626a22a0de66dce1d81d00de3
-PatchScript: cd build-aux; perl -pi -e 's/.*chmod.*777.*$//g' ltmain.sh
+PatchFile: %n.patch
+PatchFile-MD5: 3799b4f059212628bac707e5365856b3
+PatchScript: <<
+ patch -p1 < %{PatchFile}
+ cd build-aux; perl -pi -e 's/.*chmod.*777.*$//g' ltmain.sh
+<<
Essential: yes
Depends: libiconv, libiconv-bin, base-files
-BuildDepends: libiconv-dev, fink (>= 0.13.6)
+BuildDepends: libiconv-dev, fink (>= 0.24.12)
Conflicts: libgettext3
Replaces: gettext-bin (<< 0.14-1), libgettext3
NoSetMAKEFLAGS: true
Index: dpkg.info
===================================================================
RCS file: /cvsroot/fink/fink/10.4/dpkg.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- dpkg.info 29 Jun 2006 13:44:14 -0000 1.3
+++ dpkg.info 15 Aug 2006 02:57:59 -0000 1.4
@@ -2,6 +2,7 @@
Version: 1.10.21
Revision: 1219
GCC: 4.0
+BuildDepends: fink (>= 0.24.12)
Depends: libgettext3-shlibs, libiconv, gzip, tar, libncurses5-shlibs (>=
5.4-20041023-1006)
Essential: yes
Maintainer: Fink Core Group <[EMAIL PROTECTED]>
@@ -10,8 +11,10 @@
Source-MD5: a9f6c43891db74d727beab7dfc0ee663
Source2: mirror:sourceforge:fink/gettext-0.14.5.tar.gz
Source2-MD5: e2f6581626a22a0de66dce1d81d00de3
+PatchFile: %n.patch
+PatchFile-MD5: 037adbd66b3723518532371840dc76e7
PatchScript: <<
- sed 's|@PREFIX@|%p|g' <%a/dpkg.patch | patch -p1
+ cd %b/..; sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p0
cd %b/../gettext-0.14.5/build-aux; perl -pi -e 's/.*chmod.*777.*$//g'
ltmain.sh
<<
SetCFLAGS: -no-cpp-precomp -I%p/include
Index: libiconv.info
===================================================================
RCS file: /cvsroot/fink/fink/10.4/libiconv.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- libiconv.info 14 Aug 2006 02:31:42 -0000 1.3
+++ libiconv.info 15 Aug 2006 02:57:59 -0000 1.4
@@ -7,13 +7,15 @@
Source2: mirror:sourceforge:fink/gettext-0.14.5.tar.gz
#Source2: mirror:gnu:gettext/gettext-0.14.5.tar.gz
Source2-MD5: e2f6581626a22a0de66dce1d81d00de3
+PatchFile: %n.patch
+PatchFile-MD5: 13a6fb7d37e6ad1cc6fffd54b1c4b52a
PatchScript: <<
+ cd %b/..; patch -p0 < %{PatchFile}
cd %b/../gettext-0.14.5/build-aux; perl -pi -e 's/.*chmod.*777.*$//g'
ltmain.sh
<<
-Patch: %n.patch
Essential: yes
Depends: base-files
-BuildDepends: fink (>= 0.13.0)
+BuildDepends: fink (>= 0.24.12)
Shlibs: <<
%p/lib/libcharset.1.dylib 2.0.0 %n (>= 1.7-7)
%p/lib/libiconv.2.dylib 6.0.0 %n (>= 1.10-5)
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
