- Update to 1.35

- Most patches have been accepted upstreams. The remaining ones have been
  submitted on http://sourceforge.net/p/xfe/bugs/176/

  Release notes:

  This release adds a scripts feature: like in Nautilus, users can now apply
  custom shell scripts to a list of selected files. See the documentation page
  for more information.
  The default keyboard shortcut for the file rename operation was changed to
  F2. Swedish and greek translation were updated. A spanish colombian
  translation was also added. And as usual, several bugs were fixed.

8 files changed, 298 insertions, 82 deletions

diff --git a/x11-fm/xfe/Makefile b/x11-fm/xfe/Makefile
index 5b82331585dd..f4a96f179c8f 100644
--- a/x11-fm/xfe/Makefile
+++ b/x11-fm/xfe/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xfe
-PORTVERSION=	1.34
-PORTREVISION=	1
+PORTVERSION=	1.35
 CATEGORIES=	x11-fm
 MASTER_SITES=	SF
 
@@ -14,10 +13,9 @@ LIB_DEPENDS=	FOX-1.6:${PORTSDIR}/x11-toolkits/fox16
 
 USE_XORG=	xft
 USE_GNOME=	gnomehack intltool
-USES=		gettext
-USE_GMAKE=	yes
+USES=		gettext gmake
 GNU_CONFIGURE=	yes
-CFLAGS+=	-I${LOCALBASE}/include
+CFLAGS+=	-I${LOCALBASE}/include -g -O0
 LDFLAGS+=	-L${LOCALBASE}/lib -pthread
 
 MAN1=		xfe.1 xfi.1 xfp.1 xfv.1 xfw.1
diff --git a/x11-fm/xfe/distinfo b/x11-fm/xfe/distinfo
index 9f0297a5bb20..498a42ba7296 100644
--- a/x11-fm/xfe/distinfo
+++ b/x11-fm/xfe/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfe-1.34.tar.gz) = 5e311b0609349ca5ad2c34d32ccb79863eb48f6b8a9fddcecf37f0dd368acf78
-SIZE (xfe-1.34.tar.gz) = 2356801
+SHA256 (xfe-1.35.tar.gz) = 9f001cc9c07a9703b2874cd41635b1b2402cd1d7d270ab436d3daf0015369850
+SIZE (xfe-1.35.tar.gz) = 2447267
diff --git a/x11-fm/xfe/files/patch-src_DirList.cpp b/x11-fm/xfe/files/patch-src_DirList.cpp
deleted file mode 100644
index 5e77199a09c5..000000000000
--- a/x11-fm/xfe/files/patch-src_DirList.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/DirList.cpp.orig	2013-02-11 08:59:54.000000000 +0100
-+++ src/DirList.cpp	2013-02-11 09:03:05.000000000 +0100
-@@ -1954,8 +1954,10 @@
- 	if (prevMinimized == FALSE && minimized == TRUE)
- 	{
- 		onCmdRefreshTimer(0,0,0);
-+#if defined(linux)
- 		onMtdevicesRefresh(0,0,0);
- 		onUpdevicesRefresh(0,0,0);
-+#endif
- 	}
- 
-     return 1;
diff --git a/x11-fm/xfe/files/patch-src_FilePanel b/x11-fm/xfe/files/patch-src_FilePanel
new file mode 100644
index 000000000000..04da45a21081
--- /dev/null
+++ b/x11-fm/xfe/files/patch-src_FilePanel
@@ -0,0 +1,262 @@
+--- src/FilePanel.cpp.orig	2013-08-21 13:32:33.000000000 +0200
++++ src/FilePanel.cpp	2013-08-26 18:08:30.000000000 +0200
+@@ -119,9 +119,13 @@
+ 	FXMAPFUNC(SEL_COMMAND,FilePanel::ID_EXTRACT,FilePanel::onCmdExtract),
+ 	FXMAPFUNC(SEL_COMMAND,FilePanel::ID_EXTRACT_TO_FOLDER,FilePanel::onCmdExtractToFolder),
+ 	FXMAPFUNC(SEL_COMMAND,FilePanel::ID_EXTRACT_HERE,FilePanel::onCmdExtractHere),
++#if defined(linux) || defined(__FreeBSD__)
+ 	FXMAPFUNC(SEL_COMMAND,FilePanel::ID_RUN_SCRIPT,FilePanel::onCmdRunScript),
++#endif
+ 	FXMAPFUNC(SEL_UPDATE,FilePanel::ID_RUN_SCRIPT,FilePanel::onUpdRunScript),
++#if defined(linux) || defined(__FreeBSD__)
+ 	FXMAPFUNC(SEL_COMMAND,FilePanel::ID_GO_SCRIPTDIR,FilePanel::onCmdGoScriptDir),
++#endif
+ 	FXMAPFUNC(SEL_RIGHTBUTTONRELEASE,FilePanel::ID_FILELIST,FilePanel::onCmdPopupMenu),
+ 	FXMAPFUNC(SEL_COMMAND,FilePanel::ID_POPUP_MENU,FilePanel::onCmdPopupMenu),
+ 	FXMAPFUNC(SEL_DOUBLECLICKED,FilePanel::ID_FILELIST,FilePanel::onCmdItemDoubleClicked),
+@@ -4548,108 +4552,6 @@
+ }
+ 
+ 
+-// Run script
+-long FilePanel::onCmdRunScript(FXObject* o, FXSelector sel, void*)
+-{
+-    // Wait cursor
+-    getApp()->beginWaitCursor();
+-
+-    FXString pathname, cmd, itemslist=" "; 
+-	FXString scriptpath = dynamic_cast<FXMenuCommand *>(o)->getHelpText();
+-  
+-	// Construct selected files list
+-	current->list->setFocus();
+-	for (int u=0; u<current->list->getNumItems(); u++)
+-	{
+-		if (current->list->isItemSelected(u))
+-		{
+-			pathname=current->list->getItemPathname(u);
+-							
+-			// List of selected items
+-			itemslist += ::quote(pathname) + " ";
+-		}
+-	}
+-
+-	// Construct command line
+-	cmd = scriptpath + itemslist + " &";
+-
+-	// Go to the current directory
+-	int ret=chdir(current->list->getDirectory().text());
+-	if (ret < 0)
+-	{
+-		int errcode=errno;	
+-		if (errcode)
+-			MessageBox::error(this,BOX_OK,_("Error"),_("Can't enter folder %s: %s"),current->list->getDirectory().text(),strerror(errcode));
+-		else
+-			MessageBox::error(this,BOX_OK,_("Error"),_("Can't enter folder %s"),current->list->getDirectory().text());
+-	}
+-
+-	// Execute command
+-	static pid_t child_pid = 0;
+-	switch ((child_pid = fork ()))
+-	{
+-		case -1:
+-			fprintf (stderr,_("Error: Fork failed: %s\n"),strerror (errno));
+-			break;
+-	
+-		case 0:
+-			execl("/bin/sh","sh","-c",cmd.text(),(char *)NULL);
+-			exit(1);
+-			break;
+-	}
+-
+-	// Return to the starting directory
+-	ret=chdir(startlocation.text());
+-	if (ret < 0)
+-	{
+-		int errcode=errno;	
+-		if (errcode)
+-			MessageBox::error(this,BOX_OK,_("Error"),_("Can't enter folder %s: %s"),startlocation.text(),strerror(errcode));
+-		else
+-			MessageBox::error(this,BOX_OK,_("Error"),_("Can't enter folder %s"),startlocation.text());
+-	}
+-
+-	getApp()->endWaitCursor();
+-
+-	return 1;
+-}
+-
+-
+-// Go to scripts directory
+-long FilePanel::onCmdGoScriptDir(FXObject* o, FXSelector sel, void*)
+-{
+-	FXString scriptpath = homedir + PATHSEPSTRING CONFIGPATH PATHSEPSTRING XFECONFIGPATH PATHSEPSTRING SCRIPTPATH;
+-	
+-	if (!::exists(scriptpath))
+-	{
+-		// Create the script directory according to the umask
+-		int mask=umask(0);
+-		umask(mask);
+-		errno=0;
+-		int ret=mkpath(scriptpath.text(),511 & ~mask);
+-		int errcode=errno;
+-		if (ret==-1)
+-		{
+-			if (errcode)
+-				MessageBox::error(this,BOX_OK,_("Error"),_("Can't create script folder %s: %s"),scriptpath.text(),strerror(errcode));
+-			else
+-				MessageBox::error(this,BOX_OK,_("Error"),_("Can't create script folder %s"),scriptpath.text());
+-			
+-			return 0;
+-		}
+-	}
+-	
+-	// Go to scripts directory
+-	current->list->setDirectory(scriptpath);
+-	current->list->setFocus();
+-	dirpanel->setDirectory(scriptpath,TRUE);
+-	current->updatePath();
+-	updateLocation();
+-	
+-	return 1;
+-}
+-
+-
+ // Update the Mount button
+ long FilePanel::onUpdMount(FXObject* o,FXSelector sel,void*)
+ {
+@@ -4815,6 +4717,114 @@
+ }
+ #endif // End #if defined(linux)
+ 
++#if defined(linux) || defined(__FreeBSD__)
++
++// Go to scripts directory
++long FilePanel::onCmdGoScriptDir(FXObject* o, FXSelector sel, void*)
++{
++	FXString scriptpath = homedir + PATHSEPSTRING CONFIGPATH PATHSEPSTRING XFECONFIGPATH PATHSEPSTRING SCRIPTPATH;
++	
++	if (!::exists(scriptpath))
++	{
++		// Create the script directory according to the umask
++		int mask=umask(0);
++		umask(mask);
++		errno=0;
++		int ret=mkpath(scriptpath.text(),511 & ~mask);
++		int errcode=errno;
++		if (ret==-1)
++		{
++			if (errcode)
++				MessageBox::error(this,BOX_OK,_("Error"),_("Can't create script folder %s: %s"),scriptpath.text(),strerror(errcode));
++			else
++				MessageBox::error(this,BOX_OK,_("Error"),_("Can't create script folder %s"),scriptpath.text());
++			
++			return 0;
++		}
++	}
++	
++	// Go to scripts directory
++	current->list->setDirectory(scriptpath);
++	current->list->setFocus();
++	dirpanel->setDirectory(scriptpath,TRUE);
++	current->updatePath();
++	updateLocation();
++	
++	return 1;
++}
++
++// Run script
++long FilePanel::onCmdRunScript(FXObject* o, FXSelector sel, void*)
++{
++    // Wait cursor
++    getApp()->beginWaitCursor();
++
++    FXString pathname, cmd, itemslist=" "; 
++	FXString scriptpath = dynamic_cast<FXMenuCommand *>(o)->getHelpText();
++  
++	// Construct selected files list
++	current->list->setFocus();
++	for (int u=0; u<current->list->getNumItems(); u++)
++	{
++		if (current->list->isItemSelected(u))
++		{
++			pathname=current->list->getItemPathname(u);
++							
++			// List of selected items
++			itemslist += ::quote(pathname) + " ";
++		}
++	}
++
++	// Construct command line
++	cmd = scriptpath + itemslist + " &";
++
++	// Go to the current directory
++	int ret=chdir(current->list->getDirectory().text());
++	if (ret < 0)
++	{
++		int errcode=errno;	
++		if (errcode)
++			MessageBox::error(this,BOX_OK,_("Error"),_("Can't enter folder %s: %s"),current->list->getDirectory().text(),strerror(errcode));
++		else
++			MessageBox::error(this,BOX_OK,_("Error"),_("Can't enter folder %s"),current->list->getDirectory().text());
++	}
++
++	// Execute command
++	static pid_t child_pid = 0;
++	switch ((child_pid = fork ()))
++	{
++		case -1:
++			fprintf (stderr,_("Error: Fork failed: %s\n"),strerror (errno));
++			break;
++	
++		case 0:
++			execl("/bin/sh","sh","-c",cmd.text(),(char *)NULL);
++			exit(1);
++			break;
++	}
++
++	// Return to the starting directory
++	ret=chdir(startlocation.text());
++	if (ret < 0)
++	{
++		int errcode=errno;	
++		if (errcode)
++			MessageBox::error(this,BOX_OK,_("Error"),_("Can't enter folder %s: %s"),startlocation.text(),strerror(errcode));
++		else
++			MessageBox::error(this,BOX_OK,_("Error"),_("Can't enter folder %s"),startlocation.text());
++	}
++
++	getApp()->endWaitCursor();
++
++	return 1;
++}
++
++
++
++#endif
++
++
++
+ 
+ // Update the status bar and the path linker
+ long FilePanel::onUpdStatus(FXObject* sender,FXSelector,void*)
+--- src/FilePanel.h.orig	2013-08-20 15:14:01.000000000 +0200
++++ src/FilePanel.h	2013-08-26 18:06:46.000000000 +0200
+@@ -176,7 +176,9 @@
+     long onCmdToggleHidden(FXObject*,FXSelector,void*);
+     long onUpdToggleHidden(FXObject*,FXSelector,void*);
+ 	long onCmdToggleThumbnails(FXObject*,FXSelector,void*);
++#if defined(linux) || defined(__FreeBSD__)
+ 	long onCmdRunScript(FXObject* o,FXSelector sel,void*);
++#endif
+ 	long onUpdToggleThumbnails(FXObject*,FXSelector,void*);
+     long onCmdAddToArch(FXObject*,FXSelector,void*);
+ 	long onUpdMenu(FXObject*,FXSelector,void*);
+@@ -190,7 +192,9 @@
+ 	void updatePath();
+ 	long onCmdStopListRefreshTimer(FXObject*,FXSelector,void*);
+ 	long onUpdRunScript(FXObject*,FXSelector,void*);
++#if defined(linux) || defined(__FreeBSD__)
+ 	long onCmdGoScriptDir(FXObject*, FXSelector, void*);
++#endif
+ 
+ #if defined(linux)
+     long onCmdMount(FXObject*,FXSelector,void*);
diff --git a/x11-fm/xfe/files/patch-src_XFilePackage.cpp b/x11-fm/xfe/files/patch-src_XFilePackage.cpp
deleted file mode 100644
index 2b5b79cca5c3..000000000000
--- a/x11-fm/xfe/files/patch-src_XFilePackage.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/XFilePackage.cpp.orig	2010-08-24 07:46:45.000000000 +0000
-+++ src/XFilePackage.cpp	2010-08-24 07:47:15.000000000 +0000
-@@ -11,6 +11,7 @@
- #include <unistd.h>
- #include <sys/stat.h>
- #include <sys/wait.h>
-+#include <sys/signal.h>
- 
- #include "xfedefs.h"
- #include "icons.h"
diff --git a/x11-fm/xfe/files/patch-xvt_command.c b/x11-fm/xfe/files/patch-xvt_command.c
deleted file mode 100644
index 5662b0b5b161..000000000000
--- a/x11-fm/xfe/files/patch-xvt_command.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- xvt/command.c.orig	2010-08-24 07:23:55.000000000 +0000
-+++ xvt/command.c	2010-08-24 07:25:30.000000000 +0000
-@@ -36,7 +36,12 @@
- #include <unistd.h>
- #include <signal.h>
- #include <fcntl.h>
--#include <utmp.h>
-+#include <sys/param.h>
-+#if __FreeBSD_version >= 900007
-+#    include <utmpx.h>
-+#else
-+#    include <utmp.h>
-+#endif
- #include <errno.h>
- #include <string.h>
- #include "xvt.h"
diff --git a/x11-fm/xfe/files/patch-xvt_ttyinit.c b/x11-fm/xfe/files/patch-xvt_ttyinit.c
index 0645ff1fb999..daeaf4b3156c 100644
--- a/x11-fm/xfe/files/patch-xvt_ttyinit.c
+++ b/x11-fm/xfe/files/patch-xvt_ttyinit.c
@@ -1,44 +1,29 @@
---- xvt/ttyinit.c.orig	2010-09-15 16:32:26.000000000 +0200
-+++ xvt/ttyinit.c	2012-02-20 09:30:28.000000000 +0100
-@@ -37,7 +37,12 @@
+--- xvt/ttyinit.c.orig	2013-08-13 17:49:45.000000000 +0200
++++ xvt/ttyinit.c	2013-08-26 17:37:10.000000000 +0200
+@@ -37,7 +37,6 @@
  #include <unistd.h>
  #include <signal.h>
  #include <fcntl.h>
 -#include <utmp.h>
-+#include <sys/param.h>
-+#if __FreeBSD_version >= 900007
-+#    include <utmpx.h>
-+#else
-+#    include <utmp.h>
-+#endif
- #include <grp.h>
- #include <pwd.h>
- #include <errno.h>
-@@ -134,7 +139,7 @@
- #endif /* LINUX */
- 
- /* GNU KFREEBSD */
--#if defined (__FreeBSD_kernel__)
-+#if defined (__FreeBSD_kernel__) && !defined (__FreeBSD__)
- #include <sys/ioctl.h>
- #include <pty.h>
- #define BSD_PTY
-@@ -175,7 +180,9 @@
- #ifdef BSD_UTMP
- static int tslot = -1;		/* index to our slot in the utmp file */
- #endif /* BSD_UTMP */
-+#if defined(BSD_UTMP) || defined(SVR4_UTMP)
- static struct utmp utent;	/* our current utmp entry */
-+#endif
- 
- /*  Catch a SIGCHLD signal and exit if the direct child has died.
-  */
-@@ -385,7 +392,7 @@
-  */
+ #include <sys/param.h>
+ #if __FreeBSD_version >= 900007
+ #    include <utmpx.h>
+@@ -394,7 +393,6 @@
  static char* get_pseudo_tty(int* pmaster, int* pslave)
  {
--#ifdef BSD_PTY
-+#if defined(BSD_PTY) || defined(__FreeBSD__)
-     int mfd, sfd;
+     int mfd = 0, sfd = 0;
+-    char *ttynam = NULL;
+ #if defined(BSD_PTY) || defined(__FreeBSD__)
      char *s3, *s4;
      static char ptyc3[] = "pqrstuvwxyz";
+@@ -435,7 +433,9 @@
+         error("could not open slave tty %s",ttynam);
+         return(NULL);
+     }
+-#endif /* BSD_PTY */
++#else /* BSD_PTY */
++    char *ttynam = NULL;
++#endif
+ 
+ #ifdef SVR4_PTY
+ 
diff --git a/x11-fm/xfe/pkg-plist b/x11-fm/xfe/pkg-plist
index 0955e34bc303..545b6486f328 100644
--- a/x11-fm/xfe/pkg-plist
+++ b/x11-fm/xfe/pkg-plist
@@ -11,6 +11,7 @@ share/locale/de/LC_MESSAGES/xfe.mo
 share/locale/el/LC_MESSAGES/xfe.mo
 share/locale/es/LC_MESSAGES/xfe.mo
 share/locale/es_AR/LC_MESSAGES/xfe.mo
+share/locale/es_CO/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
@@ -139,6 +140,7 @@ share/applications/xfp.desktop
 %%DATADIR%%/icons/blue-theme/gif_16x16.png
 %%DATADIR%%/icons/blue-theme/gif_32x32.png
 %%DATADIR%%/icons/blue-theme/gotobig.png
+%%DATADIR%%/icons/blue-theme/gotodir.png
 %%DATADIR%%/icons/blue-theme/gotoline.png
 %%DATADIR%%/icons/blue-theme/graybutton.png
 %%DATADIR%%/icons/blue-theme/greenbutton.png
@@ -447,6 +449,7 @@ share/applications/xfp.desktop
 %%DATADIR%%/icons/brown-theme/gif_16x16.png
 %%DATADIR%%/icons/brown-theme/gif_32x32.png
 %%DATADIR%%/icons/brown-theme/gotobig.png
+%%DATADIR%%/icons/brown-theme/gotodir.png
 %%DATADIR%%/icons/brown-theme/gotoline.png
 %%DATADIR%%/icons/brown-theme/graybutton.png
 %%DATADIR%%/icons/brown-theme/greenbutton.png
@@ -755,6 +758,7 @@ share/applications/xfp.desktop
 %%DATADIR%%/icons/gnome-theme/gif_16x16.png
 %%DATADIR%%/icons/gnome-theme/gif_32x32.png
 %%DATADIR%%/icons/gnome-theme/gotobig.png
+%%DATADIR%%/icons/gnome-theme/gotodir.png
 %%DATADIR%%/icons/gnome-theme/gotoline.png
 %%DATADIR%%/icons/gnome-theme/graybutton.png
 %%DATADIR%%/icons/gnome-theme/greenbutton.png
@@ -1063,6 +1067,7 @@ share/applications/xfp.desktop
 %%DATADIR%%/icons/gnomeblue-theme/gif_16x16.png
 %%DATADIR%%/icons/gnomeblue-theme/gif_32x32.png
 %%DATADIR%%/icons/gnomeblue-theme/gotobig.png
+%%DATADIR%%/icons/gnomeblue-theme/gotodir.png
 %%DATADIR%%/icons/gnomeblue-theme/gotoline.png
 %%DATADIR%%/icons/gnomeblue-theme/graybutton.png
 %%DATADIR%%/icons/gnomeblue-theme/greenbutton.png
@@ -1371,6 +1376,7 @@ share/applications/xfp.desktop
 %%DATADIR%%/icons/kde-theme/gif_16x16.png
 %%DATADIR%%/icons/kde-theme/gif_32x32.png
 %%DATADIR%%/icons/kde-theme/gotobig.png
+%%DATADIR%%/icons/kde-theme/gotodir.png
 %%DATADIR%%/icons/kde-theme/gotoline.png
 %%DATADIR%%/icons/kde-theme/graybutton.png
 %%DATADIR%%/icons/kde-theme/greenbutton.png
@@ -1679,6 +1685,7 @@ share/applications/xfp.desktop
 %%DATADIR%%/icons/tango-theme/gif_16x16.png
 %%DATADIR%%/icons/tango-theme/gif_32x32.png
 %%DATADIR%%/icons/tango-theme/gotobig.png
+%%DATADIR%%/icons/tango-theme/gotodir.png
 %%DATADIR%%/icons/tango-theme/gotoline.png
 %%DATADIR%%/icons/tango-theme/graybutton.png
 %%DATADIR%%/icons/tango-theme/greenbutton.png
@@ -1987,6 +1994,7 @@ share/applications/xfp.desktop
 %%DATADIR%%/icons/windows-theme/gif_16x16.png
 %%DATADIR%%/icons/windows-theme/gif_32x32.png
 %%DATADIR%%/icons/windows-theme/gotobig.png
+%%DATADIR%%/icons/windows-theme/gotodir.png
 %%DATADIR%%/icons/windows-theme/gotoline.png
 %%DATADIR%%/icons/windows-theme/graybutton.png
 %%DATADIR%%/icons/windows-theme/greenbutton.png
@@ -2295,6 +2303,7 @@ share/applications/xfp.desktop
 %%DATADIR%%/icons/xfce-theme/gif_16x16.png
 %%DATADIR%%/icons/xfce-theme/gif_32x32.png
 %%DATADIR%%/icons/xfce-theme/gotobig.png
+%%DATADIR%%/icons/xfce-theme/gotodir.png
 %%DATADIR%%/icons/xfce-theme/gotoline.png
 %%DATADIR%%/icons/xfce-theme/graybutton.png
 %%DATADIR%%/icons/xfce-theme/greenbutton.png
@@ -2603,6 +2612,7 @@ share/applications/xfp.desktop
 %%DATADIR%%/icons/xfe-theme/gif_16x16.png
 %%DATADIR%%/icons/xfe-theme/gif_32x32.png
 %%DATADIR%%/icons/xfe-theme/gotobig.png
+%%DATADIR%%/icons/xfe-theme/gotodir.png
 %%DATADIR%%/icons/xfe-theme/gotoline.png
 %%DATADIR%%/icons/xfe-theme/graybutton.png
 %%DATADIR%%/icons/xfe-theme/greenbutton.png