Adapt to texi2html-1.76 and depend on it.

Bump PKGREVISION.

4 files changed, 64 insertions, 5 deletions

diff --git a/devel/papaya/Makefile b/devel/papaya/Makefile
index 693ff8cf33b..7ae6ef01999 100644
--- a/devel/papaya/Makefile
+++ b/devel/papaya/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2005/01/01 03:18:40 minskim Exp $
+# $NetBSD: Makefile,v 1.10 2005/03/02 14:11:28 wiz Exp $
 #
 
 DISTNAME=	papaya-0.1.7
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.asahi-net.or.jp/~em7t-hmd/papaya/		\
 		${MASTER_SITE_SOURCEFORGE:=papaya-utils/}
@@ -11,7 +11,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.asahi-net.or.jp/~em7t-hmd/papaya/index.html
 COMMENT=	Simple scripts for software development
 
-BUILD_DEPENDS+=	texi2html-[0-9]*:../../textproc/texi2html
+BUILD_DEPENDS+=	texi2html>=1.76:../../textproc/texi2html
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
@@ -28,4 +28,7 @@ pre-configure:
 	${CP} detab.in detab.in.cr &&					\
 	${TR} -d '\r' < detab.in.cr > detab.in
 
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/doc/html/*.html ${PREFIX}/share/doc/papaya
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/papaya/PLIST b/devel/papaya/PLIST
index 105d58127a3..488759dfe69 100644
--- a/devel/papaya/PLIST
+++ b/devel/papaya/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/02/16 14:43:08 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/03/02 14:11:28 wiz Exp $
 bin/add-html-signature
 bin/compare-version
 bin/copy-if-changed
@@ -22,5 +22,41 @@ bin/search-package
 bin/texi2html-wrapper
 libexec/papaya-lib.pl
 libexec/papaya-lib.sh
+share/doc/papaya/Copying.html
+share/doc/papaya/Indexes.html
+share/doc/papaya/Introduction.html
+share/doc/papaya/Library-Manual.html
+share/doc/papaya/Manual.html
+share/doc/papaya/Overview.html
+share/doc/papaya/Problems.html
+share/doc/papaya/Utility-Manual.html
+share/doc/papaya/add-html-signature.html
+share/doc/papaya/compare-version.html
+share/doc/papaya/copy-if-changed.html
+share/doc/papaya/default-configure.html
+share/doc/papaya/default-make.html
+share/doc/papaya/extract-package.html
+share/doc/papaya/find-include-dir.html
+share/doc/papaya/get-tarball-version.html
+share/doc/papaya/index.html
+share/doc/papaya/insert-date-string.html
+share/doc/papaya/insert-executer.html
+share/doc/papaya/make-install.html
+share/doc/papaya/papaya-config.html
+share/doc/papaya/papaya-lib.pl.html
+share/doc/papaya/papaya-lib.sh.html
 share/doc/papaya/papaya.html
+share/doc/papaya/papaya_1.html
+share/doc/papaya/papaya_2.html
+share/doc/papaya/papaya_3.html
+share/doc/papaya/papaya_4.html
+share/doc/papaya/papaya_5.html
+share/doc/papaya/papaya_6.html
+share/doc/papaya/papaya_abt.html
+share/doc/papaya/papaya_ovr.html
+share/doc/papaya/papaya_toc.html
+share/doc/papaya/plain-to-html.html
+share/doc/papaya/recursive-make.html
+share/doc/papaya/search-exec.html
+share/doc/papaya/texi2html-wrapper.html
 @dirrm share/doc/papaya
diff --git a/devel/papaya/distinfo b/devel/papaya/distinfo
index 970958a29af..418043eea58 100644
--- a/devel/papaya/distinfo
+++ b/devel/papaya/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 22:24:30 agc Exp $
+$NetBSD: distinfo,v 1.3 2005/03/02 14:11:28 wiz Exp $
 
 SHA1 (papaya-0.1.7.tar.gz) = 4dad7d302a774666207216d8fadae92faf42918d
 RMD160 (papaya-0.1.7.tar.gz) = cef643b2370c020aeebca8b424620e46bdfe1642
@@ -6,3 +6,4 @@ Size (papaya-0.1.7.tar.gz) = 200514 bytes
 SHA1 (patch-aa) = 2b1c1f0abe375dd37870347891df97e127163b6f
 SHA1 (patch-ab) = 5dc68a8598665d11f4484c2ce490681b07dea721
 SHA1 (patch-ac) = 5c169a116fbf115e2db57bca354a9e6dd2c34a7b
+SHA1 (patch-ad) = 98e2aee534349b238888267869cbb94b31f98dd7
diff --git a/devel/papaya/patches/patch-ad b/devel/papaya/patches/patch-ad
new file mode 100644
index 00000000000..b3a950976dc
--- /dev/null
+++ b/devel/papaya/patches/patch-ad
@@ -0,0 +1,19 @@
+$NetBSD: patch-ad,v 1.1 2005/03/02 14:11:28 wiz Exp $
+
+--- src/texi2html-wrapper.in.orig	2002-06-25 16:25:17.000000000 +0200
++++ src/texi2html-wrapper.in
+@@ -39,11 +39,12 @@ fi
+ 
+ for TEXI in $* ; do
+ 	$COMMAND $TEXI ;
+-	for HTML in *.html ; do
++	for HTML in papaya/*.html ; do
++		OUT=`echo $HTML | sed "s,papaya/,,"`;
+ 		# sed -e $html_sed $HTML > ./html/$HTML ;
+ 		sed -e 's!<BODY>!<BODY BGCOLOR=white TEXT=black LINK=blue VLINK=green>!' \
+ 		    -e 's!<body>!<body BGCOLOR=white TEXT=black LINK=blue VLINK=green>!' \
+-		    $html_sed $HTML > ./html/$HTML ;
++		    $html_sed $HTML > ./html/$OUT ;
+ 	done
+ 	rm -f *.html ;
+ done