Convert to USE_NEW_TEXINFO.

4 files changed, 16 insertions, 11 deletions

diff --git a/devel/pcl-cvs/Makefile b/devel/pcl-cvs/Makefile
index 13b76c3e9c0..945d2338131 100644
--- a/devel/pcl-cvs/Makefile
+++ b/devel/pcl-cvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/06/02 01:20:19 jschauma Exp $
+# $NetBSD: Makefile,v 1.5 2003/06/23 22:27:05 seb Exp $
 #
 
 DISTNAME=	pcl-cvs-2.9.9
@@ -20,8 +20,8 @@ EMACS_VERSIONS_ACCEPTED=	emacs20
 
 MAKE_ENV+=	PREFIX=${PREFIX}
 ALL_TARGET= 	default
+USE_NEW_TEXINFO=	YES
 INFO_FILES=	pcl-cvs.info
 MESSAGE_SUBST+=	EMACS_LISPPREFIX=${EMACS_LISPPREFIX:Q}
 
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/pcl-cvs/PLIST b/devel/pcl-cvs/PLIST
index 9cd53fe0ea2..d6072c2e2ec 100644
--- a/devel/pcl-cvs/PLIST
+++ b/devel/pcl-cvs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/01/10 14:39:58 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/06/23 22:27:05 seb Exp $
 ${EMACS_LISPPREFIX}/pcl-cvs/cvs-compat.el
 ${EMACS_LISPPREFIX}/pcl-cvs/cvs-compat.elc
 ${EMACS_LISPPREFIX}/pcl-cvs/cvs-edit.el
@@ -18,9 +18,7 @@ ${EMACS_LISPPREFIX}/pcl-cvs/pcl-cvs-util.el
 ${EMACS_LISPPREFIX}/pcl-cvs/pcl-cvs-util.elc
 ${EMACS_LISPPREFIX}/pcl-cvs/pcl-cvs.el
 ${EMACS_LISPPREFIX}/pcl-cvs/pcl-cvs.elc
-@unexec install-info --delete --info-dir=%D/info %D/info/pcl-cvs.info
 info/pcl-cvs.info
 info/pcl-cvs.info-1
 info/pcl-cvs.info-2
-@exec install-info --info-dir=%D/info %D/info/pcl-cvs.info
 @dirrm ${EMACS_LISPPREFIX}/pcl-cvs
diff --git a/devel/pcl-cvs/distinfo b/devel/pcl-cvs/distinfo
index 431d94bdcc4..9b93bb989da 100644
--- a/devel/pcl-cvs/distinfo
+++ b/devel/pcl-cvs/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/06/08 17:33:18 cjep Exp $
+$NetBSD: distinfo,v 1.2 2003/06/23 22:27:05 seb Exp $
 
 SHA1 (pcl-cvs-2.9.9.tar.gz) = 7fb527a2a5b9c8ff8256682a11928497fc6cdf96
 Size (pcl-cvs-2.9.9.tar.gz) = 140016 bytes
-SHA1 (patch-aa) = c1f347b61c0065dfd6bb2f13f0fb5407af956fcf
+SHA1 (patch-aa) = 8c1339cb486c0a05e09ac3a32d2580cf5000eace
diff --git a/devel/pcl-cvs/patches/patch-aa b/devel/pcl-cvs/patches/patch-aa
index 490b1fbe30e..aaf50904b6d 100644
--- a/devel/pcl-cvs/patches/patch-aa
+++ b/devel/pcl-cvs/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/06/08 17:33:18 cjep Exp $
+$NetBSD: patch-aa,v 1.2 2003/06/23 22:27:06 seb Exp $
 
 --- Makefile.orig	Sun Mar  5 21:32:20 2000
 +++ Makefile
@@ -11,17 +11,24 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/06/08 17:33:18 cjep Exp $
  datadir = $(prefix)/share
  
  # the directory where you install third-party emacs packges
-@@ -102,8 +102,7 @@
+@@ -47,7 +47,6 @@ infodir = $(prefix)/info
+ docdir = $(prefix)/doc
+ 
+ EMACS	= emacs
+-MAKEINFO= makeinfo
+ TEXI2DVI= texi2dvi
+ SHELL	= /bin/sh
+ DVIPS	= dvips
+@@ -102,8 +101,6 @@ install_el:
  install_info: $(PACKAGE).info
  	$(MKDIR) $(infodir)
  	$(CP) *.info* $(infodir)/
 -	-[ ! -w $(infodir)/dir ] \
 -	    || install-info --info-dir=$(infodir) $(PACKAGE).info
-+	-[ -w $(infodir)/dir ] && install-info --info-dir=$(infodir) $(PACKAGE).info
  
  install_startup:
  	$(MKDIR) $(lispdir)
-@@ -130,7 +129,7 @@
+@@ -130,7 +127,7 @@ install_dvi: dvi
  	$(MKDIR) $(docdir)
  	$(CP) *.dvi $(docdir)/