8 files changed, 10 insertions, 74 deletions

diff --git a/devel/esdl/Makefile b/devel/esdl/Makefile
index 1c43023e930e..8ccca2a5240e 100644
--- a/devel/esdl/Makefile
+++ b/devel/esdl/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	esdl
-PORTVERSION=	0.94.0615
-PORTREVISION=	1
+PORTVERSION=	0.95.0630
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -30,10 +29,6 @@ PLIST_SUB=	VERSION="${PORTVERSION}"
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} != "i386"
-BROKEN=		"Does not compile on !i386"
-.endif
-
 post-install:
 	@${LN} -sf ${PORTNAME}-${PORTVERSION} ${PREFIX}/lib/erlang/lib/${PORTNAME}
 
diff --git a/devel/esdl/distinfo b/devel/esdl/distinfo
index 71f36fecfd28..72a639624e20 100644
--- a/devel/esdl/distinfo
+++ b/devel/esdl/distinfo
@@ -1,2 +1,2 @@
-MD5 (erlang/esdl-0.94.0615.src.tar.gz) = c3caede4e1af50043d89fe1b774912d8
-SIZE (erlang/esdl-0.94.0615.src.tar.gz) = 404439
+MD5 (erlang/esdl-0.95.0630.src.tar.gz) = e892f64e9c5f6eca037757e5c38667ce
+SIZE (erlang/esdl-0.95.0630.src.tar.gz) = 416646
diff --git a/devel/esdl/files/patch-c__src_Makefile b/devel/esdl/files/patch-c__src_Makefile
index d43fcb9373fe..23f706f984fd 100644
--- a/devel/esdl/files/patch-c__src_Makefile
+++ b/devel/esdl/files/patch-c__src_Makefile
@@ -1,5 +1,8 @@
---- c_src/Makefile.ori	Tue Sep  9 10:28:24 2003
-+++ c_src/Makefile	Mon Nov 17 18:34:14 2003
+
+$FreeBSD$
+
+--- c_src/Makefile.orig
++++ c_src/Makefile
 @@ -11,7 +11,7 @@
  include ../win32_conf/mingw_vars.mk
  else
@@ -29,7 +32,7 @@
    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_DIR := $(shell echo 'io:format("~s~n",[code:root_dir()]),halt().' | erl | grep '1>' | sed 's,^[0-9]*> *,,g')
    ERL_INCS = -I$(ERL_DIR)/usr/include
  
 -  CC = gcc
diff --git a/devel/esdl/files/patch-c__src_esdl.h b/devel/esdl/files/patch-c__src_esdl.h
deleted file mode 100644
index fb03d23ad30e..000000000000
--- a/devel/esdl/files/patch-c__src_esdl.h
+++ /dev/null
@@ -1,17 +0,0 @@
-
-$FreeBSD$
-
---- c_src/esdl.h.orig	Mon Dec  9 23:10:14 2002
-+++ c_src/esdl.h	Mon Dec  9 23:10:27 2002
-@@ -17,7 +17,11 @@
- #include <windows.h>  /* needed by Windows' gl.h etc */
- #include <SDL.h>
- #else
-+#ifdef __FreeBSD__
-+#include <SDL.h>
-+#else
- #include <SDL/SDL.h>
-+#endif
- #endif
- 
- 
diff --git a/devel/esdl/files/patch-c__src_esdl__conv.h b/devel/esdl/files/patch-c__src_esdl__conv.h
deleted file mode 100644
index 6579994aacc2..000000000000
--- a/devel/esdl/files/patch-c__src_esdl__conv.h
+++ /dev/null
@@ -1,17 +0,0 @@
-
-$FreeBSD$
-
---- c_src/esdl_conv.h.orig	Mon Dec  9 23:11:33 2002
-+++ c_src/esdl_conv.h	Mon Dec  9 23:12:05 2002
-@@ -23,7 +23,11 @@
- #ifdef WIN32
- #include <SDL_byteorder.h>
- #else 
-+#ifdef __FreeBSD__
-+#include <SDL_byteorder.h>
-+#else
- #include <SDL/SDL_byteorder.h>
-+#endif
- #endif
- 
- float  readFloat(char *);
diff --git a/devel/esdl/files/patch-c__src_esdl__events.c b/devel/esdl/files/patch-c__src_esdl__events.c
deleted file mode 100644
index 31952bbf7d3e..000000000000
--- a/devel/esdl/files/patch-c__src_esdl__events.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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
-+#ifdef __FreeBSD__
-+#include <SDL_events.h>
-+#else
- #include <SDL/SDL_events.h>
-+#endif
- #endif
- 
- #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
deleted file mode 100644
index b835ccf1a443..000000000000
--- a/devel/esdl/files/patch-c__src_esdl__video.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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
-+#ifdef __FreeBSD__
-+#include <SDL_syswm.h>
-+#else
- #include <SDL/SDL_syswm.h>
-+#endif
- #endif
- 
- void es_setVideoMode(sdl_data *sd, int len, char* bp) 
diff --git a/devel/esdl/pkg-plist b/devel/esdl/pkg-plist
index 42d6c17838e9..6b282427bd4f 100644
--- a/devel/esdl/pkg-plist
+++ b/devel/esdl/pkg-plist
@@ -86,6 +86,6 @@ lib/erlang/lib/esdl-%%VERSION%%/vsn
 @dirrm lib/erlang/lib/esdl-%%VERSION%%/ebin
 @dirrm lib/erlang/lib/esdl-%%VERSION%%/doc
 @dirrm lib/erlang/lib/esdl-%%VERSION%%/c_src
-@dirrm lib/erlang/lib/esdl-%%VERSION%%/
+@dirrm lib/erlang/lib/esdl-%%VERSION%%
 @exec ln -sf esdl-%%VERSION%% %D/lib/erlang/lib/esdl
 @unexec rm -f %D/lib/erlang/lib/esdl