From owner-svn-ports-all@FreeBSD.ORG Sun Feb 1 09:13:07 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3FAC5C3A; Sun, 1 Feb 2015 09:13:07 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1277CB27; Sun, 1 Feb 2015 09:13:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t119D6ui042713; Sun, 1 Feb 2015 09:13:06 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t119D65V042710; Sun, 1 Feb 2015 09:13:06 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201502010913.t119D65V042710@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Sun, 1 Feb 2015 09:13:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r378231 - in head: . deskutils/mirall net net/owncloud-csync 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.18-1 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: Sun, 01 Feb 2015 09:13:07 -0000 Author: madpilot Date: Sun Feb 1 09:13:05 2015 New Revision: 378231 URL: https://svnweb.freebsd.org/changeset/ports/378231 QAT: https://qat.redports.org/buildarchive/r378231/ Log: - 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) Deleted: head/net/owncloud-csync/ Modified: head/MOVED head/deskutils/mirall/Makefile head/net/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Sun Feb 1 07:26:15 2015 (r378230) +++ head/MOVED Sun Feb 1 09:13:05 2015 (r378231) @@ -7411,3 +7411,4 @@ ftp/rexx-curl||2015-01-28|Has expired: B net-im/pidgin-audacious-remote||2015-01-28|Has expired: Broken for more than 6 months www/lifetype||2015-01-28|Has expired: Broken for more than 6 months www/ump||2015-01-28|Has expired: Broken for more than 6 months +net/owncloud-csync||2015-02-01|Merged into deskutils/mirall Modified: head/deskutils/mirall/Makefile ============================================================================== --- head/deskutils/mirall/Makefile Sun Feb 1 07:26:15 2015 (r378230) +++ head/deskutils/mirall/Makefile Sun Feb 1 09:13:05 2015 (r378231) @@ -27,8 +27,6 @@ CMAKE_ARGS= -DCMAKE_INSTALL_MANDIR:STRIN USE_LDCONFIG= yes INSTALLS_ICONS= yes -CONFLICTS= owncloud-csync-[0-9]* - OPTIONS_DEFINE= DOCS DOCS_BUILD_DEPENDS= sphinx-build:${PORTSDIR}/textproc/py-sphinx Modified: head/net/Makefile ============================================================================== --- head/net/Makefile Sun Feb 1 07:26:15 2015 (r378230) +++ head/net/Makefile Sun Feb 1 09:13:05 2015 (r378231) @@ -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