NetBSD Problem Report #42329
From sdrake@xnet.co.nz Mon Nov 16 00:03:03 2009
Return-Path: <sdrake@xnet.co.nz>
Received: from mail.netbsd.org (mail.netbsd.org [204.152.190.11])
by www.NetBSD.org (Postfix) with ESMTP id C69F263C411
for <gnats-bugs@gnats.netbsd.org>; Mon, 16 Nov 2009 00:03:03 +0000 (UTC)
Message-Id: <alpine.LNX.2.00.0911161256090.25110@vqena.qenxr.bet.am>
Date: Mon, 16 Nov 2009 12:57:35 +1300 (NZDT)
From: Steven Drake <sdrake@xnet.co.nz>
To: gnats-bugs@gnats.netbsd.org
Subject: print/html2ps does not honor ${PKGMANDIR}
>Number: 42329
>Category: pkg
>Synopsis: print/html2ps does not honor ${PKGMANDIR}
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: kim
>State: closed
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Mon Nov 16 00:05:01 +0000 2009
>Closed-Date: Thu May 06 09:18:54 +0000 2010
>Last-Modified: Thu May 06 09:20:02 +0000 2010
>Originator: Steven Drake
>Release: pkgsrc-2009Q3
>Organization:
>Environment:
System: Linux idran 2.6.30 #2 PREEMPT Sun Aug 9 18:32:44 NZST 2009 i686 pentium4 i386 GNU/Linux
Architecture: pentium4
Machine: i686
C library: GNU C Library stable release version 2.10.1, by Roland McGrath et al.
>Description:
html2ps directly installs manpages to ${PREFIX}/man not ${PREFIX}/${PKGMANDIR}
>How-To-Repeat:
>Fix:
Index: pkgsrc/print/html2ps/Makefile
===================================================================
--- pkgsrc.orig/print/html2ps/Makefile
+++ pkgsrc/print/html2ps/Makefile
@@ -26,7 +26,7 @@ NO_BUILD= yes
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/html2ps
- @cd ${WRKSRC} && PATH=${LOCALBASE}/bin:${PREFIX}/bin ./install ${PREFIX}
+ @cd ${WRKSRC} && PATH=${LOCALBASE}/bin:${PREFIX}/bin ./install ${PREFIX} ${PKGMANDIR}
@${INSTALL_DATA} ${WRKSRC}/sample ${PREFIX}/share/html2ps/sample.rc
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/print/html2ps/patches/patch-aa
===================================================================
--- pkgsrc.orig/print/html2ps/patches/patch-aa
+++ pkgsrc/print/html2ps/patches/patch-aa
@@ -2,16 +2,17 @@ $NetBSD: patch-aa,v 1.5 2009/03/08 19:17
--- install.orig 2005-03-03 12:25:29.000000000 +0000
+++ install
-@@ -17,7 +17,7 @@ if(-e '/dev/null') {
+@@ -17,7 +17,8 @@ if(-e '/dev/null') {
$pathsep = ':';
$dirsep = '/';
$sys = 'unix';
- $prefix = '/usr/local';
+ $prefix = $ARGV[0];
++ $mandir = $ARGV[1];
} elsif (-e 'nul') {
$pathsep = ';';
$dirsep = '\\';
-@@ -57,8 +57,8 @@ where the abovementioned packages are. Y
+@@ -57,8 +58,8 @@ where the abovementioned packages are. Y
the directories where the files should be placed.
EOD
@@ -22,7 +23,7 @@ $NetBSD: patch-aa,v 1.5 2009/03/08 19:17
print "\n";
for $req (@perl) {
-@@ -134,19 +134,22 @@ if(@reqpath) {
+@@ -134,19 +135,22 @@ if(@reqpath) {
chop ($cd = `pwd`);
@@ -57,7 +58,7 @@ $NetBSD: patch-aa,v 1.5 2009/03/08 19:17
if($def) {
$bindir = "$prefix${dirsep}bin";
-@@ -159,9 +162,9 @@ if($def) {
+@@ -159,9 +163,9 @@ if($def) {
&makedir($bindir,$def);
if($def) {
@@ -69,7 +70,25 @@ $NetBSD: patch-aa,v 1.5 2009/03/08 19:17
"\nEnter the the directory where the global configuration file for\n"
."html2ps should be put");
$glob =~ s|/$||g;
-@@ -198,7 +201,7 @@ $cophy = 1;
+@@ -174,7 +178,7 @@ if(-f "$glob${dirsep}html2psrc") {
+ }
+
+ if($def) {
+- $man1 = "$prefix${dirsep}man${dirsep}man1";
++ $man1 = "$prefix${dirsep}${mandir}${dirsep}man1";
+ } else {
+ &getval($man1, "$prefix${dirsep}man${dirsep}man1",
+ "\nEnter the directory for the html2ps manual page");
+@@ -183,7 +187,7 @@ if($def) {
+ &makedir($man1,$def);
+
+ if($def) {
+- $man5 = "$prefix${dirsep}man${dirsep}man5";
++ $man5 = "$prefix${dirsep}${mandir}${dirsep}man5";
+ } else {
+ &getval($man5, "$prefix${dirsep}man${dirsep}man5",
+ "\nEnter the directory for the manual page describing the configuration\n"
+@@ -198,7 +202,7 @@ $cophy = 1;
if($exist{'TeX'}) {
$hfile = "";
($texdir = $dir{'TeX'}) =~ s|/bin$||;
@@ -78,7 +97,7 @@ $NetBSD: patch-aa,v 1.5 2009/03/08 19:17
"lib/inputs","lib/tex/macros","lib/tex/inputs") {
if(-f "$texdir/$_/ushyph1.tex") {
$hyph = "$texdir/$_";
-@@ -212,15 +215,15 @@ if($exist{'TeX'}) {
+@@ -212,15 +216,15 @@ if($exist{'TeX'}) {
}
}
if($hfile) {
@@ -102,7 +121,7 @@ $NetBSD: patch-aa,v 1.5 2009/03/08 19:17
} else {
&getval($hfile, "", "$ht I cannot find the pattern\nfile for English "
."in your TeX installation. (It should be called\n'hyphen.tex', "
-@@ -236,9 +239,9 @@ if($exist{'TeX'}) {
+@@ -236,9 +240,9 @@ if($exist{'TeX'}) {
}
if(!$hfile) {
if($def) {
@@ -114,7 +133,7 @@ $NetBSD: patch-aa,v 1.5 2009/03/08 19:17
"\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 @@ if($exist{'TeX'}) {
+@@ -246,9 +250,9 @@ if($exist{'TeX'}) {
}
} else {
if($def) {
@@ -126,7 +145,7 @@ $NetBSD: patch-aa,v 1.5 2009/03/08 19:17
."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($cophy) {
+@@ -260,20 +264,21 @@ if($cophy) {
}
if($def) {
@@ -156,7 +175,7 @@ $NetBSD: patch-aa,v 1.5 2009/03/08 19:17
if($format !~ /^other$/i) {
$paper .= " type: $format;";
} else {
-@@ -431,7 +435,7 @@ sub inst {
+@@ -431,7 +436,7 @@ sub inst {
copy $from => $_[0].$dirsep.$_[1] or die "*** Cannot write to $_[0]\n";
}
sub goodprefix {
--
Steven
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: pkg-manager->kim
Responsible-Changed-By: wiz@NetBSD.org
Responsible-Changed-When: Mon, 16 Nov 2009 11:35:17 +0000
Responsible-Changed-Why:
Over to maintainer.
State-Changed-From-To: open->closed
State-Changed-By: sbd@NetBSD.org
State-Changed-When: Thu, 06 May 2010 09:18:54 +0000
State-Changed-Why:
done
From: Steven Drake <sbd@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc:
Subject: PR/42329 CVS commit: pkgsrc/print/html2ps
Date: Thu, 6 May 2010 09:17:27 +0000
Module Name: pkgsrc
Committed By: sbd
Date: Thu May 6 09:17:27 UTC 2010
Modified Files:
pkgsrc/print/html2ps: Makefile distinfo
pkgsrc/print/html2ps/patches: patch-aa
Log Message:
honor PKGMANDIR, from PR 42329
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/print/html2ps/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/print/html2ps/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/print/html2ps/patches/patch-aa
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
>Unformatted:
(Contact us)
$NetBSD: query-full-pr,v 1.51 2026/08/10 02:28:17 riastradh Exp $
$NetBSD: gnats_config.sh,v 1.10 2026/05/13 22:00:09 riastradh Exp $
Copyright © 1994-2026
The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.