Restore previously used file locations.

4 files changed, 79 insertions, 23 deletions

diff --git a/print/html2ps/Makefile b/print/html2ps/Makefile
index 47953d637d3..f27c132d9db 100644
--- a/print/html2ps/Makefile
+++ b/print/html2ps/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2005/12/04 16:34:34 kim Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/04 17:02:54 kim Exp $
 #
 
 DISTNAME=	html2ps-1.0b4
-PKGREVISION=	1
-CATEGORIES=	www
+PKGREVISION=	2
+CATEGORIES=	print
 MASTER_SITES=	http://www.tdb.uu.se/~jan/
 
 MAINTAINER=	kim@tac.nyc.ny.us
@@ -23,9 +23,9 @@ NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/html2ps
+	${INSTALL_DATA_DIR} ${PREFIX}/share/html2ps
 	@cd ${WRKSRC} && PATH=${LOCALBASE}/bin:${PREFIX}/bin ./install ${PREFIX}
-	@${INSTALL_DATA} ${WRKSRC}/sample ${PREFIX}/lib/html2ps/sample.rc
+	@${INSTALL_DATA} ${WRKSRC}/sample ${PREFIX}/share/html2ps/sample.rc
 
 .include "../../mk/tex.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/html2ps/PLIST b/print/html2ps/PLIST
index 15081715a70..1ee6da36c6d 100644
--- a/print/html2ps/PLIST
+++ b/print/html2ps/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2005/07/08 19:23:28 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/12/04 17:02:54 kim Exp $
 bin/html2ps
 man/man1/html2ps.1
 man/man5/html2psrc.5
-lib/html2ps/html2ps.html
-lib/html2ps/html2psrc
-lib/html2ps/sample.rc
-@dirrm lib/html2ps
+share/html2ps/html2ps.html
+share/html2ps/html2psrc
+share/html2ps/sample.rc
+@dirrm share/html2ps
diff --git a/print/html2ps/distinfo b/print/html2ps/distinfo
index c8a6656199a..04bf3d32d59 100644
--- a/print/html2ps/distinfo
+++ b/print/html2ps/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2005/07/08 19:23:28 hubertf Exp $
+$NetBSD: distinfo,v 1.6 2005/12/04 17:02:54 kim Exp $
 
 SHA1 (html2ps-1.0b4.tar.gz) = 09b1b6678e08eb08c49113e4837f0ac91942c095
 RMD160 (html2ps-1.0b4.tar.gz) = 248a6319eaddbf5fc342fd9150c6c8cb67c7df1f
 Size (html2ps-1.0b4.tar.gz) = 127901 bytes
-SHA1 (patch-aa) = 1c54fc020400d46f53b10bf43f046a2b064e7ad5
+SHA1 (patch-aa) = 51e8621bf6936c1760e991a61256cdc9485ab4d7
 SHA1 (patch-ab) = b541a724106572e2d82dfc9a73b3e11b22a9136b
diff --git a/print/html2ps/patches/patch-aa b/print/html2ps/patches/patch-aa
index 15d34202ca1..09907e89b89 100644
--- a/print/html2ps/patches/patch-aa
+++ b/print/html2ps/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2005/07/08 19:23:28 hubertf Exp $
+$NetBSD: patch-aa,v 1.3 2005/12/04 17:02:54 kim Exp $
 
---- install.orig	2005-03-03 13:25:29.000000000 +0100
-+++ install
-@@ -17,7 +17,7 @@ if(-e '/dev/null') {
+--- install.orig	2005-03-03 14:25:29.000000000 +0200
++++ install	2005-12-04 18:54:52.000000000 +0200
+@@ -17,7 +17,7 @@
      $pathsep = ':';
      $dirsep = '/';
      $sys = 'unix';
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.2 2005/07/08 19:23:28 hubertf Exp $
  } elsif (-e 'nul') {
      $pathsep = ';';
      $dirsep = '\\';
-@@ -57,8 +57,8 @@ where the abovementioned packages are. Y
+@@ -57,8 +57,8 @@
  the directories where the files should be placed.
  EOD
  
@@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.2 2005/07/08 19:23:28 hubertf Exp $
  
  print "\n";
  for $req (@perl) {
-@@ -134,19 +134,20 @@ if(@reqpath) {
+@@ -134,19 +134,22 @@
  
  chop ($cd = `pwd`);
  
@@ -30,7 +30,8 @@ $NetBSD: patch-aa,v 1.2 2005/07/08 19:23:28 hubertf Exp $
 - "\nBy default all files will be installed in subdirectories 'bin', 'lib',\n"
 - ."and 'man' in a common directory. Is this OK?");
 -$def = $ans=~/^y/i;
--
++$sharedir = "share";
+ 
 -if($def) {
 -    &getval($prefix, "$prefix", "\nEnter the name of this directory");
 -    &fixdir($prefix);
@@ -40,7 +41,7 @@ $NetBSD: patch-aa,v 1.2 2005/07/08 19:23:28 hubertf Exp $
 -    &makedir($prefix,0);
 -}
 +#&getval($ans, "y",
-+# "\nBy default all files will be installed in subdirectories 'bin', 'lib',\n"
++# "\nBy default all files will be installed in subdirectories 'bin', '$sharedir',\n"
 +# ."and 'man' in a common directory. Is this OK?");
 +#$def = $ans=~/^y/i;
 +$def = 1;
@@ -56,7 +57,19 @@ $NetBSD: patch-aa,v 1.2 2005/07/08 19:23:28 hubertf Exp $
  
  if($def) {
      $bindir = "$prefix${dirsep}bin";
-@@ -198,7 +199,7 @@ $cophy = 1;
+@@ -159,9 +162,9 @@
+ &makedir($bindir,$def);
+ 
+ if($def) {
+-    $glob = "$prefix${dirsep}lib${dirsep}html2ps";
++    $glob = "$prefix${dirsep}${sharedir}${dirsep}html2ps";
+ } else {
+-    &getval($glob, "$prefix${dirsep}lib${dirsep}html2ps",
++    &getval($glob, "$prefix${dirsep}${sharedir}${dirsep}html2ps",
+      "\nEnter the the directory where the global configuration file for\n"
+     ."html2ps should be put");
+     $glob =~ s|/$||g;
+@@ -198,7 +201,7 @@
  if($exist{'TeX'}) {
      $hfile = "";
      ($texdir = $dir{'TeX'}) =~ s|/bin$||;
@@ -65,7 +78,7 @@ $NetBSD: patch-aa,v 1.2 2005/07/08 19:23:28 hubertf Exp $
          "lib/inputs","lib/tex/macros","lib/tex/inputs") {
          if(-f "$texdir/$_/ushyph1.tex") {
              $hyph = "$texdir/$_";
-@@ -212,15 +213,15 @@ if($exist{'TeX'}) {
+@@ -212,15 +215,15 @@
          }
      }
      if($hfile) {
@@ -89,7 +102,41 @@ $NetBSD: patch-aa,v 1.2 2005/07/08 19:23:28 hubertf Exp $
      } else {
          &getval($hfile, "", "$ht I cannot find the pattern\nfile for English "
           ."in your TeX installation. (It should be called\n'hyphen.tex', "
-@@ -268,12 +269,13 @@ if($def) {
+@@ -236,9 +239,9 @@
+     }
+     if(!$hfile) {
+         if($def) {
+-            $hyph = "$prefix${dirsep}lib${dirsep}html2ps";
++            $hyph = "$prefix${dirsep}${sharedir}${dirsep}html2ps";
+         } else {
+-            &getval($hyph, "$prefix${dirsep}lib${dirsep}html2ps",
++            &getval($hyph, "$prefix${dirsep}${sharedir}${dirsep}html2ps",
+              "\nOK, I will use the supplied pattern file for English. Enter "
+             ."the directory\nwhere this file should be put");
+             &fixdir($hyph);
+@@ -246,9 +249,9 @@
+     }
+ } else {
+     if($def) {
+-        $hyph = "$prefix${dirsep}lib${dirsep}html2ps";
++        $hyph = "$prefix${dirsep}${sharedir}${dirsep}html2ps";
+     } else {
+-    &getval($hyph, "$prefix${dirsep}lib${dirsep}html2ps", "$ht A pattern file for English is\n"
++    &getval($hyph, "$prefix${dirsep}${sharedir}${dirsep}html2ps", "$ht A pattern file for English is\n"
+      ."included with html2ps (see the documentation how to install pattern\n"
+      ."files for other languages). Enter the directory where this file\n"
+      ."should be put");
+@@ -260,20 +263,21 @@
+ }
+ 
+ if($def) {
+-    $html = "$prefix${dirsep}lib${dirsep}html2ps";
++    $html = "$prefix${dirsep}${sharedir}${dirsep}html2ps";
+ } else {
+-    &getval($html, "$prefix${dirsep}lib${dirsep}html2ps",
++    &getval($html, "$prefix${dirsep}${sharedir}${dirsep}html2ps",
+      "\nEnter a directory where to put the HTML document describing\nhtml2ps");
+     &fixdir($html);
  }
  &makedir($html,$def);
  
@@ -109,3 +156,12 @@ $NetBSD: patch-aa,v 1.2 2005/07/08 19:23:28 hubertf Exp $
  if($format !~ /^other$/i) {
      $paper .= "    type: $format;";
  } else {
+@@ -431,7 +435,7 @@
+     copy $from => $_[0].$dirsep.$_[1] or die "*** Cannot write to $_[0]\n";
+ }
+ sub goodprefix {
+-    for ($prefix, "$prefix${dirsep}bin", "$prefix${dirsep}lib",
++    for ($prefix, "$prefix${dirsep}bin", "$prefix${dirsep}${sharedir}",
+ 	 "$prefix${dirsep}man")
+     {
+ 	if (-d $_ && !-w $_) {