Convert to USE_NEW_TEXINFO.

Remove unnecessary patch file on Texinfo source.

4 files changed, 6 insertions, 22 deletions

diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index c6869df3c64..f1a3e84a00c 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/06/11 20:50:52 abs Exp $
+# $NetBSD: Makefile,v 1.10 2003/06/23 11:27:51 seb Exp $
 
 DISTNAME=		libgtop-2.0.0
 PKGNAME=		${DISTNAME:S/-/2-/}
@@ -38,6 +38,9 @@ USE_GMAKE=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE=	${WRKSRC}/libgtop-2.0.pc.in
+USE_NEW_TEXINFO=	YES
+USE_MAKEINFO=		YES
+INFO_FILES=		libgtop2.info
 
 # The following flags are for debugging purposes.  They don't need to
 # be used unless you are actively developing/debugging libgtop.
@@ -52,5 +55,4 @@ CONFIGURE_ENV+=		AWK="${AWK}" LN_S="${LN} -s" PERL="${PERL5}"
 
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libgtop2/PLIST b/devel/libgtop2/PLIST
index f91ffe40929..25cd2a5a29a 100644
--- a/devel/libgtop2/PLIST
+++ b/devel/libgtop2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/11/04 02:56:17 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/06/23 11:27:51 seb Exp $
 bin/libgtop_daemon2
 bin/libgtop_server2
 include/libgtop-2.0/glibtop.h
@@ -45,9 +45,7 @@ include/libgtop-2.0/glibtop/xmalloc.h
 include/libgtop-2.0/glibtop_machine.h
 include/libgtop-2.0/glibtop_server.h
 include/libgtop-2.0/glibtop_suid.h
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/libgtop2.info
 info/libgtop2.info
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/libgtop2.info
 lib/libgnomesupport-2.0.a
 lib/libgnomesupport-2.0.la
 lib/libgnomesupport-2.0.so
diff --git a/devel/libgtop2/distinfo b/devel/libgtop2/distinfo
index 8def38d50d4..ef78be1e1bc 100644
--- a/devel/libgtop2/distinfo
+++ b/devel/libgtop2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2003/01/21 20:08:09 rh Exp $
+$NetBSD: distinfo,v 1.5 2003/06/23 11:27:52 seb Exp $
 
 SHA1 (libgtop-2.0.0.tar.bz2) = 9178e5cede22ae5a8928677b195fe585b84b3b86
 Size (libgtop-2.0.0.tar.bz2) = 690581 bytes
@@ -12,7 +12,6 @@ SHA1 (patch-ag) = 470e29d999b079a5f75993978b3cdcdec2fd7d9c
 SHA1 (patch-ah) = 93ebb47710f1c4cc70406a92503bdc4a5bfa50d2
 SHA1 (patch-ai) = 07a83340eb9d6a36a3f5b2db33eb50c74fbc4777
 SHA1 (patch-aj) = ca1fd2efe97a7bada35bdb99bc0ac3ed72981a11
-SHA1 (patch-ak) = cf39190646a4fd618b8ef94647a4cf3c48a9e98b
 SHA1 (patch-al) = 6f3613fab44bbf27e5a60fdab35d26b93a04de47
 SHA1 (patch-am) = a1fd84155a76246276e952f5288636d2f086b3e7
 SHA1 (patch-an) = 2db9a77b2b021ecd6e0f8c82cebf0455ae6ce501
diff --git a/devel/libgtop2/patches/patch-ak b/devel/libgtop2/patches/patch-ak
deleted file mode 100644
index b983c84f0d0..00000000000
--- a/devel/libgtop2/patches/patch-ak
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ak,v 1.1.1.1 2002/11/04 02:56:17 rh Exp $
-
---- doc/libgtop2.texi.orig	Tue Jun 11 07:34:39 2002
-+++ doc/libgtop2.texi
-@@ -2,6 +2,10 @@
- @c %**start of header
- @setfilename libgtop2.info
- @settitle LibGTop Reference Manual
-+@dircategory Gnome
-+@direntry
-+* LibGTop2: (libgtop2).          A library to retrieve system information.
-+@end direntry
- @setchapternewpage odd
- @c %**end of header
-