Update of /cvsroot/fink/dists/10.3/stable/main/finkinfo/libs
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11892/10.3/stable/main/finkinfo/libs
Modified Files:
pilot-link9.info pilot-link9.patch
Log Message:
pilot-link9 to stable, gpgme11 update to use pthreads by default (since it
actually *works*)
Index: pilot-link9.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/libs/pilot-link9.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- pilot-link9.info 11 Apr 2005 00:36:23 -0000 1.5
+++ pilot-link9.info 12 Sep 2005 16:56:46 -0000 1.6
@@ -1,49 +1,51 @@
Package: pilot-link9
-Version: 0.11.7
-Revision: 22
+Version: 0.11.8
+Revision: 12
###
-Depends: x11, libpng3-shlibs, readline-shlibs, tcltk-shlibs, %N-shlibs (=
%v-%r)
-BuildDepends: fink (>= 0.21.2-1), gcc3.1, libpng3, readline, tcltk, tcltk-dev,
python22 | python22-nox, libiconv-dev, ncurses-dev (>= 5.3-20031018-2), x11-dev
+Depends: x11, libpng3-shlibs, readline-shlibs (>= 4.3-15), tcltk-shlibs,
%N-shlibs (= %v-%r)
+BuildDepends: fink (>= 0.9.9), libpng3, readline (>= 4.3-15), tcltk,
tcltk-dev, python22 | python22-nox, libiconv-dev, libncurses5, x11-dev
BuildDependsOnly: true
Conflicts: pilot-link
Replaces: pilot-link
###
Source: http://pilot-link.org/source/pilot-link-%v.tar.bz2
-Source-MD5: 7d06c1101707125b1e385dbd3cd7ce91
+Source-MD5: 586f84add601e8b86da3093ab784e997
###
Patch: %n.patch
###
-SetCC: gcc3
+GCC: 3.3
###
NoSetLDFLAGS: true
SetLIBS: -L%p/lib
SetCPPFLAGS: -no-cpp-precomp
-NoSetCXXFLAGS: true
###
-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: AUTHORS COPYING* ChangeLog INSTALL NEWS README
###
-DocFiles: COPYING*
+# --with-java=/System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Home
+ConfigureParams: --without-perl --with-pic --with-readline --enable-shared
--enable-static --with-tcl=%p/lib --without-itcl --with-tk --without-java
--with-python --with-libiconv --with-libpng --disable-debug
--mandir=%i/share/man --infodir=%p/share/info --libexecdir=%p/lib
###
Splitoff: <<
Package: %N-shlibs
- Depends: readline-shlibs
+ Depends: readline-shlibs (>= 4.3-15), ncurses, libncurses5-shlibs
Conflicts: pilot-link-shlibs
Replaces: pilot-link-shlibs
Files: <<
lib/libpisock.*.dylib
lib/libpisock++.*.dylib
lib/libpisync.*.dylib
+ lib/libpitcl.*.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)
+ %p/lib/libpisock.8.dylib 9.0.0 pilot-link9-shlibs (>= 0.11.7-12)
+ %p/lib/libpisock++.0.dylib 1.0.0 pilot-link9-shlibs (>= 0.11.7-12)
+ %p/lib/libpisync.0.dylib 1.0.0 pilot-link9-shlibs (>= 0.11.7-12)
+ %p/lib/libpitcl.0.dylib 1.0.0 pilot-link9-shlibs (>= 0.11.8-11)
<<
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)
+ Depends: libpng3-shlibs, readline-shlibs (>= 4.3-15), tcltk-shlibs,
%N-shlibs (= %v-%r)
Replaces: pilot-link-bin
Conflicts: pilot-link-bin
Files: <<
@@ -54,7 +56,7 @@
DocFiles: COPYING*
<<
Splitoff3: <<
- Package: %N-python
+ Package: %N-py22
Depends: python22 | python22-nox
Conflicts: pilot-link-python
Replaces: pilot-link-python
@@ -63,6 +65,19 @@
<<
Docfiles: bindings/Python/NEWS bindings/Python/README bindings/Python/TODO
<<
+### Off for now since I have no idea what to do with the lib
+### and java -jar <jarfile> gives errors
+#JarFiles: <<
+# bindings/Java/pilot-link.jar
+# bindings/Java/libjpisock.so
+#<<
+#Splitoff4: <<
+# Package: %N-java
+# Files: <<
+# share/java
+# <<
+# Docfiles: bindings/Java/README* bindings/Java/TODO
+#<<
###
Description: Palm libraries
DescDetail: <<
@@ -72,5 +87,5 @@
<<
###
License: GPL
-Maintainer: Justin F. Hallett <[EMAIL PROTECTED]>
+Maintainer: None <fink-devel@lists.sourceforge.net>
Homepage: http://www.pilot-link.org/
Index: pilot-link9.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/libs/pilot-link9.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pilot-link9.patch 22 Oct 2003 05:51:19 -0000 1.1
+++ pilot-link9.patch 12 Sep 2005 16:56:46 -0000 1.2
@@ -1,19 +1,29 @@
-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 @@
+diff -ruN pilot-link-0.11.8.orig/bindings/Java/Makefile.in
pilot-link-0.11.8/bindings/Java/Makefile.in
+--- pilot-link-0.11.8.orig/bindings/Java/Makefile.in Tue Jul 1 13:09:06 2003
++++ pilot-link-0.11.8/bindings/Java/Makefile.in Tue Jul 22 14:09:00 2003
+@@ -233,7 +233,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_lib: libjpisock.c
+- $(CXX) $(INCLUDES) $(DEFS) -L $(top_builddir)/libpisock/.libs -lpisock
-shared -o libjpisock.so $(srcdir)/libjpisock.c
++ $(CXX) $(INCLUDES) $(DEFS) -L$(top_builddir)/libpisock/.libs -lpisock
-dynamiclib -o libjpisock.so $(srcdir)/libjpisock.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 @@
+@@ -241,7 +241,8 @@
+ java_pisock: java_compile java_lib java_jar
+
+ install: all
+- cp libjpisock.so ${JAVABASE}/jre/lib/i386/
++ mkdir -p ${prefix}/${JAVABASE}/jre/lib/ppc/
++ cp libjpisock.so ${prefix}/${JAVABASE}/jre/lib/ppc/
+
+ test: install
+ ${JAVABASE}/bin/java test ${PORT}
+diff -ruN pilot-link-0.11.8.orig/bindings/Makefile.in
pilot-link-0.11.8/bindings/Makefile.in
+--- pilot-link-0.11.8.orig/bindings/Makefile.in Tue Jul 1 13:09:05 2003
++++ pilot-link-0.11.8/bindings/Makefile.in Tue Jul 22 11:00:22 2003
+@@ -344,7 +344,7 @@
cd $(srcdir)/Python && $(PYTHON) setup.py build
python-install: python-build
@@ -22,10 +32,10 @@
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 @@
+diff -ruN pilot-link-0.11.8.orig/bindings/Perl/Makefile.PL
pilot-link-0.11.8/bindings/Perl/Makefile.PL
+--- pilot-link-0.11.8.orig/bindings/Perl/Makefile.PL Tue Jul 1 12:57:18 2003
++++ pilot-link-0.11.8/bindings/Perl/Makefile.PL Tue Jul 22 11:02:01 2003
+@@ -2,17 +2,18 @@
# See lib/ExtUtils/MakeMaker.pm for details of how to influence
# the contents of the Makefile that is written.
@@ -38,12 +48,10 @@
-$lib = "-L$libdir -lpisock";
+$libs = "-L$libdir -lpisock";
+$inc = "-I$prefix/include";
-+
[EMAIL PROTECTED] = ("$libs");
WriteMakefile(
'NAME' => 'PDA::Pilot',
- 'VERSION' => '0.11.7',
+ 'VERSION' => '0.11.8',
- 'LIBS' => $lib,
+ 'LIBS' => [EMAIL PROTECTED],
'XSPROTOARG' => '-noprototypes',
@@ -51,423 +59,64 @@
+ '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 @@
+diff -ruN pilot-link-0.11.8.orig/configure pilot-link-0.11.8/configure
+--- pilot-link-0.11.8.orig/configure Tue Jul 1 13:08:40 2003
++++ pilot-link-0.11.8/configure Tue Jul 22 13:42:48 2003
+@@ -5634,19 +5634,20 @@
+ allow_undefined_flag='-undefined suppress'
+ ;;
+ *) # Darwin 1.3 on
+- allow_undefined_flag='-flat_namespace -undefined suppress'
++ #allow_undefined_flag='-flat_namespace -undefined suppress'
++ allow_undefined_flag=''
+ ;;
+ esac
+ # FIXME: Relying on posixy $() will cause problems for
+ # cross-compilation, but unfortunately the echo tests do not
+ # yet detect zsh echo's removal of \ escapes. Also zsh mangles
+ # `"' quotes if we put them in here... so don't!
+- archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o
$libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib)
$allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test
.$module != .yes && echo -install_name $rpath/$soname $verstring)'
++ archive_cmds='$nonopt -r -keep_private_externs -nostdlib -o
${lib}-master.o $libobjs && $nonopt $(test .$module = .yes && echo -bundle ||
echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o
$deplibs$linker_flags $(test .$module != .yes && echo -install_name
$rpath/$soname $verstring)'
+ # We need to add '_' to the symbols in $export_symbols first
+ #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
+- hardcode_direct=yes
++ hardcode_direct=no
+ hardcode_shlibpath_var=no
+- whole_archive_flag_spec='-all_load $convenience'
++ whole_archive_flag_spec='-all-load $convenience'
+ ;;
+ freebsd1*)
+@@ -11481,7 +11482,7 @@
+ fi;
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.
+ # 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)
+diff -ruN pilot-link-0.11.8.orig/libpisync/Makefile.in
pilot-link-0.11.8/libpisync/Makefile.in
+--- pilot-link-0.11.8.orig/libpisync/Makefile.in Tue Jul 1 13:08:57 2003
++++ pilot-link-0.11.8/libpisync/Makefile.in Tue Jul 22 13:09:01 2003
+@@ -125,7 +125,7 @@
+ libpisync_la_SOURCES = sync.c
- 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 @@
+-libpisync_la_LIBADD = $(ICONV_LIBS)
++libpisync_la_LIBADD = -L$(top_srcdir)/libpisock -lpisock $(ICONV_LIBS)
- pilot_datebook_LDADD = \
-- $(top_builddir)/libpisock/libpisock.la
-+ $(top_builddir)/libpisock/libpisock.la \
-+ $(ICONV_LIBS) $(RL_LIBS)
+ libpisync_la_LDFLAGS = -export-dynamic -version-info
$(PISYNC_CURRENT):$(PISYNC_REVISION):$(PISYNC_AGE)
+diff -ruN pilot-link-0.11.8.orig/ltmain.sh pilot-link-0.11.8/ltmain.sh
+--- pilot-link-0.11.8.orig/ltmain.sh Tue Jul 1 12:56:55 2003
++++ pilot-link-0.11.8/ltmain.sh Tue Jul 22 12:28:51 2003
+@@ -1774,7 +1774,7 @@
+ if test "$installed" = no; then
+ notinst_deplibs="$notinst_deplibs $lib"
+- need_relink=yes
++ need_relink=no
+ fi
- EXTRA_DIST = \
+ if test -n "$old_archive_from_expsyms_cmds"; then
-------------------------------------------------------
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
