From owner-svn-ports-head@FreeBSD.ORG  Mon Aug 26 10:07:02 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 9F7ABE5;
 Mon, 26 Aug 2013 10:07:02 +0000 (UTC)
 (envelope-from zeising@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8D0132FF4;
 Mon, 26 Aug 2013 10:07:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7QA723b065480;
 Mon, 26 Aug 2013 10:07:02 GMT (envelope-from zeising@svn.freebsd.org)
Received: (from zeising@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7QA72N0065477;
 Mon, 26 Aug 2013 10:07:02 GMT (envelope-from zeising@svn.freebsd.org)
Message-Id: <201308261007.r7QA72N0065477@svn.freebsd.org>
From: Niclas Zeising <zeising@FreeBSD.org>
Date: Mon, 26 Aug 2013 10:07:02 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r325381 - in head/x11: libXtrans xtrans
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Aug 2013 10:07:02 -0000

Author: zeising
Date: Mon Aug 26 10:07:01 2013
New Revision: 325381
URL: http://svnweb.freebsd.org/changeset/ports/325381

Log:
  Add conflicts between x11/libXtrans and x11/xtrans, they install the same
  files. [1]
  Mark x11/libXtrans as DEPRECATED, since it is obsolteted upstream, and set
  removal date one month from now.  Nothing in ports uses x11/libXtrans
  anyway.
  
  PR:		ports/181512 [1]
  Submitted by:	Gerald Pfeifer <gerald@pfeifer.com> [1]

Modified:
  head/x11/libXtrans/Makefile
  head/x11/xtrans/Makefile

Modified: head/x11/libXtrans/Makefile
==============================================================================
--- head/x11/libXtrans/Makefile	Mon Aug 26 09:47:12 2013	(r325380)
+++ head/x11/libXtrans/Makefile	Mon Aug 26 10:07:01 2013	(r325381)
@@ -10,6 +10,11 @@ MASTER_SITES=	http://xlibs.freedesktop.o
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Network API translation layer for X applications and libraries
 
+CONFLICTS=	xtrans
+
+DEPRECATED=	Project is obsoleted, use x11/xtrans instead
+EXPIRATION_DATE=2013-09-26
+
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes

Modified: head/x11/xtrans/Makefile
==============================================================================
--- head/x11/xtrans/Makefile	Mon Aug 26 09:47:12 2013	(r325380)
+++ head/x11/xtrans/Makefile	Mon Aug 26 10:07:01 2013	(r325381)
@@ -8,6 +8,8 @@ CATEGORIES=	x11
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Abstract network code for X
 
+CONFLICTS=	libXtrans
+
 LICENSE=	MIT
 
 XORG_CAT=	lib