Update of /cvsroot/fink/fink/10.3
In directory sc8-pr-cvs17:/tmp/cvs-serv21043
Modified Files:
dpkg.info dpkg.patch
Log Message:
sync with stable
Index: dpkg.patch
===================================================================
RCS file: /cvsroot/fink/fink/10.3/dpkg.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- dpkg.patch 10 Jun 2007 06:09:29 -0000 1.9
+++ dpkg.patch 9 Jul 2007 21:38:03 -0000 1.10
@@ -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
Index: dpkg.info
===================================================================
RCS file: /cvsroot/fink/fink/10.3/dpkg.info,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- dpkg.info 10 Jun 2007 06:09:29 -0000 1.24
+++ dpkg.info 9 Jul 2007 21:38:03 -0000 1.25
@@ -1,9 +1,9 @@
Package: dpkg
Version: 1.10.21
-Revision: 223
+Revision: 224
GCC: 3.3
BuildDepends: fink (>= 0.24.12)
-Depends: libgettext3-shlibs, libiconv, gzip, tar, libncurses5-shlibs (>=
5.4-20041023-6)
+Depends: libgettext3-shlibs, libiconv (>= 1.11-1), gzip, tar,
libncurses5-shlibs (>= 5.4-20041023-6)
Essential: yes
Maintainer: Fink Core Group <[EMAIL PROTECTED]>
Source: mirror:sourceforge:fink/dpkg_%v.tar.gz
@@ -12,12 +12,12 @@
Source2: mirror:sourceforge:fink/gettext-0.14.5.tar.gz
Source2-MD5: e2f6581626a22a0de66dce1d81d00de3
PatchFile: %n.patch
-PatchFile-MD5: 78b236715ad6391f708a5776f43a65bf
+PatchFile-MD5: 49fc7cb90bb3ae0aa64c359044461699
PatchScript: <<
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
+SetCFLAGS: -I%p/include
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
CompileScript: <<
@@ -26,12 +26,12 @@
%p/bin/fink -y install gettext-bin libgettext3-dev libiconv-dev libncurses5
cd %b/../gettext-0.14.5/gettext-tools; env EMACS=no ./configure
--prefix="%b/../_inst%p" --infodir='${prefix}/share/info'
--mandir='${prefix}/share/man' --with-included-gettext --disable-csharp
--disable-rpath --disable-shared; make; rm -rf %b/../_inst; make install
PERL=/usr/bin/perl ac_cv_path_MSGFMT="%b/../_inst%p/bin/msgfmt"
ac_cv_path_XGETTEXT="%b/../_inst%p/bin/xgettext" ./configure
--build=%m-apple-darwin %c
- make
+ /usr/bin/make
<<
ConfigureParams: --without-start-stop-daemon --without-sgml-doc
--with-admindir=%p/var/lib/dpkg --mandir=%p/share/man --infodir=%p/share/info
--srcdir=%b
InstallScript: <<
mkdir -p %i/share/doc/dpkg
- make install DESTDIR=%d
+ /usr/bin/make install DESTDIR=%d
install -c -p -m 644 origin.fink %i/etc/dpkg/origins/fink
rm -rf %i/lib/dpkg/methods/*
<<
@@ -82,11 +82,13 @@
Patched to hardcode complete paths to our component executables
instead of relying on PATH
-Patch 'dpkg -b' tar invovation to avoid warning under tar>=1.16
+Patch 'dpkg -b' tar invocation to avoid warning under tar>=1.16
See: http://permalink.gmane.org/gmane.os.apple.fink.core/1281
Patch 'dpkg -b' tar invocation to not die if tar returns exit code 1.
(Exit 1 is a non-fatal error for tar; exit 2 is fatal.) patch written by vasi
+
+Fink's make-3.81-1 breaks compiling so use Apple's to be safe.
<<
#
PostInstScript: <<
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
