diff options
-rw-r--r-- | devel/esdl/Makefile | 3 | ||||
-rw-r--r-- | devel/esdl/distinfo | 2 | ||||
-rw-r--r-- | devel/esdl/files/patch-c__src_Makefile | 63 | ||||
-rw-r--r-- | devel/esdl/files/patch-c__src_esdl__events.c | 11 | ||||
-rw-r--r-- | devel/esdl/files/patch-c__src_esdl__video.c | 11 | ||||
-rw-r--r-- | devel/esdl/pkg-plist | 6 |
6 files changed, 48 insertions, 48 deletions
diff --git a/devel/esdl/Makefile b/devel/esdl/Makefile index 5cb77b65b4e9..f63ccff135bb 100644 --- a/devel/esdl/Makefile +++ b/devel/esdl/Makefile @@ -6,8 +6,7 @@ # PORTNAME= esdl -PORTVERSION= 0.93.0526 -PORTREVISION= 1 +PORTVERSION= 0.93.0909 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/devel/esdl/distinfo b/devel/esdl/distinfo index ce9e300c3b55..3be6a273cc51 100644 --- a/devel/esdl/distinfo +++ b/devel/esdl/distinfo @@ -1 +1 @@ -MD5 (erlang/esdl-0.93.0526.src.tar.gz) = ac54d03d0bd7f53ebf84c371cbaabcb2 +MD5 (erlang/esdl-0.93.0909.src.tar.gz) = f086856666b00211be451269747f14c3 diff --git a/devel/esdl/files/patch-c__src_Makefile b/devel/esdl/files/patch-c__src_Makefile index ea8feb12ab95..d43fcb9373fe 100644 --- a/devel/esdl/files/patch-c__src_Makefile +++ b/devel/esdl/files/patch-c__src_Makefile @@ -1,42 +1,45 @@ - -$FreeBSD$ - ---- c_src/Makefile.orig Mon May 26 16:13:17 2003 -+++ c_src/Makefile Fri Jul 18 11:42:01 2003 -@@ -5,7 +5,7 @@ - # $Id: Makefile,v 1.8 2003/05/26 08:00:46 dgud Exp $ - # - --OGLDIR = /usr -+OGLDIR = ${X11BASE} +--- c_src/Makefile.ori Tue Sep 9 10:28:24 2003 ++++ c_src/Makefile Mon Nov 17 18:34:14 2003 +@@ -11,7 +11,7 @@ + include ../win32_conf/mingw_vars.mk + else + +- OGLDIR = /usr ++ OGLDIR = ${X11BASE} # Uncomment these if your opengl header is located in another directory than # the usual $(OGLDIR)/include/GL/gl.h -@@ -15,13 +15,13 @@ - GL_LIBS = -L$(OGLDIR)/lib -lGL -lGLU - GL_INCS = -I$(OGLDIR)/include/$(GL_INCLUDE_DIR) +@@ -21,14 +21,13 @@ + GL_LIBS = -L$(OGLDIR)/lib -lGL -lGLU + GL_INCS = -I$(OGLDIR)/include/$(GL_INCLUDE_DIR) --SDL_LIBS = $(shell sdl-config --libs) -+SDL_LIBS = $(shell $(SDL_CONFIG) --libs) - LIBS = $(GL_LIBS) $(SDL_LIBS) -lm +- SDL_LIBS = $(shell sdl-config --libs) +- SDL_INCS = $(shell sdl-config --cflags) ++ SDL_LIBS = $(shell $(SDL_CONFIG) --libs) ++ SDL_INCS = $(shell $(SDL_CONFIG) --cflags) --SDLINCS = $(shell sdl-config --cflags) -+SDLINCS = $(shell $(SDL_CONFIG) --cflags) + LIBS = $(GL_LIBS) $(SDL_LIBS) -lm --CFLAGS = -g -O2 -funroll-loops -Wall -ffast-math -fpic -fomit-frame-pointer \ -- $(USE_GL_INCLUDE_DIR) -DSHM -DPTHREADS $(GL_INCS) $(SDLINCS) $(ERLINC) -+CFLAGS += -funroll-loops -Wall -ffast-math -fpic -fomit-frame-pointer \ -+ $(USE_GL_INCLUDE_DIR) -DSHM -DPTHREADS $(GL_INCS) $(SDLINCS) +- CFLAGS = -g -O2 -funroll-loops -Wall -ffast-math -fpic \ +- -fomit-frame-pointer $(USE_GL_INCLUDE_DIR) -DSHM \ +- -DPTHREADS $(GL_INCS) $(SDL_INCS) $(ERL_INCS) ++ CFLAGS += -O2 -funroll-loops -Wall -ffast-math -fpic -fomit-frame-pointer \ ++ $(USE_GL_INCLUDE_DIR) -DSHM -DPTHREADS $(GL_INCS) $(SDL_INCS) $(ERL_INCS) - TARGETDIR = ../priv + CLINKFLAGS = -fpic -shared + +@@ -38,13 +37,13 @@ + ERL_DIR := $(shell echo 'io:format("~s~n",[code:root_dir()]),halt().' | erl | sed 's,^[0-9]*> *,,g' | tail +2) + ERL_INCS = -I$(ERL_DIR)/usr/include -@@ -29,8 +29,8 @@ - ERL_DIR := $(shell echo 'io:format("~s~n",[code:root_dir()]),halt().' | erl | sed 's,^[0-9]*> *,,g' | tail +2) - ERLINC = -I$(ERL_DIR)/usr/include +- CC = gcc ++ CC ?= gcc + + endif + + TARGETDIR = ../priv --CC = gcc --GCC_O = $(CC) -c $(CFLAGS) $(INCS) $< -+CC ?= gcc +-GCC_O = $(CC) -c $(CFLAGS) $< +GCC_O = $(CC) -c $(CFLAGS) $(INCS) $(ERLINC) $< # Files diff --git a/devel/esdl/files/patch-c__src_esdl__events.c b/devel/esdl/files/patch-c__src_esdl__events.c index 38e276fee6ff..31952bbf7d3e 100644 --- a/devel/esdl/files/patch-c__src_esdl__events.c +++ b/devel/esdl/files/patch-c__src_esdl__events.c @@ -1,9 +1,6 @@ - -$FreeBSD$ - ---- c_src/esdl_events.c.orig Mon Dec 9 23:13:11 2002 -+++ c_src/esdl_events.c Mon Dec 9 23:13:35 2002 -@@ -14,7 +14,11 @@ +--- c_src/esdl_events.c.ori Tue Sep 9 10:28:24 2003 ++++ c_src/esdl_events.c Mon Nov 17 18:23:24 2003 +@@ -15,7 +15,11 @@ #ifdef WIN32 #include <SDL_events.h> #else @@ -14,4 +11,4 @@ $FreeBSD$ +#endif #endif - /* Foward decls */ + #define MAX_EVENT_SIZE 13 diff --git a/devel/esdl/files/patch-c__src_esdl__video.c b/devel/esdl/files/patch-c__src_esdl__video.c index 89a4e03f25f3..b835ccf1a443 100644 --- a/devel/esdl/files/patch-c__src_esdl__video.c +++ b/devel/esdl/files/patch-c__src_esdl__video.c @@ -1,9 +1,6 @@ - -$FreeBSD$ - ---- c_src/esdl_video.c.orig Mon Dec 9 23:12:18 2002 -+++ c_src/esdl_video.c Mon Dec 9 23:13:01 2002 -@@ -18,7 +18,11 @@ +--- c_src/esdl_video.c.ori Tue Sep 9 10:28:24 2003 ++++ c_src/esdl_video.c Mon Nov 17 18:24:48 2003 +@@ -16,7 +16,11 @@ #ifdef WIN32 #include <SDL_syswm.h> #else @@ -14,4 +11,4 @@ $FreeBSD$ +#endif #endif - int es_setVideoMode(sdl_data *sd, int len, char * buff) + void es_setVideoMode(sdl_data *sd, int len, char* bp) diff --git a/devel/esdl/pkg-plist b/devel/esdl/pkg-plist index 45caa210f6cc..26a940c3d54f 100644 --- a/devel/esdl/pkg-plist +++ b/devel/esdl/pkg-plist @@ -1,5 +1,6 @@ lib/erlang/lib/esdl-%%VERSION%%/Readme lib/erlang/lib/esdl-%%VERSION%%/Readme.MacOSX-Cocoa +lib/erlang/lib/esdl-%%VERSION%%/Readme.win32 lib/erlang/lib/esdl-%%VERSION%%/c_src/CPS.h lib/erlang/lib/esdl-%%VERSION%%/c_src/SDLMain.h lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl.h @@ -12,10 +13,14 @@ lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_events.h lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_gen.c lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_gl.c lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_gl.h +lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_gl_fp.h lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_glext.c lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_glext.h +lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_glext_fp.h lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_glu.c lib/erlang/lib/esdl-%%VERSION%%/c_src/esdl_glu.h +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_util.h @@ -48,7 +53,6 @@ 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 lib/erlang/lib/esdl-%%VERSION%%/include/glu.hrl -lib/erlang/lib/esdl-%%VERSION%%/include/old_gl.hrl lib/erlang/lib/esdl-%%VERSION%%/include/sdl.hrl lib/erlang/lib/esdl-%%VERSION%%/include/sdl_active.hrl lib/erlang/lib/esdl-%%VERSION%%/include/sdl_audio.hrl |