- Upgrade to 2.0.8;

  Changelog at <http://www.geuz.org/gmsh/doc/VERSIONS>

- Now we are allowed to package Gmsh built with Tetgen: thanks to Pedro
  F. Giffuni, the author granted the FreeBSD project to redistribute it.
  However, redistribution of Triangle has not yet been granted, then:
  . build the default package with Tetgen and Triangle;
  . set NO_CDROM if Triangle is not disabled;
  . explain the conditions in post-installation message.

Suggested by:	Pedro F. Giffuni <giffunip (at) yahoo.com>

6 files changed, 36 insertions, 39 deletions

diff --git a/cad/gmsh/Makefile b/cad/gmsh/Makefile
index d7185a438c57..70b6c01aac72 100644
--- a/cad/gmsh/Makefile
+++ b/cad/gmsh/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gmsh
-PORTVERSION=	2.0.7
-PORTREVISION=	2
+PORTVERSION=	2.0.8
 CATEGORIES=	cad
 MASTER_SITES=	http://www.geuz.org/gmsh/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
@@ -20,13 +19,8 @@ RUN_DEPENDS=	getdp:${PORTSDIR}/science/getdp
 LIB_DEPENDS=	gsl.10:${PORTSDIR}/math/gsl \
 		fltk.1:${PORTSDIR}/x11-toolkits/fltk
 
-.if defined(PACKAGE_BUILDING)
-#Triangle and Tetgen are NO_CDROM
-WITHOUT_TRIANGLE=	yes
-WITHOUT_TETGEN=		yes
-.endif
-
 .if !defined(WITHOUT_TRIANGLE)
+NO_CDROM=		Triangle must not be sold for profit
 EXTRACT_DEPENDS+=	${NONEXISTENT}:${TRIANGLE_PORTDIR}:patch
 TRIANGLE_PORTDIR=	${PORTSDIR}/math/triangle
 .endif
@@ -79,6 +73,7 @@ CONFIGURE_ARGS+=	--disable-occ
 .endif
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+PKGMESSAGE=	${WRKDIR}/pkg-message
 
 MAN1=		gmsh.1
 
@@ -113,13 +108,23 @@ pre-everything::
 .endif
 
 post-extract:
+	${TOUCH} ${PKGMESSAGE}
 .if !defined(WITHOUT_TRIANGLE)
 	${CP} `cd ${TRIANGLE_PORTDIR}; ${MAKE} -V WRKSRC`/triangle.*	\
 		${WRKSRC}/contrib/Triangle
+	@${ECHO} >> ${PKGMESSAGE}
+	@${ECHO} "This package of Gmsh has been built with Triangle, then" >> ${PKGMESSAGE}
+	@${ECHO} "distribution of this code as part of a commercial system" >> ${PKGMESSAGE}
+	@${ECHO} "is permissible only by direct arrangement with the Triangle's author." >> ${PKGMESSAGE}
 .endif
 .if !defined(WITHOUT_TETGEN)
 	${CP} ${TETGEN_SRC:S|^|`cd ${TETGEN_PORTDIR}; ${MAKE} -V WRKSRC`/|}	\
 		${WRKSRC}/contrib/Tetgen
+	@${ECHO} >> ${PKGMESSAGE}
+	@${ECHO} "The FreeBSD project has been granted redistribution rights" >> ${PKGMESSAGE}
+	@${ECHO} "but anyone attempting to redistribute Gmsh with Tetgen" >> ${PKGMESSAGE}
+	@${ECHO} "for strict commercial purposes must still contact the author" >> ${PKGMESSAGE}
+	@${ECHO} "(Hang Si) and license the code." >> ${PKGMESSAGE}
 .endif
 
 pre-configure:
@@ -143,4 +148,7 @@ do-install:
 		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
 .endif
 
+post-install:
+	@${CAT} ${PKGMESSAGE}
+
 .include <bsd.port.mk>
diff --git a/cad/gmsh/distinfo b/cad/gmsh/distinfo
index a932643d9329..1af21afd7f9e 100644
--- a/cad/gmsh/distinfo
+++ b/cad/gmsh/distinfo
@@ -1,3 +1,3 @@
-MD5 (gmsh-2.0.7-source.tgz) = b98d1ee455d11a1fbbe19114042f9fcf
-SHA256 (gmsh-2.0.7-source.tgz) = 8cd127448c35c1645223bd63ec81fc475113067861bb8ed1ca45fd040ee88421
-SIZE (gmsh-2.0.7-source.tgz) = 2172662
+MD5 (gmsh-2.0.8-source.tgz) = 123e7f40dedcc0f2ec33ff1af4b8d127
+SHA256 (gmsh-2.0.8-source.tgz) = 944988ba39b79dee1c84576918384670ff99ac54f864e33c4130b0565e1484f7
+SIZE (gmsh-2.0.8-source.tgz) = 2244709
diff --git a/cad/gmsh/files/patch-Common::AdaptiveViews.cpp b/cad/gmsh/files/patch-Common::AdaptiveViews.cpp
deleted file mode 100644
index 339a5ef1221d..000000000000
--- a/cad/gmsh/files/patch-Common::AdaptiveViews.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- Common/AdaptiveViews.cpp.orig	Thu Nov 11 07:45:16 2004
-+++ Common/AdaptiveViews.cpp	Thu Nov 11 16:11:29 2004
-@@ -23,6 +23,7 @@
- 				       
- #include <stdio.h>
- #include <math.h>
-+#include <time.h>
- #include <list>
- #include <set>
- #include "Views.h"
diff --git a/cad/gmsh/files/patch-Post_AdaptiveViews.cpp b/cad/gmsh/files/patch-Post_AdaptiveViews.cpp
new file mode 100644
index 000000000000..5c0c58378686
--- /dev/null
+++ b/cad/gmsh/files/patch-Post_AdaptiveViews.cpp
@@ -0,0 +1,10 @@
+--- ./Post/AdaptiveViews.cpp.orig	Mon Jul  9 15:54:37 2007
++++ ./Post/AdaptiveViews.cpp	Mon Jul 23 22:42:06 2007
+@@ -20,6 +20,7 @@
+ 
+ #include <stdio.h>
+ #include <math.h>
++#include <time.h>
+ #include <list>
+ #include <set>
+ #include "AdaptiveViews.h"
diff --git a/cad/gmsh/files/patch-configure b/cad/gmsh/files/patch-configure
index 169777176897..d1729b700667 100644
--- a/cad/gmsh/files/patch-configure
+++ b/cad/gmsh/files/patch-configure
@@ -1,15 +1,15 @@
---- configure.orig	Sat Mar 31 11:38:03 2007
-+++ configure	Sun Apr  1 10:24:31 2007
-@@ -3174,7 +3174,7 @@
+--- configure.orig	Thu Jul 12 18:08:39 2007
++++ configure	Mon Jul 23 22:45:54 2007
+@@ -3192,7 +3192,7 @@
    GMSH_DIRS="${GMSH_DIRS} Graphics Fltk"
    GMSH_LIBS="-Llib -lGmshFltk -lGmshParser -lGmshGraphics -lGmshMesh -lGmshGeo"
-   GMSH_LIBS="${GMSH_LIBS} -lGmshPlugin -lGmshCommon -lGmshDataStr -lGmshNumeric"
+   GMSH_LIBS="${GMSH_LIBS} -lGmshPlugin -lGmshPost -lGmshCommon -lGmshDataStr -lGmshNumeric"
 -  GMSH_LIBS="${GMSH_LIBS} -lGmshParallel"
 +  GMSH_LIBS="${GMSH_LIBS} -lGmshParallel ${LDFLAGS}"
    FLAGS="-DHAVE_FLTK ${FLAGS}"
  
    if test "x${FLTK_PREFIX}" != "x" ; then
-@@ -4521,7 +4521,7 @@
+@@ -4541,7 +4541,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -18,7 +18,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -4584,7 +4584,7 @@
+@@ -4604,7 +4604,7 @@
        GMSH_LIBS="${GMSH_LIBS} -lcgns"
        FLAGS="${FLAGS} -DHAVE_LIBCGNS"
      else
@@ -27,7 +27,7 @@
        FLAGS="${FLAGS} -DHAVE_LIBCGNS -I${CGNS_PREFIX}/include"
      fi
    fi
-@@ -4678,7 +4678,7 @@
+@@ -4698,7 +4698,7 @@
        FLAGS="${FLAGS} -DHAVE_OCC"
      else
        GMSH_LIBS="${GMSH_LIBS} -L${OCC_PREFIX}/lib ${OCC_LIBS}"
diff --git a/cad/gmsh/files/patch-utils_converters_autocad_message.c b/cad/gmsh/files/patch-utils_converters_autocad_message.c
deleted file mode 100644
index 550c1d1eb817..000000000000
--- a/cad/gmsh/files/patch-utils_converters_autocad_message.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- utils/converters/autocad/message.c.orig	Fri May  9 23:58:55 2003
-+++ utils/converters/autocad/message.c	Mon Feb  5 21:47:50 2007
-@@ -3,7 +3,7 @@
- #include <signal.h>
- #include <stdarg.h>
- 
--void Msg(int level, char *fmt, ...)
-+void Msg(int level, const char *fmt, ...)
- {
-   va_list args;
-   va_start(args, fmt);