Date: Thu, 21 Feb 2019 20:55:42 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r493533 - in head/games/stormbaancoureur: . files Message-ID: <201902212055.x1LKtgW1057887@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Thu Feb 21 20:55:42 2019 New Revision: 493533 URL: https://svnweb.freebsd.org/changeset/ports/493533 Log: - Avoid static linking with ode [1] - Switch to more correct way of avoiding C++11 related build errors - Switch to options helpers PR: 231016 [1] Submitted by: yuri@freebsd.org [1] Added: head/games/stormbaancoureur/files/patch-src-stormbaancoureur_Makefile - copied, changed from r493532, head/games/stormbaancoureur/files/patch-src-stormbaancoureur-Makefile Deleted: head/games/stormbaancoureur/files/patch-src-stormbaancoureur-Makefile Modified: head/games/stormbaancoureur/Makefile Modified: head/games/stormbaancoureur/Makefile ============================================================================== --- head/games/stormbaancoureur/Makefile Thu Feb 21 20:52:58 2019 (r493532) +++ head/games/stormbaancoureur/Makefile Thu Feb 21 20:55:42 2019 (r493533) @@ -3,7 +3,7 @@ PORTNAME= stormbaancoureur PORTVERSION= 2.1.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://www.stolk.org/stormbaancoureur/download/ \ http://mirror.amdmi3.ru/distfiles/ @@ -13,17 +13,15 @@ COMMENT= Simulated obstacle course for automobiles LICENSE= GPLv3 -BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib \ - ${LOCALBASE}/lib/libode.a:devel/ode +BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib +LIB_DEPENDS= libode.so:devel/ode -USES= compiler +USES= compiler gl pkgconfig USE_GL= gl glu glut +USE_CXXSTD= c++98 MAKE_ENV= DATADIR="${DATADIR}" -CXXFLAGS+= ${CXXFLAGS_${CHOSEN_COMPILER_TYPE}} -CXXFLAGS_clang= -Wno-c++11-narrowing - BUILD_WRKSRC= ${WRKSRC}/src-stormbaancoureur INSTALL_WRKSRC= ${WRKSRC}/src-stormbaancoureur @@ -45,8 +43,10 @@ post-patch: ${WRKSRC}/src-stormbaancoureur/main.cxx post-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${INSTALL_WRKSRC}/README ${STAGEDIR}${DOCSDIR} - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .include <bsd.port.mk> Copied and modified: head/games/stormbaancoureur/files/patch-src-stormbaancoureur_Makefile (from r493532, head/games/stormbaancoureur/files/patch-src-stormbaancoureur-Makefile) ============================================================================== --- head/games/stormbaancoureur/files/patch-src-stormbaancoureur-Makefile Thu Feb 21 20:52:58 2019 (r493532, copy source) +++ head/games/stormbaancoureur/files/patch-src-stormbaancoureur_Makefile Thu Feb 21 20:55:42 2019 (r493533) @@ -1,6 +1,6 @@ --- src-stormbaancoureur/Makefile.orig 2009-12-01 03:23:51 UTC +++ src-stormbaancoureur/Makefile -@@ -5,23 +5,20 @@ VERSION=2.1.6-generic +@@ -5,23 +5,21 @@ VERSION=2.1.6-generic GLPREFIX=/usr PLIBPREFIX=/usr ODEPREFIX=/usr @@ -15,9 +15,10 @@ - -I$(ODEPREFIX)/include \ - -I$(PLIBPREFIX)/include \ +CXXFLAGS+=\ -+ -I$(LOCALBASE)/include \ -I../src-common \ -I. \ ++ -I$(LOCALBASE)/include \ ++ `pkg-config --cflags ode` \ -DGAMEVERSION=$(VERSION) \ - -O2 -g -Wall + -g -Wall @@ -29,12 +30,12 @@ OBJS=\ -@@ -39,15 +36,15 @@ OBJS=\ +@@ -39,15 +37,15 @@ OBJS=\ LIBS=\ - $(ODEPREFIX)/$(LIBDIRNAME)/libode.a \ -+ $(LOCALBASE)/lib/libode.a \ ++ `pkg-config --libs ode` \ -lplibssgaux -lplibssg -lplibsg -lplibpu -lplibfnt -lplibul \ - -lglut -lGLU -lGL -lasound + -lglut -lGLU -lGL $(ALSA_LIBS) @@ -48,7 +49,7 @@ $(CXX) -o stormbaancoureur $(OBJS) $(LFLAGS) $(LIBS) staticworldobject.o: ../src-common/staticworldobject.cxx ../src-common/staticworldobject.h ../src-common/worldobject.h -@@ -92,16 +89,15 @@ run: stormbaancoureur +@@ -92,16 +90,15 @@ run: stormbaancoureur clean: rm -f *.o stormbaancoureur
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902212055.x1LKtgW1057887>