From 6a42bbccdf2e376de3aa6f405c62439af8938d6c Mon Sep 17 00:00:00 2001
From: shaun <shaun@FreeBSD.org>
Date: Fri, 28 Sep 2007 00:46:26 +0000
Subject: - Upgrade to 1.4.2. - Replace the test target by the canonical
 regression-test.

PR:		ports/114710
Submitted by:	Pedro F. Giffuni via thierry
---
 math/tetgen/Makefile             | 10 ++++------
 math/tetgen/distinfo             |  6 +++---
 math/tetgen/files/patch-makefile | 39 +++++++++++++++++++++------------------
 3 files changed, 28 insertions(+), 27 deletions(-)

(limited to 'math/tetgen')

diff --git a/math/tetgen/Makefile b/math/tetgen/Makefile
index 336d37d95dc8..0bc8a0661712 100644
--- a/math/tetgen/Makefile
+++ b/math/tetgen/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tetgen
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES=	math
 MASTER_SITES=	http://www.wias-berlin.de/people/si/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
@@ -21,11 +21,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION}
 MAKEFILE=	makefile
 ALL_TARGET=	tetgen tetlib
 
-.if defined(MAINTAINER_MODE)
-test:	build
-	(cd ${INSTALL_WRKSRC} && ./tetgen -p example.poly )
-.endif
-
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/tetgen ${PREFIX}/bin
 	@${INSTALL_DATA} ${WRKSRC}/tetgen.h ${PREFIX}/include
@@ -35,4 +30,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/example.poly ${EXAMPLESDIR}
 .endif
 
+regression-test:
+	(cd ${INSTALL_WRKSRC} && ./tetgen -p example.poly )
+
 .include <bsd.port.mk>
diff --git a/math/tetgen/distinfo b/math/tetgen/distinfo
index 170fc38963ac..b6c27cd1cc7d 100644
--- a/math/tetgen/distinfo
+++ b/math/tetgen/distinfo
@@ -1,3 +1,3 @@
-MD5 (tetgen1.4.1.tar.gz) = 916934ae75478d12af197f45b678ef15
-SHA256 (tetgen1.4.1.tar.gz) = c02633d72d86fdc55c17da93a6b18d871acbb69de7b45b0a0ffbbd9927315321
-SIZE (tetgen1.4.1.tar.gz) = 550952
+MD5 (tetgen1.4.2.tar.gz) = 59c92b223f69cc7e50ae6cd9d1539db1
+SHA256 (tetgen1.4.2.tar.gz) = 38f24694983f20e5bffa2ebc1d35a7c3abea50479a6df6449cc900bf2732891d
+SIZE (tetgen1.4.2.tar.gz) = 294143
diff --git a/math/tetgen/files/patch-makefile b/math/tetgen/files/patch-makefile
index f3d806975f32..0602a53b6335 100644
--- a/math/tetgen/files/patch-makefile
+++ b/math/tetgen/files/patch-makefile
@@ -1,26 +1,29 @@
---- makefile.orig	Fri Jan 13 15:30:08 2006
-+++ makefile	Wed Mar  8 16:20:59 2006
-@@ -6,12 +6,12 @@
+--- makefile.orig	Mon Apr 16 16:45:21 2007
++++ makefile	Wed Jul 18 22:04:08 2007
+@@ -11,7 +11,7 @@
+ # CXX should be set to the name of your favorite C++ compiler.
+ # ===========================================================
  
- # CC should be set to the name of your favorite C++ compiler.
+-CXX = g++
++#CXX = g++
+ #CXX = icpc
+ #CXX = CC
  
--CC = g++
-+CC = $(CXX)
+@@ -19,7 +19,7 @@
+ # -O2, -O3 ... to find the best optimization level.
+ # ===================================================================
  
- # OPT is the level of optimiztion, default is -O. One should try -O2, -O3
- #   ... to find the best optimization level.
+-CXXFLAGS = -g
++#CXXFLAGS = -g
  
--OPT = -g
-+OPT = ${CXXFLAGS}
- 
- # CFLAGS is a list of switches to compile TetGen.
- #
-@@ -23,7 +23,7 @@
+ # PREDCXXFLAGS is for compiling J. Shewchuk's predicates. It should
+ # always be equal to -O0 (no optimization). Otherwise, TetGen may not
+@@ -38,7 +38,7 @@
  #   down the speed of TetGen.  They can be skipped by define the -DNDEBUG
  #   switch.
  
--CFLAGS = -Wall -DSELF_CHECK
-+CFLAGS = -DNDEBUG
+-SWITCHES = -Wall -DSELF_CHECK
++SWITCHES = -DNDEBUG
  
- #CFLAGS = -funroll-all-loops -fomit-frame-pointer\
- #         -Wall -Wabi -Wctor-dtor-privacy \
+ # SWITCHES = -Wall -Wabi -Wctor-dtor-privacy \
+ #            -Woverloaded-virtual -Wno-pmf-conversions -Wsign-promo \
-- 
cgit