From 77d69dadc61cd4607b361080dff3dad6da5450a3 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Fri, 6 Nov 2015 13:17:52 -0200 Subject: Deal with multiple conflicts --- tools/scripts/update_package_pfPorts.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tools/scripts/update_package_pfPorts.php') diff --git a/tools/scripts/update_package_pfPorts.php b/tools/scripts/update_package_pfPorts.php index a6a61b3..7536b36 100755 --- a/tools/scripts/update_package_pfPorts.php +++ b/tools/scripts/update_package_pfPorts.php @@ -391,7 +391,9 @@ function create_port($pkg) { $conflicts = $product_name . '-base-nanobsd-[0-9]*'; } if (isset($pkg['conflicts']) && !empty($pkg['conflicts'])) { - $conflicts = trim($conflicts . ' ' . $port_name_prefix . $pkg['conflicts'] . '-[0-9]*'); + foreach (preg_split('/[\s\t]+/', $pkg['conflicts']) as $conflict) { + $conflicts = trim($conflicts . ' ' . $port_name_prefix . $conflict . '-[0-9]*'); + } } if (!empty($conflicts)) { $makefile[] = ""; -- cgit v1.1