Author: ranger
Date: Wed Jan 17 16:50:33 2007
New Revision: 588

URL: 
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=588&repname=user%3a+ranger>
Log:
new libmal

Modified:
    trunk/experimental/10.3/main/finkinfo/libs/libmal10.info
    trunk/experimental/10.3/main/finkinfo/libs/libmal10.patch
    trunk/experimental/10.4/main/finkinfo/libs/libmal10.info
    trunk/experimental/10.4/main/finkinfo/libs/libmal10.patch
    trunk/experimental/common/main/finkinfo/libs/libmal10.info
    trunk/experimental/common/main/finkinfo/libs/libmal10.patch

Modified: trunk/experimental/10.3/main/finkinfo/libs/libmal10.info
URL: 
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.3/main/finkinfo/libs/libmal10.info&rev=588&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.3/main/finkinfo/libs/libmal10.info (original)
+++ trunk/experimental/10.3/main/finkinfo/libs/libmal10.info Wed Jan 17 
16:50:33 2007
@@ -1,21 +1,26 @@
 Package: libmal10
-Version: 0.40
-Revision: 15
+Version: 0.43
+Revision: 11
 Description: Library for syncing AvantGo
 License: OSI-Approved
 Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
 
 Depends: %N-shlibs (>= %v-%r)
-BuildDepends: pilot-link10, libiconv-dev, libncurses5, readline5
+BuildDepends: <<
+       pilot-link10,
+       libiconv-dev,
+       libncurses5,
+       readline5
+<<
 Conflicts: libmal
 Replaces: libmal
 BuildDependsOnly: true
 
 Source: http://jasonday.home.att.net/code/libmal/libmal-%v.tar.gz
-Source-MD5: b570bc495101de915f3401d0baaf6b62
+Source-MD5: 211d4db4f984512e5d3d10c35443b881
 Patch: %n.patch
 
-SetCPPFLAGS: -I%p/lib/pilot-link10/include -no-cpp-precomp -fno-common 
-D__unix__ -DDARWIN
+SetCPPFLAGS: -I%p/lib/pilot-link10/include -fno-common -D__unix__ -DDARWIN
 SetLDFLAGS: -L%p/lib/pilot-link10/lib -L%p/lib/ncurses/lib
 SetLIBS: -L%p/lib
 NoSetLDFLAGS: true
@@ -38,7 +43,12 @@
 <<
 SplitOff2: <<
        Package: malsync
-       Depends: %N-shlibs (>= %v-%r), libiconv, libncurses5-shlibs, 
readline5-shlibs
+       Depends: <<
+               %N-shlibs (>= %v-%r),
+               libiconv,
+               libncurses5-shlibs,
+               readline5-shlibs
+       <<
 <<
 
 Homepage: http://jasonday.home.att.net/code/libmal/libmal.html

Modified: trunk/experimental/10.3/main/finkinfo/libs/libmal10.patch
URL: 
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.3/main/finkinfo/libs/libmal10.patch&rev=588&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.3/main/finkinfo/libs/libmal10.patch (original)
+++ trunk/experimental/10.3/main/finkinfo/libs/libmal10.patch Wed Jan 17 
16:50:33 2007
@@ -1,106 +1,34 @@
 
---- libmal-0.40/configure      2004-01-29 22:00:34.000000000 -0500
-+++ libmal-0.40-new/configure  2006-09-07 21:59:06.000000000 -0400
-@@ -8401,7 +8401,7 @@
- 
- for pilot_libs in $pilot_prefix/lib /usr/lib /usr/local/lib/ \
-   /usr/extra/pilot/lib ; do
--   if test -r "$pilot_libs/libpisock.so" ; then
-+   if test -r "$pilot_libs/libpisock.dylib" ; then
-       pilotlibs=yes
-       PILOT_LIBS="-L$pilot_libs $PILOT_LIBS"
-       break
---- libmal-0.40/malsync/mal/common/AGBase64.c  2000-05-14 17:17:36.000000000 
-0400
-+++ libmal-0.40-new/malsync/mal/common/AGBase64.c      2006-09-07 
21:59:38.000000000 -0400
-@@ -103,7 +103,7 @@
-     int ixtext;
-     int lentext;
-     char ch, *ptr, *tptr;
--    char inbuf [3];
-+    char inbuf [4];
-     int ixinbuf;
-     int ignorechar;
-     int endtext = 0;
---- libmal-0.40/malsync/mal/common/AGNet.h     2003-08-09 14:52:30.000000000 
-0400
-+++ libmal-0.40-new/malsync/mal/common/AGNet.h 2006-09-07 21:59:06.000000000 
-0400
-@@ -61,7 +61,7 @@
+--- libmal-0.43/configure      2006-12-11 22:20:52.000000000 -0500
++++ libmal-0.43-patched/configure      2007-01-17 10:33:51.000000000 -0500
+@@ -20216,7 +20216,7 @@
+ if test $pilotlibs = no ; then
+     for pilot_libs in $pilot_prefix/lib /usr/lib /usr/local/lib/ \
+         /usr/extra/pilot/lib ; do
+-        if test -r "$pilot_libs/libpisock.so" ; then
++        if test -r "$pilot_libs/libpisock.dylib" ; then
+             pilotlibs=yes
+             PILOT_LIBS="-L$pilot_libs $PILOT_LIBS"
+             break
+--- libmal-0.43/malsync/mal/common/AGNet.h     2006-12-10 21:57:12.000000000 
-0500
++++ libmal-0.43-patched/malsync/mal/common/AGNet.h     2007-01-17 
10:34:48.000000000 -0500
+@@ -62,7 +62,7 @@
  #               include <sys/filio.h>
  #               include <arpa/inet.h>
  #           else
--#               if (defined(BSD) && BSD >= 199306) || defined(_HPUX_SOURCE)
-+#               if (defined(BSD) && BSD >= 199306) || defined(_HPUX_SOURCE) 
|| defined(__APPLE__)
+-#               if (defined(BSD) && BSD >= 199306) ||  defined(__OpenBSD__) 
|| defined(_HPUX_SOURCE)
++#               if (defined(BSD) && BSD >= 199306) ||  defined(__OpenBSD__) 
|| defined(_HPUX_SOURCE) || defined(__APPLE__)
  #                   include <sys/ioctl.h>
  #                   include <arpa/inet.h>
- #               else
---- libmal-0.40/src/Makefile.in        2004-01-29 22:00:33.000000000 -0500
-+++ libmal-0.40-new/src/Makefile.in    2006-09-07 21:59:06.000000000 -0400
-@@ -198,7 +198,7 @@
- 
+ #               elif defined(__GLIBC__)
+--- libmal-0.43/src/Makefile.in        2006-12-11 22:20:47.000000000 -0500
++++ libmal-0.43-patched/src/Makefile.in        2007-01-17 10:35:15.000000000 
-0500
+@@ -303,7 +303,7 @@
+ malsync_LDADD = @LIBS@ @PILOT_LIBS@ libmal.la
+ lib_LTLIBRARIES = libmal.la
  libmal_la_SOURCES = libmal.c libmal.h $(MAL_SRC) $(MAL_HDRS)
- 
--libmal_la_LDFLAGS = $(PILOT_LIBS) -module -version-info 1:0:0
-+libmal_la_LDFLAGS = $(PILOT_LIBS) -ldl -version-info 1:0:0
- 
+-libmal_la_LDFLAGS = -module -version-info 1:0:0
++libmal_la_LDFLAGS = -version-info 1:0:0
+ libmal_la_LIBADD = @PILOT_LIBS@
  c_header_DATA = libmal.h $(MAL_HDRS)
  c_headerdir = $(includedir)/libmal
---- libmal-0.40/src/libmal.c   2004-01-29 15:58:55.000000000 -0500
-+++ libmal-0.40-new/src/libmal.c       2006-09-08 18:28:15.000000000 -0400
-@@ -291,8 +291,7 @@
- 
-         rc = dlp_ReadRecordByIndex(sd, database_id, 0, 
-                                    (void *)dev_db_info_buffer, 
--                                   &id, &dev_db_info_buffer_size, 
--                                   &attr, &cat);
-+                                   &id, &attr, &cat);
-     
- 
-         if (rc >= 0) {
-@@ -614,7 +613,7 @@
-     AGBufferReader * r = NULL;
- 
-     rc = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer, 
--                               &id, &bufferSize, &attr, &cat);
-+                               &id, &attr, &cat);
-     
-     if (rc < 0) {
-         if (verbose)
-@@ -652,7 +651,7 @@
-     AGBufferReader * r = NULL;
- 
-     rc = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer, 
--                               &id, &bufferSize, &attr, &cat);
-+                               &id, &attr, &cat);
-     
-     if (rc < 0) {
-         if (verbose)
-@@ -712,7 +711,7 @@
-         }
- 
-         result = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void 
*)buffer, 
--                                   &id, &bufferSize, &attr, &cat);
-+                                   &id, &attr, &cat);
-         
-         if (result < 0)
-             id = 0;
-@@ -1027,11 +1026,11 @@
-     result = (modonly) ?
-         dlp_ReadNextModifiedRec (pInfo->sd, pInfo->pilot_rHandle, 
pInfo->pilot_buffer,
-                                  &pInfo->id, &idx,
--                                 &size, &att, &cat)
-+                                 &att, &cat)
-         :
-         dlp_ReadRecordByIndex(pInfo->sd, pInfo->pilot_rHandle, idx,
-                               pInfo->pilot_buffer, &pInfo->id,
--                              &size, &att, &cat);
-+                              &att, &cat);
-     
-     if (result < 0) {
-         closeDatabase(pInfo);
-@@ -1388,7 +1387,6 @@
-                                    0, 
-                                    (void *)version_buffer, 
-                                    &id, 
--                                   &version_buffer_size,
-                                    &attr, 
-                                    &cat);
- 

Modified: trunk/experimental/10.4/main/finkinfo/libs/libmal10.info
URL: 
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/libs/libmal10.info&rev=588&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/libs/libmal10.info (original)
+++ trunk/experimental/10.4/main/finkinfo/libs/libmal10.info Wed Jan 17 
16:50:33 2007
@@ -1,21 +1,26 @@
 Package: libmal10
-Version: 0.40
-Revision: 1025
+Version: 0.43
+Revision: 1021
 Description: Library for syncing AvantGo
 License: OSI-Approved
 Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
 
 Depends: %N-shlibs (>= %v-%r)
-BuildDepends: pilot-link10, libiconv-dev, libncurses5 (>= 5.4-20041023-1006), 
readline5 (>= 5.0-1004)
+BuildDepends: <<
+       pilot-link10,
+       libiconv-dev,
+       libncurses5,
+       readline5
+<<
 Conflicts: libmal
 Replaces: libmal
 BuildDependsOnly: true
 
 Source: http://jasonday.home.att.net/code/libmal/libmal-%v.tar.gz
-Source-MD5: b570bc495101de915f3401d0baaf6b62
+Source-MD5: 211d4db4f984512e5d3d10c35443b881
 Patch: %n.patch
 
-SetCPPFLAGS: -I%p/lib/pilot-link10/include -no-cpp-precomp -fno-common 
-D__unix__ -DDARWIN
+SetCPPFLAGS: -I%p/lib/pilot-link10/include -fno-common -D__unix__ -DDARWIN
 SetLDFLAGS: -L%p/lib/pilot-link10/lib -L%p/lib/ncurses/lib
 SetLIBS: -L%p/lib
 NoSetLDFLAGS: true
@@ -38,7 +43,12 @@
 <<
 SplitOff2: <<
        Package: malsync
-       Depends: %N-shlibs (>= %v-%r), libiconv, libncurses5-shlibs (>= 
5.4-20041023-1006), readline5-shlibs (>= 5.0-1004)
+       Depends: <<
+               %N-shlibs (>= %v-%r),
+               libiconv,
+               libncurses5-shlibs,
+               readline5-shlibs
+       <<
 <<
 
 Homepage: http://jasonday.home.att.net/code/libmal/libmal.html

Modified: trunk/experimental/10.4/main/finkinfo/libs/libmal10.patch
URL: 
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/libs/libmal10.patch&rev=588&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/libs/libmal10.patch (original)
+++ trunk/experimental/10.4/main/finkinfo/libs/libmal10.patch Wed Jan 17 
16:50:33 2007
@@ -1,106 +1,34 @@
 
---- libmal-0.40/configure      2004-01-29 22:00:34.000000000 -0500
-+++ libmal-0.40-new/configure  2006-09-07 21:59:06.000000000 -0400
-@@ -8401,7 +8401,7 @@
- 
- for pilot_libs in $pilot_prefix/lib /usr/lib /usr/local/lib/ \
-   /usr/extra/pilot/lib ; do
--   if test -r "$pilot_libs/libpisock.so" ; then
-+   if test -r "$pilot_libs/libpisock.dylib" ; then
-       pilotlibs=yes
-       PILOT_LIBS="-L$pilot_libs $PILOT_LIBS"
-       break
---- libmal-0.40/malsync/mal/common/AGBase64.c  2000-05-14 17:17:36.000000000 
-0400
-+++ libmal-0.40-new/malsync/mal/common/AGBase64.c      2006-09-07 
21:59:38.000000000 -0400
-@@ -103,7 +103,7 @@
-     int ixtext;
-     int lentext;
-     char ch, *ptr, *tptr;
--    char inbuf [3];
-+    char inbuf [4];
-     int ixinbuf;
-     int ignorechar;
-     int endtext = 0;
---- libmal-0.40/malsync/mal/common/AGNet.h     2003-08-09 14:52:30.000000000 
-0400
-+++ libmal-0.40-new/malsync/mal/common/AGNet.h 2006-09-07 21:59:06.000000000 
-0400
-@@ -61,7 +61,7 @@
+--- libmal-0.43/configure      2006-12-11 22:20:52.000000000 -0500
++++ libmal-0.43-patched/configure      2007-01-17 10:33:51.000000000 -0500
+@@ -20216,7 +20216,7 @@
+ if test $pilotlibs = no ; then
+     for pilot_libs in $pilot_prefix/lib /usr/lib /usr/local/lib/ \
+         /usr/extra/pilot/lib ; do
+-        if test -r "$pilot_libs/libpisock.so" ; then
++        if test -r "$pilot_libs/libpisock.dylib" ; then
+             pilotlibs=yes
+             PILOT_LIBS="-L$pilot_libs $PILOT_LIBS"
+             break
+--- libmal-0.43/malsync/mal/common/AGNet.h     2006-12-10 21:57:12.000000000 
-0500
++++ libmal-0.43-patched/malsync/mal/common/AGNet.h     2007-01-17 
10:34:48.000000000 -0500
+@@ -62,7 +62,7 @@
  #               include <sys/filio.h>
  #               include <arpa/inet.h>
  #           else
--#               if (defined(BSD) && BSD >= 199306) || defined(_HPUX_SOURCE)
-+#               if (defined(BSD) && BSD >= 199306) || defined(_HPUX_SOURCE) 
|| defined(__APPLE__)
+-#               if (defined(BSD) && BSD >= 199306) ||  defined(__OpenBSD__) 
|| defined(_HPUX_SOURCE)
++#               if (defined(BSD) && BSD >= 199306) ||  defined(__OpenBSD__) 
|| defined(_HPUX_SOURCE) || defined(__APPLE__)
  #                   include <sys/ioctl.h>
  #                   include <arpa/inet.h>
- #               else
---- libmal-0.40/src/Makefile.in        2004-01-29 22:00:33.000000000 -0500
-+++ libmal-0.40-new/src/Makefile.in    2006-09-07 21:59:06.000000000 -0400
-@@ -198,7 +198,7 @@
- 
+ #               elif defined(__GLIBC__)
+--- libmal-0.43/src/Makefile.in        2006-12-11 22:20:47.000000000 -0500
++++ libmal-0.43-patched/src/Makefile.in        2007-01-17 10:35:15.000000000 
-0500
+@@ -303,7 +303,7 @@
+ malsync_LDADD = @LIBS@ @PILOT_LIBS@ libmal.la
+ lib_LTLIBRARIES = libmal.la
  libmal_la_SOURCES = libmal.c libmal.h $(MAL_SRC) $(MAL_HDRS)
- 
--libmal_la_LDFLAGS = $(PILOT_LIBS) -module -version-info 1:0:0
-+libmal_la_LDFLAGS = $(PILOT_LIBS) -ldl -version-info 1:0:0
- 
+-libmal_la_LDFLAGS = -module -version-info 1:0:0
++libmal_la_LDFLAGS = -version-info 1:0:0
+ libmal_la_LIBADD = @PILOT_LIBS@
  c_header_DATA = libmal.h $(MAL_HDRS)
  c_headerdir = $(includedir)/libmal
---- libmal-0.40/src/libmal.c   2004-01-29 15:58:55.000000000 -0500
-+++ libmal-0.40-new/src/libmal.c       2006-09-08 18:28:15.000000000 -0400
-@@ -291,8 +291,7 @@
- 
-         rc = dlp_ReadRecordByIndex(sd, database_id, 0, 
-                                    (void *)dev_db_info_buffer, 
--                                   &id, &dev_db_info_buffer_size, 
--                                   &attr, &cat);
-+                                   &id, &attr, &cat);
-     
- 
-         if (rc >= 0) {
-@@ -614,7 +613,7 @@
-     AGBufferReader * r = NULL;
- 
-     rc = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer, 
--                               &id, &bufferSize, &attr, &cat);
-+                               &id, &attr, &cat);
-     
-     if (rc < 0) {
-         if (verbose)
-@@ -652,7 +651,7 @@
-     AGBufferReader * r = NULL;
- 
-     rc = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer, 
--                               &id, &bufferSize, &attr, &cat);
-+                               &id, &attr, &cat);
-     
-     if (rc < 0) {
-         if (verbose)
-@@ -712,7 +711,7 @@
-         }
- 
-         result = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void 
*)buffer, 
--                                   &id, &bufferSize, &attr, &cat);
-+                                   &id, &attr, &cat);
-         
-         if (result < 0)
-             id = 0;
-@@ -1027,11 +1026,11 @@
-     result = (modonly) ?
-         dlp_ReadNextModifiedRec (pInfo->sd, pInfo->pilot_rHandle, 
pInfo->pilot_buffer,
-                                  &pInfo->id, &idx,
--                                 &size, &att, &cat)
-+                                 &att, &cat)
-         :
-         dlp_ReadRecordByIndex(pInfo->sd, pInfo->pilot_rHandle, idx,
-                               pInfo->pilot_buffer, &pInfo->id,
--                              &size, &att, &cat);
-+                              &att, &cat);
-     
-     if (result < 0) {
-         closeDatabase(pInfo);
-@@ -1388,7 +1387,6 @@
-                                    0, 
-                                    (void *)version_buffer, 
-                                    &id, 
--                                   &version_buffer_size,
-                                    &attr, 
-                                    &cat);
- 

Modified: trunk/experimental/common/main/finkinfo/libs/libmal10.info
URL: 
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/libmal10.info&rev=588&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/libmal10.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/libmal10.info Wed Jan 17 
16:50:33 2007
@@ -1,15 +1,15 @@
 Package: libmal10
-Version: 0.40
-Revision: 5
+Version: 0.43
+Revision: 1
 Conflicts: libmal
 Replaces: libmal
 BuildDependsOnly: true
 BuildDepends: pilot-link10, libiconv-dev, libncurses5, readline5
 Depends: %N-shlibs (>= %v-%r)
 Source: http://jasonday.home.att.net/code/libmal/libmal-%v.tar.gz
-Source-MD5: b570bc495101de915f3401d0baaf6b62
+Source-MD5: 211d4db4f984512e5d3d10c35443b881
 Patch: %n.patch
-SetCPPFLAGS: -I%p/lib/pilot-link10/include -no-cpp-precomp -fno-common 
-D__unix__ -DDARWIN
+SetCPPFLAGS: -I%p/lib/pilot-link10/include -fno-common -D__unix__ -DDARWIN
 NoSetLDFLAGS: true
 SetLDFLAGS: -L%p/lib/pilot-link10/lib -L%p/lib/ncurses/lib
 SetLIBS: -L%p/lib

Modified: trunk/experimental/common/main/finkinfo/libs/libmal10.patch
URL: 
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/libmal10.patch&rev=588&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/libmal10.patch (original)
+++ trunk/experimental/common/main/finkinfo/libs/libmal10.patch Wed Jan 17 
16:50:33 2007
@@ -1,110 +1,36 @@
-diff -uNr libmal-0.40/configure libmal-0.40-new/configure
---- libmal-0.40/configure      2004-01-29 22:00:34.000000000 -0500
-+++ libmal-0.40-new/configure  2006-09-07 21:59:06.000000000 -0400
-@@ -8401,7 +8401,7 @@
- 
- for pilot_libs in $pilot_prefix/lib /usr/lib /usr/local/lib/ \
-   /usr/extra/pilot/lib ; do
--   if test -r "$pilot_libs/libpisock.so" ; then
-+   if test -r "$pilot_libs/libpisock.dylib" ; then
-       pilotlibs=yes
-       PILOT_LIBS="-L$pilot_libs $PILOT_LIBS"
-       break
-diff -uNr libmal-0.40/malsync/mal/common/AGBase64.c 
libmal-0.40-new/malsync/mal/common/AGBase64.c
---- libmal-0.40/malsync/mal/common/AGBase64.c  2000-05-14 17:17:36.000000000 
-0400
-+++ libmal-0.40-new/malsync/mal/common/AGBase64.c      2006-09-07 
21:59:38.000000000 -0400
-@@ -103,7 +103,7 @@
-     int ixtext;
-     int lentext;
-     char ch, *ptr, *tptr;
--    char inbuf [3];
-+    char inbuf [4];
-     int ixinbuf;
-     int ignorechar;
-     int endtext = 0;
-diff -uNr libmal-0.40/malsync/mal/common/AGNet.h 
libmal-0.40-new/malsync/mal/common/AGNet.h
---- libmal-0.40/malsync/mal/common/AGNet.h     2003-08-09 14:52:30.000000000 
-0400
-+++ libmal-0.40-new/malsync/mal/common/AGNet.h 2006-09-07 21:59:06.000000000 
-0400
-@@ -61,7 +61,7 @@
+diff -uNr libmal-0.43/configure libmal-0.43-patched/configure
+--- libmal-0.43/configure      2006-12-11 22:20:52.000000000 -0500
++++ libmal-0.43-patched/configure      2007-01-17 10:33:51.000000000 -0500
+@@ -20216,7 +20216,7 @@
+ if test $pilotlibs = no ; then
+     for pilot_libs in $pilot_prefix/lib /usr/lib /usr/local/lib/ \
+         /usr/extra/pilot/lib ; do
+-        if test -r "$pilot_libs/libpisock.so" ; then
++        if test -r "$pilot_libs/libpisock.dylib" ; then
+             pilotlibs=yes
+             PILOT_LIBS="-L$pilot_libs $PILOT_LIBS"
+             break
+diff -uNr libmal-0.43/malsync/mal/common/AGNet.h 
libmal-0.43-patched/malsync/mal/common/AGNet.h
+--- libmal-0.43/malsync/mal/common/AGNet.h     2006-12-10 21:57:12.000000000 
-0500
++++ libmal-0.43-patched/malsync/mal/common/AGNet.h     2007-01-17 
10:34:48.000000000 -0500
+@@ -62,7 +62,7 @@
  #               include <sys/filio.h>
  #               include <arpa/inet.h>
  #           else
--#               if (defined(BSD) && BSD >= 199306) || defined(_HPUX_SOURCE)
-+#               if (defined(BSD) && BSD >= 199306) || defined(_HPUX_SOURCE) 
|| defined(__APPLE__)
+-#               if (defined(BSD) && BSD >= 199306) ||  defined(__OpenBSD__) 
|| defined(_HPUX_SOURCE)
++#               if (defined(BSD) && BSD >= 199306) ||  defined(__OpenBSD__) 
|| defined(_HPUX_SOURCE) || defined(__APPLE__)
  #                   include <sys/ioctl.h>
  #                   include <arpa/inet.h>
- #               else
-diff -uNr libmal-0.40/src/Makefile.in libmal-0.40-new/src/Makefile.in
---- libmal-0.40/src/Makefile.in        2004-01-29 22:00:33.000000000 -0500
-+++ libmal-0.40-new/src/Makefile.in    2006-09-07 21:59:06.000000000 -0400
-@@ -198,7 +198,7 @@
- 
+ #               elif defined(__GLIBC__)
+diff -uNr libmal-0.43/src/Makefile.in libmal-0.43-patched/src/Makefile.in
+--- libmal-0.43/src/Makefile.in        2006-12-11 22:20:47.000000000 -0500
++++ libmal-0.43-patched/src/Makefile.in        2007-01-17 10:35:15.000000000 
-0500
+@@ -303,7 +303,7 @@
+ malsync_LDADD = @LIBS@ @PILOT_LIBS@ libmal.la
+ lib_LTLIBRARIES = libmal.la
  libmal_la_SOURCES = libmal.c libmal.h $(MAL_SRC) $(MAL_HDRS)
- 
--libmal_la_LDFLAGS = $(PILOT_LIBS) -module -version-info 1:0:0
-+libmal_la_LDFLAGS = $(PILOT_LIBS) -ldl -version-info 1:0:0
- 
+-libmal_la_LDFLAGS = -module -version-info 1:0:0
++libmal_la_LDFLAGS = -version-info 1:0:0
+ libmal_la_LIBADD = @PILOT_LIBS@
  c_header_DATA = libmal.h $(MAL_HDRS)
  c_headerdir = $(includedir)/libmal
-diff -uNr libmal-0.40/src/libmal.c libmal-0.40-new/src/libmal.c
---- libmal-0.40/src/libmal.c   2004-01-29 15:58:55.000000000 -0500
-+++ libmal-0.40-new/src/libmal.c       2006-09-08 18:28:15.000000000 -0400
-@@ -291,8 +291,7 @@
- 
-         rc = dlp_ReadRecordByIndex(sd, database_id, 0, 
-                                    (void *)dev_db_info_buffer, 
--                                   &id, &dev_db_info_buffer_size, 
--                                   &attr, &cat);
-+                                   &id, &attr, &cat);
-     
- 
-         if (rc >= 0) {
-@@ -614,7 +613,7 @@
-     AGBufferReader * r = NULL;
- 
-     rc = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer, 
--                               &id, &bufferSize, &attr, &cat);
-+                               &id, &attr, &cat);
-     
-     if (rc < 0) {
-         if (verbose)
-@@ -652,7 +651,7 @@
-     AGBufferReader * r = NULL;
- 
-     rc = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer, 
--                               &id, &bufferSize, &attr, &cat);
-+                               &id, &attr, &cat);
-     
-     if (rc < 0) {
-         if (verbose)
-@@ -712,7 +711,7 @@
-         }
- 
-         result = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void 
*)buffer, 
--                                   &id, &bufferSize, &attr, &cat);
-+                                   &id, &attr, &cat);
-         
-         if (result < 0)
-             id = 0;
-@@ -1027,11 +1026,11 @@
-     result = (modonly) ?
-         dlp_ReadNextModifiedRec (pInfo->sd, pInfo->pilot_rHandle, 
pInfo->pilot_buffer,
-                                  &pInfo->id, &idx,
--                                 &size, &att, &cat)
-+                                 &att, &cat)
-         :
-         dlp_ReadRecordByIndex(pInfo->sd, pInfo->pilot_rHandle, idx,
-                               pInfo->pilot_buffer, &pInfo->id,
--                              &size, &att, &cat);
-+                              &att, &cat);
-     
-     if (result < 0) {
-         closeDatabase(pInfo);
-@@ -1388,7 +1387,6 @@
-                                    0, 
-                                    (void *)version_buffer, 
-                                    &id, 
--                                   &version_buffer_size,
-                                    &attr, 
-                                    &cat);
- 


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to