summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJimmy Olgeni <olgeni@FreeBSD.org>2013-11-11 15:08:48 +0000
committerJimmy Olgeni <olgeni@FreeBSD.org>2013-11-11 15:08:48 +0000
commit9af122c34a17452a9226633227f9d6e6eaf4af7b (patch)
tree42d451ba59d76e9073318d7ff76abcdafe85bb77
parent- Update to 2.0.9 (diff)
- Switch to USES=gmake.
- Add staging support. - Remove indefinite article from COMMENT.
Notes
Notes: svn path=/head/; revision=333510
-rw-r--r--devel/esdl/Makefile8
-rw-r--r--devel/esdl/files/patch-Makefile17
-rw-r--r--devel/esdl/pkg-plist3
3 files changed, 22 insertions, 6 deletions
diff --git a/devel/esdl/Makefile b/devel/esdl/Makefile
index 0d6eb6b985f5..f234a1544c7f 100644
--- a/devel/esdl/Makefile
+++ b/devel/esdl/Makefile
@@ -9,26 +9,26 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}.src
DIST_SUBDIR= erlang
MAINTAINER= olgeni@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>
diff --git a/devel/esdl/files/patch-Makefile b/devel/esdl/files/patch-Makefile
new file mode 100644
index 000000000000..58db809217c4
--- /dev/null
+++ b/devel/esdl/files/patch-Makefile
@@ -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... :-)
diff --git a/devel/esdl/pkg-plist b/devel/esdl/pkg-plist
index c9789531e312..24c99de4484f 100644
--- a/devel/esdl/pkg-plist
+++ b/devel/esdl/pkg-plist
@@ -93,6 +93,7 @@ lib/erlang/lib/esdl-%%VERSION%%/src/sdl_util.hrl
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%%
-@exec ln -sf esdl-%%VERSION%% %D/lib/erlang/lib/esdl
-@rmtry lib/erlang/lib/esdl