CVS commit: pkgsrc/textproc/latex2html

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Sun Aug 19 18:03:30 UTC 2018

Modified Files:
        pkgsrc/textproc/latex2html: Makefile distinfo
        pkgsrc/textproc/latex2html/patches: patch-ab

Log Message:
Fix broken DESTDIR support. PKGREVISION -> 1.


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 pkgsrc/textproc/latex2html/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/textproc/latex2html/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/latex2html/patches/patch-ab

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/latex2html/Makefile
diff -u pkgsrc/textproc/latex2html/Makefile:1.47 pkgsrc/textproc/latex2html/Makefile:1.48
--- pkgsrc/textproc/latex2html/Makefile:1.47    Thu Aug 11 00:15:53 2016
+++ pkgsrc/textproc/latex2html/Makefile Sun Aug 19 18:03:29 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2016/08/11 00:15:53 mef Exp $
+# $NetBSD: Makefile,v 1.48 2018/08/19 18:03:29 dholland Exp $
 
 DISTNAME=      latex2html-2016
+PKGREVISION=   1
 CATEGORIES=    textproc converters
 MASTER_SITES=  ${MASTER_SITE_TEX_CTAN:=support/latex2html/}
 

Index: pkgsrc/textproc/latex2html/distinfo
diff -u pkgsrc/textproc/latex2html/distinfo:1.16 pkgsrc/textproc/latex2html/distinfo:1.17
--- pkgsrc/textproc/latex2html/distinfo:1.16    Wed Sep  6 16:49:47 2017
+++ pkgsrc/textproc/latex2html/distinfo Sun Aug 19 18:03:29 2018
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.16 2017/09/06 16:49:47 wiz Exp $
+$NetBSD: distinfo,v 1.17 2018/08/19 18:03:29 dholland Exp $
 
 SHA1 (latex2html-2016.tar.gz) = 667308a050a071106acc573f4b88f919bb0809c9
 RMD160 (latex2html-2016.tar.gz) = 1e400a65753ee8520acf1d3c4f9356d1e58fa033
 SHA512 (latex2html-2016.tar.gz) = 2a7d12bda145101c4099cd0efba7ccfd18eaa858c9ffe5223d0bc25eb57d298b94961289a6a79443000116a358ea8513d8054933f902aad21a67a2c0c2e41445
 Size (latex2html-2016.tar.gz) = 1149971 bytes
 SHA1 (patch-Makefile.in) = b9b94d3a0f561c67fd0f644c8632bfb540b749ec
-SHA1 (patch-ab) = 6d23f6bda65caff3fb0a5bfd67df44ee57a1ac43
+SHA1 (patch-ab) = 53ad611dec3cd301c907b0285020272da29ab8ef
 SHA1 (patch-configure) = a3b2d77020045b2b8f732f03d0d4d8045311efb9

Index: pkgsrc/textproc/latex2html/patches/patch-ab
diff -u pkgsrc/textproc/latex2html/patches/patch-ab:1.4 pkgsrc/textproc/latex2html/patches/patch-ab:1.5
--- pkgsrc/textproc/latex2html/patches/patch-ab:1.4     Wed Sep  6 16:49:47 2017
+++ pkgsrc/textproc/latex2html/patches/patch-ab Sun Aug 19 18:03:30 2018
@@ -1,16 +1,38 @@
-$NetBSD: patch-ab,v 1.4 2017/09/06 16:49:47 wiz Exp $
+$NetBSD: patch-ab,v 1.5 2018/08/19 18:03:30 dholland Exp $
 
-(the first half)
+(the last bit)
 date: 2006-04-07 11:23:19 +0900;  author: minskim;  state: Exp;
 Use tex infrastructure to run mktexlsr for texmf-local only.
 
-(second half)
-date: 2011-07-09 23:19:30 +0900;  author: bsiegert;  state: Exp;  lines: +18 -3;
-Add user-destdir support. Almost trivial except for one bug in the install
-script.
+(the rest)
+Add user-destdir support.
 
---- config/install.pl.orig     2002-11-29 11:49:01.000000000 +0000
+--- config/install.pl.orig     2016-04-19 16:52:35.000000000 +0000
 +++ config/install.pl
+@@ -294,15 +294,15 @@ my @icon_types = $cfg{'IMAGE_TYPES'} ? 
+ my $iconrx = join('|', @icon_types);
+ 
+ my $dest1 = "$cfg{'SHLIBDIR'}${dd}icons";
+-if((-d $dest1 && !-w _) || (-d $cfg{'SHLIBDIR'} && !-w _)) {
+-  print STDERR "Error: Cannot install icons in '$dest1': No write permission.\n";
+-  $dest1 = '';
+-}
++#if((-d $dest1 && !-w _) || (-d $cfg{'SHLIBDIR'} && !-w _)) {
++#  print STDERR "Error: Cannot install icons in '$dest1': No write permission.\n";
++#  $dest1 = '';
++#}
+ my $dest2 = $cfg{'ICONSTORAGE'} || '';
+-if(-d $dest2 && !-w $dest2) {
+-  print STDERR "Error: Cannot install icons in '$dest2': No write permission.\n";
+-  $dest2 = '';
+-}
++#if(-d $dest2 && !-w $dest2) {
++#  print STDERR "Error: Cannot install icons in '$dest2': No write permission.\n";
++#  $dest2 = '';
++#}
+ my $dir = "icons";
+ unless(opendir(DIR,$dir)) {
+   print STDERR qq{Error: Could not read directory "$dir": $!\n};
 @@ -372,12 +372,6 @@ foreach $item (sort keys %Install_items)
  
  if($cfg{TEXPATH}) {