- Update to 1.0.6 (it fixes gcc 4.1 build problem too)

- Install in LOCALBASE

6 files changed, 35 insertions, 44 deletions

diff --git a/x11-toolkits/efltk/Makefile b/x11-toolkits/efltk/Makefile
index 903547038a3c..052decc4e004 100644
--- a/x11-toolkits/efltk/Makefile
+++ b/x11-toolkits/efltk/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	efltk
-PORTVERSION=	2.0.5
+PORTVERSION=	2.0.6
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ede
@@ -29,13 +29,14 @@ CONFIGURE_ARGS+=	--disable-mysql
 USE_MYSQL=	yes
 .endif
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_AUTOTOOLS=	autoconf:213
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" \
 		DEBUGFLAG="${CFLAGS} -I${LOCALBASE}/include"
+MAKE_ENV+=	LD_LIBRARY_PATH="${WRKSRC}/lib"
 
 INSTALLS_SHLIB=	yes
 
diff --git a/x11-toolkits/efltk/distinfo b/x11-toolkits/efltk/distinfo
index bade5763ebbf..6344b856c5f0 100644
--- a/x11-toolkits/efltk/distinfo
+++ b/x11-toolkits/efltk/distinfo
@@ -1,3 +1,3 @@
-MD5 (efltk-2.0.5.tar.bz2) = edee90b237cbc7fe21f6a1e4f40c88c6
-SHA256 (efltk-2.0.5.tar.bz2) = 7d1301ecbc1fcbebb8280f5f82e14757f17030acda7b3835d7c827e1c93714e8
-SIZE (efltk-2.0.5.tar.bz2) = 1241294
+MD5 (efltk-2.0.6.tar.bz2) = 125c1deade9da94453758fa3cdac1c6a
+SHA256 (efltk-2.0.6.tar.bz2) = 0c361b2b14a26c8963e4ec317ae9578bac67d045ab49b64b973f01397c6baf66
+SIZE (efltk-2.0.6.tar.bz2) = 1241283
diff --git a/x11-toolkits/efltk/files/patch-configure.in b/x11-toolkits/efltk/files/patch-configure.in
index 91fb82e40031..4bc36e209a26 100644
--- a/x11-toolkits/efltk/files/patch-configure.in
+++ b/x11-toolkits/efltk/files/patch-configure.in
@@ -1,36 +1,14 @@
---- 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=5
--FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}
-+FL_API_VERSION=${FL_MAJOR_VERSION}
+--- configure.in.orig	Sun Sep  3 00:55:56 2006
++++ configure.in	Sat Dec 16 21:43:39 2006
+@@ -132,10 +132,9 @@
+ LD="\${CXX}"
+ LDLIBS="$LDLIBS -lX11 -lXext -lm"
  
- AC_SUBST(FL_MAJOR_VERSION)
- AC_SUBST(FL_MINOR_VERSION)
-@@ -135,7 +135,6 @@
- DSOEXT=".so.$FL_API_VERSION"
+-DSOEXT=".so.$FL_API_VERSION"
++DSOEXT=".so.$FL_MAJOR_VERSION"
  DSOSHORTEXT=".so"
  
 -DEBUGFLAG=""
  SYSTYPE="UNIX"
  DSOCOMMAND=""
  THEMECOMMAND=""
-@@ -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
--  AC_CHECK_LIB(c, pthread_create, \
--     have_pthread=yes,
--     AC_CHECK_LIB(pthread, pthread_create, \
--        THREADSLIBS=-lpthread have_pthread=yes,,),
-+  AC_CHECK_LIB(pthread, pthread_create, \
-+     THREADSLIBS=-lpthread have_pthread=yes,
-+     AC_CHECK_LIB(kse, pthread_create, \
-+        THREADSLIBS=-lkse have_pthread=yes,
-+        AC_CHECK_LIB(c_r, pthread_create, \
-+           THREADSLIBS=-lc_r have_pthread=yes,),),
-   )
- fi
- 
diff --git a/x11-toolkits/efltk/files/patch-src-Makefile b/x11-toolkits/efltk/files/patch-src-Makefile
new file mode 100644
index 000000000000..e2735059b391
--- /dev/null
+++ b/x11-toolkits/efltk/files/patch-src-Makefile
@@ -0,0 +1,11 @@
+--- src/Makefile.orig	Sun Dec 17 11:54:39 2006
++++ src/Makefile	Sun Dec 17 11:54:46 2006
+@@ -86,7 +86,7 @@
+ 	@$(LIBCOMMAND) $@ $(STATIC_OBJECTS)
+ 	@$(RANLIB) $@
+ 
+-$(DSO).so.$(FL_API_VERSION) $(DSO).sl.2:
++$(DSO).so.2 $(DSO).sl.2:
+ 	@rm -f $@
+ 	@echo $(DSOCOMMAND) $(DSONAME) ...
+ 	@$(DSOCOMMAND) $(DSONAME) $(SHARED_OBJECTS) $(DSOLIBS)
diff --git a/x11-toolkits/efltk/files/patch-src-makeinclude_tmpl b/x11-toolkits/efltk/files/patch-src-makeinclude_tmpl
new file mode 100644
index 000000000000..777595654c6b
--- /dev/null
+++ b/x11-toolkits/efltk/files/patch-src-makeinclude_tmpl
@@ -0,0 +1,11 @@
+--- src/makeinclude_tmpl.orig	Sun Dec 17 11:50:17 2006
++++ src/makeinclude_tmpl	Sun Dec 17 11:51:09 2006
+@@ -72,7 +72,7 @@
+ 	@$(LIBCOMMAND) $@ $(STATIC_OBJECTS)
+ 	@$(RANLIB) $@
+ 
+-$(DSO).so.$(FL_API_VERSION) $(DSO).sl.$(FL_API_VERSION): $(SHARED_OBJECTS)
++$(DSO).so.2 $(DSO).sl.$(FL_API_VERSION): $(SHARED_OBJECTS)
+ 	@rm -f $@
+ 	@echo $(DSOCOMMAND) $(DSONAME) ...
+ 	@$(DSOCOMMAND) $(DSONAME) $(SHARED_OBJECTS) $(DSOLIBS)
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
deleted file mode 100644
index 0391a3790f6f..000000000000
--- a/x11-toolkits/efltk/files/patch-src-net-Fl_FTP_Connect.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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>
--#ifdef __linux__
-+#if defined(__linux__) || defined(__FreeBSD__)
- #  include <netinet/in.h>
- #endif
-