cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perl extra stuff that's arch dependent and version dependent, should not

Browse Source 
appear in diagnostics.
This commit is contained in:
espie 2008-11-01 14:49:51 +00:00
parent c17c566a6b
commit e1023039c9
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
infrastructure/install/FS.pm
View File

@ -1,4 +1,4 @@
# $OpenBSD: FS.pm,v 1.4 2008/10/29 00:22:56 espie Exp $
# $OpenBSD: FS.pm,v 1.5 2008/11/01 14:49:51 espie Exp $
# Copyright (c) 2008 Marc Espie <espie@openbsd.org>
#
# Permission to use, copy, modify, and distribute this software for any
@ -17,6 +17,7 @@ use strict;
use warnings;
package FS::File;
sub new
{
my ($class, $filename, $type, $owner, $group) = @_;
@ -52,6 +53,7 @@ use File::Find;
use File::Spec;
use File::Basename;
use OpenBSD::IdCache;
use Config;
# existing files are classified according to the following routine
sub get_type
@ -255,7 +257,6 @@ sub scan_destdir
{
my %files;
my %okay_files=map { $_=>1 } split(/\s+/, $ENV{'OKAY_FILES'});
use Config;
my $installsitearch = $Config{'installsitearch'};
my $archname = $Config{'archname'};
@ -301,6 +302,9 @@ sub get_files
$mtree->{'/usr/local/lib/X11'} = 1;
$mtree->{'/usr/local/include/X11'} = 1;
$mtree->{'/usr/local/lib/X11/app-defaults'} = 1;
# zap /usr/libdata/xxx from perl install
$mtree->{$Config{'installarchlib'}} = 1;
$mtree->{dirname($Config{'installarchlib'})} = 1;
# make sure main mtree is removed
for my $d (keys %$mtree) {