- Update of advi from 1.4.0 to 1.6.0

Version 1.5+2
2003/10/09
        Background enhancement with specification of the geometry and colors.
2003/10/09
	Added an HTML version of the manual with the help of HeVeA and
	Luc Maranget.
2003/10/08
	Change the background command execution order:
	1) Solid background first,
	2) Then apply the gradient function,
	3) Then draw the image.
	This way you can use an (alpha blended) image on a gradient background.
2003/10/03
	Long time standing bug of set_title has been fixed: the
	Active-DVI window is now allocated by the Window Manager with
	the expected correct name.

Version 1.5
2003/09/30:
	Introducing page timing dump to designated files for
	synchronisation purposes.

3 files changed, 28 insertions, 17 deletions

diff --git a/print/advi/Makefile b/print/advi/Makefile
index d7fab97d6ba..7f3df057ef8 100644
--- a/print/advi/Makefile
+++ b/print/advi/Makefile
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.9 2004/12/28 23:18:15 reed Exp $
+# $NetBSD: Makefile,v 1.10 2005/02/04 21:50:25 adrianp Exp $
 
-DISTNAME=		advi-1.4.0
-PKGREVISION=		6
+DISTNAME=		advi-1.6.0
 CATEGORIES=		print
 MASTER_SITES=		ftp://ftp.inria.fr/INRIA/Projects/cristal/advi/
+EXTRACT_SUFX=           .tgz
 
 MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://pauillac.inria.fr/advi/
 COMMENT=		Active-DVI Presenter
 
 DEPENDS+=		teTeX-[0-9]*:../../print/teTeX
+BUILD_DEPENDS+=		ocaml>=3.04:../../lang/ocaml
 
 USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
@@ -19,6 +20,9 @@ USE_X11=		yes
 
 post-extract:
 	@${CP} ${WRKSRC}/tex/*.eps ${WRKSRC}/doc
+	@${CP} ${WRKSRC}/doc/eng.htm ${WRKSRC}/doc/index.html
+	@${MKDIR} ${WRKSRC}/doc.orig
+	@${CP} ${WRKSRC}/doc/*.dvi ${WRKSRC}/doc.orig
 
 post-configure:
 	@for f in ${WRKSRC}/userfile.ml; do				\
@@ -28,13 +32,14 @@ post-configure:
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/advi
-	cd ${WRKSRC}/doc && ${INSTALL_DATA} *.dvi *.ps *.pdf \
+	cd ${WRKSRC}/doc && ${INSTALL_DATA} *.ps *.pdf \
+		${PREFIX}/share/doc/advi
+	cd ${WRKSRC}/doc.orig && ${INSTALL_DATA} *.dvi \
 		${PREFIX}/share/doc/advi
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/advi
 	cd ${WRKSRC}/doc && ${INSTALL_DATA} *.html *.css *.jpg *.gif \
 		${PREFIX}/share/doc/html/advi
 	cd ${PREFIX}/share/doc/html/advi && ${LN} -sf ../../advi/manual.* .
-	${INSTALL_MAN} ${WRKSRC}/doc/advi.1 ${PREFIX}/man/man1
 
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../graphics/camlimages/buildlink3.mk"
diff --git a/print/advi/PLIST b/print/advi/PLIST
index 5a41efb64be..9f9e7101ddf 100644
--- a/print/advi/PLIST
+++ b/print/advi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/08/31 01:43:26 jtb Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/02/04 21:50:25 adrianp Exp $
 bin/advi
 man/man1/advi.1
 share/doc/advi/manual.dvi
@@ -7,34 +7,42 @@ share/doc/advi/manual.ps
 share/doc/advi/mathmode.dvi
 share/doc/advi/splash.dvi
 share/doc/advi/splash.ps
+share/doc/advi/advi_remote.dvi
+share/doc/advi/scratch_draw_splash.dvi
+share/doc/advi/scratch_draw_splash.ps
+share/doc/advi/scratch_write_splash.dvi
+share/doc/advi/scratch_write_splash.ps
 share/doc/html/advi/advi-j.jpg
 share/doc/html/advi/advi.jpg
 share/doc/html/advi/advilogo.anim.gif
 share/doc/html/advi/advilogo.gif
 share/doc/html/advi/bar.gif
-share/doc/html/advi/faq.html
-share/doc/html/advi/index-en.html
-share/doc/html/advi/index-fr.html
 share/doc/html/advi/index.html
 share/doc/html/advi/inria.gif
 share/doc/html/advi/manual.dvi
 share/doc/html/advi/manual.pdf
 share/doc/html/advi/manual.ps
 share/doc/html/advi/style.css
+share/doc/html/advi/advi_remote.html
+share/doc/html/advi/eng.html
+share/doc/html/advi/manual.html
+share/doc/html/advi/manual001.gif
+share/doc/html/advi/manual002.gif
 share/texmf/tex/latex/advi/advi-annot.sty
 share/texmf/tex/latex/advi/advi-graphicx.sty
 share/texmf/tex/latex/advi/advi-slides.sty
-share/texmf/tex/latex/advi/advi.pro
 share/texmf/tex/latex/advi/advi.sty
 share/texmf/tex/latex/advi/advilogo.eps
 share/texmf/tex/latex/advi/argv.sty
-share/texmf/tex/latex/advi/bar.jpg.eps
 share/texmf/tex/latex/advi/bubble.sty
 share/texmf/tex/latex/advi/caml.eps
 share/texmf/tex/latex/advi/jpfonts.conf
 share/texmf/tex/latex/advi/splash.dvi
 share/texmf/tex/latex/advi/superpose.sty
-share/texmf/tex/latex/advi/xcolor.sty
+share/texmf/tex/latex/advi/bar.eps
+share/texmf/tex/latex/advi/scratch_draw_splash.dvi
+share/texmf/tex/latex/advi/scratch_write_splash.dvi
+share/texmf/tex/latex/advi/xwindows-colors.sty
 @unexec texhash
 @exec texhash
 @dirrm share/doc/html/advi
diff --git a/print/advi/distinfo b/print/advi/distinfo
index bf15477e89c..1b8b02dca4e 100644
--- a/print/advi/distinfo
+++ b/print/advi/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/08/31 01:43:26 jtb Exp $
+$NetBSD: distinfo,v 1.2 2005/02/04 21:50:25 adrianp Exp $
 
-SHA1 (advi-1.4.0.tar.gz) = 580625328cb555bd97e8be3438d65fb396fc3457
-Size (advi-1.4.0.tar.gz) = 4390953 bytes
-SHA1 (patch-aa) = e75541089b7eb05b15b5ff8553a973edcce5e18d
-SHA1 (patch-ab) = 3d0f800d8eb48b5dbb339e09dc69548e886e00bc
+SHA1 (advi-1.6.0.tgz) = 8c033df906f3e208471506f64ffa0b175c1c5ee8
+Size (advi-1.6.0.tgz) = 11436152 bytes