3 files changed, 40 insertions, 36 deletions

diff --git a/print/latex2slides/Makefile b/print/latex2slides/Makefile
index 6ba305690a1d..938c7119e9a1 100644
--- a/print/latex2slides/Makefile
+++ b/print/latex2slides/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	latex2slides
-PORTVERSION=	0.8.1
+PORTVERSION=	1.0
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,21 +16,24 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Produces a set of HTML/JPEG slides from a TeX or LaTeX source
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter \
+RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick \
 		dvips:${PORTSDIR}/print/teTeX \
-		convert:${PORTSDIR}/graphics/ImageMagick
+		${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
 
 USE_REINPLACE=	yes
 USE_PYTHON=	yes
 NO_BUILD=	yes
+PLIST_SUB=	PORTNAME="${PORTNAME}" PORTVERSION="${PORTVERSION}"
 
 MANCOMPRESSED=	yes
-MAN1=	latex2slides.1
+MAN1=		latex2slides.1
 
 post-patch:
-	@${REINPLACE_CMD} -e "s,/usr,${PREFIX},g ; \
-		s,share/man,man,g" ${WRKSRC}/install
-	@${REINPLACE_CMD} -e "s,/usr/share,${PREFIX}/share,g" ${WRKSRC}/latex2slides
+.for file in install latex2slides
+	@${REINPLACE_CMD} -e "s,'/usr/bin/,'${PREFIX}/bin/,g ; \
+		 s,'/usr/share/latex2slides/,'${DATADIR}/,g ; \
+		 s,'/usr/share/man/,'${MANPREFIX}/man/,g" ${WRKSRC}/${file}
+.endfor
 
 do-install:
 	@(cd ${WRKSRC} ; ${PYTHON_CMD} ./install)
diff --git a/print/latex2slides/distinfo b/print/latex2slides/distinfo
index a20c7a9371c2..1cf6414ede51 100644
--- a/print/latex2slides/distinfo
+++ b/print/latex2slides/distinfo
@@ -1,2 +1,2 @@
-MD5 (latex2slides-0.8.1.tgz) = da72068e03a9e6d7a6b682bc32750f59
-SIZE (latex2slides-0.8.1.tgz) = 47113
+MD5 (latex2slides-1.0.tgz) = 2a322fce5ff82c32696f2c283002f446
+SIZE (latex2slides-1.0.tgz) = 52488
diff --git a/print/latex2slides/pkg-plist b/print/latex2slides/pkg-plist
index 09cd59652424..e1c09c53d544 100644
--- a/print/latex2slides/pkg-plist
+++ b/print/latex2slides/pkg-plist
@@ -1,28 +1,29 @@
 bin/latex2slides
-share/latex2slides/latex2slides-0.8.1/doc/documentation.html
-share/latex2slides/latex2slides-0.8.1/doc/faq.html
-share/latex2slides/latex2slides-0.8.1/doc/logo.jpg
-share/latex2slides/latex2slides-0.8.1/doc/manual.html
-share/latex2slides/latex2slides-0.8.1/doc/style.css
-share/latex2slides/latex2slides-0.8.1/icons/README
-share/latex2slides/latex2slides-0.8.1/icons/first.jpg
-share/latex2slides/latex2slides-0.8.1/icons/first.png
-share/latex2slides/latex2slides-0.8.1/icons/index.jpg
-share/latex2slides/latex2slides-0.8.1/icons/index.png
-share/latex2slides/latex2slides-0.8.1/icons/last.ico
-share/latex2slides/latex2slides-0.8.1/icons/last.jpg
-share/latex2slides/latex2slides-0.8.1/icons/last.png
-share/latex2slides/latex2slides-0.8.1/icons/next.ico
-share/latex2slides/latex2slides-0.8.1/icons/next.jpg
-share/latex2slides/latex2slides-0.8.1/icons/next.png
-share/latex2slides/latex2slides-0.8.1/icons/prev.jpg
-share/latex2slides/latex2slides-0.8.1/icons/prev.png
-share/latex2slides/latex2slides-0.8.1/samples/README
-share/latex2slides/latex2slides-0.8.1/samples/landscape.tex
-share/latex2slides/latex2slides-0.8.1/samples/landscape2.tex
-share/latex2slides/latex2slides-0.8.1/samples/portrait.tex
-@dirrm share/latex2slides/latex2slides-0.8.1/doc
-@dirrm share/latex2slides/latex2slides-0.8.1/icons
-@dirrm share/latex2slides/latex2slides-0.8.1/samples
-@dirrm share/latex2slides/latex2slides-0.8.1
-@dirrm share/latex2slides
+%%DATADIR%%/%%PORTNAME%%-%%PORTVERSION%%/doc/documentation.html
+%%DATADIR%%/%%PORTNAME%%-%%PORTVERSION%%/doc/faq.html
+%%DATADIR%%/%%PORTNAME%%-%%PORTVERSION%%/doc/latex2slides.1.html
+%%DATADIR%%/%%PORTNAME%%-%%PORTVERSION%%/doc/logo.jpg
+%%DATADIR%%/%%PORTNAME%%-%%PORTVERSION%%/doc/manual.html
+%%DATADIR%%/%%PORTNAME%%-%%PORTVERSION%%/doc/style.css
+%%DATADIR%%/%%PORTNAME%%-%%PORTVERSION%%/icons/README
+%%DATADIR%%/%%PORTNAME%%-%%PORTVERSION%%/icons/first.jpg
+%%DATADIR%%/%%PORTNAME%%-%%PORTVERSION%%/icons/first.png
+%%DATADIR%%/%%PORTNAME%%-%%PORTVERSION%%/icons/index.jpg
+%%DATADIR%%/%%PORTNAME%%-%%PORTVERSION%%/icons/index.png
+%%DATADIR%%/%%PORTNAME%%-%%PORTVERSION%%/icons/last.ico
+%%DATADIR%%/%%PORTNAME%%-%%PORTVERSION%%/icons/last.jpg
+%%DATADIR%%/%%PORTNAME%%-%%PORTVERSION%%/icons/last.png
+%%DATADIR%%/%%PORTNAME%%-%%PORTVERSION%%/icons/next.ico
+%%DATADIR%%/%%PORTNAME%%-%%PORTVERSION%%/icons/next.jpg
+%%DATADIR%%/%%PORTNAME%%-%%PORTVERSION%%/icons/next.png
+%%DATADIR%%/%%PORTNAME%%-%%PORTVERSION%%/icons/prev.jpg
+%%DATADIR%%/%%PORTNAME%%-%%PORTVERSION%%/icons/prev.png
+%%DATADIR%%/%%PORTNAME%%-%%PORTVERSION%%/samples/README
+%%DATADIR%%/%%PORTNAME%%-%%PORTVERSION%%/samples/landscape.tex
+%%DATADIR%%/%%PORTNAME%%-%%PORTVERSION%%/samples/landscape2.tex
+%%DATADIR%%/%%PORTNAME%%-%%PORTVERSION%%/samples/portrait.tex
+@dirrm %%DATADIR%%/%%PORTNAME%%-%%PORTVERSION%%/samples
+@dirrm %%DATADIR%%/%%PORTNAME%%-%%PORTVERSION%%/icons
+@dirrm %%DATADIR%%/%%PORTNAME%%-%%PORTVERSION%%/doc
+@dirrm %%DATADIR%%/%%PORTNAME%%-%%PORTVERSION%%
+@dirrm %%DATADIR%%