svn commit: r333510 - in head/devel/esdl: . files

[Jimmy Olgeni]

Author: olgeni
Date: Mon Nov 11 15:08:48 2013
New Revision: 333510
URL: http://svnweb.freebsd.org/changeset/ports/333510

Log:
  - Switch to USES=gmake.
  - Add staging support.
  - Remove indefinite article from COMMENT.

Added:
  head/devel/esdl/files/patch-Makefile   (contents, props changed)
Modified:
  head/devel/esdl/Makefile
  head/devel/esdl/pkg-plist   (contents, props changed)

Modified: head/devel/esdl/Makefile
==============================================================================
--- head/devel/esdl/Makefile	Mon Nov 11 15:03:39 2013	(r333509)
+++ head/devel/esdl/Makefile	Mon Nov 11 15:08:48 2013	(r333510)
@@ -9,26 +9,26 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}.src
 DIST_SUBDIR=	erlang
 
 MAINTAINER=	olgeni at FreeBSD.org
-COMMENT=	A library for accessing SDL and OpenGL through Erlang
+COMMENT=	Library for accessing SDL and OpenGL through Erlang
 
 BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang
 RUN_DEPENDS=	erl:${PORTSDIR}/lang/erlang
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
+USES=		gmake
 USE_DOS2UNIX=	Makefile
 USE_GL=		gl glu
-USE_GMAKE=	yes
 USE_SDL=	sdl
 ALL_TARGET=	target
 PLIST_SUB=	VERSION="${PORTVERSION}"
+MAKE_ENV+=	STAGEDIR="${STAGEDIR}"
 
 OPTIONS_DEFINE=	SDL_TTF SDL_IMAGE
 OPTIONS_DEFAULT=SDL_TTF SDL_IMAGE
 SDL_TTF_DESC=	SDL_ttf support
 SDL_IMAGE_DESC=	SDL_image support
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MSDL_TTF}
@@ -58,6 +58,6 @@ post-patch:
 .endif
 
 post-install:
-	@${LN} -sf ${PORTNAME}-${PORTVERSION} ${PREFIX}/lib/erlang/lib/${PORTNAME}
+	@${LN} -sf ${PORTNAME}-${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/erlang/lib/${PORTNAME}
 
 .include <bsd.port.post.mk>

Added: head/devel/esdl/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/esdl/files/patch-Makefile	Mon Nov 11 15:08:48 2013	(r333510)
@@ -0,0 +1,17 @@
+
+$FreeBSD$
+
+--- Makefile.orig
++++ Makefile
+@@ -51,9 +51,9 @@
+ ERL_DIR := $(shell erl -noshell -eval "io:format([126,115,126,110],[code:root_dir()])" -s erlang halt)
+ 
+ ifeq ($(INSTALL_DIR), )
+-INSTALLDIR = $(ERL_DIR)/addons/$(ESDL_VSN)
++INSTALLDIR = $(STAGEDIR)$(ERL_DIR)/addons/$(ESDL_VSN)
+ else 
+-INSTALLDIR = $(INSTALL_DIR)/$(ESDL_VSN)
++INSTALLDIR = $(STAGEDIR)$(INSTALL_DIR)/$(ESDL_VSN)
+ endif
+ 
+ ## I assume that make install are only made on unixes... :-)

Modified: head/devel/esdl/pkg-plist
==============================================================================
--- head/devel/esdl/pkg-plist	Mon Nov 11 15:03:39 2013	(r333509)
+++ head/devel/esdl/pkg-plist	Mon Nov 11 15:08:48 2013	(r333510)
@@ -93,6 +93,7 @@ lib/erlang/lib/esdl-%%VERSION%%/src/sdl_
 lib/erlang/lib/esdl-%%VERSION%%/src/sdl_video.erl
 lib/erlang/lib/esdl-%%VERSION%%/src/sdl_video_funcs.hrl
 lib/erlang/lib/esdl-%%VERSION%%/vsn.mk
+lib/erlang/lib/esdl
 @dirrm lib/erlang/lib/esdl-%%VERSION%%/src
 @dirrm lib/erlang/lib/esdl-%%VERSION%%/priv
 @dirrm lib/erlang/lib/esdl-%%VERSION%%/include
@@ -100,5 +101,3 @@ lib/erlang/lib/esdl-%%VERSION%%/vsn.mk
 @dirrm lib/erlang/lib/esdl-%%VERSION%%/doc
 @dirrm lib/erlang/lib/esdl-%%VERSION%%/c_src
 @dirrm lib/erlang/lib/esdl-%%VERSION%%
- at exec ln -sf esdl-%%VERSION%% %D/lib/erlang/lib/esdl
- at rmtry lib/erlang/lib/esdl