8 files changed, 13 insertions, 43 deletions

diff --git a/x11-toolkits/efltk/Makefile b/x11-toolkits/efltk/Makefile
index 4f38a21a7f34..b3d7071a26a7 100644
--- a/x11-toolkits/efltk/Makefile
+++ b/x11-toolkits/efltk/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	efltk
-PORTVERSION=	2.0.1
+PORTVERSION=	2.0.5
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ede
-DISTNAME=	${PORTNAME}-${PORTVERSION}-${TIMESTAMP}
 
 MAINTAINER=	sem@FreeBSD.org
 COMMENT=	Extended Fast Light Toolkit
@@ -18,7 +17,9 @@ COMMENT=	Extended Fast Light Toolkit
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
-TIMESTAMP=	20040218
+USE_BZIP2=	yes
+
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
 ONLY_FOR_ARCHS=	i386
 
diff --git a/x11-toolkits/efltk/distinfo b/x11-toolkits/efltk/distinfo
index 35937fc701ae..1e1edebaff4f 100644
--- a/x11-toolkits/efltk/distinfo
+++ b/x11-toolkits/efltk/distinfo
@@ -1,2 +1,2 @@
-MD5 (efltk-2.0.1-20040218.tar.gz) = 9e3ba9f16ff8737cfdf115761ceee47d
-SIZE (efltk-2.0.1-20040218.tar.gz) = 1672878
+MD5 (efltk-2.0.5.tar.bz2) = edee90b237cbc7fe21f6a1e4f40c88c6
+SIZE (efltk-2.0.5.tar.bz2) = 1241294
diff --git a/x11-toolkits/efltk/files/patch-configure.in b/x11-toolkits/efltk/files/patch-configure.in
index 2bbb3e590b9a..91fb82e40031 100644
--- a/x11-toolkits/efltk/files/patch-configure.in
+++ b/x11-toolkits/efltk/files/patch-configure.in
@@ -1,9 +1,9 @@
---- configure.in.orig	Fri May 30 12:48:30 2003
-+++ configure.in	Sat Feb 28 04:37:19 2004
+--- configure.in.orig	Fri Apr 29 20:13:18 2005
++++ configure.in	Fri Jul 15 12:38:50 2005
 @@ -36,7 +36,7 @@
  FL_MAJOR_VERSION=2
  FL_MINOR_VERSION=0
- FL_PATCH_VERSION=3
+ FL_PATCH_VERSION=5
 -FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}
 +FL_API_VERSION=${FL_MAJOR_VERSION}
  
@@ -17,7 +17,7 @@
  SYSTYPE="UNIX"
  DSOCOMMAND=""
  THEMECOMMAND=""
-@@ -430,10 +429,12 @@
+@@ -420,10 +419,12 @@
  AC_ARG_ENABLE(threads, [  --disable-threads       dont require mt libraries],,enable_threads=yes)
  have_pthread=no
  if test "$enable_threads" = yes; then
diff --git a/x11-toolkits/efltk/files/patch-src::net::Fl_FTP_Connect.cpp b/x11-toolkits/efltk/files/patch-src-net-Fl_FTP_Connect.cpp
index 501c6e637b72..0391a3790f6f 100644
--- a/x11-toolkits/efltk/files/patch-src::net::Fl_FTP_Connect.cpp
+++ b/x11-toolkits/efltk/files/patch-src-net-Fl_FTP_Connect.cpp
@@ -1,5 +1,5 @@
---- src/net/Fl_FTP_Connect.cpp.orig	Fri Feb 27 04:09:46 2004
-+++ src/net/Fl_FTP_Connect.cpp	Fri Feb 27 04:10:32 2004
+--- src/net/Fl_FTP_Connect.cpp.orig	Fri Jul 15 11:31:49 2005
++++ src/net/Fl_FTP_Connect.cpp	Fri Jul 15 11:39:47 2005
 @@ -1,6 +1,6 @@
  #include <efltk/net/Fl_FTP_Connect.h>
  #include <stdio.h>
diff --git a/x11-toolkits/efltk/files/patch-src::core::Fl_Util.cpp b/x11-toolkits/efltk/files/patch-src::core::Fl_Util.cpp
deleted file mode 100644
index 973d39472fc3..000000000000
--- a/x11-toolkits/efltk/files/patch-src::core::Fl_Util.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/core/Fl_Util.cpp.orig	Fri Feb 27 03:46:57 2004
-+++ src/core/Fl_Util.cpp	Fri Feb 27 03:47:30 2004
-@@ -8,7 +8,6 @@
- #include <stdlib.h>
- #include <stdarg.h>
- #include <string.h>
--#include <malloc.h>
- #include <ctype.h>
- 
- #ifdef _WIN32_WCE
diff --git a/x11-toolkits/efltk/files/patch-test::CubeView.cpp b/x11-toolkits/efltk/files/patch-test::CubeView.cpp
deleted file mode 100644
index b91a0de6c2ed..000000000000
--- a/x11-toolkits/efltk/files/patch-test::CubeView.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- test/CubeView.cpp.orig	Fri Feb 27 04:40:14 2004
-+++ test/CubeView.cpp	Fri Feb 27 04:40:41 2004
-@@ -25,7 +25,7 @@
- 
- #include "CubeView.h"
- 
--#ifndef __linux
-+#if !defined(__linux) && !defined(__FreeBSD__)
- # include <math.h>
- #endif
- 
diff --git a/x11-toolkits/efltk/files/patch-tools::efluid::Fl_Widget_Type.cpp b/x11-toolkits/efltk/files/patch-tools::efluid::Fl_Widget_Type.cpp
deleted file mode 100644
index 760c298214da..000000000000
--- a/x11-toolkits/efltk/files/patch-tools::efluid::Fl_Widget_Type.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/efluid/Fl_Widget_Type.cpp.orig	Sat Feb 28 06:03:16 2004
-+++ tools/efluid/Fl_Widget_Type.cpp	Sat Feb 28 06:05:38 2004
-@@ -1890,7 +1890,7 @@
- 
-     if (member_of && !callback().empty() && !is_name(callback())) {
-         const char* cn = callback_name();
--        const char* ut = user_data_type().empty() ? "void*" : user_data_type();
-+        const char* ut = user_data_type().empty() ? Fl_String("void*") : user_data_type();
-         write_public(0);
-         write_h("%sinline void %s_i(%s*, %s);\n", indent(), cn, subclass, ut);
-         write_h("%sstatic void %s(%s*, %s);\n", indent(), cn, subclass, ut);
diff --git a/x11-toolkits/efltk/pkg-plist b/x11-toolkits/efltk/pkg-plist
index 6d89e7d4d8cc..c9dbb59a33e2 100644
--- a/x11-toolkits/efltk/pkg-plist
+++ b/x11-toolkits/efltk/pkg-plist
@@ -222,6 +222,7 @@ lib/libefltk_net.so.2
 lib/libefltk_xml.so
 lib/libefltk_xml.so.2
 share/locale/fi/LC_MESSAGES/efltk.mo
+share/locale/hu/LC_MESSAGES/efltk.mo
 share/locale/id/LC_MESSAGES/efltk.mo
 share/locale/sk/LC_MESSAGES/efltk.mo
 share/locale/sr/LC_MESSAGES/efltk.mo