no -ltinfo, and throw out /usr/local - really!

2 files changed, 8 insertions, 120 deletions

diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index 45d47112248..03816b2a9e0 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/04/22 14:22:46 agc Exp $
+# $NetBSD: Makefile,v 1.8 1998/05/08 23:30:05 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.16 1997/11/30 19:37:48 vanilla Exp
 #
 
@@ -16,6 +16,13 @@ DEPENDS+=		ncurses-1.9.9g:../../devel/ncurses
 MAN1=			mc.1 mcedit.1
 MAN8=			mcserv.8
 
+pre-configure:
+	for f in `find ${WRKDIR}/. -type f -print|xargs ${GREP} -l '/usr/local'`; do \
+		echo patching $$f ; \
+		${CP} -p $$f $$f.tmp ; \
+		${SED} -e 's:/usr/local:'${PREFIX}':g' < $$f.tmp > $$f && ${MV} $$f.tmp $$f; \
+	done
+
 post-install:
 	@ ${RMDIR} ${PREFIX}/lib/mc/icons
 
diff --git a/misc/mc/patches/patch-aa b/misc/mc/patches/patch-aa
index 556889a9f1d..99a3293a653 100644
--- a/misc/mc/patches/patch-aa
+++ b/misc/mc/patches/patch-aa
@@ -10,122 +10,3 @@
   if test -z "$INSTALL"; then
   if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
     echo $ac_n "(cached) $ac_c" 1>&6
-*************** if test "${with_ncurses+set}" = set; the
-*** 5411,5417 ****
-  	then
-  		search_ncurses=true
-  	else
-! 		LIBS="$LIBS -L$withval/lib -lncurses"
-  		CPPFLAGS="$CPPFLAGS -I$withval/include"
-  		search_ncurses=false
-  		screen_manager="ncurses"
---- 5412,5418 ----
-  	then
-  		search_ncurses=true
-  	else
-! 		LIBS="$LIBS -L$withval/lib -lncurses -lmytinfo"
-  		CPPFLAGS="$CPPFLAGS -I$withval/include"
-  		search_ncurses=false
-  		screen_manager="ncurses"
-*************** then
-*** 6372,6378 ****
-          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"
---- 6373,6379 ----
-          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"
-*************** EOF
-*** 6389,6395 ****
-          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"
---- 6390,6396 ----
-          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"
-*************** EOF
-*** 6406,6412 ****
-          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"
---- 6407,6413 ----
-          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"
-*************** EOF
-*** 6423,6429 ****
-          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"
---- 6424,6430 ----
-          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"
-*************** EOF
-*** 6441,6447 ****
-          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"
---- 6442,6448 ----
-          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"
-*************** EOF
-*** 6459,6465 ****
-          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"
---- 6460,6466 ----
-          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"