4 files changed, 109 insertions, 9 deletions

diff --git a/deskutils/mirall/Makefile b/deskutils/mirall/Makefile
index 3de2323f4de5..6e0b8bc458a3 100644
--- a/deskutils/mirall/Makefile
+++ b/deskutils/mirall/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mirall
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	http://download.owncloud.com/download/
 
@@ -24,12 +25,23 @@ USE_GCC=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 
-# It seems to be able to generate docs, but, it's not working.
-#
-# OPTIONS_DEFINE=	DOCS
-# OPTIONS_DEFAULT=
-# 
-# DOCS_BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
-# DOCS_USE=	TEX=latex:build
+OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFAULT=
+
+DOCS_BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+DOCS_USE=	TEX=latex:build
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
+CMAKE_ARGS+=	WITH_DOC=TRUE
+ALL_TARGET=	all doc-html doc-pdf
+
+post-install:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
+	@${INSTALL_DATA} ${INSTALL_WRKSRC}/doc/latex/ownCloudClientManual.pdf ${STAGEDIR}${DOCSDIR}
+	@cd ${INSTALL_WRKSRC}/doc/html/unthemed ; ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/html
+.endif
 
 .include <bsd.port.mk>
diff --git a/deskutils/mirall/files/patch-CMakeLists.txt b/deskutils/mirall/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..af3d72ab83b7
--- /dev/null
+++ b/deskutils/mirall/files/patch-CMakeLists.txt
@@ -0,0 +1,9 @@
+--- ./CMakeLists.txt.orig	2013-09-26 11:13:19.000000000 +0200
++++ ./CMakeLists.txt	2013-10-16 15:10:00.000000000 +0200
+@@ -106,5 +106,5 @@
+ if(BUILD_OWNCLOUD_OSX_BUNDLE)
+     configure_file(sync-exclude.lst ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/sync-exclude.lst COPYONLY)
+ else()
+-    install( FILES sync-exclude.lst DESTINATION ${SYSCONFDIR}/${APPLICATION_SHORTNAME} )
++    install( FILES sync-exclude.lst DESTINATION ${SYSCONFDIR}/${APPLICATION_SHORTNAME} RENAME sync-exclude.lst.sample )
+ endif()
diff --git a/deskutils/mirall/files/patch-doc__CMakeLists.txt b/deskutils/mirall/files/patch-doc__CMakeLists.txt
new file mode 100644
index 000000000000..838fc310700a
--- /dev/null
+++ b/deskutils/mirall/files/patch-doc__CMakeLists.txt
@@ -0,0 +1,11 @@
+--- ./doc/CMakeLists.txt.orig	2013-09-26 11:13:19.000000000 +0200
++++ ./doc/CMakeLists.txt	2013-10-16 14:57:42.000000000 +0200
+@@ -36,7 +36,7 @@
+ 				     -D latex_logo=${LATEX_LOGO}
+ 				     ${CMAKE_CURRENT_SOURCE_DIR}
+ 				     ${SPHINX_PDF_DIR} )
+-        add_custom_target(doc-pdf make -C ${SPHINX_PDF_DIR} all-pdf
++        add_custom_target(doc-pdf $(MAKE) -C ${SPHINX_PDF_DIR} all-pdf
+ 		                  DEPENDS doc-latex )
+         add_dependencies(doc doc-pdf)
+         if (WITH_DOC)
diff --git a/deskutils/mirall/pkg-plist b/deskutils/mirall/pkg-plist
index f0e51d2d1441..198ab268b375 100644
--- a/deskutils/mirall/pkg-plist
+++ b/deskutils/mirall/pkg-plist
@@ -1,9 +1,72 @@
 bin/owncloud
-etc/ownCloud/sync-exclude.lst
+@unexec if cmp -s %D/etc/ownCloud/sync-exclude.lst.sample %D/etc/ownCloud/sync-exclude.lst; then rm -f %D/etc/ownCloud/sync-exclude.lst; fi
+etc/ownCloud/sync-exclude.lst.sample
+@exec if [ ! -f %D/etc/ownCloud/sync-exclude.lst ] ; then cp -p %D/%F %B/sync-exclude.lst; fi
 lib/libowncloudsync.so
 lib/libowncloudsync.so.0
 lib/libowncloudsync.so.1.4.1
 share/applications/owncloud.desktop
+%%PORTDOCS%%%%DOCSDIR%%/html/.buildinfo
+%%PORTDOCS%%%%DOCSDIR%%/html/_images/icon.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_images/ignored_files_editor.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_images/menu.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_images/settings_account.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_images/settings_general.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_images/settings_network.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_images/sync_protocol.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_images/wizard_overview.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_images/wizard_targetfolder.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_images/wizard_url.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_images/wizard_user.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/accountsetup.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/advancedusage.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/architecture.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/building.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/conffile.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/glossary.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/index.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/introduction.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/options.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/owncloud.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/troubleshooting.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/visualtour.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/ajax-loader.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/basic.css
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/comment-bright.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/comment-close.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/comment.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/default.css
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/doctools.js
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/down-pressed.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/down.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/file.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/jquery.js
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/minus.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/plus.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/pygments.css
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/searchtools.js
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/sidebar.js
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/underscore.js
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/up-pressed.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/up.png
+%%PORTDOCS%%%%DOCSDIR%%/html/_static/websupport.js
+%%PORTDOCS%%%%DOCSDIR%%/html/accountsetup.html
+%%PORTDOCS%%%%DOCSDIR%%/html/advancedusage.html
+%%PORTDOCS%%%%DOCSDIR%%/html/architecture.html
+%%PORTDOCS%%%%DOCSDIR%%/html/building.html
+%%PORTDOCS%%%%DOCSDIR%%/html/conffile.html
+%%PORTDOCS%%%%DOCSDIR%%/html/genindex.html
+%%PORTDOCS%%%%DOCSDIR%%/html/glossary.html
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/introduction.html
+%%PORTDOCS%%%%DOCSDIR%%/html/objects.inv
+%%PORTDOCS%%%%DOCSDIR%%/html/options.html
+%%PORTDOCS%%%%DOCSDIR%%/html/owncloud.1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/search.html
+%%PORTDOCS%%%%DOCSDIR%%/html/searchindex.js
+%%PORTDOCS%%%%DOCSDIR%%/html/troubleshooting.html
+%%PORTDOCS%%%%DOCSDIR%%/html/visualtour.html
+%%PORTDOCS%%%%DOCSDIR%%/ownCloudClientManual.pdf
 share/icons/hicolor/128x128/apps/owncloud.png
 share/icons/hicolor/22x22/apps/owncloud.png
 share/icons/hicolor/32x32/apps/owncloud.png
@@ -52,5 +115,10 @@ share/owncloud/i18n/mirall_zh_TW.qm
 @dirrmtry share/icons/hicolor/128x128
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/_static
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/_sources
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/_images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/applications
-@dirrm etc/ownCloud
+@dirrmtry etc/ownCloud