Re: Make plist problem...

[Stuart Henderson]

On 2009/10/01 09:09, Ryan Boggs wrote:
> Hi,
> 
> I ran into an issue with the "make plist" and "make update-plist"
> commands last night after updating my test system to the latest
> snapshot.  The error I rec'd complained that the file
> /etc/mtree/BSD.x11.dist file was missing.  It looks like this file was
> removed about a week ago from the system.  Is there something I can do
> to get around this issue so I can generate a plist?

Index: install/FS.pm
===================================================================
RCS file: /cvs/ports/infrastructure/install/FS.pm,v
retrieving revision 1.8
diff -u -p -r1.8 FS.pm
--- install/FS.pm       14 Aug 2009 22:41:13 -0000      1.8
+++ install/FS.pm       1 Oct 2009 16:49:58 -0000
@@ -297,7 +297,6 @@ sub get_files
        my $mtree = {};
        OpenBSD::Mtree::parse($mtree, '/usr/local', 
'/etc/mtree/BSD.local.dist');
        OpenBSD::Mtree::parse($mtree, '/', '/etc/mtree/4.4BSD.dist');
-       OpenBSD::Mtree::parse($mtree, '/usr/X11R6', '/etc/mtree/BSD.x11.dist');
        $mtree->{'/usr/local/lib/X11'} = 1;
        $mtree->{'/usr/local/include/X11'} = 1;
        $mtree->{'/usr/local/lib/X11/app-defaults'} = 1;
Index: package/check-common-dirs
===================================================================
RCS file: /cvs/ports/infrastructure/package/check-common-dirs,v
retrieving revision 1.7
diff -u -p -r1.7 check-common-dirs
--- package/check-common-dirs   13 May 2007 08:03:47 -0000      1.7
+++ package/check-common-dirs   1 Oct 2009 16:49:58 -0000
@@ -172,7 +172,6 @@ my $mtree = {};
 
 OpenBSD::Mtree::parse($mtree, '/usr/local', '/etc/mtree/BSD.local.dist');
 OpenBSD::Mtree::parse($mtree, '/', '/etc/mtree/4.4BSD.dist');
-OpenBSD::Mtree::parse($mtree, '/usr/X11R6', '/etc/mtree/BSD.x11.dist');
 $mtree->{'/usr/local/lib/X11'} = 1;
 $mtree->{'/usr/local/include/X11'} = 1;
 $mtree->{'/usr/local/lib/X11/app-defaults'} = 1;
Index: package/find-plist-issues
===================================================================
RCS file: /cvs/ports/infrastructure/package/find-plist-issues,v
retrieving revision 1.7
diff -u -p -r1.7 find-plist-issues
--- package/find-plist-issues   12 May 2007 14:56:21 -0000      1.7
+++ package/find-plist-issues   1 Oct 2009 16:49:58 -0000
@@ -350,7 +350,6 @@ try {
 
 OpenBSD::Mtree::parse($mtree, '/usr/local', '/etc/mtree/BSD.local.dist');
 OpenBSD::Mtree::parse($mtree, '/', '/etc/mtree/4.4BSD.dist');
-OpenBSD::Mtree::parse($mtree, '/usr/X11R6', '/etc/mtree/BSD.x11.dist');
 $mtree->{'/usr/local/lib/X11'} = 1;
 $mtree->{'/usr/local/include/X11'} = 1;
 $mtree->{'/usr/local/lib/X11/app-defaults'} = 1;