summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2013-10-03 14:01:14 +0000
committerMathieu Arnold <mat@FreeBSD.org>2013-10-03 14:01:14 +0000
commite8f339bf6436cdc858a7b476c62774e8b0effce9 (patch)
treee3804034cda06ee41086a467331fbeb763130f31 /net
parentUpdate lang/sbcl to 1.1.12 [1] and math/maxima to 5.31.1; adjust (diff)
Update to 0.90.0.
maintainer timeout. PR: 182201 Submitted by: mat
Notes
Notes: svn path=/head/; revision=329192
Diffstat (limited to 'net')
-rw-r--r--net/owncloud-csync/Makefile17
-rw-r--r--net/owncloud-csync/distinfo4
-rw-r--r--net/owncloud-csync/files/patch-cmake__Modules__DefineCompilerFlags.cmake14
-rw-r--r--net/owncloud-csync/pkg-plist3
4 files changed, 25 insertions, 13 deletions
diff --git a/net/owncloud-csync/Makefile b/net/owncloud-csync/Makefile
index c75dc78058b2..53fbd1363701 100644
--- a/net/owncloud-csync/Makefile
+++ b/net/owncloud-csync/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= owncloud-csync
-PORTVERSION= 0.80.0
+PORTVERSION= 0.90.0
CATEGORIES= net kde
MASTER_SITES= http://download.owncloud.com/download/
DISTNAME= ocsync-${PORTVERSION}
@@ -12,10 +12,10 @@ COMMENT= csync fork for Owncloud
LICENSE= GPLv2
-LIB_DEPENDS= iniparser:${PORTSDIR}/devel/iniparser \
- smbclient:${PORTSDIR}/net/samba-libsmbclient \
- ssh:${PORTSDIR}/security/libssh \
- neon:${PORTSDIR}/www/neon29
+LIB_DEPENDS= libiniparser.so:${PORTSDIR}/devel/iniparser \
+ libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient \
+ libssh.so.4.2.2:${PORTSDIR}/security/libssh \
+ libneon.so:${PORTSDIR}/www/neon29
USES= cmake:outsource iconv pkgconfig
USE_BZIP2= yes
@@ -24,12 +24,9 @@ CMAKE_ARGS+= -DWITH_LOG4C=NO \
-DUNIT_TESTING=NO \
-DMAN_INSTALL_DIR=${MANPREFIX}/man
-MAN1= ocsync.1
-
USE_LDCONFIG= yes
-DOCSDIR= /usr/local/share/doc/ocsync
-ETCDIR= /usr/local/etc/ocsync
+DOCSDIR= ${LOCALBASE}/share/doc/ocsync
+ETCDIR= ${LOCALBASE}/etc/ocsync
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/net/owncloud-csync/distinfo b/net/owncloud-csync/distinfo
index 138d9084cf5e..8e770edbf05d 100644
--- a/net/owncloud-csync/distinfo
+++ b/net/owncloud-csync/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ocsync-0.80.0.tar.bz2) = 0b4d935a812dc2164a58490909ee0a7269e9a9e1a5d16e29bf83d53a33d536db
-SIZE (ocsync-0.80.0.tar.bz2) = 4624510
+SHA256 (ocsync-0.90.0.tar.bz2) = 4531d196637829284704ce29816b2f6f9f8e61ca8dd61e6743774d085392301c
+SIZE (ocsync-0.90.0.tar.bz2) = 4630130
diff --git a/net/owncloud-csync/files/patch-cmake__Modules__DefineCompilerFlags.cmake b/net/owncloud-csync/files/patch-cmake__Modules__DefineCompilerFlags.cmake
new file mode 100644
index 000000000000..c7f717f5d15a
--- /dev/null
+++ b/net/owncloud-csync/files/patch-cmake__Modules__DefineCompilerFlags.cmake
@@ -0,0 +1,14 @@
+--- ./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
+@@ -30,11 +30,6 @@
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+ endif (WITH_FPIC AND NOT WIN32)
+
+- check_c_compiler_flag_ssp("-fstack-protector" WITH_STACK_PROTECTOR)
+- if (WITH_STACK_PROTECTOR AND NOT WIN32)
+- 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)
diff --git a/net/owncloud-csync/pkg-plist b/net/owncloud-csync/pkg-plist
index 30a34b19ec95..8f2d56a44544 100644
--- a/net/owncloud-csync/pkg-plist
+++ b/net/owncloud-csync/pkg-plist
@@ -38,10 +38,11 @@ include/ocsync/csync_vio_module.h
lib/libhttpbflib.a
lib/libocsync.so
lib/libocsync.so.0
-lib/libocsync.so.0.2.0
+lib/libocsync.so.0.2.1
lib/ocsync-0/ocsync_owncloud.so
lib/ocsync-0/ocsync_smb.so
lib/ocsync-0/ocsync_sftp.so
+man/man1/ocsync.1.gz
@dirrm lib/ocsync-0
@dirrm include/ocsync
@dirrmtry %%ETCDIR%%