Update of /cvsroot/fink/experimental/rangerrick/common/main/finkinfo/base
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29247/common/main/finkinfo/base
Modified Files:
apt.info apt.patch
Log Message:
buncha work on dbus, still not sure it works, other misc in-progress stuff
Index: apt.patch
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/common/main/finkinfo/base/apt.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- apt.patch 30 Aug 2005 17:40:42 -0000 1.5
+++ apt.patch 12 Sep 2005 18:07:04 -0000 1.6
@@ -1,17 +1,5 @@
-diff -uNr apt-0.6.40.1/Makefile apt-0.6.40.1-new/Makefile
---- apt-0.6.40.1/Makefile 2005-08-05 05:58:35.000000000 -0400
-+++ apt-0.6.40.1-new/Makefile 2005-08-29 17:30:29.000000000 -0400
-@@ -15,7 +15,6 @@
- $(MAKE) -C apt-inst $@
- $(MAKE) -C methods $@
- $(MAKE) -C cmdline $@
-- $(MAKE) -C ftparchive $@
- $(MAKE) -C dselect $@
- $(MAKE) -C doc $@
- $(MAKE) -C po $@
-diff -uNr apt-0.6.40.1/apt-inst/makefile apt-0.6.40.1-new/apt-inst/makefile
---- apt-0.6.40.1/apt-inst/makefile 2005-08-05 05:58:35.000000000 -0400
-+++ apt-0.6.40.1-new/apt-inst/makefile 2005-08-29 17:30:29.000000000 -0400
+--- apt-0.6.41/apt-inst/makefile 2005-08-01 12:05:41.000000000 -0400
++++ apt-0.6.41-new/apt-inst/makefile 2005-09-09 12:30:35.000000000 -0400
@@ -12,9 +12,9 @@
# The library name
LIBRARY=apt-inst
@@ -24,10 +12,9 @@
APT_DOMAIN:=libapt-inst$(MAJOR)
# Source code for the contributed non-core things
-diff -uNr apt-0.6.40.1/apt-pkg/acquire-item.cc
apt-0.6.40.1-new/apt-pkg/acquire-item.cc
---- apt-0.6.40.1/apt-pkg/acquire-item.cc 2005-08-05 05:58:35.000000000
-0400
-+++ apt-0.6.40.1-new/apt-pkg/acquire-item.cc 2005-08-29 17:42:31.000000000
-0400
-@@ -700,12 +700,14 @@
+--- apt-0.6.41/apt-pkg/acquire-item.cc 2005-08-23 04:13:13.000000000 -0400
++++ apt-0.6.41-new/apt-pkg/acquire-item.cc 2005-09-09 12:30:35.000000000
-0400
+@@ -708,12 +708,14 @@
// ---------------------------------------------------------------------
/* This just sets up the initial fetch environment and queues the first
possibilitiy */
@@ -43,9 +30,8 @@
{
Retries = _config->FindI("Acquire::Retries",0);
-diff -uNr apt-0.6.40.1/apt-pkg/contrib/cdromutl.cc
apt-0.6.40.1-new/apt-pkg/contrib/cdromutl.cc
---- apt-0.6.40.1/apt-pkg/contrib/cdromutl.cc 2005-08-05 05:58:35.000000000
-0400
-+++ apt-0.6.40.1-new/apt-pkg/contrib/cdromutl.cc 2005-08-29
17:30:29.000000000 -0400
+--- apt-0.6.41/apt-pkg/contrib/cdromutl.cc 2005-08-01 12:05:41.000000000
-0400
++++ apt-0.6.41-new/apt-pkg/contrib/cdromutl.cc 2005-09-09 12:30:35.000000000
-0400
@@ -23,13 +23,13 @@
#include <sys/wait.h>
@@ -73,9 +59,8 @@
return _error->Errno("statfs",_("Failed to stat the cdrom"));
// We use a kilobyte block size to advoid overflow
-diff -uNr apt-0.6.40.1/apt-pkg/deb/debindexfile.cc
apt-0.6.40.1-new/apt-pkg/deb/debindexfile.cc
---- apt-0.6.40.1/apt-pkg/deb/debindexfile.cc 2005-08-05 05:58:37.000000000
-0400
-+++ apt-0.6.40.1-new/apt-pkg/deb/debindexfile.cc 2005-08-29
17:30:29.000000000 -0400
+--- apt-0.6.41/apt-pkg/deb/debindexfile.cc 2005-08-01 12:05:46.000000000
-0400
++++ apt-0.6.41-new/apt-pkg/deb/debindexfile.cc 2005-09-09 12:30:35.000000000
-0400
@@ -444,3 +444,9 @@
}
@@ -86,9 +71,8 @@
+ (void)_apt_Pkg;
+ (void)_apt_Status;
+}
-diff -uNr apt-0.6.40.1/apt-pkg/deb/debsystem.cc
apt-0.6.40.1-new/apt-pkg/deb/debsystem.cc
---- apt-0.6.40.1/apt-pkg/deb/debsystem.cc 2005-08-05 05:58:35.000000000
-0400
-+++ apt-0.6.40.1-new/apt-pkg/deb/debsystem.cc 2005-08-29 17:30:29.000000000
-0400
+--- apt-0.6.41/apt-pkg/deb/debsystem.cc 2005-08-23 04:13:13.000000000
-0400
++++ apt-0.6.41-new/apt-pkg/deb/debsystem.cc 2005-09-09 12:30:35.000000000
-0400
@@ -27,6 +27,111 @@
#include <dirent.h>
#include <errno.h>
@@ -218,10 +202,10 @@
- Cnf.CndSet("Dir::Bin::dpkg","/usr/bin/dpkg");
+ Cnf.CndSet("Dir::State::status","@PREFIX@/var/lib/dpkg/status");
+ Cnf.CndSet("Dir::Bin::dpkg","@PREFIX@/bin/dpkg");
-
- return true;
- }
-@@ -186,9 +293,9 @@
+
+ if (StatusFile) {
+ delete StatusFile;
+@@ -191,9 +298,9 @@
signed debSystem::Score(Configuration const &Cnf)
{
signed Score = 0;
@@ -233,7 +217,7 @@
Score += 10;
if (FileExists("/etc/debian_version") == true)
Score += 10;
-@@ -203,6 +310,44 @@
+@@ -208,6 +315,44 @@
if (StatusFile == 0)
StatusFile = new
debStatusIndex(_config->FindFile("Dir::State::status"));
List.push_back(StatusFile);
@@ -278,7 +262,7 @@
return true;
}
/*}}}*/
-@@ -218,6 +363,10 @@
+@@ -223,6 +368,10 @@
{
Found = StatusFile;
return true;
@@ -289,9 +273,8 @@
}
return false;
-diff -uNr apt-0.6.40.1/apt-pkg/deb/debsystem.h
apt-0.6.40.1-new/apt-pkg/deb/debsystem.h
---- apt-0.6.40.1/apt-pkg/deb/debsystem.h 2005-08-05 05:58:35.000000000
-0400
-+++ apt-0.6.40.1-new/apt-pkg/deb/debsystem.h 2005-08-29 17:30:29.000000000
-0400
+--- apt-0.6.41/apt-pkg/deb/debsystem.h 2005-08-01 12:05:41.000000000 -0400
++++ apt-0.6.41-new/apt-pkg/deb/debsystem.h 2005-09-09 12:30:35.000000000
-0400
@@ -25,6 +25,7 @@
bool CheckUpdates();
@@ -300,9 +283,8 @@
public:
-diff -uNr apt-0.6.40.1/apt-pkg/deb/debversion.cc
apt-0.6.40.1-new/apt-pkg/deb/debversion.cc
---- apt-0.6.40.1/apt-pkg/deb/debversion.cc 2005-08-05 05:58:35.000000000
-0400
-+++ apt-0.6.40.1-new/apt-pkg/deb/debversion.cc 2005-08-29 17:30:29.000000000
-0400
+--- apt-0.6.41/apt-pkg/deb/debversion.cc 2005-08-01 12:05:41.000000000
-0400
++++ apt-0.6.41-new/apt-pkg/deb/debversion.cc 2005-09-09 12:30:35.000000000
-0400
@@ -24,6 +24,11 @@
debVersioningSystem debVS;
@@ -315,9 +297,8 @@
// debVS::debVersioningSystem - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
-diff -uNr apt-0.6.40.1/apt-pkg/deb/dpkgpm.cc
apt-0.6.40.1-new/apt-pkg/deb/dpkgpm.cc
---- apt-0.6.40.1/apt-pkg/deb/dpkgpm.cc 2005-08-05 07:20:13.000000000 -0400
-+++ apt-0.6.40.1-new/apt-pkg/deb/dpkgpm.cc 2005-08-29 17:30:29.000000000
-0400
+--- apt-0.6.41/apt-pkg/deb/dpkgpm.cc 2005-08-19 04:04:07.000000000 -0400
++++ apt-0.6.41-new/apt-pkg/deb/dpkgpm.cc 2005-09-09 12:30:35.000000000
-0400
@@ -26,6 +26,10 @@
#include <errno.h>
#include <stdio.h>
@@ -329,9 +310,8 @@
#include <map>
#include <config.h>
-diff -uNr apt-0.6.40.1/apt-pkg/init.cc apt-0.6.40.1-new/apt-pkg/init.cc
---- apt-0.6.40.1/apt-pkg/init.cc 2005-08-05 05:58:35.000000000 -0400
-+++ apt-0.6.40.1-new/apt-pkg/init.cc 2005-08-29 17:30:29.000000000 -0400
+--- apt-0.6.41/apt-pkg/init.cc 2005-08-01 12:05:41.000000000 -0400
++++ apt-0.6.41-new/apt-pkg/init.cc 2005-09-09 12:30:35.000000000 -0400
@@ -15,6 +15,8 @@
#include <apti18n.h>
#include <config.h>
@@ -368,9 +348,8 @@
Sys = 0;
string Label = Cnf.Find("Apt::System","");
if (Label.empty() == false)
-diff -uNr apt-0.6.40.1/apt-pkg/makefile apt-0.6.40.1-new/apt-pkg/makefile
---- apt-0.6.40.1/apt-pkg/makefile 2005-08-05 06:28:00.000000000 -0400
-+++ apt-0.6.40.1-new/apt-pkg/makefile 2005-08-29 17:30:29.000000000 -0400
+--- apt-0.6.41/apt-pkg/makefile 2005-08-19 04:04:07.000000000 -0400
++++ apt-0.6.41-new/apt-pkg/makefile 2005-09-09 12:30:35.000000000 -0400
@@ -13,7 +13,7 @@
# methods/makefile - FIXME
LIBRARY=apt-pkg
@@ -380,9 +359,8 @@
MINOR=0
SLIBS=$(PTHREADLIB) $(INTLLIBS)
APT_DOMAIN:=libapt-pkg$(MAJOR)
-diff -uNr apt-0.6.40.1/buildlib/environment.mak.in
apt-0.6.40.1-new/buildlib/environment.mak.in
---- apt-0.6.40.1/buildlib/environment.mak.in 2005-08-05 05:58:35.000000000
-0400
-+++ apt-0.6.40.1-new/buildlib/environment.mak.in 2005-08-29
17:30:29.000000000 -0400
+--- apt-0.6.41/buildlib/environment.mak.in 2005-08-01 12:05:41.000000000
-0400
++++ apt-0.6.41-new/buildlib/environment.mak.in 2005-09-09 12:30:35.000000000
-0400
@@ -7,14 +7,14 @@
CC = @CC@
CPPFLAGS+= @CPPFLAGS@ @DEFS@ -D_REENTRANT -Wall
@@ -422,9 +400,8 @@
+#endif
+SONAME_MAGIC=-install_name @PREFIX@/lib/
+LFLAGS_SO=-dynamiclib
-diff -uNr apt-0.6.40.1/buildlib/library.mak
apt-0.6.40.1-new/buildlib/library.mak
---- apt-0.6.40.1/buildlib/library.mak 2005-08-05 05:58:35.000000000 -0400
-+++ apt-0.6.40.1-new/buildlib/library.mak 2005-08-29 17:30:29.000000000
-0400
+--- apt-0.6.41/buildlib/library.mak 2005-08-01 12:05:41.000000000 -0400
++++ apt-0.6.41-new/buildlib/library.mak 2005-09-09 12:30:35.000000000
-0400
@@ -16,11 +16,11 @@
# See defaults.mak for information about LOCAL
@@ -479,9 +456,8 @@
$(filter %.opic,$^) \
$($(@F)-SLIBS)
-diff -uNr apt-0.6.40.1/buildlib/ostable apt-0.6.40.1-new/buildlib/ostable
---- apt-0.6.40.1/buildlib/ostable 2005-08-05 05:58:35.000000000 -0400
-+++ apt-0.6.40.1-new/buildlib/ostable 2005-08-29 17:30:29.000000000 -0400
+--- apt-0.6.41/buildlib/ostable 2005-08-01 12:05:41.000000000 -0400
++++ apt-0.6.41-new/buildlib/ostable 2005-09-09 12:30:35.000000000 -0400
@@ -16,6 +16,7 @@
hp-hpux[^-]* hp-ux
sun-solaris[^-]* solaris
@@ -490,9 +466,8 @@
# Catch all
.* unknown
-diff -uNr apt-0.6.40.1/cmdline/apt-get.cc apt-0.6.40.1-new/cmdline/apt-get.cc
---- apt-0.6.40.1/cmdline/apt-get.cc 2005-08-05 05:58:39.000000000 -0400
-+++ apt-0.6.40.1-new/cmdline/apt-get.cc 2005-08-29 17:30:29.000000000
-0400
+--- apt-0.6.41/cmdline/apt-get.cc 2005-08-23 04:13:13.000000000 -0400
++++ apt-0.6.41-new/cmdline/apt-get.cc 2005-09-09 12:30:35.000000000 -0400
@@ -51,7 +51,7 @@
#include <termios.h>
#include <sys/ioctl.h>
@@ -672,9 +647,8 @@
// Deal with stdout not being a tty
if (!isatty(STDOUT_FILENO) && _config->FindI("quiet",0) < 1)
-diff -uNr apt-0.6.40.1/cmdline/makefile apt-0.6.40.1-new/cmdline/makefile
---- apt-0.6.40.1/cmdline/makefile 2005-08-05 05:58:35.000000000 -0400
-+++ apt-0.6.40.1-new/cmdline/makefile 2005-08-29 17:30:29.000000000 -0400
+--- apt-0.6.41/cmdline/makefile 2005-08-01 12:05:41.000000000 -0400
++++ apt-0.6.41-new/cmdline/makefile 2005-09-09 12:30:35.000000000 -0400
@@ -7,42 +7,42 @@
# The apt-cache program
@@ -724,9 +698,8 @@
LIB_MAKES = apt-pkg/makefile
SOURCE = apt-extracttemplates.cc
include $(PROGRAM_H)
-diff -uNr apt-0.6.40.1/configure apt-0.6.40.1-new/configure
---- apt-0.6.40.1/configure 2005-08-05 07:35:03.000000000 -0400
-+++ apt-0.6.40.1-new/configure 2005-08-29 17:30:29.000000000 -0400
+--- apt-0.6.41/configure 2005-09-05 17:01:37.000000000 -0400
++++ apt-0.6.41-new/configure 2005-09-09 12:30:36.000000000 -0400
@@ -1296,8 +1296,8 @@
ac_ext=c
@@ -801,7 +774,7 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test -n "$ac_tool_prefix"; then
-@@ -8669,7 +8669,7 @@
+@@ -8629,7 +8629,7 @@
fi
@@ -810,7 +783,7 @@
ac_config_commands="$ac_config_commands default"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -9213,7 +9213,7 @@
+@@ -9173,7 +9173,7 @@
case "$ac_config_target" in
# Handling of arguments.
"environment.mak" ) CONFIG_FILES="$CONFIG_FILES
environment.mak:buildlib/environment.mak.in" ;;
@@ -819,7 +792,7 @@
"default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
"include/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS
include/config.h:buildlib/config.h.in" ;;
-@@ -10058,7 +10058,7 @@
+@@ -10018,7 +10018,7 @@
;;
esac
done ;;
@@ -828,18 +801,16 @@
esac
done
_ACEOF
-diff -uNr apt-0.6.40.1/configure.in apt-0.6.40.1-new/configure.in
---- apt-0.6.40.1/configure.in 2005-08-05 07:34:35.000000000 -0400
-+++ apt-0.6.40.1-new/configure.in 2005-08-29 17:30:29.000000000 -0400
-@@ -203,4 +203,4 @@
+--- apt-0.6.41/configure.in 2005-08-23 04:13:13.000000000 -0400
++++ apt-0.6.41-new/configure.in 2005-09-09 12:30:36.000000000 -0400
+@@ -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.40.1/doc/apt-cache.8 apt-0.6.40.1-new/doc/apt-cache.8
---- apt-0.6.40.1/doc/apt-cache.8 2005-08-05 07:35:14.000000000 -0400
-+++ apt-0.6.40.1-new/doc/apt-cache.8 2005-08-29 17:30:29.000000000 -0400
+--- apt-0.6.41/doc/apt-cache.8 2005-09-05 17:01:54.000000000 -0400
++++ apt-0.6.41-new/doc/apt-cache.8 2005-09-09 12:30:36.000000000 -0400
@@ -42,7 +42,7 @@
.TP
@@ -886,9 +857,8 @@
.SH AUTHORS
Jason Gunthorpe, APT team.
-diff -uNr apt-0.6.40.1/doc/apt-cdrom.8 apt-0.6.40.1-new/doc/apt-cdrom.8
---- apt-0.6.40.1/doc/apt-cdrom.8 2005-08-05 07:35:17.000000000 -0400
-+++ apt-0.6.40.1-new/doc/apt-cdrom.8 2005-08-29 17:30:29.000000000 -0400
+--- apt-0.6.41/doc/apt-cdrom.8 2005-09-05 17:01:57.000000000 -0400
++++ apt-0.6.41-new/doc/apt-cdrom.8 2005-09-09 12:30:36.000000000 -0400
@@ -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\&.
@@ -907,9 +877,8 @@
.SH AUTHORS
Jason Gunthorpe, APT team.
-diff -uNr apt-0.6.40.1/doc/apt-config.8 apt-0.6.40.1-new/doc/apt-config.8
---- apt-0.6.40.1/doc/apt-config.8 2005-08-05 07:35:22.000000000 -0400
-+++ apt-0.6.40.1-new/doc/apt-config.8 2005-08-29 17:30:29.000000000 -0400
+--- apt-0.6.41/doc/apt-config.8 2005-09-05 17:02:02.000000000 -0400
++++ apt-0.6.41-new/doc/apt-config.8 2005-09-09 12:30:36.000000000 -0400
@@ -31,7 +31,7 @@
.SH "DESCRIPTION"
@@ -928,9 +897,8 @@
.SH AUTHORS
Jason Gunthorpe, APT team.
-diff -uNr apt-0.6.40.1/doc/apt-get.8 apt-0.6.40.1-new/doc/apt-get.8
---- apt-0.6.40.1/doc/apt-get.8 2005-08-05 07:35:16.000000000 -0400
-+++ apt-0.6.40.1-new/doc/apt-get.8 2005-08-29 17:30:29.000000000 -0400
+--- apt-0.6.41/doc/apt-get.8 2005-09-05 17:01:55.000000000 -0400
++++ apt-0.6.41-new/doc/apt-get.8 2005-09-09 12:30:36.000000000 -0400
@@ -38,11 +38,11 @@
.TP
@@ -1037,9 +1005,8 @@
.SH AUTHORS
Jason Gunthorpe, APT team.
-diff -uNr apt-0.6.40.1/doc/apt_preferences.5
apt-0.6.40.1-new/doc/apt_preferences.5
---- apt-0.6.40.1/doc/apt_preferences.5 2005-08-05 07:35:23.000000000 -0400
-+++ apt-0.6.40.1-new/doc/apt_preferences.5 2005-08-29 17:30:29.000000000
-0400
+--- apt-0.6.41/doc/apt_preferences.5 2005-09-05 17:02:03.000000000 -0400
++++ apt-0.6.41-new/doc/apt_preferences.5 2005-09-09 12:30:36.000000000
-0400
@@ -23,7 +23,7 @@
.SH "DESCRIPTION"
@@ -1076,9 +1043,8 @@
.SH AUTHOR
APT team.
-diff -uNr apt-0.6.40.1/doc/sources.list.5 apt-0.6.40.1-new/doc/sources.list.5
---- apt-0.6.40.1/doc/sources.list.5 2005-08-05 07:35:20.000000000 -0400
-+++ apt-0.6.40.1-new/doc/sources.list.5 2005-08-29 17:30:29.000000000
-0400
+--- apt-0.6.41/doc/sources.list.5 2005-09-05 17:02:00.000000000 -0400
++++ apt-0.6.41-new/doc/sources.list.5 2005-09-09 12:30:36.000000000 -0400
@@ -23,7 +23,7 @@
.SH "DESCRIPTION"
@@ -1097,9 +1063,8 @@
.SH AUTHORS
Jason Gunthorpe, APT team.
-diff -uNr apt-0.6.40.1/dselect/install apt-0.6.40.1-new/dselect/install
---- apt-0.6.40.1/dselect/install 2005-08-05 05:58:35.000000000 -0400
-+++ apt-0.6.40.1-new/dselect/install 2005-08-29 17:30:29.000000000 -0400
+--- apt-0.6.41/dselect/install 2005-08-01 12:05:41.000000000 -0400
++++ apt-0.6.41-new/dselect/install 2005-09-09 12:30:36.000000000 -0400
@@ -6,8 +6,8 @@
# Get the configuration from /etc/apt/apt.conf
CLEAN="prompt"
@@ -1111,9 +1076,8 @@
DPKG_OPTS="--admindir=$1"
APT_OPT0="-oDir::State::status=$1/status"
APT_OPT1="-oDPkg::Options::=$DPKG_OPTS"
-diff -uNr apt-0.6.40.1/dselect/setup apt-0.6.40.1-new/dselect/setup
---- apt-0.6.40.1/dselect/setup 2005-08-05 05:58:35.000000000 -0400
-+++ apt-0.6.40.1-new/dselect/setup 2005-08-29 17:30:29.000000000 -0400
+--- apt-0.6.41/dselect/setup 2005-08-01 12:05:41.000000000 -0400
++++ apt-0.6.41-new/dselect/setup 2005-09-09 12:30:36.000000000 -0400
@@ -23,15 +23,17 @@
my $vardir=$ARGV[0];
my $method=$ARGV[1];
@@ -1186,9 +1150,8 @@
my $answer = <STDIN>;
chomp ($answer);
$answer =~ s/\s+/ /og;
-diff -uNr apt-0.6.40.1/dselect/update apt-0.6.40.1-new/dselect/update
---- apt-0.6.40.1/dselect/update 2005-08-05 05:58:35.000000000 -0400
-+++ apt-0.6.40.1-new/dselect/update 2005-08-29 17:30:29.000000000 -0400
+--- apt-0.6.41/dselect/update 2005-08-01 12:05:43.000000000 -0400
++++ apt-0.6.41-new/dselect/update 2005-09-09 12:30:36.000000000 -0400
@@ -7,13 +7,13 @@
# Get the configuration from /etc/apt/apt.conf
CLEAN="prompt"
@@ -1207,9 +1170,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.40.1/methods/makefile apt-0.6.40.1-new/methods/makefile
---- apt-0.6.40.1/methods/makefile 2005-08-05 06:28:00.000000000 -0400
-+++ apt-0.6.40.1-new/methods/makefile 2005-08-29 17:30:29.000000000 -0400
+--- apt-0.6.41/methods/makefile 2005-08-19 04:04:07.000000000 -0400
++++ apt-0.6.41-new/methods/makefile 2005-09-09 12:30:36.000000000 -0400
@@ -7,61 +7,61 @@
BIN := $(BIN)/methods
@@ -1281,9 +1243,8 @@
LIB_MAKES = apt-pkg/makefile
SOURCE = rsh.cc
include $(PROGRAM_H)
-diff -uNr apt-0.6.40.1/methods/rfc2553emu.h
apt-0.6.40.1-new/methods/rfc2553emu.h
---- apt-0.6.40.1/methods/rfc2553emu.h 2005-08-05 05:58:35.000000000 -0400
-+++ apt-0.6.40.1-new/methods/rfc2553emu.h 2005-08-29 17:30:29.000000000
-0400
+--- apt-0.6.41/methods/rfc2553emu.h 2005-08-01 12:05:41.000000000 -0400
++++ apt-0.6.41-new/methods/rfc2553emu.h 2005-09-09 12:30:37.000000000
-0400
@@ -26,6 +26,11 @@
#include <sys/types.h>
#include <sys/socket.h>
@@ -1315,9 +1276,8 @@
#define sockaddr_storage sockaddr_in
#endif
-diff -uNr apt-0.6.40.1/patch_flush apt-0.6.40.1-new/patch_flush
---- apt-0.6.40.1/patch_flush 1969-12-31 19:00:00.000000000 -0500
-+++ apt-0.6.40.1-new/patch_flush 2005-08-29 17:30:29.000000000 -0400
+--- apt-0.6.41/patch_flush 1969-12-31 19:00:00.000000000 -0500
++++ apt-0.6.41-new/patch_flush 2005-09-09 12:30:37.000000000 -0400
@@ -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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- apt.info 20 Aug 2005 15:43:27 -0000 1.5
+++ apt.info 12 Sep 2005 18:07:04 -0000 1.6
@@ -1,12 +1,14 @@
Package: apt
-Version: 0.6.40.1
+Version: 0.6.41
Revision: 1
GCC: 3.3
Depends: apt0.6.40-shlibs (>= %v-%r)
BuildDepends: fink-prebinding, libiconv-dev, libgettext3-dev
Source: mirror:sourceforge:fink/%n_%v.tar.gz
-Source-MD5: b07f9b50c56e8870f43fe44ed5290429
+Source-MD5: e2b3b7efa18819697b98bc331be5d753
SourceDirectory: %n-%v
+Source2: http://downloads.sleepycat.com/db-4.3.28.tar.gz
+Source2-MD5: e27759537db6054b31d8cb3e99ba6fbb
PatchScript: <<
#!/bin/sh -ex
DISTRIBUTION=`grep -i -E '^Distribution:' %p/etc/fink.conf | awk '{ print $2
}'`
@@ -21,6 +23,13 @@
CompileScript: <<
#!/bin/sh -ex
+ pushd ../db-4.3.28/build_unix
+ LIBS="" CXXFLAGS="" F77=no ../dist/configure --enable-static=yes
--enable-shared=no
+ make libdb.a
+ popd
+
+ export CPPFLAGS="-I`pwd`/db-4.3.28/build_unix"
+ export LDFLAGS="-L`pwd`/db-4.3.28/build_unix"
./configure %c
make -f makefile.wrap NOISY=1 GLIBC_VER= LIBSTDCPP_VER= INTLLIBS="-L%p/lib
-lintl"
<<
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
