Upgrade to mc-3.0

7 files changed, 194 insertions, 27 deletions

diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index 238cfbd1cf1f..e44f69f3212a 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -1,18 +1,21 @@
 # New ports collection makefile for:	mc
-# Version required:	2.1
+# Version required:	3.0
 # Date created:		15 Jul 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1995/07/15 23:43:34 torstenb Exp $
 #
 
-DISTNAME=	mc-2.1
+DISTNAME=	mc-3.0
 CATEGORIES=	utilities
 MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
 
 GNU_CONFIGURE=	YES
+CONFIGURE_ARGS=	--prefix=${PREFIX} --with-ncurses
+
+STRIP=
 
 post-install:
-	@gzip -9nf ${PREFIX}/man/man1/mc.1
+	@gzip -9nf ${PREFIX}/man/man1/mc.1 ${PREFIX}/man/man8/mc.8
 
 .include <bsd.port.mk>
diff --git a/misc/mc/distinfo b/misc/mc/distinfo
index 6b06b9bc9937..fbe6e5edcb78 100644
--- a/misc/mc/distinfo
+++ b/misc/mc/distinfo
@@ -1 +1 @@
-MD5 (mc-2.1.tar.gz) = 82ad07033bf6eca1386929091e6d7678
+MD5 (mc-3.0.tar.gz) = 6b9b8fc224239bbc4737e470594151de
diff --git a/misc/mc/files/patch-aa b/misc/mc/files/patch-aa
index 1458192330f2..9afe23f85603 100644
--- a/misc/mc/files/patch-aa
+++ b/misc/mc/files/patch-aa
@@ -1,19 +1,121 @@
-*** Makefile.in.orig	Sat Jul 15 13:13:47 1995
---- Makefile.in	Sat Jul 15 13:13:52 1995
+*** configure.orig	Mon Sep 18 21:27:59 1995
+--- configure	Mon Sep 18 21:29:01 1995
 ***************
-*** 10,16 ****
-  INSTALL_DATA = @INSTALL_DATA@
-  
-  DEFS = @DEFS@
-! LIBS = @LIBS@ $(XLIB)
-  
-  CFLAGS = @CFLAGS@
-  CPPFLAGS = @CPPFLAGS@ -DBINDIR=\""$(bindir)/"\" -DLIBDIR=\""$(libdir)/"\" -DVERSION=\""$(VERSION)"\" $(XINC)
---- 10,16 ----
-  INSTALL_DATA = @INSTALL_DATA@
-  
-  DEFS = @DEFS@
-! LIBS = @LIBS@ $(XLIB) -lmytinfo
-  
-  CFLAGS = @CFLAGS@
-  CPPFLAGS = @CPPFLAGS@ -DBINDIR=\""$(bindir)/"\" -DLIBDIR=\""$(libdir)/"\" -DVERSION=\""$(VERSION)"\" $(XINC)
+*** 4828,4834 ****
+  	then
+  		search_ncurses=true
+  	else
+! 		LIBS="$LIBS -L$withval/lib -lncurses"
+  		CPPFLAGS="$CPPFLAGS -I$withval/include"
+  		search_ncurses=false
+  		screen_manager="ncurses"
+--- 4828,4834 ----
+  	then
+  		search_ncurses=true
+  	else
+! 		LIBS="$LIBS -L$withval/lib -lncurses -lmytinfo"
+  		CPPFLAGS="$CPPFLAGS -I$withval/include"
+  		search_ncurses=false
+  		screen_manager="ncurses"
+***************
+*** 5661,5667 ****
+          if test -f /usr/include/ncurses.h
+  	then
+  	    echo "$ac_t""Found ncurses on /usr/include/ncurses.h" 1>&6
+!  	    LIBS="$LIBS -lncurses"
+  	    CPPFLAGS="$CPPFLAGS "
+  	    search_ncurses=false
+  	    screen_manager="ncurses on /usr/include"
+--- 5661,5667 ----
+          if test -f /usr/include/ncurses.h
+  	then
+  	    echo "$ac_t""Found ncurses on /usr/include/ncurses.h" 1>&6
+!  	    LIBS="$LIBS -lncurses -lmytinfo"
+  	    CPPFLAGS="$CPPFLAGS "
+  	    search_ncurses=false
+  	    screen_manager="ncurses on /usr/include"
+***************
+*** 5678,5684 ****
+          if test -f /usr/include/ncurses/ncurses.h
+  	then
+  	    echo "$ac_t""Found ncurses on /usr/include/ncurses/ncurses.h" 1>&6
+!  	    LIBS="$LIBS -lncurses"
+  	    CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
+  	    search_ncurses=false
+  	    screen_manager="ncurses on /usr/include/ncurses"
+--- 5678,5684 ----
+          if test -f /usr/include/ncurses/ncurses.h
+  	then
+  	    echo "$ac_t""Found ncurses on /usr/include/ncurses/ncurses.h" 1>&6
+!  	    LIBS="$LIBS -lncurses -lmytinfo"
+  	    CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
+  	    search_ncurses=false
+  	    screen_manager="ncurses on /usr/include/ncurses"
+***************
+*** 5695,5701 ****
+          if test -f /usr/local/include/ncurses.h
+  	then
+  	    echo "$ac_t""Found ncurses on /usr/local/include/ncurses.h" 1>&6
+!  	    LIBS="$LIBS -lncurses -L/usr/local/lib"
+  	    CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+  	    search_ncurses=false
+  	    screen_manager="ncurses on /usr/local"
+--- 5695,5701 ----
+          if test -f /usr/local/include/ncurses.h
+  	then
+  	    echo "$ac_t""Found ncurses on /usr/local/include/ncurses.h" 1>&6
+!  	    LIBS="$LIBS -lncurses -lmytinfo -L/usr/local/lib"
+  	    CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+  	    search_ncurses=false
+  	    screen_manager="ncurses on /usr/local"
+***************
+*** 5712,5718 ****
+          if test -f /usr/local/include/ncurses/ncurses.h
+  	then
+  	    echo "$ac_t""Found ncurses on /usr/local/include/ncurses/ncurses.h" 1>&6
+!  	    LIBS="$LIBS -lncurses -L/usr/local/lib -L/usr/local/lib/ncurses"
+  	    CPPFLAGS="$CPPFLAGS -I/usr/local/include/ncurses"
+  	    search_ncurses=false
+  	    screen_manager="ncurses on /usr/local/include/ncurses"
+--- 5712,5718 ----
+          if test -f /usr/local/include/ncurses/ncurses.h
+  	then
+  	    echo "$ac_t""Found ncurses on /usr/local/include/ncurses/ncurses.h" 1>&6
+!  	    LIBS="$LIBS -lncurses -lmytinfo -L/usr/local/lib -L/usr/local/lib/ncurses"
+  	    CPPFLAGS="$CPPFLAGS -I/usr/local/include/ncurses"
+  	    search_ncurses=false
+  	    screen_manager="ncurses on /usr/local/include/ncurses"
+***************
+*** 5730,5736 ****
+          if test -f /usr/local/include/ncurses/curses.h
+  	then
+  	    echo "$ac_t""Found ncurses on /usr/local/include/ncurses/curses.h" 1>&6
+!  	    LIBS="$LIBS -lncurses -L/usr/local/lib"
+  	    CPPFLAGS="$CPPFLAGS -I/usr/local/include/ncurses -DRENAMED_NCURSES"
+  	    search_ncurses=false
+  	    screen_manager="renamed ncurses on /usr/local/.../ncurses"
+--- 5730,5736 ----
+          if test -f /usr/local/include/ncurses/curses.h
+  	then
+  	    echo "$ac_t""Found ncurses on /usr/local/include/ncurses/curses.h" 1>&6
+!  	    LIBS="$LIBS -lncurses -lmytinfo -L/usr/local/lib"
+  	    CPPFLAGS="$CPPFLAGS -I/usr/local/include/ncurses -DRENAMED_NCURSES"
+  	    search_ncurses=false
+  	    screen_manager="renamed ncurses on /usr/local/.../ncurses"
+***************
+*** 5748,5754 ****
+          if test -f /usr/include/ncurses/curses.h
+  	then
+  	    echo "$ac_t""Found ncurses on /usr/include/ncurses/curses.h" 1>&6
+!  	    LIBS="$LIBS -lncurses"
+  	    CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses -DRENAMED_NCURSES"
+  	    search_ncurses=false
+  	    screen_manager="renamed ncurses on /usr/include/ncurses"
+--- 5748,5754 ----
+          if test -f /usr/include/ncurses/curses.h
+  	then
+  	    echo "$ac_t""Found ncurses on /usr/include/ncurses/curses.h" 1>&6
+!  	    LIBS="$LIBS -lncurses -lmytinfo"
+  	    CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses -DRENAMED_NCURSES"
+  	    search_ncurses=false
+  	    screen_manager="renamed ncurses on /usr/include/ncurses"
diff --git a/misc/mc/files/patch-ab b/misc/mc/files/patch-ab
new file mode 100644
index 000000000000..c8a83a18c7fa
--- /dev/null
+++ b/misc/mc/files/patch-ab
@@ -0,0 +1,19 @@
+*** vfs/Makefile.in.orig	Wed Sep 27 20:07:56 1995
+--- vfs/Makefile.in	Wed Sep 27 20:08:28 1995
+***************
+*** 75,81 ****
+  
+  install:
+  	if test x@mcserv@ != x; then \
+! 	    $(INSTALL_PROGRAM) mcserv $(DESTDIR)$(bindir)/$(binprefix)mcserv; \
+  	fi
+  
+  install.extfs:
+--- 75,81 ----
+  
+  install:
+  	if test x@mcserv@ != x; then \
+! 	    $(INSTALL_PROGRAM) mcserv $(DESTDIR)$(sbindir)/$(binprefix)mcserv; \
+  	fi
+  
+  install.extfs:
diff --git a/misc/mc/files/patch-ac b/misc/mc/files/patch-ac
new file mode 100644
index 000000000000..d07c8e7ae22e
--- /dev/null
+++ b/misc/mc/files/patch-ac
@@ -0,0 +1,29 @@
+*** Make.common.in.orig	Wed Sep 27 20:09:34 1995
+--- Make.common.in	Wed Sep 27 20:10:42 1995
+***************
+*** 14,19 ****
+--- 14,20 ----
+  binprefix =
+  manprefix =
+  bindir = $(exec_prefix)/bin
++ sbindir = $(exec_prefix)/sbin
+  libdir = $(exec_prefix)/lib/mc
+  suppbindir = $(libdir)/bin
+  tidir = $(libdir)/term
+***************
+*** 42,48 ****
+  # 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@ -I.. -DBINDIR=\""$(bindir)/"\" -DLIBDIR=\""$(libdir)/"\" -DICONDIR=\""$(icondir)/"\" $(XINC)
+  XLDFLAGS = @LDFLAGS@
+  XDEFS = @DEFS@
+  XLIBS = @LIBS@
+--- 43,49 ----
+  # 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@ -I.. -DSBINDIR=\""$(sbindir)/"\" -DBINDIR=\""$(bindir)/"\" -DLIBDIR=\""$(libdir)/"\" -DICONDIR=\""$(icondir)/"\" $(XINC)
+  XLDFLAGS = @LDFLAGS@
+  XDEFS = @DEFS@
+  XLIBS = @LIBS@
diff --git a/misc/mc/pkg-descr b/misc/mc/pkg-descr
index 6254570a4a50..6145fb52479d 100644
--- a/misc/mc/pkg-descr
+++ b/misc/mc/pkg-descr
@@ -1,4 +1,4 @@
-This is version 2.0 of the Midnight Commander, a free Norton Commander
+This is version 3.0 of the Midnight Commander, a free Norton Commander
 Clone with many useful features. The Midnight Commander comes with
 mouse support on xterms.
 
diff --git a/misc/mc/pkg-plist b/misc/mc/pkg-plist
index 630f351b7410..248d27a49ad5 100644
--- a/misc/mc/pkg-plist
+++ b/misc/mc/pkg-plist
@@ -1,5 +1,19 @@
 bin/mc
-lib/mc.hlp
-lib/mc.ext
-lib/mc.menu
+sbin/mcserv
+lib/mc/bin/mcfn_install
+lib/mc/term/ansi.ti
+lib/mc/term/linux.ti
+lib/mc/term/vt100.ti
+lib/mc/term/xterm.ti
+lib/mc/term/xterm.tcap
+lib/mc/term/xterm.ad
+lib/mc/term/README.xterm
+lib/mc/mc.hlp
+lib/mc/mc.ext
+lib/mc/mc.menu
+lib/mc/mc.hint
+lib/mc/mc.lib
+lib/mc/mc.tcl
+lib/mc/FAQ
 man/man1/mc.1.gz
+man/man8/mc.8.gz