svn commit: r338996 - in head: . graphics graphics/wings graphics/wings-devel

[Dmitry Marakasov]

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