6 files changed, 32 insertions, 58 deletions

diff --git a/palm/synce-librapi2/Makefile b/palm/synce-librapi2/Makefile
index 92a65dd1f68a..ddb400c2560e 100644
--- a/palm/synce-librapi2/Makefile
+++ b/palm/synce-librapi2/Makefile
@@ -4,35 +4,46 @@
 #
 # $FreeBSD$
 
-PORTNAME=	synce-librapi2
-PORTVERSION=	0.9.3
+PORTNAME=	librapi2
+PORTVERSION=	0.12
 CATEGORIES=	palm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	synce
-DISTNAME=	synce-librapi-${PORTVERSION}
+PKGNAMEPREFIX?=	synce-
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Utilities/libraries to make RAPI calls on WinCE devices
+MAINTAINER=	webmaster@kibab.com
+COMMENT?=	Utilities/libraries to make RAPI calls on WinCE devices
 
-BUILD_DEPENDS+=	pkg-config:${PORTSDIR}/devel/pkg-config
 LIB_DEPENDS+=	synce.0:${PORTSDIR}/palm/synce-libsynce
 
-ONLY_FOR_ARCHS=	i386 amd64
-
-MAN1=		pcp.1 pls.1 pmkdir.1 pmv.1 prm.1 prmdir.1 prun.1 pstatus.1 rapiconfig.1 synce-install-cab.1 synce-remove-program.1 synce-list-programs.1
-
 GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_ICONV=	yes
-WRKSRC=		${WRKDIR}/librapi-${PORTVERSION}
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS+=	--with-libiconv=${LOCALBASE} \
-			--with-libsynce=${LOCALBASE}
-
+USE_GNOME=	gnomehack gnometarget
 USE_LDCONFIG=	yes
+CONFIGURE_ARGS=	--with-libiconv="${LOCALBASE}" \
+			--with-libsynce="${LOCALBASE}"
+
+.include <bsd.port.pre.mk>
+
+.if defined(RAPI_SLAVE) && ${RAPI_SLAVE} == "pythonb"
+CONFIGURE_ARGS+=	--enable-python-bindings
+.else
+CONFIGURE_ARGS+=	--disable-python-bindings
+
+MAN1=		pcp.1 pkillall.1 pls.1 pmkdir.1 \
+		pmv.1 prm.1 prmdir.1 prun.1 \
+		psettime.1 pshortcut.1 pstatus.1 \
+		rapiconfig.1 synce-install-cab.1 \
+		synce-list-programs.1 synce-registry.1 \
+		synce-remove-program.1
+MAN3=		rapi_connection_from_name.3
 
 post-patch:
 .for f in synce-install-cab.in synce-remove-program.in
-	@${REINPLACE_CMD} -e 's+bin/bash+bin/sh+' ${WRKSRC}/script/${f}
+	@${REINPLACE_CMD} -e 's|bin/bash|bin/sh|' ${WRKSRC}/script/${f}
 .endfor
 
-.include <bsd.port.mk>
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/palm/synce-librapi2/distinfo b/palm/synce-librapi2/distinfo
index 82deeb08f67a..f9f111d4ed30 100644
--- a/palm/synce-librapi2/distinfo
+++ b/palm/synce-librapi2/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (librapi2-0.12.tar.gz) = 80aa988bb37e40066abf204c6a8d6f7a
+SHA256 (librapi2-0.12.tar.gz) = 254eef973a685f89ace6d389f528936df0bc23d56fc673dc73354d77ac3d47bc
+SIZE (librapi2-0.12.tar.gz) = 483287
diff --git a/palm/synce-librapi2/files/patch-Makefile.in b/palm/synce-librapi2/files/patch-Makefile.in
deleted file mode 100644
index 09938616de33..000000000000
--- a/palm/synce-librapi2/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 994b5509857a..000000000000
--- a/palm/synce-librapi2/files/patch-src-connection.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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-tools-pcp.c b/palm/synce-librapi2/files/patch-tools-pcp.c
deleted file mode 100644
index a4590d4eb74c..000000000000
--- a/palm/synce-librapi2/files/patch-tools-pcp.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/pkg-plist b/palm/synce-librapi2/pkg-plist
index 710f13523428..4ba84f983837 100644
--- a/palm/synce-librapi2/pkg-plist
+++ b/palm/synce-librapi2/pkg-plist
@@ -6,8 +6,8 @@ bin/pmv
 bin/prm
 bin/prmdir
 bin/prun
-bin/pshortcut
 bin/psettime
+bin/pshortcut
 bin/pstatus
 bin/rapiconfig
 bin/synce-install-cab