Update of /cvsroot/fink/dists/10.2/stable/main/finkinfo/base
In directory sc8-pr-cvs1:/tmp/cvs-serv8751
Added Files:
anacron-2.3-4.info anacron-2.3-4.patch apt-0.5.4-8.info
apt-0.5.4-8.patch debianutils-1.23-1.info
debianutils-1.23-1.patch dpkg-1.10.9-2.info
dpkg-1.10.9-2.patch ncurses-5.2-9.info ncurses-5.2-9.patch
Removed Files:
anacron-2.3-3.info anacron-2.3-3.patch apt-0.5.4-6.info
apt-0.5.4-6.patch apt-0.5.4-7.info apt-0.5.4-7.patch
debianutils-1.16-1.info debianutils-1.16-1.patch
ncurses-5.2-8.info ncurses-5.2-8.patch
Log Message:
sync with unstable (TODO: updated this in the fink CVS module, too; and update
dpkg-bootstrap; also, mirror the dpkg 1.10.9 source!
--- NEW FILE: anacron-2.3-4.info ---
Package: anacron
Version: 2.3
Revision: 4
Description: Periodic command scheduler
License: GPL
Maintainer: Christian Swinehart <[EMAIL PROTECTED]>
Provides: cron-service
Depends: daemonic, debianutils
Conflicts: cron-service
Source: mirror:sourceforge:anacron/%n-%v.tar.gz
Source-MD5: 865cc1dfe1ed75c470d3e6de13763f03
SetCPPFLAGS: -no-cpp-precomp -I.
PatchScript: sed 's|@PREFIX@|%p|g' <%a/%f.patch | patch -p1
CompileScript: make PREFIX=%p
InstallScript: <<
make install PREFIX=%i
mkdir -p %i/sbin
install -m 755 update-anacron %i/sbin/
mkdir -p %i/etc
install -m 644 anacrontab.fink %i/etc/anacrontab
mkdir -p %i/etc/cron.daily
install -m 755 0anacron.daily %i/etc/cron.daily/0anacron
mkdir -p %i/etc/cron.weekly
install -m 755 0anacron.weekly %i/etc/cron.weekly/0anacron
mkdir -p %i/etc/cron.monthly
install -m 755 0anacron.monthly %i/etc/cron.monthly/0anacron
<<
DocFiles: COPYING README README.Fink
ConfFiles: %p/etc/anacrontab
DaemonicName: anacron
DaemonicFile: <<
<service>
<description>Anacron</description>
<message>anac(h)ronistic cron: anacron</message>
<daemon name="anacron">
<executable background="true">%p/sbin/anacron</executable>
<parameters> -s</parameters>
<configfile>%p/etc/anacrontab</configfile>
</daemon>
</service>
<<
PostInstScript: update-anacron postinst
PreRmScript: <<
if [ $1 != "upgrade" ]; then
daemonic remove anacron
cat /etc/crontab | grep -v "%p/sbin/anacron" > /etc/a_very_temporary_crontab
mv /etc/a_very_temporary_crontab /etc/crontab
rm -f %p/var/spool/anacron/*
fi
<<
DescDetail: Anacron executes commands at intervals specified in days
Unlike cron, it does not assume that the system is running continuously.
It's ideal for machines such as laptops
DescPort: Anacron expects to be able to find the obstack macros from the
GNU C Library. Since that doesn't really apply on OS X, I've just added the
obstack.[ch] files to the build directory. Also, I created a default anacrontab
file that could be used for switching standard system tasks to run via anacron
rather than cron.
DescUsage: <<
It is very important that you read the README files in the docs folder
if you plan to add any scheduled tasks. Note that the anacrontab file format
is different from that used in the standard crontab. Consult the manual page
for anacrontab.5 for details.
Fink Developer Note:
If your package requires some sort of recurring activity, you can add a
script to the <fink prefix>/etc/cron.{daily,weekly,monthly} directory.
See the run-parts(8) manpage for the structure of these scripts.
<<
Homepage: http://sourceforge.net/projects/anacron
--- NEW FILE: anacron-2.3-4.patch ---
diff -u -Naur anacron-2.3/0anacron.daily anacron-2.3.fink/0anacron.daily
--- anacron-2.3/0anacron.daily Wed Dec 31 19:00:00 1969
+++ anacron-2.3.fink/0anacron.daily Tue Nov 19 15:01:20 2002
@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+# anacron's cron script
+#
+# This script updates anacron time stamps. It is called through run-parts
+# either by anacron itself or by cron.
+#
+# The script is called "0anacron" to assure that it will be executed
+# _before_ all other scripts.
+
+test -x @PREFIX@/sbin/anacron || exit 0
+anacron -u cron.daily
diff -u -Naur anacron-2.3/0anacron.monthly anacron-2.3.fink/0anacron.monthly
--- anacron-2.3/0anacron.monthly Wed Dec 31 19:00:00 1969
+++ anacron-2.3.fink/0anacron.monthly Tue Nov 19 15:01:20 2002
[...1546 lines suppressed...]
+ answer=`echo $answer | sed 's/^[yY].*$/y/'`
+ if [ "x$answer" = "xy" ]; then
+ # Remove anacron from /etc/crontab
+ cat /etc/crontab | grep -v "$PREFIX/sbin/anacron" >
+/etc/a_very_temporary_crontab
+ mv /etc/a_very_temporary_crontab /etc/crontab
+ daemonic disable anacron
+ echo
+ echo "Removed anacron from task schedule."
+ else
+ echo
+ echo "No changes made. Anacron will still be run automatically"
+ fi
+fi
+
+
+
+
+
+exit 0
+
--- NEW FILE: apt-0.5.4-8.info ---
Package: apt
Version: 0.5.4
Revision: 8
GCC: 3.1
Depends: %N-shlibs (= %v-%r)
Source: mirror:sourceforge:fink/%n_%v.tar.gz
Source-MD5: 274fb64e2e67318b4c9c94599785c37d
SourceDirectory: %n-%v
PatchScript: <<
sed 's|@PREFIX@|%p|g' <%a/%f.patch | patch -p1
if [ "%p" = "/sw" ]; then cat sources.list.fink-bindist >>sources.list.fink ; fi
sh patch_flush
<<
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
SetCXXFLAGS: -O2 -DEMULATE_MMAP -fno-rtti -D__USE_MISC
CompileScript: <<
./configure %c
make -f makefile.wrap
<<
InstallScript: <<
mkdir -p %i/bin
install -m 755 bin/apt-cache %i/bin/
install -m 755 bin/apt-cdrom %i/bin/
install -m 755 bin/apt-config %i/bin/
install -m 755 bin/apt-extracttemplates %i/bin/
install -m 755 bin/apt-get %i/bin/
install -m 755 bin/apt-sortpkgs %i/bin/
mkdir -p %i/lib
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
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
mkdir -p %i/lib/apt/methods
install -m 755 bin/methods/cdrom %i/lib/apt/methods/
install -m 755 bin/methods/copy %i/lib/apt/methods/
install -m 755 bin/methods/file %i/lib/apt/methods/
install -m 755 bin/methods/ftp %i/lib/apt/methods/
install -m 755 bin/methods/gzip %i/lib/apt/methods/
install -m 755 bin/methods/http %i/lib/apt/methods/
install -m 755 bin/methods/rsh %i/lib/apt/methods/
cd %i/lib/apt/methods && ln -s rsh ssh
mkdir -p %i/lib/dpkg/methods/apt
install -m 644 scripts/dselect/desc.apt %i/lib/dpkg/methods/apt/
install -m 755 scripts/dselect/install %i/lib/dpkg/methods/apt/
install -m 644 scripts/dselect/names %i/lib/dpkg/methods/apt/
install -m 755 scripts/dselect/setup %i/lib/dpkg/methods/apt/
install -m 755 scripts/dselect/update %i/lib/dpkg/methods/apt/
mkdir -p %i/include/apt-pkg
cp include/apt-pkg/*.h %i/include/apt-pkg/
mkdir -p %i/share/man
mkdir -p %i/share/man/man1
mkdir -p %i/share/man/man5
mkdir -p %i/share/man/man8
install -m 644 doc/apt.8 %i/share/man/man8/
install -m 644 docs/apt-cache.8 %i/share/man/man8/
install -m 644 docs/apt-cdrom.8 %i/share/man/man8/
install -m 644 docs/apt-config.8 %i/share/man/man8/
install -m 644 docs/apt-extracttemplates.1 %i/share/man/man1/
install -m 644 docs/apt-get.8 %i/share/man/man8/
install -m 644 docs/apt-sortpkgs.1 %i/share/man/man1/
install -m 644 docs/apt.conf.5 %i/share/man/man5/
install -m 644 docs/apt_preferences.5 %i/share/man/man5/
install -m 644 docs/sources.list.5 %i/share/man/man5/
mkdir -p %i/etc/apt/apt.conf.d
install -m 644 sources.list.fink %i/etc/apt/sources.list
mkdir -p %i/var/cache/apt/archives/partial
mkdir -p %i/var/lib/apt/lists/partial
<<
SplitOff: <<
Package: %N-shlibs
Depends: dpkg
Replaces: %N (<= 0.5.4-1)
Files: lib/libapt-inst.1.0.0.dylib lib/libapt-pkg.3.2.0.dylib
lib/libapt-inst.1.0.dylib lib/libapt-pkg.3.2.dylib
Shlibs: <<
%p/lib/libapt-inst.1.0.dylib 1.0.0 %n (>= 0.5.4-5)
%p/lib/libapt-pkg.3.2.dylib 3.2.0 %n (>= 0.5.4-5)
<<
DocFiles: COPYING* AUTHORS
<<
SplitOff2: <<
Package: %N-dev
Depends: %N-shlibs (= %v-%r)
BuildDependsOnly: true
Files: lib/libapt-inst.dylib lib/libapt-pkg.dylib include
DocFiles: COPYING* AUTHORS
<<
DocFiles: COPYING* AUTHORS
ConfFiles: %p/etc/apt/sources.list
PostInstScript: <<
if [ ! -f %p/var/lib/dpkg/cmethopt ]; then
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
fi
rm -f %p/var/cache/apt/pkgcache.bin %p/var/cache/apt/srcpkgcache.bin
perl -pi -e 's#direct_download (release|current)#direct_download 10.2/$1#g'
%p/etc/apt/sources.list
<<
#
Description: Advanced front-end for dpkg
DescPort: <<
There are three troublemakers when porting apt:
- It was written for Linux/ELF/glibc.
- It was written to maintain a distribution that is in charge of the
system and hardcodes paths like /usr/bin, /usr/lib and /var/lib.
- There is no install target in the Makefiles because the Debian
packaging files take care of what goes where.
There's also the usual trouble like not recognizing Darwin and
depending on a case-sensitive file system. All of this amounts to a
big, bad patch.
The patch also fixes some potential and some real crashing bugs.
Oh, one more thing: mmap() is broken for non-trivial uses in OS X
10.1. Luckily apt uses a wrapper class that can be equipped with a
workaround (malloc() + read() + write()...).
The -fno-rtti works around a bug in GCC 3.1 on Jaguar.
Ben Hines - added patch to make apt recognize macosx and darwin pkgs
<<
DescPackaging: Previous versions by Christoph Pfisterer.
License: GPL
Maintainer: Max Horn <[EMAIL PROTECTED]>
Homepage: http://packages.qa.debian.org/a/apt.html
--- NEW FILE: apt-0.5.4-8.patch ---
diff -ruN apt-0.5.4/apt-pkg/contrib/mmap.cc apt-0.5.4-patched/apt-pkg/contrib/mmap.cc
--- apt-0.5.4/apt-pkg/contrib/mmap.cc Sun May 27 07:19:30 2001
+++ apt-0.5.4-patched/apt-pkg/contrib/mmap.cc Fri Oct 19 10:18:27 2001
@@ -41,7 +41,7 @@
// ---------------------------------------------------------------------
/* */
MMap::MMap(FileFd &F,unsigned long Flags) : Flags(Flags), iSize(0),
- Base(0)
+ Base(0), iFd(0)
{
if ((Flags & NoImmMap) != NoImmMap)
Map(F);
@@ -51,7 +51,7 @@
// ---------------------------------------------------------------------
/* */
MMap::MMap(unsigned long Flags) : Flags(Flags), iSize(0),
- Base(0)
+ Base(0), iFd(0)
{
}
/*}}}*/
@@ -68,6 +68,7 @@
/* */
bool MMap::Map(FileFd &Fd)
{
+ iFd = &Fd;
iSize = Fd.Size();
// Set the permissions.
@@ -81,10 +82,19 @@
if (iSize == 0)
return _error->Error(_("Can't mmap an empty file"));
+#ifndef EMULATE_MMAP
// Map it.
Base = mmap(0,iSize,Prot,Map,Fd.Fd(),0);
if (Base == (void *)-1)
return _error->Errno("mmap",_("Couldn't make mmap of %lu bytes"),iSize);
+#else
+ Base = new unsigned char[iSize];
+ if (Base == NULL)
+ return _error->Errno("mmap",_("Couldn't allocate %lu bytes to emulate
+mmap"),iSize);
+
+ Fd.Seek(0);
+ Fd.Read(Base, iSize, true);
+#endif
return true;
}
@@ -99,9 +109,17 @@
if (DoSync == true)
Sync();
-
+
+#ifndef EMULATE_MMAP
if (munmap((char *)Base,iSize) != 0)
_error->Warning("Unable to munmap");
+#else
+ if ((Flags & ReadOnly) != ReadOnly && iFd != 0) {
+ iFd->Seek(0);
+ iFd->Write(Base, iSize);
+ }
+ delete [] (unsigned char *)Base;
+#endif
iSize = 0;
Base = 0;
@@ -117,11 +135,13 @@
if ((Flags & UnMapped) == UnMapped)
return true;
+#ifndef EMULATE_MMAP
#ifdef _POSIX_SYNCHRONIZED_IO
if ((Flags & ReadOnly) != ReadOnly)
if (msync((char *)Base,iSize,MS_SYNC) != 0)
return _error->Errno("msync","Unable to write mmap");
#endif
+#endif
return true;
}
/*}}}*/
@@ -133,11 +153,13 @@
if ((Flags & UnMapped) == UnMapped)
return true;
+#ifndef EMULATE_MMAP
#ifdef _POSIX_SYNCHRONIZED_IO
unsigned long PSize = sysconf(_SC_PAGESIZE);
if ((Flags & ReadOnly) != ReadOnly)
if (msync((char *)Base+(int)(Start/PSize)*PSize,Stop - Start,MS_SYNC) != 0)
return _error->Errno("msync","Unable to write mmap");
+#endif
#endif
return true;
}
diff -ruN apt-0.5.4/apt-pkg/contrib/mmap.h apt-0.5.4-patched/apt-pkg/contrib/mmap.h
--- apt-0.5.4/apt-pkg/contrib/mmap.h Mon May 14 07:16:43 2001
+++ apt-0.5.4-patched/apt-pkg/contrib/mmap.h Fri Oct 19 10:18:40 2001
@@ -46,6 +46,7 @@
unsigned long Flags;
unsigned long iSize;
void *Base;
+ FileFd *iFd;
bool Map(FileFd &Fd);
bool Close(bool DoSync = true);
diff -ruN apt-0.5.4/apt-pkg/deb/debindexfile.cc
apt-0.5.4-patched/apt-pkg/deb/debindexfile.cc
--- apt-0.5.4/apt-pkg/deb/debindexfile.cc Sun Apr 29 07:13:51 2001
+++ apt-0.5.4-patched/apt-pkg/deb/debindexfile.cc Fri Oct 19 10:19:11 2001
@@ -505,3 +505,11 @@
}
/*}}}*/
+void init_deb2()
+{
+ (void)_apt_DebType;
+ (void)_apt_DebSrcType;
+ (void)_apt_Src;
+ (void)_apt_Pkg;
+ (void)_apt_Status;
+}
diff -ruN apt-0.5.4/apt-pkg/deb/debversion.cc
apt-0.5.4-patched/apt-pkg/deb/debversion.cc
--- apt-0.5.4/apt-pkg/deb/debversion.cc Mon May 7 07:14:53 2001
+++ apt-0.5.4-patched/apt-pkg/deb/debversion.cc Fri Oct 19 10:20:59 2001
@@ -24,6 +24,11 @@
debVersioningSystem debVS;
+void init_deb3()
+{
+ (void)debVS;
+}
+
// debVS::debVersioningSystem - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
diff -ruN apt-0.5.4/apt-pkg/init.cc apt-0.5.4-patched/apt-pkg/init.cc
--- apt-0.5.4/apt-pkg/init.cc Tue Mar 13 07:51:46 2001
+++ apt-0.5.4-patched/apt-pkg/init.cc Fri Oct 19 10:22:23 2001
@@ -15,6 +15,8 @@
#include <apti18n.h>
#include <config.h>
#include <sys/stat.h>
+
+extern void initDebSystem();
/*}}}*/
#define Stringfy_(x) # x
@@ -39,7 +41,7 @@
Cnf.Set("APT::Architecture",COMMON_CPU);
else
Cnf.Set("APT::Architecture",COMMON_OS "-" COMMON_CPU);
- Cnf.Set("Dir","/");
+ Cnf.Set("Dir","@PREFIX@/");
// State
Cnf.Set("Dir::State","var/lib/apt/");
@@ -68,7 +70,7 @@
Cnf.Set("Dir::Etc::main","apt.conf");
Cnf.Set("Dir::Etc::parts","apt.conf.d");
Cnf.Set("Dir::Etc::preferences","preferences");
- Cnf.Set("Dir::Bin::methods","/usr/lib/apt/methods");
+ Cnf.Set("Dir::Bin::methods","@PREFIX@/lib/apt/methods");
bool Res = true;
@@ -101,6 +103,8 @@
/* */
bool pkgInitSystem(Configuration &Cnf,pkgSystem *&Sys)
{
+ initDebSystem();
+
Sys = 0;
string Label = Cnf.Find("Apt::System","");
if (Label.empty() == false)
diff -ruN apt-0.5.4/apt-pkg/tagfile.cc apt-0.5.4-patched/apt-pkg/tagfile.cc
--- apt-0.5.4/apt-pkg/tagfile.cc Mon May 14 07:56:26 2001
+++ apt-0.5.4-patched/apt-pkg/tagfile.cc Fri Oct 19 10:26:32 2001
@@ -197,7 +197,7 @@
return false;
TagCount = 0;
- while (TagCount < sizeof(Indexes)/sizeof(Indexes[0]) && Stop < End)
+ while (TagCount+1 < sizeof(Indexes)/sizeof(Indexes[0]) && Stop < End)
{
// Start a new index and add it to the hash
if (isspace(Stop[0]) == 0)
@@ -211,13 +211,13 @@
if (Stop == 0)
return false;
- for (; Stop[1] == '\r' && Stop+1 < End; Stop++);
+ for (; Stop+1 < End && Stop[1] == '\r'; Stop++);
// Double newline marks the end of the record
if (Stop+1 < End && Stop[1] == '\n')
{
Indexes[TagCount] = Stop - Section;
- for (; (Stop[0] == '\n' || Stop[0] == '\r') && Stop < End; Stop++);
+ for (; Stop < End && (Stop[0] == '\n' || Stop[0] == '\r'); Stop++);
return true;
}
diff -ruN apt-0.5.4/apt-pkg/tagfile.h apt-0.5.4-patched/apt-pkg/tagfile.h
--- apt-0.5.4/apt-pkg/tagfile.h Sun Apr 22 07:42:52 2001
+++ apt-0.5.4-patched/apt-pkg/tagfile.h Fri Oct 19 10:25:33 2001
@@ -34,7 +34,7 @@
// We have a limit of 256 tags per section.
unsigned short Indexes[256];
- unsigned short AlphaIndexes[0xff];
+ unsigned short AlphaIndexes[0x100];
unsigned int TagCount;
diff -ruN apt-0.5.4/buildlib/library.mak apt-0.5.4-patched/buildlib/library.mak
--- apt-0.5.4/buildlib/library.mak Tue Feb 27 05:16:05 2001
+++ apt-0.5.4-patched/buildlib/library.mak Fri Oct 19 10:13:28 2001
@@ -15,17 +15,17 @@
# See defaults.mak for information about LOCAL
# Some local definitions
-LOCAL := lib$(LIBRARY)$(LIBEXT).so.$(MAJOR).$(MINOR)
+LOCAL := lib$(LIBRARY)$(LIBEXT).$(MAJOR).$(MINOR).dylib
$(LOCAL)-OBJS := $(addprefix $(OBJ)/,$(addsuffix .opic,$(notdir $(basename
$(SOURCE)))))
$(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)-SLIBS := $(SLIBS)
$(LOCAL)-LIBRARY := $(LIBRARY)
# Install the command hooks
headers: $($(LOCAL)-HEADERS)
-library: $(LIB)/lib$(LIBRARY).so $(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR)
+library: $(LIB)/lib$(LIBRARY).dylib $(LIB)/lib$(LIBRARY)$(LIBEXT).$(MAJOR).dylib
clean: clean/$(LOCAL)
veryclean: veryclean/$(LOCAL)
@@ -37,21 +37,23 @@
clean/$(LOCAL):
-rm -f $($(@F)-OBJS) $($(@F)-DEP)
veryclean/$(LOCAL): clean/$(LOCAL)
- -rm -f $($(@F)-HEADERS) $(LIB)/lib$($(@F)-LIBRARY)*.so*
+ -rm -f $($(@F)-HEADERS) $(LIB)/lib$($(@F)-LIBRARY)*.dylib
# Build rules for the two symlinks
-.PHONY: $(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR) $(LIB)/lib$(LIBRARY).so
-$(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR):
$(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR).$(MINOR)
+.PHONY: $(LIB)/lib$(LIBRARY)$(LIBEXT).$(MAJOR).dylib $(LIB)/lib$(LIBRARY).dylib
+$(LIB)/lib$(LIBRARY)$(LIBEXT).$(MAJOR).dylib:
+$(LIB)/lib$(LIBRARY)$(LIBEXT).$(MAJOR).$(MINOR).dylib
ln -sf $(<F) $@
-$(LIB)/lib$(LIBRARY).so: $(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR).$(MINOR)
+$(LIB)/lib$(LIBRARY).dylib: $(LIB)/lib$(LIBRARY)$(LIBEXT).$(MAJOR).$(MINOR).dylib
ln -sf $(<F) $@
# The binary build rule
-$(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR).$(MINOR): $($(LOCAL)-HEADERS)
$($(LOCAL)-OBJS)
- -rm -f $(LIB)/lib$($(@F)-LIBRARY)*.so* 2> /dev/null
+$(LIB)/lib$(LIBRARY)$(LIBEXT).$(MAJOR).$(MINOR).dylib: $($(LOCAL)-HEADERS)
+$($(LOCAL)-OBJS)
+ -rm -f $(LIB)/lib$($(@F)-LIBRARY)*.dylib 2> /dev/null
echo Building shared library $@
$(CXX) $(CXXFLAGS) $(LDFLAGS) $(PICFLAGS) $(LFLAGS) $(LFLAGS_SO)\
- -o $@ $(SONAME_MAGIC)$($(@F)-SONAME) -shared \
+ -o $@ $(SONAME_MAGIC)$($(@F)-SONAME) \
+ -compatibility_version $(MAJOR).$(MINOR) \
+ -current_version $(MAJOR).$(MINOR) \
$(filter %.opic,$^) \
$($(@F)-SLIBS)
diff -ruN apt-0.5.4/buildlib/ostable apt-0.5.4-patched/buildlib/ostable
--- apt-0.5.4/buildlib/ostable Tue Feb 20 08:03:17 2001
+++ apt-0.5.4-patched/buildlib/ostable Fri Oct 19 10:13:28 2001
@@ -14,6 +14,7 @@
hp-hpux[^-]* hp-ux
sun-solaris[^-]* solaris
[^-]*-openbsd[^-]* openbsd
+[^-]*-darwin[^-]* darwin
# Catch all
.* unknown
diff -ruN apt-0.5.4/cmdline/apt-cache.cc apt-0.5.4-patched/cmdline/apt-cache.cc
--- apt-0.5.4/cmdline/apt-cache.cc Mon Jul 2 02:10:32 2001
+++ apt-0.5.4-patched/cmdline/apt-cache.cc Fri Oct 19 10:13:28 2001
@@ -374,8 +374,10 @@
if (ReadPinFile(Plcy) == false)
return false;
- pkgCache::VerFile **VFList = new pkgCache::VerFile *[Cache.HeaderP->PackageCount];
- memset(VFList,0,sizeof(*VFList)*Cache.HeaderP->PackageCount);
+ // Make sure we have a sentinel for the list.
+ unsigned long Count = Cache.HeaderP->PackageCount+1;
+ pkgCache::VerFile **VFList = new pkgCache::VerFile *[Count];
+ memset(VFList,0,sizeof(*VFList)*Count);
// Map versions that we want to write out onto the VerList array.
for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++)
@@ -428,7 +430,7 @@
VFList[P->ID] = VF;
}
- LocalitySort(VFList,Cache.HeaderP->PackageCount,sizeof(*VFList));
+ LocalitySort(VFList,Count,sizeof(*VFList));
// Iterate over all the package files and write them out.
char *Buffer = new char[Cache.HeaderP->MaxVerFileSize+10];
diff -ruN apt-0.5.4/cmdline/apt-get.cc apt-0.5.4-patched/cmdline/apt-get.cc
--- apt-0.5.4/cmdline/apt-get.cc Mon Jul 2 00:59:04 2001
+++ apt-0.5.4-patched/cmdline/apt-get.cc Fri Oct 19 10:13:28 2001
@@ -113,6 +113,8 @@
return true;
}
+ fflush(NULL);
+
char C = 0;
char Jnk = 0;
if (read(STDIN_FILENO,&C,1) != 1)
diff -ruN apt-0.5.4/configure apt-0.5.4-patched/configure
--- apt-0.5.4/configure Sun Aug 19 02:46:43 2001
+++ apt-0.5.4-patched/configure Fri Oct 19 10:13:28 2001
@@ -2394,7 +2394,7 @@
ac_given_srcdir=$srcdir
-trap 'rm -fr `echo "environment.mak:buildlib/environment.mak.in
makefile:buildlib/makefile.in include/config.h:buildlib/config.h.in
include/apti18n.h:buildlib/apti18n.h.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "environment.mak:buildlib/environment.mak.in
+makefile.wrap:buildlib/makefile.in include/config.h:buildlib/config.h.in
+include/apti18n.h:buildlib/apti18n.h.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2
+15
EOF
cat >> $CONFIG_STATUS <<EOF
@@ -2504,7 +2504,7 @@
cat >> $CONFIG_STATUS <<EOF
-CONFIG_FILES=\${CONFIG_FILES-"environment.mak:buildlib/environment.mak.in
makefile:buildlib/makefile.in"}
+CONFIG_FILES=\${CONFIG_FILES-"environment.mak:buildlib/environment.mak.in
+makefile.wrap:buildlib/makefile.in"}
EOF
cat >> $CONFIG_STATUS <<\EOF
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
@@ -2670,7 +2670,7 @@
EOF
cat >> $CONFIG_STATUS <<\EOF
-make -s dirs
+make -f makefile.wrap -s dirs
exit 0
EOF
chmod +x $CONFIG_STATUS
diff -ruN apt-0.5.4/configure.in apt-0.5.4-patched/configure.in
--- apt-0.5.4/configure.in Mon Jun 18 07:56:32 2001
+++ apt-0.5.4-patched/configure.in Fri Oct 19 10:13:28 2001
@@ -163,4 +163,4 @@
rc_LIBSTDCPP_VER
ah_GCC3DEP
-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 -ruN apt-0.5.4/dselect/install apt-0.5.4-patched/dselect/install
--- apt-0.5.4/dselect/install Tue Feb 20 08:03:17 2001
+++ apt-0.5.4-patched/dselect/install Fri Oct 19 10:13:28 2001
@@ -3,8 +3,8 @@
# Get the configuration from /etc/apt/apt.conf
CLEAN="prompt"
OPTS="-f"
-APTGET="/usr/bin/apt-get"
-DPKG="/usr/bin/dpkg"
+APTGET="@PREFIX@/bin/apt-get"
+DPKG="@PREFIX@/bin/dpkg"
DPKG_OPTS="--admindir=$1"
APT_OPT0="-oDir::State::status=$1/status"
APT_OPT1="-oDPkg::Options::=$DPKG_OPTS"
diff -ruN apt-0.5.4/dselect/setup apt-0.5.4-patched/dselect/setup
--- apt-0.5.4/dselect/setup Thu Jan 27 05:15:10 2000
+++ apt-0.5.4-patched/dselect/setup Fri Oct 19 10:32:00 2001
@@ -23,15 +23,17 @@
my $vardir=$ARGV[0];
my $method=$ARGV[1];
my $option=$ARGV[2];
-my $config_file = '/etc/apt/sources.list';
+my $config_file = '@PREFIX@/etc/apt/sources.list';
-my $boldon=`setterm -bold on`;
-my $boldoff=`setterm -bold off`;
+my $boldon=`setterm -bold on 2>/dev/null`;
+my $boldoff=`setterm -bold off 2>/dev/null`;
+$boldon = "" unless defined $boldon;
+$boldoff = "" unless defined $boldon;
my @known_types = ('deb');
my @known_access = ('http', 'ftp', 'file');
-my @typical_distributions = ('stable', 'unstable', 'frozen', 'non-US');
-my @typical_components = ('main', 'contrib', 'non-free');
+my @typical_distributions = ('release', 'current');
+my @typical_components = ('main', 'crypto');
my %known_access = map {($_,$_)} @known_access;
my %typical_distributions = map {($_,$_)} @typical_distributions;
@@ -118,9 +120,9 @@
}
$type = 'deb';
- $urn = "http://http.us.debian.org/debian"; unless $urn;
- $distribution = "stable" unless $distribution;
- $components = "main contrib non-free" unless $components;
+ $urn = "http://us.dl.sourceforge.net/fink/direct_download"; unless $urn;
+ $distribution = "release" unless $distribution;
+ $components = "main" unless $components;
$rec->{'Type'} = 'deb';
@@ -222,19 +224,13 @@
print "\t$boldon Set up a list of distribution source locations $boldoff \n";
print "\n";
- print " Please give the base URL of the debian distribution.\n";
+ print " Please give the base URL of the Fink distribution.\n";
print " The access schemes I know about are:$boldon ";
print join (' ', @known_access), "$boldoff\n";
-# print " The mirror scheme is special that it does not specify the\n";
-# print " location of a debian archive but specifies the location\n";
-# print " of a list of mirrors to use to access the archive.\n";
print "\n";
print " For example:\n";
- print " file:/mnt/debian,\n";
- print " ftp://ftp.debian.org/debian,\n";;
- print " http://ftp.de.debian.org/debian,\n";;
-# print " and the special mirror scheme,\n";
-# print " mirror:http://www.debian.org/archivemirrors \n";
+ print " file:/sw/fink,\n";
+ print " http://us.dl.sourceforge.net/fink/direct_download\n";;
print "\n";
my $index = 0;
diff -ruN apt-0.5.4/dselect/update apt-0.5.4-patched/dselect/update
--- apt-0.5.4/dselect/update Tue Mar 13 02:45:36 2001
+++ apt-0.5.4-patched/dselect/update Fri Oct 19 10:13:28 2001
@@ -4,13 +4,13 @@
# Get the configuration from /etc/apt/apt.conf
CLEAN="prompt"
OPTS="-f"
-APTGET="/usr/bin/apt-get"
-APTCACHE="/usr/bin/apt-cache"
-DPKG="/usr/bin/dpkg"
+APTGET="@PREFIX@/bin/apt-get"
+APTCACHE="@PREFIX@/bin/apt-cache"
+DPKG="@PREFIX@/bin/dpkg"
DPKG_OPTS="--admindir=$1"
APT_OPT0="-oDir::State::status=$1/status"
APT_OPT1="-oDPkg::Options::=$DPKG_OPTS"
-CACHEDIR="/var/cache/apt"
+CACHEDIR="@PREFIX@/var/cache/apt"
PROMPT="false"
RES=`apt-config shell CLEAN DSelect::Clean OPTS DSelect::UpdateOptions \
DPKG Dir::Bin::dpkg/f APTGET Dir::Bin::apt-get/f \
diff -ruN apt-0.5.4/methods/connect.cc apt-0.5.4-patched/methods/connect.cc
--- apt-0.5.4/methods/connect.cc Tue Feb 20 08:03:18 2001
+++ apt-0.5.4-patched/methods/connect.cc Fri Oct 19 10:13:28 2001
@@ -90,7 +90,7 @@
// Check the socket for an error condition
unsigned int Err;
- unsigned int Len = sizeof(Err);
+ int Len = sizeof(Err);
if (getsockopt(Fd,SOL_SOCKET,SO_ERROR,&Err,&Len) != 0)
return _error->Errno("getsockopt","Failed");
diff -ruN apt-0.5.4/methods/ftp.cc apt-0.5.4-patched/methods/ftp.cc
--- apt-0.5.4/methods/ftp.cc Tue May 22 06:02:00 2001
+++ apt-0.5.4-patched/methods/ftp.cc Fri Oct 19 10:13:28 2001
@@ -694,7 +694,7 @@
if (WaitFd(DataFd,true,TimeOut) == false)
return _error->Error("Could not connect data socket, connection timed out");
unsigned int Err;
- unsigned int Len = sizeof(Err);
+ int Len = sizeof(Err);
if (getsockopt(DataFd,SOL_SOCKET,SO_ERROR,&Err,&Len) != 0)
return _error->Errno("getsockopt","Failed");
if (Err != 0)
@@ -739,7 +739,7 @@
// Determine the name to send to the remote
struct sockaddr_storage Addr;
- socklen_t AddrLen = sizeof(Addr);
+ int AddrLen = sizeof(Addr);
if (getsockname(DataListenFd,(sockaddr *)&Addr,&AddrLen) < 0)
return _error->Errno("getsockname","Could not determine the socket's name");
@@ -815,7 +815,7 @@
// Accept the connection
struct sockaddr_in Addr;
- socklen_t Len = sizeof(Addr);
+ int Len = sizeof(Addr);
DataFd = accept(DataListenFd,(struct sockaddr *)&Addr,&Len);
if (DataFd < 0)
return _error->Errno("accept","Unable to accept connection");
diff -ruN apt-0.5.4/methods/ftp.h apt-0.5.4-patched/methods/ftp.h
--- apt-0.5.4/methods/ftp.h Tue Mar 6 08:15:29 2001
+++ apt-0.5.4-patched/methods/ftp.h Fri Oct 19 10:13:28 2001
@@ -26,11 +26,11 @@
// Generic Peer Address
struct sockaddr_storage PeerAddr;
- socklen_t PeerAddrLen;
+ int PeerAddrLen;
// Generic Server Address (us)
struct sockaddr_storage ServerAddr;
- socklen_t ServerAddrLen;
+ int ServerAddrLen;
// Private helper functions
bool ReadLine(string &Text);
diff -ruN apt-0.5.4/methods/rfc2553emu.h apt-0.5.4-patched/methods/rfc2553emu.h
--- apt-0.5.4/methods/rfc2553emu.h Sun Jun 18 08:04:45 2000
+++ apt-0.5.4-patched/methods/rfc2553emu.h Fri Oct 19 10:13:28 2001
@@ -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)
#define HAVE_GETADDRINFO
@@ -36,6 +41,8 @@
#define HAVE_GETNAMEINFO
#endif
+#endif /* __APPLE__ */
+
// getaddrinfo support?
#ifndef HAVE_GETADDRINFO
// Renamed to advoid type clashing.. (for debugging)
@@ -100,6 +107,9 @@
// #define NI_NOFQDN (1<<2)
#define NI_NAMEREQD (1<<3)
#define NI_DATAGRAM (1<<4)
+ #endif
+ #ifndef NI_DATAGRAM
+ #define NI_DATAGRAM NI_DGRAM
#endif
#define sockaddr_storage sockaddr_in
diff -ruN apt-0.5.4/patch_flush apt-0.5.4-patched/patch_flush
--- apt-0.5.4/patch_flush Thu Jan 1 01:00:00 1970
+++ apt-0.5.4-patched/patch_flush Fri Oct 19 10:13:28 2001
@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+
+files=`find . -name '*.cc' -print | xargs grep -l 'flush;'`
+
+for i in $files ; do
+ sed 's/<< flush;/<< flush, fflush(NULL);/g' <$i >$i.tmp
+ mv $i.tmp $i
+done
+
+exit 0
diff -ruN apt-0.5.4/sources.list.fink apt-0.5.4-patched/sources.list.fink
--- apt-0.5.4/sources.list.fink Thu Jan 1 01:00:00 1970
+++ apt-0.5.4-patched/sources.list.fink Fri Oct 19 10:34:29 2001
@@ -0,0 +1,8 @@
+# Default APT sources configuration for Fink
+
+# Local package trees - packages built from source locally
+# NOTE: keep this in sync with the Trees: line in @PREFIX@/etc/fink.conf
+# NOTE: run 'fink scanpackages' to create Packages.gz files
+deb file:@PREFIX@/fink local main
+deb file:@PREFIX@/fink stable main crypto
+#deb file:@PREFIX@/fink unstable main crypto
diff -ruN apt-0.5.4/sources.list.fink-bindist
apt-0.5.4-patched/sources.list.fink-bindist
--- apt-0.5.4/sources.list.fink-bindist Thu Jan 1 01:00:00 1970
+++ apt-0.5.4-patched/sources.list.fink-bindist Fri Oct 19 10:34:54 2001
@@ -0,0 +1,8 @@
+
+# Official binary distribution: download location for packages
+# from the latest release
+deb http://us.dl.sourceforge.net/fink/direct_download 10.2/release main crypto
+
+# Official binary distribution: download location for updated
+# packages built between releases
+deb http://us.dl.sourceforge.net/fink/direct_download 10.2/current main crypto
--- apt-0.5.4/apt-pkg/deb/debsystem.cc 2001-04-28 22:13:51.000000000 -0700
+++ apt-0.5.4/apt-pkg/deb/debsystem.cc 2002-12-11 01:18:39.000000000 -0800
@@ -27,6 +27,105 @@
#include <dirent.h>
#include <errno.h>
/*}}}*/
+/* FINK LOCAL begin */
+#include <sys/utsname.h>
+#include <CoreFoundation/CoreFoundation.h>
+#include <fstream>
+
+extern void init_deb2();
+extern void init_deb3();
+
+struct versionrevision {
+ unsigned long epoch;
+ const char *version;
+ const char *revision;
+};
+
+struct versionrevision darwin_version = {0,NULL,NULL};
+struct versionrevision macosx_version = {0,NULL,NULL};
+
+static void finkinit()
+{
+ Boolean status;
+ SInt32 errorCode;
+ CFURLRef fileURL = NULL;
+ CFDataRef resourceData = NULL;
+ CFPropertyListRef propertyList = NULL;
+ CFStringRef string;
+ static char buffer[256]; // This is static, to ensure the buffer stays around
+
+ static struct utsname ver; // This is static, to ensure the buffer stays around
+
+ /* Determine system version */
+ /* TODO - should maybe check if this is really Darwin? */
+ if (!uname(&ver)) {
+ darwin_version.version = ver.release;
+ }
+
+ /* Check whether this is Mac OS X, and which version of it */
+
+ fileURL = CFURLCreateWithFileSystemPath( NULL,
+ CFSTR("/System/Library/CoreServices/SystemVersion.plist"),
+ kCFURLPOSIXPathStyle,
+ false );
+ if (!fileURL)
+ goto BAIL;
+
+ /* Read the XML */
+ status = CFURLCreateDataAndPropertiesFromResource(
+ NULL,
+ fileURL,
+ &resourceData,
+ NULL,
+ NULL,
+ &errorCode);
+ if (!status || errorCode != 0)
+ goto BAIL;
+
+ /* Reconstitute the dictionary using the XML data. */
+ propertyList = CFPropertyListCreateFromXMLData( NULL,
+ resourceData,
+ kCFPropertyListImmutable,
+ &string);
+ if (!propertyList)
+ goto BAIL;
+
+ /* Try to read the system version from it. */
+ status = CFDictionaryGetValueIfPresent( propertyList,
+ CFSTR("ProductVersion"),
+ (void*)&string);
+ if (!status)
+ goto BAIL;
+
+ /* Convert into a C string */
+ status = CFStringGetCString( string,
+ buffer,
+ sizeof(buffer),
+ kCFStringEncodingISOLatin1);
+ if (!status)
+ goto BAIL;
+
+ /* Finally link the buffer into the macosx_version struct. */
+ macosx_version.version = buffer;
+
+BAIL:
+ // Release all of the CF objects we're responsible for.
+ if (fileURL)
+ CFRelease(fileURL);
+ if (resourceData)
+ CFRelease(resourceData);
+ if (propertyList)
+ CFRelease(propertyList);
+}
+
+void initDebSystem()
+{
+ finkinit();
+ (void)debSys;
+ init_deb2();
+ init_deb3();
+}
+/* FINK LOCAL end */
debSystem debSys;
@@ -48,6 +147,7 @@
debSystem::~debSystem()
{
delete StatusFile;
+ delete FinkStatusFile;
}
/*}}}*/
// System::Lock - Get the lock /*{{{*/
@@ -161,8 +261,8 @@
which is yet to be determined. The functions in pkgcachegen should
be the only users of these */
Cnf.CndSet("Dir::State::userstatus","status.user"); // Defunct
- Cnf.CndSet("Dir::State::status","/var/lib/dpkg/status");
- 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;
}
@@ -185,9 +285,9 @@
signed debSystem::Score(Configuration const &Cnf)
{
signed Score = 0;
- if (FileExists(Cnf.FindFile("Dir::State::status","/var/lib/dpkg/status")) == true)
+ if (FileExists(Cnf.FindFile("Dir::State::status","@PREFIX@/var/lib/dpkg/status"))
+== true)
Score += 10;
- if (FileExists(Cnf.FindFile("Dir::Bin::dpkg","/usr/bin/dpkg")) == true)
+ if (FileExists(Cnf.FindFile("Dir::Bin::dpkg","@PREFIX@/bin/dpkg")) == true)
Score += 10;
if (FileExists("/etc/debian_version") == true)
Score += 10;
@@ -202,6 +302,37 @@
if (StatusFile == 0)
StatusFile = new debStatusIndex(_config->FindFile("Dir::State::status"));
List.push_back(StatusFile);
+/* FINK LOCAL begin */
+#define FINKSTATUSFILE "/tmp/finkaptstatus"
+ if (FinkStatusFile == 0) {
+ unlink(FINKSTATUSFILE);
+ std::ofstream finkstatus(FINKSTATUSFILE);
+ if(macosx_version.version != 0)
+ {
+ finkstatus << "Package: macosx" << endl;
+ finkstatus << "Status: install ok installed" << endl;
+ finkstatus << "Priority: optional" << endl;
+ finkstatus << "Section: base" << endl;
+ finkstatus << "Maintainer: None" << endl;
+ finkstatus << "Source: macosx" << endl;
+ finkstatus << "Version: " << macosx_version.version << endl;
+ finkstatus << "Description: Pseudo package representing Mac OS X" << endl;
+ finkstatus << " Pseudo package representing Mac OS X" << endl << endl;
+ }
+ finkstatus << "Package: darwin" << endl;
+ finkstatus << "Status: install ok installed" << endl;
+ finkstatus << "Priority: optional" << endl;
+ finkstatus << "Section: base" << endl;
+ finkstatus << "Maintainer: None" << endl;
+ finkstatus << "Source: darwin" << endl;
+ finkstatus << "Version: " << darwin_version.version << endl;
+ finkstatus << "Description: Pseudo package representing Darwin" << endl;
+ finkstatus << " Pseudo package representing Darwin" << endl << endl;
+ finkstatus.close();
+ FinkStatusFile = new debStatusIndex(FINKSTATUSFILE);
+ }
+ List.push_back(FinkStatusFile);
+/* FINK LOCAL end */
return true;
}
/*}}}*/
@@ -217,6 +348,10 @@
{
Found = StatusFile;
return true;
+ } else if ((FinkStatusFile != 0) && (FinkStatusFile->FindInCache(*File.Cache())
+== File))
+ {
+ Found = FinkStatusFile;
+ return true;
}
return false;
--- /Users/ben/Desktop/apt-0.5.4/apt-pkg/deb/debsystem.h Sat Apr 28 22:13:51
2001
+++ apt-0.5.4/apt-pkg/deb/debsystem.h Wed Dec 11 02:06:42 2002
@@ -25,6 +25,7 @@
bool CheckUpdates();
debStatusIndex *StatusFile;
+ debStatusIndex *FinkStatusFile;
public:
--- apt-0.5.4/buildlib/environment.mak.in Mon May 28 22:11:03 2001
+++ apt-0.5.4/buildlib/environment.mak.in Tue Dec 10 23:08:35 2002
@@ -11,8 +11,8 @@
LIBSTDCPP_VER = @LIBSTDCPP_VER@
# Linker stuff
-PICFLAGS+= -fPIC -DPIC
-LFLAGS+= @LDFLAGS@
+PICFLAGS+= -fno-common -DPIC
+LFLAGS+= @LDFLAGS@ -framework CoreFoundation
LEFLAGS+=
SOCKETLIBS:= @SOCKETLIBS@
AR:=@AR@
@@ -47,11 +47,13 @@
# Shared library things
HOST_OS = @host_os@
-ifneq ($(words $(filter linux-gnu gnu%,$(HOST_OS))),0)
- SONAME_MAGIC=-Wl,-soname -Wl,
- LFLAGS_SO=
-else
- # Do not know how to create shared libraries here.
- ONLYSTATICLIBS = yes
-endif
+#ifneq ($(words $(filter linux-gnu gnu%,$(HOST_OS))),0)
+# SONAME_MAGIC=-Wl,-soname -Wl,
+# LFLAGS_SO=
+#else
+# # Do not know how to create shared libraries here.
+# ONLYSTATICLIBS = yes
+#endif
+SONAME_MAGIC=-install_name /sw/lib/
+LFLAGS_SO=-dynamiclib -flat_namespace -undefined suppress
--- NEW FILE: debianutils-1.23-1.info ---
Package: debianutils
Version: 1.23
Revision: 1
Essential: true
Description: Misc. utilities specific to Debian (and Fink)
License: GPL
Maintainer: Christian Swinehart <[EMAIL PROTECTED]>
Depends: base-files
Conflicts: mktemp
Replaces: mktemp, tetex
Provides: mktemp
Source: http://www.cs.brandeis.edu/~csw/debianutils_%v.tar.gz
Source-MD5: 232b5bc916a1e2af43fde890f840a304
SourceDirectory: %n-%v
Patch: %f.patch
InstallScript: <<
#!/bin/sh
INSTALL=install
INSTALL_FILE="$INSTALL -p -o root -g admin -m 644"
INSTALL_PROGRAM="$INSTALL -p -o root -g admin -m 755"
INSTALL_SCRIPT="$INSTALL -p -o root -g admin -m 755"
INSTALL_DIR="$INSTALL -p -d -o root -g admin -m 755"
$INSTALL_DIR %i/bin \
%i/sbin \
%i/share/man/man1 \
%i/share/man/man8 \
%i/share/man/fr/man8
$INSTALL_PROGRAM readlink run-parts tempfile mktemp %i/sbin
$INSTALL_SCRIPT which savelog sensible-editor sensible-pager %i/bin
$INSTALL_FILE run-parts.8 savelog.8 %i/share/man/man8
$INSTALL_FILE which.1 tempfile.1 sensible-editor.1 mktemp.1 readlink.1 \
%i/share/man/man1
$INSTALL_FILE savelog.fr.8 %i/share/man/fr/man8/savelog.8
ln -s sensible-editor.1 %i/share/man/man1/sensible-pager.1
<<
DocFiles: debian/copyright debian/changelog
DescDetail: Includes the commands: mktemp, readlink, tempfile, and run-parts
DescPort: Both run-parts and tempfile require the getopt() routines from glibc.
The versions included here come from glibc-2.2.4
Thanks to Justin Hallett for the 1.22.5 port.
Homepage: http://packages.debian.org/unstable/base/debianutils.html
--- NEW FILE: debianutils-1.23-1.patch ---
diff -ruN debianutils-1.22.5.orig/Makefile.am debianutils-1.22.5/Makefile.am
--- debianutils-1.22.5.orig/Makefile.am 2002-11-18 13:36:54.000000000 -0700
+++ debianutils-1.22.5/Makefile.am 2002-11-19 09:35:57.000000000 -0700
@@ -3,5 +3,5 @@
bin_PROGRAMS = mktemp readlink run-parts tempfile
mktemp_SOURCES = mktemp.c
readlink_SOURCES = readlink.c
-run_parts_SOURCES = run-parts.c
-tempfile_SOURCES = tempfile.c
+run_parts_SOURCES = run-parts.c getopt.c getopt1.c
+tempfile_SOURCES = tempfile.c getopt.c getopt1.c
diff -ruN debianutils-1.22.5.orig/Makefile.in debianutils-1.22.5/Makefile.in
--- debianutils-1.22.5.orig/Makefile.in 2002-11-18 14:06:08.000000000 -0700
+++ debianutils-1.22.5/Makefile.in 2002-11-19 09:36:00.000000000 -0700
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
# @configure_input@
[...1794 lines suppressed...]
+ break;
+
+ default:
+ printf ("?? getopt returned character code 0%o ??\n", c);
+ }
+ }
+
+ if (optind < argc)
+ {
+ printf ("non-option ARGV-elements: ");
+ while (optind < argc)
+ printf ("%s ", argv[optind++]);
+ printf ("\n");
+ }
+
+ exit (0);
+}
+
+#endif /* TEST */
Binary files debianutils-1.22.5.orig/getopt1.o and debianutils-1.22.5/getopt1.o differ
--- NEW FILE: dpkg-1.10.9-2.info ---
Package: dpkg
Version: 1.10.9
Revision: 2
GCC: 3.1
Depends: gettext, libiconv, gzip, tar, ncurses
Essential: yes
Maintainer: Max Horn <[EMAIL PROTECTED]>
Source: mirror:debian:pool/main/d/%n/%n_%v.tar.gz
SourceDirectory: %n-%v
#Source: mirror:sourceforge:fink/dpkg-%v.tar.gz
Source-MD5: ecd7d51416837f8910314ccb62e39dc2
PatchScript: sed 's|@PREFIX@|%p|g' <%a/%f.patch | patch -p1
SetCFLAGS: -no-cpp-precomp -I%p/include
CompileScript: <<
./configure powerpc-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/*
<<
Description: The Debian package manager
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.10.9
- Removed --without-zlib flag
- Gets confused about top_srcdir without the --srcdir arg.
- Fixed bug with BR manpage
- Patched update-rc.d out of the app check code, not needed on OS X.
Pre-Jaguar: Needed fixes to use the right architecture, disable code that uses
unimplemented functions on Darwin and other stuff.
Added code to support the pseudo package 'macosx' and 'darwin'.
Fix to install-info script to prevent a certain problem with section titles.
Previous versions by Christoph Pfisterer.
<<
#
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
--- NEW FILE: dpkg-1.10.9-2.patch ---
diff -ru2N dpkg-1.10.9/Makefile.conf.in dpkg-1.10.9-patched/Makefile.conf.in
--- dpkg-1.10.9/Makefile.conf.in Sun Jul 14 16:15:06 2002
+++ dpkg-1.10.9-patched/Makefile.conf.in Sat Dec 7 22:19:02 2002
@@ -61,5 +61,5 @@
CPPFLAGS = @CPPFLAGS@
LD = @LD@
-LDFLAGS = @LDFLAGS@ -L../lib -L../optlib
+LDFLAGS = @LDFLAGS@ -L../lib -L../optlib -framework
+CoreFoundation
LIBS = @LIBS@ -ldpkg -lopt $(ZLIB_LIBS)
@@ -67,5 +67,5 @@
DEFS = @DEFS@ -D_GNU_SOURCE
-INCLUDE_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir)
-I../include -I.. -I. -I$(top_srcdir)/optlib
+INCLUDE_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir)
+-I../include -I.. -I. -I$(top_srcdir)/optlib
+-F/System/Library/Frameworks/CoreFoundation.framework
NLS_CFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl -I../intl
diff -ru2N dpkg-1.10.9/dpkg-deb/dpkg-deb.1 dpkg-1.10.9-patched/dpkg-deb/dpkg-deb.1
--- dpkg-1.10.9/dpkg-deb/dpkg-deb.1 Wed Aug 1 20:59:31 2001
[...1827 lines suppressed...]
+.BR @PREFIX@/var/lib/dpkg .
.TP
.BI --partsize\fR|\fB-S " kbytes"
@@ -235,5 +235,5 @@
.SH FILES
.TP
-.B /var/lib/dpkg/parts
+.B @PREFIX@/var/lib/dpkg/parts
The default queue directory for part files awaiting automatic
reassembly.
@@ -254,6 +254,7 @@
by him and released under the GNU General Public Licence; there is NO
WARRANTY. See
-.B /usr/share/dpkg/copyright
+.B @PREFIX@/share/dpkg/copyright
and
-.B /usr/share/common-licenses/GPL
+.B @PREFIX@/share/common-licenses/GPL
for details.
+Paths modified by Carsten Klapp to reflect fink distribution, December 2002.
--- NEW FILE: ncurses-5.2-9.info ---
Package: ncurses
Version: 5.2
Revision: 9
GCC: 3.1
Source: gnu
Source-MD5: 464d6a49010cf2a6eb9ce59a264d4d47
Essential: yes
Depends: base-files
Patch: %f.patch
PatchScript: perl -p -i -e 's|tic\$suffix|tic\$suffix -x|;' misc/run_tic*
ConfigureParams: --with-libtool --without-ada --with-shared --without-debug
--enable-termcap --mandir=%p/share/man
--with-terminfo-dirs="%p/share/terminfo:/usr/share/terminfo"
--with-default-terminfo-dir="%p/share/terminfo"
SetCFLAGS: -no-cpp-precomp -Wno-deprecated
CompileScript: <<
LIBTOOL=/usr/bin/glibtool ./configure %c
make
<<
InstallScript: <<
make install DESTDIR=%d DYLD_LIBRARY_PATH=`pwd`/lib
mkdir -p %i/share/doc/%n
cp README ANNOUNCE NEWS %i/share/doc/%n/
cp tack/README %i/share/doc/%n/README.tack
cp tack/COPYING %i/share/doc/%n/COPYING.tack
ln -s %p/lib/libform.5.0.2.dylib %i/lib/libform.dylib.5
ln -s %p/lib/libmenu.5.0.2.dylib %i/lib/libmenu.dylib.5
ln -s %p/lib/libncurses.5.0.2.dylib %i/lib/libncurses.dylib.5
ln -s %p/lib/libpanel.5.0.2.dylib %i/lib/libpanel.dylib.5
<<
Description: Binaries for the full-screen ascii drawing library
DescPort: <<
Needs some hacking to build shared libraries. The -no-cpp-precomp is
not strictly needed, but gets rid of the myriad of bogus error
messages. Also needs a small patch for case-insensitive file systems.
More changes by Chris Zubrzycki to be more compatable with apple's lib, splitoffs, etc.
<<
DescPackaging: <<
First revision by David Ross.
Previous versions by Christoph Pfisterer.
<<
License: OSI-Approved
Maintainer: Max Horn <[EMAIL PROTECTED]>
Homepage: http://www.gnu.org/software/ncurses/ncurses.html
--- NEW FILE: ncurses-5.2-9.patch ---
diff -ru ncurses-5.2/c++/cursesw.cc ncurses-5.2-patched/c++/cursesw.cc
--- ncurses-5.2/c++/cursesw.cc Sat Sep 2 20:55:31 2000
+++ ncurses-5.2-patched/c++/cursesw.cc Thu Jun 6 20:31:51 2002
@@ -51,8 +51,9 @@
char buf[BUFSIZ];
int result = wgetstr(w, buf);
if (result == OK) {
- strstreambuf ss(buf, sizeof(buf));
- result = ss.vscan(fmt, (_IO_va_list)args);
+// strstreambuf ss(buf, sizeof(buf));
+// result = ss.vscan(fmt, (_IO_va_list)args);
+ vsscanf(buf, fmt, args);
}
va_end(args);
return result;
@@ -73,8 +74,9 @@
if (result == OK) {
result = wgetstr(w, buf);
if (result == OK) {
- strstreambuf ss(buf, sizeof(buf));
- result = ss.vscan(fmt, (_IO_va_list)args);
+// strstreambuf ss(buf, sizeof(buf));
+// result = ss.vscan(fmt, (_IO_va_list)args);
+ vsscanf(buf, fmt, args);
}
}
va_end(args);
diff -ru ncurses-5.2/configure ncurses-5.2-patched/configure
--- ncurses-5.2/configure Sat Oct 21 00:58:49 2000
+++ ncurses-5.2-patched/configure Thu Jun 6 16:44:29 2002
@@ -2688,6 +2688,11 @@
MK_SHARED_LIB='$(LD) -Bshareable -o $@'
fi
;;
+ darwin*)
+ CC_SHARED_OPTS='-fno-common'
+ test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
+ MK_SHARED_LIB='$(CC) -dynamiclib -install_name $(libdir)/`basename $@
+.$(REL_VERSION)`.$(ABI_VERSION) -compatibility_version $(ABI_VERSION)
+-current_version $(REL_VERSION) -o $@'
+ ;;
osf*|mls+*)
# tested with OSF/1 V3.2 and 'cc'
# tested with OSF/1 V3.2 and gcc 2.6.3 (but the c++ demo didn't
@@ -7057,8 +7062,10 @@
shared)
case $cf_cv_system_name in
hpux*) DFT_DEP_SUFFIX='.sl' ;;
+ darwin*) DFT_DEP_SUFFIX='.dylib' ;;
*) DFT_DEP_SUFFIX='.so' ;;
esac
+ DFT_DEP_SUFFIX="${DFT_DEP_SUFFIX}."'$(REL_VERSION)'
esac
test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}"
echo "$ac_t""$DFT_DEP_SUFFIX" 1>&6
@@ -7091,6 +7098,7 @@
shared)
case $cf_cv_system_name in
hpux*) CXX_LIB_SUFFIX='.sl' ;;
+ darwin*) CXX_LIB_SUFFIX='.dylib' ;;
*) CXX_LIB_SUFFIX='.so' ;;
esac
esac
@@ -7767,6 +7775,7 @@
shared)
case $cf_cv_system_name in
hpux*) cf_suffix='.sl' ;;
+ darwin*) cf_suffix='.dylib' ;;
*) cf_suffix='.so' ;;
esac
esac
@@ -7818,6 +7827,7 @@
shared)
case $cf_cv_system_name in
hpux*) cf_suffix='.sl' ;;
+ darwin*) cf_suffix='.dylib' ;;
*) cf_suffix='.so' ;;
esac
esac
diff -ru ncurses-5.2/misc/terminfo.src ncurses-5.2-patched/misc/terminfo.src
--- ncurses-5.2/misc/terminfo.src Sun Sep 24 04:29:16 2000
+++ ncurses-5.2-patched/misc/terminfo.src Thu Jun 6 16:44:29 2002
@@ -12955,7 +12955,7 @@
kend=\E[1~, khome=\E[H, kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4, rmkx=\E>, smkx=\E=,
use=ncr260vt300an,
-NCR260VT300WPP|ncr260vt300wpp|NCR 2900_260 vt300 wide mode pc+ kybd,
+ncr260vt300wpp|NCR 2900_260 vt300 wide mode pc+ kybd,
cols#132,
cup=\E[%i%p1%d;%p2%dH$<30>,
is2=\E[!p\E[?3;7;19;67h\E[?1;4l\E[1;0%w\E(B\E)0\017\E[2J\E[1;1H\E>$<200>,
diff -ru ncurses-5.2/ncurses/tinfo/write_entry.c
ncurses-5.2-patched/ncurses/tinfo/write_entry.c
--- ncurses-5.2/ncurses/tinfo/write_entry.c Wed Oct 4 04:32:14 2000
+++ ncurses-5.2-patched/ncurses/tinfo/write_entry.c Thu Jun 6 16:44:29 2002
@@ -319,6 +319,9 @@
#endif
if (code != 0 && errno == ENOENT)
code = 0;
+ if (code != 0) {
+ printf("error from remove/unlink: code %d, errno %d\n", code, errno);
+ }
#if USE_SYMLINKS
if (symlink(symlinkname, linkname) < 0)
#else
@@ -331,6 +334,7 @@
* target, then the source must be on a filesystem
* that uses caseless filenames, such as Win32, etc.
*/
+ printf("error from link/symlink: code %d, errno %d\n", code, errno);
if (code == 0 && errno == EEXIST)
_nc_warning("can't link %s to %s", filename, linkname);
else if (code == 0 && errno == EPERM)
--- anacron-2.3-3.info DELETED ---
--- anacron-2.3-3.patch DELETED ---
--- apt-0.5.4-6.info DELETED ---
--- apt-0.5.4-6.patch DELETED ---
--- apt-0.5.4-7.info DELETED ---
--- apt-0.5.4-7.patch DELETED ---
--- debianutils-1.16-1.info DELETED ---
--- debianutils-1.16-1.patch DELETED ---
--- ncurses-5.2-8.info DELETED ---
--- ncurses-5.2-8.patch DELETED ---
-------------------------------------------------------
This SF.NET email is sponsored by:
SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See!
http://www.vasoftware.com
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
