5 files changed, 116 insertions, 92 deletions

diff --git a/devel/libopensync/Makefile b/devel/libopensync/Makefile
index f79de82bb205..ca247c1c3848 100644
--- a/devel/libopensync/Makefile
+++ b/devel/libopensync/Makefile
@@ -6,38 +6,28 @@
 #
 
 PORTNAME=	libopensync
-PORTVERSION=	0.17
-PORTREVISION=	2
+PORTVERSION=	0.30
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
-		http://www.opensync.org/attachment/wiki/download/
-MASTER_SITE_SUBDIR=	ahze
-EXTRACT_SUFX=	.tar.gz\?rev=\&format=raw
+MASTER_SITES=	http://www.opensync.org/attachment/wiki/download/
+DISTNAME=	libopensync-${PORTVERSION}
+EXTRACT_SUFX=	.tar.bz2\?rev=\&format=raw
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Freedesktop synchronization framework
+COMMENT=	A PIM data synchronization framework
 
-BUILD_DEPENDS=	swig1.3:${PORTSDIR}/devel/swig13
 LIB_DEPENDS=	sqlite3.8:${PORTSDIR}/databases/sqlite3
-RUN_DEPENDS=	swig1.3:${PORTSDIR}/devel/swig13
 
-CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS}"
-GNU_CONFIGURE=	yes
-USE_PYTHON=	yes
-USE_GNOME=	gnomehack glib20 libxml2
-INSTALLS_SHLIB=	yes
-
-pre-everything::
-	@${ECHO_MSG} "NOTE: You may want to avoid extra dependencies"
-	@${ECHO_MSG} " from devel/swig13 by building with the following"
-	@${ECHO_MSG} " SWIG_LANGUAGES=\"perl python\""
-	@${ECHO_MSG}
+USE_BZIP2=	yes
+USE_GNOME=	glib20 libxml2
+USE_LDCONFIG=	yes
+USE_SCONS=	yes
+SCONS_ARGS=	prefix=${PREFIX}
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|$${libdir}/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
-		${WRKSRC}/Makefile.in
-	${REINPLACE_CMD} -e "s,-Werror,," ${WRKSRC}/opensync/Makefile.in \
-		${WRKSRC}/osengine/Makefile.in
-	${REINPLACE_CMD} -e "s,echo aout, echo elf,g" ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|$$libsuffix/pkgconfig|libdata/pkgconfig|' ${WRKSRC}/SConstruct
+	@${REINPLACE_CMD} -e 's|gthread-2.0|gthread-2.0 pthread|' ${WRKSRC}/opensync/SConscript
+
+post-install:
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/devel/libopensync/distinfo b/devel/libopensync/distinfo
index 8ca58d4c941c..b998d85d5c6f 100644
--- a/devel/libopensync/distinfo
+++ b/devel/libopensync/distinfo
@@ -1,3 +1,3 @@
-MD5 (libopensync-0.17.tar.gz?rev=&format=raw) = 24e5eeef1967fe10743da51d964aab1e
-SHA256 (libopensync-0.17.tar.gz?rev=&format=raw) = e1591240aee06b804adb2d49650f73ae013de344418eb4cdca2b04ef1cef79e0
-SIZE (libopensync-0.17.tar.gz?rev=&format=raw) = 587645
+MD5 (libopensync-0.30.tar.bz2?rev=&format=raw) = 1b52417878ab4ede584ce18edacfa548
+SHA256 (libopensync-0.30.tar.bz2?rev=&format=raw) = 0a1cfcb736d3569f8bced7e2e6c48d3168a0e97dee40705d09c5adfadcf6a463
+SIZE (libopensync-0.30.tar.bz2?rev=&format=raw) = 862123
diff --git a/devel/libopensync/pkg-descr b/devel/libopensync/pkg-descr
index 3868912c438a..125b9a80fc61 100644
--- a/devel/libopensync/pkg-descr
+++ b/devel/libopensync/pkg-descr
@@ -1,7 +1,5 @@
-OpenSync is a synchronization framework that is platform and distribution
-independent. It consists of several plugins that can be used to connect to
-devices, a powerfull sync-engine and the framework itself. The synchronization
-framework is kept very flexible and is capable of synchronizing any type of
-data, including contacts, calendar, tasks, notes and files.
-
-WWW: http://www.opensync.org/wiki
+OpenSync is a PIM (Personal Information Management) data synchronization 
+framework that consists of several plug-ins that can be used to 
+connect to different devices and systems. For a list of currently supported
+devices see http://www.opensync.org/wiki/DeviceCompatibilityList.
+WWW: http://www.opensync.org/wiki/Evo2-File
diff --git a/devel/libopensync/pkg-message b/devel/libopensync/pkg-message
new file mode 100644
index 000000000000..734892f05e6d
--- /dev/null
+++ b/devel/libopensync/pkg-message
@@ -0,0 +1,8 @@
+Think about using a multisync-gui, start by trying to sync your various devices
+and applications one by one with a directory; then try to assemble the devices
+in the way you want.
+
+Do not disable the syncing of data, as it disables syncing everything.
+
+See http://www.opensync.org/wiki/DeviceCompatibilityList for a list of
+compatible devices.
diff --git a/devel/libopensync/pkg-plist b/devel/libopensync/pkg-plist
index b2d32fc02d01..79d660cd5a70 100644
--- a/devel/libopensync/pkg-plist
+++ b/devel/libopensync/pkg-plist
@@ -1,66 +1,94 @@
+bin/osplugin
+bin/osyncbinary
 bin/osyncdump
-bin/osyncplugin
-bin/osyncstress
-include/opensync-1.0/opensync/opensync-xml.h
+include/opensync-1.0/opensync/archive/opensync_archive.h
+include/opensync-1.0/opensync/data/opensync_change.h
+include/opensync-1.0/opensync/data/opensync_data.h
+include/opensync-1.0/opensync/engine/opensync_engine.h
+include/opensync-1.0/opensync/engine/opensync_obj_engine.h
+include/opensync-1.0/opensync/engine/opensync_status.h
+include/opensync-1.0/opensync/file.h
+include/opensync-1.0/opensync/format/opensync_converter.h
+include/opensync-1.0/opensync/format/opensync_filter.h
+include/opensync-1.0/opensync/format/opensync_format_env.h
+include/opensync-1.0/opensync/format/opensync_objformat.h
+include/opensync-1.0/opensync/format/opensync_time.h
+include/opensync-1.0/opensync/group/opensync_group.h
+include/opensync-1.0/opensync/group/opensync_group_env.h
+include/opensync-1.0/opensync/group/opensync_member.h
+include/opensync-1.0/opensync/helper/opensync_anchor.h
+include/opensync-1.0/opensync/helper/opensync_hashtable.h
+include/opensync-1.0/opensync/ipc/opensync_message.h
+include/opensync-1.0/opensync/ipc/opensync_queue.h
+include/opensync-1.0/opensync/ipc/opensync_serializer.h
+include/opensync-1.0/opensync/mapping/opensync_mapping.h
+include/opensync-1.0/opensync/mapping/opensync_mapping_entry.h
+include/opensync-1.0/opensync/mapping/opensync_mapping_table.h
+include/opensync-1.0/opensync/mapping/opensync_mapping_view.h
+include/opensync-1.0/opensync/merger/opensync_capabilities.h
+include/opensync-1.0/opensync/merger/opensync_capability.h
+include/opensync-1.0/opensync/merger/opensync_merger.h
+include/opensync-1.0/opensync/merger/opensync_xmlfield.h
+include/opensync-1.0/opensync/merger/opensync_xmlfieldlist.h
+include/opensync-1.0/opensync/merger/opensync_xmlformat.h
+include/opensync-1.0/opensync/opensync-client.h
+include/opensync-1.0/opensync/opensync-context.h
+include/opensync-1.0/opensync/opensync-data.h
+include/opensync-1.0/opensync/opensync-engine.h
+include/opensync-1.0/opensync/opensync-error.h
+include/opensync-1.0/opensync/opensync-format.h
+include/opensync-1.0/opensync/opensync-group.h
+include/opensync-1.0/opensync/opensync-helper.h
+include/opensync-1.0/opensync/opensync-ipc.h
+include/opensync-1.0/opensync/opensync-mapping.h
+include/opensync-1.0/opensync/opensync-merger.h
+include/opensync-1.0/opensync/opensync-module.h
+include/opensync-1.0/opensync/opensync-plugin.h
+include/opensync-1.0/opensync/opensync-serializer.h
+include/opensync-1.0/opensync/opensync-support.h
+include/opensync-1.0/opensync/opensync-time.h
+include/opensync-1.0/opensync/opensync-version.h
 include/opensync-1.0/opensync/opensync.h
-include/opensync-1.0/opensync/opensync_anchor.h
-include/opensync-1.0/opensync/opensync_change.h
-include/opensync-1.0/opensync/opensync_changecmds.h
-include/opensync-1.0/opensync/opensync_context.h
-include/opensync-1.0/opensync/opensync_convert.h
-include/opensync-1.0/opensync/opensync_convreg.h
-include/opensync-1.0/opensync/opensync_debug.h
-include/opensync-1.0/opensync/opensync_env.h
-include/opensync-1.0/opensync/opensync_error.h
-include/opensync-1.0/opensync/opensync_filter.h
-include/opensync-1.0/opensync/opensync_group.h
-include/opensync-1.0/opensync/opensync_hashtable.h
-include/opensync-1.0/opensync/opensync_member.h
-include/opensync-1.0/opensync/opensync_plugin.h
-include/opensync-1.0/osengine/engine.h
-include/opensync-1.0/osengine/osengine_debug.h
-include/opensync-1.0/osengine/osengine_engine.h
-include/opensync-1.0/osengine/osengine_mapping.h
-include/opensync-1.0/osengine/osengine_status.h
-lib/libopensync-xml.la
-lib/libopensync-xml.so
-lib/libopensync-xml.so.0
-lib/libopensync.la
+include/opensync-1.0/opensync/opensync_list.h
+include/opensync-1.0/opensync/opensync_xml.h
+include/opensync-1.0/opensync/plugin/opensync_plugin.h
+include/opensync-1.0/opensync/plugin/opensync_plugin_env.h
+include/opensync-1.0/opensync/plugin/opensync_plugin_info.h
+include/opensync-1.0/opensync/plugin/opensync_sink.h
+include/opensync-1.0/opensync/version/opensync_version.h
 lib/libopensync.so
-lib/libopensync.so.0
-lib/libosengine.la
-lib/libosengine.so
-lib/libosengine.so.0
-lib/opensync/formats/contact.la
-lib/opensync/formats/contact.so
-lib/opensync/formats/data.la
-lib/opensync/formats/data.so
-lib/opensync/formats/event.la
-lib/opensync/formats/event.so
-lib/opensync/formats/note.la
-lib/opensync/formats/note.so
-lib/opensync/formats/todo.la
-lib/opensync/formats/todo.so
-lib/opensync/formats/xml-evolution.la
-lib/opensync/formats/xml-evolution.so
-lib/opensync/formats/xml-kde.la
-lib/opensync/formats/xml-kde.so
-lib/opensync/formats/xml-vcal.la
-lib/opensync/formats/xml-vcal.so
-lib/opensync/formats/xml-vcard.la
-lib/opensync/formats/xml-vcard.so
-lib/opensync/formats/xml-vnote.la
-lib/opensync/formats/xml-vnote.so
-%%PYTHON_SITELIBDIR%%/_opensync.la
-%%PYTHON_SITELIBDIR%%/_opensync.so
-%%PYTHON_SITELIBDIR%%/_opensync.so.0
-%%PYTHON_SITELIBDIR%%/opensync.py
-%%PYTHON_SITELIBDIR%%/opensync.pyc
-%%PYTHON_SITELIBDIR%%/opensync.pyo
+lib/opensync/formats/libdata.so
+lib/opensync/formats/libfile.so
+lib/opensync/formats/libxmlformat-doc.so
+lib/opensync/formats/libxmlformat.so
 libdata/pkgconfig/opensync-1.0.pc
 libdata/pkgconfig/osengine-1.0.pc
+share/opensync/capabilities/file-sync.xml
+share/opensync/capabilities/syncml-nokia-7650.xml
+share/opensync/descriptions/descriptions.xsd
+share/opensync/descriptions/miscellaneous.xml
+share/opensync/descriptions/syncml-nokia.xml
+share/opensync/descriptions/xmlformat-calendar.xsd
+share/opensync/descriptions/xmlformat-common.xsd
+share/opensync/descriptions/xmlformat-contact.xsd
+share/opensync/descriptions/xmlformat-event.xsd
+share/opensync/descriptions/xmlformat-note.xsd
+share/opensync/descriptions/xmlformat-todo.xsd
+@dirrm share/opensync/descriptions
+@dirrm share/opensync/capabilities
+@dirrm share/opensync
 @dirrm lib/opensync/formats
 @dirrm lib/opensync
-@dirrm include/opensync-1.0/osengine
+@dirrm include/opensync-1.0/opensync/version
+@dirrm include/opensync-1.0/opensync/plugin
+@dirrm include/opensync-1.0/opensync/merger
+@dirrm include/opensync-1.0/opensync/mapping
+@dirrm include/opensync-1.0/opensync/ipc
+@dirrm include/opensync-1.0/opensync/helper
+@dirrm include/opensync-1.0/opensync/group
+@dirrm include/opensync-1.0/opensync/format
+@dirrm include/opensync-1.0/opensync/engine
+@dirrm include/opensync-1.0/opensync/data
+@dirrm include/opensync-1.0/opensync/archive
 @dirrm include/opensync-1.0/opensync
 @dirrm include/opensync-1.0