Update of /cvsroot/fink/experimental/rangerrick/10.3/main/finkinfo/base
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5172/10.3/main/finkinfo/base
Modified Files:
dpkg.info dpkg.patch
Log Message:
it builds
Index: dpkg.patch
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/10.3/main/finkinfo/base/dpkg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dpkg.patch 13 Mar 2006 21:05:14 -0000 1.1
+++ dpkg.patch 14 Mar 2006 03:59:30 -0000 1.2
@@ -1,6 +1,5 @@
-diff -uNr dpkg-1.13.16/dpkg-deb/Makefile.in
dpkg-1.13.16-new/dpkg-deb/Makefile.in
--- dpkg-1.13.16/dpkg-deb/Makefile.in 2006-02-18 12:10:25.000000000 -0500
-+++ dpkg-1.13.16-new/dpkg-deb/Makefile.in 2006-03-11 12:22:35.000000000
-0500
++++ dpkg-1.13.16-new/dpkg-deb/Makefile.in 2006-03-13 22:09:31.000000000
-0500
@@ -85,7 +85,7 @@
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -19,9 +18,8 @@
all: all-am
-diff -uNr dpkg-1.13.16/dpkg-deb/build.c dpkg-1.13.16-new/dpkg-deb/build.c
--- dpkg-1.13.16/dpkg-deb/build.c 2006-01-18 03:30:03.000000000 -0500
-+++ dpkg-1.13.16-new/dpkg-deb/build.c 2006-03-11 12:22:35.000000000 -0500
++++ dpkg-1.13.16-new/dpkg-deb/build.c 2006-03-13 22:09:31.000000000 -0500
@@ -221,9 +221,11 @@
warns++;
}
@@ -34,9 +32,8 @@
}
checkversion(checkedinfo->available.version.version,"(upstream)
version",&errs);
checkversion(checkedinfo->available.version.revision,"Debian
revision",&errs);
-diff -uNr dpkg-1.13.16/dpkg-split/Makefile.in
dpkg-1.13.16-new/dpkg-split/Makefile.in
--- dpkg-1.13.16/dpkg-split/Makefile.in 2006-02-18 12:10:26.000000000
-0500
-+++ dpkg-1.13.16-new/dpkg-split/Makefile.in 2006-03-11 12:22:35.000000000
-0500
++++ dpkg-1.13.16-new/dpkg-split/Makefile.in 2006-03-13 22:09:31.000000000
-0500
@@ -87,7 +87,7 @@
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -55,9 +52,8 @@
pkglib_SCRIPTS = mksplit
EXTRA_DIST = mksplit.pl
CLEANFILES = $(pkglib_SCRIPTS)
-diff -uNr dpkg-1.13.16/dselect/Makefile.in dpkg-1.13.16-new/dselect/Makefile.in
--- dpkg-1.13.16/dselect/Makefile.in 2006-02-18 12:10:26.000000000 -0500
-+++ dpkg-1.13.16-new/dselect/Makefile.in 2006-03-11 12:22:35.000000000
-0500
++++ dpkg-1.13.16-new/dselect/Makefile.in 2006-03-13 22:09:31.000000000
-0500
@@ -97,7 +97,7 @@
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -76,9 +72,8 @@
EXTRA_DIST = keyoverride mkcurkeys.pl
CLEANFILES = curkeys.h
all: all-recursive
-diff -uNr dpkg-1.13.16/dselect/main.cc dpkg-1.13.16-new/dselect/main.cc
--- dpkg-1.13.16/dselect/main.cc 2006-02-17 02:23:31.000000000 -0500
-+++ dpkg-1.13.16-new/dselect/main.cc 2006-03-11 12:22:35.000000000 -0500
++++ dpkg-1.13.16-new/dselect/main.cc 2006-03-13 22:09:31.000000000 -0500
@@ -42,6 +42,11 @@
#include <dpkg.h>
#include <dpkg-db.h>
@@ -258,9 +253,8 @@
if (setjmp(ejbuf)) { /* expect warning about possible clobbering of argv */
cursesoff();
error_unwind(ehflag_bombout); exit(2);
-diff -uNr dpkg-1.13.16/dselect/pkgdepcon.cc
dpkg-1.13.16-new/dselect/pkgdepcon.cc
--- dpkg-1.13.16/dselect/pkgdepcon.cc 2006-01-18 03:30:03.000000000 -0500
-+++ dpkg-1.13.16-new/dselect/pkgdepcon.cc 2006-03-11 12:22:35.000000000
-0500
++++ dpkg-1.13.16-new/dselect/pkgdepcon.cc 2006-03-13 22:09:31.000000000
-0500
@@ -198,12 +198,20 @@
return 2;
@@ -330,9 +324,8 @@
+
return 0;
}
-diff -uNr dpkg-1.13.16/lib/Makefile.in dpkg-1.13.16-new/lib/Makefile.in
--- dpkg-1.13.16/lib/Makefile.in 2006-02-18 12:10:26.000000000 -0500
-+++ dpkg-1.13.16-new/lib/Makefile.in 2006-03-11 12:22:35.000000000 -0500
++++ dpkg-1.13.16-new/lib/Makefile.in 2006-03-13 22:09:31.000000000 -0500
@@ -79,7 +79,7 @@
showcright.$(OBJEXT) showpkg.$(OBJEXT) tarfn.$(OBJEXT) \
utils.$(OBJEXT) varbuf.$(OBJEXT) vercmp.$(OBJEXT)
@@ -342,9 +335,8 @@
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
@[EMAIL PROTECTED] = ./$(DEPDIR)/compat.Po \
-diff -uNr dpkg-1.13.16/lib/dpkg.h dpkg-1.13.16-new/lib/dpkg.h
--- dpkg-1.13.16/lib/dpkg.h 2006-01-18 03:30:03.000000000 -0500
-+++ dpkg-1.13.16-new/lib/dpkg.h 2006-03-11 12:22:35.000000000 -0500
++++ dpkg-1.13.16-new/lib/dpkg.h 2006-03-13 22:09:31.000000000 -0500
@@ -107,7 +107,7 @@
#define SHELLENV "SHELL"
#define DEFAULTSHELL "sh"
@@ -373,9 +365,8 @@
#define TAR "tar"
#define GZIP "gzip"
-diff -uNr dpkg-1.13.16/lib/nfmalloc.c dpkg-1.13.16-new/lib/nfmalloc.c
--- dpkg-1.13.16/lib/nfmalloc.c 2006-01-18 03:30:03.000000000 -0500
-+++ dpkg-1.13.16-new/lib/nfmalloc.c 2006-03-11 12:22:35.000000000 -0500
++++ dpkg-1.13.16-new/lib/nfmalloc.c 2006-03-13 22:09:31.000000000 -0500
@@ -26,7 +26,7 @@
#include <dpkg.h>
#include <dpkg-db.h>
@@ -385,9 +376,8 @@
#define obstack_chunk_alloc m_malloc
#define obstack_chunk_free free
-diff -uNr dpkg-1.13.16/lib/parsedump.h dpkg-1.13.16-new/lib/parsedump.h
--- dpkg-1.13.16/lib/parsedump.h 2006-01-18 03:30:03.000000000 -0500
-+++ dpkg-1.13.16-new/lib/parsedump.h 2006-03-11 12:22:35.000000000 -0500
++++ dpkg-1.13.16-new/lib/parsedump.h 2006-03-13 22:09:31.000000000 -0500
@@ -74,8 +74,9 @@
const char *canon;
};
@@ -399,9 +389,8 @@
#endif /* DPKG_PARSEDUMP_H */
+extern const struct fieldinfo fieldinfos[];
+
-diff -uNr dpkg-1.13.16/lib/tarfn.c dpkg-1.13.16-new/lib/tarfn.c
--- dpkg-1.13.16/lib/tarfn.c 2006-01-18 03:30:03.000000000 -0500
-+++ dpkg-1.13.16-new/lib/tarfn.c 2006-03-11 12:22:35.000000000 -0500
++++ dpkg-1.13.16-new/lib/tarfn.c 2006-03-13 22:09:31.000000000 -0500
@@ -59,8 +59,12 @@
{
int len;
@@ -417,9 +406,8 @@
str = malloc(len + 1);
memcpy(str, s, len);
str[len] = 0;
-diff -uNr dpkg-1.13.16/man/C/cleanup-info.8
dpkg-1.13.16-new/man/C/cleanup-info.8
--- dpkg-1.13.16/man/C/cleanup-info.8 2006-01-18 03:30:03.000000000 -0500
-+++ dpkg-1.13.16-new/man/C/cleanup-info.8 2006-03-11 12:22:35.000000000
-0500
++++ dpkg-1.13.16-new/man/C/cleanup-info.8 2006-03-13 22:09:31.000000000
-0500
@@ -34,7 +34,7 @@
Output version and exit successfully.
.SH FILES
@@ -437,9 +425,8 @@
.sp
This is free software; see the GNU General Public Licence
version 2 or later for copying conditions. There is NO warranty.
-diff -uNr dpkg-1.13.16/man/C/dpkg-deb.1 dpkg-1.13.16-new/man/C/dpkg-deb.1
--- dpkg-1.13.16/man/C/dpkg-deb.1 2006-02-18 07:22:44.000000000 -0500
-+++ dpkg-1.13.16-new/man/C/dpkg-deb.1 2006-03-11 12:22:35.000000000 -0500
++++ dpkg-1.13.16-new/man/C/dpkg-deb.1 2006-03-13 22:09:31.000000000 -0500
@@ -264,7 +264,7 @@
Copyright (C)1995-1996
by him and released under the GNU General Public Licence; there is NO
@@ -450,9 +437,8 @@
-.B /usr/share/common\-licenses/GPL
+.B @PREFIX@/share/common\-licenses/GPL
for details.
-diff -uNr dpkg-1.13.16/man/C/dpkg-divert.8 dpkg-1.13.16-new/man/C/dpkg-divert.8
--- dpkg-1.13.16/man/C/dpkg-divert.8 2006-02-02 14:39:07.000000000 -0500
-+++ dpkg-1.13.16-new/man/C/dpkg-divert.8 2006-03-11 12:22:35.000000000
-0500
++++ dpkg-1.13.16-new/man/C/dpkg-divert.8 2006-03-13 22:09:31.000000000
-0500
@@ -37,7 +37,7 @@
.SH OPTIONS
.TP
@@ -479,9 +465,8 @@
.sp
This is free software; see the GNU General Public Licence
version 2 or later for copying conditions. There is NO warranty.
-diff -uNr dpkg-1.13.16/man/C/dpkg-query.1 dpkg-1.13.16-new/man/C/dpkg-query.1
--- dpkg-1.13.16/man/C/dpkg-query.1 2006-02-11 15:23:38.000000000 -0500
-+++ dpkg-1.13.16-new/man/C/dpkg-query.1 2006-03-11 12:22:35.000000000
-0500
++++ dpkg-1.13.16-new/man/C/dpkg-query.1 2006-03-13 22:09:31.000000000
-0500
@@ -41,7 +41,7 @@
.TP
\fB\-l\fP | \fB\-\-list\fP \fIpackage-name-pattern\fP ...
@@ -517,9 +502,8 @@
.sp
This is free software; see the GNU General Public Licence version 2 or
later for copying conditions. There is NO warranty.
-diff -uNr dpkg-1.13.16/man/C/dpkg-source.1 dpkg-1.13.16-new/man/C/dpkg-source.1
--- dpkg-1.13.16/man/C/dpkg-source.1 2006-02-17 10:54:23.000000000 -0500
-+++ dpkg-1.13.16-new/man/C/dpkg-source.1 2006-03-11 12:22:35.000000000
-0500
++++ dpkg-1.13.16-new/man/C/dpkg-source.1 2006-03-13 22:09:32.000000000
-0500
@@ -54,13 +54,13 @@
.B dpkg\-shlibdeps
will read shared library dependency information from
@@ -567,9 +551,8 @@
-.B /usr/share/common\-licenses/GPL
+.B @PREFIX@/share/common\-licenses/GPL
for details.
-diff -uNr dpkg-1.13.16/man/C/dpkg-split.1 dpkg-1.13.16-new/man/C/dpkg-split.1
--- dpkg-1.13.16/man/C/dpkg-split.1 2006-02-02 14:39:07.000000000 -0500
-+++ dpkg-1.13.16-new/man/C/dpkg-split.1 2006-03-11 12:22:36.000000000
-0500
++++ dpkg-1.13.16-new/man/C/dpkg-split.1 2006-03-13 22:09:32.000000000
-0500
@@ -162,7 +162,7 @@
.BI \-\-depotdir " directory"
Specifies an alternative directory for the queue of parts awaiting
@@ -598,9 +581,8 @@
-.B /usr/share/common\-licenses/GPL
+.B @PREFIX@/share/common\-licenses/GPL
for details.
-diff -uNr dpkg-1.13.16/man/C/dpkg-statoverride.8
dpkg-1.13.16-new/man/C/dpkg-statoverride.8
--- dpkg-1.13.16/man/C/dpkg-statoverride.8 2006-02-18 07:22:44.000000000
-0500
-+++ dpkg-1.13.16-new/man/C/dpkg-statoverride.8 2006-03-11 12:22:36.000000000
-0500
++++ dpkg-1.13.16-new/man/C/dpkg-statoverride.8 2006-03-13 22:09:32.000000000
-0500
@@ -55,10 +55,10 @@
.TP
.I \-\-admindir
@@ -622,9 +604,8 @@
.sp
This is free software; see the GNU General Public Licence version 2 or
later for copying conditions. There is NO warranty.
-diff -uNr dpkg-1.13.16/man/C/dpkg.1 dpkg-1.13.16-new/man/C/dpkg.1
--- dpkg-1.13.16/man/C/dpkg.1 2006-02-18 07:22:44.000000000 -0500
-+++ dpkg-1.13.16-new/man/C/dpkg.1 2006-03-11 12:23:41.000000000 -0500
++++ dpkg-1.13.16-new/man/C/dpkg.1 2006-03-13 22:09:32.000000000 -0500
@@ -150,7 +150,7 @@
file). \fB\-P\fP or \fB\-\-purge\fP removes everything, including
configuration
files. If \fB\-a\fP or \fB\-\-pending\fP is given instead of a package
@@ -737,9 +718,8 @@
+See [EMAIL PROTECTED]@/share/doc/dpkg/THANKS.gz\fP for the list of people who
have
contributed to \fBdpkg\fP .
.fi
-diff -uNr dpkg-1.13.16/man/C/dpkg.cfg.5 dpkg-1.13.16-new/man/C/dpkg.cfg.5
--- dpkg-1.13.16/man/C/dpkg.cfg.5 2006-02-18 07:22:44.000000000 -0500
-+++ dpkg-1.13.16-new/man/C/dpkg.cfg.5 2006-03-11 12:22:36.000000000 -0500
++++ dpkg-1.13.16-new/man/C/dpkg.cfg.5 2006-03-13 22:09:32.000000000 -0500
@@ -8,10 +8,11 @@
here. Comments are allowed by starting a line with a hash sign
("\fB#\fR").
@@ -754,9 +734,8 @@
+Paths modified by Carsten Klapp to reflect fink distribution, December 2002.
.SH SEE ALSO
.BR dpkg (1)
-diff -uNr dpkg-1.13.16/man/C/dselect.1 dpkg-1.13.16-new/man/C/dselect.1
--- dpkg-1.13.16/man/C/dselect.1 2006-02-07 16:08:46.000000000 -0500
-+++ dpkg-1.13.16-new/man/C/dselect.1 2006-03-11 12:22:36.000000000 -0500
++++ dpkg-1.13.16-new/man/C/dselect.1 2006-03-13 22:09:32.000000000 -0500
@@ -34,7 +34,7 @@
of \fBdselect\fP or show additional information about the program.
.SH OPTIONS
@@ -775,9 +754,8 @@
and normally there shouldn't be any need to change it.
.TP
.B --debug <file> | -D<file>
-diff -uNr dpkg-1.13.16/man/C/dselect.cfg.5 dpkg-1.13.16-new/man/C/dselect.cfg.5
--- dpkg-1.13.16/man/C/dselect.cfg.5 2006-02-02 14:39:07.000000000 -0500
-+++ dpkg-1.13.16-new/man/C/dselect.cfg.5 2006-03-11 12:22:36.000000000
-0500
++++ dpkg-1.13.16-new/man/C/dselect.cfg.5 2006-03-13 22:09:32.000000000
-0500
@@ -8,10 +8,11 @@
here. Comments are allowed by starting a line with a hash sign
("\fB#\fR").
@@ -792,9 +770,8 @@
+Paths modified by Carsten Klapp to reflect fink distribution, December 2002.
.SH SEE ALSO
.BR dselect (1)
-diff -uNr dpkg-1.13.16/man/C/install-info.8
dpkg-1.13.16-new/man/C/install-info.8
--- dpkg-1.13.16/man/C/install-info.8 2006-02-18 07:22:44.000000000 -0500
-+++ dpkg-1.13.16-new/man/C/install-info.8 2006-03-11 12:22:36.000000000
-0500
++++ dpkg-1.13.16-new/man/C/install-info.8 2006-03-13 22:09:32.000000000
-0500
@@ -156,7 +156,7 @@
be located in
.IR infodir .
@@ -813,9 +790,8 @@
.SH COPYRIGHT
Copyright 1994, Ian Jackson.
.B install\-info
-diff -uNr dpkg-1.13.16/man/C/update-alternatives.8
dpkg-1.13.16-new/man/C/update-alternatives.8
--- dpkg-1.13.16/man/C/update-alternatives.8 2006-02-18 07:22:44.000000000
-0500
-+++ dpkg-1.13.16-new/man/C/update-alternatives.8 2006-03-11
12:22:36.000000000 -0500
++++ dpkg-1.13.16-new/man/C/update-alternatives.8 2006-03-13
22:09:32.000000000 -0500
@@ -4,7 +4,7 @@
.\" it under the terms of the GNU General Public License as published
.\" by the Free Software Foundation; either version 2 of the License, or
@@ -912,9 +888,8 @@
.SH "SEE ALSO"
.BR ln (1),
FHS, the Filesystem Hierarchy Standard.
-diff -uNr dpkg-1.13.16/man/de/md5sum.1 dpkg-1.13.16-new/man/de/md5sum.1
--- dpkg-1.13.16/man/de/md5sum.1 1969-12-31 19:00:00.000000000 -0500
-+++ dpkg-1.13.16-new/man/de/md5sum.1 2006-03-11 12:22:36.000000000 -0500
++++ dpkg-1.13.16-new/man/de/md5sum.1 2006-03-13 22:09:32.000000000 -0500
@@ -0,0 +1,74 @@
+.\" Hey, Emacs! This is an -*- nroff -*- source file.
+.hw ge-knackt
@@ -990,9 +965,8 @@
+wurde ursprünglich von Branko Lankester geschrieben und hiernach von
+Colin Plumb und Ian Jackson ([EMAIL PROTECTED]) geändert. Die Man-Seite
+wurde von Juho Vuori ([EMAIL PROTECTED]) hinzugefügt.
-diff -uNr dpkg-1.13.16/man/es/md5sum.1 dpkg-1.13.16-new/man/es/md5sum.1
--- dpkg-1.13.16/man/es/md5sum.1 1969-12-31 19:00:00.000000000 -0500
-+++ dpkg-1.13.16-new/man/es/md5sum.1 2006-03-11 12:22:42.000000000 -0500
++++ dpkg-1.13.16-new/man/es/md5sum.1 2006-03-13 22:09:32.000000000 -0500
@@ -0,0 +1,78 @@
+.\" Hey, Emacs! This is an -*- nroff -*- source file.
+.TH MD5SUM 1 "29 de Noviembre de 1995" "Lankester et al" "Debian GNU/Linux"
@@ -1072,9 +1046,8 @@
+Colin Plumb y Ian Jackson ([EMAIL PROTECTED]). La pagina del manual
+fue agregada por Juho Vuori ([EMAIL PROTECTED]) y traducida por Rubén
+Porras ([EMAIL PROTECTED])
-diff -uNr dpkg-1.13.16/man/ja/md5sum.1 dpkg-1.13.16-new/man/ja/md5sum.1
--- dpkg-1.13.16/man/ja/md5sum.1 1969-12-31 19:00:00.000000000 -0500
-+++ dpkg-1.13.16-new/man/ja/md5sum.1 2006-03-11 12:22:44.000000000 -0500
++++ dpkg-1.13.16-new/man/ja/md5sum.1 2006-03-13 22:09:32.000000000 -0500
@@ -0,0 +1,86 @@
+.\" Hey, Emacs! This is an -*- nroff -*- source file.
+.\"WORD: message digest ¥á¥Ã¥»¡¼¥¸¥À¥¤¥¸¥§¥¹¥È
@@ -1162,9 +1135,8 @@
+.SH ËÝÌõ¼Ô
+
+Æéë ±ÉŸ <[EMAIL PROTECTED]>
-diff -uNr dpkg-1.13.16/man/sv/md5sum.1 dpkg-1.13.16-new/man/sv/md5sum.1
--- dpkg-1.13.16/man/sv/md5sum.1 1969-12-31 19:00:00.000000000 -0500
-+++ dpkg-1.13.16-new/man/sv/md5sum.1 2006-03-11 12:22:45.000000000 -0500
++++ dpkg-1.13.16-new/man/sv/md5sum.1 2006-03-13 22:09:32.000000000 -0500
@@ -0,0 +1,83 @@
+.\" Hey, Emacs! This is an -*- nroff -*- source file.
+.\" Translation of CVS revision 1.2
@@ -1249,16 +1221,128 @@
+Colin Plumb och Ian Jackson ([EMAIL PROTECTED]).
+Manualsidan lades till av Juho Vuori ([EMAIL PROTECTED])
+och översattes av Peter Karlsson.
-diff -uNr dpkg-1.13.16/origin.fink dpkg-1.13.16-new/origin.fink
--- dpkg-1.13.16/origin.fink 1969-12-31 19:00:00.000000000 -0500
-+++ dpkg-1.13.16-new/origin.fink 2006-03-11 12:22:45.000000000 -0500
++++ dpkg-1.13.16-new/origin.fink 2006-03-13 22:09:32.000000000 -0500
@@ -0,0 +1,3 @@
+Vendor: Fink
+Vendor-URL: http://fink.sourceforge.net/
+Bugs: http://fink.sourceforge.net/
-diff -uNr dpkg-1.13.16/scripts/dpkg-name.sh
dpkg-1.13.16-new/scripts/dpkg-name.sh
+--- dpkg-1.13.16/scripts/controllib.pl.in 2006-01-22 23:50:40.000000000
-0500
++++ dpkg-1.13.16-new/scripts/controllib.pl.in 2006-03-13 22:13:34.000000000
-0500
+@@ -13,7 +13,7 @@
+
+ $pkgdatadir=".";
+
+-$parsechangelog= 'dpkg-parsechangelog';
++$parsechangelog= '@PREFIX@/bin/dpkg-parsechangelog';
+
+ @pkg_dep_fields = qw(Replaces Provides Depends Pre-Depends Recommends Suggests
+ Conflicts Enhances);
+@@ -72,8 +72,8 @@
+ }
+
+ sub findarch {
+- $arch=`dpkg-architecture -qDEB_HOST_ARCH`;
+- $? && &subprocerr("dpkg-architecture -qDEB_HOST_ARCH");
++ [EMAIL PROTECTED]@/bin/dpkg-architecture -qDEB_HOST_ARCH`;
++ $? && &subprocerr("@PREFIX@/bin/dpkg-architecture -qDEB_HOST_ARCH");
+ chomp $arch;
+ $substvar{'Arch'}= $arch;
+ }
+@@ -278,7 +278,7 @@
+ my ($dep_line, $use_arch, $reduce_arch) = @_;
+ my @dep_list;
+ if (!$host_arch) {
+- $host_arch = `dpkg-architecture -qDEB_HOST_ARCH`;
++ $host_arch = [EMAIL PROTECTED]@/bin/dpkg-architecture
-qDEB_HOST_ARCH`;
+ chomp $host_arch;
+ }
+ foreach my $dep_and (split(/,\s*/m, $dep_line)) {
+--- dpkg-1.13.16/scripts/dpkg-architecture.pl 2006-01-27 23:29:10.000000000
-0500
++++ dpkg-1.13.16-new/scripts/dpkg-architecture.pl 2006-03-13
22:14:37.000000000 -0500
+@@ -22,7 +22,7 @@
+ $version="1.0.0"; # This line modified by Makefile
+ $0 = `basename $0`; chomp $0;
+
+-$dpkglibdir="/usr/lib/dpkg";
++$dpkglibdir="@PREFIX@/lib/dpkg";
+ push(@INC,$dpkglibdir);
+ require 'controllib.pl';
+
+@@ -113,7 +113,7 @@
+
+ # Set default values:
+
+-chomp ($deb_build_arch = `dpkg --print-architecture`);
++chomp ($deb_build_arch = [EMAIL PROTECTED]@/bin/dpkg --print-architecture`);
+ &syserr("dpkg --print-architecture failed") if $?>>8;
+ $deb_build_gnu_type = &debian_to_gnu($deb_build_arch);
+
+--- dpkg-1.13.16/scripts/dpkg-buildpackage.sh 2006-01-29 11:10:59.000000000
-0500
++++ dpkg-1.13.16-new/scripts/dpkg-buildpackage.sh 2006-03-13
22:15:28.000000000 -0500
+@@ -141,15 +141,15 @@
+
+ curd="`pwd`"
+ dirn="`basename \"$curd\"`"
+-mustsetvar package "`dpkg-parsechangelog | sed -n 's/^Source: //p'`" "source
package is"
+-mustsetvar version "`dpkg-parsechangelog | sed -n 's/^Version: //p'`" "source
version is"
++mustsetvar package "[EMAIL PROTECTED]@/bin/dpkg-parsechangelog | sed -n
's/^Source: //p'`" "source package is"
++mustsetvar version "[EMAIL PROTECTED]@/bin/dpkg-parsechangelog | sed -n
's/^Version: //p'`" "source version is"
+ if [ -n "$changedby" ]; then maintainer="$changedby";
+ elif [ -n "$maint" ]; then maintainer="$maint";
+-else mustsetvar maintainer "`dpkg-parsechangelog | sed -n 's/^Maintainer:
//p'`" "source changed by"; fi
+-eval `dpkg-architecture -a${targetarch} -t${targetgnusystem} -s -f`
++else mustsetvar maintainer "[EMAIL PROTECTED]@/bin/dpkg-parsechangelog | sed
-n 's/^Maintainer: //p'`" "source changed by"; fi
++eval [EMAIL PROTECTED]@/bin/dpkg-architecture -a${targetarch}
-t${targetgnusystem} -s -f`
+
+ if [ x$sourceonly = x ]; then
+- mustsetvar arch "`dpkg-architecture -a${targetarch}
-t${targetgnusystem} -qDEB_HOST_ARCH`" "host architecture"
++ mustsetvar arch "[EMAIL PROTECTED]@/bin/dpkg-architecture
-a${targetarch} -t${targetgnusystem} -qDEB_HOST_ARCH`" "host architecture"
+ else
+ arch=source
+ fi
+--- dpkg-1.13.16/scripts/dpkg-checkbuilddeps.pl 2006-01-18
03:30:03.000000000 -0500
++++ dpkg-1.13.16-new/scripts/dpkg-checkbuilddeps.pl 2006-03-13
22:16:00.000000000 -0500
+@@ -133,7 +133,7 @@
+ my $dep_list=shift;
+ my %version=%{shift()};
+ my %providers=%{shift()};
+- my $host_arch=shift || `dpkg-architecture -qDEB_HOST_ARCH`;
++ my $host_arch=shift || [EMAIL PROTECTED]@/bin/dpkg-architecture
-qDEB_HOST_ARCH`;
+ chomp $host_arch;
+
+ my @unmet=();
+@@ -160,7 +160,7 @@
+ else {
+ # Compare installed and needed
+ # version number.
+- system("dpkg", "--compare-versions",
++ system("@PREFIX@/bin/dpkg",
"--compare-versions",
+ $version{$package}, $relation,
+ $version);
+ if (($? >> 8) != 0) {
+--- dpkg-1.13.16/scripts/dpkg-genchanges.pl 2006-01-22 23:50:40.000000000
-0500
++++ dpkg-1.13.16-new/scripts/dpkg-genchanges.pl 2006-03-13
22:17:48.000000000 -0500
+@@ -307,7 +307,7 @@
+ $f{'Format'}= $substvar{'Format'};
+
+ if (!length($f{'Date'})) {
+- chop($date822=`822-date`); $? && subprocerr("822-date");
++ chop([EMAIL PROTECTED]@/bin/822-date`); $? && subprocerr("822-date");
+ $f{'Date'}= $date822;
+ }
+
+@@ -326,7 +326,7 @@
+ open(STDIN,"< $uf") || &syserr("cannot open upload file $uf for reading");
+ (@s=stat(STDIN)) || &syserr("cannot fstat upload file $uf");
+ $size= $s[7]; $size || &warn("upload file $uf is empty");
+- $md5sum=`md5sum`; $? && subprocerr("md5sum upload file $uf");
++ [EMAIL PROTECTED]@/bin/md5sum`; $? && subprocerr("md5sum upload file
$uf");
+ $md5sum =~ m/^([0-9a-f]{32})\s*-?\s*$/i ||
+ &failure("md5sum upload file $uf gave strange output \`$md5sum'");
+ $md5sum= $1;
--- dpkg-1.13.16/scripts/dpkg-name.sh 2006-01-18 03:30:03.000000000 -0500
-+++ dpkg-1.13.16-new/scripts/dpkg-name.sh 2006-03-11 12:22:45.000000000
-0500
++++ dpkg-1.13.16-new/scripts/dpkg-name.sh 2006-03-13 22:19:41.000000000
-0500
@@ -10,6 +10,7 @@
license () {
echo "# ${prog} ${version} -- ${purpose}
@@ -1276,9 +1360,122 @@
}
stderr () {
-diff -uNr dpkg-1.13.16/scripts/update-alternatives.pl
dpkg-1.13.16-new/scripts/update-alternatives.pl
+@@ -54,13 +55,13 @@
+ }
+
+ getname () {
+- if p=`dpkg-deb -f -- "$1" package`;
++ if [EMAIL PROTECTED]@/bin/dpkg-deb -f -- "$1" package`;
+ then
+- v=`dpkg-deb -f -- "$1" version | sed s,.*:,,`;
+- r=`dpkg-deb -f -- "$1" revision`;
++ [EMAIL PROTECTED]@/bin/dpkg-deb -f -- "$1" version | sed
s,.*:,,`;
++ [EMAIL PROTECTED]@/bin/dpkg-deb -f -- "$1" revision`;
+ if [ -z "$r" ];
+ then
+- r=`dpkg-deb -f -- "$1" package_revision`;
++ [EMAIL PROTECTED]@/bin/dpkg-deb -f -- "$1"
package_revision`;
+ fi
+
+ if [ -n "$r" ];
+@@ -68,11 +69,11 @@
+ v=$v-$r;
+ fi
+
+- a=`dpkg-deb -f -- "$1" architecture`;
++ [EMAIL PROTECTED]@/bin/dpkg-deb -f -- "$1" architecture`;
+ a=`echo $a|sed -e 's/ *//g'`;
+ if [ -z "$a" ] && [ -n "$noarchitecture" ]; # arch field empty,
or ignored
+ then
+- a=`dpkg --print-architecture`;
++ [EMAIL PROTECTED]@/bin/dpkg --print-architecture`;
+ stderr "assuming architecture \`"$a"' for \`"$1"'";
+ fi
+ if [ -z "$noarchitecture" ];
+@@ -97,7 +98,7 @@
+ dir=`dirname "$1"`;
+ if [ -n "$subdir" ];
+ then
+- s=`dpkg-deb -f -- "$1" section`;
++ [EMAIL PROTECTED]@/bin/dpkg-deb -f -- "$1" section`;
+ if [ -z "$s" ];
+ then
+ s="no-section";
+--- dpkg-1.13.16/scripts/dpkg-scanpackages.pl 2006-02-17 09:35:13.000000000
-0500
++++ dpkg-1.13.16-new/scripts/dpkg-scanpackages.pl 2006-03-13
22:20:34.000000000 -0500
+@@ -86,7 +86,7 @@
+ sub vercmp {
+ my ($a,$b)[EMAIL PROTECTED];
+ return $vercache{$a}{$b} if exists $vercache{$a}{$b};
+- system('dpkg','--compare-versions',$a,'le',$b);
++ system('@PREFIX@/bin/dpkg','--compare-versions',$a,'le',$b);
+ $vercache{$a}{$b}=$?;
+ return $?;
+ }
+@@ -99,7 +99,7 @@
+ while (<$find_h>) {
+ chomp;
+ my $fn = $_;
+- my $control = `dpkg-deb -I $fn control`;
++ my $control = [EMAIL PROTECTED]@/bin/dpkg-deb -I $fn control`;
+ if ($control eq "") {
+ warn "Couldn't call dpkg-deb on $fn: $!, skipping package\n";
+ next;
+--- dpkg-1.13.16/scripts/dpkg-scansources.pl 2006-01-18 03:30:03.000000000
-0500
++++ dpkg-1.13.16-new/scripts/dpkg-scansources.pl 2006-03-13
22:20:48.000000000 -0500
+@@ -283,7 +283,7 @@
+ if (!$pid) {
+ open STDIN, '<&FILE' or xdie "can't dup $file:";
+ seek STDIN, 0, 0 or xdie "can't rewind $file:";
+- exec 'md5sum' or xdie "can't exec md5sum:";
++ exec '@PREFIX@/bin/md5sum' or xdie "can't exec md5sum:";
+ }
+ chomp($md5 = join '', <MD5>);
+ unless (close MD5) {
+--- dpkg-1.13.16/scripts/dpkg-shlibdeps.pl 2006-01-30 13:43:28.000000000
-0500
++++ dpkg-1.13.16-new/scripts/dpkg-shlibdeps.pl 2006-03-13 22:21:50.000000000
-0500
+@@ -231,7 +231,7 @@
+ close STDERR; # we don't need to see dpkg's errors
+ open STDERR, "> /dev/null";
+ $ENV{LC_ALL} = "C";
+- exec("dpkg","--search","--",@libfiles);
++ exec("@PREFIX@/bin/dpkg","--search","--",@libfiles);
+ syserr("cannot exec dpkg");
+ }
+ while (<P>) {
+--- dpkg-1.13.16/scripts/dpkg-source.pl 2006-02-10 19:23:42.000000000
-0500
++++ dpkg-1.13.16-new/scripts/dpkg-source.pl 2006-03-13 22:24:21.000000000
-0500
+@@ -580,8 +580,8 @@
+ close(DSC);
+
+ if ($is_signed) {
+- if (-x '/usr/bin/gpg') {
+- my $gpg_command = 'gpg -q --verify '.quotemeta($dsc).' 2>&1';
++ if (-x '@PREFIX@/bin/gpg') {
++ my $gpg_command = '@PREFIX@/bin/gpg -q --verify '.quotemeta($dsc).'
2>&1';
+ my @gpg_output = `$gpg_command`;
+ my $gpg_status = $? >> 8;
+ if ($gpg_status) {
+@@ -868,7 +868,7 @@
+ open(STDIN,"< $dscdir/$f") || &syserr("cannot read $dscdir/$f");
+ (@s= stat(STDIN)) || &syserr("cannot fstat $dscdir/$f");
+ $s[7] == $size{$f} || &error("file $f has size $s[7] instead of expected
$size{$f}");
+- $m= `md5sum`; $? && subprocerr("md5sum $f"); $m =~ s/\n$//;
++ $m= [EMAIL PROTECTED]@/bin/md5sum`; $? && subprocerr("md5sum $f"); $m =~
s/\n$//;
+ $m = readmd5sum( $m );
+ $m eq $md5sum{$f} || &error("file $f has md5sum $m instead of expected
$md5sum{$f}");
+ open(STDIN,"</dev/null") || &syserr("reopen stdin from /dev/null");
+@@ -1281,7 +1281,7 @@
+ &internerr( "tried to add file `$filename' twice" );
+ stat($filename) || &syserr("could not stat output file `$filename'");
+ $size= (stat _)[7];
+- my $md5sum= `md5sum <$filename`;
++ my $md5sum= [EMAIL PROTECTED]@/bin/md5sum <$filename`;
+ $? && &subprocerr("md5sum $filename");
+ $md5sum = readmd5sum( $md5sum );
+ $f{'Files'}.= "\n $md5sum $size $filename";
--- dpkg-1.13.16/scripts/update-alternatives.pl 2006-01-18
03:30:03.000000000 -0500
-+++ dpkg-1.13.16-new/scripts/update-alternatives.pl 2006-03-11
12:22:45.000000000 -0500
++++ dpkg-1.13.16-new/scripts/update-alternatives.pl 2006-03-13
22:25:40.000000000 -0500
@@ -59,7 +59,7 @@
sub quit { print STDERR "update-alternatives: @_\n"; exit(2); }
sub badusage { print STDERR "update-alternatives: @_\n\n"; &usageversion;
exit(2); }
@@ -1288,9 +1485,8 @@
$admindir= $admindir . '/alternatives';
$testmode= 0;
$verbosemode= 0;
-diff -uNr dpkg-1.13.16/src/Makefile.in dpkg-1.13.16-new/src/Makefile.in
--- dpkg-1.13.16/src/Makefile.in 2006-02-18 12:10:28.000000000 -0500
-+++ dpkg-1.13.16-new/src/Makefile.in 2006-03-11 12:22:45.000000000 -0500
++++ dpkg-1.13.16-new/src/Makefile.in 2006-03-13 22:09:32.000000000 -0500
@@ -84,7 +84,7 @@
query.$(OBJEXT)
dpkg_query_OBJECTS = $(am_dpkg_query_OBJECTS)
@@ -1317,9 +1513,8 @@
all: all-am
.SUFFIXES:
-diff -uNr dpkg-1.13.16/src/configure.c dpkg-1.13.16-new/src/configure.c
--- dpkg-1.13.16/src/configure.c 2006-02-10 09:40:46.000000000 -0500
-+++ dpkg-1.13.16-new/src/configure.c 2006-03-11 12:22:45.000000000 -0500
++++ dpkg-1.13.16-new/src/configure.c 2006-03-13 22:09:32.000000000 -0500
@@ -483,9 +483,10 @@
static void suspend(void) {
const char* s;
@@ -1346,9 +1541,8 @@
}
-diff -uNr dpkg-1.13.16/src/help.c dpkg-1.13.16-new/src/help.c
--- dpkg-1.13.16/src/help.c 2006-02-10 11:22:50.000000000 -0500
-+++ dpkg-1.13.16-new/src/help.c 2006-03-11 12:22:45.000000000 -0500
++++ dpkg-1.13.16-new/src/help.c 2006-03-13 22:09:32.000000000 -0500
@@ -69,11 +69,18 @@
void checkpath(void) {
@@ -1398,9 +1592,8 @@
for (packageslump= file->packages; packageslump; packageslump=
packageslump->more) {
debug(dbg_veryverbose, "isdirectoryinuse packageslump %s ...",
packageslump->pkgs[0] ? packageslump->pkgs[0]->name : "<none>");
-diff -uNr dpkg-1.13.16/src/main.c dpkg-1.13.16-new/src/main.c
--- dpkg-1.13.16/src/main.c 2006-02-06 16:28:52.000000000 -0500
-+++ dpkg-1.13.16-new/src/main.c 2006-03-11 12:22:45.000000000 -0500
++++ dpkg-1.13.16-new/src/main.c 2006-03-13 22:09:32.000000000 -0500
@@ -38,6 +38,12 @@
#include <dpkg-db.h>
#include <myopt.h>
@@ -1579,9 +1772,8 @@
actionfunction= (void (*)(const char* const*))cipaction->farg;
actionfunction(argv);
-diff -uNr dpkg-1.13.16/src/main.h dpkg-1.13.16-new/src/main.h
--- dpkg-1.13.16/src/main.h 2006-02-10 19:35:17.000000000 -0500
-+++ dpkg-1.13.16-new/src/main.h 2006-03-11 12:22:45.000000000 -0500
++++ dpkg-1.13.16-new/src/main.h 2006-03-13 22:09:32.000000000 -0500
@@ -95,6 +95,11 @@
extern const char *instdir;
extern struct packageinlist *ignoredependss;
@@ -1594,9 +1786,8 @@
/* from filesdb.c */
-diff -uNr dpkg-1.13.16/src/packages.c dpkg-1.13.16-new/src/packages.c
--- dpkg-1.13.16/src/packages.c 2006-01-18 03:30:03.000000000 -0500
-+++ dpkg-1.13.16-new/src/packages.c 2006-03-11 12:22:45.000000000 -0500
++++ dpkg-1.13.16-new/src/packages.c 2006-03-13 22:09:32.000000000 -0500
@@ -334,6 +334,30 @@
return thisf;
}
@@ -1667,9 +1858,8 @@
if (possi->cyclebreak) {
debug(dbg_depcondetail," break cycle so ok and found");
found= 3; break;
-diff -uNr dpkg-1.13.16/utils/Makefile.in dpkg-1.13.16-new/utils/Makefile.in
--- dpkg-1.13.16/utils/Makefile.in 2006-02-18 12:10:28.000000000 -0500
-+++ dpkg-1.13.16-new/utils/Makefile.in 2006-03-11 12:22:45.000000000 -0500
++++ dpkg-1.13.16-new/utils/Makefile.in 2006-03-13 22:09:32.000000000 -0500
@@ -14,7 +14,7 @@
@SET_MAKE@
@@ -1783,7 +1973,7 @@
distclean-compile:
-rm -f *.tab.c
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
++
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@@ -1839,9 +2029,8 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-diff -uNr dpkg-1.13.16/utils/md5sum.1 dpkg-1.13.16-new/utils/md5sum.1
--- dpkg-1.13.16/utils/md5sum.1 1969-12-31 19:00:00.000000000 -0500
-+++ dpkg-1.13.16-new/utils/md5sum.1 2006-03-11 12:22:45.000000000 -0500
++++ dpkg-1.13.16-new/utils/md5sum.1 2006-03-13 22:09:32.000000000 -0500
@@ -0,0 +1,75 @@
+.\" Hey, Emacs! This is an -*- nroff -*- source file.
+.TH MD5SUM 1 "29th November 1995" "Lankester et al" "Debian GNU/Linux"
@@ -1918,9 +2107,8 @@
+was originally written by Branko Lankester, and modified afterwards by
+Colin Plumb and Ian Jackson ([EMAIL PROTECTED]). Manual page was
+added by Juho Vuori ([EMAIL PROTECTED])
-diff -uNr dpkg-1.13.16/utils/md5sum.c dpkg-1.13.16-new/utils/md5sum.c
--- dpkg-1.13.16/utils/md5sum.c 1969-12-31 19:00:00.000000000 -0500
-+++ dpkg-1.13.16-new/utils/md5sum.c 2006-03-11 12:22:45.000000000 -0500
++++ dpkg-1.13.16-new/utils/md5sum.c 2006-03-13 22:09:32.000000000 -0500
@@ -0,0 +1,312 @@
+/*
+ * md5sum.c - Generate/check MD5 Message Digests
Index: dpkg.info
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/10.3/main/finkinfo/base/dpkg.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dpkg.info 13 Mar 2006 21:05:14 -0000 1.1
+++ dpkg.info 14 Mar 2006 03:59:30 -0000 1.2
@@ -6,35 +6,44 @@
Maintainer: Fink Core Group <[EMAIL PROTECTED]>
Depends: libgettext3-shlibs, libiconv, gzip, tar, libncurses5-shlibs
+BuildDepends: libgettext3-dev, gettext-tools, libiconv-dev, libncurses5
Essential: yes
GCC: 3.3
-Source: mirror:sourceforge:fink/dpkg_%v.tar.gz
+Source: http://debian.ethz.ch/debian/pool/main/d/%n/%n_%v.tar.gz
+Source2: http://alioth.debian.org/download.php/1496/po4a-0.24.tar.gz
SourceDirectory: dpkg-%v
Source-MD5: bf16c7c5efe5025320c73c862ffeb1d3
+Source2-MD5: 8f3edbc9df9a7f960d123c3dd5aa13c7
PatchScript: sed 's|@PREFIX@|%p|g' <%a/dpkg.patch | patch -p1
SetCFLAGS: -no-cpp-precomp -I%p/include
-SetMAKEFLAGS: -j1
-NoSetMAKEFLAGS: true
+SetCPPFLAGS: -fconstant-cfstrings
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
CompileScript: <<
- %p/bin/fink -y install libgettext3-dev gettext-tools libiconv-dev libncurses5
- PERL=/usr/bin/perl ./configure --build=%m-apple-darwin %c
- make EXEFLAGS="-force_flat_namespace -framework CoreFoundation"
+#!/bin/sh -ev
+
+ export PERL5LIB=`pwd`/../po4a-0.24/lib:"$PERL5LIB"
+ export PATH=`pwd`/../po4a-0.24:"$PATH"
+ chmod a+x ../po4a-0.24/po4a*
+ PERL=/usr/bin/perl ./configure --build=%m-apple-darwin %c
+ make EXEFLAGS="-force_flat_namespace -framework CoreFoundation"
<<
InstallScript: <<
-#!/bin/sh -ex
+#!/bin/sh -ev
- 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 -c -p -m 644 origin.fink %i/etc/dpkg/origins/fink
- rm -rf %i/lib/dpkg/methods/*
+ export PERL5LIB=`pwd`/../po4a-0.24/lib:"$PERL5LIB"
+ export PATH=`pwd`/../po4a-0.24:"$PATH"
+ chmod a+x ../po4a-0.24/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 -c -p -m 644 origin.fink %i/etc/dpkg/origins/fink
+ rm -rf %i/lib/dpkg/methods/*
<<
PostInstScript: <<
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
