5 files changed, 35 insertions, 32 deletions

diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index 81a38c05303b..4d7e2717ba17 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -1,21 +1,21 @@
 # New ports collection makefile for:	mc
-# Version required:	4.5.10
+# Version required:	4.5.23
 # Date created:		15 Jul 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.27 1999/01/31 18:12:49 vanilla Exp $
+# $Id: Makefile,v 1.28 1999/02/22 04:27:44 steve Exp $
 #
 
-DISTNAME=	mc-4.5.10
+DISTNAME=	mc-4.5.23
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	mc
+MASTER_SITE_SUBDIR=	gnome-1.0/sources
 
 MAINTAINER=	reg@shale.csir.co.za
 
 BUILD_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
 RUN_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
-LIB_DEPENDS=	glib11d.2:${PORTSDIR}/devel/glib11-devel
+LIB_DEPENDS=	glib12.1:${PORTSDIR}/devel/glib12
 
 .if defined(USE_NCURSES_PORT)
 LIB_DEPENDS+=	ncurses.4:${PORTSDIR}/devel/ncurses
@@ -26,7 +26,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ncurses --without-gnome --without-edit
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		MAKE="gmake" \
-		GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \
+		GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" \
 		LIBS="-L${LOCALBASE}/lib"
 
 MAN1=		midc.1
diff --git a/misc/mc/distinfo b/misc/mc/distinfo
index 94bf014f4230..ec42a95ab3db 100644
--- a/misc/mc/distinfo
+++ b/misc/mc/distinfo
@@ -1 +1 @@
-MD5 (mc-4.5.10.tar.gz) = 13d941d11913d18b05a71df45d5d86ed
+MD5 (mc-4.5.23.tar.gz) = 9953d8a88957e814a25e8ee364739318
diff --git a/misc/mc/files/patch-ac b/misc/mc/files/patch-ac
index 2dfc012812d9..c6abe289485e 100644
--- a/misc/mc/files/patch-ac
+++ b/misc/mc/files/patch-ac
@@ -1,5 +1,5 @@
---- Make.common.in.orig	Tue Jan 19 00:44:07 1999
-+++ Make.common.in	Tue Jan 26 18:50:46 1999
+--- Make.common.in.orig	Sat Feb 27 02:25:11 1999
++++ Make.common.in	Sat Feb 27 21:01:05 1999
 @@ -17,9 +17,10 @@
  
  builddir   = @builddir@
@@ -12,12 +12,12 @@
  idldir     = $(prefix)/share/idl
  suppbindir = $(libdir)/bin
  gnewdir	   = $(prefix)/share/mc/templates
-@@ -56,7 +57,7 @@
+@@ -60,7 +61,7 @@
  # No way, to make make happy (except GNU), we cannot use := to append
  # something to these, so that's why there is a leading _
  XCFLAGS = @CFLAGS@
--XCPPFLAGS = @CPPFLAGS@ @MCCPPFLAGS@ -I.. -DBINDIR=\""$(bindir)/"\" -DLIBDIR=\""$(libdir)/"\" -DICONDIR=\""$(icondir)/"\" $(XINC) -DLOCALEDIR=\""$(localedir)/"\" 
-+XCPPFLAGS = @CPPFLAGS@ @MCCPPFLAGS@ -I.. -DSBINDIR=\""$(sbindir)/"\" -DBINDIR=\""$(bindir)/"\" -DLIBDIR=\""$(libdir)/"\" -DICONDIR=\""$(icondir)/"\" $(XINC) -DLOCALEDIR=\""$(localedir)/"\" 
+-XCPPFLAGS = @CPPFLAGS@ @MCCPPFLAGS@ -I.. -DBINDIR=\""$(bindir)/"\" -DLIBDIR=\""$(libdir)/"\" -DICONDIR=\""$(icondir)/"\" $(XINC) -DLOCALEDIR=\""$(localedir)/"\" -DCONFDIR=\""$(confdir)/"\"
++XCPPFLAGS = @CPPFLAGS@ @MCCPPFLAGS@ -I.. -DSBINDIR=\""$(sbindir)/"\" -DBINDIR=\""$(bindir)/"\" -DLIBDIR=\""$(libdir)/"\" -DICONDIR=\""$(icondir)/"\" $(XINC) -DLOCALEDIR=\""$(localedir)/"\" -DCONFDIR=\""$(confdir)/"\"
  XLDFLAGS = @LDFLAGS@
  XDEFS = @DEFS@
  XLIBS = @LIBS@
diff --git a/misc/mc/files/patch-af b/misc/mc/files/patch-af
index 504ba70ade86..f1deb1145228 100644
--- a/misc/mc/files/patch-af
+++ b/misc/mc/files/patch-af
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Tue Jan 19 00:44:07 1999
-+++ Makefile.in	Tue Jan 26 19:38:26 1999
+--- Makefile.in.orig	Sat Feb 27 02:25:11 1999
++++ Makefile.in	Sat Feb 27 21:02:30 1999
 @@ -5,7 +5,7 @@
  @MCFGR@@MCF@
  
@@ -10,7 +10,7 @@
  alldirs=$(unixdirs) $(foreigndirs) 
  subdirs=$(alldirs)
 @@ -46,7 +46,7 @@
- install: installdirs @vcs@
+ install: installdirs
  	@for I in $(unixdirs); do cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1; cd ..; done
  	$(INSTALL_DATA) $(srcdir)/FAQ $(DESTDIR)$(libdir)/FAQ
 -	$(INSTALL_PROGRAM) mcfn_install $(DESTDIR)$(suppbindir)/mcfn_install
@@ -20,12 +20,12 @@
  	@echo "set in the mc.ext file in $(libdir)"
 @@ -58,9 +58,8 @@
  installdirs:
- 	$(mcsrcdir)/xmkdir $(DESTDIR)$(bindir) $(DESTDIR)$(libdir)
- 	$(mcsrcdir)/xmkdir $(DESTDIR)$(mandir) $(DESTDIR)$(man8dir)
--	$(mcsrcdir)/xmkdir $(DESTDIR)$(icondir) $(DESTDIR)$(suppbindir)
-+	$(mcsrcdir)/xmkdir $(DESTDIR)$(suppbindir)
- 	$(mcsrcdir)/xmkdir $(DESTDIR)$(tidir) $(DESTDIR)$(extfsdir)
--	$(mcsrcdir)/xmkdir $(DESTDIR)$(idldir)
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(libdir)
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(mandir) $(DESTDIR)$(man8dir)
+-	$(MKINSTALLDIRS) $(DESTDIR)$(icondir) $(DESTDIR)$(suppbindir)
++	$(MKINSTALLDIRS) $(DESTDIR)$(suppbindir)
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(tidir) $(DESTDIR)$(extfsdir)
+-	$(MKINSTALLDIRS) $(DESTDIR)$(idldir)
  
  mcfninstall:
  	-/bin/sh ./mcfn_install
@@ -40,15 +40,15 @@
  	$(INSTALL_PROGRAM) mcmfmt $(DESTDIR)$(bindir)/$(binprefix)mcmfmt
  	$(SEDCMD2) < $(srcdir)/mc.hlp > $(DESTDIR)$(libdir)/$(libprefix)mc.hlp 
  
---- doc/Makefile.in.orig	Sun Dec  6 12:09:48 1998
-+++ doc/Makefile.in	Sun Dec  6 12:10:08 1998
-@@ -15,7 +15,7 @@
- all:
- 
+--- doc/Makefile.in.orig	Sat Feb 27 02:25:12 1999
++++ doc/Makefile.in	Sat Feb 27 21:03:37 1999
+@@ -17,7 +17,7 @@
  install:
--	-$(SEDCMD2) < mc.1 > $(DESTDIR)$(mandir)/$(manprefix)mc.$(manext)
-+	-$(SEDCMD2) < mc.1 > $(DESTDIR)$(mandir)/$(manprefix)midc.$(manext)
- 	-$(SEDCMD2) < mcedit.1 > $(DESTDIR)$(mandir)/$(manprefix)mcedit.$(manext)
+ 	$(MKINSTALLDIRS) $(DESTDIR)/$(man1dir)
+ 	$(MKINSTALLDIRS) $(DESTDIR)/$(man8dir)
+-	-$(SEDCMD2) < mc.1 > $(DESTDIR)$(man1dir)/$(manprefix)mc.$(manext)
++	-$(SEDCMD2) < mc.1 > $(DESTDIR)$(man1dir)/$(manprefix)midc.$(manext)
+ 	-$(SEDCMD2) < mcedit.1 > $(DESTDIR)$(man1dir)/$(manprefix)mcedit.$(manext)
  	-$(SEDCMD2) < mcserv.8 > $(DESTDIR)$(man8dir)/$(manprefix)mcserv.$(man8ext)
  
 --- lib/Makefile.in.orig	Wed Jan 27 01:10:33 1999
diff --git a/misc/mc/pkg-plist b/misc/mc/pkg-plist
index 3f04f22d6dd2..113905eb5735 100644
--- a/misc/mc/pkg-plist
+++ b/misc/mc/pkg-plist
@@ -1,6 +1,9 @@
-bin/midc
 bin/mcmfmt
+bin/midc
+etc/mc.global
 sbin/mcserv
+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/fr/LC_MESSAGES/mc.mo
@@ -42,7 +45,7 @@ share/mc/term/vt100.ti
 share/mc/term/xterm.ad
 share/mc/term/xterm.tcap
 share/mc/term/xterm.ti
-@dirrm share/mc/bin
-@dirrm share/mc/extfs
 @dirrm share/mc/term
+@dirrm share/mc/extfs
+@dirrm share/mc/bin
 @dirrm share/mc