- Unbreak parallel (-jX) builds by calling sub-makes correctly

- Avoid hardcoding version in DISTNAME, use modern LIB_DEPENDS syntax
- Do not install COPYING as portdocs, use LICENSE framework instead
- Fix the build against Clang (return should match function prototype)
- Cleanup do-install target recipe while I am here

Approved by:	miwi, bapt (portmgr, implicit)

5 files changed, 50 insertions, 26 deletions

diff --git a/x11-fm/ezfm/Makefile b/x11-fm/ezfm/Makefile
index 57f30f4..f93216e 100644
--- a/x11-fm/ezfm/Makefile
+++ b/x11-fm/ezfm/Makefile
@@ -1,4 +1,4 @@
-# Created by: Andrey Zakhvatov
+# Created by: Andrey Zakhvatov <andy@icc.surw.chel.su>
 # $FreeBSD$
 
 PORTNAME=	ezfm
@@ -6,35 +6,31 @@ PORTVERSION=	0.4.3
 PORTREVISION=	7
 CATEGORIES=	x11-fm
 MASTER_SITES=	ftp://ftp.ma.utexas.edu/pub/mzou/
-DISTNAME=	EZFM-0.4-src
+DISTNAME=	EZFM-${PORTVERSION:R}-src
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	EZWGL-based file manager for X Window System
 
-LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
-		EZ.1:${PORTSDIR}/graphics/EZWGL
+LICENSE=	GPLv2
+
+LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libEZ.so:${PORTSDIR}/graphics/EZWGL
 
 WRKSRC=		${WRKDIR}/EZFM-${PORTVERSION}
 USES=		gmake
-MAKE_JOBS_UNSAFE=	yes
 
 MAN1=		ezfm.1
 
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/ezfm ${PREFIX}/bin
-	@ ${MKDIR} ${PREFIX}/share/ezfm
+	${INSTALL_PROGRAM} ${WRKSRC}/ezfm ${PREFIX}/bin
+	@${MKDIR} ${PREFIX}/share/ezfm
 .for file in ezfmExtension ezfmMagic ezfmrc
-	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/ezfm
+	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/ezfm
 .endfor
-	@ ${MKDIR} ${PREFIX}/share/ezfm/ezfmIcons
-	@ cd ${WRKSRC}/ezfmIcons; tar -cf - . | (cd ${PREFIX}/share/ezfm/ezfmIcons; tar -xf - )
-	@ ${INSTALL_MAN} ${WRKSRC}/${MAN1} ${PREFIX}/man/man1
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCSDIR}
-.endif
+	@${MKDIR} ${PREFIX}/share/ezfm/ezfmIcons
+	${TAR} -C ${WRKSRC}/ezfmIcons -cf - . | ${TAR} -xf - -C \
+		${PREFIX}/share/ezfm/ezfmIcons
+	${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/x11-fm/ezfm/files/patch-aa b/x11-fm/ezfm/files/patch-aa
index 3896ba3..26db3ff 100644
--- a/x11-fm/ezfm/files/patch-aa
+++ b/x11-fm/ezfm/files/patch-aa
@@ -12,7 +12,7 @@
  #
  #
  EZFM_MAGIC=$(DEST_DIR)/lib/ezfm/ezfmMagic
-@@ -25,12 +28,13 @@
+@@ -25,12 +28,13 @@ BIN=$(DEST_DIR)/bin
  #
  #----------------------------------------------------------------------------------
  #
@@ -29,7 +29,7 @@
  
  SRC= action.c folder.c atoms.c clientMessage.c main.c icons.c items.c finfo.c \
       signal.c info.c infoBtn.c printer.c misc.c mbtnFile.c mbtnView.c mbtnHelp.c popup.c\
-@@ -45,10 +49,10 @@
+@@ -45,10 +49,10 @@ OBJECTS = $(SRC:.c=.o)
  all: ezfm  ezfmMagic
  
  ezfm: libfile.a $(OBJECTS)
@@ -42,16 +42,26 @@
  
  
  install: ezfm ezfmMagic ezfmExtension ezfmrc ezfmIcons
-@@ -62,7 +66,7 @@
+@@ -62,11 +66,11 @@ install: ezfm ezfmMagic ezfmExtension ez
  	cp ezfm $(BIN)
  
  libfile.a:
 -	(cd libfile; make libfile.a CC="gcc -O"; mv libfile.a ../ )
-+	(cd libfile; make libfile.a; mv libfile.a ../ )
++	$(MAKE) -C libfile libfile.a && mv libfile/libfile.a .
  	- ranlib libfile.a
  
  ezfmMagic:
-@@ -79,13 +83,13 @@
+-	(cd libfile/Magdir; make all)
++	$(MAKE) -C libfile/Magdir all
+ 
+ 
+ mbtnHelp.c: aboutEZFM.h
+@@ -75,17 +79,17 @@ mbtnHelp.c: aboutEZFM.h
+ 
+ clean:
+ 	$(RM)  libfile.a
+-	(cd libfile; make clean;)
++	$(MAKE) -C libfile clean
  	$(RM)  $(OBJECTS) ezfm
   
  .c.o:
diff --git a/x11-fm/ezfm/files/patch-ah b/x11-fm/ezfm/files/patch-ah
index 7da9de2..6af883f 100644
--- a/x11-fm/ezfm/files/patch-ah
+++ b/x11-fm/ezfm/files/patch-ah
@@ -1,6 +1,6 @@
 --- transparent.c.orig	Fri Aug 29 17:47:44 2003
 +++ transparent.c	Fri Aug 29 17:48:01 2003
-@@ -417,9 +417,9 @@
+@@ -417,9 +417,9 @@ void makeDialogue()
  }
  /********************************************************************************/
  static char *transparentResource = 
@@ -13,3 +13,12 @@
  "
  ;
  /********************************************************************************/
+@@ -535,7 +535,7 @@ void ezfmPopupWarning(lab1, lab2, lab3, 
+   }
+ }
+ /***************************************************************************/  
+-static setroot(obj, data, scale)
++static void setroot(obj, data, scale)
+      void *obj, *data; int scale;
+ {
+   FileInfo *finfo = (FileInfo *)data;
diff --git a/x11-fm/ezfm/files/patch-folder.c b/x11-fm/ezfm/files/patch-folder.c
index 6b4f0b2..979f63a 100644
--- a/x11-fm/ezfm/files/patch-folder.c
+++ b/x11-fm/ezfm/files/patch-folder.c
@@ -1,6 +1,17 @@
 --- 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 @@
+@@ -883,8 +883,8 @@ Folder *createNewFolder(pathname, toplev
+   EZ_Widget    *pframe, *tmp;
+   int          type = (ftype == 0 ? defaultFolderType: ftype);
+ 
+-  if(which != 0 && which != 1) return;
+-  if(toplevel->folder[which] != NULL) return;
++  if(which != 0 && which != 1) return NULL;
++  if(toplevel->folder[which] != NULL) return NULL;
+ 
+   folder= (Folder *)   EZ_Malloc(sizeof(Folder));
+   finfo  = (FileInfo *) EZ_Malloc(sizeof(FileInfo));
+@@ -2118,7 +2118,7 @@ static void renameEntryCb(entry, data) E
            else
              {
                char *err = (errno >= 0 && errno <sys_nerr)? 
diff --git a/x11-fm/ezfm/pkg-plist b/x11-fm/ezfm/pkg-plist
index 2df6ad9..ea7f56c 100644
--- a/x11-fm/ezfm/pkg-plist
+++ b/x11-fm/ezfm/pkg-plist
@@ -1,5 +1,4 @@
 bin/ezfm
-%%PORTDOCS%%share/doc/ezfm/COPYING
 share/ezfm/ezfmExtension
 share/ezfm/ezfmMagic
 share/ezfm/ezfmrc
@@ -336,6 +335,5 @@ share/ezfm/ezfmIcons/zipU.xpm
 share/ezfm/ezfmIcons/zip_s.xpm
 share/ezfm/ezfmIcons/zipdisk.xpm
 share/ezfm/ezfmIcons/zsh_script.xpm
-%%PORTDOCS%%@dirrm share/doc/ezfm
 @dirrm share/ezfm/ezfmIcons
 @dirrm share/ezfm