4 files changed, 36 insertions, 55 deletions

diff --git a/x11-fm/ezfm/Makefile b/x11-fm/ezfm/Makefile
index 266eda1bd140..75d7df5ddcdb 100644
--- a/x11-fm/ezfm/Makefile
+++ b/x11-fm/ezfm/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	ezfm
-PORTVERSION= 	0.4
+PORTVERSION= 	0.4.3
 CATEGORIES=	x11-fm
 MASTER_SITES=	ftp://ftp.ma.utexas.edu/pub/mzou/
-DISTNAME=	EZFM-${PORTVERSION}-src
+DISTNAME=	EZFM-0.4-src
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
@@ -17,12 +17,10 @@ MAINTAINER=	ports@FreeBSD.org
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		EZ.1:${PORTSDIR}/graphics/EZWGL
 
-WRKSRC=		${WRKDIR}/EZFM-0.4
+WRKSRC=		${WRKDIR}/EZFM-${PORTVERSION}
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 
-BROKEN=		"Distfile changed: patches no longer apply"
-
 MAN1=		ezfm.1
 
 do-install:
diff --git a/x11-fm/ezfm/distinfo b/x11-fm/ezfm/distinfo
index df6b55a23708..4d1bbd39af46 100644
--- a/x11-fm/ezfm/distinfo
+++ b/x11-fm/ezfm/distinfo
@@ -1 +1 @@
-MD5 (EZFM-0.4-src.tgz) = 7fdc11cb042a3eb2bcc9992099a174e3
+MD5 (EZFM-0.4-src.tgz) = e23109065f5b2e1caf35af2b2b15375c
diff --git a/x11-fm/ezfm/files/patch-aa b/x11-fm/ezfm/files/patch-aa
index 4d1e09f689d1..7f0f349483d8 100644
--- a/x11-fm/ezfm/files/patch-aa
+++ b/x11-fm/ezfm/files/patch-aa
@@ -1,67 +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 @@
--#-------------------------------------------------------------------------------
+--- Makefile.orig	Thu Jul 15 00:31:35 1999
++++ Makefile	Sat May 27 14:40:42 2000
+@@ -2,7 +2,10 @@
  #
--# Where to install ezfm files
-+# X11 base directory
-+#
-+X11BASE?=/usr/X11R6
-+
-+#
-+# Local packages directory
+ # Where to install ezfm files
  #
 -DEST_DIR=/usr/local
 +LOCALBASE?=/usr/local
-+
- #
-+# Installation prefix
-+#
-+PREFIX?=/usr/X11R6
-+
-+#-------------------------------------------------------------------------------
-+#
-+# Where to install ezfm files
- #
--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=$(DEST_DIR)/lib/ezfm/ezfmrc
-+EZFM_RC=$(PREFIX)/share/ezfm/ezfmrc
- 
- #
- # Where to install the icons
- #
--EZFM_ICONS=$(DEST_DIR)/lib/ezfm/ezfmIcons
-+EZFM_ICONS=$(PREFIX)/share/ezfm/ezfmIcons
++X11BASE?=/usr/X11R6
++PREFIX?=${LOCALBASE}
++DEST_DIR=${PREFIX}
  #
- # Where to install the binary
  #
--BIN=$(DEST_DIR)/bin
-+BIN=$(PREFIX)/bin
+ EZFM_MAGIC=$(DEST_DIR)/lib/ezfm/ezfmMagic
+@@ -25,12 +28,13 @@
  #
  #----------------------------------------------------------------------------------
  #
--CC= gcc  -O2 -DLINUX -I../include
-+CC?= cc
+-CC= gcc  -g -DLINUX -I../include
++CC?= gcc  -g -DLINUX -I../include
 +CFLAGS+= -I$(LOCALBASE)/include -I$(X11BASE)/include
  
  #
  #----------------------------------------------------------------------------------
--LIBS = libfile.a -L../EZWGL/lib -lEZ -L/usr/X11R6/lib -lX11 -lXext  -lm  -lc
+-LIBS = libfile.a -L../EZWGL/lib -lEZ -L/usr/X11R6/lib -lX11 -lXext  -ljpeg -ltiff -lpng -lz -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
++LIBS = libfile.a -L../EZWGL/lib -lEZ -L${LOCALBASE}/lib -L${X11BASE}/lib -lX11 -lXext  -ljpeg -ltiff -lpng -lz -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 \
       signal.c info.c infoBtn.c printer.c misc.c mbtnFile.c mbtnView.c mbtnHelp.c popup.c\
-@@ -45,10 +58,10 @@
+@@ -45,10 +49,10 @@
  all: ezfm  ezfmMagic
  
  ezfm: libfile.a $(OBJECTS)
@@ -74,7 +42,7 @@
  
  
  install: ezfm ezfmMagic ezfmExtension ezfmrc ezfmIcons
-@@ -62,7 +75,7 @@
+@@ -62,7 +66,7 @@
  	cp ezfm $(BIN)
  
  libfile.a:
@@ -83,7 +51,7 @@
  	- ranlib libfile.a
  
  ezfmMagic:
-@@ -79,13 +92,13 @@
+@@ -79,13 +83,13 @@
  	$(RM)  $(OBJECTS) ezfm
   
  .c.o:
diff --git a/x11-fm/ezfm/pkg-plist b/x11-fm/ezfm/pkg-plist
index 9d82e2d56ab8..6ef35a9b87f0 100644
--- a/x11-fm/ezfm/pkg-plist
+++ b/x11-fm/ezfm/pkg-plist
@@ -4,15 +4,25 @@ 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/BGNpaperGray.gif
 share/ezfm/ezfmIcons/BGNpaperGrnWhite.gif
 share/ezfm/ezfmIcons/BGNpaperOrange.gif
 share/ezfm/ezfmIcons/BGNpaperPeach.gif
@@ -20,12 +30,14 @@ share/ezfm/ezfmIcons/BGNpaperTan.gif
 share/ezfm/ezfmIcons/BGNpaperWhite.gif
 share/ezfm/ezfmIcons/BGNpaperWind.gif
 share/ezfm/ezfmIcons/BGNpaperYellow.gif
+share/ezfm/ezfmIcons/BGNreptiles.gif
 share/ezfm/ezfmIcons/BGNrockYellow.gif
 share/ezfm/ezfmIcons/BGNsquare.xpm
 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
@@ -207,6 +219,7 @@ share/ezfm/ezfmIcons/mpg.xpm
 share/ezfm/ezfmIcons/music.xpm
 share/ezfm/ezfmIcons/nawk.xpm
 share/ezfm/ezfmIcons/netmath.xpm
+share/ezfm/ezfmIcons/netscape.xpm
 share/ezfm/ezfmIcons/network-dir.xpm
 share/ezfm/ezfmIcons/network.xpm
 share/ezfm/ezfmIcons/network_disk.xpm
@@ -299,11 +312,13 @@ share/ezfm/ezfmIcons/wri_only.xpm
 share/ezfm/ezfmIcons/xanim.xpm
 share/ezfm/ezfmIcons/xbm.xpm
 share/ezfm/ezfmIcons/xcalc.xpm
+share/ezfm/ezfmIcons/xcmail.xpm
 share/ezfm/ezfmIcons/xdvi.xpm
 share/ezfm/ezfmIcons/xedit.xpm
 share/ezfm/ezfmIcons/xfig.xpm
 share/ezfm/ezfmIcons/xgopher.xpm
 share/ezfm/ezfmIcons/xman.xpm
+share/ezfm/ezfmIcons/xmftp.xpm
 share/ezfm/ezfmIcons/xplot.xpm
 share/ezfm/ezfmIcons/xpm.xpm
 share/ezfm/ezfmIcons/xterm.xpm