18 files changed, 162 insertions, 34 deletions

diff --git a/palm/synce-dccm/Makefile b/palm/synce-dccm/Makefile
index 958802e71428..49f8e93493e8 100644
--- a/palm/synce-dccm/Makefile
+++ b/palm/synce-dccm/Makefile
@@ -5,28 +5,22 @@
 # $FreeBSD$
 
 PORTNAME=	synce-dccm
-PORTVERSION=	0.9.1
+PORTVERSION=	0.9.3
 CATEGORIES=	palm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	synce
+DISTNAME=	synce-vdccm-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Listener daemon for connections from WinCE devices
 
 LIB_DEPENDS+=	synce.0:${PORTSDIR}/palm/synce-libsynce
 
-MAN1=		dccm.1 synce-sound.1
-
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS+=	--with-libiconv=${LOCALBASE}
-CONFIGURE_ARGS+=	--with-libsynce=${LOCALBASE}
 USE_ICONV=	yes
-
-post-install:
-	@${ECHO_CMD} "*******************************************************************************"
-	@${ECHO_CMD} "*** Edit ${PREFIX}/bin/synce-sound and substitute 'playwave' "
-	@${ECHO_CMD} "*** for your wavefile player of choice."
-	@${ECHO_CMD} "*******************************************************************************"
+WRKSRC=		${WRKDIR}/vdccm-${PORTVERSION}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS+=	--with-libiconv=${LOCALBASE} \
+			--with-libsynce=${LOCALBASE}
 
 .include <bsd.port.mk>
diff --git a/palm/synce-dccm/distinfo b/palm/synce-dccm/distinfo
index dbc9f0040cc5..4627849cf735 100644
--- a/palm/synce-dccm/distinfo
+++ b/palm/synce-dccm/distinfo
@@ -1,3 +1,3 @@
-MD5 (synce-dccm-0.9.1.tar.gz) = 8818b71133049fe9c739166225aebe0c
-SHA256 (synce-dccm-0.9.1.tar.gz) = a7de5a303a3784a5b6921e6a880962265b600543283c8934c5f023f631682acd
-SIZE (synce-dccm-0.9.1.tar.gz) = 292930
+MD5 (synce-vdccm-0.9.3.tar.gz) = 996236320a6b4c9410050c4dc6e53164
+SHA256 (synce-vdccm-0.9.3.tar.gz) = e2e26ff503c242189c3cdc4778db72c38d28c86c0a18f7a1d2fda26801789571
+SIZE (synce-vdccm-0.9.3.tar.gz) = 354000
diff --git a/palm/synce-dccm/files/patch-lib-localsocket.h b/palm/synce-dccm/files/patch-lib-localsocket.h
new file mode 100644
index 000000000000..8c38131e73bc
--- /dev/null
+++ b/palm/synce-dccm/files/patch-lib-localsocket.h
@@ -0,0 +1,10 @@
+--- lib/localsocket.h.orig	Fri Jan 26 03:40:07 2007
++++ lib/localsocket.h	Fri Jan 26 03:40:23 2007
+@@ -24,6 +24,7 @@
+ #define LOCALSOCKET_H
+ 
+ #include <string>
++#include <sys/socket.h>
+ #include <sys/un.h>
+ #include "netsocket.h"
+ 
diff --git a/palm/synce-dccm/files/patch-lib-tcpconnectedsocket.cpp b/palm/synce-dccm/files/patch-lib-tcpconnectedsocket.cpp
new file mode 100644
index 000000000000..55ee2ae5e7e6
--- /dev/null
+++ b/palm/synce-dccm/files/patch-lib-tcpconnectedsocket.cpp
@@ -0,0 +1,14 @@
+--- lib/tcpconnectedsocket.cpp.orig	Thu Jun 29 22:01:48 2006
++++ lib/tcpconnectedsocket.cpp	Fri Jan 26 20:36:48 2007
+@@ -149,8 +149,10 @@
+ int TCPConnectedSocket::getMTU()
+ {
+     int s;
++    struct protoent *pent;
+     socklen_t r = sizeof(int);
+-    if (getsockopt(getDescriptor(), SOL_IP, IP_MTU, &s, &r) < 0) {
++    pent = getprotobyname ("ip");
++    if (getsockopt(getDescriptor(), ((pent != NULL) ? pent->p_proto : 0), IP_MTU, &s, &r) < 0) {
+         s = -1;
+     }
+ 
diff --git a/palm/synce-dccm/files/patch-lib-tcpsocket.h b/palm/synce-dccm/files/patch-lib-tcpsocket.h
new file mode 100644
index 000000000000..ca63569939d9
--- /dev/null
+++ b/palm/synce-dccm/files/patch-lib-tcpsocket.h
@@ -0,0 +1,10 @@
+--- lib/tcpsocket.h.orig	Fri Jan 26 03:21:01 2007
++++ lib/tcpsocket.h	Fri Jan 26 03:21:48 2007
+@@ -24,6 +24,7 @@
+ #define TCPSOCKET_H
+ 
+ #include <string>
++#include <sys/socket.h>
+ #include <netinet/in.h>
+ #include "netsocket.h"
+ 
diff --git a/palm/synce-dccm/files/patch-lib-udpsocket.cpp b/palm/synce-dccm/files/patch-lib-udpsocket.cpp
new file mode 100644
index 000000000000..52c134c9b4c8
--- /dev/null
+++ b/palm/synce-dccm/files/patch-lib-udpsocket.cpp
@@ -0,0 +1,11 @@
+--- lib/udpsocket.cpp.orig	Sun May  7 18:49:36 2006
++++ lib/udpsocket.cpp	Fri Jan 26 19:21:19 2007
+@@ -10,6 +10,8 @@
+ //
+ //
+ #include "udpsocket.h"
++#include <netinet/in.h>
++#include <sys/socket.h>
+ #include <netdb.h>
+ 
+ using namespace std;
diff --git a/palm/synce-dccm/files/patch-src-vdccm.cpp b/palm/synce-dccm/files/patch-src-vdccm.cpp
new file mode 100644
index 000000000000..13cef7eda098
--- /dev/null
+++ b/palm/synce-dccm/files/patch-src-vdccm.cpp
@@ -0,0 +1,11 @@
+--- src/vdccm.cpp.orig	Fri Jan 26 19:24:38 2007
++++ src/vdccm.cpp	Fri Jan 26 19:26:01 2007
+@@ -34,7 +34,7 @@
+ #include <localserversocket.h>
+ #include <synce_log.h>
+ #include <iostream>
+-#include <wait.h>
++#include <sys/wait.h>
+ 
+ using namespace synce;
+ using namespace std;
diff --git a/palm/synce-dccm/files/patch-testtools-triggerconnection.cpp b/palm/synce-dccm/files/patch-testtools-triggerconnection.cpp
new file mode 100644
index 000000000000..e06a9fa8720c
--- /dev/null
+++ b/palm/synce-dccm/files/patch-testtools-triggerconnection.cpp
@@ -0,0 +1,10 @@
+--- testtools/triggerconnection.cpp.orig	Fri Jan 26 19:27:52 2007
++++ testtools/triggerconnection.cpp	Fri Jan 26 19:28:25 2007
+@@ -16,6 +16,7 @@
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ 
+ 
+ int main(int argc, char *argv[])
diff --git a/palm/synce-dccm/pkg-plist b/palm/synce-dccm/pkg-plist
index 9a16a315830c..cbdc5b6b9a9a 100644
--- a/palm/synce-dccm/pkg-plist
+++ b/palm/synce-dccm/pkg-plist
@@ -1,2 +1,6 @@
-bin/dccm
-bin/synce-sound
+bin/vdccm
+bin/proxyclient
+bin/triggerconnection
+lib/libdescriptor.la
+lib/libdescriptor.so
+lib/libdescriptor.so.0
diff --git a/palm/synce-vdccm/Makefile b/palm/synce-vdccm/Makefile
index 958802e71428..49f8e93493e8 100644
--- a/palm/synce-vdccm/Makefile
+++ b/palm/synce-vdccm/Makefile
@@ -5,28 +5,22 @@
 # $FreeBSD$
 
 PORTNAME=	synce-dccm
-PORTVERSION=	0.9.1
+PORTVERSION=	0.9.3
 CATEGORIES=	palm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	synce
+DISTNAME=	synce-vdccm-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Listener daemon for connections from WinCE devices
 
 LIB_DEPENDS+=	synce.0:${PORTSDIR}/palm/synce-libsynce
 
-MAN1=		dccm.1 synce-sound.1
-
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS+=	--with-libiconv=${LOCALBASE}
-CONFIGURE_ARGS+=	--with-libsynce=${LOCALBASE}
 USE_ICONV=	yes
-
-post-install:
-	@${ECHO_CMD} "*******************************************************************************"
-	@${ECHO_CMD} "*** Edit ${PREFIX}/bin/synce-sound and substitute 'playwave' "
-	@${ECHO_CMD} "*** for your wavefile player of choice."
-	@${ECHO_CMD} "*******************************************************************************"
+WRKSRC=		${WRKDIR}/vdccm-${PORTVERSION}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS+=	--with-libiconv=${LOCALBASE} \
+			--with-libsynce=${LOCALBASE}
 
 .include <bsd.port.mk>
diff --git a/palm/synce-vdccm/distinfo b/palm/synce-vdccm/distinfo
index dbc9f0040cc5..4627849cf735 100644
--- a/palm/synce-vdccm/distinfo
+++ b/palm/synce-vdccm/distinfo
@@ -1,3 +1,3 @@
-MD5 (synce-dccm-0.9.1.tar.gz) = 8818b71133049fe9c739166225aebe0c
-SHA256 (synce-dccm-0.9.1.tar.gz) = a7de5a303a3784a5b6921e6a880962265b600543283c8934c5f023f631682acd
-SIZE (synce-dccm-0.9.1.tar.gz) = 292930
+MD5 (synce-vdccm-0.9.3.tar.gz) = 996236320a6b4c9410050c4dc6e53164
+SHA256 (synce-vdccm-0.9.3.tar.gz) = e2e26ff503c242189c3cdc4778db72c38d28c86c0a18f7a1d2fda26801789571
+SIZE (synce-vdccm-0.9.3.tar.gz) = 354000
diff --git a/palm/synce-vdccm/files/patch-lib-localsocket.h b/palm/synce-vdccm/files/patch-lib-localsocket.h
new file mode 100644
index 000000000000..8c38131e73bc
--- /dev/null
+++ b/palm/synce-vdccm/files/patch-lib-localsocket.h
@@ -0,0 +1,10 @@
+--- lib/localsocket.h.orig	Fri Jan 26 03:40:07 2007
++++ lib/localsocket.h	Fri Jan 26 03:40:23 2007
+@@ -24,6 +24,7 @@
+ #define LOCALSOCKET_H
+ 
+ #include <string>
++#include <sys/socket.h>
+ #include <sys/un.h>
+ #include "netsocket.h"
+ 
diff --git a/palm/synce-vdccm/files/patch-lib-tcpconnectedsocket.cpp b/palm/synce-vdccm/files/patch-lib-tcpconnectedsocket.cpp
new file mode 100644
index 000000000000..55ee2ae5e7e6
--- /dev/null
+++ b/palm/synce-vdccm/files/patch-lib-tcpconnectedsocket.cpp
@@ -0,0 +1,14 @@
+--- lib/tcpconnectedsocket.cpp.orig	Thu Jun 29 22:01:48 2006
++++ lib/tcpconnectedsocket.cpp	Fri Jan 26 20:36:48 2007
+@@ -149,8 +149,10 @@
+ int TCPConnectedSocket::getMTU()
+ {
+     int s;
++    struct protoent *pent;
+     socklen_t r = sizeof(int);
+-    if (getsockopt(getDescriptor(), SOL_IP, IP_MTU, &s, &r) < 0) {
++    pent = getprotobyname ("ip");
++    if (getsockopt(getDescriptor(), ((pent != NULL) ? pent->p_proto : 0), IP_MTU, &s, &r) < 0) {
+         s = -1;
+     }
+ 
diff --git a/palm/synce-vdccm/files/patch-lib-tcpsocket.h b/palm/synce-vdccm/files/patch-lib-tcpsocket.h
new file mode 100644
index 000000000000..ca63569939d9
--- /dev/null
+++ b/palm/synce-vdccm/files/patch-lib-tcpsocket.h
@@ -0,0 +1,10 @@
+--- lib/tcpsocket.h.orig	Fri Jan 26 03:21:01 2007
++++ lib/tcpsocket.h	Fri Jan 26 03:21:48 2007
+@@ -24,6 +24,7 @@
+ #define TCPSOCKET_H
+ 
+ #include <string>
++#include <sys/socket.h>
+ #include <netinet/in.h>
+ #include "netsocket.h"
+ 
diff --git a/palm/synce-vdccm/files/patch-lib-udpsocket.cpp b/palm/synce-vdccm/files/patch-lib-udpsocket.cpp
new file mode 100644
index 000000000000..52c134c9b4c8
--- /dev/null
+++ b/palm/synce-vdccm/files/patch-lib-udpsocket.cpp
@@ -0,0 +1,11 @@
+--- lib/udpsocket.cpp.orig	Sun May  7 18:49:36 2006
++++ lib/udpsocket.cpp	Fri Jan 26 19:21:19 2007
+@@ -10,6 +10,8 @@
+ //
+ //
+ #include "udpsocket.h"
++#include <netinet/in.h>
++#include <sys/socket.h>
+ #include <netdb.h>
+ 
+ using namespace std;
diff --git a/palm/synce-vdccm/files/patch-src-vdccm.cpp b/palm/synce-vdccm/files/patch-src-vdccm.cpp
new file mode 100644
index 000000000000..13cef7eda098
--- /dev/null
+++ b/palm/synce-vdccm/files/patch-src-vdccm.cpp
@@ -0,0 +1,11 @@
+--- src/vdccm.cpp.orig	Fri Jan 26 19:24:38 2007
++++ src/vdccm.cpp	Fri Jan 26 19:26:01 2007
+@@ -34,7 +34,7 @@
+ #include <localserversocket.h>
+ #include <synce_log.h>
+ #include <iostream>
+-#include <wait.h>
++#include <sys/wait.h>
+ 
+ using namespace synce;
+ using namespace std;
diff --git a/palm/synce-vdccm/files/patch-testtools-triggerconnection.cpp b/palm/synce-vdccm/files/patch-testtools-triggerconnection.cpp
new file mode 100644
index 000000000000..e06a9fa8720c
--- /dev/null
+++ b/palm/synce-vdccm/files/patch-testtools-triggerconnection.cpp
@@ -0,0 +1,10 @@
+--- testtools/triggerconnection.cpp.orig	Fri Jan 26 19:27:52 2007
++++ testtools/triggerconnection.cpp	Fri Jan 26 19:28:25 2007
+@@ -16,6 +16,7 @@
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ 
+ 
+ int main(int argc, char *argv[])
diff --git a/palm/synce-vdccm/pkg-plist b/palm/synce-vdccm/pkg-plist
index 9a16a315830c..cbdc5b6b9a9a 100644
--- a/palm/synce-vdccm/pkg-plist
+++ b/palm/synce-vdccm/pkg-plist
@@ -1,2 +1,6 @@
-bin/dccm
-bin/synce-sound
+bin/vdccm
+bin/proxyclient
+bin/triggerconnection
+lib/libdescriptor.la
+lib/libdescriptor.so
+lib/libdescriptor.so.0