From 3f52756ad3c1b30dbe6353408b9c3d93a8a62b9c Mon Sep 17 00:00:00 2001 From: wiz Date: Fri, 23 Jan 2004 23:22:41 +0000 Subject: Make build on -current. Also, this package can use native curses since 1.6V; replace USE_NCURSES with appropriate INCOMPAT_CURSES. --- misc/vfu/Makefile | 6 ++++-- misc/vfu/patches/patch-ac | 14 +++++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/misc/vfu/Makefile b/misc/vfu/Makefile index 9707ac62f91..8a8668dda6b 100644 --- a/misc/vfu/Makefile +++ b/misc/vfu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2003/09/28 09:13:58 jlam Exp $ +# $NetBSD: Makefile,v 1.34 2004/01/23 23:22:41 wiz Exp $ # DISTNAME= vfu-3.04 @@ -13,7 +13,9 @@ COMMENT= Small, handy, easy-to-use file manager USE_BUILDLINK2= # defined USE_PKGINSTALL= YES -USE_NCURSES= # qiflush() + +INCOMPAT_CURSES= NetBSD-1.5* NetBSD-1.6[-_.]* +INCOMPAT_CURSES+= NetBSD-1.6[A-U]-* DOCDIR= ${PREFIX}/share/doc/vfu EGDIR= ${PREFIX}/share/examples/vfu diff --git a/misc/vfu/patches/patch-ac b/misc/vfu/patches/patch-ac index 65a0023ae32..338af021274 100644 --- a/misc/vfu/patches/patch-ac +++ b/misc/vfu/patches/patch-ac @@ -1,8 +1,16 @@ -$NetBSD: patch-ac,v 1.8 2003/07/14 10:07:12 jmmv Exp $ +$NetBSD: patch-ac,v 1.9 2004/01/23 23:22:41 wiz Exp $ --- vfu/vfu.cpp.orig 2002-05-24 18:55:36.000000000 +0200 +++ vfu/vfu.cpp -@@ -485,8 +485,6 @@ void vfu_help() +@@ -9,6 +9,7 @@ + * + */ + ++#include + #include "vfu.h" + #include "vfuopt.h" + #include "vfufiles.h" +@@ -485,8 +486,6 @@ void vfu_help() mb.push( " 1. $HOME/$RC_PREFIX/vfu/vfu.conf"); mb.push( " 2. $HOME/.vfu/vfu.conf"); mb.push( " 3. " FILENAME_CONF_GLOBAL0 ); @@ -11,7 +19,7 @@ $NetBSD: patch-ac,v 1.8 2003/07/14 10:07:12 jmmv Exp $ mb.push( "" ); vfu_menu_box( 1, 4, "VFU Help ( PageUp/PageDown to scroll )" ); mb.zap(); -@@ -604,10 +602,6 @@ void vfu_init() +@@ -604,10 +603,6 @@ void vfu_init() { /* cannot find local/user conf file, try globals */ if ( access( FILENAME_CONF_GLOBAL0, R_OK ) == 0 ) filename_conf = FILENAME_CONF_GLOBAL0; -- cgit v1.2.3