4 files changed, 157 insertions, 143 deletions

diff --git a/x11-fm/xfe/Makefile b/x11-fm/xfe/Makefile
index ac002aa4e59b..bf49cc1a5c21 100644
--- a/x11-fm/xfe/Makefile
+++ b/x11-fm/xfe/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	xfe
-PORTVERSION=	0.54.2
-PORTREVISION=	1
+PORTVERSION=	0.70
+PORTREVISION=	0
 CATEGORIES=	x11-fm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ptiJo@noos.fr
 COMMENT=	Fast MS-Explorer like filemanager for X
 
-LIB_DEPENDS=	FOX:${PORTSDIR}/x11-toolkits/fox \
+LIB_DEPENDS=	FOX-1.2:${PORTSDIR}/x11-toolkits/fox-devel \
 		png.5:${PORTSDIR}/graphics/png
 
 GNU_CONFIGURE=	yes
@@ -33,7 +33,8 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|-I/usr/include/fox|-I${LOCALBASE}/include/|g' \
 		${WRKSRC}/src/Makefile.in ${WRKSRC}/xfq/Makefile.in \
 		${WRKSRC}/xfv/Makefile.in
-	@${REINPLACE_CMD} -e 's|_nl_domain_bindings|libintl_nl_domain_bindings|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|_nl_domain_bindings|libintl_nl_domain_bindings| ; \
+		s|-lFOX|${PTHREAD_LIBS} &|g' ${WRKSRC}/configure
 
 MAN1=		xfe.1 xfq.1 xfv.1
 
diff --git a/x11-fm/xfe/distinfo b/x11-fm/xfe/distinfo
index a51ad19f0304..c86532a96056 100644
--- a/x11-fm/xfe/distinfo
+++ b/x11-fm/xfe/distinfo
@@ -1,2 +1,2 @@
-MD5 (xfe-0.54.2.tar.gz) = 4d50faa3153cd1ff4e9f4237926f44b1
-SIZE (xfe-0.54.2.tar.gz) = 546869
+MD5 (xfe-0.70.tar.gz) = ae8ba8af8aafee053f70e909e6e22920
+SIZE(xfe-0.70.tar.gz) = 805921
diff --git a/x11-fm/xfe/files/patch-src::CommandWindow.cc b/x11-fm/xfe/files/patch-src::CommandWindow.cc
new file mode 100644
index 000000000000..27aed0bd21e3
--- /dev/null
+++ b/x11-fm/xfe/files/patch-src::CommandWindow.cc
@@ -0,0 +1,11 @@
+--- src/CommandWindow.cc.orig	Sun Aug 15 14:28:01 2004
++++ src/CommandWindow.cc	Sun Aug 15 14:28:10 2004
+@@ -13,6 +13,8 @@
+ #include <stdlib.h>
++#include <signal.h>
+ #include <sys/wait.h>
+ #include <sys/ioctl.h>
++#include <sys/signal.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+ 
diff --git a/x11-fm/xfe/pkg-plist b/x11-fm/xfe/pkg-plist
index 9db237ff1d15..71ee5f418d77 100644
--- a/x11-fm/xfe/pkg-plist
+++ b/x11-fm/xfe/pkg-plist
@@ -1,147 +1,149 @@
 bin/xfe
 bin/xfq
 bin/xfv
-lib/foxicons/a_32x32.gif
-lib/foxicons/bak_16x16.gif
-lib/foxicons/bak_32x32.gif
-lib/foxicons/bigapp.gif
-lib/foxicons/bigblockdev.gif
-lib/foxicons/bigchardev.gif
-lib/foxicons/bigdoc.gif
-lib/foxicons/bigfolder.gif
-lib/foxicons/bigfolderlocked.gif
-lib/foxicons/bigfolderopen.gif
-lib/foxicons/bigicons.gif
-lib/foxicons/bigpipe.gif
-lib/foxicons/bigsocket.gif
-lib/foxicons/bmp_16x16.gif
-lib/foxicons/bmp_32x32.gif
-lib/foxicons/bug_16x16.gif
-lib/foxicons/bug_32x32.gif
-lib/foxicons/c_16x16.gif
-lib/foxicons/c_32x32.gif
-lib/foxicons/cc_16x16.gif
-lib/foxicons/cc_32x32.gif
-lib/foxicons/class_16x16.gif
-lib/foxicons/class_32x32.gif
-lib/foxicons/config_16x16.gif
-lib/foxicons/config_32x32.gif
-lib/foxicons/copy_big.gif
-lib/foxicons/core_16x16.gif
-lib/foxicons/core_32x32.gif
-lib/foxicons/details.gif
-lib/foxicons/dirup.gif
-lib/foxicons/dot_c_32x32.gif
-lib/foxicons/dot_h_32x32.gif
-lib/foxicons/dot_o_32x32.gif
-lib/foxicons/exec_16x16.gif
-lib/foxicons/exec_32x32.gif
-lib/foxicons/file_16x16.gif
-lib/foxicons/file_32x32.gif
-lib/foxicons/fileopen.gif
-lib/foxicons/find_again.gif
-lib/foxicons/fonts.gif
-lib/foxicons/gif_16x16.gif
-lib/foxicons/gif_32x32.gif
-lib/foxicons/h_16x16.gif
-lib/foxicons/h_32x32.gif
-lib/foxicons/help_16x16.gif
-lib/foxicons/help_32x32.gif
-lib/foxicons/hidehidden.gif
-lib/foxicons/home.gif
-lib/foxicons/html_16x16.gif
-lib/foxicons/html_32x32.gif
-lib/foxicons/image_16x16.gif
-lib/foxicons/image_32x32.gif
-lib/foxicons/info_16x16.gif
-lib/foxicons/info_32x32.gif
-lib/foxicons/java_16x16.gif
-lib/foxicons/java_32x32.gif
-lib/foxicons/jpeg_16x16.gif
-lib/foxicons/jpeg_32x32.gif
-lib/foxicons/list_16x16.gif
-lib/foxicons/list_32x32.gif
-lib/foxicons/make_16x16.gif
-lib/foxicons/make_32x32.gif
-lib/foxicons/midi_16x16.gif
-lib/foxicons/midi_32x32.gif
-lib/foxicons/miniapp.gif
-lib/foxicons/miniblockdev.gif
-lib/foxicons/minichardev.gif
-lib/foxicons/minidoc.gif
-lib/foxicons/minifolder.gif
-lib/foxicons/minifolderlocked.gif
-lib/foxicons/minifolderopen.gif
-lib/foxicons/minipipe.gif
-lib/foxicons/minisocket.gif
-lib/foxicons/move_big.gif
-lib/foxicons/mp3_16x16.gif
-lib/foxicons/mp3_32x32.gif
-lib/foxicons/news_16x16.gif
-lib/foxicons/news_32x32.gif
-lib/foxicons/o_16x16.gif
-lib/foxicons/o_32x32.gif
-lib/foxicons/package_16x16.gif
-lib/foxicons/package_32x32.gif
-lib/foxicons/pdf_16x16.gif
-lib/foxicons/pdf_32x32.gif
-lib/foxicons/png_16x16.gif
-lib/foxicons/png_32x32.gif
-lib/foxicons/postscript_16x16.gif
-lib/foxicons/postscript_32x32.gif
-lib/foxicons/ppt_16x16.gif
-lib/foxicons/ppt_32x32.gif
-lib/foxicons/print.gif
-lib/foxicons/ps_16x16.gif
-lib/foxicons/ps_32x32.gif
-lib/foxicons/quit.gif
-lib/foxicons/rpm_16x16.gif
-lib/foxicons/rpm_32x32.gif
-lib/foxicons/search.gif
-lib/foxicons/shadowman_16x16.gif
-lib/foxicons/shadowman_32x32.gif
-lib/foxicons/shared_16x16.gif
-lib/foxicons/shared_32x32.gif
-lib/foxicons/shell_16x16.gif
-lib/foxicons/shell_32x32.gif
-lib/foxicons/showhidden.gif
-lib/foxicons/smallicons.gif
-lib/foxicons/so_32x32.gif
-lib/foxicons/sound_16x16.gif
-lib/foxicons/sound_32x32.gif
-lib/foxicons/tcl_16x16.gif
-lib/foxicons/tcl_32x32.gif
-lib/foxicons/tex_16x16.gif
-lib/foxicons/tex_32x32.gif
-lib/foxicons/text_16x16.gif
-lib/foxicons/text_32x32.gif
-lib/foxicons/tgz_16x16.gif
-lib/foxicons/tgz_32x32.gif
-lib/foxicons/tools_16x16.gif
-lib/foxicons/tools_32x32.gif
-lib/foxicons/video_16x16.gif
-lib/foxicons/video_32x32.gif
-lib/foxicons/wave_16x16.gif
-lib/foxicons/wave_32x32.gif
-lib/foxicons/word_16x16.gif
-lib/foxicons/word_32x32.gif
-lib/foxicons/work.gif
-lib/foxicons/xbm_16x16.gif
-lib/foxicons/xbm_32x32.gif
-lib/foxicons/xfv.gif
-lib/foxicons/xls_16x16.gif
-lib/foxicons/xls_32x32.gif
-lib/foxicons/xpm_16x16.gif
-lib/foxicons/xpm_32x32.gif
-lib/foxicons/zdraw_16x16.gif
-lib/foxicons/zdraw_32x32.gif
-lib/foxicons/zip_16x16.gif
-lib/foxicons/zip_32x32.gif
+lib/foxicons/a_32x32.png
+lib/foxicons/bak_16x16.png
+lib/foxicons/bak_32x32.png
+lib/foxicons/bigapp.png
+lib/foxicons/bigblockdev.png
+lib/foxicons/bigchardev.png
+lib/foxicons/bigdoc.png
+lib/foxicons/bigfolder.png
+lib/foxicons/bigfolderlocked.png
+lib/foxicons/bigfolderopen.png
+lib/foxicons/bigicons.png
+lib/foxicons/bigpipe.png
+lib/foxicons/bigsocket.png
+lib/foxicons/bmp_16x16.png
+lib/foxicons/bmp_32x32.png
+lib/foxicons/bug_16x16.png
+lib/foxicons/bug_32x32.png
+lib/foxicons/c_16x16.png
+lib/foxicons/c_32x32.png
+lib/foxicons/cc_16x16.png
+lib/foxicons/cc_32x32.png
+lib/foxicons/class_16x16.png
+lib/foxicons/class_32x32.png
+lib/foxicons/config_16x16.png
+lib/foxicons/config_32x32.png
+lib/foxicons/copy_big.png
+lib/foxicons/core_16x16.png
+lib/foxicons/core_32x32.png
+lib/foxicons/details.png
+lib/foxicons/dirup.png
+lib/foxicons/dot_c_32x32.png
+lib/foxicons/dot_h_32x32.png
+lib/foxicons/dot_o_32x32.png
+lib/foxicons/file_16x16.png
+lib/foxicons/file_32x32.png
+lib/foxicons/fileopen.png
+lib/foxicons/find_again.png
+lib/foxicons/fonts.png
+lib/foxicons/gif_16x16.png
+lib/foxicons/gif_32x32.png
+lib/foxicons/h_16x16.png
+lib/foxicons/h_32x32.png
+lib/foxicons/help_16x16.png
+lib/foxicons/help_32x32.png
+lib/foxicons/hidehidden.png
+lib/foxicons/home.png
+lib/foxicons/html_16x16.png
+lib/foxicons/html_32x32.png
+lib/foxicons/image_16x16.png
+lib/foxicons/image_32x32.png
+lib/foxicons/info_16x16.png
+lib/foxicons/info_32x32.png
+lib/foxicons/java_16x16.png
+lib/foxicons/java_32x32.png
+lib/foxicons/jpeg_16x16.png
+lib/foxicons/jpeg_32x32.png
+lib/foxicons/list_16x16.png
+lib/foxicons/list_32x32.png
+lib/foxicons/make_16x16.png
+lib/foxicons/make_32x32.png
+lib/foxicons/midi_16x16.png
+lib/foxicons/midi_32x32.png
+lib/foxicons/miniapp.png
+lib/foxicons/miniblockdev.png
+lib/foxicons/minichardev.png
+lib/foxicons/minidoc.png
+lib/foxicons/minifolder.png
+lib/foxicons/minifolderlocked.png
+lib/foxicons/minifolderopen.png
+lib/foxicons/minipipe.png
+lib/foxicons/minisocket.png
+lib/foxicons/move_big.png
+lib/foxicons/mp3_16x16.png
+lib/foxicons/mp3_32x32.png
+lib/foxicons/news_16x16.png
+lib/foxicons/news_32x32.png
+lib/foxicons/o_16x16.png
+lib/foxicons/o_32x32.png
+lib/foxicons/package_16x16.png
+lib/foxicons/package_32x32.png
+lib/foxicons/pdf_16x16.png
+lib/foxicons/pdf_32x32.png
+lib/foxicons/png_16x16.png
+lib/foxicons/png_32x32.png
+lib/foxicons/postscript_16x16.png
+lib/foxicons/postscript_32x32.png
+lib/foxicons/ppt_16x16.png
+lib/foxicons/ppt_32x32.png
+lib/foxicons/print.png
+lib/foxicons/ps_16x16.png
+lib/foxicons/ps_32x32.png
+lib/foxicons/quit.png
+lib/foxicons/rpm_16x16.png
+lib/foxicons/rpm_32x32.png
+lib/foxicons/search.png
+lib/foxicons/shadowman_16x16.png
+lib/foxicons/shadowman_32x32.png
+lib/foxicons/shared_16x16.png
+lib/foxicons/shared_32x32.png
+lib/foxicons/shell_16x16.png
+lib/foxicons/shell_32x32.png
+lib/foxicons/showhidden.png
+lib/foxicons/smallicons.png
+lib/foxicons/so_32x32.png
+lib/foxicons/sound_16x16.png
+lib/foxicons/sound_32x32.png
+lib/foxicons/tcl_16x16.png
+lib/foxicons/tcl_32x32.png
+lib/foxicons/tex_16x16.png
+lib/foxicons/tex_32x32.png
+lib/foxicons/text_16x16.png
+lib/foxicons/text_32x32.png
+lib/foxicons/tgz_16x16.png
+lib/foxicons/tgz_32x32.png
+lib/foxicons/tools_16x16.png
+lib/foxicons/tools_32x32.png
+lib/foxicons/video_16x16.png
+lib/foxicons/video_32x32.png
+lib/foxicons/visio_16x16.png
+lib/foxicons/visio_32x32.png
+lib/foxicons/wave_16x16.png
+lib/foxicons/wave_32x32.png
+lib/foxicons/word_16x16.png
+lib/foxicons/word_32x32.png
+lib/foxicons/work.png
+lib/foxicons/xbm_16x16.png
+lib/foxicons/xbm_32x32.png
+lib/foxicons/xfv.png
+lib/foxicons/xls_16x16.png
+lib/foxicons/xls_32x32.png
+lib/foxicons/xpm_16x16.png
+lib/foxicons/xpm_32x32.png
+lib/foxicons/zip_16x16.png
+lib/foxicons/zip_32x32.png
 lib/foxrc/Desktop
-share/locale/fr/LC_MESSAGES/xfe.mo
+share/locale/ca/LC_MESSAGES/xfe.mo
 share/locale/de/LC_MESSAGES/xfe.mo
+share/locale/es/LC_MESSAGES/xfe.mo
+share/locale/es_AR/LC_MESSAGES/xfe.mo
+share/locale/fr/LC_MESSAGES/xfe.mo
 share/locale/pt_BR/LC_MESSAGES/xfe.mo
 share/locale/pl/LC_MESSAGES/xfe.mo
+share/locale/tr/LC_MESSAGES/xfe.mo
 share/pixmaps/xfe.png
 @dirrm lib/foxicons
 @dirrm lib/foxrc