ports/80415: x11-fm/xfe: update to 0.80 and unbreak

[Johan van Selst]

>Number:         80415
>Category:       ports
>Synopsis:       x11-fm/xfe: update to 0.80 and unbreak
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 27 18:40:16 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Johan van Selst
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
>Environment:
System: FreeBSD mud.stack.nl 5.4-STABLE FreeBSD 5.4-STABLE #1: Fri Apr 15 14:21:39 CEST 2005 johans at mud.stack.nl:/usr/obj/usr/src/sys/mud i386


	
>Description:
	
	Update to version 0.80 that also compiles with fox-devel.

	Added a few missing  #if defined(linux)  lines (will be fed upstream)

>How-To-Repeat:
	
>Fix:

	

	This introduces an extra patch: files/patch-src_DirPanel.cc

diff -uNr xfe/Makefile xfe/Makefile
--- xfe/Makefile	Mon Feb 28 10:53:01 2005
+++ xfe/Makefile	Wed Apr 27 20:17:21 2005
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xfe
-PORTVERSION=	0.72
-PORTREVISION=	1
+PORTVERSION=	0.80
 CATEGORIES=	x11-fm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,8 +14,6 @@
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Fast MS-Explorer like filemanager for X
 
-BROKEN=		"Does not build with current fox-devel version"
-
 LIB_DEPENDS=	FOX-1.4:${PORTSDIR}/x11-toolkits/fox-devel \
 		png.5:${PORTSDIR}/graphics/png
 
@@ -38,6 +35,6 @@
 	@${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
+MAN1=		xfe.1 xfi.1 xfq.1 xfv.1
 
 .include <bsd.port.mk>
diff -uNr xfe/distinfo xfe/distinfo
--- xfe/distinfo	Mon Jan 31 21:20:51 2005
+++ xfe/distinfo	Tue Apr 26 22:24:49 2005
@@ -1,2 +1,2 @@
-MD5 (xfe-0.72.tar.gz) = 625a4c8e152314363d2f3a27cc8fa6cc
-SIZE(xfe-0.72.tar.gz) = 828770
+MD5 (xfe-0.80.tar.gz) = fc980b3ad44a2160d9289df1fabb09c4
+SIZE (xfe-0.80.tar.gz) = 973727
diff -uNr xfe/files/patch-src_DirPanel.cc xfe/files/patch-src_DirPanel.cc
--- xfe/files/patch-src_DirPanel.cc	Thu Jan  1 01:00:00 1970
+++ xfe/files/patch-src_DirPanel.cc	Wed Apr 27 20:09:04 2005
@@ -0,0 +1,29 @@
+--- 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 -uNr xfe/pkg-plist xfe/pkg-plist
--- xfe/pkg-plist	Mon Jan 31 21:20:51 2005
+++ xfe/pkg-plist	Wed Apr 27 20:17:10 2005
@@ -1,4 +1,5 @@
 bin/xfe
+bin/xfi
 bin/xfq
 bin/xfv
 lib/foxicons/a_32x32.png
@@ -31,6 +32,8 @@
 lib/foxicons/core_32x32.png
 lib/foxicons/details.png
 lib/foxicons/dirup.png
+lib/foxicons/djvu_16x16.png
+lib/foxicons/djvu_32x32.png
 lib/foxicons/dot_c_32x32.png
 lib/foxicons/dot_h_32x32.png
 lib/foxicons/dot_o_32x32.png
>Release-Note:
>Audit-Trail:
>Unformatted: