Update to 0.9.3

9 files changed, 95 insertions, 7 deletions

diff --git a/palm/synce-librapi2/Makefile b/palm/synce-librapi2/Makefile
index cabde917dd1b..365545dfc728 100644
--- a/palm/synce-librapi2/Makefile
+++ b/palm/synce-librapi2/Makefile
@@ -5,10 +5,11 @@
 # $FreeBSD$
 
 PORTNAME=	synce-librapi2
-PORTVERSION=	0.9.1
+PORTVERSION=	0.9.3
 CATEGORIES=	palm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	synce
+DISTNAME=	synce-librapi-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utilities/libraries to make RAPI calls on WinCE devices
@@ -21,9 +22,11 @@ MAN1=		pcp.1 pls.1 pmkdir.1 pmv.1 prm.1 prmdir.1 prun.1 pstatus.1 rapiconfig.1 s
 
 GNU_CONFIGURE=	yes
 USE_ICONV=	yes
+WRKSRC=		${WRKDIR}/librapi-${PORTVERSION}
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS+=	--with-libiconv=${LOCALBASE}
-CONFIGURE_ARGS+=	--with-libsynce=${LOCALBASE}
+CONFIGURE_ARGS+=	--with-libiconv=${LOCALBASE} \
+			--with-libsynce=${LOCALBASE} \
+			--mandir=${MANPREFIX}/man
 
 USE_LDCONFIG=	yes
 
diff --git a/palm/synce-librapi2/distinfo b/palm/synce-librapi2/distinfo
index 6ae71015780f..82deeb08f67a 100644
--- a/palm/synce-librapi2/distinfo
+++ b/palm/synce-librapi2/distinfo
@@ -1,3 +1,3 @@
-MD5 (synce-librapi2-0.9.1.tar.gz) = 6ab07aa21dfbdb1047348b3a47071a3a
-SHA256 (synce-librapi2-0.9.1.tar.gz) = cb2b8448f42ec536b552d0221a4449cf9608793976ffa0d9770b33f669ad9f66
-SIZE (synce-librapi2-0.9.1.tar.gz) = 386579
+MD5 (synce-librapi-0.9.3.tar.gz) = 1dcb43bbbb43688839c3b19de77b7b4e
+SHA256 (synce-librapi-0.9.3.tar.gz) = 9e0b68fea0592a7cf8379676c389b6bace796a291f24ac21744e5977c6081f45
+SIZE (synce-librapi-0.9.3.tar.gz) = 425329
diff --git a/palm/synce-librapi2/files/patch-Makefile.in b/palm/synce-librapi2/files/patch-Makefile.in
new file mode 100644
index 000000000000..09938616de33
--- /dev/null
+++ b/palm/synce-librapi2/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Fri Jan 26 02:04:18 2007
++++ Makefile.in	Fri Jan 26 02:06:21 2007
+@@ -194,7 +194,7 @@
+ target_vendor = @target_vendor@
+ AUTOMAKE_OPTIONS = foreign 1.4
+ pcfiles = librapi2.pc
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = $(pcfiles)
+ EXTRA_DIST = librapi2.pc.in
+ CLEANFILES = $(pcfiles)
diff --git a/palm/synce-librapi2/files/patch-src-connection.c b/palm/synce-librapi2/files/patch-src-connection.c
new file mode 100644
index 000000000000..994b5509857a
--- /dev/null
+++ b/palm/synce-librapi2/files/patch-src-connection.c
@@ -0,0 +1,15 @@
+--- src/connection.c.orig	Fri Jan 26 02:16:40 2007
++++ src/connection.c	Fri Jan 26 02:17:25 2007
+@@ -14,10 +14,11 @@
+ 
+ RapiConnection* rapi_connection_from_path(const char* path)
+ {
++  RapiConnection* result;
+   SynceInfo* info = synce_info_new(path);
+   if (info == NULL)
+     return NULL;
+-  RapiConnection* result = rapi_connection_from_info(info);
++  result = rapi_connection_from_info(info);
+   if (result)
+     result->owned_info = info;
+ 
diff --git a/palm/synce-librapi2/files/patch-src-rapi2-file_management2.c b/palm/synce-librapi2/files/patch-src-rapi2-file_management2.c
new file mode 100644
index 000000000000..b3ce2a7db611
--- /dev/null
+++ b/palm/synce-librapi2/files/patch-src-rapi2-file_management2.c
@@ -0,0 +1,19 @@
+--- src/rapi2/file_management2.c.orig	Fri Jan 26 02:12:41 2007
++++ src/rapi2/file_management2.c	Fri Jan 26 02:13:40 2007
+@@ -40,6 +40,7 @@
+ {
+     RapiContext* context = rapi_context_current();
+     uint32_t count = 0;
++    uint32_t unknown;
+ 
+     rapi_context_begin_command(context, 0x1a);
+     rapi2_buffer_write_string(context->send_buffer, szPath);
+@@ -50,7 +51,7 @@
+ 
+     /* TODO Don't know this two uint32_t fields */
+     rapi_buffer_read_uint32(context->recv_buffer, &context->last_error);
+-    uint32_t unknown;
++
+     rapi_buffer_read_uint32(context->recv_buffer, &unknown);
+ 
+     rapi_buffer_read_uint32(context->recv_buffer, &count);
diff --git a/palm/synce-librapi2/files/patch-src_rapi_invoke.c b/palm/synce-librapi2/files/patch-src_rapi_invoke.c
new file mode 100644
index 000000000000..929669891dbb
--- /dev/null
+++ b/palm/synce-librapi2/files/patch-src_rapi_invoke.c
@@ -0,0 +1,10 @@
+--- src/rapi/invoke.c.orig	Fri Jan 26 01:58:51 2007
++++ src/rapi/invoke.c	Fri Jan 26 01:59:15 2007
+@@ -1,6 +1,7 @@
+ /* $Id: invoke.c 2355 2006-04-07 18:47:20Z voc $ */
+ #include "rapi_api.h"
+ #include "rapi_context.h"
++#include <sys/socket.h>
+ #include <assert.h>
+ #include <stdlib.h>
+ 
diff --git a/palm/synce-librapi2/files/patch-tools-pcp.c b/palm/synce-librapi2/files/patch-tools-pcp.c
new file mode 100644
index 000000000000..a4590d4eb74c
--- /dev/null
+++ b/palm/synce-librapi2/files/patch-tools-pcp.c
@@ -0,0 +1,11 @@
+--- tools/pcp.c.orig	Wed Apr  5 17:58:44 2006
++++ tools/pcp.c	Fri Jan 26 02:34:34 2007
+@@ -278,7 +278,7 @@
+ 			printf("File copy took less than one second!\n");
+ 		else
+ 			printf("File copy of %i bytes took %li minutes and %li seconds, that's %li bytes/s.\n",
+-					bytes_copied, duration / 60, duration % 60, bytes_copied / duration);
++					bytes_copied, (long)duration / 60, (long)duration % 60, (long)bytes_copied / duration);
+ 
+ 	}
+ 
diff --git a/palm/synce-librapi2/files/patch-tools-pshortcut.c b/palm/synce-librapi2/files/patch-tools-pshortcut.c
new file mode 100644
index 000000000000..d4b3164d6c03
--- /dev/null
+++ b/palm/synce-librapi2/files/patch-tools-pshortcut.c
@@ -0,0 +1,19 @@
+--- tools/pshortcut.c.orig	Fri Jan 26 02:19:29 2007
++++ tools/pshortcut.c	Fri Jan 26 02:21:07 2007
+@@ -77,6 +77,7 @@
+   WCHAR* wide_target = NULL;
+   WCHAR *tmp, *tmp_quote;
+   int tmpsize;
++  BOOL res;
+ 
+   if (!handle_parameters(argc, argv, &shortcut, &target))
+     goto exit;
+@@ -123,7 +124,7 @@
+   wstr_free_string(tmp_quote);
+   wide_target = tmp;
+   
+-  BOOL res = CeSHCreateShortcut(wide_shortcut, wide_target);
++  res = CeSHCreateShortcut(wide_shortcut, wide_target);
+   if (!res)
+   {
+     fprintf(stderr, "%s: Unable to create shortcut to '%s' at '%s': %s\n",
diff --git a/palm/synce-librapi2/pkg-plist b/palm/synce-librapi2/pkg-plist
index 8c447386ddf9..9c628dd67f98 100644
--- a/palm/synce-librapi2/pkg-plist
+++ b/palm/synce-librapi2/pkg-plist
@@ -16,4 +16,4 @@ lib/librapi.a
 lib/librapi.la
 lib/librapi.so
 lib/librapi.so.2
-share/aclocal/librapi2.m4
+libdata/pkgconfig/librapi2.pc