Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 17 Oct 2013 10:15:19 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r330623 - head/graphics/wings
Message-ID:  <201310171015.r9HAFJq2096290@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.mk>

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310171015.r9HAFJq2096290>