From owner-svn-ports-all@FreeBSD.ORG Tue Mar 25 13:40:59 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1B7CB4C5; Tue, 25 Mar 2014 13:40:59 +0000 (UTC) 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 078E5C45; Tue, 25 Mar 2014 13:40:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2PDeweJ008150; Tue, 25 Mar 2014 13:40:58 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2PDewB7008142; Tue, 25 Mar 2014 13:40:58 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201403251340.s2PDewB7008142@svn.freebsd.org> From: Mathieu Arnold Date: Tue, 25 Mar 2014 13:40:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349143 - 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.17 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: Tue, 25 Mar 2014 13:40:59 -0000 Author: mat Date: Tue Mar 25 13:40:57 2014 New Revision: 349143 URL: http://svnweb.freebsd.org/changeset/ports/349143 QAT: https://qat.redports.org/buildarchive/r349143/ Log: Update to 1.5.3. Sponsored by: Absolight Added: head/deskutils/mirall/files/patch-src__mirall__folderwatcher.cpp (contents, props changed) Modified: head/deskutils/mirall/Makefile head/deskutils/mirall/distinfo head/deskutils/mirall/files/patch-src__CMakeLists.txt head/deskutils/mirall/pkg-plist Modified: head/deskutils/mirall/Makefile ============================================================================== --- head/deskutils/mirall/Makefile Tue Mar 25 13:32:40 2014 (r349142) +++ head/deskutils/mirall/Makefile Tue Mar 25 13:40:57 2014 (r349143) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mirall -PORTVERSION= 1.5.0 +PORTVERSION= 1.5.3 CATEGORIES= deskutils MASTER_SITES= http://download.owncloud.com/desktop/stable/ @@ -15,27 +15,27 @@ LIB_DEPENDS= libocsync.so:${PORTSDIR}/ne libinotify.so:${PORTSDIR}/devel/libinotify \ libqtkeychain.so:${PORTSDIR}/security/qtkeychain -USES= cmake:outsource pkgconfig gmake compiler:c++11-lang -USE_BZIP2= +USES= cmake:outsource pkgconfig gmake compiler:c++11-lang tar:bzip2 USE_QT4= corelib dbus gui linguist moc network qmake qtestlib rcc uic webkit xml CMAKE_ENV= CSYNC_DIR=${LOCALBASE} INOTIFY_LIB=${LOCALBASE}/lib CMAKE_ARGS= -DCSYNC_INCLUDE_PATH:STRING=${LOCALBASE}/include/ocsync/ USE_LDCONFIG= yes INSTALLS_ICONS= yes +ALL_TARGET= all + OPTIONS_DEFINE= DOCS DOCS_BUILD_DEPENDS= sphinx-build:${PORTSDIR}/textproc/py-sphinx DOCS_USE= TEX=latex:build +DOCS_CMAKE_ON= WITH_DOC=true +DOCS_ALL_TARGET= doc-html doc-pdf PLIST_SUB+= VERSION=${PORTVERSION} .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 Modified: head/deskutils/mirall/distinfo ============================================================================== --- head/deskutils/mirall/distinfo Tue Mar 25 13:32:40 2014 (r349142) +++ head/deskutils/mirall/distinfo Tue Mar 25 13:40:57 2014 (r349143) @@ -1,2 +1,2 @@ -SHA256 (mirall-1.5.0.tar.bz2) = 64532680da1c452b7b591550d07f25b554283ec65d448d41366ea2105b959a18 -SIZE (mirall-1.5.0.tar.bz2) = 1318514 +SHA256 (mirall-1.5.3.tar.bz2) = a50f235eba7a24915e583c3c5bb68ccd86171296151a9520f5a375842b3ced8e +SIZE (mirall-1.5.3.tar.bz2) = 7841424 Modified: head/deskutils/mirall/files/patch-src__CMakeLists.txt ============================================================================== --- head/deskutils/mirall/files/patch-src__CMakeLists.txt Tue Mar 25 13:32:40 2014 (r349142) +++ head/deskutils/mirall/files/patch-src__CMakeLists.txt Tue Mar 25 13:40:57 2014 (r349143) @@ -1,9 +1,9 @@ ---- ./src/CMakeLists.txt.orig 2013-12-12 18:20:45.000000000 +0100 -+++ ./src/CMakeLists.txt 2014-01-09 19:53:06.000000000 +0100 -@@ -118,6 +118,7 @@ - set(libsync_SRCS ${libsync_SRCS} mirall/folderwatcher_inotify.cpp) - set(libsync_HEADERS ${libsync_HEADERS} mirall/inotify.h) - set(libsync_HEADERS ${libsync_HEADERS} mirall/folderwatcher_inotify.h) +--- ./src/CMakeLists.txt.orig 2014-03-10 12:22:06.000000000 +0100 ++++ ./src/CMakeLists.txt 2014-03-18 17:12:29.000000000 +0100 +@@ -136,6 +136,7 @@ + IF( NOT WIN32 AND NOT APPLE ) + set(libsync_SRCS ${libsync_SRCS} mirall/folderwatcher_linux.cpp) + set(libsync_HEADERS ${libsync_HEADERS} mirall/folderwatcher_linux.h) + link_directories($ENV{INOTIFY_LIB}) ENDIF() IF( WIN32 ) Added: head/deskutils/mirall/files/patch-src__mirall__folderwatcher.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/mirall/files/patch-src__mirall__folderwatcher.cpp Tue Mar 25 13:40:57 2014 (r349143) @@ -0,0 +1,11 @@ +--- ./src/mirall/folderwatcher.cpp.orig 2014-03-10 12:22:06.000000000 +0100 ++++ ./src/mirall/folderwatcher.cpp 2014-03-24 14:18:20.000000000 +0100 +@@ -29,7 +29,7 @@ + #include "mirall/folderwatcher_win.h" + #elif defined(Q_OS_MAC) + #include "mirall/folderwatcher_mac.h" +-#elif defined(Q_OS_LINUX) ++#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) + #include "mirall/folderwatcher_linux.h" + #endif + Modified: head/deskutils/mirall/pkg-plist ============================================================================== --- head/deskutils/mirall/pkg-plist Tue Mar 25 13:32:40 2014 (r349142) +++ head/deskutils/mirall/pkg-plist Tue Mar 25 13:40:57 2014 (r349143) @@ -21,13 +21,15 @@ lib/libowncloudsync.so.0 lib/libowncloudsync.so.%%VERSION%% share/applications/owncloud.desktop %%PORTDOCS%%%%DOCSDIR%%/html/.buildinfo +%%PORTDOCS%%%%DOCSDIR%%/html/_images/folderwizard_local.png +%%PORTDOCS%%%%DOCSDIR%%/html/_images/folderwizard_remote.png %%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_activity.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 @@ -35,6 +37,7 @@ share/applications/owncloud.desktop %%PORTDOCS%%%%DOCSDIR%%/html/_sources/accountsetup.txt %%PORTDOCS%%%%DOCSDIR%%/html/_sources/advancedusage.txt %%PORTDOCS%%%%DOCSDIR%%/html/_sources/architecture.txt +%%PORTDOCS%%%%DOCSDIR%%/html/_sources/autoupdate.txt %%PORTDOCS%%%%DOCSDIR%%/html/_sources/building.txt %%PORTDOCS%%%%DOCSDIR%%/html/_sources/conffile.txt %%PORTDOCS%%%%DOCSDIR%%/html/_sources/glossary.txt @@ -68,6 +71,7 @@ share/applications/owncloud.desktop %%PORTDOCS%%%%DOCSDIR%%/html/accountsetup.html %%PORTDOCS%%%%DOCSDIR%%/html/advancedusage.html %%PORTDOCS%%%%DOCSDIR%%/html/architecture.html +%%PORTDOCS%%%%DOCSDIR%%/html/autoupdate.html %%PORTDOCS%%%%DOCSDIR%%/html/building.html %%PORTDOCS%%%%DOCSDIR%%/html/conffile.html %%PORTDOCS%%%%DOCSDIR%%/html/genindex.html