From 65f33e72257a0b9c8c093d68a06592c1fde2f840 Mon Sep 17 00:00:00 2001 From: madpilot Date: Sun, 1 Feb 2015 09:13:05 +0000 Subject: - Remove owncloud-csync, it's been merged in net/mirall, please use that - Remove uneeded CONFLICTS in deskutils/mirall PR: 196440 Submitted by: 6yearold@gmail.com (maintainer) --- net/Makefile | 1 - net/owncloud-csync/Makefile | 50 ---------------------- net/owncloud-csync/distinfo | 2 - ...patch-cmake__Modules__DefineCompilerFlags.cmake | 14 ------ net/owncloud-csync/files/patch-enodata | 27 ------------ .../files/patch-src-std-CMakeLists.txt | 10 ----- net/owncloud-csync/pkg-descr | 9 ---- net/owncloud-csync/pkg-plist | 46 -------------------- 8 files changed, 159 deletions(-) delete mode 100644 net/owncloud-csync/Makefile delete mode 100644 net/owncloud-csync/distinfo delete mode 100644 net/owncloud-csync/files/patch-cmake__Modules__DefineCompilerFlags.cmake delete mode 100644 net/owncloud-csync/files/patch-enodata delete mode 100644 net/owncloud-csync/files/patch-src-std-CMakeLists.txt delete mode 100644 net/owncloud-csync/pkg-descr delete mode 100644 net/owncloud-csync/pkg-plist (limited to 'net') diff --git a/net/Makefile b/net/Makefile index 6118f3102adb..d1cbe647a350 100644 --- a/net/Makefile +++ b/net/Makefile @@ -467,7 +467,6 @@ SUBDIR += ossp-sa SUBDIR += ostinato SUBDIR += owamp - SUBDIR += owncloud-csync SUBDIR += p5-Acme-HTTP SUBDIR += p5-AddressBook SUBDIR += p5-Amazon-SQS-Simple diff --git a/net/owncloud-csync/Makefile b/net/owncloud-csync/Makefile deleted file mode 100644 index a78326169605..000000000000 --- a/net/owncloud-csync/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -# Created by: arrowdodger <6yearold@gmail.com> -# $FreeBSD$ - -PORTNAME= owncloud-csync -PORTVERSION= 0.91.4 -PORTREVISION= 2 -CATEGORIES= net kde -MASTER_SITES= http://download.owncloud.com/desktop/stable/ -DISTNAME= ocsync-${PORTVERSION} - -MAINTAINER= 6yearold@gmail.com -COMMENT= Csync fork for Owncloud - -LICENSE= GPLv2 - -LIB_DEPENDS= libiniparser.so:${PORTSDIR}/devel/iniparser \ - libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient \ - libssh.so.4:${PORTSDIR}/security/libssh \ - libneon.so:${PORTSDIR}/www/neon - -USES= cmake:outsource iconv pkgconfig tar:bzip2 -USE_SQLITE= yes -CMAKE_ARGS+= -DUNIT_TESTING=NO \ - -DMAN_INSTALL_DIR=${MANPREFIX}/man - -USE_LDCONFIG= yes - -DOCSDIR= ${PREFIX}/share/doc/ocsync -ETCDIR= ${PREFIX}/etc/ocsync - -DEPRECATED= Merged into deskutils/mirall and unsupported upstream -EXPIRATION_DATE= 2015-01-31 - -OPTIONS_DEFINE= DOCS - -.include - -.if ! ${PORT_OPTIONS:MDOCS} -BUILD_DEPENDS+= asciidoc:${PORTSDIR}/textproc/asciidoc - -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 diff --git a/net/owncloud-csync/distinfo b/net/owncloud-csync/distinfo deleted file mode 100644 index 872ddfc4944d..000000000000 --- a/net/owncloud-csync/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (ocsync-0.91.4.tar.bz2) = 9ce5d04ff0475be4c3d3bfff43a554980d88277e95de4128a3f18611529b2cb6 -SIZE (ocsync-0.91.4.tar.bz2) = 6010999 diff --git a/net/owncloud-csync/files/patch-cmake__Modules__DefineCompilerFlags.cmake b/net/owncloud-csync/files/patch-cmake__Modules__DefineCompilerFlags.cmake deleted file mode 100644 index 2783d1de0458..000000000000 --- a/net/owncloud-csync/files/patch-cmake__Modules__DefineCompilerFlags.cmake +++ /dev/null @@ -1,14 +0,0 @@ ---- 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) - -- 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 (CMAKE_BUILD_TYPE) - string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER) - if (CMAKE_BUILD_TYPE_LOWER MATCHES "(release|relwithdebinfo|minsizerel)") diff --git a/net/owncloud-csync/files/patch-enodata b/net/owncloud-csync/files/patch-enodata deleted file mode 100644 index a5199296c603..000000000000 --- a/net/owncloud-csync/files/patch-enodata +++ /dev/null @@ -1,27 +0,0 @@ -From 199d6a1b07f8ce5d8009518b61b57768061d65b5 Mon Sep 17 00:00:00 2001 -From: arrowdodger <6yearold@gmail.com> -Date: Tue, 19 Feb 2013 11:37:10 +0400 -Subject: [PATCH] Fix build for FreeBSD. - ---- - src/std/c_private.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git src/std/c_private.h src/std/c_private.h -index 2b1c6a3..bacd179 100644 ---- src/std/c_private.h -+++ src/std/c_private.h -@@ -32,6 +32,10 @@ - #endif - - -+#ifdef __FreeBSD__ -+#define ENODATA 0 -+#endif -+ - #ifdef _WIN32 - #define EDQUOT 0 - #define ENODATA 0 --- -1.8.1.3 - diff --git a/net/owncloud-csync/files/patch-src-std-CMakeLists.txt b/net/owncloud-csync/files/patch-src-std-CMakeLists.txt deleted file mode 100644 index ceeefbe63a51..000000000000 --- a/net/owncloud-csync/files/patch-src-std-CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ ---- src/std/_CMakeLists.txt 2013-02-20 20:39:16.000000000 +0400 -+++ src/std/CMakeLists.txt 2013-03-16 14:16:52.896920438 +0400 -@@ -31,6 +31,7 @@ - include_directories( - ${CSTDLIB_PUBLIC_INCLUDE_DIRS} - ${CSTDLIB_PRIVATE_INCLUDE_DIRS} -+ ${ICONV_INCLUDE_DIR} - ) - - add_library(${CSTDLIB_LIBRARY} STATIC ${cstdlib_SRCS}) diff --git a/net/owncloud-csync/pkg-descr b/net/owncloud-csync/pkg-descr deleted file mode 100644 index 5237b8f6c7cb..000000000000 --- a/net/owncloud-csync/pkg-descr +++ /dev/null @@ -1,9 +0,0 @@ -Csync is a lightweight utility to synchronize files between two directories on -a system or between multiple systems. - -It synchronizes bidirectionally and allows the user to keep two copies of files -and directories in sync. csync uses widely adopted protocols, such as smb or -sftp, so that there is no need for a server component. It is a user-level -program which means you do not to be a superuser or administrator. - -WWW: http://owncloud.org/sync-clients/ diff --git a/net/owncloud-csync/pkg-plist b/net/owncloud-csync/pkg-plist deleted file mode 100644 index f55ec887b2bd..000000000000 --- a/net/owncloud-csync/pkg-plist +++ /dev/null @@ -1,46 +0,0 @@ -@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 -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/libhttpbf.a -lib/libocsync.so -lib/libocsync.so.0 -lib/libocsync.so.0.2.1 -%%PORTDOCS%%man/man1/ocsync.1.gz -%%PORTDOCS%%%%DOCSDIR%%/userguide/csync.html -%%PORTDOCS%%%%DOCSDIR%%/userguide/images/icons/README -%%PORTDOCS%%%%DOCSDIR%%/userguide/images/icons/callouts/1.png -%%PORTDOCS%%%%DOCSDIR%%/userguide/images/icons/callouts/10.png -%%PORTDOCS%%%%DOCSDIR%%/userguide/images/icons/callouts/11.png -%%PORTDOCS%%%%DOCSDIR%%/userguide/images/icons/callouts/12.png -%%PORTDOCS%%%%DOCSDIR%%/userguide/images/icons/callouts/13.png -%%PORTDOCS%%%%DOCSDIR%%/userguide/images/icons/callouts/14.png -%%PORTDOCS%%%%DOCSDIR%%/userguide/images/icons/callouts/15.png -%%PORTDOCS%%%%DOCSDIR%%/userguide/images/icons/callouts/2.png -%%PORTDOCS%%%%DOCSDIR%%/userguide/images/icons/callouts/3.png -%%PORTDOCS%%%%DOCSDIR%%/userguide/images/icons/callouts/4.png -%%PORTDOCS%%%%DOCSDIR%%/userguide/images/icons/callouts/5.png -%%PORTDOCS%%%%DOCSDIR%%/userguide/images/icons/callouts/6.png -%%PORTDOCS%%%%DOCSDIR%%/userguide/images/icons/callouts/7.png -%%PORTDOCS%%%%DOCSDIR%%/userguide/images/icons/callouts/8.png -%%PORTDOCS%%%%DOCSDIR%%/userguide/images/icons/callouts/9.png -%%PORTDOCS%%%%DOCSDIR%%/userguide/images/icons/caution.png -%%PORTDOCS%%%%DOCSDIR%%/userguide/images/icons/example.png -%%PORTDOCS%%%%DOCSDIR%%/userguide/images/icons/home.png -%%PORTDOCS%%%%DOCSDIR%%/userguide/images/icons/important.png -%%PORTDOCS%%%%DOCSDIR%%/userguide/images/icons/next.png -%%PORTDOCS%%%%DOCSDIR%%/userguide/images/icons/note.png -%%PORTDOCS%%%%DOCSDIR%%/userguide/images/icons/prev.png -%%PORTDOCS%%%%DOCSDIR%%/userguide/images/icons/tip.png -%%PORTDOCS%%%%DOCSDIR%%/userguide/images/icons/up.png -%%PORTDOCS%%%%DOCSDIR%%/userguide/images/icons/warning.png -- cgit