- Change maintainer email to @FreeBSD.org

- Convert LIB_DEPENDS to new syntax
- Add staging support

Approved by:	wg (mentor)

2 files changed, 90 insertions, 99 deletions

diff --git a/devel/libopensync/Makefile b/devel/libopensync/Makefile
index 6b0ab14c916a..96c76ab6c3b0 100644
--- a/devel/libopensync/Makefile
+++ b/devel/libopensync/Makefile
@@ -7,11 +7,11 @@ PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.opensync.org/download/releases/${PORTVERSION}/
 
-MAINTAINER=	danilogondolfo@gmail.com
-COMMENT=	A PIM data synchronization framework
+MAINTAINER=	danilo@FreeBSD.org
+COMMENT=	PIM data synchronization framework
 
 BUILD_DEPENDS=	swig1.3:${PORTSDIR}/devel/swig13
-LIB_DEPENDS=	exslt:${PORTSDIR}/textproc/libxslt
+LIB_DEPENDS=	libexslt.so:${PORTSDIR}/textproc/libxslt
 
 CONFLICTS=	libopensync-0.22*
 
@@ -26,14 +26,6 @@ CMAKE_ARGS+=	-DPYTHON_INCLUDE_PATH:PATH=${PYTHON_INCLUDEDIR}
 
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-PLIST_FILES+=	%%DOCSDIR%%/OpenSync-WhitePaper.pdf
-PLIST_DIRS+=	%%DOCSDIR%%
-.endif
-
 SWIG_VER=	$$(cd ${PORTSDIR}/devel/swig13 && ${MAKE} -V PORTVERSION)
 SWIG_DATADIR=	$$(cd ${PORTSDIR}/devel/swig13 && ${MAKE} -V DATADIR)
 
@@ -47,10 +39,7 @@ post-patch:
 		${WRKSRC}/opensync/common/opensync_list.c
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/OpenSync-WhitePaper.pdf ${DOCSDIR}
-.endif
-	@${CAT} ${PKGMESSAGE}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/OpenSync-WhitePaper.pdf ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/libopensync/pkg-plist b/devel/libopensync/pkg-plist
index 419e9d75d1da..f1ab6d48a157 100644
--- a/devel/libopensync/pkg-plist
+++ b/devel/libopensync/pkg-plist
@@ -1,78 +1,55 @@
-bin/osyncdump
 bin/osyncbinary
+bin/osyncdump
 bin/osyncplugin
-lib/libopensync.so.1.0.0
-lib/libopensync.so.1
-lib/libopensync.so
-lib/libopensync1/osplugin
-libdata/pkgconfig/libopensync.pc
+include/libopensync1/opensync/capabilities/opensync_capabilities.h
+include/libopensync1/opensync/capabilities/opensync_capabilities_objtype.h
+include/libopensync1/opensync/capabilities/opensync_capability.h
 include/libopensync1/opensync/client/opensync_client.h
+include/libopensync1/opensync/common/opensync_error.h
 include/libopensync1/opensync/common/opensync_file.h
+include/libopensync1/opensync/common/opensync_list.h
 include/libopensync1/opensync/common/opensync_marshal.h
-include/libopensync1/opensync/common/opensync_string.h
 include/libopensync1/opensync/common/opensync_memory.h
-include/libopensync1/opensync/common/opensync_error.h
-include/libopensync1/opensync/common/opensync_list.h
+include/libopensync1/opensync/common/opensync_string.h
 include/libopensync1/opensync/data/opensync_change.h
 include/libopensync1/opensync/data/opensync_data.h
 include/libopensync1/opensync/debug/opensync_trace.h
-include/libopensync1/opensync/engine/opensync_mapping_entry_engine.h
+include/libopensync1/opensync/engine/opensync_engine.h
 include/libopensync1/opensync/engine/opensync_mapping_engine.h
-include/libopensync1/opensync/engine/opensync_sink_engine.h
+include/libopensync1/opensync/engine/opensync_mapping_entry_engine.h
 include/libopensync1/opensync/engine/opensync_obj_engine.h
-include/libopensync1/opensync/engine/opensync_engine.h
+include/libopensync1/opensync/engine/opensync_sink_engine.h
+include/libopensync1/opensync/format/opensync_caps_converter.h
 include/libopensync1/opensync/format/opensync_converter.h
-include/libopensync1/opensync/format/opensync_objformat_sink.h
-include/libopensync1/opensync/format/opensync_time.h
 include/libopensync1/opensync/format/opensync_filter.h
 include/libopensync1/opensync/format/opensync_format_env.h
 include/libopensync1/opensync/format/opensync_merger.h
 include/libopensync1/opensync/format/opensync_objformat.h
-include/libopensync1/opensync/format/opensync_caps_converter.h
+include/libopensync1/opensync/format/opensync_objformat_sink.h
+include/libopensync1/opensync/format/opensync_time.h
 include/libopensync1/opensync/group/opensync_group.h
-include/libopensync1/opensync/group/opensync_updater.h
-include/libopensync1/opensync/group/opensync_member.h
 include/libopensync1/opensync/group/opensync_group_env.h
-include/libopensync1/opensync/helper/opensync_sink_state_db.h
+include/libopensync1/opensync/group/opensync_member.h
+include/libopensync1/opensync/group/opensync_updater.h
 include/libopensync1/opensync/helper/opensync_hashtable.h
-include/libopensync1/opensync/ipc/opensync_serializer.h
+include/libopensync1/opensync/helper/opensync_sink_state_db.h
 include/libopensync1/opensync/ipc/opensync_queue.h
+include/libopensync1/opensync/ipc/opensync_serializer.h
+include/libopensync1/opensync/mapping/opensync_mapping.h
 include/libopensync1/opensync/mapping/opensync_mapping_entry.h
 include/libopensync1/opensync/mapping/opensync_mapping_table.h
-include/libopensync1/opensync/mapping/opensync_mapping.h
-include/libopensync1/opensync/capabilities/opensync_capabilities_objtype.h
-include/libopensync1/opensync/capabilities/opensync_capabilities.h
-include/libopensync1/opensync/capabilities/opensync_capability.h
-include/libopensync1/opensync/plugin/opensync_plugin_advancedoptions.h
-include/libopensync1/opensync/plugin/opensync_objtype_sink.h
-include/libopensync1/opensync/plugin/opensync_plugin.h
-include/libopensync1/opensync/plugin/opensync_plugin_config.h
-include/libopensync1/opensync/plugin/opensync_plugin_resource.h
-include/libopensync1/opensync/plugin/opensync_context.h
-include/libopensync1/opensync/plugin/opensync_plugin_connection.h
-include/libopensync1/opensync/plugin/opensync_plugin_authentication.h
-include/libopensync1/opensync/plugin/opensync_plugin_localization.h
-include/libopensync1/opensync/plugin/opensync_plugin_info.h
-include/libopensync1/opensync/plugin/opensync_plugin_env.h
-include/libopensync1/opensync/version/opensync_version.h
-include/libopensync1/opensync/xmlformat/opensync_xmlformat.h
-include/libopensync1/opensync/xmlformat/opensync_xmlfieldlist.h
-include/libopensync1/opensync/xmlformat/opensync_xmlfield.h
-include/libopensync1/opensync/xmlformat/opensync_xmlformat_schema.h
-include/libopensync1/opensync/opensync.h
 include/libopensync1/opensync/opensync-capabilities.h
 include/libopensync1/opensync/opensync-client.h
-include/libopensync1/opensync/opensync-context.h
 include/libopensync1/opensync/opensync-common.h
+include/libopensync1/opensync/opensync-context.h
 include/libopensync1/opensync/opensync-data.h
 include/libopensync1/opensync/opensync-debug.h
-include/libopensync1/opensync/opensync-ipc.h
 include/libopensync1/opensync/opensync-engine.h
 include/libopensync1/opensync/opensync-error.h
 include/libopensync1/opensync/opensync-format.h
 include/libopensync1/opensync/opensync-group.h
 include/libopensync1/opensync/opensync-helper.h
-include/libopensync1/opensync/opensync_list.h
+include/libopensync1/opensync/opensync-ipc.h
 include/libopensync1/opensync/opensync-mapping.h
 include/libopensync1/opensync/opensync-merger.h
 include/libopensync1/opensync/opensync-module.h
@@ -82,42 +59,67 @@ include/libopensync1/opensync/opensync-support.h
 include/libopensync1/opensync/opensync-time.h
 include/libopensync1/opensync/opensync-version.h
 include/libopensync1/opensync/opensync-xmlformat.h
-share/libopensync1/capabilities/reference.xml
-share/libopensync1/capabilities/syncml-nokia-7650.xml
-share/libopensync1/descriptions/syncml-nokia.xml
-share/libopensync1/descriptions/reference.xml
-share/libopensync1/schemas/descriptions.xsd
-share/libopensync1/schemas/plugin_config.xsd
-share/libopensync1/schemas/capabilities.xsd
-share/libopensync1/schemas/syncmember.xsd
-share/libopensync1/schemas/syncgroup.xsd
-share/libopensync1/cmake/modules/OpenSyncPlatforms.cmake
-share/libopensync1/cmake/modules/OpenSyncPackaging.cmake
-share/libopensync1/cmake/modules/OpenSyncPlugin.cmake
-share/libopensync1/cmake/modules/OpenSyncInternal.cmake
-@dirrm include/libopensync1/opensync/archive
-@dirrm include/libopensync1/opensync/client
-@dirrm include/libopensync1/opensync/common
-@dirrm include/libopensync1/opensync/data
-@dirrm include/libopensync1/opensync/db
-@dirrm include/libopensync1/opensync/debug
-@dirrm include/libopensync1/opensync/engine
-@dirrm include/libopensync1/opensync/format
-@dirrm include/libopensync1/opensync/group
-@dirrm include/libopensync1/opensync/helper
-@dirrm include/libopensync1/opensync/ipc
-@dirrm include/libopensync1/opensync/mapping
-@dirrm include/libopensync1/opensync/capabilities
-@dirrm include/libopensync1/opensync/module
-@dirrm include/libopensync1/opensync/plugin
-@dirrm include/libopensync1/opensync/version
-@dirrm include/libopensync1/opensync/xmlformat
-@dirrm include/libopensync1/opensync
-@dirrm include/libopensync1
-@dirrm lib/libopensync1
-@dirrm share/libopensync1/capabilities
-@dirrm share/libopensync1/descriptions
-@dirrm share/libopensync1/schemas
-@dirrm share/libopensync1/cmake/modules
-@dirrm share/libopensync1/cmake
-@dirrm share/libopensync1/
+include/libopensync1/opensync/opensync.h
+include/libopensync1/opensync/opensync_list.h
+include/libopensync1/opensync/plugin/opensync_context.h
+include/libopensync1/opensync/plugin/opensync_objtype_sink.h
+include/libopensync1/opensync/plugin/opensync_plugin.h
+include/libopensync1/opensync/plugin/opensync_plugin_advancedoptions.h
+include/libopensync1/opensync/plugin/opensync_plugin_authentication.h
+include/libopensync1/opensync/plugin/opensync_plugin_config.h
+include/libopensync1/opensync/plugin/opensync_plugin_connection.h
+include/libopensync1/opensync/plugin/opensync_plugin_env.h
+include/libopensync1/opensync/plugin/opensync_plugin_info.h
+include/libopensync1/opensync/plugin/opensync_plugin_localization.h
+include/libopensync1/opensync/plugin/opensync_plugin_resource.h
+include/libopensync1/opensync/version/opensync_version.h
+include/libopensync1/opensync/xmlformat/opensync_xmlfield.h
+include/libopensync1/opensync/xmlformat/opensync_xmlfieldlist.h
+include/libopensync1/opensync/xmlformat/opensync_xmlformat.h
+include/libopensync1/opensync/xmlformat/opensync_xmlformat_schema.h
+lib/libopensync.so
+lib/libopensync.so.1
+lib/libopensync.so.1.0.0
+lib/libopensync1/osplugin
+libdata/pkgconfig/libopensync.pc
+%%PORTDOCS%%%%DOCSDIR%%/OpenSync-WhitePaper.pdf
+%%DATADIR%%1/capabilities/reference.xml
+%%DATADIR%%1/capabilities/syncml-nokia-7650.xml
+%%DATADIR%%1/cmake/modules/OpenSyncInternal.cmake
+%%DATADIR%%1/cmake/modules/OpenSyncPackaging.cmake
+%%DATADIR%%1/cmake/modules/OpenSyncPlatforms.cmake
+%%DATADIR%%1/cmake/modules/OpenSyncPlugin.cmake
+%%DATADIR%%1/descriptions/reference.xml
+%%DATADIR%%1/descriptions/syncml-nokia.xml
+%%DATADIR%%1/schemas/capabilities.xsd
+%%DATADIR%%1/schemas/descriptions.xsd
+%%DATADIR%%1/schemas/plugin_config.xsd
+%%DATADIR%%1/schemas/syncgroup.xsd
+%%DATADIR%%1/schemas/syncmember.xsd
+@dirrmtry %%DATADIR%%1/schemas
+@dirrmtry %%DATADIR%%1/descriptions
+@dirrmtry %%DATADIR%%1/cmake/modules
+@dirrmtry %%DATADIR%%1/cmake
+@dirrmtry %%DATADIR%%1/capabilities
+@dirrmtry %%DATADIR%%1
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
+@dirrmtry lib/libopensync1
+@dirrmtry include/libopensync1/opensync/xmlformat
+@dirrmtry include/libopensync1/opensync/version
+@dirrmtry include/libopensync1/opensync/plugin
+@dirrmtry include/libopensync1/opensync/module
+@dirrmtry include/libopensync1/opensync/mapping
+@dirrmtry include/libopensync1/opensync/ipc
+@dirrmtry include/libopensync1/opensync/helper
+@dirrmtry include/libopensync1/opensync/group
+@dirrmtry include/libopensync1/opensync/format
+@dirrmtry include/libopensync1/opensync/engine
+@dirrmtry include/libopensync1/opensync/debug
+@dirrmtry include/libopensync1/opensync/db
+@dirrmtry include/libopensync1/opensync/data
+@dirrmtry include/libopensync1/opensync/common
+@dirrmtry include/libopensync1/opensync/client
+@dirrmtry include/libopensync1/opensync/capabilities
+@dirrmtry include/libopensync1/opensync/archive
+@dirrmtry include/libopensync1/opensync
+@dirrmtry include/libopensync1