From 1c04be573e49e26220cf467cc7d26564e12ff260 Mon Sep 17 00:00:00 2001
From: Eric Anholt <anholt@FreeBSD.org>
Date: Sat, 22 Oct 2005 01:41:40 +0000
Subject: [PATCH] Fix FreeBSD build by building libGL in the order desired, and
 doing a fix to my mklib changes.

---
 bin/mklib           | 3 ++-
 configs/freebsd-dri | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/mklib b/bin/mklib
index ce405d1c896..5b04234785c 100755
--- a/bin/mklib
+++ b/bin/mklib
@@ -338,7 +338,8 @@ case $ARCH in
 	    echo "mklib: Making FreeBSD shared library: " ${SHLIB}
 	    rm -f ${SHLIB}
 	    ${LINK} ${OPTS} -o ${SHLIB} ${OBJECTS} ${DEPS}
-	    FINAL_LIBS=${SHLIB}
+	    ln -sf ${SHLIB} "lib${LIBNAME}.so"
+	    FINAL_LIBS="${SHLIB} lib${LIBNAME}.so"
 	fi
 	;;
 
diff --git a/configs/freebsd-dri b/configs/freebsd-dri
index c7d3659e914..e8b3a96bf90 100644
--- a/configs/freebsd-dri
+++ b/configs/freebsd-dri
@@ -31,7 +31,7 @@ GLW_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lXm -lX11
 
 
 # Directories
-SRC_DIRS = mesa glu glut/glx glw glx/x11
+SRC_DIRS = glx/x11 mesa glu glut/glx glw
 DRIVER_DIRS = dri
 PROGRAM_DIRS = 
 WINDOW_SYSTEM=dri
-- 
2.30.2