diff options
author | Torsten Blum <torstenb@FreeBSD.org> | 1995-09-27 22:57:42 +0000 |
---|---|---|
committer | Torsten Blum <torstenb@FreeBSD.org> | 1995-09-27 22:57:42 +0000 |
commit | 00cbf54c6055111c260561236b2b933366cb12bf (patch) | |
tree | 860e132493273020ffacd42d1c4e2dbb770526c8 /misc/mc/files | |
parent | Edit patch to match latest changes to ls.1. (diff) |
Upgrade to mc-3.0
Notes
Notes:
svn path=/head/; revision=2201
Diffstat (limited to 'misc/mc/files')
-rw-r--r-- | misc/mc/files/patch-aa | 138 | ||||
-rw-r--r-- | misc/mc/files/patch-ab | 19 | ||||
-rw-r--r-- | misc/mc/files/patch-ac | 29 |
3 files changed, 168 insertions, 18 deletions
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@ |