From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 13:21:20 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4BFA118C; Sat, 25 Jan 2014 13:21:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 36977116D; Sat, 25 Jan 2014 13:21:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0PDLK9H018986; Sat, 25 Jan 2014 13:21:20 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PDLJ04018980; Sat, 25 Jan 2014 13:21:19 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201401251321.s0PDLJ04018980@svn.freebsd.org> From: Martin Wilke Date: Sat, 25 Jan 2014 13:21:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341036 - in branches/2014Q1/graphics/dynamechs: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Jan 2014 13:21:20 -0000 Author: miwi Date: Sat Jan 25 13:21:18 2014 New Revision: 341036 URL: http://svnweb.freebsd.org/changeset/ports/341036 QAT: https://qat.redports.org/buildarchive/r341036/ Log: MFH: r340307 - Fix build with clang PR: 185716 Submitted by: ports fury Added: branches/2014Q1/graphics/dynamechs/files/patch-aquarobot__MatrixMy.cpp - copied unchanged from r340307, head/graphics/dynamechs/files/patch-aquarobot__MatrixMy.cpp branches/2014Q1/graphics/dynamechs/files/patch-dm__svd_linpack.cpp - copied unchanged from r340307, head/graphics/dynamechs/files/patch-dm__svd_linpack.cpp Modified: branches/2014Q1/graphics/dynamechs/Makefile branches/2014Q1/graphics/dynamechs/files/make.platform.freebsd (contents, props changed) branches/2014Q1/graphics/dynamechs/files/patch-aquarobot::Gait.hpp (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/graphics/dynamechs/Makefile ============================================================================== --- branches/2014Q1/graphics/dynamechs/Makefile Sat Jan 25 13:20:40 2014 (r341035) +++ branches/2014Q1/graphics/dynamechs/Makefile Sat Jan 25 13:21:18 2014 (r341036) @@ -10,32 +10,32 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME} DISTNAME= ${PORTNAME}_${PORTVERSION:S/.p/pre/} MAINTAINER= ports@FreeBSD.org -COMMENT= A Multibody Dynamic Simulation Library +COMMENT= Multibody Dynamic Simulation Library -USES= perl5 USE_BZIP2= yes +USES= gmake perl5 USE_GL= glut -USE_GMAKE= yes USE_PERL5= build -CXXFLAGS+= ${PTHREAD_CFLAGS} MAKE_ENV= OPENGLINCDIR="${LOCALBASE}/include" \ OPENGLLIBDIR="${LOCALBASE}/lib" -LDFLAGS+= ${PTHREAD_LIBS} ALL_TARGET= freebsd USE_LDCONFIG= yes -NO_STAGE= yes -.include +post-patch: + @${REINPLACE_CMD} -e \ + 's|.SILENT:||' ${WRKSRC}/Makefile do-configure: @${CP} -f ${FILESDIR}/make.platform.freebsd ${WRKSRC}/make/ do-install: .for dir in dm dmu dmGL - ${RM} -f ${WRKSRC}/${dir}/*.orig - @${MKDIR} ${PREFIX}/include/${PORTNAME}/${dir} - ${INSTALL_DATA} ${WRKSRC}/${dir}/*.h* ${PREFIX}/include/${PORTNAME}/${dir} - ${INSTALL_DATA} ${WRKSRC}/lib/platform.freebsd/lib${dir}.so ${PREFIX}/lib + @${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}/${dir} + (cd ${WRKSRC}/${dir} && ${FIND} . -name "*.h" -or -name "*.hpp" | \ + ${XARGS} -J % ${INSTALL_DATA} % \ + ${STAGEDIR}${PREFIX}/include/${PORTNAME}/${dir}) + (cd ${WRKSRC}/lib/platform.freebsd && ${INSTALL_LIB} lib${dir}.so \ + ${STAGEDIR}${PREFIX}/lib) .endfor -.include +.include Modified: branches/2014Q1/graphics/dynamechs/files/make.platform.freebsd ============================================================================== --- branches/2014Q1/graphics/dynamechs/files/make.platform.freebsd Sat Jan 25 13:20:40 2014 (r341035) +++ branches/2014Q1/graphics/dynamechs/files/make.platform.freebsd Sat Jan 25 13:21:18 2014 (r341036) @@ -2,7 +2,7 @@ CXXFLAGS += -D_BOOL -c -fPIC -I/$(OPENGL # -pthreads DEPENDFLAGS := $(CXXFLAGS) -LDFLAGS += -fPIC -L/$(OPENGLLIBDIR) -L${LOCALBASE}/lib -lX11 -lm -l$(MESA)GLU -l$(MESA)GL +LDFLAGS += -pthread -fPIC -L/$(OPENGLLIBDIR) -L${LOCALBASE}/lib -lX11 -lm -l$(MESA)GLU -l$(MESA)GL LDGLUT := -lglut # CXX := c++ Modified: branches/2014Q1/graphics/dynamechs/files/patch-aquarobot::Gait.hpp ============================================================================== --- branches/2014Q1/graphics/dynamechs/files/patch-aquarobot::Gait.hpp Sat Jan 25 13:20:40 2014 (r341035) +++ branches/2014Q1/graphics/dynamechs/files/patch-aquarobot::Gait.hpp Sat Jan 25 13:21:18 2014 (r341036) @@ -1,15 +1,28 @@ ---- aquarobot/Gait.hpp.orig Thu Jul 19 08:40:44 2001 -+++ aquarobot/Gait.hpp Sat Dec 21 08:57:01 2002 -@@ -26,10 +26,11 @@ +--- aquarobot/Gait.hpp.orig 2001-07-19 08:40:44.000000000 +0900 ++++ aquarobot/Gait.hpp 2014-01-08 21:46:35.000000000 +0900 +@@ -26,24 +26,17 @@ #include #endif -#if defined(WIN32) || (defined(sgi) && defined(_STANDARD_C_PLUS_PLUS)) || (defined(__GNUC__) && (__GNUC__>=2) && (__GNUC_MINOR__>=91)) -+#if defined(WIN32) || (defined(sgi) && defined(_STANDARD_C_PLUS_PLUS)) || (defined(__GNUC__) && (__GNUC__>=2) && (__GNUC_MINOR__>=91)) || (defined(__GNUC__) && (__GNUC__>=3)) #include #include #include +-#else +-#include +-#include +-#include +-#endif +using namespace std; - #else - #include - #include + + #include + #include + #include + + // Use the std namespace. To do this we must first guarantee that it exists. +-#if defined(__sgi) || defined(__WIN32_) || defined(WIN32) + namespace std {} + using namespace std; +-#endif + + #endif Copied: branches/2014Q1/graphics/dynamechs/files/patch-aquarobot__MatrixMy.cpp (from r340307, head/graphics/dynamechs/files/patch-aquarobot__MatrixMy.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/dynamechs/files/patch-aquarobot__MatrixMy.cpp Sat Jan 25 13:21:18 2014 (r341036, copy of r340307, head/graphics/dynamechs/files/patch-aquarobot__MatrixMy.cpp) @@ -0,0 +1,11 @@ +--- aquarobot/MatrixMy.cpp.orig ++++ aquarobot/MatrixMy.cpp +@@ -38,7 +38,7 @@ + // Constructor + // ************************************************************************** + //MatrixMy::MatrixMy(int r = 4, int c = 4) +-MatrixMy::MatrixMy(int r = 3, int c = 3) ++MatrixMy::MatrixMy(int r, int c) + { + row = r; + column = c; Copied: branches/2014Q1/graphics/dynamechs/files/patch-dm__svd_linpack.cpp (from r340307, head/graphics/dynamechs/files/patch-dm__svd_linpack.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/dynamechs/files/patch-dm__svd_linpack.cpp Sat Jan 25 13:21:18 2014 (r341036, copy of r340307, head/graphics/dynamechs/files/patch-dm__svd_linpack.cpp) @@ -0,0 +1,13 @@ +--- dm/svd_linpack.cpp.orig ++++ dm/svd_linpack.cpp +@@ -10,7 +10,9 @@ + #endif + + #include +-#include ++#include ++#include ++using namespace std; + + #ifdef __cplusplus + extern "C" {