svn commit: r378231 - in head: . deskutils/mirall net net/owncloud-csync

[Guido Falsi]

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 at 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