6 files changed, 60 insertions, 27 deletions

diff --git a/palm/synce-libsynce/Makefile b/palm/synce-libsynce/Makefile
index 57bae81f26e3..46d937b02576 100644
--- a/palm/synce-libsynce/Makefile
+++ b/palm/synce-libsynce/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	synce-libsynce
-PORTVERSION=	0.9.1
+PORTVERSION=	0.9.3
 CATEGORIES=	palm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	synce
@@ -17,8 +17,10 @@ MAN1=		synce.1
 
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
+WRKSRC=		${WRKDIR}/libsynce-${PORTVERSION}
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS+=	--with-libiconv-prefix=${LOCALBASE}
+CONFIGURE_ARGS+=	--with-libiconv-prefix=${LOCALBASE} \
+			--mandir=${MANPREFIX}/man
 
 USE_LDCONFIG=	yes
 
diff --git a/palm/synce-libsynce/distinfo b/palm/synce-libsynce/distinfo
index 20ff7af97138..1d1e7d91e76e 100644
--- a/palm/synce-libsynce/distinfo
+++ b/palm/synce-libsynce/distinfo
@@ -1,3 +1,3 @@
-MD5 (synce-libsynce-0.9.1.tar.gz) = 3fcffb776a5bedc23458152e5a650348
-SHA256 (synce-libsynce-0.9.1.tar.gz) = 78f342a77bd3b58b70377beb3eea8dd3319ead72300c66fc7ceda3139207ede5
-SIZE (synce-libsynce-0.9.1.tar.gz) = 356343
+MD5 (synce-libsynce-0.9.3.tar.gz) = 9b793d1ef241fa7fca6ca7832b3b4811
+SHA256 (synce-libsynce-0.9.3.tar.gz) = eebaf90c4de0992f94a7d665e656d75f34831868e377acb3f57264c1eb63ed8c
+SIZE (synce-libsynce-0.9.3.tar.gz) = 368963
diff --git a/palm/synce-libsynce/files/patch-Makefile.in b/palm/synce-libsynce/files/patch-Makefile.in
new file mode 100644
index 000000000000..53e194f2aa91
--- /dev/null
+++ b/palm/synce-libsynce/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in	Fri Jan 26 01:31:36 2007
++++ Makefile.in	Fri Jan 26 01:31:25 2007
+@@ -200,7 +200,7 @@
+ target_vendor = @target_vendor@
+ AUTOMAKE_OPTIONS = foreign 1.4
+ pcfiles = libsynce.pc
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = $(pcfiles)
+ EXTRA_DIST = libsynce.pc.in
+ CLEANFILES = $(pcfiles)
diff --git a/palm/synce-libsynce/files/patch-lib-files.c b/palm/synce-libsynce/files/patch-lib-files.c
deleted file mode 100644
index eca6826ada9a..000000000000
--- a/palm/synce-libsynce/files/patch-lib-files.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- lib/files.c.orig	Tue May 17 01:42:34 2005
-+++ lib/files.c	Fri Jul 29 21:26:37 2005
-@@ -45,7 +45,8 @@
- bool synce_get_directory(char** path)
- {
- 	char buffer[MAX_PATH];
--    char *p;
-+	char *p;
-+	struct passwd* user;
- 
- 	/* if there is a preference for config dir set
- 	   as an environment variable, use it */
-@@ -57,7 +58,7 @@
- 	}
- 	
- 	/* XXX: not very thread-safe? */
--	struct passwd* user = getpwuid(getuid());
-+	user = getpwuid(getuid());
- 
- 	if (!path)
- 		return false;
diff --git a/palm/synce-libsynce/files/patch-lib-synce_socket.c b/palm/synce-libsynce/files/patch-lib-synce_socket.c
new file mode 100644
index 000000000000..5ef26601a3fb
--- /dev/null
+++ b/palm/synce-libsynce/files/patch-lib-synce_socket.c
@@ -0,0 +1,41 @@
+--- lib/synce_socket.c.orig	Thu Sep 14 17:38:41 2006
++++ lib/synce_socket.c	Fri Jan 26 01:18:32 2007
+@@ -138,32 +138,31 @@
+ 
+ bool synce_socket_connect_proxy(SynceSocket* syncesock, const char* remoteIpAddress)
+ {
++    char *path;
++    char socketPath[256];
++    struct sockaddr_un proxyaddr;
++    size_t size;
++
+     synce_socket_close(syncesock);
+ 
+     if (!synce_socket_create_proxy(syncesock))
+         goto fail;
+ 
+ 
+-    char *path;
+-
+     if (!synce_get_subdirectory("rapi2", &path)) {
+         goto fail;
+     }
+ 
+-    char socketPath[256];
+-
+     strncpy(socketPath, path, 256);
+     strncat(socketPath, "/", 256 - strlen(socketPath));
+     strncat(socketPath, remoteIpAddress, 256 - strlen(socketPath));
+ 
+     free(path);
+ 
+-    struct sockaddr_un proxyaddr;
+-
+     proxyaddr.sun_family = AF_LOCAL;
+     strncpy(proxyaddr.sun_path, socketPath, sizeof(proxyaddr.sun_path));
+ 
+-    size_t size = (offsetof (struct sockaddr_un, sun_path) + strlen(proxyaddr.sun_path) + 1);
++    size = (offsetof (struct sockaddr_un, sun_path) + strlen(proxyaddr.sun_path) + 1);
+ 
+     if (connect(syncesock->fd, (struct sockaddr *) &proxyaddr, size) < 0)
+         goto fail;
diff --git a/palm/synce-libsynce/pkg-plist b/palm/synce-libsynce/pkg-plist
index 7a991641f24f..0ecc95389f2d 100644
--- a/palm/synce-libsynce/pkg-plist
+++ b/palm/synce-libsynce/pkg-plist
@@ -9,4 +9,4 @@ lib/libsynce.a
 lib/libsynce.la
 lib/libsynce.so
 lib/libsynce.so.0
-share/aclocal/libsynce.m4
+libdata/pkgconfig/libsynce.pc