Date: Sat, 06 May 2000 22:01:55 +0100 From: Ben Smithurst <ben@scientia.demon.co.uk> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/18421: bkmrkconv doesn't allow for per-user customization Message-ID: <E12oBhz-0004tg-00@magnesium.scientia.demon.co.uk>
next in thread | raw e-mail | index | archive | help
>Number: 18421
>Category: ports
>Synopsis: bkmrkconv doesn't allow for per-user customization
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun May 07 01:10:18 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: Ben Smithurst
>Release: FreeBSD 3.4-STABLE i386
>Organization:
>Environment:
>Description:
The bkmrkconv port is patched so that it unconditionally reads files
from /usr/local/share/bkmrkconv rather than from the user's output
directory (which is what the unpatched version did). I think it would
be better to only go to /usr/local/share if the user's version doesn't
exist.
>How-To-Repeat:
make a 'src' directory in your output directory, customize the
{links,root,contents}page.html files, see that this doesn't affect
anything.
>Fix:
Index: patches/patch-aa
===================================================================
RCS file: /usr/cvs/ports/www/bkmrkconv/patches/patch-aa,v
retrieving revision 1.1
diff -u -r1.1 patch-aa
--- patch-aa 2000/03/29 19:44:35 1.1
+++ patch-aa 2000/05/06 20:53:51
@@ -1,16 +1,13 @@
---- bkmrkconv.pl Thu Mar 23 09:22:20 2000
-+++ bkmrkconv.pl.new Thu Mar 23 09:25:54 2000
-@@ -70,9 +70,10 @@
+--- bkmrkconv.pl.orig Wed Feb 9 15:50:11 2000
++++ bkmrkconv.pl Sat May 6 21:53:43 2000
+@@ -422,7 +422,9 @@
+ my ($file) = @_;
+ my $data = '';
- chomp(my $oldcwd = `pwd`);
- chdir $outputDir;
--my $rootpage = &readFile("src/rootpage.html");
--my $linkspage = &readFile("src/linkspage.html");
--my $contentspage = &readFile("src/contentspage.html") if ($doContents);
-+my $shareDir = '/usr/local/share/bkmrkconv';
-+my $rootpage = &readFile("$shareDir/src/rootpage.html");
-+my $linkspage = &readFile("$shareDir/src/linkspage.html");
-+my $contentspage = &readFile("$shareDir/src/contentspage.html") if ($doContents);
- chdir $oldcwd;
+- open(INFILE, "<$file") or die "Unable to open $file: $!\n";
++ open(INFILE, "<$file")
++ or open(INFILE, "</usr/local/share/bkmrkconv/$file")
++ or die "Unable to open $file: $!\n";
+ while(<INFILE>) { $data .= $_; }
+ close(INFILE) or die "Unable to close $file: $!\n";
- my %root;
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E12oBhz-0004tg-00>