- Unbroke with theraded Mesa;

- respect CFLAGS.

x11-wm/wmanager/Makefile

@@ -21,7 +21,8 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_QT_VER=	1
 USE_GMAKE=	yes
-MAKE_ENV=	prefix=${PREFIX}
+MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wmanager ${PREFIX}/bin

x11-wm/wmanager/files/patch-aa

@@ -1,43 +1,37 @@
---- Makefile.orig	Sun Nov 14 07:29:24 1999
-+++ Makefile	Sun Dec  5 16:37:05 1999
-@@ -23,49 +23,38 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- 
--
--
- # make settings
+
+$FreeBSD$
+
+--- Makefile.orig	Sun Nov 14 17:29:24 1999
++++ Makefile	Tue Aug 14 13:08:36 2001
+@@ -29,17 +29,21 @@
  SHELL     = /bin/sh
  MAKEFLAGS = --print-directory
  
 +# base settings
-+bindir	= $(prefix)/bin
++bindir	= $(PREFIX)/bin
 +incdir	= ./inc
 +srcdir	= ./src
-+fltkinc	= $(prefix)/include
-+x11lib	= $(prefix)/lib
++fltkinc	= $(X11BASE)/include
++x11lib	= $(X11BASE)/lib
  
  # compiler settings
 -CXX       = g++ 
 -CXXFLAGS  = -I$(incdir) -O2 -Wall -pedantic #-DDEBUG=1 -g3
 -
-+CXX	= g++ 
-+CXXFLAGS= -I$(fltkinc) -I$(incdir) -O2 -Wall -pedantic #-DDEBUG=1 -g3
++CXX       = g++
++CXXFLAGS+= -I$(fltkinc) -I$(incdir) -Wall -pedantic $(PTHREAD_CFLAGS) #-DDEBUG=1 -g3
  
  # linker settings
  LD        = g++
 -LDFLAGS   = -lfltk -lXext -lX11 -lm
 -LDDIRS    = -L/usr/X11R6/lib -L/usr/lib -L/usr/local/lib
 -
-+LDFLAGS   = -lMesaGL -lfltk -lXext -lX11 -lm
++LDFLAGS   = -lMesaGL -lfltk -lXext -lX11 -lm $(PTHREAD_LIBS)
 +LDDIRS    = -L$(x11lib) -L/usr/lib -L/usr/local/lib
  
  # install settings
  INSTALL       = /usr/bin/install
- INSTALL_FLAGS = --strip
- 
--
- # documentation tool
+@@ -50,17 +54,6 @@
  DOCTOOL      = perceps
  DOCTOOL_FLAGS = -a -b -f -h -m -r
  
@@ -55,16 +49,7 @@
  # documentational files for developer
  docdir    = ./doc
  templates = $(docdir)/templates
- 
--
- # search paths
- vpath %.H    $(incdir)
- vpath %.cc   $(srcdir)
-@@ -78,12 +67,10 @@
- 	.wmanagerrc .xinitrc
- OBJ  = $(patsubst %.cc,%.o,$(SRC)) 
- 
--
+@@ -82,8 +75,7 @@
  # project version
  VERSION = 0.1.1
  
@@ -74,11 +59,3 @@
  
  wmanager: $(OBJ)
  	$(LD) -o $@ $^ $(LDDIRS) $(LDFLAGS) 
-@@ -110,7 +97,6 @@
- 	@-echo -e '\nwmanager - X11 window manager selector'
- 	@-echo 'v$(VERSION) 1999/09/26 by M. Tessmer'
- 	@-echo 'Look at README for more information\n'
--
- 
- # phony targets
- .PHONY: all clean distclean TAGS version doc