7 files changed, 98 insertions, 52 deletions

diff --git a/x11-fm/ezfm/Makefile b/x11-fm/ezfm/Makefile
index b2025955b6cb..fdf8d1873adc 100644
--- a/x11-fm/ezfm/Makefile
+++ b/x11-fm/ezfm/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	ezfm
-# Version required:			0.1
+# Version required:			0.4
 # Date created:				27 July 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.4 1998/10/15 10:53:27 jseger Exp $
+# $Id: Makefile,v 1.5 1998/10/20 01:25:55 steve Exp $
 #
 
-DISTNAME=	EZFM-0.1-src
-PKGNAME=	ezfm-0.1
+DISTNAME=	EZFM-0.4-src
+PKGNAME=	ezfm-0.4
 CATEGORIES=	x11-fm
 MASTER_SITES=	ftp://ftp.ma.utexas.edu/pub/mzou/
 EXTRACT_SUFX=	.tgz
@@ -17,7 +17,7 @@ MAINTAINER=	andy@icc.surw.chel.su
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		EZ.1:${PORTSDIR}/graphics/EZWGL
 
-WRKSRC=		${WRKDIR}/EZFM-0.1
+WRKSRC=		${WRKDIR}/EZFM-0.4
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 
@@ -32,6 +32,8 @@ do-install:
 	@ ${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} ${PREFIX}/share/doc/ezfm
 	@ ${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/ezfm
diff --git a/x11-fm/ezfm/distinfo b/x11-fm/ezfm/distinfo
index fa14e1f29e90..df6b55a23708 100644
--- a/x11-fm/ezfm/distinfo
+++ b/x11-fm/ezfm/distinfo
@@ -1 +1 @@
-MD5 (EZFM-0.1-src.tgz) = 71242398196d974ed8b77265e9600299
+MD5 (EZFM-0.4-src.tgz) = 7fdc11cb042a3eb2bcc9992099a174e3
diff --git a/x11-fm/ezfm/files/patch-aa b/x11-fm/ezfm/files/patch-aa
index 21d9c3a51338..4d1e09f689d1 100644
--- a/x11-fm/ezfm/files/patch-aa
+++ b/x11-fm/ezfm/files/patch-aa
@@ -1,54 +1,101 @@
---- Makefile	Thu Jul  2 17:27:53 1998
-+++ /home/andy/tmp/wrk/Makefile	Thu Jul 30 11:11:08 1998
-@@ -1,31 +1,35 @@
+--- Makefile	Wed Dec  9 23:31:06 1998
++++ /home/andy/tmp/wrk/Makefile	Tue Mar 16 17:13:19 1999
+@@ -1,36 +1,49 @@
+-#-------------------------------------------------------------------------------
+ #
+-# Where to install ezfm files
++# X11 base directory
 +#
-+# Prefix definition
++X11BASE?=/usr/X11R6
++
 +#
-+PREFIX?=/usr/X11R6
- #-------------------------------------------------------------------------------
++# Local packages directory
  #
- # Where to install the default magic file.
+-DEST_DIR=/usr/local
++LOCALBASE?=/usr/local
++
+ #
++# Installation prefix
++#
++PREFIX?=/usr/X11R6
++
++#-------------------------------------------------------------------------------
++#
++# Where to install ezfm files
  #
--EZFM_MAGIC=/usr/local/lib/ezfm/ezfmMagic
--EZFM_EXTENSION=/usr/local/lib/ezfm/ezfmExtension
-+EZFM_MAGIC=${PREFIX}/share/ezfm/ezfmMagic
-+EZFM_EXTENSION=${PREFIX}/share/ezfm/ezfmExtension
+-EZFM_MAGIC=$(DEST_DIR)/lib/ezfm/ezfmMagic
+-EZFM_EXTENSION=$(DEST_DIR)/lib/ezfm/ezfmExtension
++EZFM_MAGIC=$(PREFIX)/share/ezfm/ezfmMagic
++EZFM_EXTENSION=$(PREFIX)/share/ezfm/ezfmExtension
  #
  # Where to install default initialization file
  # this file is consulted if ~/.ezfmrc $EZFMRC
  # are not found.
  #
--EZFM_RC=/usr/local/lib/ezfm/ezfmrc
-+EZFM_RC=${PREFIX}/share/ezfm/ezfmrc
+-EZFM_RC=$(DEST_DIR)/lib/ezfm/ezfmrc
++EZFM_RC=$(PREFIX)/share/ezfm/ezfmrc
  
  #
  # Where to install the icons
  #
--EZFM_ICONS=/usr/local/lib/ezfm/ezfmIcons
-+EZFM_ICONS=${PREFIX}/share/ezfm/ezfmIcons
+-EZFM_ICONS=$(DEST_DIR)/lib/ezfm/ezfmIcons
++EZFM_ICONS=$(PREFIX)/share/ezfm/ezfmIcons
  #
  # Where to install the binary
  #
--BIN=/usr/local/bin
-+BIN=${PREFIX}/bin
+-BIN=$(DEST_DIR)/bin
++BIN=$(PREFIX)/bin
  #
  #----------------------------------------------------------------------------------
  #
--CC= gcc  -O -DLINUX
-+CC+= -I${PREFIX}/include
+-CC= gcc  -O2 -DLINUX -I../include
++CC?= cc
++CFLAGS+= -I$(LOCALBASE)/include -I$(X11BASE)/include
+ 
  #
  #----------------------------------------------------------------------------------
--LIBS = libfile.a  -lEZ  ../jpeg/libjpeg.a -L/usr/X11R6/lib -lX11 -lXext  -lm  -lc
-+LIBS = libfile.a  -lEZ -ljpeg -L/usr/local/lib -L${X11BASE}/lib -lX11 -lXext -lm  -lc
- 
+-LIBS = libfile.a -L../EZWGL/lib -lEZ -L/usr/X11R6/lib -lX11 -lXext  -lm  -lc
+-STATICLIBS = libfile.a /usr/local/lib/libEZ.a -L/usr/X11R6/lib -lX11 -lXext  -lm  -lc
++LIBS = libfile.a -lEZ -ljpeg -L$(LOCALBASE)/lib -L$(X11BASE)/lib -lX11 -lXext  -lm  -lc
++STATICLIBS = libfile.a $(LOCALBASE)/lib/libEZ.a -L$(X11BASE)/lib -lX11 -lXext  -lm  -lc
  
  SRC= action.c folder.c atoms.c clientMessage.c main.c icons.c items.c finfo.c \
-@@ -54,7 +58,7 @@
+      signal.c info.c infoBtn.c printer.c misc.c mbtnFile.c mbtnView.c mbtnHelp.c popup.c\
+@@ -45,10 +58,10 @@
+ all: ezfm  ezfmMagic
+ 
+ ezfm: libfile.a $(OBJECTS)
+-	$(CC) $(CFLAG)  -o ezfm $(OBJECTS) $(LIBS) $(JPEG_LIB)
++	$(CC) $(CFLAGS)  -o ezfm $(OBJECTS) $(LIBS) $(JPEG_LIB)
+ 
+ ezfm-static: libfile.a $(OBJECTS)
+-	$(CC) $(CFLAG)  -o ezfm $(OBJECTS) $(STATICLIBS) $(JPEG_LIB)
++	$(CC) $(CFLAGS)  -o ezfm $(OBJECTS) $(STATICLIBS) $(JPEG_LIB)
+ 
+ 
+ install: ezfm ezfmMagic ezfmExtension ezfmrc ezfmIcons
+@@ -62,7 +75,7 @@
  	cp ezfm $(BIN)
  
  libfile.a:
 -	(cd libfile; make libfile.a CC="gcc -O"; mv libfile.a ../ )
 +	(cd libfile; make libfile.a; mv libfile.a ../ )
+ 	- ranlib libfile.a
  
  ezfmMagic:
- 	(cd libfile/Magdir; make all)
+@@ -79,13 +92,13 @@
+ 	$(RM)  $(OBJECTS) ezfm
+  
+ .c.o:
+-	$(CC) $(CFLAG) -c $<
++	$(CC) $(CFLAGS) -c $<
+ 
+ .o:
+ 	$(CC) $<  -o $@  $(LIBS) $(JPEG_LIB)
+ 
+ .c:
+-	$(CC) $(CFLAG)  $< -o $@  $(LIBS) $(JPEG_LIB)
++	$(CC) $(CFLAGS)  $< -o $@  $(LIBS) $(JPEG_LIB)
+ 
+ #
+ #  That's all folks,
diff --git a/x11-fm/ezfm/files/patch-ab b/x11-fm/ezfm/files/patch-ab
index 12338c808278..ba0c5605378c 100644
--- a/x11-fm/ezfm/files/patch-ab
+++ b/x11-fm/ezfm/files/patch-ab
@@ -1,11 +1,12 @@
---- ezfm.h	Mon Jun 29 07:24:36 1998
-+++ /home/andy/tmp/wrk/ezfm.h	Thu Jul 30 11:02:31 1998
-@@ -53,7 +53,7 @@
+--- ezfm.h	Thu Dec 10 09:30:59 1998
++++ /home/andy/tmp/wrk/ezfm.h	Tue Mar 16 17:23:47 1999
+@@ -53,7 +53,9 @@
  #endif
  /*************************************************************/
  EXTERN   int erron, sys_nerr;
--EXTERN   char *sys_errlist[];
-+/* EXTERN   char *sys_errlist[]; */
++#ifndef __FreeBSD__
+ EXTERN   char *sys_errlist[];
++#endif
  #define syserr(en) (((en) >= 0 && (en) < sys_nerr) ? sys_errlist[(en)] : "Unknown error")
  #define SECONDS_IN_YEAR         31536000
  #define SelectionBackground     "yellow"
diff --git a/x11-fm/ezfm/files/patch-af b/x11-fm/ezfm/files/patch-af
index d0491c08ede4..fc17fbfce2ff 100644
--- a/x11-fm/ezfm/files/patch-af
+++ b/x11-fm/ezfm/files/patch-af
@@ -1,15 +1,15 @@
---- ezfmrc.orig	Tue Jun 30 10:59:34 1998
-+++ ezfmrc	Sun Aug  9 16:53:48 1998
-@@ -5,9 +5,9 @@
- # ezfm needs the following two files to start. 
+--- ezfmrc	Wed Dec  9 12:05:32 1998
++++ /home/andy/tmp/wrk/ezfmrc	Tue Mar 16 17:18:22 1999
+@@ -2,9 +2,9 @@
+ # Initialization file for ezfm. Path should be ~/.ezfmrc
  #
  Section  "Files"
--   Magicfile     ezfmMagic:~/.ezfmMagic:/etc/ezfmMagic:/usr/lib/ezfm/ezfmMagic:/usr/local/lib/ezfm/ezfmMagic
+-   Magicfile     ezfmMagic:~/.ezfmMagic:/etc/ezfmMagic:/usr/local/lib/ezfm/ezfmMagic
 -   IconPath      ezfmIcons:~/.ezfmIcons:/usr/lib/ezfm/ezfmIcons:/usr/local/lib/ezfm/ezfmIcons
 -   ExtensionFile ezfmExtension:~/.ezfmExtension
 +   Magicfile     ezfmMagic:~/.ezfmMagic:/usr/X11R6/share/ezfm/ezfmMagic
 +   IconPath      ezfmIcons:~/.ezfmIcons:/usr/X11R6/share/ezfm/ezfmIcons
 +   ExtensionFile ezfmExtension:~/.ezfmExtension:/usr/X11R6/share/ezfm/ezfmExtension
  EndSection
- 
- # list all removable devices here. The format is
+ #
+ # Note: the extension file above is used to supress magic check. You can
diff --git a/x11-fm/ezfm/pkg-descr b/x11-fm/ezfm/pkg-descr
index 6ea6e7477787..b647835d556b 100644
--- a/x11-fm/ezfm/pkg-descr
+++ b/x11-fm/ezfm/pkg-descr
@@ -1,2 +1,4 @@
 Ezfm is a EZWGL-based file manager for X Window System. It
 offers most of the features one would expect from a file manager.
+
+http://www.ma.utexas.edu/~mzou/EZFM/
diff --git a/x11-fm/ezfm/pkg-plist b/x11-fm/ezfm/pkg-plist
index a3fb0775c799..9d82e2d56ab8 100644
--- a/x11-fm/ezfm/pkg-plist
+++ b/x11-fm/ezfm/pkg-plist
@@ -4,23 +4,14 @@ share/ezfm/ezfmExtension
 share/ezfm/ezfmMagic
 share/ezfm/ezfmrc
 share/ezfm/ezfmIcons/BGNalumGray.gif
-share/ezfm/ezfmIcons/BGNam.gif
-share/ezfm/ezfmIcons/BGNbump2.gif
-share/ezfm/ezfmIcons/BGNcbright.gif
-share/ezfm/ezfmIcons/BGNcontour.gif
 share/ezfm/ezfmIcons/BGNdotsGray.gif
 share/ezfm/ezfmIcons/BGNfabricGray.gif
 share/ezfm/ezfmIcons/BGNfabricPink.gif
 share/ezfm/ezfmIcons/BGNfabricYellow.gif
 share/ezfm/ezfmIcons/BGNgray.gif
-share/ezfm/ezfmIcons/BGNlgray.gif
-share/ezfm/ezfmIcons/BGNlinux.gif
-share/ezfm/ezfmIcons/BGNlpaper3.gif
-share/ezfm/ezfmIcons/BGNlpaper4.gif
 share/ezfm/ezfmIcons/BGNmarble.gif
 share/ezfm/ezfmIcons/BGNmarbleGrnRed.gif
 share/ezfm/ezfmIcons/BGNmarbleLavender.gif
-share/ezfm/ezfmIcons/BGNmodern_hiero.gif
 share/ezfm/ezfmIcons/BGNpaperBlue.gif
 share/ezfm/ezfmIcons/BGNpaperGrnWhite.gif
 share/ezfm/ezfmIcons/BGNpaperOrange.gif
@@ -35,7 +26,6 @@ share/ezfm/ezfmIcons/BGNstarfield.xpm
 share/ezfm/ezfmIcons/BGNstuccoYellow.gif
 share/ezfm/ezfmIcons/BGNwaves.xpm
 share/ezfm/ezfmIcons/BGNweaveYellow.gif
-share/ezfm/ezfmIcons/BGNwhtsand.gif
 share/ezfm/ezfmIcons/BGNwood.xpm
 share/ezfm/ezfmIcons/Folder.xpm
 share/ezfm/ezfmIcons/FolderBooks.xpm
@@ -75,6 +65,7 @@ share/ezfm/ezfmIcons/cdrom_view.xpm
 share/ezfm/ezfmIcons/chardevice.xpm
 share/ezfm/ezfmIcons/checkbook.xpm
 share/ezfm/ezfmIcons/chess.xpm
+share/ezfm/ezfmIcons/cm.xpm
 share/ezfm/ezfmIcons/columns.xpm
 share/ezfm/ezfmIcons/communication.xpm
 share/ezfm/ezfmIcons/compressed.xpm
@@ -146,6 +137,7 @@ share/ezfm/ezfmIcons/floppyExtU.xpm
 share/ezfm/ezfmIcons/floppyM.xpm
 share/ezfm/ezfmIcons/floppyU.xpm
 share/ezfm/ezfmIcons/flowers.xpm
+share/ezfm/ezfmIcons/flowersS.xpm
 share/ezfm/ezfmIcons/folderC.xpm
 share/ezfm/ezfmIcons/folderO.xpm
 share/ezfm/ezfmIcons/folders.xpm
@@ -171,6 +163,7 @@ share/ezfm/ezfmIcons/home3.xpm
 share/ezfm/ezfmIcons/html.xpm
 share/ezfm/ezfmIcons/html_s.xpm
 share/ezfm/ezfmIcons/iconI.xpm
+share/ezfm/ezfmIcons/iconIS.xpm
 share/ezfm/ezfmIcons/index.xpm
 share/ezfm/ezfmIcons/info.xpm
 share/ezfm/ezfmIcons/java_byte.xpm
@@ -297,6 +290,7 @@ share/ezfm/ezfmIcons/unknown.xpm
 share/ezfm/ezfmIcons/unknown16.xpm
 share/ezfm/ezfmIcons/unknown32.xpm
 share/ezfm/ezfmIcons/uu.xpm
+share/ezfm/ezfmIcons/wincenter.xpm
 share/ezfm/ezfmIcons/word_processor.xpm
 share/ezfm/ezfmIcons/wordprocess.xpm
 share/ezfm/ezfmIcons/wri-only.xpm