Rename patches to match the files patched.


(wiz)

$NetBSD: patch-dist_Makefile.am,v 1.1 2013/01/23 17:33:28 wiz Exp $

--- dist/Makefile.am.orig	2012-05-21 13:09:39.000000000 +0000
+++ dist/Makefile.am
@@ -242,7 +242,7 @@ vi_motif_LDADD = @MOTIFLIBS@ @LIBOBJS@
 vi_motif_CFLAGS = @XINCS@
 
 VI=-DVI=\"$(bindir)/`echo vi-ipc | sed '$(transform)'`\"
-CFLAGS=	$(OPTFLAG)
+CFLAGS=	@CFLAGS@
 AM_CPPFLAGS=	 -D__REGEX_PRIVATE -I. -I$(visrcdir)/include $(VI)
 PERL=	@vi_cv_path_perl@
 PERLLIB=@vi_cv_perllib@
@@ -283,24 +283,7 @@ install-data-local: install_common
 	@[ -d $(DESTDIR)$(mandir) ] || \
 	    ($(mkdir) $(DESTDIR)$(mandir) && \
 	     $(chmod) $(dmode) $(DESTDIR)$(mandir))
-	@[ -d $(DESTDIR)$(mandir)/cat1 ] || \
-	    ($(mkdir) $(DESTDIR)$(mandir)/cat1 && \
-	     $(chmod) $(dmode) $(DESTDIR)$(mandir)/cat1)
 	@echo "Installing man pages: $(DESTDIR)$(mandir) ..."
-	@cd $(DESTDIR)$(mandir)/cat1 && \
-	    $(rm) -f `echo vi.0 | sed '$(transform)'`
-	@$(cp) $(visrcdir)/docs/vi.man/vi.0 \
-	    $(DESTDIR)$(mandir)/cat1/`echo vi.0 | sed '$(transform)'`
-	@cd $(DESTDIR)$(mandir)/cat1 && \
-	    $(chmod) $(fmode) `echo vi.0 | sed '$(transform)'`
-	@cd $(DESTDIR)$(mandir)/cat1 && \
-	    $(rm) -f `echo ex.0 | sed '$(transform)'`
-	@cd $(DESTDIR)$(mandir)/cat1 && \
-	    $(rm) -f `echo view.0 | sed '$(transform)'`
-	@cd $(DESTDIR)$(mandir)/cat1 && $(ln) \
-	    `echo vi.0 | sed '$(transform)'` `echo ex.0 | sed '$(transform)'`
-	@cd $(DESTDIR)$(mandir)/cat1 && $(ln) \
-	    `echo vi.0 | sed '$(transform)'` `echo view.0 | sed '$(transform)'`
 	@[ -d $(DESTDIR)$(mandir)/man1 ] || \
 	    ($(mkdir) $(DESTDIR)$(mandir)/man1 && \
 	     $(chmod) $(dmode) $(DESTDIR)$(mandir)/man1)

$NetBSD: patch-dist_configure.in,v 1.1 2013/01/23 17:33:28 wiz Exp $

First chunk: automake-1.13 compat.
Rest: ?

--- dist/configure.in.orig	2007-11-18 16:41:42.000000000 +0000
+++ dist/configure.in
@@ -4,7 +4,7 @@ dnl Process this file with autoconf to p
 AC_INIT(../common/main.c)
 AC_CONFIG_AUX_DIR(.)
 AM_INIT_AUTOMAKE(vi, 1.81.6)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
 
 dnl Configure setup.
 AC_PROG_INSTALL()
@@ -787,6 +787,8 @@ if test "$vi_cv_gettimeofday" = broken; 
 fi
 AC_MSG_RESULT($vi_cv_gettimeofday)
 
+AC_CHECK_HEADERS([sys/stropts.h stropts.h])
+
 dnl Check for which version of openpty to use, System V or Berkeley.
 AC_MSG_CHECKING(for System V pty calls)
 AC_CACHE_VAL(vi_cv_sys5_pty, [dnl

$NetBSD: patch-ex_ex__script.c,v 1.1 2013/01/23 17:33:28 wiz Exp $

--- ex/ex_script.c.orig	2007-11-18 16:41:42.000000000 +0000
+++ ex/ex_script.c
@@ -23,8 +23,10 @@ static const char sccsid[] = "$Id: ex_sc
 #include <sys/select.h>
 #endif
 #include <sys/stat.h>
-#ifdef HAVE_SYS5_PTY
+#ifdef HAVE_SYS_STROPTS_H
 #include <sys/stropts.h>
+#elif defined(HAVE_STROPTS_H)
+#include <stropts.h>
 #endif
 #include <sys/time.h>
 #include <sys/wait.h>
@@ -750,6 +752,7 @@ ptys_open(int fdm, char *pts_name)
 		return (-5);
 	}
 
+#ifndef __linux__
 	if (ioctl(fds, I_PUSH, "ptem") < 0) {
 		close(fds);
 		close(fdm);
@@ -767,6 +770,7 @@ ptys_open(int fdm, char *pts_name)
 		close(fdm);
 		return (-8);
 	}
+#endif
 
 	return (fds);
 }