diff --git a/media-libs/opensubdiv/opensubdiv-3.3.2.recipe b/media-libs/opensubdiv/opensubdiv-3.3.2.recipe
index fc83bab10..f948811c9 100644
--- a/media-libs/opensubdiv/opensubdiv-3.3.2.recipe
+++ b/media-libs/opensubdiv/opensubdiv-3.3.2.recipe
@@ -10,6 +10,7 @@ LICENSE="Apache v2"
 REVISION="1"
 SOURCE_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${portVersion//\./_}.tar.gz"
 CHECKSUM_SHA256="d11a0f21bcf21156f9071ea49050ec6675b77776b9dba33b8e30b072d82a8b05"
+SOURCE_FILENAME="opensubdiv-$portVersion.tar.gz"
 SOURCE_DIR="OpenSubdiv-${portVersion//\./_}"
 PATCHES="opensubdiv-$portVersion.patchset"
 
@@ -78,13 +79,8 @@ BUILD()
 	mkdir -p build
 	cd build
 
-	local GLEW_SUBDIR=
-	if [ -n "$secondaryArchSuffix" ]; then
-		GLEW_SUBDIR="$secondaryArchSuffix/"
-	fi
-
-	export GLEW_LOCATION="$portPackageLinksDir/glew${secondaryArchSuffix}_devel/develop"
-	export GLEW_INC_LOCATION="$portPackageLinksDir/glew${secondaryArchSuffix}_devel/develop/headers$UNITTEST_SUBDIR"
+	export GLEW_LOCATION="$portPackageLinksDir/devel~libglew/$relativeDevelopDir/"
+	export GLEW_INC_LOCATION="$portPackageLinksDir/devel~libglew/$relativeIncludeDir/"
 
 	cmake .. \
 		-DNO_EXAMPLES=ON \
diff --git a/media-libs/opensubdiv/opensubdiv-3.3.3.recipe b/media-libs/opensubdiv/opensubdiv-3.3.3.recipe
index a8ff4369d..a846ca1aa 100644
--- a/media-libs/opensubdiv/opensubdiv-3.3.3.recipe
+++ b/media-libs/opensubdiv/opensubdiv-3.3.3.recipe
@@ -82,13 +82,8 @@ BUILD()
 	mkdir -p build
 	cd build
 
-	local GLEW_SUBDIR=
-	if [ -n "$secondaryArchSuffix" ]; then
-		GLEW_SUBDIR="$secondaryArchSuffix/"
-	fi
-
-	export GLEW_LOCATION="$portPackageLinksDir/glew${secondaryArchSuffix}_devel/develop"
-	export GLEW_INC_LOCATION="$portPackageLinksDir/glew${secondaryArchSuffix}_devel/develop/headers$UNITTEST_SUBDIR"
+	export GLEW_LOCATION="$portPackageLinksDir/devel~libglew/$relativeDevelopDir/"
+	export GLEW_INC_LOCATION="$portPackageLinksDir/devel~libglew/$relativeIncludeDir/"
 
 	cmake .. \
 		-DNO_EXAMPLES=ON \