From owner-svn-ports-all@FreeBSD.ORG  Tue Jan  7 10:34:49 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 72F5A980;
 Tue,  7 Jan 2014 10:34:49 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5E420189E;
 Tue,  7 Jan 2014 10:34:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s07AYnux055088;
 Tue, 7 Jan 2014 10:34:49 GMT (envelope-from amdmi3@svn.freebsd.org)
Received: (from amdmi3@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s07AYmsD055082;
 Tue, 7 Jan 2014 10:34:48 GMT (envelope-from amdmi3@svn.freebsd.org)
Message-Id: <201401071034.s07AYmsD055082@svn.freebsd.org>
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Tue, 7 Jan 2014 10:34:48 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r338996 - in head: . graphics graphics/wings
 graphics/wings-devel
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.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Jan 2014 10:34:49 -0000

Author: amdmi3
Date: Tue Jan  7 10:34:48 2014
New Revision: 338996
URL: http://svnweb.freebsd.org/changeset/ports/338996

Log:
  - Remove graphics/wings-devel, use graphics/wings instead

Deleted:
  head/graphics/wings-devel/
Modified:
  head/MOVED
  head/graphics/Makefile
  head/graphics/wings/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Tue Jan  7 10:28:35 2014	(r338995)
+++ head/MOVED	Tue Jan  7 10:34:48 2014	(r338996)
@@ -5365,3 +5365,4 @@ devel/qt4-qtestlib|devel/qt4-testlib|201
 textproc/qt4-clucene|textproc/clucene-qt4|2014-01-06|Renamed to unify with Qt 5
 www/qt4-webkit|www/webkit-qt4|2014-01-06|Renamed to unify with Qt 5
 x11/qt4-opengl|graphics/qt4-opengl|2014-01-06|Moved to unify with Qt 5
+graphics/wings-devel|graphics/wings|2014-01-07|Obsoleted by the main port

Modified: head/graphics/Makefile
==============================================================================
--- head/graphics/Makefile	Tue Jan  7 10:28:35 2014	(r338995)
+++ head/graphics/Makefile	Tue Jan  7 10:34:48 2014	(r338996)
@@ -1025,7 +1025,6 @@
     SUBDIR += whirlgif
     SUBDIR += white_dune
     SUBDIR += wings
-    SUBDIR += wings-devel
     SUBDIR += wmgrabimage
     SUBDIR += wmicons
     SUBDIR += wxsvg

Modified: head/graphics/wings/Makefile
==============================================================================
--- head/graphics/wings/Makefile	Tue Jan  7 10:28:35 2014	(r338995)
+++ head/graphics/wings/Makefile	Tue Jan  7 10:34:48 2014	(r338996)
@@ -16,8 +16,6 @@ BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erl
 RUN_DEPENDS=	erl:${PORTSDIR}/lang/erlang \
 		${LOCALBASE}/lib/erlang/lib/esdl/include/sdl.hrl:${PORTSDIR}/devel/esdl
 
-CONFLICTS=	${PORTNAME}-devel-[0-9]*
-
 MAKE_ENV=	ESDL_PATH=${LOCALBASE}/lib/erlang/lib/esdl
 PLIST_SUB=	VERSION="${PORTVERSION}"
 MAKE_JOBS_UNSAFE=yes