Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/libs In directory sc8-pr-cvs1:/tmp/cvs-serv23295
Modified Files: readline.info Added Files: aalib.info aalib.patch cups-dev.info libmath++.info libmath++.patch pilot-link9.info pilot-link9.patch Removed Files: aalib-1.4rc5-12.info aalib-1.4rc5-12.patch pilot-link9-0.11.7-12.info pilot-link9-0.11.7-12.patch pilot-link9-0.11.7-2.info pilot-link9-0.11.7-2.patch Log Message: name changes and fixed deps --- NEW FILE: aalib.info --- Package: aalib Version: 1.4rc5 Revision: 12 Maintainer: Matt Stephenson <[EMAIL PROTECTED]> Depends: %N-shlibs (= %v-%r), %N-bin BuildDepends: fink (>= 0.9.12), ncurses-dev (>= 5.3-20031018-1) Source: mirror:sourceforge:aa-project/%N-%v.tar.gz Source-MD5: 9801095c42bba12edebd1902bcf0a990 SourceDirectory: %N-1.4.0 UpdateLibtool: True Patch: %n.patch ConfigureParams: --infodir=%i/share/info --mandir=%i/share/man GCC: 3.3 DocFiles: ANNOUNCE AUTHORS ChangeLog COPYING NEWS README BuildDependsOnly: True SplitOff: << Package: %N-shlibs Replaces: aalib (<< 1.4rc4-3) Depends: x11, ncurses, ncurses-shlibs Suggest: %N-bin Files: lib/libaa.1.0.4.dylib lib/libaa.1.dylib Shlibs: %p/lib/libaa.1.dylib 2.0.0 %n (>= 1.4rc5-12) DocFiles: COPYING README << SplitOff2: << Package: %N-bin Replaces: aalib (<< 1.4rc4-3) Depends: %N-shlibs (= %v-%r) Files: bin/ share/aclocal/ share/info/ share/man/ DocFiles: COPYING README InfoDocs: aalib.info << Description: Ascii art library DescUsage: << To see a graphical representation of this library just type 'aafire' at the command prompt. << DescPort: << Patch several files to remove 'include malloc.h' to allow source to compile. << License: GPL Homepage: http://aa-project.sourceforge.net/aalib --- NEW FILE: aalib.patch --- --- aalib-1.4.0/src/aax.c Tue Apr 24 14:00:02 2001 +++ aalib-1.4.0-patched/src/aax.c Wed Oct 31 01:12:58 2001 @@ -1,4 +1,3 @@ -#include <malloc.h> #include <stdlib.h> #include <string.h> #include <stdio.h> --- aalib-1.4.0/src/aaxkbd.c Tue Apr 24 14:00:02 2001 +++ aalib-1.4.0-patched/src/aaxkbd.c Wed Oct 31 01:23:56 2001 @@ -1,4 +1,3 @@ -#include <malloc.h> #include <stdlib.h> #include <string.h> #include <stdio.h> --- aalib-1.4.0/src/aaxmouse.c Tue Apr 24 14:00:02 2001 +++ aalib-1.4.0-patched/src/aaxmouse.c Wed Oct 31 01:24:09 2001 @@ -1,4 +1,3 @@ -#include <malloc.h> #include <stdlib.h> #include <string.h> #include <stdio.h> --- aalib-1.4.0/src/aarec.c Tue Apr 24 14:00:02 2001 +++ aalib-1.4.0-patched/src/aarec.c Thu Nov 1 23:09:07 2001 @@ -1,5 +1,5 @@ #include <string.h> -#include <malloc.h> +#include <stdlib.h> #include "aalib.h" #include "aaint.h" aa_linkedlist *aa_kbdrecommended = NULL, *aa_mouserecommended = NULL, --- aalib-1.4.0/src/aalib.c Tue Apr 24 14:00:02 2001 +++ aalib-1.4.0-patched/src/aalib.c Thu Nov 1 23:10:55 2001 @@ -1,6 +1,6 @@ #include <stdio.h> #include <string.h> -#include <malloc.h> +#include <stdlib.h> #include "aalib.h" #include "aaint.h" --- aalib-1.4.0/src/aaedit.c Tue Apr 24 14:00:02 2001 +++ aalib-1.4.0-patched/src/aaedit.c Thu Nov 1 23:11:23 2001 @@ -1,6 +1,6 @@ #include <string.h> #include <ctype.h> -#include <malloc.h> +#include <stdlib.h> #include "aalib.h" #include "aaint.h" static void aa_editdisplay(struct aa_edit *e) --- aalib-1.4.0/src/aaregist.c Tue Apr 24 14:00:02 2001 +++ aalib-1.4.0-patched/src/aaregist.c Thu Nov 1 23:11:47 2001 @@ -1,4 +1,4 @@ -#include <malloc.h> +#include <stdlib.h> #include "config.h" #include "aalib.h" #include "aaint.h" --- aalib-1.4.0/src/aakbdreg.c Tue Apr 24 14:00:02 2001 +++ aalib-1.4.0-patched/src/aakbdreg.c Thu Nov 1 23:10:02 2001 @@ -1,4 +1,4 @@ -#include <malloc.h> +#include <stdlib.h> #include "config.h" #include "aalib.h" #include "aaint.h" --- aalib-1.4.0/src/aamoureg.c Tue Apr 24 14:00:02 2001 +++ aalib-1.4.0-patched/src/aamoureg.c Thu Nov 1 23:12:11 2001 @@ -1,4 +1,4 @@ -#include <malloc.h> +#include <stdlib.h> #include "config.h" #include "aalib.h" #include "aaint.h" --- NEW FILE: cups-dev.info --- Package: cups-dev Version: 1.1.15 Conflicts: cups, cups-shlibs, cups-dev, cups-ssl, cups-ssl-shlibs, cups-ssl-dev, system-cups Replaces: cups, cups-shlibs, cups-dev, cups-ssl, cups-ssl-shlibs, cups-ssl-dev, system-cups Revision: 2 Source: http://www.opensource.apple.com/projects/cups/cups.tar.gz Source-MD5: b2aed0b50372687a56f4e665fdd85bee CompileScript: echo "no CompileScript needed" InstallScript: << make installhdrs INCLUDEDIR=%i/include << DocFiles: *.txt LICENSE.html Description: Development headers apple's CUPS printing libraries DescDetail: << This package contains the bare minimum headers and configuration file for building against Apple's provided CUPS printing system on newer MacOS X releases. << DescPackaging: << << License: BSD Maintainer: Benjamin Reed <[EMAIL PROTECTED]> Homepage: http://developer.apple.com/darwin/projects/cups/ --- NEW FILE: libmath++.info --- Package: libmath++ Version: 0.0.3 Revision: 12 GCC: 3.3 Source: http://distfiles.opendarwin.org/%n-%v.tar.gz Source-MD5: f7d1bd1059b9620e5e9c8e2204430d3c PatchScript: sed 's|@PREFIX@|%p|g' < %a/%n.patch | patch -p1 InstallScript: << make install DESTDIR=%d ranlib %i/lib/*.a << SplitOff: << Description: libmath++ development headers and libraries. Package: %N-dev Depends: libmath++ (= %v-%r) BuildDependsOnly: true Files: include lib/libmath++.dylib lib/*.a lib/*.la Shlibs: %p/lib/libmath++.0.dylib 1.0.0 %n (>= 0.0.3-12) << DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README TODO Description: C++ math library DescUsage: << libmath++ is a template based math library, written in C++, for symbolic and numeric calculus applications. << DescPort: << gcc 2.95.2 does not have sstream (although gcc3 in the dev tools does...) << License: GPL Maintainer: Benjamin Reed <[EMAIL PROTECTED]> Homepage: http://www.surakware.net/projects/libmath%2B%2B/index.xml --- NEW FILE: libmath++.patch --- diff -uNbr libmath++-0.0.3/examples/Makefile.in libmath++-0.0.3-new/examples/Makefile.in --- libmath++-0.0.3/examples/Makefile.in 2002-07-01 22:46:04.000000000 -0500 +++ libmath++-0.0.3-new/examples/Makefile.in 2002-07-30 09:24:25.000000000 -0500 @@ -92,7 +92,7 @@ am__quote = @am__quote@ install_sh = @install_sh@ -CXXFLAGS = -pedantic -ansi -Wall -Wno-long-long +CXXFLAGS = -pedantic -ansi -Wall -Wno-long-long -I$(top_srcdir)/math++ LIBS = ../math++/libmath++.la diff -uNbr libmath++-0.0.3/math++/Makefile.in libmath++-0.0.3-new/math++/Makefile.in --- libmath++-0.0.3/math++/Makefile.in 2002-07-01 22:46:05.000000000 -0500 +++ libmath++-0.0.3-new/math++/Makefile.in 2002-07-30 09:24:25.000000000 -0500 @@ -92,7 +92,7 @@ am__quote = @am__quote@ install_sh = @install_sh@ -CXXFLAGS = -pedantic -ansi -Wall -Wno-long-long +CXXFLAGS = -pedantic -ansi -Wall -Wno-long-long -I$(top_srcdir)/math++ lib_LTLIBRARIES = libmath++.la diff -uNbr libmath++-0.0.3/math++/printer.tcc libmath++-0.0.3-new/math++/printer.tcc --- libmath++-0.0.3/math++/printer.tcc 2002-05-05 05:48:24.000000000 -0500 +++ libmath++-0.0.3-new/math++/printer.tcc 2002-07-30 09:26:40.000000000 -0500 @@ -24,7 +24,11 @@ #error You may not include math++/printer.tcc directly; include math++/printer.h instead. #endif -#include <sstream> +#if defined(__APPLE__) && __GNUC__ < 3 +# include <sstream.gcc2> +#else +# include <sstream> +#endif namespace math { diff -uNbr libmath++-0.0.3/math++/reader.tcc libmath++-0.0.3-new/math++/reader.tcc --- libmath++-0.0.3/math++/reader.tcc 2002-07-01 19:56:12.000000000 -0500 +++ libmath++-0.0.3-new/math++/reader.tcc 2002-07-30 09:26:52.000000000 -0500 @@ -25,7 +25,11 @@ #endif #include <memory> -#include <sstream> +#if defined(__APPLE__) && __GNUC__ < 3 +# include <sstream.gcc2> +#else +# include <sstream> +#endif #include <iostream> // just for debuggin #include <cstring> diff -uNbr libmath++-0.0.3/math++/sstream.gcc2 libmath++-0.0.3-new/math++/sstream.gcc2 --- libmath++-0.0.3/math++/sstream.gcc2 1969-12-31 19:00:00.000000000 -0500 +++ libmath++-0.0.3-new/math++/sstream.gcc2 2002-07-30 09:24:25.000000000 -0500 @@ -0,0 +1,225 @@ +/* This is part of libio/iostream, providing -*- C++ -*- input/output. +Copyright (C) 2000 Free Software Foundation + +This file is part of the GNU IO Library. This library is free +software; you can redistribute it and/or modify it under the +terms of the GNU General Public License as published by the +Free Software Foundation; either version 2, or (at your option) +any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this library; see the file COPYING. If not, write to the Free +Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +As a special exception, if you link this library with files +compiled with a GNU compiler to produce an executable, this does not cause +the resulting executable to be covered by the GNU General Public License. +This exception does not however invalidate any other reasons why +the executable file might be covered by the GNU General Public License. */ + +/* Written by Magnus Fromreide ([EMAIL PROTECTED]). */ + +#ifndef __SSTREAM__ +#define __SSTREAM__ + +#include <string> +#include <iostream.h> +#include <streambuf.h> + +namespace std +{ + class stringbuf : public streambuf + { + public: + typedef char char_type; + typedef int int_type; + typedef streampos pos_type; + typedef streamoff off_type; + + explicit stringbuf(int which=ios::in|ios::out) : + streambuf(which), buf(), mode(static_cast<ios::open_mode>(which)), + rpos(0), bufsize(1) + { } + + explicit stringbuf(const std::string &s, int which=ios::in|ios::out) : + streambuf(which), buf(s), mode(static_cast<ios::open_mode>(which)), + bufsize(1) + { + if(mode & ios::in) + { + setg(&defbuf, &defbuf + bufsize, &defbuf + bufsize); + } + if(mode & ios::out) + { + setp(&defbuf, &defbuf + bufsize); + } + rpos = (mode & ios::ate ? s.size() : 0); + } + + std::string str() const + { + const_cast<stringbuf*>(this)->sync(); // Sigh, really ugly hack + return buf; + }; + + void str(const std::string& s) + { + buf = s; + if(mode & ios::in) + { + gbump(egptr() - gptr()); + } + if(mode & ios::out) + { + pbump(pbase() - pptr()); + } + rpos = (mode & ios::ate ? s.size() : 0); + } + + protected: + inline virtual int sync(); + inline virtual int overflow(int = EOF); + inline virtual int underflow(); + private: + std::string buf; + ios::open_mode mode; + std::string::size_type rpos; + streamsize bufsize; + char defbuf; + }; + + class stringstreambase : virtual public ios { + protected: + stringbuf __my_sb; + public: + std::string str() const + { + return dynamic_cast<stringbuf*>(_strbuf)->str(); + } + void str(const std::string& s) + { + clear(); + dynamic_cast<stringbuf*>(_strbuf)->str(s); + } + + stringbuf* rdbuf() + { + return &__my_sb; + } + protected: + stringstreambase(int which) : + __my_sb(which) + { + init (&__my_sb); + } + + stringstreambase(const std::string& s, int which) : + __my_sb(s, which) + { + init (&__my_sb); + } + }; + + class istringstream : public stringstreambase, public istream { + public: + istringstream(int which=ios::in) : + stringstreambase(which) + { } + + istringstream(const std::string& s, int which=ios::in) : + stringstreambase(s, which) + { } + }; + + class ostringstream : public stringstreambase, public ostream { + public: + ostringstream(int which=ios::out) : + stringstreambase(which) + { } + + ostringstream(const std::string& s, int which=ios::out) : + stringstreambase(s, which) + { } + }; + + class stringstream : public stringstreambase, public iostream { + public: + stringstream(int which=ios::in|ios::out) : + stringstreambase(which) + { } + + stringstream(const std::string &s, int which=ios::in|ios::out) : + stringstreambase(s, which) + { } + }; +} + +inline int std::stringbuf::sync() +{ + if((mode & ios::out) == 0) + return EOF; + + streamsize n = pptr() - pbase(); + if(n) + { + buf.replace(rpos, std::string::npos, pbase(), n); + if(buf.size() - rpos != n) + return EOF; + rpos += n; + pbump(-n); + gbump(egptr() - gptr()); + } + return 0; +} + +inline int std::stringbuf::overflow(int ch) +{ + if((mode & ios::out) == 0) + return EOF; + + streamsize n = pptr() - pbase(); + + if(n && sync()) + return EOF; + + if(ch != EOF) + { + std::string::size_type oldSize = buf.size(); + + buf.replace(rpos, std::string::npos, ch); + if(buf.size() - oldSize != 1) + return EOF; + ++rpos; + } + return 0; +} + +inline int std::stringbuf::underflow() +{ + sync(); + if((mode & ios::in) == 0) + { + return EOF; + } + if(rpos >= buf.size()) + { + return EOF; + } + + std::string::size_type n = egptr() - eback(); + std::string::size_type s; + + s = buf.copy(eback(), n, rpos); + pbump(pbase() - pptr()); + gbump(eback() - gptr()); + int res = (0377 & buf[rpos]); + rpos += s; + return res; +} + +#endif /* not __STRSTREAM__ */ diff -uNbr libmath++-0.0.3/math++/utils.cpp libmath++-0.0.3-new/math++/utils.cpp --- libmath++-0.0.3/math++/utils.cpp 2002-04-08 16:09:12.000000000 -0500 +++ libmath++-0.0.3-new/math++/utils.cpp 2002-07-30 09:27:02.000000000 -0500 @@ -21,7 +21,11 @@ // Boston, MA 02111-1307, USA. /////////////////////////////////////////////////////////////////////// #include <math++/utils.h> -#include <sstream> +#if defined(__APPLE__) && __GNUC__ < 3 +# include <sstream.gcc2> +#else +# include <sstream> +#endif #include <cmath> --- NEW FILE: pilot-link9.info --- Package: pilot-link9 Version: 0.11.7 Revision: 12 ### Depends: x11, libpng3-shlibs, readline-shlibs, tcltk-shlibs, %N-shlibs (= %v-%r) BuildDepends: fink (>= 0.9.9), libpng3, readline, tcltk, tcltk-dev, python22 | python22-nox, libiconv-dev, ncurses-dev (>= 5.3-20031018-1) BuildDependsOnly: true Conflicts: pilot-link Replaces: pilot-link ### Source: http://pilot-link.org/source/pilot-link-%v.tar.bz2 Source-MD5: 7d06c1101707125b1e385dbd3cd7ce91 ### Patch: %n.patch ### SetCC: gcc3 ### NoSetLDFLAGS: true SetLIBS: -L%p/lib SetCPPFLAGS: -no-cpp-precomp ### ConfigureParams: --without-perl --with-pic --with-readline --enable-shared --enable-static --with-tcl=%p --without-itcl --with-tk=%p --without-java --with-python --with-libiconv --with-libpng --disable-debug --mandir=%i/share/man --infodir=%p/share/info --libexecdir=%p/lib ### DocFiles: COPYING* ### Splitoff: << Package: %N-shlibs Depends: readline-shlibs Conflicts: pilot-link-shlibs Replaces: pilot-link-shlibs Files: << lib/libpisock.*.dylib lib/libpisock++.*.dylib lib/libpisync.*.dylib << Shlibs: << %p/lib/libpisock.8.dylib 9.0.0 pilot-link-shlibs (>= 0.11.7-1) %p/lib/libpisock++.0.dylib 1.0.0 pilot-link-shlibs (>= 0.11.7-1) %p/lib/libpisync.0.dylib 1.0.0 pilot-link-shlibs (>= 0.11.7-1) << DocFiles: AUTHORS COPYING* ChangeLog INSTALL NEWS README bindings/Tcl/README << Splitoff2: << Package: %N-bin Depends: libpng3-shlibs, readline-shlibs, tcltk-shlibs, %N-shlibs (= %v-%r) Replaces: pilot-link-bin Conflicts: pilot-link-bin Files: << bin share/man share/pilot-link << DocFiles: COPYING* << Splitoff3: << Package: %N-python Depends: python22 | python22-nox Conflicts: pilot-link-python Replaces: pilot-link-python Files: << lib/python2.2 << Docfiles: bindings/Python/NEWS bindings/Python/README bindings/Python/TODO << ### Description: Palm libraries DescDetail: << Pilot-Link is the tools and toys needed to connect your Palm or Palm compatible handheld (including Handspring, Sony, and Palm) with Unix and Linux machines. << ### License: GPL Maintainer: Justin F. Hallett <[EMAIL PROTECTED]> Homepage: http://www.pilot-link.org/ --- NEW FILE: pilot-link9.patch --- diff -ruN pilot-link-0.11.7.orig/bindings/Java/Makefile.in pilot-link-0.11.7/bindings/Java/Makefile.in --- pilot-link-0.11.7.orig/bindings/Java/Makefile.in Sun Jan 5 16:45:18 2003 +++ pilot-link-0.11.7/bindings/Java/Makefile.in Sun Mar 9 19:07:57 2003 @@ -494,7 +494,7 @@ $(JAVAC) -d . $(java_files) java_lib: Jni.c - $(CXX) $(INCLUDES) $(DEFS) -L $(top_builddir)/libpisock/.libs -lpisock -shared -o libPiJni.so $(srcdir)/Jni.c + $(CXX) $(INCLUDES) $(DEFS) -L$(top_builddir)/libpisock/.libs -lpisock -dynamiclib -o libPiJni.so $(srcdir)/Jni.c java_jar: $(java_classes) $(JAR) cvf pilot-link.jar $(java_classes) diff -ruN pilot-link-0.11.7.orig/bindings/Makefile.in pilot-link-0.11.7/bindings/Makefile.in --- pilot-link-0.11.7.orig/bindings/Makefile.in Sun Jan 5 16:45:18 2003 +++ pilot-link-0.11.7/bindings/Makefile.in Sun Mar 9 19:07:57 2003 @@ -409,7 +409,7 @@ cd $(srcdir)/Python && $(PYTHON) setup.py build python-install: python-build - cd $(srcdir)/Python && $(PYTHON) setup.py install --prefix=$(prefix) --root=$(DESTDIR) + cd $(srcdir)/Python && $(PYTHON) setup.py install --prefix=$(prefix) --root=/ python-clean: Python/setup.py -cd $(srcdir)/Python && $(PYTHON) setup.py clean diff -ruN pilot-link-0.11.7.orig/bindings/Perl/Makefile.PL pilot-link-0.11.7/bindings/Perl/Makefile.PL --- pilot-link-0.11.7.orig/bindings/Perl/Makefile.PL Sun Jan 5 16:45:30 2003 +++ pilot-link-0.11.7/bindings/Perl/Makefile.PL Sun Mar 9 19:07:57 2003 @@ -3,17 +3,20 @@ # See lib/ExtUtils/MakeMaker.pm for details of how to influence # the contents of the Makefile that is written. -$prefix = "/usr/local"; +$prefix = "@FINKPREFIX@"; $exec_prefix = "${prefix}"; -$libdir = "../../libpisock/.libs"; +$libdir = "${prefix}/lib"; -$lib = "-L$libdir -lpisock"; +$libs = "-L$libdir -lpisock"; +$inc = "-I$prefix/include"; + [EMAIL PROTECTED] = ("$libs"); WriteMakefile( 'NAME' => 'PDA::Pilot', 'VERSION' => '0.11.7', - 'LIBS' => $lib, + 'LIBS' => [EMAIL PROTECTED], 'XSPROTOARG' => '-noprototypes', - 'INC' => '-I../../include', + 'INC' => $inc, 'DEFINE' => '-DPERL_POLLUTE', ); diff -ruN pilot-link-0.11.7.orig/configure pilot-link-0.11.7/configure --- pilot-link-0.11.7.orig/configure Sun Jan 5 16:45:21 2003 +++ pilot-link-0.11.7/configure Sun Mar 9 19:23:22 2003 @@ -8106,7 +8106,7 @@ if test "x$with_python" != "xno"; then - for ac_prog in python2 python + for ac_prog in python2.2 python2 python do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 diff -ruN pilot-link-0.11.7.orig/libpisock++/Makefile.in pilot-link-0.11.7/libpisock++/Makefile.in --- pilot-link-0.11.7.orig/libpisock++/Makefile.in Sun Jan 5 16:45:19 2003 +++ pilot-link-0.11.7/libpisock++/Makefile.in Sun Mar 9 19:07:57 2003 @@ -225,8 +225,17 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + libpisock++.la: $(libpisock___la_OBJECTS) $(libpisock___la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(libpisock___la_LDFLAGS) $(libpisock___la_OBJECTS) $(libpisock___la_LIBADD) $(LIBS) + rm -fr .libs/libpisock++.la .libs/libpisock++.* .libs/libpisock++.* + c++ -r -keep_private_externs -nostdlib -o .libs/libpisock++.0.0.0.dylib-master.o address.lo appInfo.lo datebook.lo dlp.lo memo.lo todo.lo && c++ -dynamiclib -flat_namespace -undefined suppress -o .libs/libpisock++.0.0.0.dylib .libs/libpisock++.0.0.0.dylib-master.o -L../libpisock/.libs -lpisock -L$(libdir) -liconv -lncurses -lreadline -lc -install_name $(libdir)/libpisock++.0.dylib -compatibility_version 1 -current_version 1.0 + (cd .libs && rm -f libpisock++.0.dylib && ln -s libpisock++.0.0.0.dylib libpisock++.0.dylib) + (cd .libs && rm -f libpisock++.dylib && ln -s libpisock++.0.0.0.dylib libpisock++.dylib) + ar cru .libs/libpisock++.a address.o appInfo.o datebook.o dlp.o memo.o todo.o + ranlib .libs/libpisock++.a + sed -e s,'8','0',g -e s,'4','0',g -e s,'libpisock','libpisock++',g -e s,'-lreadline','-lreadline -lpisock',g ../libpisock/libpisock.la > libpisock++.la + (cd .libs && rm -f libpisock++.la && ln -s ../libpisock++.la libpisock++.la) + (cd .libs && sed -e s,'8','0',g -e s,'4','0',g -e s,'libpisock','libpisock++',g -e s,'-lreadline','-lreadline -lpisock',g ../../libpisock/.libs/libpisock.lai > libpisock++.lai) mostlyclean-compile: -rm -f *.$(OBJEXT) core *.core diff -ruN pilot-link-0.11.7.orig/src/Makefile.in pilot-link-0.11.7/src/Makefile.in --- pilot-link-0.11.7.orig/src/Makefile.in Sun Jan 5 16:45:20 2003 +++ pilot-link-0.11.7/src/Makefile.in Sun Mar 9 19:07:57 2003 @@ -211,8 +211,9 @@ ccexample.cc ccexample_LDADD = \ - $(top_builddir)/libpisock++/libpisock++.la \ - $(top_builddir)/libpisock/libpisock.la + $(top_builddir)/libpisock/libpisock.la \ + $(top_builddir)/libpisock++/libpisock++.la \ + $(ICONV_LIBS) $(RL_LIBS) addresses_SOURCES = \ @@ -220,14 +221,16 @@ addresses.c addresses_LDADD = \ - $(top_builddir)/libpisock/libpisock.la + $(top_builddir)/libpisock/libpisock.la \ + $(ICONV_LIBS) $(RL_LIBS) debugsh_SOURCES = \ debugsh.c debugsh_LDADD = \ - $(top_builddir)/libpisock/libpisock.la + $(top_builddir)/libpisock/libpisock.la \ + $(ICONV_LIBS) $(RL_LIBS) dlpsh_SOURCES = \ @@ -235,8 +238,8 @@ dlpsh.c dlpsh_LDADD = \ - $(RL_LIBS) \ - $(top_builddir)/libpisock/libpisock.la + $(top_builddir)/libpisock/libpisock.la \ + $(ICONV_LIBS) $(RL_LIBS) @@ -249,7 +252,8 @@ hinotes.c hinotes_LDADD = \ - $(top_builddir)/libpisock/libpisock.la + $(top_builddir)/libpisock/libpisock.la \ + $(ICONV_LIBS) $(RL_LIBS) install_datebook_SOURCES = \ @@ -258,7 +262,8 @@ parsedate.y install_datebook_LDADD = \ - $(top_builddir)/libpisock/libpisock.la + $(top_builddir)/libpisock/libpisock.la \ + $(ICONV_LIBS) $(RL_LIBS) install_expenses_SOURCES = \ @@ -266,7 +271,8 @@ install-expenses.c install_expenses_LDADD = \ - $(top_builddir)/libpisock/libpisock.la + $(top_builddir)/libpisock/libpisock.la \ + $(ICONV_LIBS) $(RL_LIBS) install_hinote_SOURCES = \ @@ -274,7 +280,8 @@ install-hinote.c install_hinote_LDADD = \ - $(top_builddir)/libpisock/libpisock.la + $(top_builddir)/libpisock/libpisock.la \ + $(ICONV_LIBS) $(RL_LIBS) install_memo_SOURCES = \ @@ -282,7 +289,8 @@ install-memo.c install_memo_LDADD = \ - $(top_builddir)/libpisock/libpisock.la + $(top_builddir)/libpisock/libpisock.la \ + $(ICONV_LIBS) $(RL_LIBS) install_netsync_SOURCES = \ @@ -290,7 +298,8 @@ install-netsync.c install_netsync_LDADD = \ - $(top_builddir)/libpisock/libpisock.la + $(top_builddir)/libpisock/libpisock.la \ + $(ICONV_LIBS) $(RL_LIBS) install_todos_SOURCES = \ @@ -298,7 +307,8 @@ install-todos.c install_todos_LDADD = \ - $(top_builddir)/libpisock/libpisock.la + $(top_builddir)/libpisock/libpisock.la \ + $(ICONV_LIBS) $(RL_LIBS) install_todo_SOURCES = \ @@ -306,7 +316,8 @@ install-todo.c install_todo_LDADD = \ - $(top_builddir)/libpisock/libpisock.la + $(top_builddir)/libpisock/libpisock.la \ + $(ICONV_LIBS) $(RL_LIBS) install_user_SOURCES = \ @@ -314,7 +325,8 @@ install-user.c install_user_LDADD = \ - $(top_builddir)/libpisock/libpisock.la + $(top_builddir)/libpisock/libpisock.la \ + $(ICONV_LIBS) $(RL_LIBS) memos_SOURCES = \ @@ -322,7 +334,8 @@ memos.c memos_LDADD = \ - $(top_builddir)/libpisock/libpisock.la + $(top_builddir)/libpisock/libpisock.la \ + $(ICONV_LIBS) $(RL_LIBS) money2qif_SOURCES = \ @@ -330,7 +343,8 @@ money2qif.c money2qif_LDADD = \ - $(top_builddir)/libpisock/libpisock.la + $(top_builddir)/libpisock/libpisock.la \ + $(ICONV_LIBS) $(RL_LIBS) pi_csd_SOURCES = \ @@ -338,7 +352,8 @@ pi-csd.c pi_csd_LDADD = \ - $(top_builddir)/libpisock/libpisock.la + $(top_builddir)/libpisock/libpisock.la \ + $(ICONV_LIBS) $(RL_LIBS) pi_getram_SOURCES = \ @@ -346,7 +361,8 @@ pi-getram.c pi_getram_LDADD = \ - $(top_builddir)/libpisock/libpisock.la + $(top_builddir)/libpisock/libpisock.la \ + $(ICONV_LIBS) $(RL_LIBS) pi_getrom_SOURCES = \ @@ -354,7 +370,8 @@ pi-getrom.c pi_getrom_LDADD = \ - $(top_builddir)/libpisock/libpisock.la + $(top_builddir)/libpisock/libpisock.la \ + $(ICONV_LIBS) $(RL_LIBS) pi_getromtoken_SOURCES = \ @@ -362,7 +379,8 @@ pi-getromtoken.c pi_getromtoken_LDADD = \ - $(top_builddir)/libpisock/libpisock.la + $(top_builddir)/libpisock/libpisock.la \ + $(ICONV_LIBS) $(RL_LIBS) pi_nredir_SOURCES = \ @@ -370,7 +388,8 @@ pi-nredir.c pi_nredir_LDADD = \ - $(top_builddir)/libpisock/libpisock.la + $(top_builddir)/libpisock/libpisock.la \ + $(ICONV_LIBS) $(RL_LIBS) @@ -384,7 +403,8 @@ pilot-addresses.c pilot_addresses_LDADD = \ - $(top_builddir)/libpisock/libpisock.la + $(top_builddir)/libpisock/libpisock.la \ + $(ICONV_LIBS) $(RL_LIBS) pilot_archive_SOURCES = \ @@ -392,7 +412,8 @@ pilot-archive.c pilot_archive_LDADD = \ - $(top_builddir)/libpisock/libpisock.la + $(top_builddir)/libpisock/libpisock.la \ + $(ICONV_LIBS) $(RL_LIBS) pilot_clip_SOURCES = \ @@ -400,7 +421,8 @@ pilot-clip.c pilot_clip_LDADD = \ - $(top_builddir)/libpisock/libpisock.la + $(top_builddir)/libpisock/libpisock.la \ + $(ICONV_LIBS) $(RL_LIBS) pilot_debug_SOURCES = \ @@ -408,9 +430,8 @@ pilot-debug.c pilot_debug_LDADD = \ - $(TCLTKLIBS) \ - $(RL_LIBS) \ - $(top_builddir)/libpisock/libpisock.la + $(top_builddir)/libpisock/libpisock.la \ + $(TCLTKLIBS) $(ICONV_LIBS) $(RL_LIBS) pilot_dedupe_SOURCES = \ @@ -418,7 +439,8 @@ pilot-dedupe.c pilot_dedupe_LDADD = \ - $(top_builddir)/libpisock/libpisock.la + $(top_builddir)/libpisock/libpisock.la \ + $(ICONV_LIBS) $(RL_LIBS) pilot_file_SOURCES = \ @@ -426,7 +448,8 @@ pilot-file.c pilot_file_LDADD = \ - $(top_builddir)/libpisock/libpisock.la + $(top_builddir)/libpisock/libpisock.la \ + $(ICONV_LIBS) $(RL_LIBS) @@ -447,7 +470,8 @@ pilot-prc.c pilot_prc_LDADD = \ - $(top_builddir)/libpisock/libpisock.la + $(top_builddir)/libpisock/libpisock.la \ + $(ICONV_LIBS) $(RL_LIBS) pilot_schlep_SOURCES = \ @@ -455,7 +479,8 @@ pilot-schlep.c pilot_schlep_LDADD = \ - $(top_builddir)/libpisock/libpisock.la + $(top_builddir)/libpisock/libpisock.la \ + $(ICONV_LIBS) $(RL_LIBS) pilot_xfer_SOURCES = \ @@ -463,7 +488,8 @@ pilot-xfer.c pilot_xfer_LDADD = \ - $(top_builddir)/libpisock/libpisock.la + $(top_builddir)/libpisock/libpisock.la \ + $(ICONV_LIBS) $(RL_LIBS) read_expenses_SOURCES = \ @@ -471,7 +497,8 @@ read-expenses.c read_expenses_LDADD = \ - $(top_builddir)/libpisock/libpisock.la + $(top_builddir)/libpisock/libpisock.la \ + $(ICONV_LIBS) $(RL_LIBS) read_ical_SOURCES = \ @@ -479,7 +506,8 @@ read-ical.c read_ical_LDADD = \ - $(top_builddir)/libpisock/libpisock.la + $(top_builddir)/libpisock/libpisock.la \ + $(ICONV_LIBS) $(RL_LIBS) read_notepad_SOURCES = \ @@ -487,8 +515,8 @@ read-notepad.c read_notepad_LDADD = \ - $(PNG_LIBS) \ - $(top_builddir)/libpisock/libpisock.la + $(top_builddir)/libpisock/libpisock.la \ + $(PNG_LIBS) $(ICONV_LIBS) $(RL_LIBS) -lz read_palmpix_SOURCES = \ @@ -496,8 +524,8 @@ read-palmpix.c read_palmpix_LDADD = \ - $(PNG_LIBS) \ - $(top_builddir)/libpisock/libpisock.la + $(top_builddir)/libpisock/libpisock.la \ + $(PNG_LIBS) $(ICONV_LIBS) $(RL_LIBS) -lz read_todos_SOURCES = \ @@ -505,7 +533,8 @@ read-todos.c read_todos_LDADD = \ - $(top_builddir)/libpisock/libpisock.la + $(top_builddir)/libpisock/libpisock.la \ + $(ICONV_LIBS) $(RL_LIBS) reminders_SOURCES = \ @@ -513,7 +542,8 @@ reminders.c reminders_LDADD = \ - $(top_builddir)/libpisock/libpisock.la + $(top_builddir)/libpisock/libpisock.la \ + $(ICONV_LIBS) $(RL_LIBS) CLEANFILES = $(PERLSCRIPTS) @@ -996,9 +1026,11 @@ addresses$(EXEEXT): $(addresses_OBJECTS) $(addresses_DEPENDENCIES) @rm -f addresses$(EXEEXT) $(LINK) $(addresses_LDFLAGS) $(addresses_OBJECTS) $(addresses_LDADD) $(LIBS) -ccexample$(EXEEXT): $(ccexample_OBJECTS) $(ccexample_DEPENDENCIES) +ccexample$(EXEEXT): $(ccexample_OBJECTS) $(ccexample_DEPENDENCIES) @rm -f ccexample$(EXEEXT) - $(CXXLINK) $(ccexample_LDFLAGS) $(ccexample_OBJECTS) $(ccexample_LDADD) $(LIBS) + mkdir .libs + c++ -O2 -o .libs/ccexample $(ccexample_OBJECTS) -L../libpisock/.libs -L../libpisock++/.libs -lpisock++ -lpisock -L$(libdir) -liconv -lncurses -lreadline + sed -e s,'$$thisdir/../../libpisock/.libs','$$thisdir/../libpisock\/.libs:$$thisdir/../libpisock++\/.libs',g -e s,'../../libpisock/libpisock.la','../libpisock/libpisock.la ../libpisock++/libpisock++.la',g -e s,'pilot-datebook','ccexample',g pilot-datebook/pilot-datebook$(EXEEXT) > ccexample$(EXEEXT) debugsh$(EXEEXT): $(debugsh_OBJECTS) $(debugsh_DEPENDENCIES) @rm -f debugsh$(EXEEXT) $(LINK) $(debugsh_LDFLAGS) $(debugsh_OBJECTS) $(debugsh_LDADD) $(LIBS) diff -ruN pilot-link-0.11.7.orig/src/pilot-datebook/Makefile.in pilot-link-0.11.7/src/pilot-datebook/Makefile.in --- pilot-link-0.11.7.orig/src/pilot-datebook/Makefile.in Sun Jan 5 16:45:20 2003 +++ pilot-link-0.11.7/src/pilot-datebook/Makefile.in Sun Mar 9 19:07:57 2003 @@ -183,7 +183,8 @@ pilot_datebook_LDADD = \ - $(top_builddir)/libpisock/libpisock.la + $(top_builddir)/libpisock/libpisock.la \ + $(ICONV_LIBS) $(RL_LIBS) EXTRA_DIST = \ Index: readline.info =================================================================== RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/libs/readline.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- readline.info 20 Oct 2003 16:36:36 -0000 1.1 +++ readline.info 22 Oct 2003 03:59:54 -0000 1.2 @@ -5,7 +5,7 @@ GCC: 3.3 # Depends: %n-shlibs (= %v-%r) -BuildDepends: ncurses-dev (>= 5.3-12) +BuildDepends: ncurses-dev (>= 5.3-20031018-1) Source: gnu Source-MD5: f86f7cb717ab321fe15f1bbcb058c11e PatchScript: sed 's|@FINK@|%p|g' < %a/%n.patch | patch -p1 @@ -18,7 +18,7 @@ BuildDependsOnly: True SplitOff: << Package: %N-shlibs - Depends: ncurses (>= 5.3-12), ncurses-shlibs (>= 5.3-12) + Depends: ncurses, ncurses-shlibs Replaces: %N Files: lib/libhistory.%v.dylib lib/libreadline.%v.dylib lib/libhistory.4.dylib lib/libreadline.4.dylib lib/libhistory.4.2.dylib lib/libreadline.4.2.dylib Shlibs: << --- aalib-1.4rc5-12.info DELETED --- --- aalib-1.4rc5-12.patch DELETED --- --- pilot-link9-0.11.7-12.info DELETED --- --- pilot-link9-0.11.7-12.patch DELETED --- --- pilot-link9-0.11.7-2.info DELETED --- --- pilot-link9-0.11.7-2.patch DELETED --- ------------------------------------------------------- This SF.net email is sponsored by OSDN developer relations Here's your chance to show off your extensive product knowledge We want to know what you know. Tell us and you have a chance to win $100 http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54 _______________________________________________ Fink-commits mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/fink-commits