From bcacf5232021a0393638aa9610e0dcaa6f3fd565 Mon Sep 17 00:00:00 2001 From: bf Date: Sat, 4 Sep 2010 12:24:10 +0000 Subject: -fix website and distfile information -update to 2.16c -clean up Makefile and pkg-descr -add license information -add a few minor patches (Note: This port needs more work.) PR: 148610 Approved by: makc (co-mentor) --- math/emc2/Makefile | 45 ++++++++++++++---------- math/emc2/distinfo | 18 +++++----- math/emc2/files/patch-f3d__u_hp700__prettydate.c | 19 ++++++++++ math/emc2/files/patch-f3d__u_hp700__prettytime.c | 19 ++++++++++ math/emc2/files/patch-libI77__lread.c | 29 +++++++++++++++ math/emc2/files/patch-libemc2_1.c | 11 ++++++ math/emc2/pkg-descr | 19 +++++----- math/emc2/pkg-plist | 21 ----------- 8 files changed, 122 insertions(+), 59 deletions(-) create mode 100644 math/emc2/files/patch-f3d__u_hp700__prettydate.c create mode 100644 math/emc2/files/patch-f3d__u_hp700__prettytime.c create mode 100644 math/emc2/files/patch-libI77__lread.c create mode 100644 math/emc2/files/patch-libemc2_1.c delete mode 100644 math/emc2/pkg-plist (limited to 'math/emc2') diff --git a/math/emc2/Makefile b/math/emc2/Makefile index 2ffee03fe992..3f464b2d3960 100644 --- a/math/emc2/Makefile +++ b/math/emc2/Makefile @@ -6,25 +6,25 @@ # PORTNAME= emc2 -PORTVERSION= 2.15 -PORTREVISION= 5 +DISTVERSIONPREFIX=v +DISTVERSION= 2.16c CATEGORIES= math science -MASTER_SITES= http://pauillac.inria.fr/cdrom_a_graver/ftp/emc2/ -DISTFILES= ${PORTNAME}${EXTRACT_SUFX} +MASTER_SITES= http://www.ann.jussieu.fr/~hecht/ftp/emc2/ +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} .if !defined(NOPORTDOCS) -DISTFILES+= ${PORTNAME}-doc-en.ps.gz ${PORTNAME}-doc-fr.ps.gz -EXTRACT_ONLY= ${PORTNAME}${EXTRACT_SUFX} +DISTFILES+= RTemc2_fr.pdf RTemc2_gb.pdf +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} .endif MAINTAINER= ports@FreeBSD.org -COMMENT= A graphic editor of two dimensional geometry and mesh +COMMENT= A graphical editor of two-dimensional mesh geometries +LICENSE= INRIA +LICENSE_NAME= INRIA license, perhaps specific to emc2 +LICENSE_FILE= ${WRKSRC}/COPYRIGHT +LICENSE_PERMS= no-dist-sell no-pkg-sell RESTRICTED= No resale, contact author for commercial usage -BROKEN= size mismatch - -WRKSRC= ${WRKDIR}/${PORTNAME} - USE_XORG= x11 USE_GMAKE= yes ALL_TARGET= ${PORTNAME} @@ -33,19 +33,28 @@ ALL_TARGET= ${PORTNAME} CFLAGS+= -DFRENCH .endif +.if !defined(NOPORTDOCS) +PORTDOCS= ${DISTFILES:M*.pdf} +.endif + +.if !defined(NOPORTEXAMPLES) +PORTEXAMPLES= * +.endif + +PLIST_FILES= bin/emc2 bin/prf_f3d + +do-install: + @${INSTALL_PROGRAM} ${WRKSRC}/emc2 ${PREFIX}/bin + @${INSTALL_SCRIPT} ${WRKSRC}/prf_f3d ${PREFIX}/bin + post-install: - @${STRIP_CMD} ${PREFIX}/bin/emc2 .if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} ${EXAMPLESDIR} - @${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${DOCSDIR} - @${GZCAT} ${DISTDIR}/${PORTNAME}-doc-en.ps.gz > ${DOCSDIR}/${PORTNAME}-en.ps - @${GZCAT} ${DISTDIR}/${PORTNAME}-doc-fr.ps.gz > ${DOCSDIR}/${PORTNAME}-fr.ps - @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." + @${MKDIR} ${DOCSDIR} + @(cd ${DISTDIR} && ${INSTALL_MAN} ${PORTDOCS} ${DOCSDIR}) .endif .if !defined(NOPORTEXAMPLES) @${MKDIR} ${EXAMPLESDIR} @${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR} - @${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}." .endif .include diff --git a/math/emc2/distinfo b/math/emc2/distinfo index 5bbc4126ef59..805392329804 100644 --- a/math/emc2/distinfo +++ b/math/emc2/distinfo @@ -1,9 +1,9 @@ -MD5 (emc2.tar.gz) = 37b45e0d948e196020488eb05e00a216 -SHA256 (emc2.tar.gz) = bac5cb8cd97611034711169441d71f7b87b8e21a03a4a44b8547117d2e5bc551 -SIZE (emc2.tar.gz) = 647354 -MD5 (emc2-doc-en.ps.gz) = 5056bcca5d12d2410c121778404ab40c -SHA256 (emc2-doc-en.ps.gz) = a129d5821624dd8b0b91c811572f10081a1ec44acfd85e21cc5c2a54c737294a -SIZE (emc2-doc-en.ps.gz) = 447045 -MD5 (emc2-doc-fr.ps.gz) = 9c65a98f9926eb85e51c651aa9ee4488 -SHA256 (emc2-doc-fr.ps.gz) = eca8d1f6254a2071222f11c04b9d2d414ac5fb7d32a3caabd4671546bf3e23d3 -SIZE (emc2-doc-fr.ps.gz) = 451024 +MD5 (emc2-v2.16c.tar.gz) = 25eaf11d661e87db6c67d761a75243d0 +SHA256 (emc2-v2.16c.tar.gz) = 447b2b8c749f8f0e1dc15cd9981032a06504765622912e4a3ff8cb71aa57f767 +SIZE (emc2-v2.16c.tar.gz) = 1026774 +MD5 (RTemc2_fr.pdf) = c99939d97130db107dc87426a15d02d0 +SHA256 (RTemc2_fr.pdf) = d07db82e0f167c882355571b6462745309fc09f81241dd8d029a8bb0560b4fe5 +SIZE (RTemc2_fr.pdf) = 724924 +MD5 (RTemc2_gb.pdf) = 6e87d72e74724ce7dac750f23cc6d32c +SHA256 (RTemc2_gb.pdf) = e5983fb78234f9eb20bcff19812f109ad277261b2617e0c623b4b6e0865665be +SIZE (RTemc2_gb.pdf) = 744208 diff --git a/math/emc2/files/patch-f3d__u_hp700__prettydate.c b/math/emc2/files/patch-f3d__u_hp700__prettydate.c new file mode 100644 index 000000000000..1cc91f968391 --- /dev/null +++ b/math/emc2/files/patch-f3d__u_hp700__prettydate.c @@ -0,0 +1,19 @@ +--- ./f3d/u_hp700/prettydate.c.orig 2010-08-31 08:51:18.000000000 -0400 ++++ ./f3d/u_hp700/prettydate.c 2010-08-31 08:52:44.000000000 -0400 +@@ -6,7 +6,7 @@ + { + time_t timevar; + struct tm *pttm; +- char buffer[6]; ++ char buffer[7]; + + timevar=time(&timevar); + pttm = localtime(&timevar); +@@ -14,6 +14,6 @@ + sprintf(buffer,"%02d%02d%02d",pttm->tm_year % 100, + pttm->tm_mon+1, + pttm->tm_mday); +- bcopy (buffer, date, 6); ++ bcopy (buffer, date, 7); + } + diff --git a/math/emc2/files/patch-f3d__u_hp700__prettytime.c b/math/emc2/files/patch-f3d__u_hp700__prettytime.c new file mode 100644 index 000000000000..863755e7427d --- /dev/null +++ b/math/emc2/files/patch-f3d__u_hp700__prettytime.c @@ -0,0 +1,19 @@ +--- ./f3d/u_hp700/prettytime.c.orig 2010-08-31 08:51:31.000000000 -0400 ++++ ./f3d/u_hp700/prettytime.c 2010-08-31 08:52:32.000000000 -0400 +@@ -6,7 +6,7 @@ + { + time_t timevar; + struct tm *pttm; +- char buffer[12]; ++ char buffer[13]; + + timevar=time(&timevar); + pttm = localtime(&timevar); +@@ -14,6 +14,6 @@ + sprintf(buffer,"%02d%02d%02d000000",pttm->tm_hour, + pttm->tm_min, + pttm->tm_sec); +- bcopy (buffer, timeret, 12); ++ bcopy (buffer, timeret, 13); + } + diff --git a/math/emc2/files/patch-libI77__lread.c b/math/emc2/files/patch-libI77__lread.c new file mode 100644 index 000000000000..c948e6142608 --- /dev/null +++ b/math/emc2/files/patch-libI77__lread.c @@ -0,0 +1,29 @@ +--- ./libI77/lread.c.orig 2010-08-31 08:39:32.000000000 -0400 ++++ ./libI77/lread.c 2010-08-31 08:40:19.000000000 -0400 +@@ -369,7 +369,7 @@ + *p++ = ch; + f__lcount = 10*f__lcount + ch - '0'; + if (++i == size) { +- f__lchar = (char *)realloc(f__lchar, ++ f__lchar = (char *)reallocf(f__lchar, + (unsigned int)(size += BUFSIZE)); + p = f__lchar + i; + } +@@ -401,7 +401,7 @@ + noquote: + *p++ = ch; + if (++i == size) { +- f__lchar = (char *)realloc(f__lchar, ++ f__lchar = (char *)reallocf(f__lchar, + (unsigned int)(size += BUFSIZE)); + p = f__lchar + i; + } +@@ -414,7 +414,7 @@ + if(i==size) + { + newone: +- f__lchar= (char *)realloc(f__lchar, ++ f__lchar= (char *)reallocf(f__lchar, + (unsigned int)(size += BUFSIZE)); + p=f__lchar+i-1; + *p++ = ch; diff --git a/math/emc2/files/patch-libemc2_1.c b/math/emc2/files/patch-libemc2_1.c new file mode 100644 index 000000000000..eca9f96691b8 --- /dev/null +++ b/math/emc2/files/patch-libemc2_1.c @@ -0,0 +1,11 @@ +--- ./libemc2_1.c.orig 2010-08-31 08:37:40.000000000 -0400 ++++ ./libemc2_1.c 2010-08-31 08:38:38.000000000 -0400 +@@ -1517,7 +1517,7 @@ + i__1[2] = 7, a__1[2] = "' retry"; + s_cat(ch__1, a__1, i__1, &c__3, 99L); + scrtch_(ch__1, ii + 19); +-/* call scrtch('mauvais type : '''/*type(1:ii)//''' recommencez'*/ ++/* call scrtch('mauvais type : '''/*type(1:ii)//''' recommencez' + ) #FR*/ + goto L5; + } diff --git a/math/emc2/pkg-descr b/math/emc2/pkg-descr index 6c5eea5c135c..449b1ee1ea28 100644 --- a/math/emc2/pkg-descr +++ b/math/emc2/pkg-descr @@ -1,13 +1,10 @@ -Emc2 is a portable, interactive and graphic software Edition of two -dimensional geometry and mesh. We can create and modify the geometry -(CAD), define the discretization on the lines, define the subdomains, -and define some reference numbers to take into account the boundary -conditions and material properties. The elements of the mesh are triangles -and quadrilaterals. We have two kind of meshes: grid mesh and Delaunay -Voronoo (automatic mesh). We make the edition of the mesh by moving, -removing, adding vertices, by regularization, or by transformations -(symmetry, rotation,..), etc. +Emc2 is a portable, interactive, graphical editor of two-dimensional mesh +geometries. It can create and modify geometries (as in CAD), and define line +discretizations, subdomains, and reference numbers (to take into account +boundary conditions and material properties). Grid and Delaunay-Voronoi +meshes composed of triangles or quadrilaterals can be regularized, rotated, +and modified via the addition, removal, or moving of vertices. -Suggested add-on: the port math/bamg. +It is suggested that users also install the math/bamg port. -WWW: http://pauillac.inria.fr/cdrom_a_graver/prog/unix/emc2/eng.htm +WWW: http://www.ann.jussieu.fr/~hecht/main.html diff --git a/math/emc2/pkg-plist b/math/emc2/pkg-plist deleted file mode 100644 index c417f2d3b5e6..000000000000 --- a/math/emc2/pkg-plist +++ /dev/null @@ -1,21 +0,0 @@ -bin/emc2 -bin/prf_f3d -%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT -%%PORTDOCS%%%%DOCSDIR%%/emc2-en.ps -%%PORTDOCS%%%%DOCSDIR%%/emc2-fr.ps -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c.emc2_bd -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cooler.emc2_bd -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/culot1.emc2_bd -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demi_carre.emc2_bd -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fissure.emc2_bd -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gruyere.emc2_bd -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/houman.emc2_bd -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/levier.emc2_bd -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mos.emc2_bd -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/naca.f -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/naca.pts -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/naca012.emc2_bd -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/q.emc2_bd -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rotor.emc2_bd -%%PORTDOCS%%@dirrm %%DOCSDIR%% -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% -- cgit