(pkgsrc)

  - Add DEPENDS+= textproc/hevea
  - Remove two patches:
     * One was to disable building doc
     * The other was fixing tex stuff PATH
  - PKGREVISION++
  - (PLIST) adding many doc files

5 files changed, 108 insertions, 69 deletions

diff --git a/print/advi/Makefile b/print/advi/Makefile
index ac955f15890..7658798e8aa 100644
--- a/print/advi/Makefile
+++ b/print/advi/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.82 2015/01/24 03:55:34 mef Exp $
+# $NetBSD: Makefile,v 1.83 2015/01/24 07:27:46 mef Exp $
 
 DISTNAME=		advi-1.10.2
+PKGREVISION=		1
 CATEGORIES=		print
 MASTER_SITES=		http://gallium.inria.fr/advi/
 
@@ -19,6 +20,7 @@ DEPENDS+=		camlimages>=4.0.0:../../graphics/camlimages
 DEPENDS+=		tex-fontinst>=1.933:../../fonts/tex-fontinst
 DEPENDS+=		tex-pstools>=1.68:../../graphics/tex-pstools
 DEPENDS+=		tex-cyrillic-bin>=2013:../../print/tex-cyrillic-bin
+DEPENDS+=		hevea-[0-9]*:../../textproc/hevea
 
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
diff --git a/print/advi/PLIST b/print/advi/PLIST
index a63b8cb28cd..141d4c9bd2a 100644
--- a/print/advi/PLIST
+++ b/print/advi/PLIST
@@ -1,12 +1,115 @@
-@comment $NetBSD: PLIST,v 1.6 2015/01/24 03:55:34 mef Exp $
+@comment $NetBSD: PLIST,v 1.7 2015/01/24 07:27:46 mef Exp $
 bin/advi
 bin/advi.byt
 lib/ocaml/stublibs/dlladvi.so
+man/man1/advi.1
+share/doc/advi/advilogo.anim.gif
+share/doc/advi/advilogo.gif
+share/doc/advi/bar.gif
+share/doc/advi/faq.html
+share/doc/advi/index.html
+share/doc/advi/inria.gif
 share/doc/advi/manual.dvi
+share/doc/advi/manual.html
 share/doc/advi/manual.pdf
 share/doc/advi/manual.ps
+share/doc/advi/manualxxx.html
+share/doc/advi/pngs/basics/adviwait.png
+share/doc/advi/pngs/basics/adviwait.small.png
+share/doc/advi/pngs/basics/cash/cash.png
+share/doc/advi/pngs/basics/cash/cash.small.png
+share/doc/advi/pngs/basics/moderate.png
+share/doc/advi/pngs/basics/moderate.small.png
+share/doc/advi/pngs/basics/simple.png
+share/doc/advi/pngs/basics/simple.small.png
+share/doc/advi/pngs/f.png
+share/doc/advi/pngs/japanese/advi-j.png
+share/doc/advi/pngs/japanese/advi-j.small.png
+share/doc/advi/pngs/prosper/Join/behaviour_pi.png
+share/doc/advi/pngs/prosper/Join/behaviour_pi.small.png
+share/doc/advi/pngs/prosper/Join/join.png
+share/doc/advi/pngs/prosper/Join/join.small.png
+share/doc/advi/pngs/prosper/Join/join_title.png
+share/doc/advi/pngs/prosper/Join/join_title.small.png
+share/doc/advi/pngs/prosper/Join/pi.png
+share/doc/advi/pngs/prosper/Join/pi.small.png
+share/doc/advi/pngs/prosper/LL/LL_def.png
+share/doc/advi/pngs/prosper/LL/LL_def.small.png
+share/doc/advi/pngs/prosper/LL/LL_launch.png
+share/doc/advi/pngs/prosper/LL/LL_launch.small.png
+share/doc/advi/pngs/prosper/LL/LL_libre_vs_proprietaire.png
+share/doc/advi/pngs/prosper/LL/LL_libre_vs_proprietaire.small.png
+share/doc/advi/pngs/prosper/LL/LL_title.png
+share/doc/advi/pngs/prosper/LL/LL_title.small.png
+share/doc/advi/pngs/seminar/a14/a14_bezier.png
+share/doc/advi/pngs/seminar/a14/a14_bezier.small.png
+share/doc/advi/pngs/seminar/a14/a14_fill.png
+share/doc/advi/pngs/seminar/a14/a14_fill.small.png
+share/doc/advi/pngs/seminar/a14/a14_title.png
+share/doc/advi/pngs/seminar/a14/a14_title.small.png
+share/doc/advi/pngs/seminar/a14/bitmap.png
+share/doc/advi/pngs/seminar/a14/bitmap.small.png
+share/doc/advi/pngs/seminar/clock/OCamlODBC.png
+share/doc/advi/pngs/seminar/clock/OCamlODBC.small.png
+share/doc/advi/pngs/seminar/clock/clock_title.png
+share/doc/advi/pngs/seminar/clock/clock_title.small.png
+share/doc/advi/pngs/slitex/advi/advi.png
+share/doc/advi/pngs/slitex/advi/advi.small.png
+share/doc/advi/pngs/slitex/advi/advi_end.png
+share/doc/advi/pngs/slitex/advi/advi_end.small.png
+share/doc/advi/pngs/slitex/advi/interaction.png
+share/doc/advi/pngs/slitex/advi/interaction.small.png
+share/doc/advi/pngs/slitex/advi/interaction_source.png
+share/doc/advi/pngs/slitex/advi/interaction_source.small.png
+share/doc/advi/pngs/slitex/advi/test_colors.png
+share/doc/advi/pngs/slitex/advi/test_colors.small.png
+share/doc/advi/pngs/slitex/caml/caml.png
+share/doc/advi/pngs/slitex/caml/caml.small.png
+share/doc/advi/pngs/slitex/caml/caml_future.png
+share/doc/advi/pngs/slitex/caml/caml_future.small.png
+share/doc/advi/pngs/slitex/caml/caml_strength.png
+share/doc/advi/pngs/slitex/caml/caml_strength.small.png
+share/doc/advi/pngs/slitex/caml/code_evolutivity.png
+share/doc/advi/pngs/slitex/caml/code_evolutivity.small.png
+share/doc/advi/pngs/slitex/simplistic/simplistic.png
+share/doc/advi/pngs/slitex/simplistic/simplistic.small.png
+share/doc/advi/pngs/slitex/simplistic/simplistic_1.png
+share/doc/advi/pngs/slitex/simplistic/simplistic_1.small.png
+share/doc/advi/pngs/slitex/simplistic/simplistic_plan.png
+share/doc/advi/pngs/slitex/simplistic/simplistic_plan.small.png
+share/doc/advi/pngs/slitex/simplistic/simplistic_source.png
+share/doc/advi/pngs/slitex/simplistic/simplistic_source.small.png
+share/doc/advi/pngs/slitex/simplistic/simplistic_title.png
+share/doc/advi/pngs/slitex/simplistic/simplistic_title.small.png
+share/doc/advi/pngs/slitex/skin_detection/skin_detection.png
+share/doc/advi/pngs/slitex/skin_detection/skin_detection.small.png
+share/doc/advi/pngs/slitex/skin_detection/skin_detection_title.png
+share/doc/advi/pngs/slitex/skin_detection/skin_detection_title.small.png
+share/doc/advi/pngs/slitex/skin_detection/skin_illumination.png
+share/doc/advi/pngs/slitex/skin_detection/skin_illumination.small.png
+share/doc/advi/pngs/slitex/skin_detection/skin_variation.png
+share/doc/advi/pngs/slitex/skin_detection/skin_variation.small.png
+share/doc/advi/pngs/test/alpha_channel.png
+share/doc/advi/pngs/test/alpha_channel.small.png
+share/doc/advi/pngs/test/annotations.png
+share/doc/advi/pngs/test/annotations.small.png
+share/doc/advi/pngs/test/caml_whale.png
+share/doc/advi/pngs/test/caml_whale.small.png
+share/doc/advi/pngs/test/camltk_embedding.png
+share/doc/advi/pngs/test/camltk_embedding.small.png
+share/doc/advi/pngs/test/demo2.png
+share/doc/advi/pngs/test/demo2.small.png
+share/doc/advi/pngs/test/mldvi.png
+share/doc/advi/pngs/test/mldvi.small.png
+share/doc/advi/pngs/test/test_colors.png
+share/doc/advi/pngs/test/test_colors.small.png
+share/doc/advi/pngs/test/text_movements.png
+share/doc/advi/pngs/test/text_movements.small.png
+share/doc/advi/pngs/test/yellow_background.png
+share/doc/advi/pngs/test/yellow_background.small.png
 share/doc/advi/scratch_draw_splash.dvi
 share/doc/advi/scratch_write_splash.dvi
+share/doc/advi/screen-shots.html
 share/doc/advi/splash.dvi
 share/doc/html/advi/advilogo.anim.gif
 share/doc/html/advi/advilogo.gif
diff --git a/print/advi/distinfo b/print/advi/distinfo
index ac3da984ec2..22b77993be4 100644
--- a/print/advi/distinfo
+++ b/print/advi/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.8 2015/01/24 03:55:34 mef Exp $
+$NetBSD: distinfo,v 1.9 2015/01/24 07:27:46 mef Exp $
 
 SHA1 (advi-1.10.2.tar.gz) = b9a239ccdfccb3a8f726d140e703aa33c9afd350
 RMD160 (advi-1.10.2.tar.gz) = 7609b68e1a05b1057bb8f5c9e5c413c5d8111263
 Size (advi-1.10.2.tar.gz) = 9772060 bytes
-SHA1 (patch-Makefile.in) = 2d0714c4b411cf1248c74ac4f18e141c8b3572f6
-SHA1 (patch-configure) = cd53f7190a217beddff8e9988c489a4280e8d007
 SHA1 (patch-src_Makefile.in) = 3f9be7ac0c4a98b3e36c383ed2489b0d71e73f8a
diff --git a/print/advi/patches/patch-Makefile.in b/print/advi/patches/patch-Makefile.in
deleted file mode 100644
index b65bddf90d5..00000000000
--- a/print/advi/patches/patch-Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-Makefile.in,v 1.2 2015/01/24 03:55:34 mef Exp $
-
-Not to build doc
-1.10.2 claims doc problems fixed. But now getting
-! LaTeX Error: File `hevea.sty' not found.
-pkgsrc does not have following packge (yet).
-  http://hevea.inria.fr/
-
---- Makefile.in.orig	2011-08-07 14:15:44.000000000 +0000
-+++ Makefile.in	2011-08-07 14:16:03.000000000 +0000
-@@ -225,7 +225,7 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = src tex doc
-+SUBDIRS = src tex
- # SUBDIRS = src 
- DIST_SUBDIRS = $(SUBDIRS) examples
- CVSRELEASETAG = Release-$(subst .,_,$(VERSION))
diff --git a/print/advi/patches/patch-configure b/print/advi/patches/patch-configure
deleted file mode 100644
index 338b266bc28..00000000000
--- a/print/advi/patches/patch-configure
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2011/08/07 20:40:58 wiz Exp $
-
---- configure.orig	2011-08-04 13:40:01.000000000 +0000
-+++ configure	2011-08-07 15:50:51.000000000 +0000
-@@ -5624,7 +5624,7 @@
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking TeX root path" >&5
- $as_echo_n "checking TeX root path... " >&6; }
--texdir=`$KPSEXPAND '$TEXMFMAIN'`
-+texdir=`$KPSEXPAND '$TEXMFDIST'`
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $texdir" >&5
- $as_echo "$texdir" >&6; }
- if test -z "$texdir"; then
-@@ -5633,9 +5633,7 @@
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking LaTeX root path" >&5
- $as_echo_n "checking LaTeX root path... " >&6; }
--if test -d "$texdir/tex/latex"; then
--    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $texdir/tex/latex" >&5
--$as_echo "$texdir/tex/latex" >&6; }
-+#if test -d "$texdir/tex/latex"; then
-     # this ugly stuff, shamelessly stolen from lispdir computation, is supposed
-     # to find latex resources installation directory expressed in term of prefix
-     # the ugly [^\/] is meant to express [^\/] regexp
-@@ -5643,12 +5641,14 @@
- 	-e 's,/$,,' \
- 	-e '/.*\/lib\/[^\/]*\/tex\/latex$/{s,.*/lib/\([^\/]*\/tex\/latex\)$,${libdir}/\1,;p;q;}' \
- 	-e '/.*\/share\/[^\/]*\/tex\/latex$/{s,.*/share/\([^\/]*\/tex\/latex\),${datadir}/\1,;p;q;}'`
--else
--    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
--$as_echo "not found" >&6; }
--    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no LaTeX root path found, check your setup" >&5
--$as_echo "$as_me: WARNING: no LaTeX root path found, check your setup" >&2;}
--fi
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ($texdir/tex/latex) -> $latexdir" >&5
-+$as_echo "($texdir/tex/latex) -> $latexdir" >&6; }
-+#else
-+#    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-+#$as_echo "not found" >&6; }
-+#    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no LaTeX root path found, check your setup" >&5
-+#$as_echo "$as_me: WARNING: no LaTeX root path found, check your setup" >&2;}
-+#fi
- 
- 
- # # Checking gunzip and bunzip2. not mandatory.