--- a/open-src/common/Makefile.inc	Sun Jul 31 11:54:33 2011 -0700
+++ b/open-src/common/Makefile.inc	Sun Jul 31 11:55:37 2011 -0700
@@ -512,7 +512,7 @@
 # autoconfig environment
 $(USE_DEFAULT_CONFIG_ENV:no=$(POUND_SIGN))	DEFAULT_CONFIG_ENV = \
     CC="$(CC)" CXX="$(CXX)" \
-    LD="$(CC) $(LDFLAGS)" \
+    LD="$(CC) $(ARCH_FLAGS) $(LDFLAGS)" \
     CFLAGS="$(MODTYPE_CFLAGS) $(MODULE_CFLAGS)" \
     CXXFLAGS="$(MODTYPE_CXXFLAGS) $(MODULE_CXXFLAGS)" \
     CPPFLAGS="$(DEFAULT_CONFIG_CPPFLAGS) $(MODTYPE_CPPFLAGS) $(MODULE_CPPFLAGS)" \

--- a/open-src/lib/freeglut/Makefile	Sun Jul 31 11:54:33 2011 -0700
+++ b/open-src/lib/freeglut/Makefile	Sun Jul 31 11:55:37 2011 -0700
@@ -62,62 +62,16 @@
 MODULE_STABILITY=Uncommitted
 LIB_MAN_SUFFIX=
 
-MODULE_LD_OPTIONS = -L$(PROTODIR)/usr/lib$(ARCHLIBSUBDIR)
-MODULE_LD_OPTIONS += -lGL -lGLU
-MODULE_LD_OPTIONS += -z combreloc -z redlocsym -z ignore
-
-# We want GNU cp
-GNUCP=/usr/gnu/bin/cp
-
 # We must build with GNU make
 MODULE_MAKE=$(GNUMAKE)
 MODULE_MAKE_SET=yes
 
-# Command line options to GNU autoconf configure script
-MODULE_CONFIG_OPTS = $(MODTYPE_CONFIG_OPTS) \
-		     --enable-shared \
-		     --disable-static \
-		     --disable-libtool-lock \
-		     --x-includes=/usr/include \
-		     --x-libraries=/usr/lib$(ARCHLIBSUBDIR) \
-		     --with-x \
-		     --with-pic
-
-# -xF is needed for mapfile reordering to work
-MODULE_CFLAGS = -xF -D__posix__ -D__unix__
-
 #  FreeGLUT really wants to know that we are POSIX friendly
 MODULE_CPPFLAGS = -D__posix__ -D__unix__
-MODULE_CPPFLAGS += -I$(PROTODIR)/usr/X11/include \
-		   -I$(PROTODIR)/usr/X11/include/X11
-
-# Add -lGL and -lGLU to LDFLAGS
-MODULE_LDFLAGS = -L$(PROTODIR)/usr/lib$(ARCHLIBSUBDIR)
-MODULE_LDFLAGS += -lGL -lGLU
-MODULE_LDFLAGS += -z combreloc -z redlocsym -z ignore
-
-# We must use GNU make
-MODULE_ENV = \
-	     SHELL="/bin/bash" \
-	     MAKESHELL="/bin/bash" \
-	     PROTODIR="$(PROTODIR)" \
-	     CC="$(CC)" \
-	     CPPFLAGS="$(MODULE_CPPFLAGS) $(CPPFLAGS)" \
-	     CFLAGS="$(MODULE_CPPFLAGS) $(CPPFLAGS) $(CFLAGS)" \
-	     LDFLAGS="$(LDFLAGS) $(MODULE_LDFLAGS)" \
-	     LD="$(CC) $(CFLAGS) $(LDFLAGS) $(MODULE_LDFLAGS)" \
-	     CPP="$(CC) -E $(MODULE_CPPFLAGS) $(CPPFLAGS) $(CFLAGS)" \
-	     CXXCPP="$(CXX) -E $(CXXFLAGS)" \
-	     MAKEFLAGS= \
-	     MAKE="$(GNUMAKE)" \
-	     CPPROG="$(GNUCP)"
-
-MODULE_CONFIG_ENV = $(MODULE_ENV)
-MODULE_BUILD_ENV = $(MODULE_ENV)
 
 include ../Makefile.inc
 
-# Freeglut's $(VERSION_INFO) breaks delibtoolize.pl
+# FreeGLUT's $(VERSION_INFO) breaks delibtoolize.pl
 DELIBTOOLIZE=no
 
 install: install_extra_symlinks

--- a/open-src/xserver/xorg/Makefile	Sun Jul 31 11:54:33 2011 -0700
+++ b/open-src/xserver/xorg/Makefile	Sun Jul 31 11:55:37 2011 -0700
@@ -110,15 +110,13 @@
 AUTORECONF=yes
 
 # Command line options to GNU autoconf configure script
-#  Need to override LD setting to add -xarch flags that libtool strips
 # XXX: --disable-dga
 MODULE_CONFIG_OPTS = $(XSERVER_CONFIG_OPTS) \
         --enable-dmx \
         --enable-builddocs \
 	--enable-kdrive --enable-xephyr --disable-xsdl \
 	MKFONTDIR="$(MKFONTDIR)" \
-	MKFONTSCALE="$(MKFONTSCALE)" \
-	LD="$(CC) $(ARCH_FLAGS)"
+	MKFONTSCALE="$(MKFONTSCALE)"
 
 MODULE_LDFLAGS = $(XSERVER_LDFLAGS)
 MODULE_LD_OPTIONS = $(MAPFILES_FOR_ALL)