From 2e477cf688115e832d27a6019b7cf4263ba9e036 Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Wed, 13 Aug 2014 12:37:55 +0200
Subject: [PATCH] Simplify handling of package names.

* No longer apply somewhat crude mechanism for converting a package name
  into a corresponding port name - haikuporter by now supports package
  names directly.

This fixes a problem when trying to pass 'gcc_syslibs_devel' to
haikuporter, which only ever saw 'gcc_syslibs'.
---
 build/jam/RepositoryRules | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/build/jam/RepositoryRules b/build/jam/RepositoryRules
index 3647d8fc1f..54d504be18 100644
--- a/build/jam/RepositoryRules
+++ b/build/jam/RepositoryRules
@@ -355,16 +355,8 @@ actions BootstrapRepositoryFetchPackage1
 		done
 	fi
 
-	# determine the portName
-	portName=`basename "$package" | sed 's@-.*@@'`
-	case $portName in
-		*_devel|*_doc|*_source|*_debuginfo)
-			portName=`echo $portName | sed 's@_[^_]*$@@'`
-			;;
-		*_source_rigged)
-			portName=`echo $portName | sed 's@_source_rigged$@@'`
-			;;
-	esac
+	# determine the port-specification from the package name
+	portSpec=`basename "$package" | sed 's@-.*@@'`
 
 	cd $(HAIKU_REPOSITORY_BUILD_DIRECTORY)
 
@@ -373,11 +365,11 @@ actions BootstrapRepositoryFetchPackage1
 		$(HOST_HAIKU_PORTER) -j$(HAIKU_PORTER_CONCURRENT_JOBS) \
 			$(HAIKU_PORTER_EXTRA_OPTIONS) \
 			--cross-devel-package "$haikuCrossDevelPackage" \
-			"$secondaryCrossDevelPackages" $portName
+			"$secondaryCrossDevelPackages" $portSpec
 	else
 		$(HOST_HAIKU_PORTER) -j$(HAIKU_PORTER_CONCURRENT_JOBS) \
 			$(HAIKU_PORTER_EXTRA_OPTIONS) \
-			--cross-devel-package "$haikuCrossDevelPackage" $portName
+			--cross-devel-package "$haikuCrossDevelPackage" $portSpec
 	fi
 }