Update of /cvsroot/fink/experimental/rangerrick/common/main/finkinfo/base
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12609/common/main/finkinfo/base
Modified Files:
apt-shlibs.info apt.info apt.patch
Log Message:
this builds too, rearranged apt a little
Index: apt-shlibs.info
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/common/main/finkinfo/base/apt-shlibs.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- apt-shlibs.info 13 Mar 2006 21:05:14 -0000 1.6
+++ apt-shlibs.info 14 Mar 2006 12:49:17 -0000 1.7
@@ -1,6 +1,6 @@
Package: apt-shlibs
Version: 0.5.4
-Revision: 53
+Revision: 55
GCC: 3.3
BuildDepends: fink-prebinding, libiconv-dev, libgettext3-dev
Source: mirror:sourceforge:fink/apt_%v.tar.gz
@@ -27,9 +27,9 @@
install -d -m 755 %i/include/apt-pkg
install -m 644 bin/libapt-pkg.3.2.0.dylib %i/lib/
- cd %i/lib/ && ln -s libapt-pkg.3.2.0.dylib libapt-pkg.3.2.dylib && ln -s
libapt-pkg.3.2.0.dylib libapt-pkg.dylib
+ cd %i/lib/ && ln -s libapt-pkg.3.2.0.dylib libapt-pkg.3.2.dylib && ln -s
libapt-pkg.3.2.dylib libapt-pkg.dylib
install -m 644 bin/libapt-inst.1.0.0.dylib %i/lib/
- cd %i/lib/ && ln -s libapt-inst.1.0.0.dylib libapt-inst.1.0.dylib && ln -s
libapt-inst.1.0.0.dylib libapt-inst.dylib
+ cd %i/lib/ && ln -s libapt-inst.1.0.0.dylib libapt-inst.1.0.dylib && ln -s
libapt-inst.1.0.dylib libapt-inst.dylib
install -c -m 644 include/apt-pkg/*.h %i/include/apt-pkg/
<<
@@ -41,8 +41,8 @@
Package: apt-dev
Depends: %N (>= %v-%r)
BuildDependsOnly: true
- Conflicts: apt0.6.40-dev
- Replaces: apt0.6.40-dev
+ Conflicts: libapt3-dev
+ Replaces: libapt3-dev
Recommends: libiconv-dev, libgettext3-dev
Files: lib/libapt-pkg.dylib lib/libapt-inst.dylib include
DocFiles: COPYING* AUTHORS
Index: apt.patch
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/common/main/finkinfo/base/apt.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- apt.patch 13 Mar 2006 21:05:14 -0000 1.17
+++ apt.patch 14 Mar 2006 12:49:17 -0000 1.18
@@ -1,21 +1,20 @@
-diff -uNr apt-0.6.43.3/apt-inst/contrib/extracttar.cc
apt-0.6.43.3-new/apt-inst/contrib/extracttar.cc
--- apt-0.6.43.3/apt-inst/contrib/extracttar.cc 2005-10-19
15:19:09.000000000 -0400
-+++ apt-0.6.43.3-new/apt-inst/contrib/extracttar.cc 2006-03-11
12:35:32.000000000 -0500
++++ apt-0.6.43.3-new/apt-inst/contrib/extracttar.cc 2006-03-14
06:50:14.000000000 -0500
@@ -149,7 +149,30 @@
close(Pipes[1]);
return true;
}
+
-+// Handle the ridiculous way that tar stores large numbers
-+static bool TarUIDToNum(const char *Str, unsigned long &Res, unsigned Len) {
-+ switch (*Str) {
-+ case '\200':
-+ Res = *((unsigned long *)(Str + Len - sizeof(unsigned
long)));
-+ return true;
-+ default:
-+ return StrToNum(Str+1, Res, Len-1, 8);
-+ }
-+}
++
++
++
++
++
++
++
++
++
++
/*}}}*/
+
+// Handle the ridiculous way that tar stores large numbers
@@ -43,24 +42,22 @@
StrToNum(Tar->Size,Itm.Size,sizeof(Tar->Size),8) == false ||
StrToNum(Tar->MTime,Itm.MTime,sizeof(Tar->MTime),8) == false ||
StrToNum(Tar->Major,Itm.Major,sizeof(Tar->Major),8) == false ||
-diff -uNr apt-0.6.43.3/apt-inst/makefile apt-0.6.43.3-new/apt-inst/makefile
--- apt-0.6.43.3/apt-inst/makefile 2005-10-19 15:19:09.000000000 -0400
-+++ apt-0.6.43.3-new/apt-inst/makefile 2006-03-11 12:27:33.000000000 -0500
-@@ -12,9 +12,9 @@
++++ apt-0.6.43.3-new/apt-inst/makefile 2006-03-14 06:53:00.000000000 -0500
+@@ -12,9 +12,10 @@
# The library name
LIBRARY=apt-inst
LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER)
--MAJOR=1.1
-+MAJOR=0.6.40
++COMPAT=1.0
+ MAJOR=1.1
MINOR=0
-SLIBS=$(PTHREADLIB) -lapt-pkg
+SLIBS=$(PTHREADLIB) -lapt-pkg $(INTLLIBS)
APT_DOMAIN:=libapt-inst$(MAJOR)
# Source code for the contributed non-core things
-diff -uNr apt-0.6.43.3/apt-pkg/acquire-item.cc
apt-0.6.43.3-new/apt-pkg/acquire-item.cc
--- apt-0.6.43.3/apt-pkg/acquire-item.cc 2006-02-22 04:04:32.000000000
-0500
-+++ apt-0.6.43.3-new/apt-pkg/acquire-item.cc 2006-03-11 12:27:33.000000000
-0500
++++ apt-0.6.43.3-new/apt-pkg/acquire-item.cc 2006-03-14 06:50:14.000000000
-0500
@@ -739,12 +739,14 @@
// ---------------------------------------------------------------------
/* This just sets up the initial fetch environment and queues the first
@@ -77,9 +74,8 @@
{
Retries = _config->FindI("Acquire::Retries",0);
-diff -uNr apt-0.6.43.3/apt-pkg/contrib/cdromutl.cc
apt-0.6.43.3-new/apt-pkg/contrib/cdromutl.cc
--- apt-0.6.43.3/apt-pkg/contrib/cdromutl.cc 2005-10-19 15:19:08.000000000
-0400
-+++ apt-0.6.43.3-new/apt-pkg/contrib/cdromutl.cc 2006-03-11
12:27:33.000000000 -0500
++++ apt-0.6.43.3-new/apt-pkg/contrib/cdromutl.cc 2006-03-14
06:50:14.000000000 -0500
@@ -23,13 +23,13 @@
#include <sys/wait.h>
@@ -107,9 +103,8 @@
return _error->Errno("statfs",_("Failed to stat the cdrom"));
// We use a kilobyte block size to advoid overflow
-diff -uNr apt-0.6.43.3/apt-pkg/deb/debindexfile.cc
apt-0.6.43.3-new/apt-pkg/deb/debindexfile.cc
--- apt-0.6.43.3/apt-pkg/deb/debindexfile.cc 2005-10-19 15:19:08.000000000
-0400
-+++ apt-0.6.43.3-new/apt-pkg/deb/debindexfile.cc 2006-03-11
12:27:33.000000000 -0500
++++ apt-0.6.43.3-new/apt-pkg/deb/debindexfile.cc 2006-03-14
06:50:14.000000000 -0500
@@ -444,3 +444,9 @@
}
@@ -120,9 +115,8 @@
+ (void)_apt_Pkg;
+ (void)_apt_Status;
+}
-diff -uNr apt-0.6.43.3/apt-pkg/deb/debsystem.cc
apt-0.6.43.3-new/apt-pkg/deb/debsystem.cc
--- apt-0.6.43.3/apt-pkg/deb/debsystem.cc 2005-10-19 15:19:08.000000000
-0400
-+++ apt-0.6.43.3-new/apt-pkg/deb/debsystem.cc 2006-03-11 12:27:33.000000000
-0500
++++ apt-0.6.43.3-new/apt-pkg/deb/debsystem.cc 2006-03-14 06:50:14.000000000
-0500
@@ -27,6 +27,111 @@
#include <dirent.h>
#include <errno.h>
@@ -323,9 +317,8 @@
}
return false;
-diff -uNr apt-0.6.43.3/apt-pkg/deb/debsystem.h
apt-0.6.43.3-new/apt-pkg/deb/debsystem.h
--- apt-0.6.43.3/apt-pkg/deb/debsystem.h 2005-10-19 15:19:08.000000000
-0400
-+++ apt-0.6.43.3-new/apt-pkg/deb/debsystem.h 2006-03-11 12:27:33.000000000
-0500
++++ apt-0.6.43.3-new/apt-pkg/deb/debsystem.h 2006-03-14 06:50:14.000000000
-0500
@@ -25,6 +25,7 @@
bool CheckUpdates();
@@ -334,9 +327,8 @@
public:
-diff -uNr apt-0.6.43.3/apt-pkg/deb/debversion.cc
apt-0.6.43.3-new/apt-pkg/deb/debversion.cc
--- apt-0.6.43.3/apt-pkg/deb/debversion.cc 2005-10-19 15:19:08.000000000
-0400
-+++ apt-0.6.43.3-new/apt-pkg/deb/debversion.cc 2006-03-11 12:27:33.000000000
-0500
++++ apt-0.6.43.3-new/apt-pkg/deb/debversion.cc 2006-03-14 06:50:14.000000000
-0500
@@ -24,6 +24,11 @@
debVersioningSystem debVS;
@@ -349,9 +341,8 @@
// debVS::debVersioningSystem - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
-diff -uNr apt-0.6.43.3/apt-pkg/deb/dpkgpm.cc
apt-0.6.43.3-new/apt-pkg/deb/dpkgpm.cc
--- apt-0.6.43.3/apt-pkg/deb/dpkgpm.cc 2005-10-19 15:19:08.000000000 -0400
-+++ apt-0.6.43.3-new/apt-pkg/deb/dpkgpm.cc 2006-03-11 12:27:33.000000000
-0500
++++ apt-0.6.43.3-new/apt-pkg/deb/dpkgpm.cc 2006-03-14 06:50:14.000000000
-0500
@@ -26,6 +26,10 @@
#include <errno.h>
#include <stdio.h>
@@ -363,9 +354,8 @@
#include <map>
#include <config.h>
-diff -uNr apt-0.6.43.3/apt-pkg/init.cc apt-0.6.43.3-new/apt-pkg/init.cc
--- apt-0.6.43.3/apt-pkg/init.cc 2005-11-28 04:55:46.000000000 -0500
-+++ apt-0.6.43.3-new/apt-pkg/init.cc 2006-03-11 12:27:33.000000000 -0500
++++ apt-0.6.43.3-new/apt-pkg/init.cc 2006-03-14 06:50:14.000000000 -0500
@@ -15,6 +15,8 @@
#include <apti18n.h>
#include <config.h>
@@ -402,21 +392,18 @@
Sys = 0;
string Label = Cnf.Find("Apt::System","");
if (Label.empty() == false)
-diff -uNr apt-0.6.43.3/apt-pkg/makefile apt-0.6.43.3-new/apt-pkg/makefile
--- apt-0.6.43.3/apt-pkg/makefile 2005-11-28 04:55:46.000000000 -0500
-+++ apt-0.6.43.3-new/apt-pkg/makefile 2006-03-11 12:28:11.000000000 -0500
-@@ -13,7 +13,7 @@
++++ apt-0.6.43.3-new/apt-pkg/makefile 2006-03-14 06:53:10.000000000 -0500
+@@ -13,6 +13,7 @@
# methods/makefile - FIXME
LIBRARY=apt-pkg
LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER)
--MAJOR=3.11
-+MAJOR=0.6.40
++COMPAT=3
+ MAJOR=3.11
MINOR=0
SLIBS=$(PTHREADLIB) $(INTLLIBS)
- APT_DOMAIN:=libapt-pkg$(MAJOR)
-diff -uNr apt-0.6.43.3/buildlib/environment.mak.in
apt-0.6.43.3-new/buildlib/environment.mak.in
--- apt-0.6.43.3/buildlib/environment.mak.in 2005-10-19 15:19:09.000000000
-0400
-+++ apt-0.6.43.3-new/buildlib/environment.mak.in 2006-03-11
12:27:33.000000000 -0500
++++ apt-0.6.43.3-new/buildlib/environment.mak.in 2006-03-14
06:50:14.000000000 -0500
@@ -7,14 +7,14 @@
CC = @CC@
CPPFLAGS+= @CPPFLAGS@ @DEFS@ -D_REENTRANT -Wall
@@ -456,9 +443,8 @@
+#endif
+SONAME_MAGIC=-install_name @PREFIX@/lib/
+LFLAGS_SO=-dynamiclib
-diff -uNr apt-0.6.43.3/buildlib/library.mak
apt-0.6.43.3-new/buildlib/library.mak
--- apt-0.6.43.3/buildlib/library.mak 2005-10-19 15:19:09.000000000 -0400
-+++ apt-0.6.43.3-new/buildlib/library.mak 2006-03-11 12:27:33.000000000
-0500
++++ apt-0.6.43.3-new/buildlib/library.mak 2006-03-14 06:54:25.000000000
-0500
@@ -16,11 +16,11 @@
# See defaults.mak for information about LOCAL
@@ -469,7 +455,7 @@
$(LOCAL)-DEP := $(addprefix $(DEP)/,$(addsuffix .opic.d,$(notdir $(basename
$(SOURCE)))))
$(LOCAL)-HEADERS := $(addprefix $(INCLUDE)/,$(HEADERS))
-$(LOCAL)-SONAME := lib$(LIBRARY)$(LIBEXT).so.$(MAJOR)
-+$(LOCAL)-SONAME := lib$(LIBRARY)$(LIBEXT).$(MAJOR).dylib
++$(LOCAL)-SONAME := lib$(LIBRARY)$(LIBEXT).$(COMPAT).dylib
$(LOCAL)-SLIBS := $(SLIBS)
$(LOCAL)-LIBRARY := $(LIBRARY)
@@ -508,14 +494,13 @@
$(CXX) $(CXXFLAGS) $(LDFLAGS) $(PICFLAGS) $(LFLAGS) $(LFLAGS_SO)\
- -o $@ $(SONAME_MAGIC)$($(@F)-SONAME) -shared \
+ -o $@ $(SONAME_MAGIC)$($(@F)-SONAME) \
-+ -compatibility_version $(MAJOR) \
-+ -current_version $(MAJOR) \
++ -compatibility_version $(COMPAT) \
++ -current_version $(MAJOR).$(MINOR) \
$(filter %.opic,$^) \
$($(@F)-SLIBS)
-diff -uNr apt-0.6.43.3/buildlib/ostable apt-0.6.43.3-new/buildlib/ostable
--- apt-0.6.43.3/buildlib/ostable 2005-10-19 15:19:09.000000000 -0400
-+++ apt-0.6.43.3-new/buildlib/ostable 2006-03-11 12:27:33.000000000 -0500
++++ apt-0.6.43.3-new/buildlib/ostable 2006-03-14 06:50:14.000000000 -0500
@@ -16,6 +16,7 @@
hp-hpux[^-]* hp-ux
sun-solaris[^-]* solaris
@@ -524,9 +509,8 @@
# Catch all
.* unknown
-diff -uNr apt-0.6.43.3/buildlib/sgml_manpage.mak
apt-0.6.43.3-new/buildlib/sgml_manpage.mak
--- apt-0.6.43.3/buildlib/sgml_manpage.mak 2005-10-19 15:19:09.000000000
-0400
-+++ apt-0.6.43.3-new/buildlib/sgml_manpage.mak 2006-03-11 12:27:33.000000000
-0500
++++ apt-0.6.43.3-new/buildlib/sgml_manpage.mak 2006-03-14 06:50:14.000000000
-0500
@@ -11,7 +11,7 @@
# See defaults.mak for information about LOCAL
@@ -536,9 +520,8 @@
LOCAL := sgml-manpage-$(firstword $(SOURCE))
$(LOCAL)-LIST := $(SOURCE)
-diff -uNr apt-0.6.43.3/cmdline/apt-get.cc apt-0.6.43.3-new/cmdline/apt-get.cc
--- apt-0.6.43.3/cmdline/apt-get.cc 2006-02-22 04:04:32.000000000 -0500
-+++ apt-0.6.43.3-new/cmdline/apt-get.cc 2006-03-11 12:27:33.000000000
-0500
++++ apt-0.6.43.3-new/cmdline/apt-get.cc 2006-03-14 06:50:14.000000000
-0500
@@ -53,7 +53,7 @@
#include <termios.h>
#include <sys/ioctl.h>
@@ -724,9 +707,8 @@
// Deal with stdout not being a tty
if (!isatty(STDOUT_FILENO) && _config->FindI("quiet",0) < 1)
-diff -uNr apt-0.6.43.3/cmdline/makefile apt-0.6.43.3-new/cmdline/makefile
--- apt-0.6.43.3/cmdline/makefile 2005-10-19 15:19:09.000000000 -0400
-+++ apt-0.6.43.3-new/cmdline/makefile 2006-03-11 12:27:33.000000000 -0500
++++ apt-0.6.43.3-new/cmdline/makefile 2006-03-14 06:50:14.000000000 -0500
@@ -7,42 +7,42 @@
# The apt-cache program
@@ -776,9 +758,8 @@
LIB_MAKES = apt-pkg/makefile
SOURCE = apt-extracttemplates.cc
include $(PROGRAM_H)
-diff -uNr apt-0.6.43.3/configure apt-0.6.43.3-new/configure
--- apt-0.6.43.3/configure 2006-02-22 04:22:55.000000000 -0500
-+++ apt-0.6.43.3-new/configure 2006-03-11 12:27:33.000000000 -0500
++++ apt-0.6.43.3-new/configure 2006-03-14 06:50:14.000000000 -0500
@@ -1296,8 +1296,8 @@
ac_ext=c
@@ -880,18 +861,16 @@
esac
done
_ACEOF
-diff -uNr apt-0.6.43.3/configure.in apt-0.6.43.3-new/configure.in
--- apt-0.6.43.3/configure.in 2006-02-22 04:04:32.000000000 -0500
-+++ apt-0.6.43.3-new/configure.in 2006-03-11 12:27:33.000000000 -0500
++++ apt-0.6.43.3-new/configure.in 2006-03-14 06:50:14.000000000 -0500
@@ -200,4 +200,4 @@
AC_SUBST(USE_NLS)
AC_PATH_PROG(BASH, bash)
-AC_OUTPUT(environment.mak:buildlib/environment.mak.in
makefile:buildlib/makefile.in,make -s dirs)
+AC_OUTPUT(environment.mak:buildlib/environment.mak.in
makefile.wrap:buildlib/makefile.in,make -f makefile.wrap -s dirs)
-diff -uNr apt-0.6.43.3/doc/apt-cache.8 apt-0.6.43.3-new/doc/apt-cache.8
--- apt-0.6.43.3/doc/apt-cache.8 2006-02-22 04:23:13.000000000 -0500
-+++ apt-0.6.43.3-new/doc/apt-cache.8 2006-03-11 12:27:33.000000000 -0500
++++ apt-0.6.43.3-new/doc/apt-cache.8 2006-03-14 06:50:14.000000000 -0500
@@ -42,7 +42,7 @@
.TP
@@ -938,9 +917,8 @@
.SH AUTHORS
Jason Gunthorpe, APT team.
-diff -uNr apt-0.6.43.3/doc/apt-cdrom.8 apt-0.6.43.3-new/doc/apt-cdrom.8
--- apt-0.6.43.3/doc/apt-cdrom.8 2006-02-22 04:23:17.000000000 -0500
-+++ apt-0.6.43.3-new/doc/apt-cdrom.8 2006-03-11 12:27:33.000000000 -0500
++++ apt-0.6.43.3-new/doc/apt-cdrom.8 2006-03-14 06:50:14.000000000 -0500
@@ -43,7 +43,7 @@
add
add is used to add a new disc to the source list\&. It will unmount the CDROM
device, prompt for a disk to be inserted and then procceed to scan it and copy
the index files\&. If the disc does not have a proper \fIdisk\fR directory you
will be prompted for a descriptive title\&.
@@ -959,9 +937,8 @@
.SH AUTHORS
Jason Gunthorpe, APT team.
-diff -uNr apt-0.6.43.3/doc/apt-config.8 apt-0.6.43.3-new/doc/apt-config.8
--- apt-0.6.43.3/doc/apt-config.8 2006-02-22 04:23:27.000000000 -0500
-+++ apt-0.6.43.3-new/doc/apt-config.8 2006-03-11 12:27:33.000000000 -0500
++++ apt-0.6.43.3-new/doc/apt-config.8 2006-03-14 06:50:14.000000000 -0500
@@ -31,7 +31,7 @@
.SH "DESCRIPTION"
@@ -980,9 +957,8 @@
.SH AUTHORS
Jason Gunthorpe, APT team.
-diff -uNr apt-0.6.43.3/doc/apt-get.8 apt-0.6.43.3-new/doc/apt-get.8
--- apt-0.6.43.3/doc/apt-get.8 2006-02-22 04:23:15.000000000 -0500
-+++ apt-0.6.43.3-new/doc/apt-get.8 2006-03-11 12:27:33.000000000 -0500
++++ apt-0.6.43.3-new/doc/apt-get.8 2006-03-14 06:50:14.000000000 -0500
@@ -38,11 +38,11 @@
.TP
@@ -1089,9 +1065,8 @@
.SH AUTHORS
Jason Gunthorpe, APT team.
-diff -uNr apt-0.6.43.3/doc/apt_preferences.5
apt-0.6.43.3-new/doc/apt_preferences.5
--- apt-0.6.43.3/doc/apt_preferences.5 2006-02-22 04:23:31.000000000 -0500
-+++ apt-0.6.43.3-new/doc/apt_preferences.5 2006-03-11 12:27:33.000000000
-0500
++++ apt-0.6.43.3-new/doc/apt_preferences.5 2006-03-14 06:50:14.000000000
-0500
@@ -23,7 +23,7 @@
.SH "DESCRIPTION"
@@ -1128,9 +1103,8 @@
.SH AUTHOR
APT team.
-diff -uNr apt-0.6.43.3/doc/sources.list.5 apt-0.6.43.3-new/doc/sources.list.5
--- apt-0.6.43.3/doc/sources.list.5 2006-02-22 04:23:24.000000000 -0500
-+++ apt-0.6.43.3-new/doc/sources.list.5 2006-03-11 12:27:33.000000000
-0500
++++ apt-0.6.43.3-new/doc/sources.list.5 2006-03-14 06:50:14.000000000
-0500
@@ -23,7 +23,7 @@
.SH "DESCRIPTION"
@@ -1149,9 +1123,8 @@
.SH AUTHORS
Jason Gunthorpe, APT team.
-diff -uNr apt-0.6.43.3/dselect/install apt-0.6.43.3-new/dselect/install
--- apt-0.6.43.3/dselect/install 2005-10-19 15:19:09.000000000 -0400
-+++ apt-0.6.43.3-new/dselect/install 2006-03-11 12:27:33.000000000 -0500
++++ apt-0.6.43.3-new/dselect/install 2006-03-14 06:50:14.000000000 -0500
@@ -6,8 +6,8 @@
# Get the configuration from /etc/apt/apt.conf
CLEAN="prompt"
@@ -1163,9 +1136,8 @@
DPKG_OPTS="--admindir=$1"
APT_OPT0="-oDir::State::status=$1/status"
APT_OPT1="-oDPkg::Options::=$DPKG_OPTS"
-diff -uNr apt-0.6.43.3/dselect/setup apt-0.6.43.3-new/dselect/setup
--- apt-0.6.43.3/dselect/setup 2005-10-19 15:19:09.000000000 -0400
-+++ apt-0.6.43.3-new/dselect/setup 2006-03-11 12:27:33.000000000 -0500
++++ apt-0.6.43.3-new/dselect/setup 2006-03-14 06:50:14.000000000 -0500
@@ -23,15 +23,17 @@
my $vardir=$ARGV[0];
my $method=$ARGV[1];
@@ -1238,9 +1210,8 @@
my $answer = <STDIN>;
chomp ($answer);
$answer =~ s/\s+/ /og;
-diff -uNr apt-0.6.43.3/dselect/update apt-0.6.43.3-new/dselect/update
--- apt-0.6.43.3/dselect/update 2005-10-19 15:19:09.000000000 -0400
-+++ apt-0.6.43.3-new/dselect/update 2006-03-11 12:27:33.000000000 -0500
++++ apt-0.6.43.3-new/dselect/update 2006-03-14 06:50:14.000000000 -0500
@@ -7,13 +7,13 @@
# Get the configuration from /etc/apt/apt.conf
CLEAN="prompt"
@@ -1259,9 +1230,8 @@
PROMPT="false"
RES=`apt-config shell CLEAN DSelect::Clean OPTS DSelect::UpdateOptions \
DPKG Dir::Bin::dpkg/f APTGET Dir::Bin::apt-get/f \
-diff -uNr apt-0.6.43.3/ftparchive/contents.cc
apt-0.6.43.3-new/ftparchive/contents.cc
--- apt-0.6.43.3/ftparchive/contents.cc 2005-10-19 15:19:09.000000000
-0400
-+++ apt-0.6.43.3-new/ftparchive/contents.cc 2006-03-11 12:27:33.000000000
-0500
++++ apt-0.6.43.3-new/ftparchive/contents.cc 2006-03-14 06:50:14.000000000
-0500
@@ -41,7 +41,6 @@
#include <stdio.h>
#include <stdlib.h>
@@ -1270,9 +1240,8 @@
/*}}}*/
// GenContents::~GenContents - Free allocated memory /*{{{*/
-diff -uNr apt-0.6.43.3/ftparchive/makefile apt-0.6.43.3-new/ftparchive/makefile
--- apt-0.6.43.3/ftparchive/makefile 2005-10-19 15:19:09.000000000 -0400
-+++ apt-0.6.43.3-new/ftparchive/makefile 2006-03-11 12:27:33.000000000
-0500
++++ apt-0.6.43.3-new/ftparchive/makefile 2006-03-14 06:50:14.000000000
-0500
@@ -8,7 +8,7 @@
# The apt-ftparchive program
ifdef BDBLIB
@@ -1282,20 +1251,18 @@
LIB_MAKES = apt-pkg/makefile apt-inst/makefile
SOURCE = apt-ftparchive.cc cachedb.cc writer.cc contents.cc override.cc \
multicompress.cc
-diff -uNr apt-0.6.43.3/ftparchive-conf apt-0.6.43.3-new/ftparchive-conf
--- apt-0.6.43.3/ftparchive-conf 1969-12-31 19:00:00.000000000 -0500
-+++ apt-0.6.43.3-new/ftparchive-conf 2006-03-11 12:27:33.000000000 -0500
++++ apt-0.6.43.3-new/ftparchive-conf 2006-03-14 06:50:14.000000000 -0500
@@ -0,0 +1 @@
+Dir::Bin::gzip "@PREFIX@/bin/gzip";
-diff -uNr apt-0.6.43.3/methods/makefile apt-0.6.43.3-new/methods/makefile
--- apt-0.6.43.3/methods/makefile 2005-11-28 04:55:47.000000000 -0500
-+++ apt-0.6.43.3-new/methods/makefile 2006-03-11 12:29:16.000000000 -0500
-@@ -7,61 +7,61 @@
++++ apt-0.6.43.3-new/methods/makefile 2006-03-14 06:53:45.000000000 -0500
+@@ -7,61 +7,62 @@
BIN := $(BIN)/methods
# FIXME..
--LIB_APT_PKG_MAJOR = 3.11
-+LIB_APT_PKG_MAJOR = 0.6.40
++COMPAT=3
+ LIB_APT_PKG_MAJOR = 3.11
APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR)
# The file method
@@ -1361,17 +1328,16 @@
LIB_MAKES = apt-pkg/makefile
SOURCE = rsh.cc
include $(PROGRAM_H)
-diff -uNr apt-0.6.43.3/methods/rfc2553emu.h
apt-0.6.43.3-new/methods/rfc2553emu.h
--- apt-0.6.43.3/methods/rfc2553emu.h 2005-10-19 15:19:09.000000000 -0400
-+++ apt-0.6.43.3-new/methods/rfc2553emu.h 2006-03-11 12:27:33.000000000
-0500
++++ apt-0.6.43.3-new/methods/rfc2553emu.h 2006-03-14 06:50:14.000000000
-0500
@@ -26,6 +26,11 @@
#include <sys/types.h>
#include <sys/socket.h>
-+// Always use full emulation on Darwin:
-+// netdb.h has the structures and constants, but getnameinfo() is missing
-+// and getaddrinfo() seems to be broken
-+#ifndef __APPLE__
++
++
++
++
+
// Autosense getaddrinfo
#if defined(AI_PASSIVE) && defined(EAI_NONAME)
@@ -1380,7 +1346,7 @@
#define HAVE_GETNAMEINFO
#endif
-+#endif /* __APPLE__ */
++
+
// getaddrinfo support?
#ifndef HAVE_GETADDRINFO
@@ -1395,9 +1361,8 @@
#define sockaddr_storage sockaddr_in
#endif
-diff -uNr apt-0.6.43.3/patch_flush apt-0.6.43.3-new/patch_flush
--- apt-0.6.43.3/patch_flush 1969-12-31 19:00:00.000000000 -0500
-+++ apt-0.6.43.3-new/patch_flush 2006-03-11 12:27:33.000000000 -0500
++++ apt-0.6.43.3-new/patch_flush 2006-03-14 06:50:14.000000000 -0500
@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
Index: apt.info
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/common/main/finkinfo/base/apt.info,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- apt.info 13 Mar 2006 21:05:14 -0000 1.15
+++ apt.info 14 Mar 2006 12:49:17 -0000 1.16
@@ -2,21 +2,22 @@
Version: 0.6.43.3
Revision: 1
GCC: 3.3
-Depends: apt0.6.40-shlibs (>= %v-%r), gzip, libftw0-shlibs
+Depends: libapt3-shlibs (>= %v-%r), gzip, libftw0-shlibs
BuildDepends: fink-prebinding, libftw0, libiconv-dev, libgettext3-dev,
gettext-tools
-Source: mirror:sourceforge:fink/%n_%v.tar.gz
+#Source: mirror:sourceforge:fink/%n_%v.tar.gz
+Source: http://debian.ethz.ch/debian/pool/main/a/%n/%n_%v.tar.gz
Source-MD5: 7d607342ffce8ba8705ae7797cb1a15c
SourceDirectory: %n-%v
Source2: http://downloads.sleepycat.com/db-4.3.29.tar.gz
-Source2-MD5: 200b9f5d74175875fcb3ee54adbf0007
+Source2-MD5: 13585a20ce32f113b8e8cdb57f52e3bb
Conflicts: apt-ftparchive
Replaces: apt-ftparchive
PatchScript: <<
#!/bin/sh -ex
- DISTRIBUTION=`grep -i -E '^Distribution:' %p/etc/fink.conf | awk '{ print $2
}'`
- sed -e 's|@PREFIX@|%p|g' -e "s|@DIST@|${DISTRIBUTION}|g" <%a/%n.patch | patch
-p1
- sh patch_flush
- for i in `grep -rl '#ifdef __GNUG__' .` ; do perl -pi.bak -e 's/#ifdef
__GNUG__/#if defined(__GNUG__) && !defined(__APPLE_CC__)/' $i; done
+ DISTRIBUTION=`grep -i -E '^Distribution:' %p/etc/fink.conf | awk '{
print $2 }'`
+ sed -e 's|@PREFIX@|%p|g' -e "s|@DIST@|${DISTRIBUTION}|g" <%a/%n.patch |
patch -p1
+ sh patch_flush
+ for i in `grep -rl '#ifdef __GNUG__' .` ; do perl -pi.bak -e 's/#ifdef
__GNUG__/#if defined(__GNUG__) && !defined(__APPLE_CC__)/' $i; done
<<
NoSetCPPFLAGS: true
SetLIBS: -L%p/lib -undefined dynamic_lookup
@@ -25,97 +26,95 @@
CompileScript: <<
#!/bin/sh -ex
- export DBDIR=`pwd`/../db-4.3.28
- pushd $DBDIR/build_unix
- LIBS="" LDFLAGS="" CFLAGS="" CXXFLAGS="" F77=no ../dist/configure
--enable-static=yes --enable-shared=no
- make libdb.a
- popd
+ export DBDIR=`pwd`/../db-4.3.29
+ pushd $DBDIR/build_unix
+ LIBS="" LDFLAGS="" CFLAGS="" CXXFLAGS="" F77=no ../dist/configure
--enable-static=yes --enable-shared=no
+ make libdb.a
+ popd
- export CPPFLAGS="-I$DBDIR/build_unix -I%p/include/ftw"
- export LDFLAGS="-L$DBDIR/build_unix"
- ./configure %c
- make -f makefile.wrap NOISY=1 GLIBC_VER= LIBSTDCPP_VER= INTLLIBS="-L%p/lib
-lintl" BDBLIB="$DBDIR/build_unix/libdb.a"
+ export CPPFLAGS="-I$DBDIR/build_unix -I%p/include/ftw"
+ export LDFLAGS="-L$DBDIR/build_unix"
+ ./configure %c
+ make -f makefile.wrap NOISY=1 GLIBC_VER= LIBSTDCPP_VER=
INTLLIBS="-L%p/lib -lintl" BDBLIB="$DBDIR/build_unix/libdb.a"
<<
InstallScript: <<
#!/bin/sh -ex
- install -d -m 755 %i/bin
- install -d -m 755 %i/lib
- install -d -m 755 %i/lib/apt/methods
- install -d -m 755 %i/lib/dpkg/methods/apt
- install -d -m 755 %i/include/apt-pkg
- install -d -m 755 %i/share/man/man{1,5,8}
- install -d -m 755 %i/etc/apt/apt.conf.d
- install -d -m 755 %i/var/cache/apt/archives/partial
- install -d -m 755 %i/var/lib/apt/lists/partial
-
- install -c -m 644 ftparchive-conf %i/etc/apt/apt.conf.d/
-
- for binfile in cache cdrom config extracttemplates ftparchive get sortpkgs; do
- install -c -m 755 bin/apt-$binfile %i/bin/
- done
+ install -d -m 755 %i/bin
+ install -d -m 755 %i/lib
+ install -d -m 755 %i/lib/apt/methods
+ install -d -m 755 %i/lib/dpkg/methods/apt
+ install -d -m 755 %i/include/apt-pkg
+ install -d -m 755 %i/share/man/man{1,5,8}
+ install -d -m 755 %i/etc/apt/apt.conf.d
+ install -d -m 755 %i/var/cache/apt/archives/partial
+ install -d -m 755 %i/var/lib/apt/lists/partial
- install -c -m 644 bin/libapt-pkg.0.6.40.0.dylib %i/lib/
- pushd %i/lib/ && ln -s libapt-pkg.0.6.40.0.dylib libapt-pkg.0.6.40.dylib &&
ln -s libapt-pkg.0.6.40.0.dylib libapt-pkg.dylib && popd
- install -c -m 644 bin/libapt-inst.0.6.40.0.dylib %i/lib/
- pushd %i/lib/ && ln -s libapt-inst.0.6.40.0.dylib libapt-inst.0.6.40.dylib &&
ln -s libapt-inst.0.6.40.0.dylib libapt-inst.dylib && popd
+ # binaries
+ install -c -m 755 bin/apt-* %i/bin/
- for method in bin/methods/*; do
- install -c -m 755 $method %i/lib/apt/methods/
- done
+ # libraries
+ install -c -m 644 bin/libapt-pkg.3.11.0.dylib %i/lib/
+ pushd %i/lib/ && ln -s libapt-pkg.3.11.0.dylib libapt-pkg.3.dylib && ln
-s libapt-pkg.3.dylib libapt-pkg.dylib && popd
+ install -c -m 644 bin/libapt-inst.1.1.0.dylib %i/lib/
+ pushd %i/lib/ && ln -s libapt-inst.1.1.0.dylib libapt-inst.3.dylib &&
ln -s libapt-inst.1.dylib libapt-inst.dylib && popd
- for method in scripts/dselect/*; do
- install -c $method %i/lib/dpkg/methods/apt/
- done
+ # methods
+ install -c -m 755 bin/methods/* %i/lib/apt/methods/
+ install -c -m 755 scripts/dselect/* %i/lib/dpkg/methods/apt/
- install -c -m 644 include/apt-pkg/*.h %i/include/apt-pkg/
+ # man pages
+ for ext in 1 5 8; do
+ for file in doc/*.$ext docs/*.$ext; do
+ install -c -m 644 $file %i/share/man/man$ext/
+ done
+ done
- for ext in 1 5 8; do
- for file in doc/*.$ext docs/*.$ext; do
- cp -f $file %i/share/man/man$ext/
- done
- done
+ # configuration files
+ install -c -m 644 ftparchive-conf %i/etc/apt/apt.conf.d/
+ # headers
+ install -c -m 644 include/apt-pkg/*.h %i/include/apt-pkg/
<<
SplitOff: <<
- Package: apt0.6.40-shlibs
- Depends: dpkg, fink (>= 0.20.6-1), libgettext3-shlibs
- Replaces: apt-shlibs
- Files: lib/lib*0.6.40*.dylib
- Shlibs: <<
- %p/lib/libapt-pkg.0.6.40.dylib 0.6.40 %n (>= 0.6.40.1-1)
- %p/lib/libapt-inst.0.6.40.dylib 0.6.40 %n (>= 0.6.40.1-1)
- <<
- DocFiles: COPYING* AUTHORS
+ Package: libapt3-shlibs
+ Depends: dpkg, fink (>= 0.20.6-1), libgettext3-shlibs
+ Replaces: apt-shlibs
+ Files: lib/lib*.3*.dylib
+ Shlibs: <<
+ %p/lib/libapt-pkg.3.dylib 3.0.0 libapt3-shlibs (>= 0.6.40.1-1)
+ %p/lib/libapt-inst.3.dylib 3.0.0 libapt3-shlibs (>= 0.6.40.1-1)
+ <<
+ DocFiles: COPYING* AUTHORS
<<
SplitOff2: <<
- Package: apt0.6.40-dev
- Depends: apt0.6.40-shlibs (>= %v-%r)
- BuildDependsOnly: true
- Recommends: libiconv-dev, libgettext3-dev
- Conflicts: apt-dev
- Replaces: apt-dev
- Files: lib/*.dylib include
- DocFiles: COPYING* AUTHORS
+ Package: libapt3-dev
+ Depends: libapt3-shlibs (>= %v-%r)
+ BuildDependsOnly: true
+ Recommends: libiconv-dev, libgettext3-dev
+ Conflicts: apt-dev
+ Replaces: apt-dev
+ Files: lib/*.dylib include
+ DocFiles: COPYING* AUTHORS
<<
DocFiles: COPYING* AUTHORS
PostInstScript: <<
if [ ! -f %p/var/lib/dpkg/cmethopt ]; then
- echo "apt apt" >%p/var/lib/dpkg/cmethopt
- chmod 644 %p/var/lib/dpkg/cmethopt
+ echo "apt apt" >%p/var/lib/dpkg/cmethopt
+ chmod 644 %p/var/lib/dpkg/cmethopt
else
- read a b <%p/var/lib/dpkg/cmethopt
- if [ "$a" != "apt" -o "$b" != "apt" ]; then
- echo
- echo "dselect is not set up to use apt as its access method. Downloading
binary"
- echo -n "package will likely not work. Do you want to use apt instead?"
- read answer
- answer=`echo $answer | sed 's/^[yY].*$/y/'`
- if [ -z "$answer" -o "x$answer" = "xy" ]; then
- echo "apt apt" >%p/var/lib/dpkg/cmethopt
- chmod 644 %p/var/lib/dpkg/cmethopt
- fi
- fi
+ read a b <%p/var/lib/dpkg/cmethopt
+ if [ "$a" != "apt" -o "$b" != "apt" ]; then
+ echo
+ echo "dselect is not set up to use apt as its access method.
Downloading binary"
+ echo -n "package will likely not work. Do you want to use apt
instead?"
+ read answer
+ answer=`echo $answer | sed 's/^[yY].*$/y/'`
+ if [ -z "$answer" -o "x$answer" = "xy" ]; then
+ echo "apt apt" >%p/var/lib/dpkg/cmethopt
+ chmod 644 %p/var/lib/dpkg/cmethopt
+ fi
+ fi
fi
rm -f %p/var/cache/apt/pkgcache.bin %p/var/cache/apt/srcpkgcache.bin
-------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
