tin: Reworked patches to apply without offset

[Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Pushed By:	micha
Date:		Fri Jan 11 10:21:43 2019 +0100
Changeset:	b3e0deadf32ca58d68c1ac6cc5100a03d8ba0220

Modified Files:
	tin/TODO
	tin/distinfo
	tin/patches/patch-Makefile
	tin/patches/patch-configure
	tin/patches/patch-include_tin.h
	tin/patches/patch-src_Makefile.in

Log Message:
tin: Reworked patches to apply without offset

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b3e0deadf32ca58d68c1ac6cc5100a03d8ba0220

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 tin/TODO                          | 3 ++-
 tin/distinfo                      | 8 ++++----
 tin/patches/patch-Makefile        | 4 ++--
 tin/patches/patch-configure       | 4 ++--
 tin/patches/patch-include_tin.h   | 4 ++--
 tin/patches/patch-src_Makefile.in | 6 +++---
 6 files changed, 15 insertions(+), 14 deletions(-)

diffs:
diff --git a/tin/TODO b/tin/TODO
index 6659084350..eba7d4d3e9 100644
--- a/tin/TODO
+++ b/tin/TODO
@@ -1,4 +1,5 @@
 [X] Update to latest release 2.4.3
-[ ] Rework patches to apply without offset
+[X] Rework patches to apply without offset
+[ ] Test package
 [ ] Suggest option "termcap" for "mk/defaults/options.description"
     (from pkglint warning)
diff --git a/tin/distinfo b/tin/distinfo
index ff0d4d5948..c798f08d5f 100644
--- a/tin/distinfo
+++ b/tin/distinfo
@@ -4,7 +4,7 @@ SHA1 (tin-2.4.3.tar.xz) = f0460e6e9aa555864df8d12986c06e3c0c27f70a
 RMD160 (tin-2.4.3.tar.xz) = ca9404b46705b75b615b79e6d0434c85e009c616
 SHA512 (tin-2.4.3.tar.xz) = 9d4b22ec889cc0b468d9d5488907b6b4a6fc864dcbd18ef2e91a463734e651bc7ff149d6c74805f82cbf0d4f6e7f28b005ba07268966e3c96928b5b20be59eba
 Size (tin-2.4.3.tar.xz) = 1538960 bytes
-SHA1 (patch-Makefile) = 5dfed6b037755fd632d71fd5c58b5982b24a598e
-SHA1 (patch-configure) = dd738e58ffe3b39396928ebb881b7b269bf21315
-SHA1 (patch-include_tin.h) = 557a75eeff1114018dca247e15eceddf70af8b91
-SHA1 (patch-src_Makefile.in) = f65cfcc6da2be21edf80317b94a98e1512e086a0
+SHA1 (patch-Makefile) = 7f9048d31e70d9630ba6511d834db5d0c60a7de1
+SHA1 (patch-configure) = 02f6c943c7e6cbf8552f163c8ff4922413c9c340
+SHA1 (patch-include_tin.h) = 75a933e15128e7e102598c311ff292caf9c49041
+SHA1 (patch-src_Makefile.in) = 412f1cd6b01618e64d6a3f713f3758d5a563e79e
diff --git a/tin/patches/patch-Makefile b/tin/patches/patch-Makefile
index fa50d7e591..a981006479 100644
--- a/tin/patches/patch-Makefile
+++ b/tin/patches/patch-Makefile
@@ -2,9 +2,9 @@ $NetBSD$
 
 Do not ignore error for missing src/Makefile.
 
---- Makefile.orig	2007-02-01 13:11:14.000000000 +0000
+--- Makefile.orig
 +++ Makefile
-@@ -400,7 +400,7 @@ all:
+@@ -407,7 +407,7 @@ all:
  	@$(ECHO) " "
  
  build:
diff --git a/tin/patches/patch-configure b/tin/patches/patch-configure
index 7a088ef166..084a859ccd 100644
--- a/tin/patches/patch-configure
+++ b/tin/patches/patch-configure
@@ -2,9 +2,9 @@ $NetBSD$
 
 Skip missing include directories.
 
---- configure.orig	2017-12-24 11:52:06.000000000 +0000
+--- configure.orig
 +++ configure
-@@ -9202,6 +9202,9 @@ echo "$ac_t""$cf_cv_ncurses_h2" 1>&6
+@@ -11429,6 +11429,9 @@ echo "$ac_t""$cf_cv_ncurses_h2" 1>&6
  if test -n "$cf_1st_incdir" ; then
    for cf_add_incdir in $cf_1st_incdir
    do
diff --git a/tin/patches/patch-include_tin.h b/tin/patches/patch-include_tin.h
index 5401ac01a1..d6d1da0c34 100644
--- a/tin/patches/patch-include_tin.h
+++ b/tin/patches/patch-include_tin.h
@@ -2,9 +2,9 @@ $NetBSD$
 
 Use system libcanlock.
 
---- include/tin.h.orig	2017-12-08 07:52:23.000000000 +0000
+--- include/tin.h.orig
 +++ include/tin.h
-@@ -2366,7 +2366,7 @@ extern struct tm *localtime(time_t *);
+@@ -2394,7 +2394,7 @@ extern struct tm *localtime(time_t *);
  
  /* libcanlock */
  #ifdef USE_CANLOCK
diff --git a/tin/patches/patch-src_Makefile.in b/tin/patches/patch-src_Makefile.in
index e27198b243..cd276faf4a 100644
--- a/tin/patches/patch-src_Makefile.in
+++ b/tin/patches/patch-src_Makefile.in
@@ -3,9 +3,9 @@ $NetBSD$
 Do not link internal static libcanlock.
 Do not install mbox manpage.
 
---- src/Makefile.in.orig	2017-12-08 07:55:34.000000000 +0000
+--- src/Makefile.in.orig
 +++ src/Makefile.in
-@@ -209,7 +209,7 @@ EXTRAOBJS = @EXTRAOBJS@
+@@ -208,7 +208,7 @@ EXTRAOBJS = @EXTRAOBJS@
  EXTRA_INTLLIBS = @INTLDIR_MAKE@ @INTLLIBS@
  EXTRA_PCREHDRS = @PCREDIR_MAKE@ ../pcre/pcre.h
  EXTRA_PCRELIBS = @PCREDIR_MAKE@ ../pcre/$(PRELIB)pcre.a
@@ -14,7 +14,7 @@ Do not install mbox manpage.
  EXTRALIBS = $(EXTRA_INTLLIBS) $(EXTRA_PCRELIBS) $(EXTRA_CANLIBS)
  
  OFILES	= @ALLOCA@ $(EXTRAOBJS) \
-@@ -341,7 +341,6 @@ install_manpage : $(DESTDIR)$(INS_MANUAL
+@@ -340,7 +340,6 @@ install_manpage : $(DESTDIR)$(INS_MANUAL
  	@-$(RM) -f $(DESTDIR)$(INS_MANUAL_DIR)5/r$(PROJECT).5
  	@$(ECHO) ".so $(INS_MANUAL_DIR)5/$(PROJECT).5" > $(DESTDIR)$(INS_MANUAL_DIR)5/r$(PROJECT).5
  	@$(CHMOD) 444 $(DESTDIR)$(INS_MANUAL_DIR)5/r$(PROJECT).5