Update to 4.5.48

Approved by:	reg (maintainer)

5 files changed, 27 insertions, 89 deletions

diff --git a/x11-fm/gnomemc/Makefile b/x11-fm/gnomemc/Makefile
index 19ef3044c59f..26b15a3cd249 100644
--- a/x11-fm/gnomemc/Makefile
+++ b/x11-fm/gnomemc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomemc
-PORTVERSION= 	4.5.44
+PORTVERSION= 	4.5.48
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/mc
diff --git a/x11-fm/gnomemc/distinfo b/x11-fm/gnomemc/distinfo
index fa9818e2ca1b..d2b3039b8ba4 100644
--- a/x11-fm/gnomemc/distinfo
+++ b/x11-fm/gnomemc/distinfo
@@ -1 +1 @@
-MD5 (mc-4.5.44.tar.gz) = 517990335f11890697e156dbf2c83717
+MD5 (mc-4.5.48.tar.gz) = 0ed6f7cda24307c13afb0c1d1a9fb7a0
diff --git a/x11-fm/gnomemc/files/patch-af b/x11-fm/gnomemc/files/patch-af
index 0bcfb1640fb5..8b71a2fc6a96 100644
--- a/x11-fm/gnomemc/files/patch-af
+++ b/x11-fm/gnomemc/files/patch-af
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Thu Sep 23 12:01:07 1999
-+++ Makefile.in	Fri Sep 24 16:54:43 1999
+--- Makefile.in.orig	Wed May 10 17:58:00 2000
++++ Makefile.in	Tue May 16 13:25:57 2000
 @@ -5,8 +5,8 @@
  @MCFGR@@MCF@
  
@@ -34,12 +34,12 @@
  
  uninstall:
  	@for I in $(unixdirs); do cd $$I; $(MAKE) $@ || exit 1; cd ..; done
---- lib/Makefile.in.orig	Sat Mar 18 07:43:44 2000
-+++ lib/Makefile.in	Mon Mar 20 10:25:38 2000
+--- lib/Makefile.in.orig	Wed May 10 17:58:01 2000
++++ lib/Makefile.in	Tue May 16 13:27:02 2000
 @@ -15,16 +15,11 @@
  LIBFILES_IN = mc.ext.in mc-gnome.ext.in
  LIBFILES_OUT = mc.ext mc-gnome.ext mc.csh mc.sh
- LIBFILES_CONST = mc.hint mc.hint.es mc.hint.cs mc.hint.ru mc.lib mc.menu
+ LIBFILES_CONST = mc.hint mc.hint.es mc.hint.cs mc.hint.ru mc.lib mc.menu cedit.menu edit.indent.rc
 -SUPPBIN_IN = mc.csh.in mc.sh.in
 -SUPPBIN_OUT =  mc.csh mc.sh
  DESKTOP_FILES = startup.links README.desktop
diff --git a/x11-fm/gnomemc/files/patch-ag b/x11-fm/gnomemc/files/patch-ag
index 1ac4e786f4de..36ea8fbad6c7 100644
--- a/x11-fm/gnomemc/files/patch-ag
+++ b/x11-fm/gnomemc/files/patch-ag
@@ -1,92 +1,28 @@
---- lib/mc.ext.in.orig	Thu Jan 28 14:19:18 1999
-+++ lib/mc.ext.in	Thu Jan 28 14:21:05 1999
-@@ -367,57 +367,58 @@
- 	Icon=core.xpm
- 
- type/PostScript
--	Open=gv %f
-+	Open=ggv %f
- 	Icon=postscript.xpm
-+	View=ggv %f
- 	View with GhostView=gv %f
- 
- type/GIF\ image
--	Open=ee %f
-+	Open=ElectricEyes %f
- 	Icon=gif.xpm
- 	Include=image-options
- 	
- type/GIF\ picture
--	Open=ee %f
-+	Open=ElectricEyes %f
- 	Icon=gif.xpm
- 	Include=image-options
- 	
- type/JPEG\ picture
--	Open=ee %f
-+	Open=ElectricEyes %f
- 	Icon=jpeg.xpm
- 	Include=image-options
- 
- type/PC\ bitmap
--	Open=ee %f
-+	Open=ElectricEyes %f
- 	Icon=bitmap.xpm
- 	Include=image-options
- 
- type/PNG\ image
--	Open=ee %f
-+	Open=ElectricEyes %f
- 	Icon=gif.xpm
- 	Include=image-options
- 
- type/JPEG\ image
--	Open=ee %f
-+	Open=ElectricEyes %f
- 	Icon=jpeg.xpm
- 	Include=image-options
- 	
- type/TIFF\ file
--	Open=ee %f
-+	Open=ElectricEyes %f
- 	Icon=tiff.xpm
- 	Include=image-options
- 	
- type/PBM
--	Open=ee %f
-+	Open=ElectricEyes %f
- 	Icon=pbm.xpm
- 	Include=image-options
- 	
- type/PGM
--	Open=ee %f
-+	Open=ElectricEyes %f
- 	Icon=pgm.xpm
- 	Include=image-options
- 	
- type/PPM
--	Open=ee %f
-+	Open=ElectricEyes %f
- 	Icon=ppm.xpm
- 	Include=image-options
- 
-@@ -426,14 +427,14 @@
- 	Icon=xbm.xpm
- 
- shell/.xpm
--	Open=ee %f
-+	Open=ElectricEyes %f
- 	View=sxpm %f
- 	Include=image-options
+--- lib/mc.ext.in.orig	Wed May 10 17:58:01 2000
++++ lib/mc.ext.in	Tue May 16 13:31:33 2000
+@@ -318,11 +318,11 @@
  	Icon=xpm.xpm
  
  include/image-options
+-	Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (ee %f &); fi
++	Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (ElectricEyes %f &); fi
+ 	View=%view{ascii} identify %f
+ 	#View=%view{ascii} asciiview %f
  	Set root window to this image=background-properties --setwallpaper %f &
 -	Display this file=ee %f &
 +	Display this file=ElectricEyes %f &
  
- # Sound files
- shell/.mod
+ 
+ ### Sound files ###
+@@ -368,7 +368,7 @@
+ 
+ # Postscript
+ type/PostScript
+-	Open=gv %f&
++	Open=ggv %f&
+ 	Icon=postscript.xpm
+ 	View=%view{ascii} ps2ascii %f
+ 	View with GhostView=gv %f
 --- lib/mc-gnome.ext.in.orig	Thu Jan 28 14:21:23 1999
 +++ lib/mc-gnome.ext.in	Thu Jan 28 14:21:59 1999
 @@ -271,60 +271,60 @@
diff --git a/x11-fm/gnomemc/pkg-plist b/x11-fm/gnomemc/pkg-plist
index 991e6a110762..381b33d0799c 100644
--- a/x11-fm/gnomemc/pkg-plist
+++ b/x11-fm/gnomemc/pkg-plist
@@ -6,8 +6,10 @@ etc/mc.global
 share/gnome/idl/FileManager.idl
 share/gnome/idl/Makefile.in
 share/gnome/mc/FAQ
+share/gnome/mc/cedit.menu
 share/gnome/mc/desktop-scripts/README.desktop
 share/gnome/mc/desktop-scripts/startup.links
+share/gnome/mc/edit.indent.rc
 share/gnome/mc/extfs/README
 share/gnome/mc/extfs/a
 share/gnome/mc/extfs/deb