Update "gmc" package to version 4.5.29.

5 files changed, 50 insertions, 29 deletions

diff --git a/sysutils/gmc/Makefile b/sysutils/gmc/Makefile
index 74bb296830f..eb2719da78b 100644
--- a/sysutils/gmc/Makefile
+++ b/sysutils/gmc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 1999/03/22 22:43:42 agc Exp $
+# $NetBSD: Makefile,v 1.4 1999/04/04 23:16:54 tron Exp $
 
-DISTNAME=	mc-4.5.25
-PKGNAME=	gmc-4.5.25
+DISTNAME=	mc-4.5.29
+PKGNAME=	gmc-4.5.29
 CATEGORIES=	systuils gnome
 MASTER_SITES=	ftp://ftp.gnome.org/pub/GNOME/gnome-1.0/sources/ \
 		ftp://ftp.jimpick.com/pub/mirrors/gnome/gnome-1.0/sources/ \
@@ -11,7 +11,7 @@ MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.gnome.org/mc/
 
 DEPENDS+=	libslang-1.2.2:../../devel/libslang
-DEPENDS+=	gnome-core-1.0.3:../../x11/gnome-core
+DEPENDS+=	gnome-core-1.0.4:../../x11/gnome-core
 
 CONFLICTS+=	mc-*
 
diff --git a/sysutils/gmc/files/md5 b/sysutils/gmc/files/md5
index d7ac6e625f7..3c87142183d 100644
--- a/sysutils/gmc/files/md5
+++ b/sysutils/gmc/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/03/15 00:10:30 tron Exp $
+$NetBSD: md5,v 1.2 1999/04/04 23:16:54 tron Exp $
 
-MD5 (mc-4.5.25.tar.gz) = b3462d5e33a3fb5e21ac64769dfc172b
+MD5 (mc-4.5.29.tar.gz) = 0400e3ae0879c944c6c145af24ac59ae
diff --git a/sysutils/gmc/patches/patch-ab b/sysutils/gmc/patches/patch-ab
index 5d3f42e422f..4297c2bcf82 100644
--- a/sysutils/gmc/patches/patch-ab
+++ b/sysutils/gmc/patches/patch-ab
@@ -1,18 +1,18 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/03/15 00:10:30 tron Exp $
+$NetBSD: patch-ab,v 1.2 1999/04/04 23:16:54 tron Exp $
 
---- vfs/Make-mc.in.orig	Sat Mar 13 03:02:30 1999
-+++ vfs/Make-mc.in	Sun Mar 14 23:25:48 1999
-@@ -192,11 +192,11 @@
- 	          $(DESTDIR)$(libdir)/extfs/$$I; \
+--- vfs/Make-mc.in.orig	Tue Mar 30 08:34:34 1999
++++ vfs/Make-mc.in	Mon Apr  5 00:41:09 1999
+@@ -194,11 +194,11 @@
+ 	          $(DESTDIR)$(extfsdir)/$$I; \
  	done
  	for I in $(EXTFS_CONST) ; do \
 -	    $(INSTALL_PROGRAM) $(srcdir)/extfs/$$I \
 +	    $(INSTALL_SCRIPT) $(srcdir)/extfs/$$I \
- 	             $(DESTDIR)$(libdir)/extfs/$$I; \
+ 	             $(DESTDIR)$(extfsdir)/$$I; \
  	done
  	for I in $(EXTFS_OUT) ; do \
 -	    $(INSTALL_PROGRAM) $(builddir)/vfs/extfs/$$I \
 +	    $(INSTALL_SCRIPT) $(builddir)/vfs/extfs/$$I \
- 	             $(DESTDIR)$(libdir)/extfs/$$I; \
+ 	             $(DESTDIR)$(extfsdir)/$$I; \
  	done
  
diff --git a/sysutils/gmc/patches/patch-ad b/sysutils/gmc/patches/patch-ad
index e5f288faca0..71679572762 100644
--- a/sysutils/gmc/patches/patch-ad
+++ b/sysutils/gmc/patches/patch-ad
@@ -1,24 +1,24 @@
-$NetBSD: patch-ad,v 1.1.1.1 1999/03/15 00:10:30 tron Exp $
+$NetBSD: patch-ad,v 1.2 1999/04/04 23:16:54 tron Exp $
 
---- Makefile.in.orig	Mon Mar 15 00:27:39 1999
-+++ Makefile.in	Mon Mar 15 00:27:48 1999
+--- Makefile.in.orig	Tue Mar 30 08:34:33 1999
++++ Makefile.in	Mon Apr  5 00:47:35 1999
 @@ -46,7 +46,7 @@
  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
-+	$(INSTALL_DATA) mcfn_install $(DESTDIR)$(suppbindir)/mcfn_install
++	$(INSTALL_SCRIPT) 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,9 +58,8 @@
  installdirs:
- 	$(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(libdir)
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(mclibdir)
  	$(MKINSTALLDIRS) $(DESTDIR)$(mandir) $(DESTDIR)$(man8dir)
 -	$(MKINSTALLDIRS) $(DESTDIR)$(icondir) $(DESTDIR)$(suppbindir)
-+	$(MKINSTALLDIRS) $(DESTDIR)$(suppbindir)
++	$(MKINSTALLDIRS) $(DESTDIR)$(suppbindir) $(DESTDIR)$(syntaxdir)
  	$(MKINSTALLDIRS) $(DESTDIR)$(tidir) $(DESTDIR)$(extfsdir)
--	$(MKINSTALLDIRS) $(DESTDIR)$(idldir)
+-	$(MKINSTALLDIRS) $(DESTDIR)$(idldir) $(DESTDIR)$(syntaxdir)
  
  mcfninstall:
  	-/bin/sh ./mcfn_install
diff --git a/sysutils/gmc/pkg/PLIST b/sysutils/gmc/pkg/PLIST
index bcc2ff3fb82..70f1281ef2e 100644
--- a/sysutils/gmc/pkg/PLIST
+++ b/sysutils/gmc/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/03/15 00:10:30 tron Exp $
+@comment $NetBSD: PLIST,v 1.2 1999/04/04 23:16:54 tron Exp $
 bin/gmc
 bin/mc
 bin/mcmfmt
@@ -28,13 +28,8 @@ lib/mc/extfs/uzoo
 lib/mc/extfs/uar
 lib/mc/extfs/ulha
 lib/mc/extfs/uzip
+lib/mc/extfs/uha
 lib/mc/layout
-lib/mc/mc-gnome.ext
-lib/mc/mc.ext
-lib/mc/mc.hint
-lib/mc/mc.hlp
-lib/mc/mc.lib
-lib/mc/mc.menu
 lib/mc/term/README.xterm
 lib/mc/term/ansi.ti
 lib/mc/term/linux.ti
@@ -42,6 +37,30 @@ lib/mc/term/vt100.ti
 lib/mc/term/xterm.ad
 lib/mc/term/xterm.tcap
 lib/mc/term/xterm.ti
+lib/mc/syntax/c.syntax
+lib/mc/syntax/changelog.syntax
+lib/mc/syntax/diff.syntax
+lib/mc/syntax/diffc.syntax
+lib/mc/syntax/html.syntax
+lib/mc/syntax/java.syntax
+lib/mc/syntax/latex.syntax
+lib/mc/syntax/lsm.syntax
+lib/mc/syntax/makefile.syntax
+lib/mc/syntax/ml.syntax
+lib/mc/syntax/nroff.syntax
+lib/mc/syntax/pascal.syntax
+lib/mc/syntax/perl.syntax
+lib/mc/syntax/python.syntax
+lib/mc/syntax/sh.syntax
+lib/mc/syntax/smalltalk.syntax
+lib/mc/desktop-scripts/startup.links
+lib/mc/desktop-scripts/README.desktop
+lib/mc/mc-gnome.ext
+lib/mc/mc.ext
+lib/mc/mc.hint
+lib/mc/mc.hlp
+lib/mc/mc.lib
+lib/mc/mc.menu
 man/man1/mc.1
 man/man1/mcedit.1
 man/man8/mcserv.8
@@ -119,6 +138,8 @@ share/pixmaps/mc/makefile.xpm
 share/pixmaps/mc/trash.xpm
 @dirrm share/pixmaps/mc
 @dirrm lib/mc/bin
+@dirrm lib/mc/desktop-scripts
 @dirrm lib/mc/extfs
+@dirrm lib/mc/syntax
 @dirrm lib/mc/term
 @dirrm lib/mc