Mesa: Make legacy version use same package script

* Clean up naming

sys-libs/mesa/buildpackage.sh

@@ -64,12 +64,12 @@ echo "Stripping debug symbols from Mesa libraries..."
 find lib.haiku -exec strip --strip-debug {} \; ;
 MESADBG=""
 else
-MESADBG="-dbg"
+MESADBG="dbg"
 fi
 
 echo "Creating Mesa OptionalPackage..."
 PLATFORM=$( uname -m )
-ZIP_FILENAME="/boot/home/mesa-${MESA_VER}${MESADBG}-x86-gcc${GCC_VER}-${DATESTAMP}.zip"
+ZIP_FILENAME="/boot/home/mesa-${MESA_VER}-x86${MESADBG}-gcc${GCC_VER}-${DATESTAMP}.zip"
 zip -r -9 $ZIP_FILENAME $ZIP_HEADERS ./lib.haiku/*
 
 echo "Great Success! $ZIP_FILENAME created."

sys-libs/mesa/mesa-7.8.2.bep

@@ -16,7 +16,7 @@ BUILD {
 	cd Mesa-7.8.2
 	make
 	cd ..
-	sh $(haikuporter -t)/sys-libs/mesa/mesapkg-7.8.x.sh ./Mesa-7.8.2
+	sh $(haikuporter -t)/sys-libs/mesa/buildpackage.sh 7.8.2 ./Mesa-7.8.2
 	echo "There should be a Mesa OptionalBuild package in your home if everything went well!"
 }
 

sys-libs/mesa/mesa-9.0.1.bep

@@ -16,7 +16,7 @@ BUILD {
 	cd Mesa-9.0.1
 	scons
 	cd ..
-	sh $(haikuporter -t)/sys-libs/mesa/mesapkg-9.x.sh 9.0.1 ./Mesa-9.0.1
+	sh $(haikuporter -t)/sys-libs/mesa/buildpackage.sh 9.0.1 ./Mesa-9.0.1
 	echo "There should be a Mesa OptionalBuild package in your home if everything went well!"
 }
 

sys-libs/mesa/mesa-9.0.2.bep

@@ -35,7 +35,7 @@ BUILD {
 	cd Mesa-9.0.2
 	scons
 	cd ..
-	sh $(haikuporter -t)/sys-libs/mesa/mesapkg-9.x.sh 9.0.2 ./Mesa-9.0.2
+	sh $(haikuporter -t)/sys-libs/mesa/buildpackage.sh 9.0.2 ./Mesa-9.0.2
 	echo "There should be a Mesa OptionalBuild package in your home if everything went well!"
 }
 

sys-libs/mesa/mesa-9.0.bep

@@ -16,7 +16,7 @@ BUILD {
 	cd Mesa-9.0
 	scons
 	cd ..
-	sh $(haikuporter -t)/sys-libs/mesa/mesapkg-9.x.sh 9.0 ./Mesa-9.0
+	sh $(haikuporter -t)/sys-libs/mesa/buildpackage.sh 9.0 ./Mesa-9.0
 	echo "There should be a Mesa OptionalBuild package in your home if everything went well!"
 }
 

sys-libs/mesa/mesa-9.1.0.bep

@@ -35,7 +35,7 @@ BUILD {
 	cd Mesa-9.1.0
 	scons
 	cd ..
-	sh $(haikuporter -t)/sys-libs/mesa/mesapkg-9.x.sh 9.1.0 ./Mesa-9.1
+	sh $(haikuporter -t)/sys-libs/mesa/buildpackage.sh 9.1.0 ./Mesa-9.1
 	echo "There should be a Mesa OptionalBuild package in your home if everything went well!"
 }
 

sys-libs/mesa/mesapkg-7.8.x.sh

@@ -1,107 +0,0 @@
-#!/bin/bash
-# This script creates an optional package containing the
-# the headers and binary code needed by the opengl kit
-# to link libGL.so
-
-# This script is run against a *COMPILED* Mesa source tree
-
-echo " Welcome to Mesa-O-Matic!"
-echo "-=-=-=-=-=-=-=-=-=-=-=-=-="
-echo ""
-
-# These are the Mesa headers and libraries used by the opengl kit
-#   Headers are probed for dependencies, only specify ones referenced
-#   by the opengl kit.
-MESA_PRIVATE_HEADERS="glheader.h glapi.h glapitable.h glapitemp.h context.h driverfuncs.h meta.h colormac.h buffers.h framebuffer.h renderbuffer.h state.h version.h swrast.h swrast_setup.h tnl.h t_context.h t_pipeline.h vbo.h extensions.h s_spantemp.h s_context.h formats.h cpuinfo.h"
-
-DEBUG=0
-
-#######################################################################
-# END CONFIG DATA, Dragons below!
-#######################################################################
-
-if [[ $( uname ) != "Haiku" ]]; then
-	echo "*************************************"
-	echo " I need to be run on a Haiku system!!"
-	echo "*************************************"
-	exit 1
-fi
-
-if [[ -z $1 ]]; then
-	echo ""
-	echo "Usage: $0 <compiled mesa location>"
-	echo ""
-	exit 1
-fi
-
-MESA_TOP="$1"
-
-GCC_VER=`gcc -v 2>&1 | tail -1 | awk '{print $3}' | cut -d. -f1`
-MESA_VER=`cat $MESA_TOP/Makefile |grep VERSION\= | cut -d= -f2`
-
-DATESTAMP=`date +"%Y-%m-%d"`
-
-echo "Bundling gcc$GCC_VER build of Mesa $MESA_VER..."
-
-cd $MESA_TOP
-
-#######################################################################
-# Create Mesa optional pacakge
-
-findInTree() {
-	RESULT=`find . -name "$1"`
-	if [[ $? -ne 0 || -z $RESULT ]]; then
-		echo "$i"
-		exit 1
-	fi
-	echo $RESULT
-}
-
-# Directories to search for matching headers
-MESA_INCLUDES="-I./include -I./src -I./src/mapi -I./src/mesa"
-MESA_DEFINES="-DUSE_X86_ASM -DUSE_PPC_ASM -DUSE_SPARC_ASM"
-MESA_DEFINES="$MESA_DEFINES -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DUSE_X86_64_ASM"
-
-ZIP_HEADERS=""
-echo "Collecting required Mesa private headers..."
-for i in $MESA_PRIVATE_HEADERS
-do
-	FOUND=$(findInTree $i)
-	if [[ $GCC_VER -eq 2 ]]; then
-		# gcc2 isn't very good at -MM
-		setgcc gcc4
-	fi
-	HEADERS_RAW=`gcc -MM $MESA_INCLUDES $MESA_DEFINES $FOUND`
-	if [[ $GCC_VER -eq 2 ]]; then
-		setgcc gcc2
-	fi
-
-	for y in $( echo "$HEADERS_RAW" | cut -d':' -f2 | sed 's/\\//g' | tr -d '\n' )
-	do
-		CLEAN_HEADER=$( echo "$y" | grep -v "include/GL/" )
-		ZIP_HEADERS="$ZIP_HEADERS $CLEAN_HEADER"
-	done
-done
-
-echo "Collecting required Mesa libraries..."
-rm -rf lib.haiku
-mkdir -p lib.haiku
-for i in $( find . -name "*.a" ) 
-do
-	cp $i lib.haiku/
-done
-
-if [[ $DEBUG -eq 0 ]]; then
-echo "Stripping debug symbols from Mesa libraries..."
-find lib.haiku -exec strip --strip-debug {} \; ;
-MESADBG=""
-else
-MESADBG="dbg"
-fi
-
-echo "Creating Mesa OptionalPackage..."
-PLATFORM=$( uname -m )
-ZIP_FILENAME="/boot/home/mesa-${MESA_VER}${MESADBG}-x86-gcc${GCC_VER}-${DATESTAMP}.zip"
-zip -r -9 $ZIP_FILENAME $ZIP_HEADERS ./include/GL/* ./lib.haiku/*
-
-echo "Great Success! $ZIP_FILENAME created."