git: aa5b5ec42a06 - main - cad/meshdev: Fix build with llvm16

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Muhammad Moinur Rahman <bofh_at_FreeBSD.org>
Date: Thu, 20 Jul 2023 10:22:56 UTC
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=aa5b5ec42a067216fda26b5b92af57296ddf7121

commit aa5b5ec42a067216fda26b5b92af57296ddf7121
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-07-20 09:50:06 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-07-20 10:22:39 +0000

    cad/meshdev: Fix build with llvm16
    
    - Add LICENSE=GPLv2
    
    Sponsored by:   The FreeBSD Foundation
---
 cad/meshdev/Makefile                               |  4 ++++
 cad/meshdev/files/patch-build_Makefile.release.gcc | 12 ++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/cad/meshdev/Makefile b/cad/meshdev/Makefile
index 6b5cce22ea6f..e36c844665e7 100644
--- a/cad/meshdev/Makefile
+++ b/cad/meshdev/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	meshdev
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	LOCAL/gahr \
 		http://people.freebsd.org/~gahr/distfiles/
@@ -8,6 +9,9 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mesh comparison software
 WWW=		http://meshdev.sourceforge.net/
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/Copying.txt
+
 USES=		dos2unix
 DOS2UNIX_FILES=	src/MeshDev.h
 
diff --git a/cad/meshdev/files/patch-build_Makefile.release.gcc b/cad/meshdev/files/patch-build_Makefile.release.gcc
index ae80852fee8a..0d2ac92cc632 100644
--- a/cad/meshdev/files/patch-build_Makefile.release.gcc
+++ b/cad/meshdev/files/patch-build_Makefile.release.gcc
@@ -3,24 +3,24 @@
 @@ -1,10 +1,10 @@
  # Project: MeshDev
  # Makefile created by Micha�l Roy
- 
+
 -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 -pedantic
- 
++CFLAGS += -DNDEBUG -Wall -W -pedantic --std=c++14
+
  .PHONY: all clean
- 
+
 @@ -25,6 +25,9 @@
  tmp/FileVrml2.o: ../src/FileVrml2.cpp
  	$(CXX) -c ../src/FileVrml2.cpp -o tmp/FileVrml2.o $(CFLAGS)
- 
+
 +tmp/FileSTL.o: ../src/FileSTL.cpp
 +	$(CXX) -c ../src/FileSTL.cpp -o tmp/FileSTL.o $(CFLAGS)
 +
  tmp/Mesh.o: ../src/Mesh.cpp
  	$(CXX) -c ../src/Mesh.cpp -o tmp/Mesh.o $(CFLAGS)
- 
+