Permalink
Browse files

Add user-destdir support. Almost trivial except for one bug inthe ins…

…tall

script.
  • Loading branch information...
1 parent 5ee1bef commit 32a52a1999f3c31eb1c436e9d5291747c4d056e9 bsiegert committed Jul 9, 2011
Showing with 23 additions and 7 deletions.
  1. +2 −1 textproc/latex2html/Makefile
  2. +2 −2 textproc/latex2html/distinfo
  3. +19 −4 textproc/latex2html/patches/patch-ab
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2009/07/22 09:01:48 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2011/07/09 14:19:30 bsiegert Exp $
DISTNAME= latex2html-2008
#PKGNAME= latex2html-2008
@@ -16,6 +16,7 @@ DEPENDS+= netpbm>=10.29nb2:../../graphics/netpbm
TEX_ACCEPTED= teTeX3
USE_TOOLS+= gs:run perl:run
GNU_CONFIGURE= yes
+PKG_DESTDIR_SUPPORT= user-destdir
.include "../../mk/bsd.prefs.mk"
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2009/05/21 16:15:44 sno Exp $
+$NetBSD: distinfo,v 1.11 2011/07/09 14:19:30 bsiegert Exp $
SHA1 (latex2html-2008.tar.gz) = 5e0aa47572e0c13a4c5da51e963d5496be3f86e7
RMD160 (latex2html-2008.tar.gz) = a95f06253d6fc8808ffedcad7edf8235194d7756
Size (latex2html-2008.tar.gz) = 1133054 bytes
SHA1 (patch-aa) = 146235dbac76107a765b86b28a81329328d8e0db
-SHA1 (patch-ab) = 91028fa0c0aa42eac056ed1ad9ee53c586eb1fb5
+SHA1 (patch-ab) = 784228fd8fafec43439fb7ff429eb0ba1e103d43
@@ -1,8 +1,21 @@
-$NetBSD: patch-ab,v 1.1 2006/04/07 02:23:19 minskim Exp $
+$NetBSD: patch-ab,v 1.2 2011/07/09 14:19:30 bsiegert Exp $
---- config/install.pl.orig 2002-04-28 05:15:01.000000000 +0000
+--- config/install.pl.orig 2002-11-29 11:49:01.000000000 +0000
+++ config/install.pl
-@@ -394,10 +394,11 @@ if($cfg{TEXPATH}) {
+@@ -372,12 +372,6 @@ foreach $item (sort keys %Install_items)
+
+ if($cfg{TEXPATH}) {
+ print "\nNote: trying to install LaTeX2HTML style files in TeX directory tree\n ($cfg{TEXPATH})\n";
+- unless(mkpath($cfg{TEXPATH})) {
+- #my $testpath = $cfg{TEXPATH}; # to strip (latex2)html
+- #$testpath =~ s/[$dd$dd][^$dd$dd]*$//;
+- #if((-d $cfg{TEXPATH} && !-w _) || (-d $testpath && !-w _)) {
+- print STDERR "\nError: Cannot install LaTeX2HTML style files in $cfg{TEXPATH}\n";
+- } else {
+ my $dir = 'texinputs';
+ my $dest = $cfg{TEXPATH};
+ unless(opendir(DIR,$dir)) {
+@@ -394,12 +388,12 @@ if($cfg{TEXPATH}) {
}
}
closedir(DIR);
@@ -16,5 +29,7 @@ $NetBSD: patch-ab,v 1.1 2006/04/07 02:23:19 minskim Exp $
+# system($cfg{MKTEXLSR});
+# }
}
- }
+- }
}
+ print "Done. Have a lot of fun with LaTeX2HTML!\n";
+ exit 0;

0 comments on commit 32a52a1

Please sign in to comment.