Index: head/games/crashtest/Makefile
===================================================================
--- head/games/crashtest/Makefile	(revision 493531)
+++ head/games/crashtest/Makefile	(revision 493532)
@@ -1,48 +1,49 @@
 # Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	crashtest
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.stolk.org/crashtest/
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Educational crash simulator
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libode.a:devel/ode \
-		${LOCALBASE}/lib/libplibul.a:x11-toolkits/plib
-LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
+BUILD_DEPENDS=	${LOCALBASE}/lib/libplibul.a:x11-toolkits/plib
+LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk \
+		libode.so:devel/ode
 
+USES=		gl pkgconfig
 USE_GL=		gl glu
 
 BUILD_WRKSRC=	${WRKSRC}/src-crashtest
 
 PORTDOCS=	*
 PORTDATA=	*
 PLIST_FILES=	bin/${PORTNAME}
 
 DESKTOP_ENTRIES="${PORTNAME}" \
 		"" \
 		"" \
 		"${PORTNAME}" \
 		"Game;Simulation;Physics;" \
 		""
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' ${WRKSRC}/src-crashtest/crashtest.cxx
 
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DATADIR}/models
 	${INSTALL_DATA} ${WRKSRC}/models-crashtest/*.3ds ${STAGEDIR}${DATADIR}/models
 	${INSTALL_DATA} ${WRKSRC}/models-crashtest/*.ac ${STAGEDIR}${DATADIR}/models
 	${INSTALL_DATA} ${WRKSRC}/models-crashtest/*.bmp ${STAGEDIR}${DATADIR}/models
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${BUILD_WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
Index: head/games/crashtest/files/patch-src-crashtest_Makefile
===================================================================
--- head/games/crashtest/files/patch-src-crashtest_Makefile	(revision 493531)
+++ head/games/crashtest/files/patch-src-crashtest_Makefile	(revision 493532)
@@ -1,32 +1,38 @@
 --- src-crashtest/Makefile.orig	2009-02-15 22:11:31 UTC
 +++ src-crashtest/Makefile
 @@ -1,8 +1,7 @@
  # EDIT THESE SETTINGS
  
 -PLIBPREFIX=/usr
 -ODEPREFIX=/usr
 -CXX=g++
 +PLIBPREFIX=${LOCALBASE}
 +ODEPREFIX=${LOCALBASE}
  
  #PLIBPREFIX=$(HOME)
  #ODEPREFIX=$(HOME)
-@@ -10,15 +9,13 @@ CXX=g++
+@@ -10,19 +9,17 @@ CXX=g++
  
  # END OF CUSTOM SETTINGS
  
 -CXXFLAGS=\
+-  -I$(ODEPREFIX)/include \
 +CXXFLAGS+=\
-   -I$(ODEPREFIX)/include \
++  `pkg-config --cflags ode` \
    -I$(PLIBPREFIX)/include \
 -  -I../src-common \
 -  -O2 -g -Wall
 +  -I../src-common
  
  LFLAGS=\
 -  -L$(PLIBPREFIX)/lib \
 -  -L/usr/X11R6/lib
 +  -L$(PLIBPREFIX)/lib
  
  OBJS=staticworldobject.o crashtest.o dynamicobject.o cartobject.o
  
+-LIBS= $(ODEPREFIX)/lib/libode.a -lplibssgaux -lplibssg -lplibsg -lplibpu -lplibfnt -lplibul -lGLU -lGL `fltk-config --use-gl --use-images --ldflags`
++LIBS= `pkg-config --libs ode` -lplibssgaux -lplibssg -lplibsg -lplibpu -lplibfnt -lplibul -lGLU -lGL `fltk-config --use-gl --use-images --ldflags`
+ 
+ 
+ all: crashtest