Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 8 Jan 2014 21:52:43 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r339181 - in head/net/owncloud-csync: . files
Message-ID:  <201401082152.s08LqiM4085107@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Wed Jan  8 21:52:43 2014
New Revision: 339181
URL: http://svnweb.freebsd.org/changeset/ports/339181

Log:
  Update to 0.91.4.
  
  Submitted by:	maintainer

Deleted:
  head/net/owncloud-csync/files/patch-src-std-c_string.c
Modified:
  head/net/owncloud-csync/Makefile
  head/net/owncloud-csync/distinfo
  head/net/owncloud-csync/files/patch-cmake__Modules__DefineCompilerFlags.cmake
  head/net/owncloud-csync/pkg-plist

Modified: head/net/owncloud-csync/Makefile
==============================================================================
--- head/net/owncloud-csync/Makefile	Wed Jan  8 21:39:02 2014	(r339180)
+++ head/net/owncloud-csync/Makefile	Wed Jan  8 21:52:43 2014	(r339181)
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	owncloud-csync
-PORTVERSION=	0.90.4
+PORTVERSION=	0.91.4
 CATEGORIES=	net kde
-MASTER_SITES=	http://download.owncloud.com/download/
+MASTER_SITES=	http://download.owncloud.com/desktop/stable/
 DISTNAME=	ocsync-${PORTVERSION}
 
 MAINTAINER=	6yearold@gmail.com
@@ -39,4 +39,9 @@ post-patch:
 	@${REINPLACE_CMD} -e 's/^add_subdirectory(doc)//' ${WRKSRC}/CMakeLists.txt
 .endif
 
+post-install:
+.for i in ocsync.conf ocsync_exclude.conf
+	@${MV} ${STAGEDIR}${ETCDIR}/$i ${STAGEDIR}${ETCDIR}/$i.sample
+.endfor
+
 .include <bsd.port.mk>

Modified: head/net/owncloud-csync/distinfo
==============================================================================
--- head/net/owncloud-csync/distinfo	Wed Jan  8 21:39:02 2014	(r339180)
+++ head/net/owncloud-csync/distinfo	Wed Jan  8 21:52:43 2014	(r339181)
@@ -1,2 +1,2 @@
-SHA256 (ocsync-0.90.4.tar.bz2) = f2146577c977dc82a24e0baf84f3970efc3b004f2730669aae3816f48ff15728
-SIZE (ocsync-0.90.4.tar.bz2) = 4630698
+SHA256 (ocsync-0.91.4.tar.bz2) = 9ce5d04ff0475be4c3d3bfff43a554980d88277e95de4128a3f18611529b2cb6
+SIZE (ocsync-0.91.4.tar.bz2) = 6010999

Modified: head/net/owncloud-csync/files/patch-cmake__Modules__DefineCompilerFlags.cmake
==============================================================================
--- head/net/owncloud-csync/files/patch-cmake__Modules__DefineCompilerFlags.cmake	Wed Jan  8 21:39:02 2014	(r339180)
+++ head/net/owncloud-csync/files/patch-cmake__Modules__DefineCompilerFlags.cmake	Wed Jan  8 21:52:43 2014	(r339181)
@@ -1,5 +1,5 @@
---- ./cmake/Modules/DefineCompilerFlags.cmake.orig	2013-09-04 11:15:42.000000000 +0200
-+++ ./cmake/Modules/DefineCompilerFlags.cmake	2013-09-18 16:29:48.000000000 +0200
+--- cmake/Modules/11DefineCompilerFlags.cmake	2013-12-17 11:05:41.000000000 +0400
++++ cmake/Modules/DefineCompilerFlags.cmake	2013-12-17 11:06:00.579967195 +0400
 @@ -30,11 +30,6 @@
          set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
      endif (WITH_FPIC AND NOT WIN32)
@@ -9,6 +9,6 @@
 -        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector")
 -    endif (WITH_STACK_PROTECTOR AND NOT WIN32)
 -
-     if (WITH_OPTIMIZATION)
-     check_c_compiler_flag("-D_FORTIFY_SOURCE=2" WITH_FORTIFY_SOURCE)
-         if (WITH_FORTIFY_SOURCE)
+     if (CMAKE_BUILD_TYPE)
+         string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)
+         if (CMAKE_BUILD_TYPE_LOWER MATCHES "(release|relwithdebinfo|minsizerel)")

Modified: head/net/owncloud-csync/pkg-plist
==============================================================================
--- head/net/owncloud-csync/pkg-plist	Wed Jan  8 21:39:02 2014	(r339180)
+++ head/net/owncloud-csync/pkg-plist	Wed Jan  8 21:52:43 2014	(r339181)
@@ -1,6 +1,10 @@
-bin/ocsync
-%%ETCDIR%%/ocsync.conf
-%%ETCDIR%%/ocsync_exclude.conf
+@unexec if cmp -s %D/%%ETCDIR%%/ocsync.conf.sample %D/%%ETCDIR%%/ocsync.conf; then rm -f %D/%%ETCDIR%%/ocsync.conf; fi
+%%ETCDIR%%/ocsync.conf.sample
+@exec if [ ! -f %D/%%ETCDIR%%/ocsync.conf ] ; then cp -p %D/%F %B/ocsync.conf; fi
+@unexec if cmp -s %D/%%ETCDIR%%/ocsync_exclude.conf.sample %D/%%ETCDIR%%/ocsync_exclude.conf; then rm -f %D/%%ETCDIR%%/ocsync_exclude.conf; fi
+%%ETCDIR%%/ocsync_exclude.conf.sample
+@exec if [ ! -f %D/%%ETCDIR%%/ocsync_exclude.conf ] ; then cp -p %D/%F %B/ocsync_exclude.conf; fi
+include/httpbf.h
 include/ocsync/csync.h
 include/ocsync/csync_version.h
 include/ocsync/csync_vio.h
@@ -8,13 +12,10 @@ include/ocsync/csync_vio_file_stat.h
 include/ocsync/csync_vio_handle.h
 include/ocsync/csync_vio_method.h
 include/ocsync/csync_vio_module.h
-lib/libhttpbflib.a
+lib/libhttpbf.a
 lib/libocsync.so
 lib/libocsync.so.0
 lib/libocsync.so.0.2.1
-lib/ocsync-0/ocsync_owncloud.so
-lib/ocsync-0/ocsync_sftp.so
-lib/ocsync-0/ocsync_smb.so
 %%PORTDOCS%%man/man1/ocsync.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/userguide/csync.html
 %%PORTDOCS%%%%DOCSDIR%%/userguide/images/icons/README
@@ -48,6 +49,5 @@ lib/ocsync-0/ocsync_smb.so
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/userguide/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/userguide
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry lib/ocsync-0
 @dirrmtry include/ocsync
 @dirrmtry %%ETCDIR%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401082152.s08LqiM4085107>