From fe0d61c9c13f66ceb8c21abb38adbe48c95c40fb Mon Sep 17 00:00:00 2001
From: seb <seb@pkgsrc.org>
Date: Wed, 6 Aug 2003 19:57:23 +0000
Subject: Convert to USE_NEW_TEXINFO.

---
 wm/sawfish/Makefile        | 7 +++++--
 wm/sawfish/Makefile.common | 3 +--
 wm/sawfish/PLIST           | 4 +---
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'wm/sawfish')

diff --git a/wm/sawfish/Makefile b/wm/sawfish/Makefile
index 731b4b76788..550999f8f85 100644
--- a/wm/sawfish/Makefile
+++ b/wm/sawfish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/07/13 18:01:50 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2003/08/06 19:57:23 seb Exp $
 #
 
 PKGNAME=		sawfish-${SF_VERS}
@@ -12,9 +12,12 @@ USE_X11BASE=		# defined
 
 CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
 MAKE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
-TEXINFO_OVERRIDE=	YES
 BUILD_USES_MSGFMT=	YES
 
+USE_NEW_TEXINFO=	YES
+USE_MAKEINFO=		YES
+INFO_FILES=		sawfish.info
+
 PLIST_SUBST+=		SF_VERS=${SF_VERS}
 
 post-install:
diff --git a/wm/sawfish/Makefile.common b/wm/sawfish/Makefile.common
index e7251fc1d84..5d989f1c8d7 100644
--- a/wm/sawfish/Makefile.common
+++ b/wm/sawfish/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2003/07/17 22:55:16 grant Exp $
+# $NetBSD: Makefile.common,v 1.17 2003/08/06 19:57:23 seb Exp $
 
 DISTNAME=		sawfish-${SF_VERS}-gtk1
 SF_VERS=		1.2
@@ -22,5 +22,4 @@ PATCHDIR=		${.CURDIR}/../../wm/sawfish/patches
 .include "../../graphics/imlib/buildlink2.mk"
 .include "../../lang/librep/buildlink2.mk"
 .include "../../x11/controlcenter/buildlink2.mk"
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/sawfish/PLIST b/wm/sawfish/PLIST
index 950bc15d445..57d28d6bd2e 100644
--- a/wm/sawfish/PLIST
+++ b/wm/sawfish/PLIST
@@ -1,17 +1,15 @@
-@comment $NetBSD: PLIST,v 1.3 2003/01/10 01:15:51 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/08/06 19:57:23 seb Exp $
 bin/sawfish
 bin/sawfish-capplet
 bin/sawfish-client
 bin/sawfish-themer
 bin/sawfish-ui
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/sawfish.info
 info/sawfish.info
 info/sawfish.info-1
 info/sawfish.info-2
 info/sawfish.info-3
 info/sawfish.info-4
 info/sawfish.info-5
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/sawfish.info
 libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/DOC
 libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/gradient.la
 libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/gradient.a
-- 
cgit v1.2.3