svn commit: r325381 - in head/x11: libXtrans xtrans

[Niclas Zeising]

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 at 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 at 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 at FreeBSD.org
 COMMENT=	Abstract network code for X
 
+CONFLICTS=	libXtrans
+
 LICENSE=	MIT
 
 XORG_CAT=	lib