- Fix build with gcc 4.2

- Pass maintainership to submitter

PR:		118474
Submitted by:	Pietro Cerutti <gahr@gahr.ch>
Approved by:	portmgr (erwin)

7 files changed, 98 insertions, 20 deletions

diff --git a/x11-fm/ezfm/Makefile b/x11-fm/ezfm/Makefile
index e0b052a..6bb1e3a 100644
--- a/x11-fm/ezfm/Makefile
+++ b/x11-fm/ezfm/Makefile
@@ -13,24 +13,18 @@ MASTER_SITES=	ftp://ftp.ma.utexas.edu/pub/mzou/
 DISTNAME=	EZFM-0.4-src
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	gahr@gahr.ch
 COMMENT=	EZWGL-based file manager for X Window System
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		EZ.1:${PORTSDIR}/graphics/EZWGL
 
 WRKSRC=		${WRKDIR}/EZFM-${PORTVERSION}
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
 
 MAN1=		ezfm.1
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-BROKEN=		Broken with gcc 4.2
-.endif
-
 do-install:
 	@ ${INSTALL_PROGRAM} ${WRKSRC}/ezfm ${PREFIX}/bin
 	@ ${MKDIR} ${PREFIX}/share/ezfm
@@ -47,4 +41,4 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-fm/ezfm/files/patch-ab b/x11-fm/ezfm/files/patch-ab
index 20eb2f9..be90c29 100644
--- a/x11-fm/ezfm/files/patch-ab
+++ b/x11-fm/ezfm/files/patch-ab
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- ezfm.h.orig	Wed Oct  6 00:01:29 1999
-+++ ezfm.h	Thu Oct 31 18:05:27 2002
+--- ezfm.h.orig	1999-10-06 00:01:29.000000000 +0200
++++ ezfm.h	2007-12-07 00:02:05.000000000 +0100
 @@ -52,8 +52,11 @@
  #define REMOVABLE_DRIVES
  #endif
@@ -16,3 +13,11 @@ $FreeBSD$
  #define syserr(en) (((en) >= 0 && (en) < sys_nerr) ? sys_errlist[(en)] : "Unknown error")
  #define SECONDS_IN_YEAR         31536000
  #define SelectionBackground     "yellow"
+@@ -253,7 +256,6 @@
+ EXTERN char               ezfmFolderBgPixmap[];
+ EXTERN EZ_Widget          *ezfmDragIcon;
+ EXTERN Cursor             ezfmDragCursor;
+-EXTERN Pixmap             rootBgPixmap;
+ EXTERN EZ_LabelPixmap     *bigPixmap;  
+ EXTERN int                transparent;
+ EXTERN Display            *theDisplay;
diff --git a/x11-fm/ezfm/files/patch-ac b/x11-fm/ezfm/files/patch-ac
index eaee17a..405f272 100644
--- a/x11-fm/ezfm/files/patch-ac
+++ b/x11-fm/ezfm/files/patch-ac
@@ -1,6 +1,33 @@
---- infoBtn.c	Thu Jun 25 16:09:58 1998
-+++ /home/andy/tmp/wrk/infoBtn.c	Thu Jul 30 11:27:26 1998
-@@ -292,7 +292,7 @@
+--- infoBtn.c.orig	1998-11-16 06:02:59.000000000 +0100
++++ infoBtn.c	2007-12-07 00:09:30.000000000 +0100
+@@ -214,7 +214,7 @@
+ 	  if(chmod(ptr->pathname, ptr->mode) != 0)
+ 	    {
+ 	      char *err= (errno >= 0 && errno <sys_nerr)? 
+-		sys_errlist[errno] : "Unknown error";
++		(char *)sys_errlist[errno] : "Unknown error";
+ 	      ezfmWarning("chmod() failed due to the following error", err);
+ 	      haserr++;
+ 	    }
+@@ -245,7 +245,7 @@
+ 		if(chown(ptr->pathname, pswd->pw_uid, grp->gr_gid) != 0)
+ 		  {
+ 		    char *err= (errno >= 0 && errno <sys_nerr)? 
+-		      sys_errlist[errno] : "Unknown error";
++		      (char *)sys_errlist[errno] : "Unknown error";
+ 		    ezfmWarning("chown() failed due to the following error", err);
+ 		    haserr++;
+ 		  }
+@@ -260,7 +260,7 @@
+ 	    if(rename(ptr->pathname, nname) < 0)
+ 	      {
+ 		char *err= (errno >= 0 && errno <sys_nerr)? 
+-		  sys_errlist[errno] : "Unknown error";
++		  (char *)sys_errlist[errno] : "Unknown error";
+ 		ezfmWarning("rename() failed due to the following error", err);
+ 		haserr++;	      
+ 	      }
+@@ -290,7 +290,7 @@
      }
  }
  /**************************************************************************/
@@ -9,7 +36,7 @@
  {
    char str[12];
    infoControl *ptr = (infoControl *)data;
-@@ -349,7 +349,7 @@
+@@ -347,7 +347,7 @@
  			       EZ_GRID_CELL_GEOMETRY,  2, idx , 1, 1,
  			       EZ_CLIENT_INT_DATA,     rr,
  			       EZ_CLIENT_PTR_DATA,     clabel,
@@ -18,7 +45,7 @@
  			       NULL);
    label =      EZ_CreateWidget(EZ_WIDGET_CHECK_BUTTON, tframe,
  			       EZ_LABEL_STRING,        "write",
-@@ -360,7 +360,7 @@
+@@ -358,7 +358,7 @@
  			       EZ_CLIENT_INT_DATA,     ww,
  			       EZ_CLIENT_PTR_DATA,     clabel,
  			       EZ_GRID_CELL_GEOMETRY,  3, idx , 1, 1, 
@@ -27,7 +54,7 @@
  			       NULL);
    label =      EZ_CreateWidget(EZ_WIDGET_CHECK_BUTTON, tframe,
  			       EZ_LABEL_STRING,        "execute",
-@@ -371,7 +371,7 @@
+@@ -369,7 +369,7 @@
  			       EZ_CLIENT_PTR_DATA,     clabel,
  			       EZ_CHECK_BUTTON_ON_OFF,  xx&mode,
  			       EZ_GRID_CELL_GEOMETRY,  4, idx , 1, 1, 
diff --git a/x11-fm/ezfm/files/patch-action.c b/x11-fm/ezfm/files/patch-action.c
new file mode 100644
index 0000000..50fdb34
--- /dev/null
+++ b/x11-fm/ezfm/files/patch-action.c
@@ -0,0 +1,11 @@
+--- action.c.orig	2007-12-07 00:24:02.000000000 +0100
++++ action.c	2007-12-07 00:24:09.000000000 +0100
+@@ -417,7 +417,7 @@
+       execl("/bin/sh", "sh", "-c", cmdline, NULL);
+       /* if we ever get to here, some thing went wrong */
+       err= (errno >= 0 && errno <sys_nerr)? 
+-        sys_errlist[errno] : "Unknown error";
++        (char *)sys_errlist[errno] : "Unknown error";
+       write(STDERR_FILENO, err, strlen(err));
+       _exit(127);
+     }
diff --git a/x11-fm/ezfm/files/patch-folder.c b/x11-fm/ezfm/files/patch-folder.c
new file mode 100644
index 0000000..6b4f0b2
--- /dev/null
+++ b/x11-fm/ezfm/files/patch-folder.c
@@ -0,0 +1,11 @@
+--- folder.c.orig	2007-12-07 00:06:06.000000000 +0100
++++ folder.c	2007-12-07 00:06:26.000000000 +0100
+@@ -2118,7 +2118,7 @@
+           else
+             {
+               char *err = (errno >= 0 && errno <sys_nerr)? 
+-                sys_errlist[errno] : "Unknown error";
++                (char *)sys_errlist[errno] : "Unknown error";
+               ezfmWarning("Rename File Failed", err);                
+             }
+         }
diff --git a/x11-fm/ezfm/files/patch-signal.c b/x11-fm/ezfm/files/patch-signal.c
new file mode 100644
index 0000000..9e59c3b
--- /dev/null
+++ b/x11-fm/ezfm/files/patch-signal.c
@@ -0,0 +1,19 @@
+--- signal.c.orig	1999-10-07 22:08:11.000000000 +0200
++++ signal.c	2007-12-07 00:17:33.000000000 +0100
+@@ -88,7 +88,7 @@
+ {
+   int i;
+   char command[256];
+-  fprintf(stderr, "existing, please wait ... ");
++  fprintf(stderr, "exiting, please wait ... ");
+   sleep(3);
+   for(i = 0; i < 8; i++)
+     {
+@@ -100,6 +100,7 @@
+         }
+     }
+   fprintf(stderr, "Done\n");
++  _exit(EXIT_SUCCESS);
+ }
+ /**************************************************************/
+ 
diff --git a/x11-fm/ezfm/files/patch-trashBtn.c b/x11-fm/ezfm/files/patch-trashBtn.c
new file mode 100644
index 0000000..280a0b1
--- /dev/null
+++ b/x11-fm/ezfm/files/patch-trashBtn.c
@@ -0,0 +1,11 @@
+--- trashBtn.c.orig	2007-12-07 00:11:13.000000000 +0100
++++ trashBtn.c	2007-12-07 00:11:21.000000000 +0100
+@@ -173,7 +173,7 @@
+   else
+     {
+       char *err = (errno >= 0 && errno <sys_nerr)? 
+-	sys_errlist[errno] : "Unknown error";
++	(char *)sys_errlist[errno] : "Unknown error";
+       ezfmWarning("Error Deleting File", err);
+     }
+ }