Attachment #82860 for bug #118474

View | Details | Raw Unified | Return to bug 118474
Collapse All | Expand All




DISTNAME=	EZFM-0.4-src
EXTRACT_SUFX=	.tgz

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_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

	@${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCSDIR}
.endif

.include <bsd.port.mk>




--- ezfm.h.orig	1999-10-06 00:01:29.000000000 +0200
+++ ezfm.h	2007-12-07 00:02:05.000000000 +0100

--- ezfm.h.orig	Wed Oct  6 00:01:29 1999
+++ ezfm.h	Thu Oct 31 18:05:27 2002
@@ -52,8 +52,11 @@
 #define REMOVABLE_DRIVES
 #endif

 #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;




--- 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 @@
     }
 }
 /**************************************************************************/

 {
   char str[12];
   infoControl *ptr = (infoControl *)data;
@@ -347,7 +347,7 @@
 			       EZ_GRID_CELL_GEOMETRY,  2, idx , 1, 1,
 			       EZ_CLIENT_INT_DATA,     rr,
 			       EZ_CLIENT_PTR_DATA,     clabel,

 			       NULL);
   label =      EZ_CreateWidget(EZ_WIDGET_CHECK_BUTTON, tframe,
 			       EZ_LABEL_STRING,        "write",
@@ -358,7 +358,7 @@
 			       EZ_CLIENT_INT_DATA,     ww,
 			       EZ_CLIENT_PTR_DATA,     clabel,
 			       EZ_GRID_CELL_GEOMETRY,  3, idx , 1, 1, 

 			       NULL);
   label =      EZ_CreateWidget(EZ_WIDGET_CHECK_BUTTON, tframe,
 			       EZ_LABEL_STRING,        "execute",
@@ -369,7 +369,7 @@
 			       EZ_CLIENT_PTR_DATA,     clabel,
 			       EZ_CHECK_BUTTON_ON_OFF,  xx&mode,
 			       EZ_GRID_CELL_GEOMETRY,  4, idx , 1, 1, 

Added Link Here

(-)files/patch-folder.c (+11 lines)
1	--- folder.c.orig 2007-12-07 00:06:06.000000000 +0100
2	+++ folder.c 2007-12-07 00:06:26.000000000 +0100
3	@@ -2118,7 +2118,7 @@
4	else
5	{
6	char *err = (errno >= 0 && errno <sys_nerr)?
7	- sys_errlist[errno] : "Unknown error";
8	+ (char *)sys_errlist[errno] : "Unknown error";
9	ezfmWarning("Rename File Failed", err);
10	}
11	}

Added Link Here

(-)files/patch-signal.c (+19 lines)
1	--- signal.c.orig 1999-10-07 22:08:11.000000000 +0200
2	+++ signal.c 2007-12-07 00:17:33.000000000 +0100
3	@@ -88,7 +88,7 @@
4	{
5	int i;
6	char command[256];
7	- fprintf(stderr, "existing, please wait ... ");
8	+ fprintf(stderr, "exiting, please wait ... ");
9	sleep(3);
10	for(i = 0; i < 8; i++)
11	{
12	@@ -100,6 +100,7 @@
13	}
14	}
15	fprintf(stderr, "Done\n");
16	+ _exit(EXIT_SUCCESS);
17	}
18	/**************************************************************/
19

Added Link Here

(-)files/patch-trashBtn.c (+11 lines)
1	--- trashBtn.c.orig 2007-12-07 00:11:13.000000000 +0100
2	+++ trashBtn.c 2007-12-07 00:11:21.000000000 +0100
3	@@ -173,7 +173,7 @@
4	else
5	{
6	char *err = (errno >= 0 && errno <sys_nerr)?
7	- sys_errlist[errno] : "Unknown error";
8	+ (char *)sys_errlist[errno] : "Unknown error";
9	ezfmWarning("Error Deleting File", err);
10	}
11	}

Added Link Here

(-)files/patch-action.c (+11 lines)
1	--- action.c.orig 2007-12-07 00:24:02.000000000 +0100
2	+++ action.c 2007-12-07 00:24:09.000000000 +0100
3	@@ -417,7 +417,7 @@
4	execl("/bin/sh", "sh", "-c", cmdline, NULL);
5	/* if we ever get to here, some thing went wrong */
6	err= (errno >= 0 && errno <sys_nerr)?
7	- sys_errlist[errno] : "Unknown error";
8	+ (char *)sys_errlist[errno] : "Unknown error";
9	write(STDERR_FILENO, err, strlen(err));
10	_exit(127);
11	}

Return to bug 118474

Lines 13-36 Link Here

(-)Makefile (-9 / +2 lines)
13	DISTNAME= EZFM-0.4-src	13	DISTNAME= EZFM-0.4-src
14	EXTRACT_SUFX= .tgz	14	EXTRACT_SUFX= .tgz
15		15
16	MAINTAINER= ports@FreeBSD.org	16	MAINTAINER= gahr@gahr.ch
17	COMMENT= EZWGL-based file manager for X Window System	17	COMMENT= EZWGL-based file manager for X Window System
18		18
19	LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \	19	LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
20	EZ.1:${PORTSDIR}/graphics/EZWGL	20	EZ.1:${PORTSDIR}/graphics/EZWGL
21		21
22	WRKSRC= ${WRKDIR}/EZFM-${PORTVERSION}	22	WRKSRC= ${WRKDIR}/EZFM-${PORTVERSION}
23	USE_X_PREFIX= yes
24	USE_GMAKE= yes	23	USE_GMAKE= yes
25		24
26	MAN1= ezfm.1	25	MAN1= ezfm.1
27		26
28	.include <bsd.port.pre.mk>
29
30	.if ${OSVERSION} >= 700042
31	BROKEN= Broken with gcc 4.2
32	.endif
33
34	do-install:	27	do-install:
35	@ ${INSTALL_PROGRAM} ${WRKSRC}/ezfm ${PREFIX}/bin	28	@ ${INSTALL_PROGRAM} ${WRKSRC}/ezfm ${PREFIX}/bin
36	@ ${MKDIR} ${PREFIX}/share/ezfm	29	@ ${MKDIR} ${PREFIX}/share/ezfm
Lines 47-50 Link Here
47	@${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCSDIR}	40	@${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCSDIR}
48	.endif	41	.endif
49		42
50	.include <bsd.port.post.mk>	43	.include <bsd.port.mk>

Lines 1-8 Link Here

(-)files/patch-ab (-5 / +10 lines)
1		1	--- ezfm.h.orig 1999-10-06 00:01:29.000000000 +0200
2	$FreeBSD: ports/x11-fm/ezfm/files/patch-ab,v 1.3 2002/10/31 17:10:41 naddy Exp $	2	+++ ezfm.h 2007-12-07 00:02:05.000000000 +0100
3
4	--- ezfm.h.orig Wed Oct 6 00:01:29 1999
5	+++ ezfm.h Thu Oct 31 18:05:27 2002
6	@@ -52,8 +52,11 @@	3	@@ -52,8 +52,11 @@
7	#define REMOVABLE_DRIVES	4	#define REMOVABLE_DRIVES
8	#endif	5	#endif
Lines 16-18 Link Here
16	#define syserr(en) (((en) >= 0 && (en) < sys_nerr) ? sys_errlist[(en)] : "Unknown error")	13	#define syserr(en) (((en) >= 0 && (en) < sys_nerr) ? sys_errlist[(en)] : "Unknown error")
17	#define SECONDS_IN_YEAR 31536000	14	#define SECONDS_IN_YEAR 31536000
18	#define SelectionBackground "yellow"	15	#define SelectionBackground "yellow"
		16	@@ -253,7 +256,6 @@
		17	EXTERN char ezfmFolderBgPixmap[];
		18	EXTERN EZ_Widget *ezfmDragIcon;
		19	EXTERN Cursor ezfmDragCursor;
		20	-EXTERN Pixmap rootBgPixmap;
		21	EXTERN EZ_LabelPixmap *bigPixmap;
		22	EXTERN int transparent;
		23	EXTERN Display *theDisplay;

Lines 1-6 Link Here

(-)files/patch-ac (-6 / +33 lines)
1	--- infoBtn.c Thu Jun 25 16:09:58 1998	1	--- infoBtn.c.orig 1998-11-16 06:02:59.000000000 +0100
2	+++ /home/andy/tmp/wrk/infoBtn.c Thu Jul 30 11:27:26 1998	2	+++ infoBtn.c 2007-12-07 00:09:30.000000000 +0100
3	@@ -292,7 +292,7 @@	3	@@ -214,7 +214,7 @@
		4	if(chmod(ptr->pathname, ptr->mode) != 0)
		5	{
		6	char *err= (errno >= 0 && errno <sys_nerr)?
		7	- sys_errlist[errno] : "Unknown error";
		8	+ (char *)sys_errlist[errno] : "Unknown error";
		9	ezfmWarning("chmod() failed due to the following error", err);
		10	haserr++;
		11	}
		12	@@ -245,7 +245,7 @@
		13	if(chown(ptr->pathname, pswd->pw_uid, grp->gr_gid) != 0)
		14	{
		15	char *err= (errno >= 0 && errno <sys_nerr)?
		16	- sys_errlist[errno] : "Unknown error";
		17	+ (char *)sys_errlist[errno] : "Unknown error";
		18	ezfmWarning("chown() failed due to the following error", err);
		19	haserr++;
		20	}
		21	@@ -260,7 +260,7 @@
		22	if(rename(ptr->pathname, nname) < 0)
		23	{
		24	char *err= (errno >= 0 && errno <sys_nerr)?
		25	- sys_errlist[errno] : "Unknown error";
		26	+ (char *)sys_errlist[errno] : "Unknown error";
		27	ezfmWarning("rename() failed due to the following error", err);
		28	haserr++;
		29	}
		30	@@ -290,7 +290,7 @@
4	}	31	}
5	}	32	}
6	/**************************************************************************/	33	/**************************************************************************/
Lines 9-15 Link Here
9	{	36	{
10	char str[12];	37	char str[12];
11	infoControl ptr = (infoControl )data;	38	infoControl ptr = (infoControl )data;
12	@@ -349,7 +349,7 @@	39	@@ -347,7 +347,7 @@
13	EZ_GRID_CELL_GEOMETRY, 2, idx , 1, 1,	40	EZ_GRID_CELL_GEOMETRY, 2, idx , 1, 1,
14	EZ_CLIENT_INT_DATA, rr,	41	EZ_CLIENT_INT_DATA, rr,
15	EZ_CLIENT_PTR_DATA, clabel,	42	EZ_CLIENT_PTR_DATA, clabel,
Lines 18-24 Link Here
18	NULL);	45	NULL);
19	label = EZ_CreateWidget(EZ_WIDGET_CHECK_BUTTON, tframe,	46	label = EZ_CreateWidget(EZ_WIDGET_CHECK_BUTTON, tframe,
20	EZ_LABEL_STRING, "write",	47	EZ_LABEL_STRING, "write",
21	@@ -360,7 +360,7 @@	48	@@ -358,7 +358,7 @@
22	EZ_CLIENT_INT_DATA, ww,	49	EZ_CLIENT_INT_DATA, ww,
23	EZ_CLIENT_PTR_DATA, clabel,	50	EZ_CLIENT_PTR_DATA, clabel,
24	EZ_GRID_CELL_GEOMETRY, 3, idx , 1, 1,	51	EZ_GRID_CELL_GEOMETRY, 3, idx , 1, 1,
Lines 27-33 Link Here
27	NULL);	54	NULL);
28	label = EZ_CreateWidget(EZ_WIDGET_CHECK_BUTTON, tframe,	55	label = EZ_CreateWidget(EZ_WIDGET_CHECK_BUTTON, tframe,
29	EZ_LABEL_STRING, "execute",	56	EZ_LABEL_STRING, "execute",
30	@@ -371,7 +371,7 @@	57	@@ -369,7 +369,7 @@
31	EZ_CLIENT_PTR_DATA, clabel,	58	EZ_CLIENT_PTR_DATA, clabel,
32	EZ_CHECK_BUTTON_ON_OFF, xx&mode,	59	EZ_CHECK_BUTTON_ON_OFF, xx&mode,
33	EZ_GRID_CELL_GEOMETRY, 4, idx , 1, 1,	60	EZ_GRID_CELL_GEOMETRY, 4, idx , 1, 1,