6 files changed, 83 insertions, 57 deletions

diff --git a/x11-fm/gnomemc/Makefile b/x11-fm/gnomemc/Makefile
index 2f678e1fb66b..1779dc588c43 100644
--- a/x11-fm/gnomemc/Makefile
+++ b/x11-fm/gnomemc/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	gnomemc
-# Version required:	4.5.23
-# Date created:		26 Jnuary 1999
+# Version required:	4.5.30
+# Date created:		26 January 1999
 # Whom:			Jeremy Lea <reg@shale.csir.co.za>
 #
-# $Id: Makefile,v 1.3 1999/03/09 01:09:06 nectar Exp $
+# $Id: Makefile,v 1.4 1999/04/08 18:08:38 steve Exp $
 #
 
-DISTNAME=	mc-4.5.23
-PKGNAME=	gnomemc-4.5.23
+DISTNAME=	mc-4.5.30
+PKGNAME=	gnomemc-4.5.30
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/mc
diff --git a/x11-fm/gnomemc/distinfo b/x11-fm/gnomemc/distinfo
index ec42a95ab3db..536cd9e395e1 100644
--- a/x11-fm/gnomemc/distinfo
+++ b/x11-fm/gnomemc/distinfo
@@ -1 +1 @@
-MD5 (mc-4.5.23.tar.gz) = 9953d8a88957e814a25e8ee364739318
+MD5 (mc-4.5.30.tar.gz) = 8b134ec792ec5a7916092b274847b99e
diff --git a/x11-fm/gnomemc/files/patch-ab b/x11-fm/gnomemc/files/patch-ab
index 27071b7451a4..dc9ff21bee71 100644
--- a/x11-fm/gnomemc/files/patch-ab
+++ b/x11-fm/gnomemc/files/patch-ab
@@ -1,6 +1,6 @@
---- vfs/Make-mc.in.orig	Tue Jan 19 00:44:08 1999
-+++ vfs/Make-mc.in	Wed Jan 27 00:28:32 1999
-@@ -179,21 +179,18 @@
+--- vfs/Make-mc.in.orig	Sat Apr 10 21:38:29 1999
++++ vfs/Make-mc.in	Thu May  6 08:42:43 1999
+@@ -184,21 +184,14 @@
  	-$(RMF) $(srcdir)/Makefile
  
  install: @mcserv@ install.extfs
@@ -12,16 +12,16 @@
  	for I in $(EXTFS_MISC); do \
 -	    $(INSTALL_DATA) $(srcdir)/extfs/$$I \
 +	    $(INSTALL_DATA) extfs/$$I \
- 	          $(DESTDIR)$(libdir)/extfs/$$I; \
+ 	          $(DESTDIR)$(extfsdir)/$$I; \
  	done
- 	for I in $(EXTFS_CONST) ; do \
+-	for I in $(EXTFS_CONST) ; do \
 -	    $(INSTALL_PROGRAM) $(srcdir)/extfs/$$I \
-+	    $(INSTALL_DATA) -m 555 extfs/$$I \
- 	             $(DESTDIR)$(libdir)/extfs/$$I; \
- 	done
- 	for I in $(EXTFS_OUT) ; do \
+-	             $(DESTDIR)$(extfsdir)/$$I; \
+-	done
+-	for I in $(EXTFS_OUT) ; do \
 -	    $(INSTALL_PROGRAM) $(builddir)/vfs/extfs/$$I \
-+	    $(INSTALL_DATA) -m 555 extfs/$$I \
- 	             $(DESTDIR)$(libdir)/extfs/$$I; \
++	for I in $(EXTFS_CONST) $(EXTFS_OUT) ; do \
++	    install -c -o root -g wheel -m 555 -m 755 extfs/$$I \
+ 	             $(DESTDIR)$(extfsdir)/$$I; \
  	done
  
diff --git a/x11-fm/gnomemc/files/patch-ac b/x11-fm/gnomemc/files/patch-ac
index f76939585b40..6729fd7d1802 100644
--- a/x11-fm/gnomemc/files/patch-ac
+++ b/x11-fm/gnomemc/files/patch-ac
@@ -1,24 +1,28 @@
---- Make.common.in.orig	Thu Feb 25 08:53:30 1999
-+++ Make.common.in	Thu Feb 25 18:29:33 1999
-@@ -19,17 +19,17 @@
+--- Make.common.in.orig	Thu May  6 09:19:55 1999
++++ Make.common.in	Thu May  6 09:22:12 1999
+@@ -19,14 +19,14 @@
  bindir     = @bindir@
  sysconfdir = @sysconfdir@
+ datadir    = @datadir@
+-libdir	   = @libdir@
++libdir	   = @localstatedir@
+ mandir     = @mandir@
+ gnomeicondir = @gnomeicondir@
+ xv_bindir  = @xv_bindir@
  corbadir   = $(sysconfdir)/CORBA/servers
--libdir     = $(exec_prefix)/lib/mc
+ mclibdir   = $(libdir)/mc
+ desktopdir = $(mclibdir)/desktop-scripts
 -idldir     = $(prefix)/share/idl
-+libdir     = @localstatedir@/mc
 +idldir     = @localstatedir@/idl
- suppbindir = $(libdir)/bin
--gnewdir	   = $(prefix)/share/mc/templates
-+gnewdir	   = $(libdir)/templates
- tidir      = $(libdir)/term
- extfsdir   = $(libdir)/extfs
+ suppbindir = $(mclibdir)/bin
+ gnewdir	   = $(prefix)/share/mc/templates
+ tidir      = $(mclibdir)/term
+@@ -34,7 +34,7 @@
  confdir    = $(prefix)/etc
- datadir    = @datadir@
  icondir    = $(datadir)/pixmaps/mc
- gnomeicondir = @gnomeicondir@
+ syntaxdir  = $(mclibdir)/syntax
 -localedir  = $(datadir)/locale
 +localedir  = $(prefix)/share/locale
- mandir     = @mandir@
  man1dir    = $(mandir)/man1
  manext     = 1
+ man8dir    = $(mandir)/man8
diff --git a/x11-fm/gnomemc/files/patch-af b/x11-fm/gnomemc/files/patch-af
index 0399494979c3..4391c083080d 100644
--- a/x11-fm/gnomemc/files/patch-af
+++ b/x11-fm/gnomemc/files/patch-af
@@ -1,54 +1,52 @@
---- Makefile.in.orig	Tue Feb 16 01:29:07 1999
-+++ Makefile.in	Fri Feb 19 01:45:58 1999
+--- Makefile.in.orig	Sat Apr 10 21:38:29 1999
++++ Makefile.in	Thu May  6 08:59:05 1999
 @@ -5,7 +5,7 @@
  @MCFGR@@MCF@
  
  foreigndirs=pc
--codedirs=vfs lib doc slang gtkedit edit src gnome new_icons icons idl
-+codedirs=vfs lib gtkedit gnome new_icons icons idl
+-codedirs=vfs lib doc slang gtkedit edit src gnome new_icons icons idl syntax
++codedirs=vfs lib gtkedit gnome new_icons icons idl syntax
  unixdirs=intl $(codedirs) @POSUB@
  alldirs=$(unixdirs) $(foreigndirs) 
  subdirs=$(alldirs)
 @@ -46,8 +46,6 @@
  install: installdirs
  	@for I in $(unixdirs); do cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1; cd ..; done
- 	$(INSTALL_DATA) $(srcdir)/FAQ $(DESTDIR)$(libdir)/FAQ
+ 	$(INSTALL_DATA) $(srcdir)/FAQ $(DESTDIR)$(mclibdir)/FAQ
 -	$(INSTALL_PROGRAM) mcfn_install $(DESTDIR)$(suppbindir)/mcfn_install
 -	chmod +x $(DESTDIR)$(suppbindir)/mcfn_install
  	@echo "Please verify that the configuration values are correctly"
- 	@echo "set in the mc.ext file in $(libdir)"
+ 	@echo "set in the mc.ext file in $(mclibdir)"
  
-@@ -58,12 +56,9 @@
+@@ -58,9 +56,8 @@
  installdirs:
- 	$(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(libdir)
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(mclibdir)
  	$(MKINSTALLDIRS) $(DESTDIR)$(mandir) $(DESTDIR)$(man8dir)
 -	$(MKINSTALLDIRS) $(DESTDIR)$(icondir) $(DESTDIR)$(suppbindir)
 -	$(MKINSTALLDIRS) $(DESTDIR)$(tidir) $(DESTDIR)$(extfsdir)
-+	$(MKINSTALLDIRS) $(DESTDIR)$(icondir)
-+	$(MKINSTALLDIRS) $(DESTDIR)$(extfsdir)
- 	$(MKINSTALLDIRS) $(DESTDIR)$(idldir)
--
--mcfninstall:
--	-/bin/sh ./mcfn_install
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(idldir) $(DESTDIR)$(syntaxdir)
++	$(MKINSTALLDIRS) $(DESTDIR)$(icondir) $(DESTDIR)$(extfsdir)
  
- uninstall:
- 	@for I in $(unixdirs); do cd $$I; $(MAKE) $@ || exit 1; cd ..; done
---- lib/Makefile.in.orig	Mon Mar  1 03:38:13 1999
-+++ lib/Makefile.in	Mon Mar  1 14:43:56 1999
-@@ -15,7 +15,6 @@
- LIBFILES_IN = mc.ext.in mc-gnome.ext.in
+ mcfninstall:
+ 	-/bin/sh ./mcfn_install
+
+
+--- lib/Makefile.in.orig	Sat Apr 10 21:38:30 1999
++++ lib/Makefile.in	Thu May  6 08:56:26 1999
+@@ -16,7 +16,6 @@
  LIBFILES_OUT = mc.ext mc-gnome.ext
  LIBFILES_CONST = mc.hint mc.lib mc.menu
+ DESKTOP_FILES = startup.links README.desktop
 -TIFILES = README.xterm linux.ti xterm.ad xterm.ti ansi.ti vt100.ti xterm.tcap
- DISTLIB = $(LIBFILES_IN) $(LIBFILES_CONST) $(TIFILES) \
- 	Makefile.in tdiff xnc.hlp ncurses.h mc.sh mc.csh mcserv.init \
- 	mcserv.pamd tkmc.wmconfig mc.ext.in.qnx.diff mc.global
-@@ -45,8 +44,6 @@
- 	do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(libdir)/$$I; done
+ 
+ DISTLIB = \
+ 	$(LIBFILES_IN) 		\
+@@ -57,8 +56,6 @@
+ 	do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(mclibdir)/$$I; done
  	for I in $(LIBFILES_OUT); \
- 	do $(INSTALL_DATA) $(builddir)/lib/$$I $(DESTDIR)$(libdir)/$$I; done
+ 	do $(INSTALL_DATA) $(builddir)/lib/$$I $(DESTDIR)$(mclibdir)/$$I; done
 -	for I in $(TIFILES); \
 -	do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(tidir)/$$I; done
  	$(MKINSTALLDIRS) $(DESTDIR)$(confdir)
  	$(INSTALL_DATA) $(srcdir)/mc.global $(DESTDIR)$(confdir)
- 
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(desktopdir)
diff --git a/x11-fm/gnomemc/pkg-plist b/x11-fm/gnomemc/pkg-plist
index 86bbf86b6a24..10fc1093a205 100644
--- a/x11-fm/gnomemc/pkg-plist
+++ b/x11-fm/gnomemc/pkg-plist
@@ -5,6 +5,8 @@ etc/mc.global
 share/gnome/idl/FileManager.idl
 share/gnome/idl/Makefile.in
 share/gnome/mc/FAQ
+share/gnome/mc/desktop-scripts/README.desktop
+share/gnome/mc/desktop-scripts/startup.links
 share/gnome/mc/extfs/README
 share/gnome/mc/extfs/a
 share/gnome/mc/extfs/deb
@@ -20,6 +22,7 @@ share/gnome/mc/extfs/sfs.ini
 share/gnome/mc/extfs/trpm
 share/gnome/mc/extfs/uar
 share/gnome/mc/extfs/ucpio
+share/gnome/mc/extfs/uha
 share/gnome/mc/extfs/ulha
 share/gnome/mc/extfs/urar
 share/gnome/mc/extfs/uzip
@@ -30,6 +33,22 @@ share/gnome/mc/mc.ext
 share/gnome/mc/mc.hint
 share/gnome/mc/mc.lib
 share/gnome/mc/mc.menu
+share/gnome/mc/syntax/c.syntax
+share/gnome/mc/syntax/changelog.syntax
+share/gnome/mc/syntax/diff.syntax
+share/gnome/mc/syntax/diffc.syntax
+share/gnome/mc/syntax/html.syntax
+share/gnome/mc/syntax/java.syntax
+share/gnome/mc/syntax/latex.syntax
+share/gnome/mc/syntax/lsm.syntax
+share/gnome/mc/syntax/makefile.syntax
+share/gnome/mc/syntax/ml.syntax
+share/gnome/mc/syntax/nroff.syntax
+share/gnome/mc/syntax/pascal.syntax
+share/gnome/mc/syntax/perl.syntax
+share/gnome/mc/syntax/python.syntax
+share/gnome/mc/syntax/sh.syntax
+share/gnome/mc/syntax/smalltalk.syntax
 share/gnome/mime-info/mc.keys
 share/gnome/pixmaps/mc/directory.xpm
 share/gnome/pixmaps/mc/gnome-application-encapsulated_postscript.png
@@ -80,6 +99,7 @@ share/gnome/pixmaps/mc/i-directory.png
 share/gnome/pixmaps/mc/i-executable.png
 share/gnome/pixmaps/mc/i-fifo.png
 share/gnome/pixmaps/mc/i-floppy.png
+share/gnome/pixmaps/mc/i-nfs.png
 share/gnome/pixmaps/mc/i-printer.png
 share/gnome/pixmaps/mc/i-regular.png
 share/gnome/pixmaps/mc/i-sock.png
@@ -92,11 +112,15 @@ share/locale/cs/LC_MESSAGES/mc.mo
 share/locale/da/LC_MESSAGES/mc.mo
 share/locale/de/LC_MESSAGES/mc.mo
 share/locale/es/LC_MESSAGES/mc.mo
+share/locale/es_ES/LC_MESSAGES/mc.mo
 share/locale/fr/LC_MESSAGES/mc.mo
 share/locale/it/LC_MESSAGES/mc.mo
 share/locale/ko/LC_MESSAGES/mc.mo
 share/locale/no/LC_MESSAGES/mc.mo
 share/locale/pl/LC_MESSAGES/mc.mo
+share/locale/ro/LC_MESSAGES/mc.mo
 share/locale/ru/LC_MESSAGES/mc.mo
 @dirrm share/gnome/pixmaps/mc
+@dirrm share/gnome/mc/desktop-scripts
 @dirrm share/gnome/mc/extfs
+@dirrm share/gnome/mc/syntax