aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzeising <zeising@FreeBSD.org>2013-08-26 18:07:01 +0800
committerzeising <zeising@FreeBSD.org>2013-08-26 18:07:01 +0800
commit7649d3131fe6c637fe680875b74f84fc58b1eb59 (patch)
treef4b17320bd6ddb7aebf56bd2528d960e25e651b8
parentea19ce262a7e6c310e99877c2a4e05665d6dafed (diff)
downloadfreebsd-ports-gnome-7649d3131fe6c637fe680875b74f84fc58b1eb59.tar.gz
freebsd-ports-gnome-7649d3131fe6c637fe680875b74f84fc58b1eb59.tar.zst
freebsd-ports-gnome-7649d3131fe6c637fe680875b74f84fc58b1eb59.zip
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]
-rw-r--r--x11/libXtrans/Makefile5
-rw-r--r--x11/xtrans/Makefile2
2 files changed, 7 insertions, 0 deletions
diff --git a/x11/libXtrans/Makefile b/x11/libXtrans/Makefile
index a311d50b463b..88d9bf6e0474 100644
--- a/x11/libXtrans/Makefile
+++ b/x11/libXtrans/Makefile
@@ -10,6 +10,11 @@ MASTER_SITES= http://xlibs.freedesktop.org/release/
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
diff --git a/x11/xtrans/Makefile b/x11/xtrans/Makefile
index 6a268d80d78d..e1953c67a53f 100644
--- a/x11/xtrans/Makefile
+++ b/x11/xtrans/Makefile
@@ -8,6 +8,8 @@ CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= Abstract network code for X
+CONFLICTS= libXtrans
+
LICENSE= MIT
XORG_CAT= lib