Update of /cvsroot/fink/fink/10.4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15159/10.4
Modified Files:
Tag: branch-rangerrick_dpkg_test
dpkg-bootstrap.info dpkg.info dpkg.patch
Added Files:
Tag: branch-rangerrick_dpkg_test
dpkg-bootstrap.patch
Log Message:
this is a test of a new dpkg 1.13.18-based bootstrap for xcode 2.3
Index: dpkg.patch
===================================================================
RCS file: /cvsroot/fink/fink/10.4/dpkg.patch,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- dpkg.patch 20 Jan 2006 20:59:55 -0000 1.1
+++ dpkg.patch 3 May 2006 16:38:09 -0000 1.1.4.1
@@ -1,380 +1,314 @@
-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
-@@ -30,7 +30,6 @@
- const char *canon;
- };
-
--extern const struct fieldinfo fieldinfos[];
- extern const struct nickname nicknames[];
- extern const int nfields; /* = elements in fieldinfos, including the
sentinels */
-
[...3639 lines suppressed...]
-+#define SPLITTER "@PREFIX@/bin/dpkg-split"
-+#define MD5SUM "@PREFIX@/bin/md5sum"
-+#define DSELECT "@PREFIX@/bin/dselect"
-+#define DPKG "@PREFIX@/bin/dpkg"
-+#define DEBSIGVERIFY "@PREFIX@/bin/debsig-verify"
-
- #define TAR "tar"
- #define GZIP "gzip"
-diff -ruN dpkg-1.10.21/lib/mlib.c dpkg-1.10.21-patched/lib/mlib.c
---- dpkg-1.10.21/lib/mlib.c 2004-03-08 12:13:09.000000000 -0500
-+++ dpkg-1.10.21-patched/lib/mlib.c 2005-06-20 04:10:00.000000000 -0400
-@@ -189,7 +189,7 @@
- switch(data->type) {
- case BUFFER_WRITE_BUF:
- memcpy(data->data.ptr, buf, length);
-- (char*)data->data.ptr += length;
-+ data->data.ptr = (char*)data->data.ptr + length;
- break;
- case BUFFER_WRITE_VBUF:
- varbufaddbuf((struct varbuf *)data->data.ptr, buf, length);
Index: dpkg-bootstrap.info
===================================================================
RCS file: /cvsroot/fink/fink/10.4/dpkg-bootstrap.info,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- dpkg-bootstrap.info 20 Jan 2006 20:59:55 -0000 1.1
+++ dpkg-bootstrap.info 3 May 2006 16:38:09 -0000 1.1.4.1
@@ -7,14 +7,14 @@
Source: mirror:sourceforge:fink/dpkg_%v.tar.gz
SourceDirectory: dpkg-%v
Source-MD5: a9f6c43891db74d727beab7dfc0ee663
-PatchScript: sed 's|@PREFIX@|%p|g' <%a/dpkg.patch | patch -p1
+PatchScript: sed 's|@PREFIX@|%p|g' <%a/dpkg-bootstrap.patch | patch -p1
SetCFLAGS: -no-cpp-precomp -I%p/include
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
ConfigureParams: --without-zlib --without-dselect --without-start-stop-daemon
--without-sgml-doc --with-admindir=%P/var/lib/dpkg --mandir=%p/share/man
--infodir=%p/share/info --srcdir=%b
CompileScript: <<
PERL=/usr/bin/perl ./configure --build=%m-apple-darwin %c
- make EXEFLAGS=-force_flat_namespace
+ make EXEFLAGS="-undefined dynamic_lookup"
<<
InstallScript: <<
mkdir -p %i/share/doc/dpkg
--- NEW FILE: dpkg-bootstrap.patch ---
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
@@ -30,7 +30,6 @@
const char *canon;
};
-extern const struct fieldinfo fieldinfos[];
extern const struct nickname nicknames[];
extern const int nfields; /* = elements in fieldinfos, including the sentinels
*/
@@ -68,6 +67,8 @@
unsigned int integer;
};
+extern const struct fieldinfo fieldinfos[];
+
void parseerr(FILE *file, const char *filename, int lno, FILE *warnto, int
*warncount,
const struct pkginfo *pigp, int warnonly,
[...2487 lines suppressed...]
+#define SPLITTER "@PREFIX@/bin/dpkg-split"
+#define MD5SUM "@PREFIX@/bin/md5sum"
+#define DSELECT "@PREFIX@/bin/dselect"
+#define DPKG "@PREFIX@/bin/dpkg"
+#define DEBSIGVERIFY "@PREFIX@/bin/debsig-verify"
#define TAR "tar"
#define GZIP "gzip"
diff -ruN dpkg-1.10.21/lib/mlib.c dpkg-1.10.21-patched/lib/mlib.c
--- dpkg-1.10.21/lib/mlib.c 2004-03-08 12:13:09.000000000 -0500
+++ dpkg-1.10.21-patched/lib/mlib.c 2005-06-20 04:10:00.000000000 -0400
@@ -189,7 +189,7 @@
switch(data->type) {
case BUFFER_WRITE_BUF:
memcpy(data->data.ptr, buf, length);
- (char*)data->data.ptr += length;
+ data->data.ptr = (char*)data->data.ptr + length;
break;
case BUFFER_WRITE_VBUF:
varbufaddbuf((struct varbuf *)data->data.ptr, buf, length);
Index: dpkg.info
===================================================================
RCS file: /cvsroot/fink/fink/10.4/dpkg.info,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- dpkg.info 20 Jan 2006 20:59:55 -0000 1.1
+++ dpkg.info 3 May 2006 16:38:09 -0000 1.1.4.1
@@ -1,36 +1,87 @@
Package: dpkg
-Version: 1.10.21
-Revision: 1217
-GCC: 4.0
-Depends: gettext, libiconv, gzip, tar, libncurses5-shlibs (>=
5.4-20041023-1006)
-Essential: yes
+Version: 1.13.18
+Revision: 1021
+Description: The Debian package manager
+License: GPL
Maintainer: Fink Core Group <[EMAIL PROTECTED]>
-Source: mirror:sourceforge:fink/dpkg_%v.tar.gz
+
+Depends: gettext, libiconv, gzip, tar
+Essential: yes
+GCC: 4.0
+
+Source: http://debian.ethz.ch/debian/pool/main/d/%n/%n_%v.tar.gz
+Source2: http://alioth.debian.org/download.php/1556/po4a-0.25.tar.gz
SourceDirectory: dpkg-%v
-Source-MD5: a9f6c43891db74d727beab7dfc0ee663
-PatchScript: sed 's|@PREFIX@|%p|g' <%a/dpkg.patch | patch -p1
-SetCFLAGS: -no-cpp-precomp -I%p/include
-NoSetMAKEFLAGS: true
-SetMAKEFLAGS: -j1
+Source-MD5: eb8353d0adfb4231fc4b40225a32758e
+Source2-MD5: e868a14e5e5212d1e1d78e0905f01fe5
+PatchScript: <<
+ #!/bin/sh -ev
+ sed 's|@PREFIX@|%p|g' <%a/dpkg.patch | patch -p0
+ find man -type f | xargs perl -pi -e 's,/usr,%p,g; s,/var,%p/var,g;
s,/etc,%p/etc,g;'
+ ls scripts/*.pl* scripts/*.sh | xargs perl -i -pe
's,([\047`"])/(etc|var),$1%p/$2,g; s,([\047`"])/usr,$1/%p,g;
s,([\047`"])(dpkg[\w-]*|822-date|md5sum|gpg)([\s\047`"]),$1%p/bin/$2$3,g'
+<<
+
+SetCFLAGS: -I%p/include
+SetCPPFLAGS: -fconstant-cfstrings
+SetLDFLAGS: -Wl,-framework,CoreFoundation
+ConfigureParams: --without-start-stop-daemon --without-sgml-doc
--with-admindir=%p/var/lib/dpkg --mandir=%p/share/man --infodir=%p/share/info
--srcdir=%b --disable-linker-optimisations --without-dselect
CompileScript: <<
- %p/bin/fink -y install gettext-bin gettext-dev gettext-tools libiconv-dev
libncurses5
- PERL=/usr/bin/perl ./configure --build=%m-apple-darwin %c
- make EXEFLAGS=-force_flat_namespace
+#!/bin/sh -ev
+
+ %p/bin/fink -y install gettext-bin gettext-dev gettext-tools
libiconv-dev
+ export PERL5LIB=`pwd`/../po4a-0.25/lib:"$PERL5LIB"
+ export PATH=`pwd`/../po4a-0.25:"$PATH"
+ chmod a+x ../po4a-0.25/po4a*
+ mv getopt/obstack.* lib/
+ PERL=/usr/bin/perl ./configure --build=%m-apple-darwin %c
+ 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
- install -c -p -m 644 origin.fink %i/etc/dpkg/origins/fink
- rm -rf %i/lib/dpkg/methods/*
+#!/bin/sh -ev
+
+ export PERL5LIB=`pwd`/../po4a-0.25/lib:"$PERL5LIB"
+ export PATH=`pwd`/../po4a-0.25:"$PATH"
+ chmod a+x ../po4a-0.25/po4a*
+ mkdir -p %i/share/doc/dpkg
+ make install DESTDIR=%d
+ for lang in de es ja sv; do
+ install -d -m 755 %i/share/man/$lang/man1
+ install -c -m 644 man/$lang/md5sum.1 %i/share/man/$lang/man1/
+ done
+ install -d -m 755 %i/var/backups
+ rm -rf %i/lib/dpkg/methods/*
<<
-Description: The Debian package manager
+
+PostInstScript: <<
+if [ ! -f %p/var/lib/dpkg/diversions ]; then
+ touch %p/var/lib/dpkg/diversions
+ chmod 644 %p/var/lib/dpkg/diversions
+fi
+<<
+
+Homepage: http://packages.qa.debian.org/d/dpkg.html
DescDetail: <<
dpkg installs and removes binary packages; it is the base of the
distribution. This package also contains some helper programs and
dselect, a full-screen console frontend to dpkg.
<<
DescPort: <<
+1.13.18
+- forward-ported changes to 1.13.18
+
+1.13.16
+- forward-ported changes to 1.13.16
+- remove dselect and curses dependency (will be split into another pkg)
+- remove the getopt stuff (except for obstack, move that to lib)
+- ignore Fink-owned fields
+- use search-and-replace for scripts and man prefix patching
+
+1.13.11
+- forward-ported changes to 1.13.11
+ - md5sum was removed, had to be re-added
+ - getopt was needed, but not automatically included, so had to be added to
the Makefile.in's
+
1.10.9
- Removed --without-zlib flag
- Gets confused about top_srcdir without the --srcdir arg.
@@ -55,12 +106,4 @@
Patched to hardcode complete paths to our component executables
instead of relying on PATH
<<
-#
-PostInstScript: <<
-if [ ! -f %p/var/lib/dpkg/diversions ]; then
- touch %p/var/lib/dpkg/diversions
- chmod 644 %p/var/lib/dpkg/diversions
-fi
-<<
-License: GPL
-Homepage: http://packages.qa.debian.org/d/dpkg.html
+
-------------------------------------------------------
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
