[arch-commits] Commit in latex2html/trunk (PKGBUILD install-destdir.patch)

[Rémy Oudompheng]

    Date: Monday, April 25, 2011 @ 13:05:18
  Author: remy
Revision: 120558

PKGBUILD cleanup, remove url.sty from package (FS#22930)

Added:
  latex2html/trunk/install-destdir.patch
Modified:
  latex2html/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |   47 ++++++++++++++++++++++-------------------------
 install-destdir.patch |   20 ++++++++++++++++++++
 2 files changed, 42 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-04-25 16:52:58 UTC (rev 120557)
+++ PKGBUILD	2011-04-25 17:05:18 UTC (rev 120558)
@@ -5,41 +5,38 @@
 
 pkgname=latex2html
 pkgver=2008
-pkgrel=1
-pkgdesc="latex2html is a convertor written in Perl that converts LaTeX documents to HTML."
-arch=('i686' 'x86_64')
-url="http://saftsack.fs.uni-bayreuth.de/~latex2ht/"
+pkgrel=2
+pkgdesc="a convertor written in Perl that converts LaTeX documents to HTML."
+arch=('any')
+url="http://www.ctan.org/pkg/latex2html/"
 depends=('perl' 'ghostscript' 'texlive-core' 'libpng' 'giflib' 'netpbm')
 install=$pkgname.install
 license=('GPL2')
-source=(http://saftsack.fs.uni-bayreuth.de/~latex2ht/current/$pkgname-$pkgver.tar.gz)
+source=(http://mirrors.ctan.org/support/${pkgname}/$pkgname-$pkgver.tar.gz
+ install-destdir.patch)
+md5sums=('275ab6cfa8ca9328446b7f40d8dc302e'
+         '5b77601b36abca4fff3e2f75ccf15499')
 
 build() {
 	cd $srcdir/$pkgname-$pkgver
-	./configure --prefix=$startdir/pkg/usr \
-	    --shlibdir=$startdir/pkg/usr/lib/$pkgname \
-	    --with-texpath=$startdir/pkg/usr/share/texmf/tex/latex/html \
+	patch -Np0 -i ${srcdir}/install-destdir.patch
+	./configure --prefix=/usr \
+	    --shlibdir=/usr/lib/$pkgname \
+	    --with-texpath=/usr/share/texmf/tex/latex/html \
 	    --enable-wrapper \
 	    --enable-gif \
-	    --enable-png || return 1
+	    --enable-png
 
-	make || return 1
-	make install || return 1
-	
-	find $startdir/pkg/usr -type f -print | while read filename; do
-	    if [ ! -z '`grep "$startdir" "$filename"`' ]; then
-		mv $filename $filename.mkpkg
-		sed -e "s#$pkgdir##g" -e "s#$srcdir##g" < $filename.mkpkg > $filename
-		rm $filename.mkpkg
-	    fi
-	done
+	make
+}
 
-	# move files to FHS location
-	mv $startdir/pkg/usr/cfgcache.pm $startdir/pkg/usr/l2hconf.pm $startdir/pkg/usr/lib/$pkgname/
-
+package() {
+	cd $srcdir/$pkgname-$pkgver
+	make DESTDIR=${pkgdir} install
+	
 	# set correct permission on executables
-	chmod 755 $pkgdir/usr/bin/pstoimg \
-	    $pkgdir/usr/bin/$pkgname \
-	    $pkgdir/usr/bin/texexpand
+	chmod 755 $pkgdir/usr/bin/{pstoimg,texexpand,latex2html}
 
+	# avoid conflict with TeXLive
+	rm -f ${pkgdir}/usr/share/texmf/tex/latex/html/url.sty
 }

Added: install-destdir.patch
===================================================================
--- install-destdir.patch	                        (rev 0)
+++ install-destdir.patch	2011-04-25 17:05:18 UTC (rev 120558)
@@ -0,0 +1,20 @@
+--- config/install.pl.old	2011-04-25 09:32:26.052179167 -0700
++++ config/install.pl	2011-04-25 09:33:28.262180892 -0700
+@@ -372,14 +372,15 @@
+ 
+ if($cfg{TEXPATH}) {
+   print "\nNote: trying to install LaTeX2HTML style files in TeX directory tree\n     ($cfg{TEXPATH})\n";
+-  unless(mkpath($cfg{TEXPATH})) {
++  my $dest = $cfg{TEXPATH};
++  $dest = $ENV{'DESTDIR'}.$dest if($ENV{'DESTDIR'});
++  unless(mkpath($dest)) {
+   #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)) {
+       print STDERR qq{Error: Could not read directory "$dir": $!\n};
+     } else {