4 files changed, 60 insertions, 20 deletions

diff --git a/devel/esdl/Makefile b/devel/esdl/Makefile
index 22db4adcda25..cb79a02dbfd9 100644
--- a/devel/esdl/Makefile
+++ b/devel/esdl/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	esdl
-PORTVERSION=	0.96.0626
-PORTREVISION=	7
+PORTVERSION=	1.0.1
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
 DIST_SUBDIR=	erlang
 
@@ -22,14 +20,41 @@ RUN_DEPENDS=	erl:${PORTSDIR}/lang/erlang
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USE_GL=		yes
+USE_DOS2UNIX=	Makefile
+USE_GL=		gl glu
 USE_GMAKE=	yes
 USE_SDL=	sdl
 ALL_TARGET=	target
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
+OPTIONS=	SDL_TTF "SDL_ttf support" on \
+		SDL_IMAGE "SDL_image support" on
+
 .include <bsd.port.pre.mk>
 
+.if !defined(WITHOUT_SDL_TTF)
+USE_SDL+=	ttf
+PLIST_SUB+=	SDL_TTF=""
+.else
+PLIST_SUB+=	SDL_TTF="@comment "
+.endif
+
+.if !defined(WITHOUT_SDL_IMAGE)
+USE_SDL+=	image
+PLIST_SUB+=	SDL_IMAGE=""
+.else
+PLIST_SUB+=	SDL_IMAGE="@comment "
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -Ee 's|addons|lib|' ${WRKSRC}/Makefile
+.if !defined(WITHOUT_SDL_TTF)
+	@${REINPLACE_CMD} -e '/ENABLE_SDL_TTF = / s|no|yes|' ${WRKSRC}/Makefile
+.endif
+.if !defined(WITHOUT_SDL_IMAGE)
+	@${REINPLACE_CMD} -e '/ENABLE_SDL_IMAGE = / s|no|yes|' ${WRKSRC}/Makefile
+.endif
+
 post-install:
 	@${LN} -sf ${PORTNAME}-${PORTVERSION} ${PREFIX}/lib/erlang/lib/${PORTNAME}
 
diff --git a/devel/esdl/distinfo b/devel/esdl/distinfo
index a72fa5ed0cfc..9973490903e9 100644
--- a/devel/esdl/distinfo
+++ b/devel/esdl/distinfo
@@ -1,3 +1,3 @@
-MD5 (erlang/esdl-0.96.0626.src.tar.gz) = 5007750ddd989319442e8e040db3b6dd
-SHA256 (erlang/esdl-0.96.0626.src.tar.gz) = 8536168826688bfb774d197f3347d823327e21b186e992e8a3dd1e4e610b796e
-SIZE (erlang/esdl-0.96.0626.src.tar.gz) = 416553
+MD5 (erlang/esdl-1.0.1.src.tar.gz) = 50230ea81418cb029281a70627a5dd8e
+SHA256 (erlang/esdl-1.0.1.src.tar.gz) = 16fcf29656e6a54c9e10d0a73faa3e5b305c6aab3ab691cad2206c427265877d
+SIZE (erlang/esdl-1.0.1.src.tar.gz) = 428917
diff --git a/devel/esdl/files/patch-c__src_Makefile b/devel/esdl/files/patch-c__src_Makefile
index 12266a6ba4ec..90710643cefc 100644
--- a/devel/esdl/files/patch-c__src_Makefile
+++ b/devel/esdl/files/patch-c__src_Makefile
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- c_src/Makefile.orig
-+++ c_src/Makefile
+--- c_src/Makefile.orig	2009-05-20 22:34:48.000000000 +0400
++++ c_src/Makefile	2009-06-02 06:19:34.000000000 +0400
 @@ -11,7 +11,7 @@
  include ../win32_conf/mingw_vars.mk
  else
@@ -12,7 +9,7 @@ $FreeBSD$
  
  # Uncomment these if your opengl header is located in another directory than
  # the usual $(OGLDIR)/include/GL/gl.h
-@@ -21,14 +21,13 @@
+@@ -21,8 +21,8 @@
    GL_LIBS		= -L$(OGLDIR)/lib -lGL -lGLU 
    GL_INCS		= -I$(OGLDIR)/include/$(GL_INCLUDE_DIR)
  
@@ -21,18 +18,23 @@ $FreeBSD$
 +  SDL_LIBS		= $(shell $(SDL_CONFIG) --libs)
 +  SDL_INCS		= $(shell $(SDL_CONFIG) --cflags)
  
-   LIBS			= $(GL_LIBS) $(SDL_LIBS) -lm 
+ ifeq ($(ENABLE_SDL_TTF), yes)
+   SDL_TTF_LIBS          = -lSDL_ttf
+@@ -43,10 +43,8 @@
+   INCS                  = $(GL_INCS) $(SDL_INCS)  $(SDL_TTF_INCS) \
+                           $(SDL_IMAGE_INCS) $(ERL_INCS)
  
 -  CFLAGS		= -g -O2 -funroll-loops -Wall -ffast-math -fpic \
 -			-fomit-frame-pointer $(USE_GL_INCLUDE_DIR) -DSHM \
--			-DPTHREADS $(GL_INCS) $(SDL_INCS) $(ERL_INCS)
+-                        $(USE_SDL_TTF) $(USE_SDL_IMAGE) \
+-			-DPTHREADS $(INCS)
 +  CFLAGS		+= -O2 -funroll-loops -Wall -ffast-math -fpic -fomit-frame-pointer \
-+			$(USE_GL_INCLUDE_DIR) -DSHM -DPTHREADS $(GL_INCS) $(SDL_INCS) $(ERL_INCS)
++			$(USE_GL_INCLUDE_DIR) -DSHM $(USE_SDL_TTF) $(USE_SDL_IMAGE) -DPTHREADS $(INCS)
  
    CLINKFLAGS 		=  -fpic -shared  
  
-@@ -38,13 +37,13 @@
-   ERL_DIR := $(shell echo 'io:format("~s~n",[code:root_dir()]),halt().' | erl | grep '1>' | sed 's,^[0-9]*> *,,g')
+@@ -56,13 +54,13 @@
+   ERL_DIR := $(shell erl -noshell -eval "io:format([126,115,126,110],[code:root_dir()])" -s erlang halt)
    ERL_INCS = -I$(ERL_DIR)/usr/include
  
 -  CC = gcc
diff --git a/devel/esdl/pkg-plist b/devel/esdl/pkg-plist
index 5234114a68db..c9789531e312 100644
--- a/devel/esdl/pkg-plist
+++ b/devel/esdl/pkg-plist
@@ -23,6 +23,10 @@ lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_glu_fp.h
 lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_sdl_fp.h
 lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_spec.c
 lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_util.c
+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_ttf.h
+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_ttf.c
+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_img.h
+lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_img.c
 lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_util.h
 lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_video.c
 lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_video.h
@@ -34,9 +38,11 @@ lib/erlang/lib/esdl-%%VERSION%%/doc/sdl.html
 lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_active.html
 lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_audio.html
 lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_events.html
+lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_img.html
 lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_joystick.html
 lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_keyboard.html
 lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_mouse.html
+lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_ttf.html
 lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_util.html
 lib/erlang/lib/esdl-%%VERSION%%/doc/sdl_video.html
 lib/erlang/lib/esdl-%%VERSION%%/ebin/gl.beam
@@ -45,9 +51,11 @@ lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl.beam
 lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_active.beam
 lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_audio.beam
 lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_events.beam
+%%SDL_IMAGE%%lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_img.beam
 lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_joystick.beam
 lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_keyboard.beam
 lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_mouse.beam
+%%SDL_TTF%%lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_ttf.beam
 lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_util.beam
 lib/erlang/lib/esdl-%%VERSION%%/ebin/sdl_video.beam
 lib/erlang/lib/esdl-%%VERSION%%/include/gl.hrl
@@ -59,6 +67,7 @@ lib/erlang/lib/esdl-%%VERSION%%/include/sdl_events.hrl
 lib/erlang/lib/esdl-%%VERSION%%/include/sdl_joystick.hrl
 lib/erlang/lib/esdl-%%VERSION%%/include/sdl_keyboard.hrl
 lib/erlang/lib/esdl-%%VERSION%%/include/sdl_mouse.hrl
+lib/erlang/lib/esdl-%%VERSION%%/include/sdl_ttf.hrl
 lib/erlang/lib/esdl-%%VERSION%%/include/sdl_video.hrl
 lib/erlang/lib/esdl-%%VERSION%%/license.terms
 lib/erlang/lib/esdl-%%VERSION%%/priv/sdl_driver.so
@@ -72,14 +81,18 @@ lib/erlang/lib/esdl-%%VERSION%%/src/sdl.erl
 lib/erlang/lib/esdl-%%VERSION%%/src/sdl_active.erl
 lib/erlang/lib/esdl-%%VERSION%%/src/sdl_audio.erl
 lib/erlang/lib/esdl-%%VERSION%%/src/sdl_events.erl
+lib/erlang/lib/esdl-%%VERSION%%/src/sdl_img.erl
+lib/erlang/lib/esdl-%%VERSION%%/src/sdl_img_funcs.hrl
 lib/erlang/lib/esdl-%%VERSION%%/src/sdl_joystick.erl
 lib/erlang/lib/esdl-%%VERSION%%/src/sdl_keyboard.erl
 lib/erlang/lib/esdl-%%VERSION%%/src/sdl_mouse.erl
+lib/erlang/lib/esdl-%%VERSION%%/src/sdl_ttf.erl
+lib/erlang/lib/esdl-%%VERSION%%/src/sdl_ttf_funcs.hrl
 lib/erlang/lib/esdl-%%VERSION%%/src/sdl_util.erl
 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
+lib/erlang/lib/esdl-%%VERSION%%/vsn.mk
 @dirrm lib/erlang/lib/esdl-%%VERSION%%/src
 @dirrm lib/erlang/lib/esdl-%%VERSION%%/priv
 @dirrm lib/erlang/lib/esdl-%%VERSION%%/include