- Update to 0.84

- Remove patches (changes have been integrated by author)
- Minor description alteration
- Update PLIST and post-patch regex
- New maintainer

PR:		ports/92087
Submitted by:	Shaun Amott <shaun@inerd.com>

6 files changed, 17 insertions, 50 deletions

diff --git a/x11-fm/xfe/Makefile b/x11-fm/xfe/Makefile
index e0f1eea0b8ed..de0ce960ac7a 100644
--- a/x11-fm/xfe/Makefile
+++ b/x11-fm/xfe/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	xfe
-PORTVERSION=	0.80
+PORTVERSION=	0.84
 CATEGORIES=	x11-fm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	shaun@inerd.com
 COMMENT=	Fast MS-Explorer like filemanager for X
 
 LIB_DEPENDS=	FOX-1.4:${PORTSDIR}/x11-toolkits/fox-devel \
@@ -30,8 +30,7 @@ USE_REINPLACE=	yes
 
 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
+		${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|_nl_domain_bindings|libintl_nl_domain_bindings| ; \
 		s|-lFOX|${PTHREAD_LIBS} &|g' ${WRKSRC}/configure
 
diff --git a/x11-fm/xfe/distinfo b/x11-fm/xfe/distinfo
index 6fdc228f0b02..06b0a9760394 100644
--- a/x11-fm/xfe/distinfo
+++ b/x11-fm/xfe/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfe-0.80.tar.gz) = fc980b3ad44a2160d9289df1fabb09c4
-SHA256 (xfe-0.80.tar.gz) = 3638e772a173fd82ae8e423b67ce33cd66c6ff5a8b74e2ae127672baedd15a4d
+MD5 (xfe-0.84.tar.gz) = 8251a0c1545d3cbbb909beb8027414a6
+SIZE (xfe-0.84.tar.gz) = 847390
 SIZE (xfe-0.80.tar.gz) = 973727
diff --git a/x11-fm/xfe/files/patch-src::CommandWindow.cc b/x11-fm/xfe/files/patch-src::CommandWindow.cc
deleted file mode 100644
index 27aed0bd21e3..000000000000
--- a/x11-fm/xfe/files/patch-src::CommandWindow.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/files/patch-src_DirPanel.cc b/x11-fm/xfe/files/patch-src_DirPanel.cc
deleted file mode 100644
index 67a115370944..000000000000
--- a/x11-fm/xfe/files/patch-src_DirPanel.cc
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/DirPanel.cc.orig	Wed Apr 27 20:08:40 2005
-+++ src/DirPanel.cc	Wed Apr 27 20:02:33 2005
-@@ -76,8 +76,10 @@ FXDEFMAP(DirPanel) DirPanelMap[]={
-                                    FXMAPFUNC(SEL_COMMAND,DirPanel::ID_TOGGLE_HIDDEN,DirPanel::onCmdToggleHidden),
-                                    FXMAPFUNC(SEL_COMMAND,DirPanel::ID_TOGGLE_TREE,DirPanel::onCmdToggleTree),
-                                    FXMAPFUNC(SEL_UPDATE,DirPanel::ID_TOGGLE_TREE,DirPanel::onUpdToggleTree),
-+#if defined(linux)
-                                	   FXMAPFUNC(SEL_UPDATE,DirPanel::ID_MOUNT,DirPanel::onUpdMount),
-                                    FXMAPFUNC(SEL_UPDATE,DirPanel::ID_UMOUNT,DirPanel::onUpdUnmount),
-+#endif								   
-                                    FXMAPFUNC(SEL_UPDATE,DirPanel::ID_STATUS,DirPanel::onUpdStatus),
-                           		};
- 
-@@ -798,7 +800,6 @@ long DirPanel::onCmdMount(FXObject*,FXSe
- 
-     return 1;
- }
--#endif
- 
- // Update the Mount menu item
- long DirPanel::onUpdMount(FXObject* o,FXSelector sel,void*)
-@@ -838,6 +839,7 @@ long DirPanel::onUpdUnmount(FXObject* o,
- 
-     return 1;
- }
-+#endif
- 
- 
- // Update the paste button and menus
diff --git a/x11-fm/xfe/pkg-descr b/x11-fm/xfe/pkg-descr
index e4db09997337..e8f839c1e027 100644
--- a/x11-fm/xfe/pkg-descr
+++ b/x11-fm/xfe/pkg-descr
@@ -1,9 +1,7 @@
 X File Explorer (Xfe) is an MS-Explorer like file manager for X.
-It is based on the popular, but discontinued,X Win Commander,
+It is based on the popular, but discontinued, X Win Commander,
 which was developed by Maxim Baranov.
+
 Xfe aims to be the file manager of choice for all the Unix addicts!
 
 WWW: http://roland65.free.fr/xfe/
-
-- ptiJo
-ptiJo@noos.fr
diff --git a/x11-fm/xfe/pkg-plist b/x11-fm/xfe/pkg-plist
index c2b149c13e36..d25651ddb5cd 100644
--- a/x11-fm/xfe/pkg-plist
+++ b/x11-fm/xfe/pkg-plist
@@ -30,6 +30,8 @@ lib/foxicons/config_32x32.png
 lib/foxicons/copy_big.png
 lib/foxicons/core_16x16.png
 lib/foxicons/core_32x32.png
+lib/foxicons/deb_16x16.png
+lib/foxicons/deb_32x32.png
 lib/foxicons/details.png
 lib/foxicons/dirup.png
 lib/foxicons/djvu_16x16.png
@@ -37,6 +39,8 @@ lib/foxicons/djvu_32x32.png
 lib/foxicons/dot_c_32x32.png
 lib/foxicons/dot_h_32x32.png
 lib/foxicons/dot_o_32x32.png
+lib/foxicons/exe_16x16.png
+lib/foxicons/exe_32x32.png
 lib/foxicons/file_16x16.png
 lib/foxicons/file_32x32.png
 lib/foxicons/fileopen.png
@@ -148,13 +152,19 @@ 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/hu/LC_MESSAGES/xfe.mo
 share/locale/it/LC_MESSAGES/xfe.mo
 share/locale/pt_BR/LC_MESSAGES/xfe.mo
+share/locale/pt_PT/LC_MESSAGES/xfe.mo
 share/locale/pl/LC_MESSAGES/xfe.mo
 share/locale/tr/LC_MESSAGES/xfe.mo
 share/pixmaps/xfe.png
+share/pixmaps/xfi.png
+share/pixmaps/xfq.png
+share/pixmaps/xfv.png
 @dirrm lib/foxicons
 @dirrm lib/foxrc
 @dirrm share/pixmaps
 @unexec rmdir %D/share/locale/es_AR/LC_MESSAGES 2> /dev/null || true
 @unexec rmdir %D/share/locale/es_AR 2> /dev/null || true
+@unexec rmdir %D/share/locale/pt_PT 2> /dev/null || true