From owner-svn-ports-all@FreeBSD.ORG Thu Oct 17 10:15:20 2013 Return-Path: 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 ESMTP id 14F92D17; Thu, 17 Oct 2013 10:15:20 +0000 (UTC) (envelope-from amdmi3@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 02FDF231D; Thu, 17 Oct 2013 10:15:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9HAFJA2096292; Thu, 17 Oct 2013 10:15:19 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9HAFJq2096290; Thu, 17 Oct 2013 10:15:19 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201310171015.r9HAFJq2096290@svn.freebsd.org> From: Dmitry Marakasov Date: Thu, 17 Oct 2013 10:15:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330623 - head/graphics/wings 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.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Oct 2013 10:15:20 -0000 Author: amdmi3 Date: Thu Oct 17 10:15:19 2013 New Revision: 330623 URL: http://svnweb.freebsd.org/changeset/ports/330623 Log: - Support staging - Convert USE_GMAKE to USES - Add CONFLICTS on wings-devel - Add DESKTOP_ENTRIES Modified: head/graphics/wings/Makefile head/graphics/wings/pkg-plist Modified: head/graphics/wings/Makefile ============================================================================== --- head/graphics/wings/Makefile Thu Oct 17 09:50:51 2013 (r330622) +++ head/graphics/wings/Makefile Thu Oct 17 10:15:19 2013 (r330623) @@ -3,7 +3,7 @@ PORTNAME= wings PORTVERSION= 1.4.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= SF DIST_SUBDIR= erlang @@ -16,28 +16,35 @@ 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 -SUB_FILES= wings.sh +SUB_FILES= ${PORTNAME}.sh USE_BZIP2= yes -USE_GMAKE= yes +USES= gmake PORTSCOUT= limitw:1,even -NO_STAGE= yes +DESKTOP_ENTRIES="Wings" \ + "${COMMENT}" \ + "${PREFIX}/share/pixmaps/${PORTNAME}.ico" \ + "${PORTNAME}" \ + "Graphics;3DGraphics;" \ + "" + post-patch: @${REINPLACE_CMD} -e 's|$$(GCC)|${CC} -I${LOCALBASE}/include -L${LOCALBASE}/lib|g' \ ${WRKSRC}/plugins_src/accel/Makefile do-install: - ${MKDIR} ${PREFIX}/lib/erlang/lib/${DISTNAME} -.for dir in src ebin fonts plugins textures shaders patches - cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${PREFIX}/lib/erlang/lib/${DISTNAME} -.endfor - @${INSTALL_SCRIPT} ${WRKDIR}/wings.sh ${PREFIX}/bin/wings - @${LN} -sf ${DISTNAME} ${PREFIX}/lib/erlang/lib/${PORTNAME} + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${DISTNAME} + cd ${WRKSRC} && ${COPYTREE_SHARE} "src ebin fonts plugins textures shaders patches" \ + ${STAGEDIR}${PREFIX}/lib/erlang/lib/${DISTNAME} + ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/src/${PORTNAME}.icon ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.ico .include Modified: head/graphics/wings/pkg-plist ============================================================================== --- head/graphics/wings/pkg-plist Thu Oct 17 09:50:51 2013 (r330622) +++ head/graphics/wings/pkg-plist Thu Oct 17 10:15:19 2013 (r330623) @@ -1,4 +1,6 @@ +@unexec rm -f %D/lib/erlang/lib/wings bin/wings +@exec ln -sf wings-%%VERSION%% %D/lib/erlang/lib/wings lib/erlang/lib/wings-%%VERSION%%/ebin/array.beam lib/erlang/lib/wings-%%VERSION%%/ebin/e3d__bmp.beam lib/erlang/lib/wings-%%VERSION%%/ebin/e3d__meshclean.beam @@ -350,6 +352,7 @@ lib/erlang/lib/wings-%%VERSION%%/src/win lib/erlang/lib/wings-%%VERSION%%/src/wpa.erl lib/erlang/lib/wings-%%VERSION%%/textures/brand.png lib/erlang/lib/wings-%%VERSION%%/textures/grandcanyon.png +share/pixmaps/wings.ico @dirrm lib/erlang/lib/wings-%%VERSION%%/textures @dirrm lib/erlang/lib/wings-%%VERSION%%/src @dirrm lib/erlang/lib/wings-%%VERSION%%/shaders @@ -364,5 +367,3 @@ lib/erlang/lib/wings-%%VERSION%%/texture @dirrm lib/erlang/lib/wings-%%VERSION%%/fonts @dirrm lib/erlang/lib/wings-%%VERSION%%/ebin @dirrm lib/erlang/lib/wings-%%VERSION%% -@exec ln -sf wings-%%VERSION%% %D/lib/erlang/lib/wings -@unexec rm -f %D/lib/erlang/lib/wings