Sun Aug 19 18:03:30 2018 UTC ()
Fix broken DESTDIR support. PKGREVISION -> 1.


(dholland)
diff -r1.47 -r1.48 pkgsrc/textproc/latex2html/Makefile
diff -r1.16 -r1.17 pkgsrc/textproc/latex2html/distinfo
diff -r1.4 -r1.5 pkgsrc/textproc/latex2html/patches/patch-ab
cvs diff -r1.47 -r1.48 pkgsrc/textproc/latex2html/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/latex2html/Makefile 2016/08/11 00:15:53 1.47
+++ pkgsrc/textproc/latex2html/Makefile 2018/08/19 18:03:29 1.48
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.47 2016/08/11 00:15:53 mef Exp $ 1# $NetBSD: Makefile,v 1.48 2018/08/19 18:03:29 dholland Exp $
2 2
3DISTNAME= latex2html-2016 3DISTNAME= latex2html-2016
 4PKGREVISION= 1
4CATEGORIES= textproc converters 5CATEGORIES= textproc converters
5MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=support/latex2html/} 6MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=support/latex2html/}
6 7
7MAINTAINER= wennmach@NetBSD.org 8MAINTAINER= wennmach@NetBSD.org
8HOMEPAGE= http://www.latex2html.org/ 9HOMEPAGE= http://www.latex2html.org/
9COMMENT= LaTeX to HTML converter 10COMMENT= LaTeX to HTML converter
10LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
11 12
12DEPENDS+= tex-graphics-[0-9]*:../../print/tex-graphics 13DEPENDS+= tex-graphics-[0-9]*:../../print/tex-graphics
13DEPENDS+= tex-hyperref-[0-9]*:../../print/tex-hyperref 14DEPENDS+= tex-hyperref-[0-9]*:../../print/tex-hyperref
14DEPENDS+= tex-latex-[0-9]*:../../print/tex-latex 15DEPENDS+= tex-latex-[0-9]*:../../print/tex-latex
15DEPENDS+= tex-latex-bin-[0-9]*:../../print/tex-latex-bin 16DEPENDS+= tex-latex-bin-[0-9]*:../../print/tex-latex-bin
16DEPENDS+= tex-tex-[0-9]*:../../print/tex-tex 17DEPENDS+= tex-tex-[0-9]*:../../print/tex-tex
cvs diff -r1.16 -r1.17 pkgsrc/textproc/latex2html/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/latex2html/distinfo 2017/09/06 16:49:47 1.16
+++ pkgsrc/textproc/latex2html/distinfo 2018/08/19 18:03:29 1.17
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.16 2017/09/06 16:49:47 wiz Exp $ 1$NetBSD: distinfo,v 1.17 2018/08/19 18:03:29 dholland Exp $
2 2
3SHA1 (latex2html-2016.tar.gz) = 667308a050a071106acc573f4b88f919bb0809c9 3SHA1 (latex2html-2016.tar.gz) = 667308a050a071106acc573f4b88f919bb0809c9
4RMD160 (latex2html-2016.tar.gz) = 1e400a65753ee8520acf1d3c4f9356d1e58fa033 4RMD160 (latex2html-2016.tar.gz) = 1e400a65753ee8520acf1d3c4f9356d1e58fa033
5SHA512 (latex2html-2016.tar.gz) = 2a7d12bda145101c4099cd0efba7ccfd18eaa858c9ffe5223d0bc25eb57d298b94961289a6a79443000116a358ea8513d8054933f902aad21a67a2c0c2e41445 5SHA512 (latex2html-2016.tar.gz) = 2a7d12bda145101c4099cd0efba7ccfd18eaa858c9ffe5223d0bc25eb57d298b94961289a6a79443000116a358ea8513d8054933f902aad21a67a2c0c2e41445
6Size (latex2html-2016.tar.gz) = 1149971 bytes 6Size (latex2html-2016.tar.gz) = 1149971 bytes
7SHA1 (patch-Makefile.in) = b9b94d3a0f561c67fd0f644c8632bfb540b749ec 7SHA1 (patch-Makefile.in) = b9b94d3a0f561c67fd0f644c8632bfb540b749ec
8SHA1 (patch-ab) = 6d23f6bda65caff3fb0a5bfd67df44ee57a1ac43 8SHA1 (patch-ab) = 53ad611dec3cd301c907b0285020272da29ab8ef
9SHA1 (patch-configure) = a3b2d77020045b2b8f732f03d0d4d8045311efb9 9SHA1 (patch-configure) = a3b2d77020045b2b8f732f03d0d4d8045311efb9
cvs diff -r1.4 -r1.5 pkgsrc/textproc/latex2html/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/textproc/latex2html/patches/patch-ab 2017/09/06 16:49:47 1.4
+++ pkgsrc/textproc/latex2html/patches/patch-ab 2018/08/19 18:03:30 1.5
@@ -1,26 +1,48 @@ @@ -1,26 +1,48 @@
1$NetBSD: patch-ab,v 1.4 2017/09/06 16:49:47 wiz Exp $ 1$NetBSD: patch-ab,v 1.5 2018/08/19 18:03:30 dholland Exp $
2 2
3(the first half) 3(the last bit)
4date: 2006-04-07 11:23:19 +0900; author: minskim; state: Exp; 4date: 2006-04-07 11:23:19 +0900; author: minskim; state: Exp;
5Use tex infrastructure to run mktexlsr for texmf-local only. 5Use tex infrastructure to run mktexlsr for texmf-local only.
6 6
7(second half) 7(the rest)
8date: 2011-07-09 23:19:30 +0900; author: bsiegert; state: Exp; lines: +18 -3; 8Add user-destdir support.
9Add user-destdir support. Almost trivial except for one bug in the install 
10script. 
11 9
12--- config/install.pl.orig 2002-11-29 11:49:01.000000000 +0000 10--- config/install.pl.orig 2016-04-19 16:52:35.000000000 +0000
13+++ config/install.pl 11+++ config/install.pl
 12@@ -294,15 +294,15 @@ my @icon_types = $cfg{'IMAGE_TYPES'} ?
 13 my $iconrx = join('|', @icon_types);
 14
 15 my $dest1 = "$cfg{'SHLIBDIR'}${dd}icons";
 16-if((-d $dest1 && !-w _) || (-d $cfg{'SHLIBDIR'} && !-w _)) {
 17- print STDERR "Error: Cannot install icons in '$dest1': No write permission.\n";
 18- $dest1 = '';
 19-}
 20+#if((-d $dest1 && !-w _) || (-d $cfg{'SHLIBDIR'} && !-w _)) {
 21+# print STDERR "Error: Cannot install icons in '$dest1': No write permission.\n";
 22+# $dest1 = '';
 23+#}
 24 my $dest2 = $cfg{'ICONSTORAGE'} || '';
 25-if(-d $dest2 && !-w $dest2) {
 26- print STDERR "Error: Cannot install icons in '$dest2': No write permission.\n";
 27- $dest2 = '';
 28-}
 29+#if(-d $dest2 && !-w $dest2) {
 30+# print STDERR "Error: Cannot install icons in '$dest2': No write permission.\n";
 31+# $dest2 = '';
 32+#}
 33 my $dir = "icons";
 34 unless(opendir(DIR,$dir)) {
 35 print STDERR qq{Error: Could not read directory "$dir": $!\n};
14@@ -372,12 +372,6 @@ foreach $item (sort keys %Install_items) 36@@ -372,12 +372,6 @@ foreach $item (sort keys %Install_items)
15  37
16 if($cfg{TEXPATH}) { 38 if($cfg{TEXPATH}) {
17 print "\nNote: trying to install LaTeX2HTML style files in TeX directory tree\n ($cfg{TEXPATH})\n"; 39 print "\nNote: trying to install LaTeX2HTML style files in TeX directory tree\n ($cfg{TEXPATH})\n";
18- unless(mkpath($cfg{TEXPATH})) { 40- unless(mkpath($cfg{TEXPATH})) {
19- #my $testpath = $cfg{TEXPATH}; # to strip (latex2)html 41- #my $testpath = $cfg{TEXPATH}; # to strip (latex2)html
20- #$testpath =~ s/[$dd$dd][^$dd$dd]*$//; 42- #$testpath =~ s/[$dd$dd][^$dd$dd]*$//;
21- #if((-d $cfg{TEXPATH} && !-w _) || (-d $testpath && !-w _)) { 43- #if((-d $cfg{TEXPATH} && !-w _) || (-d $testpath && !-w _)) {
22- print STDERR "\nError: Cannot install LaTeX2HTML style files in $cfg{TEXPATH}\n"; 44- print STDERR "\nError: Cannot install LaTeX2HTML style files in $cfg{TEXPATH}\n";
23- } else { 45- } else {
24 my $dir = 'texinputs'; 46 my $dir = 'texinputs';
25 my $dest = $cfg{TEXPATH}; 47 my $dest = $cfg{TEXPATH};
26 unless(opendir(DIR,$dir)) { 48 unless(opendir(DIR,$dir)) {