diff options
| -rw-r--r-- | cad/gmsh/Makefile | 65 | ||||
| -rw-r--r-- | cad/gmsh/distinfo | 4 |
2 files changed, 37 insertions, 32 deletions
diff --git a/cad/gmsh/Makefile b/cad/gmsh/Makefile index 2ef36e611bf8..5d349b21abe5 100644 --- a/cad/gmsh/Makefile +++ b/cad/gmsh/Makefile @@ -6,15 +6,14 @@ # PORTNAME= gmsh -PORTVERSION= 1.54.1 +PORTVERSION= 1.55.0 CATEGORIES= cad MASTER_SITES= http://www.geuz.org/gmsh/src/ \ - http://www.cs.berkeley.edu/~jrs/:triangle + http://cm.bell-labs.com/netlib/voronoi/:triangle DISTNAME= ${PORTNAME}-${PORTVERSION}-source EXTRACT_SUFX= .tgz -.ifdef WITH_TRIANGLE -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - triangle.shar.gz:triangle +.if defined(WITH_TRIANGLE) +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} triangle.shar.gz:triangle EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} .endif @@ -26,34 +25,38 @@ LIB_DEPENDS= gsl.6:${PORTSDIR}/math/gsl \ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -.ifndef WITH_TRIANGLE -pre-everything:: - @${ECHO_MSG} "You can make with WITH_TRIANGLE for faster 2d meshing" -.else -NO_CDROM= "Triangle must not be sold for profit" -post-extract: - @(cd ${WRKSRC}/Triangle; \ - ${GUNZIP_CMD} < ${DISTDIR}/${DIST_SUBDIR}/triangle.shar.gz | ${SH}) - ${RM} ${WRKSRC}/Triangle/makefile -.endif - +USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-fltk-prefix=${X11BASE} \ - --with-gsl-prefix=${LOCALBASE} \ - --with-jpeg-prefix=${LOCALBASE} \ - --with-png-prefix=${LOCALBASE} CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -USE_REINPLACE= yes -REINPLACE_ARGS= -i "" - +CONFIGURE_ARGS= --with-fltk-prefix=${X11BASE} \ + --with-gsl-prefix=${LOCALBASE} \ + --with-jpeg-prefix=${LOCALBASE} \ + --with-png-prefix=${LOCALBASE} ALL_TARGET= all converters MAN1= gmsh.1 -DEMO2FIX= isosurf.scp lowmem-anim.geo +.if !defined(WITH_TRIANGLE) +NO_CDROM= "Triangle must not be sold for profit" +.endif + +pre-everything:: +.if !defined(WITH_TRIANGLE) + @${ECHO_MSG} + @${ECHO_MSG} "You can make with WITH_TRIANGLE for faster 2d meshing" + @${ECHO_MSG} +.endif + +post-extract: +.if defined(WITH_TRIANGLE) + @(cd ${WRKSRC}/Triangle; \ + ${GUNZIP_CMD} < ${DISTDIR}/${DIST_SUBDIR}/triangle.shar.gz | \ + ${SED} 's:/ \*:/* :g' | ${SH}) + ${RM} ${WRKSRC}/Triangle/makefile +.endif -pre-configure: -.for demo in ${DEMO2FIX} +post-patch: +.for demo in isosurf.scp lowmem-anim.geo @${REINPLACE_CMD} -e "s|../tutorial|${DOCSDIR}/tutorial|" \ ${WRKSRC}/demos/${demo} .endfor @@ -62,11 +65,13 @@ post-install: @${STRIP_CMD} ${PREFIX}/bin/gmsh ${INSTALL_PROGRAM} ${WRKSRC}/bin/dxf2geo ${PREFIX}/bin .if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR}/tutorial - ${INSTALL_DATA} ${WRKSRC}/tutorial/* ${DOCSDIR}/tutorial + @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/FAQ ${DOCSDIR} - ${MKDIR} ${EXAMPLESDIR}/demos - ${INSTALL_DATA} ${WRKSRC}/demos/* ${EXAMPLESDIR}/demos + cd ${WRKSRC} && ${FIND} tutorial | \ + ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} + @${MKDIR} ${EXAMPLESDIR} + cd ${WRKSRC} && ${FIND} demos ! -name "*.bak" | \ + ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR} .endif .include <bsd.port.mk> diff --git a/cad/gmsh/distinfo b/cad/gmsh/distinfo index eb117fd4a661..0b01a19356ce 100644 --- a/cad/gmsh/distinfo +++ b/cad/gmsh/distinfo @@ -1,2 +1,2 @@ -MD5 (gmsh-1.54.1-source.tgz) = bf5919a9c72bff6150faa0319506b41a -SIZE (gmsh-1.54.1-source.tgz) = 1644348 +MD5 (gmsh-1.55.0-source.tgz) = cc4424d7383fdf50e8c243870bfe13e9 +SIZE (gmsh-1.55.0-source.tgz) = 1659060 |