From 88d40ff8311246dfedb05df395b393b313371d74 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Sun, 29 Apr 2012 08:46:02 +0000
Subject: repair src/xsrc handling fix it wrt FLAVOR/SUBPACKAGE passing

---
 usr.sbin/pkg_add/pkg_mklocatedb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'usr.sbin/pkg_add/pkg_mklocatedb')

diff --git a/usr.sbin/pkg_add/pkg_mklocatedb b/usr.sbin/pkg_add/pkg_mklocatedb
index 09ec15d824f..3a63c13e306 100644
--- a/usr.sbin/pkg_add/pkg_mklocatedb
+++ b/usr.sbin/pkg_add/pkg_mklocatedb
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 # Copyright (c) 2005-2010 Marc Espie <espie@openbsd.org>
-# $OpenBSD: pkg_mklocatedb,v 1.32 2012/04/22 11:57:18 espie Exp $
+# $OpenBSD: pkg_mklocatedb,v 1.33 2012/04/29 08:46:02 espie Exp $
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -23,7 +23,6 @@ use OpenBSD::Getopt;
 use OpenBSD::Error;
 use OpenBSD::Paths;
 use OpenBSD::AddCreateDelete;
-use File::Path;
 
 package OpenBSD::Pkgmklocatedb::State;
 our @ISA = qw(OpenBSD::AddCreateDelete::State);
@@ -123,7 +122,7 @@ sub open_output
 	}
 }
 
-sub do_src
+sub do_source
 {
 	my ($state, $src, $tag, @sets) = @_;
 	findos() if !defined $arch;
@@ -178,6 +177,8 @@ sub do_portsdir
 	my $make = $ENV{MAKE} || 'make';
 	my $target = defined $ENV{SUBDIRLIST} ? 
 	    'print-plist' : 'print-plist-all';
+	delete $ENV{FLAVOR};
+	delete $ENV{SUBPACKAGE};
 	open my $in, "cd $state->{portsdir} && $make $target |";
 	my $done = 0;
 	while (!$done) {
@@ -223,7 +224,7 @@ open_output($state);
 
 if ($state->{srcdir}) {
 	do_source($state, $state->{srcdir}, 'src', 
-	    qw(base comp etc game misc));
+	    qw(base comp etc game));
 }
 if ($state->{xdir}) {
 	do_source($state, $state->{xdir}, 'xenocara', 
-- 
cgit v1.2.3-59-g8ed1b