svn commit: r493532 - in head/games/crashtest: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Thu Feb 21 20:52:58 2019
New Revision: 493532
URL: https://svnweb.freebsd.org/changeset/ports/493532

Log:
  - Avoid static linking with ode
  
  PR:		231015
  Submitted by:	yuri at freebsd.org

Modified:
  head/games/crashtest/Makefile
  head/games/crashtest/files/patch-src-crashtest_Makefile

Modified: head/games/crashtest/Makefile
==============================================================================
--- head/games/crashtest/Makefile	Thu Feb 21 20:50:33 2019	(r493531)
+++ head/games/crashtest/Makefile	Thu Feb 21 20:52:58 2019	(r493532)
@@ -3,17 +3,18 @@
 
 PORTNAME=	crashtest
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.stolk.org/crashtest/
 
 MAINTAINER=	amdmi3 at 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

Modified: head/games/crashtest/files/patch-src-crashtest_Makefile
==============================================================================
--- head/games/crashtest/files/patch-src-crashtest_Makefile	Thu Feb 21 20:50:33 2019	(r493531)
+++ head/games/crashtest/files/patch-src-crashtest_Makefile	Thu Feb 21 20:52:58 2019	(r493532)
@@ -11,13 +11,14 @@
  
  #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
@@ -30,3 +31,8 @@
  
  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