Date: Sun, 29 Dec 2019 15:26:37 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r521362 - in head/math/tetgen: . files Message-ID: <201912291526.xBTFQbnj098120@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Sun Dec 29 15:26:37 2019 New Revision: 521362 URL: https://svnweb.freebsd.org/changeset/ports/521362 Log: - Update to 1.5.1. - Add -fPIC. Modified: head/math/tetgen/Makefile head/math/tetgen/distinfo head/math/tetgen/files/patch-makefile Modified: head/math/tetgen/Makefile ============================================================================== --- head/math/tetgen/Makefile Sun Dec 29 15:14:32 2019 (r521361) +++ head/math/tetgen/Makefile Sun Dec 29 15:26:37 2019 (r521362) @@ -2,13 +2,12 @@ # $FreeBSD$ PORTNAME= tetgen -PORTVERSION= 1.5.0.20131104 +PORTVERSION= 1.5.1 CATEGORIES= math MASTER_SITES= http://wias-berlin.de/software/tetgen/1.5/src/ -DISTNAME= ${PORTNAME}${PORTVERSION:R} -DIST_SUBDIR= ${PORTNAME} +DISTNAME= ${PORTNAME}${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= hrs@FreeBSD.org COMMENT= Quality Tetrahedral Mesh Generator and Delaunay Triangulator LICENSE= AGPLv3 @@ -16,11 +15,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE MAKEFILE= makefile ALL_TARGET= tetgen tetlib +CXXFLAGS+= -fPIC -PORTEXAMPLES= example.poly PLIST_FILES= bin/tetgen include/tetgen.h lib/libtet.a OPTIONS_DEFINE= EXAMPLES +PORTEXAMPLES= example.poly do-install: ${INSTALL_PROGRAM} ${WRKSRC}/tetgen ${STAGEDIR}${PREFIX}/bin @@ -28,10 +28,10 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/libtet.a ${STAGEDIR}${PREFIX}/lib do-install-EXAMPLES-on: - ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/example.poly ${STAGEDIR}${EXAMPLESDIR} do-test: - (cd ${INSTALL_WRKSRC} && ./tetgen -p example.poly ) + cd ${INSTALL_WRKSRC} && ./tetgen -p example.poly .include <bsd.port.mk> Modified: head/math/tetgen/distinfo ============================================================================== --- head/math/tetgen/distinfo Sun Dec 29 15:14:32 2019 (r521361) +++ head/math/tetgen/distinfo Sun Dec 29 15:26:37 2019 (r521362) @@ -1,2 +1,3 @@ -SHA256 (tetgen/tetgen1.5.0.tar.gz) = 4d114861d5ef2063afd06ef38885ec46822e90e7b4ea38c864f76493451f9cf3 -SIZE (tetgen/tetgen1.5.0.tar.gz) = 272513 +TIMESTAMP = 1577663096 +SHA256 (tetgen1.5.1.tar.gz) = e46a4434a3e7c00044c8f4f167e18b6f4a85be7d22838c8f948ce8cc8c01b850 +SIZE (tetgen1.5.1.tar.gz) = 282433 Modified: head/math/tetgen/files/patch-makefile ============================================================================== --- head/math/tetgen/files/patch-makefile Sun Dec 29 15:14:32 2019 (r521361) +++ head/math/tetgen/files/patch-makefile Sun Dec 29 15:26:37 2019 (r521362) @@ -1,5 +1,5 @@ ---- makefile.orig 2013-11-06 15:26:24.000000000 -0500 -+++ makefile 2014-08-29 10:51:57.000000000 -0500 +--- makefile.orig 2013-11-06 20:26:24 UTC ++++ makefile @@ -11,7 +11,7 @@ # CXX should be set to the name of your favorite C++ compiler. # =========================================================== @@ -9,16 +9,22 @@ #CXX = icpc #CXX = CC -@@ -19,7 +19,7 @@ +@@ -19,11 +19,12 @@ CXX = g++ # -O2, -O3 ... to find the best optimization level. # =================================================================== -CXXFLAGS = -O3 +CXXFLAGS ?= -O3 ++ARFLAGS ?= -crD # PREDCXXFLAGS is for compiling J. Shewchuk's predicates. -@@ -36,7 +36,7 @@ +-PREDCXXFLAGS = -O0 ++PREDCXXFLAGS? = -O0 + + # SWITCHES is a list of switches to compile TetGen. + # ================================================= +@@ -36,7 +37,7 @@ PREDCXXFLAGS = -O0 # down the speed of TetGen. They can be skipped by define the -DNDEBUG # switch. @@ -27,3 +33,36 @@ # RM should be set to the name of your favorite rm (file deletion program). +@@ -44,19 +45,20 @@ RM = /bin/rm + + # The action starts here. + +-tetgen: tetgen.cxx predicates.o +- $(CXX) $(CXXFLAGS) $(SWITCHES) -o tetgen tetgen.cxx predicates.o -lm +- +-tetlib: tetgen.cxx predicates.o +- $(CXX) $(CXXFLAGS) $(SWITCHES) -DTETLIBRARY -c tetgen.cxx +- ar r libtet.a tetgen.o predicates.o +- ++LIBS= -lm ++tetgen: tetgen.o predicates.o ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o ${.TARGET} ${.ALLSRC} ${LIBS} ++tetgen.o: tetgen.cxx ++ $(CXX) $(CXXFLAGS) $(SWITCHES) -c -o ${.TARGET} ${.ALLSRC} + predicates.o: predicates.cxx +- $(CXX) $(PREDCXXFLAGS) -c predicates.cxx ++ $(CXX) $(CXXFLAGS) $(PREDCXXFLAGS) $(SWITCHES) -c -o ${.TARGET} ${.ALLSRC} + +-clean: +- $(RM) *.o *.a tetgen *~ ++tetgen_lib.o: tetgen.cxx ++ $(CXX) $(CXXFLAGS) $(SWITCHES) -DTETLIBRARY -c -o ${.TARGET} ${.ALLSRC} ++libtet.a: tetgen_lib.o predicates.o ++ $(AR) $(ARFLAGS) ${.TARGET} ${.ALLSRC} + ++tetlib: libtet.a + +- +- ++clean: ++ $(RM) -f *.o *.a tetgen *~
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912291526.xBTFQbnj098120>