From owner-svn-ports-all@FreeBSD.ORG Thu Sep 26 16:26:18 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 5A32A6AA; Thu, 26 Sep 2013 16:26:18 +0000 (UTC) (envelope-from gahr@FreeBSD.org) 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 384692748; Thu, 26 Sep 2013 16:26:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8QGQI9l024524; Thu, 26 Sep 2013 16:26:18 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8QGQHVN024518; Thu, 26 Sep 2013 16:26:17 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201309261626.r8QGQHVN024518@svn.freebsd.org> From: Pietro Cerutti Date: Thu, 26 Sep 2013 16:26:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328376 - in head/cad/meshdev: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Sep 2013 16:26:18 -0000 Author: gahr Date: Thu Sep 26 16:26:17 2013 New Revision: 328376 URL: http://svnweb.freebsd.org/changeset/ports/328376 Log: - Fix on CURRENT [1] - Support STAGEDIR - Fix up CFLAGS Reported by: pkg-fallout Added: head/cad/meshdev/files/patch-src_MeshDev.h (contents, props changed) Modified: head/cad/meshdev/Makefile head/cad/meshdev/files/patch-build_Makefile.release.gcc Modified: head/cad/meshdev/Makefile ============================================================================== --- head/cad/meshdev/Makefile Thu Sep 26 16:03:43 2013 (r328375) +++ head/cad/meshdev/Makefile Thu Sep 26 16:26:17 2013 (r328376) @@ -10,6 +10,8 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}/gahr/ MAINTAINER= gahr@FreeBSD.org COMMENT= A mesh comparison software +USE_DOS2UNIX= src/MeshDev.h + BUILD_WRKSRC= ${WRKSRC}/build INSTALL_WRKSRC= ${WRKSRC}/bin @@ -17,8 +19,7 @@ MAKEFILE= Makefile.release.gcc PLIST_FILES= bin/${PORTNAME} -NO_STAGE= yes do-install: - ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${PORTNAME} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .include Modified: head/cad/meshdev/files/patch-build_Makefile.release.gcc ============================================================================== --- head/cad/meshdev/files/patch-build_Makefile.release.gcc Thu Sep 26 16:03:43 2013 (r328375) +++ head/cad/meshdev/files/patch-build_Makefile.release.gcc Thu Sep 26 16:26:17 2013 (r328376) @@ -1,13 +1,18 @@ ---- build/Makefile.release.gcc.orig 2012-02-06 16:12:55.000000000 +0100 -+++ build/Makefile.release.gcc 2012-02-06 16:13:07.000000000 +0100 -@@ -2,7 +2,7 @@ +--- build/Makefile.release.gcc.orig 2012-02-06 14:04:02.000000000 +0100 ++++ build/Makefile.release.gcc 2013-09-26 17:53:17.000000000 +0200 +@@ -1,10 +1,10 @@ + # Project: MeshDev # Makefile created by Michaël Roy - CXX = g++ +-CXX = g++ -OBJ = tmp/Deviation.o tmp/FileVrml1.o tmp/FileVrml2.o tmp/Mesh.o tmp/MeshDev.o tmp/Neighborhood.o tmp/Sample.o tmp/UniformGrid.o ++CXX ?= g++ +OBJ = tmp/Deviation.o tmp/FileVrml1.o tmp/FileVrml2.o tmp/FileSTL.o tmp/Mesh.o tmp/MeshDev.o tmp/Neighborhood.o tmp/Sample.o tmp/UniformGrid.o BIN = ../bin/meshdev - CFLAGS += -DNDEBUG -Wall -W -ansi -pedantic -s -O2 +-CFLAGS += -DNDEBUG -Wall -W -ansi -pedantic -s -O2 ++CFLAGS += -DNDEBUG -Wall -W -pedantic + + .PHONY: all clean @@ -25,6 +25,9 @@ tmp/FileVrml2.o: ../src/FileVrml2.cpp Added: head/cad/meshdev/files/patch-src_MeshDev.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/meshdev/files/patch-src_MeshDev.h Thu Sep 26 16:26:17 2013 (r328376) @@ -0,0 +1,10 @@ +--- src/MeshDev.h.orig 2013-09-26 18:00:27.000000000 +0200 ++++ src/MeshDev.h 2013-09-26 18:00:43.000000000 +0200 +@@ -30,7 +30,6 @@ + // C Standard Library + #include // sqrt, ceil + #include // EXIT_SUCCESS, EXIT_FAILURE +-#include // timeb, ftime + #include // time + + // Use C++ Standard Library namespace