PR: ports/14303

Submitted by:Ade Lovett<ade@lovett.com>
Update to 4.5.40

5 files changed, 46 insertions, 24 deletions

diff --git a/x11-fm/gnomemc/Makefile b/x11-fm/gnomemc/Makefile
index 416fe887b406..6cdab9456fcd 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.37
+# Version required:	4.5.40
 # Date created:		26 January 1999
 # Whom:			Jeremy Lea <reg@shale.csir.co.za>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	mc-4.5.37
-PKGNAME=	gnomemc-4.5.37
+DISTNAME=	mc-4.5.40
+PKGNAME=	gnomemc-4.5.40
 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 23a132225b0a..edc670ac2828 100644
--- a/x11-fm/gnomemc/distinfo
+++ b/x11-fm/gnomemc/distinfo
@@ -1 +1 @@
-MD5 (mc-4.5.37.tar.gz) = cb2b962d8e349ad579598a31f48a5276
+MD5 (mc-4.5.40.tar.gz) = 83498d806f0823bcfa067c0d715fc5b5
diff --git a/x11-fm/gnomemc/files/patch-ac b/x11-fm/gnomemc/files/patch-ac
index 4517cd4cdb74..1dc28fec72ad 100644
--- a/x11-fm/gnomemc/files/patch-ac
+++ b/x11-fm/gnomemc/files/patch-ac
@@ -1,6 +1,6 @@
---- Make.common.in.orig	Tue Mar 30 08:34:33 1999
-+++ Make.common.in	Wed Apr  7 23:18:45 1999
-@@ -24,9 +24,9 @@
+--- Make.common.in.orig	Thu Sep 23 12:01:07 1999
++++ Make.common.in	Fri Sep 24 17:16:22 1999
+@@ -24,17 +24,17 @@
  gnomeicondir = @gnomeicondir@
  xv_bindir  = @xv_bindir@
  corbadir   = $(sysconfdir)/CORBA/servers
@@ -10,10 +10,11 @@
 -idldir     = $(prefix)/share/idl
 +idldir     = $(datadir)/idl
  suppbindir = $(mclibdir)/bin
- gnewdir	   = $(prefix)/share/mc/templates
+-gnewdir	   = $(prefix)/share/mc/templates
++gnewdir	   = $(datadir)/mc/templates
  tidir      = $(mclibdir)/term
-@@ -34,7 +34,7 @@
- confdir    = $(prefix)/etc
+ extfsdir   = $(mclibdir)/extfs
+ confdir    = $(sysconfdir)
  icondir    = $(datadir)/pixmaps/mc
  syntaxdir  = $(mclibdir)/syntax
 -localedir  = $(datadir)/locale
diff --git a/x11-fm/gnomemc/files/patch-af b/x11-fm/gnomemc/files/patch-af
index b70065d20cbb..dfd65dfc7843 100644
--- a/x11-fm/gnomemc/files/patch-af
+++ b/x11-fm/gnomemc/files/patch-af
@@ -1,14 +1,16 @@
---- Makefile.in.orig	Wed Jul  7 01:43:31 1999
-+++ Makefile.in	Thu Jul 15 11:26:56 1999
-@@ -5,7 +5,7 @@
+--- Makefile.in.orig	Thu Sep 23 12:01:07 1999
++++ Makefile.in	Fri Sep 24 16:54:43 1999
+@@ -5,8 +5,8 @@
  @MCFGR@@MCF@
  
  foreigndirs=pc
--codedirs=vfs lib doc doc-gnome doc-gnome/C doc-gnome/C/figs slang gtkedit edit src gnome new_icons icons idl syntax
+-codedirs=vfs lib doc slang gtkedit edit src gnome new_icons icons idl syntax
+-unixdirs=intl $(codedirs) doc-gnome @POSUB@
 +codedirs=vfs lib gtkedit gnome new_icons icons idl syntax
- unixdirs=intl $(codedirs) @POSUB@
++unixdirs=intl $(codedirs) @POSUB@
  alldirs=$(unixdirs) $(foreigndirs) 
  subdirs=$(alldirs)
+ 
 @@ -45,8 +45,6 @@
  install: installdirs
  	@for I in $(unixdirs); do cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1; cd ..; done
@@ -18,14 +20,13 @@
  	@echo "Please verify that the configuration values are correctly"
  	@echo "set in the mc.ext file in $(mclibdir)"
  
-@@ -58,12 +56,9 @@
+@@ -57,12 +55,8 @@
  installdirs:
  	$(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)$(icondir) $(DESTDIR)$(extfsdir)
  	$(MKINSTALLDIRS) $(DESTDIR)$(idldir) $(DESTDIR)$(syntaxdir)
 -
 -mcfninstall:
@@ -33,25 +34,31 @@
  
  uninstall:
  	@for I in $(unixdirs); do cd $$I; $(MAKE) $@ || exit 1; cd ..; done
---- lib/Makefile.in.orig	Tue Mar 30 08:34:36 1999
-+++ lib/Makefile.in	Wed Apr  7 22:36:45 1999
-@@ -16,12 +16,10 @@
- LIBFILES_OUT = mc.ext mc-gnome.ext
- LIBFILES_CONST = mc.hint mc.lib mc.menu
+--- lib/Makefile.in.orig	Thu Sep 23 12:01:11 1999
++++ lib/Makefile.in	Fri Sep 24 16:46:36 1999
+@@ -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.lib mc.menu
+-SUPPBIN_IN = mc.csh.in mc.sh.in
+-SUPPBIN_OUT =  mc.csh mc.sh
  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) 	\
+-	$(SUPPBIN_IN)           \
 -	$(TIFILES) 		\
  	$(DESKTOP_FILES)	\
  	Makefile.in tdiff 	\
  	xnc.hlp ncurses.h 	\
-@@ -57,8 +55,6 @@
+@@ -61,10 +56,6 @@
  	do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(mclibdir)/$$I; done
  	for I in $(LIBFILES_OUT); \
  	do $(INSTALL_DATA) $(builddir)/lib/$$I $(DESTDIR)$(mclibdir)/$$I; done
+-	for I in $(SUPPBIN_OUT); \
+-	do $(INSTALL_PROGRAM) -m 755 $(builddir)/lib/$$I $(DESTDIR)$(suppbindir)//$$I; done
 -	for I in $(TIFILES); \
 -	do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(tidir)/$$I; done
  	$(MKINSTALLDIRS) $(DESTDIR)$(confdir)
diff --git a/x11-fm/gnomemc/pkg-plist b/x11-fm/gnomemc/pkg-plist
index 4165add5de71..bff5ebf2b35d 100644
--- a/x11-fm/gnomemc/pkg-plist
+++ b/x11-fm/gnomemc/pkg-plist
@@ -1,4 +1,5 @@
 bin/gmc
+bin/gmc-client
 bin/plain-gmc
 etc/CORBA/servers/gmc.gnorba
 etc/mc.global
@@ -31,10 +32,14 @@ share/gnome/mc/extfs/uzip
 share/gnome/mc/extfs/uzoo
 share/gnome/mc/layout
 share/gnome/mc/mc-gnome.ext
+share/gnome/mc/mc.csh
 share/gnome/mc/mc.ext
 share/gnome/mc/mc.hint
+share/gnome/mc/mc.hint.es
 share/gnome/mc/mc.lib
+share/gnome/mc/mc.sh
 share/gnome/mc/mc.menu
+share/gnome/mc/syntax/ada95.syntax
 share/gnome/mc/syntax/c.syntax
 share/gnome/mc/syntax/changelog.syntax
 share/gnome/mc/syntax/diff.syntax
@@ -43,6 +48,7 @@ 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/mail.syntax
 share/gnome/mc/syntax/makefile.syntax
 share/gnome/mc/syntax/ml.syntax
 share/gnome/mc/syntax/nroff.syntax
@@ -51,9 +57,13 @@ 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/mc/syntax/swig.syntax
+share/gnome/mc/syntax/texinfo.syntax
+share/gnome/mc/syntax/unknown.syntax
 share/gnome/mime-info/mc.keys
 share/gnome/pixmaps/mc/directory.xpm
 share/gnome/pixmaps/mc/gnome-application-encapsulated_postscript.png
+share/gnome/pixmaps/mc/gnome-application-pdf.png
 share/gnome/pixmaps/mc/gnome-application-postscript.png
 share/gnome/pixmaps/mc/gnome-application-x-c-header.png
 share/gnome/pixmaps/mc/gnome-application-x-c-source.png
@@ -126,6 +136,7 @@ share/locale/ca/LC_MESSAGES/mc.mo
 share/locale/cs/LC_MESSAGES/mc.mo
 share/locale/da/LC_MESSAGES/mc.mo
 share/locale/de/LC_MESSAGES/mc.mo
+share/locale/el/LC_MESSAGES/mc.mo
 share/locale/es/LC_MESSAGES/mc.mo
 share/locale/es_ES/LC_MESSAGES/mc.mo
 share/locale/fi/LC_MESSAGES/mc.mo
@@ -134,10 +145,13 @@ share/locale/hu/LC_MESSAGES/mc.mo
 share/locale/it/LC_MESSAGES/mc.mo
 share/locale/ja/LC_MESSAGES/mc.mo
 share/locale/ko/LC_MESSAGES/mc.mo
+share/locale/nl/LC_MESSAGES/mc.mo
 share/locale/no/LC_MESSAGES/mc.mo
 share/locale/pl/LC_MESSAGES/mc.mo
+share/locale/pt_BR/LC_MESSAGES/mc.mo
 share/locale/ro/LC_MESSAGES/mc.mo
 share/locale/ru/LC_MESSAGES/mc.mo
+share/locale/sv/LC_MESSAGES/mc.mo
 share/locale/wa/LC_MESSAGES/mc.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/mc.mo
 @dirrm share/gnome/pixmaps/mc