6 files changed, 30 insertions, 18 deletions

diff --git a/japanese/latex2html/Makefile b/japanese/latex2html/Makefile
index 2991e47fd004..dcab4adcdd66 100644
--- a/japanese/latex2html/Makefile
+++ b/japanese/latex2html/Makefile
@@ -38,28 +38,14 @@ NO_BUILD=	yes
 L2HDIR=		${PREFIX}/share/latex2html
 
 post-patch:
-.for f in configure-pstoimg latex2html latex2html.config \
-	ps2img-n pstoimg pstoimg_nopipes
-		${PERL} -e "s:\\\$$ENV{'L2HMODULE'}/user:${L2HDIR}:" \
-			-pi ${WRKSRC}/$f
-.endfor
 .for f in configure-pstoimg install-test latex2html makemap \
 	ps2img-n pstoimg pstoimg_nopipes texexpand
 		${PERL} -e "s:^\#!/usr/local/bin/perl:\#!${PERL}:" \
 		-pi ${WRKSRC}/$f
 .endfor
-	${PERL} -e "s:^use lib \"/usr/local/share/latex2html\":use lib \'${L2HDIR}\':" \
-	${PERL} -e "s:/usr/local/share/latex2html:${L2HDIR}:" \
-	-pi ${WRKSRC}/texexpand
-.ifdef WITH_GIF
-	${PERL} -pi -e "s|IMAGE_TYPE=.*;|IMAGE_TYPE='gif';|" \
-		${WRKSRC}/latex2html.config
-.endif
 
 do-install:
 	${MKDIR} ${L2HDIR}
-	${INSTALL_DATA} ${FILESDIR}/local.pm ${FILESDIR}/DBM.tst.db \
-		${FILESDIR}/TEST2.TMP ${L2HDIR}
 .for dir in IndicTeX-HTML XyMTeX-HTML cweb2html docs/changebar \
 	docs/hthtml docs/psfiles docs example foilhtml icon-dos icons.gif \
 	icons.png makeseg styles tests texinputs versions
@@ -75,6 +61,11 @@ do-install:
 .endfor
 	${MKDIR} ${PREFIX}/share/texmf/tex/latex/latex2html
 	${INSTALL_DATA} ${WRKSRC}/texinputs/* ${PREFIX}/share/texmf/tex/latex/latex2html
-	${INSTALL_SCRIPT} ${WRKSRC}/latex2html ${PREFIX}/bin
+.ifdef WITH_GIF
+	cd ${L2HDIR}; ${CAT} ${FILESDIR}/answer-gif | ${PERL} install-test
+.else
+	cd ${L2HDIR}; ${CAT} ${FILESDIR}/answer-png | ${PERL} install-test
+.endif
+	${INSTALL_SCRIPT} ${L2HDIR}/latex2html ${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/japanese/latex2html/files/answer-gif b/japanese/latex2html/files/answer-gif
new file mode 100644
index 000000000000..7df36dd9d432
--- /dev/null
+++ b/japanese/latex2html/files/answer-gif
@@ -0,0 +1,7 @@
+
+
+
+g
+
+
+
diff --git a/japanese/latex2html/files/answer-png b/japanese/latex2html/files/answer-png
new file mode 100644
index 000000000000..b8d1824a3d4d
--- /dev/null
+++ b/japanese/latex2html/files/answer-png
@@ -0,0 +1,7 @@
+
+
+
+p
+
+
+
diff --git a/japanese/latex2html/pkg-comment b/japanese/latex2html/pkg-comment
index 61bcde833184..48d2eae654b3 100644
--- a/japanese/latex2html/pkg-comment
+++ b/japanese/latex2html/pkg-comment
@@ -1 +1 @@
-Japanese LaTeX2HTML with JP patch
+Japanese LaTeX2HTML with JA patch
diff --git a/japanese/latex2html/pkg-descr b/japanese/latex2html/pkg-descr
index e80022e2519e..53ca9c408255 100644
--- a/japanese/latex2html/pkg-descr
+++ b/japanese/latex2html/pkg-descr
@@ -1,4 +1,4 @@
-Japanese LaTeX2HTML with JP patch
+Japanese LaTeX2HTML with JA patch
 
 This program can be used to convert LaTeX to HTML.  It has many configuration
 options configurable by editing a configuration file.  It can handle equations
diff --git a/japanese/latex2html/pkg-plist b/japanese/latex2html/pkg-plist
index df55905efe66..7fe1cd8f4090 100644
--- a/japanese/latex2html/pkg-plist
+++ b/japanese/latex2html/pkg-plist
@@ -63,6 +63,7 @@ share/latex2html/changebar/chbar.sh
 share/latex2html/changebar/manifest.txt
 share/latex2html/changebar/update.txt
 share/latex2html/configure-pstoimg
+share/latex2html/configure-pstoimg.bak
 share/latex2html/cweb2html/Makefile
 share/latex2html/cweb2html/README
 share/latex2html/cweb2html/cweb.perl
@@ -236,12 +237,15 @@ share/latex2html/icons.png/whiteball.png
 share/latex2html/icons.png/yellowball.png
 share/latex2html/install-test
 share/latex2html/latex2html
+share/latex2html/latex2html.bak
 share/latex2html/latex2html.config
+share/latex2html/latex2html.config.bak
 share/latex2html/local.pm
 share/latex2html/makemap
 share/latex2html/makeseg/makeseg
 share/latex2html/makeseg/makeseg.tex
 share/latex2html/ps2img-n
+share/latex2html/ps2img-n.bak
 share/latex2html/psfiles/HTMLtab.ps
 share/latex2html/psfiles/dn.gif
 share/latex2html/psfiles/eform.ps
@@ -259,7 +263,9 @@ share/latex2html/psfiles/figure.ps
 share/latex2html/psfiles/table.ps
 share/latex2html/psfiles/up.gif
 share/latex2html/pstoimg
+share/latex2html/pstoimg.bak
 share/latex2html/pstoimg_nopipes
+share/latex2html/pstoimg_nopipes.bak
 share/latex2html/readme.hthtml
 share/latex2html/styles/CJK.perl
 share/latex2html/styles/TEMPLATE.perl
@@ -374,6 +380,7 @@ share/latex2html/tests/pages.tex
 share/latex2html/tests/pages1.eps
 share/latex2html/tests/rrm-col.tex
 share/latex2html/texexpand
+share/latex2html/texexpand.bak
 share/latex2html/texinputs/floatflt.ins
 share/latex2html/texinputs/frames.sty
 share/latex2html/texinputs/heqn.sty
@@ -412,6 +419,7 @@ share/texmf/tex/latex/latex2html/justify.sty
 share/texmf/tex/latex/latex2html/ldump.sty
 share/texmf/tex/latex/latex2html/url.sty
 share/texmf/tex/latex/latex2html/verbatimfiles.sty
+@dirrm share/texmf/tex/latex/latex2html/
 @dirrm share/latex2html/IndicTeX-HTML
 @dirrm share/latex2html/XyMTeX-HTML
 @dirrm share/latex2html/changebar
@@ -433,4 +441,3 @@ share/texmf/tex/latex/latex2html/verbatimfiles.sty
 @dirrm share/latex2html/texinputs
 @dirrm share/latex2html/versions
 @dirrm share/latex2html
-@dirrm share/texmf/tex/latex/latex2html/