Update to 1.10.1, adding destdir support and switching to texlive,

from Nicolas Thauvin.

Version 1.10.1
	- Prefetching fonts to group calls to kpsewhich (starts faster)
	- Made scroll buttons preemptive (stop displaying)
	- Fix install path of dlladvi
	- Fix compatibility of event loop with new version of graphics

Version 1.10
	- Updated the doc
	- Bytecode version uses a library dlladvi.so
	- Changed configuration to use 4.0 of camlimages
	- Dynamics libraries loaded last (provided by Stefan Potyra)

Version 1.9
	- EPS files are read by advi and sent to gs
	- splash.dvi is now distributed and correctly installed
	- examples are distributed but not compiled by default
	- added conf/jpfonts.conf in the disbribution
	- gs path is now set by configure
	- Added support for gzip and bzip2 compressed files.
	- Fixed advi.man  (provided mostly by Debian managers).
	- Included security patches (provided by Debian managers).
Version 1.8
	Rendering EPS files with gs by default.
	PGF patches for pstrick support of PDF macros in advi.sty
	Bug fixes.
Version 1.7
2005/09/02
        Having Active-DVI compatible with the new Graphics library.
2004/12/07
        Getting rid of the new warnings of the Caml compiler.

1 files changed, 30 insertions, 32 deletions

diff --git a/print/advi/Makefile b/print/advi/Makefile
index a9ce0cead9a..39d71ed6d08 100644
--- a/print/advi/Makefile
+++ b/print/advi/Makefile
@@ -1,65 +1,63 @@
-# $NetBSD: Makefile,v 1.36 2011/04/22 13:44:31 obache Exp $
+# $NetBSD: Makefile,v 1.37 2011/08/07 20:40:58 wiz Exp $
 
-DISTNAME=		advi-1.6.0
-PKGREVISION=		11
+DISTNAME=		advi-1.10.1
 CATEGORIES=		print
-MASTER_SITES=		ftp://ftp.inria.fr/INRIA/Projects/cristal/advi/
-EXTRACT_SUFX=		.tgz
+MASTER_SITES=		http://gallium.inria.fr/advi/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://cristal.inria.fr/advi/
+HOMEPAGE=		http://gallium.inria.fr/advi/
 COMMENT=		Active-DVI Presenter
+LICENSE=		gnu-lgpl-v2
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 BUILD_DEPENDS+=		ocaml>=3.04:../../lang/ocaml
+BUILD_DEPENDS+=		ocaml-findlib>=1.2.6:../../devel/ocaml-findlib
+DEPENDS+=		camlimages>=4.0.0:../../graphics/camlimages
+DEPENDS+=		texlive-tetex>=2010:../../print/texlive-tetex
 
-TEX_ACCEPTED=		teTeX3
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake gs:run
-CONFIGURE_ARGS+=	--libdir=${PKG_LOCALTEXMFPREFIX:Q}
-
-# subst.mk ignores the files it thinks are not text files
-_SUBST_IS_TEXT_FILE=	true
+CONFIGURE_ARGS+=	--libdir=${PREFIX}/share/texmf-dist
+CONFIGURE_ARGS+=	--with-gs=${PREFIX}/bin/gs
 
-SUBST_CLASSES+=		gspath
-SUBST_MESSAGE.gspath=	Fixing gs pathname in binary.
-SUBST_STAGE.gspath=	pre-configure
-SUBST_FILES.gspath=	config.ml.in
-SUBST_SED.gspath=	-e "s,@PATH_GS@,${PREFIX}/bin/gs,g"
+INSTALL_UNSTRIPPED=	yes
 
-SUBST_CLASSES+=		paths
-SUBST_MESSAGE.paths=	Fixing config file path.
-SUBST_STAGE.paths=	post-configure
-SUBST_FILES.paths=	userfile.ml
-SUBST_SED.paths=	-e "s:/etc/advirc:${PKG_SYSCONFDIR}/advirc:g"
+SUBST_CLASSES+=		gs
+SUBST_STAGE.gs=		post-configure
+SUBST_FILES.gs=		src/config.ml.in
+SUBST_SED.gs=		-e 's,@GS@,gs,'
+SUBST_MESSAGE.gs=	Fixing hard-coded path to gs
 
-.include "../../print/teTeX/module.mk"
+INSTALLATION_DIRS=	share/doc/advi share/doc/html/advi
 
 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-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/advi
 	cd ${WRKSRC}/doc && ${INSTALL_DATA} *.ps *.pdf \
-		${PREFIX}/share/doc/advi
+		${DESTDIR}${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.* .
+		${DESTDIR}${PREFIX}/share/doc/advi
+	cd ${WRKSRC}/doc && ${INSTALL_DATA} *.html *.gif \
+		${DESTDIR}${PREFIX}/share/doc/html/advi
+	cd ${DESTDIR}${PREFIX}/share/doc/html/advi && ${LN} -sf ../../advi/manual.* .
 
+.include "../../print/kpathsea/texmf.mk"
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../graphics/camlimages/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../devel/nspr/buildlink3.mk"
 .include "../../mk/giflib.buildlink3.mk"
-.include "../../graphics/gdk-pixbuf/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../x11/lablgtk1/buildlink3.mk"
+.include "../../x11/lablgtk/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/libXinerama/buildlink3.mk"
 .include "../../x11/ocaml-graphics/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"