[pkgsrc/trunk]: pkgsrc/sysutils/mtools Convert to USE_NEW_TEXINFO.

[seb <seb%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/85acc326bac9
branches:  trunk
changeset: 459746:85acc326bac9
user:      seb <seb%pkgsrc.org@localhost>
date:      Tue Aug 05 20:21:42 2003 +0000

description:
Convert to USE_NEW_TEXINFO.

diffstat:

 sysutils/mtools/Makefile         |   7 +++----
 sysutils/mtools/PLIST            |   4 +---
 sysutils/mtools/distinfo         |   4 ++--
 sysutils/mtools/patches/patch-aa |  20 ++++++++++++++------
 4 files changed, 20 insertions(+), 15 deletions(-)

diffs (103 lines):

diff -r fbac95bad0bf -r 85acc326bac9 sysutils/mtools/Makefile
--- a/sysutils/mtools/Makefile  Tue Aug 05 19:21:29 2003 +0000
+++ b/sysutils/mtools/Makefile  Tue Aug 05 20:21:42 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2003/07/17 22:53:43 grant Exp $
+# $NetBSD: Makefile,v 1.29 2003/08/05 20:21:42 seb Exp $
 #
 
 DISTNAME=      mtools-3.9.7
@@ -14,10 +14,10 @@
 
 GNU_CONFIGURE= YES
 USE_GMAKE=     YES
+USE_NEW_TEXINFO=       YES
+USE_MAKEINFO=  YES
 INFO_FILES=    mtools.info
 
-TEXINFO_OVERRIDE=      YES
-
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(MTOOLS_ENABLE_FLOPPYD) && !empty(MTOOLS_ENABLE_FLOPPYD:M[Yy][Ee][Ss])
@@ -30,5 +30,4 @@
 PLIST_SUBST=   NOFLOPPYD="@comment "
 .endif
 
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r fbac95bad0bf -r 85acc326bac9 sysutils/mtools/PLIST
--- a/sysutils/mtools/PLIST     Tue Aug 05 19:21:29 2003 +0000
+++ b/sysutils/mtools/PLIST     Tue Aug 05 20:21:42 2003 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/05/22 16:16:03 salo Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/08/05 20:21:42 seb Exp $
 ${NOFLOPPYD}bin/floppyd
 ${NOFLOPPYD}bin/floppyd_installtest
 bin/lz
@@ -32,9 +32,7 @@
 bin/mzip
 bin/tgz
 bin/uz
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/mtools.info
 info/mtools.info
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/mtools.info
 ${NOFLOPPYD}man/man1/floppyd.1
 man/man1/mattrib.1
 man/man1/mbadblocks.1
diff -r fbac95bad0bf -r 85acc326bac9 sysutils/mtools/distinfo
--- a/sysutils/mtools/distinfo  Tue Aug 05 19:21:29 2003 +0000
+++ b/sysutils/mtools/distinfo  Tue Aug 05 20:21:42 2003 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2003/05/22 16:16:04 salo Exp $
+$NetBSD: distinfo,v 1.4 2003/08/05 20:21:42 seb Exp $
 
 SHA1 (mtools-3.9.7.tar.gz) = b54f8a7041854edb5c17b116b3d77e4d088aedfb
 Size (mtools-3.9.7.tar.gz) = 282769 bytes
-SHA1 (patch-aa) = 9effa09b809b1dc0dce231ea261785d52b51bf0d
+SHA1 (patch-aa) = 7ae1660f3beeda8774e9df0eb21d01a0233a6ad6
 SHA1 (patch-ab) = 7549dceacff03ad9116bb45fd30e60088cf8fa93
 SHA1 (patch-ac) = 3b807b102f832095cb0e7734393655f99a205897
 SHA1 (patch-ad) = 4165cf8850f4e2d8e5d610133f2d776b7f2ccb90
diff -r fbac95bad0bf -r 85acc326bac9 sysutils/mtools/patches/patch-aa
--- a/sysutils/mtools/patches/patch-aa  Tue Aug 05 19:21:29 2003 +0000
+++ b/sysutils/mtools/patches/patch-aa  Tue Aug 05 20:21:42 2003 +0000
@@ -1,8 +1,16 @@
-$NetBSD: patch-aa,v 1.6 2003/05/22 16:16:04 salo Exp $
+$NetBSD: patch-aa,v 1.7 2003/08/05 20:21:43 seb Exp $
 
---- Makefile.in.orig   2000-05-14 20:14:59.000000000 +0200
-+++ Makefile.in        2003-05-22 18:00:53.000000000 +0200
-@@ -49,6 +49,7 @@
+--- Makefile.in.orig   2000-05-14 18:14:59.000000000 +0000
++++ Makefile.in
+@@ -11,7 +11,6 @@ USERCFLAGS = 
+ USERLDFLAGS =
+ USERLDLIBS =
+ 
+-MAKEINFO = makeinfo
+ TEXI2DVI = texi2dvi
+ TEXI2HTML = texi2html
+ 
+@@ -49,6 +48,7 @@ LN_S        = @LN_S@
  
  INSTALL         = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -10,7 +18,7 @@
  INSTALL_DATA    = @INSTALL_DATA@
  INSTALL_INFO  = @INSTALL_INFO@
  
-@@ -56,7 +57,7 @@
+@@ -56,7 +56,7 @@ INSTALL_INFO = @INSTALL_INFO@
  .SUFFIXES: .o .c
  .SUFFIXES: .o .c
  
@@ -19,7 +27,7 @@
  mdu.1 mformat.1 mkmanifest.1 mlabel.1 mmd.1 mmount.1 mmove.1 mpartition.1 \
  mrd.1 mread.1 mren.1 mshowfat.1 mtoolstest.1 mtools.1 mtype.1 mzip.1
  MAN1EXT       = 1
-@@ -256,7 +257,7 @@
+@@ -256,7 +256,7 @@ install-links: $(bindir)/mtools
  install-scripts: $(bindir)/mtools
        @$(top_srcdir)/mkinstalldirs $(bindir)
        @for j in $(SCRIPTS) ; do \