From owner-svn-ports-all@FreeBSD.ORG Wed Oct 16 14:00:57 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id CEB5877; Wed, 16 Oct 2013 14:00:57 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AD3A62154; Wed, 16 Oct 2013 14:00:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9GE0vHr052181; Wed, 16 Oct 2013 14:00:57 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9GE0uPH051939; Wed, 16 Oct 2013 14:00:56 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201310161400.r9GE0uPH051939@svn.freebsd.org> From: Mathieu Arnold Date: Wed, 16 Oct 2013 14:00:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330513 - in head/deskutils/mirall: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Oct 2013 14:00:57 -0000 Author: mat Date: Wed Oct 16 14:00:56 2013 New Revision: 330513 URL: http://svnweb.freebsd.org/changeset/ports/330513 Log: Do generate documentation if asked. Added: head/deskutils/mirall/files/patch-CMakeLists.txt (contents, props changed) head/deskutils/mirall/files/patch-doc__CMakeLists.txt (contents, props changed) Modified: head/deskutils/mirall/Makefile head/deskutils/mirall/pkg-plist Modified: head/deskutils/mirall/Makefile ============================================================================== --- head/deskutils/mirall/Makefile Wed Oct 16 13:38:24 2013 (r330512) +++ head/deskutils/mirall/Makefile Wed Oct 16 14:00:56 2013 (r330513) @@ -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 + +.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 Added: head/deskutils/mirall/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/mirall/files/patch-CMakeLists.txt Wed Oct 16 14:00:56 2013 (r330513) @@ -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() Added: head/deskutils/mirall/files/patch-doc__CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/mirall/files/patch-doc__CMakeLists.txt Wed Oct 16 14:00:56 2013 (r330513) @@ -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) Modified: head/deskutils/mirall/pkg-plist ============================================================================== --- head/deskutils/mirall/pkg-plist Wed Oct 16 13:38:24 2013 (r330512) +++ head/deskutils/mirall/pkg-plist Wed Oct 16 14:00:56 2013 (r330513) @@ -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