From aa3e2e2d012a73279723619ffb3c28f79ebe019f Mon Sep 17 00:00:00 2001
From: seb <seb@pkgsrc.org>
Date: Thu, 3 Jul 2003 18:47:58 +0000
Subject: Convert to USE_NEW_TEXINFO.

While here fix CONFLICTS.
---
 graphics/plotutils-nox11/Makefile | 8 +++++---
 graphics/plotutils-nox11/PLIST    | 4 +---
 graphics/plotutils/Makefile       | 8 +++++---
 graphics/plotutils/PLIST          | 4 +---
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'graphics')

diff --git a/graphics/plotutils-nox11/Makefile b/graphics/plotutils-nox11/Makefile
index b9c39a56c3c..e3ef3537e89 100644
--- a/graphics/plotutils-nox11/Makefile
+++ b/graphics/plotutils-nox11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2003/06/07 17:39:24 jschauma Exp $
+# $NetBSD: Makefile,v 1.2 2003/07/03 18:55:35 seb Exp $
 #
 
 DISTNAME=		plotutils-2.4.1
@@ -10,11 +10,14 @@ MAINTAINER=		dmcmahill@netbsd.org
 HOMEPAGE=		http://www.gnu.org/software/plotutils/plotutils.html
 COMMENT=		Programs and library for plotting scientific data
 
-CONFLICTS+=		${DISTNAME:C/-[0-9].*//}
+CONFLICTS+=		plotutils-[0-9]*
 
 USE_BUILDLINK2=		yes
 USE_GCC_SHLIB=		yes
 
+USE_NEW_TEXINFO=	YES
+INFO_FILES=	plotutils.info
+
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-libplotter
 CONFIGURE_ARGS+=	--without-x
@@ -23,5 +26,4 @@ USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig ${WRKSRC}/libxmi/ltconfig
 
 .include "../../graphics/png/buildlink2.mk"
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/plotutils-nox11/PLIST b/graphics/plotutils-nox11/PLIST
index 247a1c4fbe8..9181ed0a948 100644
--- a/graphics/plotutils-nox11/PLIST
+++ b/graphics/plotutils-nox11/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2003/06/07 17:39:24 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/07/03 18:55:35 seb Exp $
 bin/double
 bin/graph
 bin/ode
@@ -67,9 +67,7 @@ share/tek2plot/scale.tek
 share/tek2plot/skymap.tek
 share/tek2plot/skymap2.tek
 share/tek2plot/usmap.tek
-@unexec ${INSTALL_INFO} --delete %D/info/plotutils.info %D/info/dir
 info/plotutils.info
-@exec ${INSTALL_INFO} %D/info/plotutils.info %D/info/dir
 @dirrm share/libplot
 @dirrm share/ode
 @dirrm share/pic2plot
diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile
index c8ad4f828fe..82e54ab6066 100644
--- a/graphics/plotutils/Makefile
+++ b/graphics/plotutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2003/06/07 17:39:24 jschauma Exp $
+# $NetBSD: Makefile,v 1.26 2003/07/03 18:47:58 seb Exp $
 #
 
 DISTNAME=		plotutils-2.4.1
@@ -10,12 +10,15 @@ MAINTAINER=		dmcmahill@netbsd.org
 HOMEPAGE=		http://www.gnu.org/software/plotutils/plotutils.html
 COMMENT=		Programs and library for plotting scientific data
 
-CONFLICTS+=		${DISTNAME:C/-[0-9].*/-nox11/}
+CONFLICTS+=		plotutils-nox11-[0-9]*
 
 USE_BUILDLINK2=		YES
 USE_GCC_SHLIB=		YES
 USE_X11=		YES
 
+USE_NEW_TEXINFO=	YES
+INFO_FILES=	plotutils.info
+
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--enable-libplotter
 
@@ -23,5 +26,4 @@ USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig ${WRKSRC}/libxmi/ltconfig
 
 .include "../../graphics/png/buildlink2.mk"
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/plotutils/PLIST b/graphics/plotutils/PLIST
index a220c47de8c..b272a751b8c 100644
--- a/graphics/plotutils/PLIST
+++ b/graphics/plotutils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:21 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/07/03 18:47:58 seb Exp $
 bin/double
 bin/graph
 bin/ode
@@ -67,9 +67,7 @@ share/tek2plot/scale.tek
 share/tek2plot/skymap.tek
 share/tek2plot/skymap2.tek
 share/tek2plot/usmap.tek
-@unexec ${INSTALL_INFO} --delete %D/info/plotutils.info %D/info/dir
 info/plotutils.info
-@exec ${INSTALL_INFO} %D/info/plotutils.info %D/info/dir
 @dirrm share/libplot
 @dirrm share/ode
 @dirrm share/pic2plot
-- 
cgit v1.2.3