Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 1 Dec 2012 00:00:13 +0000 (UTC)
From:      Armin Pirkovitsch <sperber@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r308050 - in head/science/felt: . files
Message-ID:  <201212010000.qB100D7c081859@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sperber
Date: Sat Dec  1 00:00:12 2012
New Revision: 308050
URL: http://svnweb.freebsd.org/changeset/ports/308050

Log:
  - Update to version 3.07
  - Add LICENSE
  - Add MAKE_JOBS_SAFE
  - Convert to optionsng
  
  PR:           ports/170165
  Submitted by: KATO Tsuguru <tkato432 _at_ yahoo.com>
  Approved by:  beat (mentor)
  Feature safe: yes

Added:
  head/science/felt/files/patch-src__Velvet__Velvet.ad   (contents, props changed)
Deleted:
  head/science/felt/files/patch-aa
  head/science/felt/files/patch-ab
  head/science/felt/files/patch-src+Patchwork+oogl+h
  head/science/felt/files/patch-src+Velvet+opengl+c
  head/science/felt/files/patch-src-Velvet-Makefile
  head/science/felt/files/patch-src-Velvet-analysis.c
  head/science/felt/files/patch-src__Burlap__descriptor.c
  head/science/felt/files/patch-src__Burlap__fefunc.c
  head/science/felt/files/patch-src__Burlap__felt.c
Modified:
  head/science/felt/Makefile   (contents, props changed)
  head/science/felt/distinfo   (contents, props changed)
  head/science/felt/pkg-plist   (contents, props changed)

Modified: head/science/felt/Makefile
==============================================================================
--- head/science/felt/Makefile	Fri Nov 30 23:52:56 2012	(r308049)
+++ head/science/felt/Makefile	Sat Dec  1 00:00:12 2012	(r308050)
@@ -6,24 +6,29 @@
 #
 
 PORTNAME=	felt
-PORTVERSION=	3.06
-PORTREVISION=	3
+PORTVERSION=	3.07
+DISTVERSIONSUFFIX=	.src
 CATEGORIES=	science
-MASTER_SITES=	SF/${PORTNAME}/FElt/${PORTVERSION}devel
-EXTRACT_SUFX=	-devel.src.tar.gz
+MASTER_SITES=	SF/${PORTNAME}/FElt/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A system for Finite Element Analysis
 
-LIB_DEPENDS=	GLw.1:${PORTSDIR}/graphics/libGLw
+LICENSE=	GPLv2
 
-WRKSRC=		${WRKDIR}/FElt-${PORTVERSION}
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
+USE_BZIP2=	yes
 USE_MOTIF=	yes
-USE_GL=		glu
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--x-defaults=${LOCALBASE}/lib/X11/app-defaults
-CFLAGS+=	-D__GLX_MOTIF
+USE_GL=		glu glw
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--prefix="${PREFIX}" \
+		--x-defaults="${LOCALBASE}/lib/X11/app-defaults" \
+		--x-includes="${LOCALBASE}/include" \
+		--x-libraries="${LOCALBASE}/lib"
+MAKE_JOBS_SAFE=	yes
 
 MAN1=		burlap.1 corduroy.1 felt.1 patchwork.1 velvet.1 yardstick.1
 MAN3=		Drawing.3
@@ -32,19 +37,24 @@ MAN4=		corduroy.4 felt.4
 DOCSDIR=	${PREFIX}/share/doc/FElt
 EXAMPLESDIR=	${PREFIX}/share/examples/FElt
 
-post-extract:
-	@cd ${WRKSRC}/include && ${RM} -rf X11
-
 post-patch:
 	@${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|["<]malloc\.h[">]|<stdlib.h>|g'
+	@${REINPLACE_CMD} -e \
+		'/which CC/s|^|#| ; \
+		 /CCOPTS=-O3/s|^.*|CCOPTS=$${CFLAGS}| ; \
+		 s|lib/felt|share/felt|' ${WRKSRC}/configure	
+	@${REINPLACE_CMD} -e \
+		's|-lpthread|$$(MOTIFLIB)|' ${WRKSRC}/src/Velvet/Makefile
+
+.include <bsd.port.options.mk>
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.html ${DOCSDIR}
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/README ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.ans ${EXAMPLESDIR}

Modified: head/science/felt/distinfo
==============================================================================
--- head/science/felt/distinfo	Fri Nov 30 23:52:56 2012	(r308049)
+++ head/science/felt/distinfo	Sat Dec  1 00:00:12 2012	(r308050)
@@ -1,2 +1,2 @@
-SHA256 (felt-3.06-devel.src.tar.gz) = 1444b74034a0d68d50a035983b4781f3d567c253533f0776ee19b48ea93de37d
-SIZE (felt-3.06-devel.src.tar.gz) = 1005386
+SHA256 (felt-3.07.src.tar.bz2) = 8acbfefd4d8245338fa2bd575e6a6592d24812b1fd2ce3e051f119669cf37a78
+SIZE (felt-3.07.src.tar.bz2) = 795173

Added: head/science/felt/files/patch-src__Velvet__Velvet.ad
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/science/felt/files/patch-src__Velvet__Velvet.ad	Sat Dec  1 00:00:12 2012	(r308050)
@@ -0,0 +1,14 @@
+--- src/Velvet/Velvet.ad.orig	2009-04-20 01:27:34.000000000 +0900
++++ src/Velvet/Velvet.ad	2012-07-11 23:01:19.000000000 +0900
+@@ -1046,7 +1046,7 @@
+ 
+ ! 3d specific defaults
+ 
+-!*shapeStyle:					Rectangle
+-!*control*spacer.height:				43
+-!*control*MenuButton*height:			26
+-!*control*Command*height:			26
++*shapeStyle:					Rectangle
++*control*spacer.height:				43
++*control*MenuButton*height:			26
++*control*Command*height:			26

Modified: head/science/felt/pkg-plist
==============================================================================
--- head/science/felt/pkg-plist	Fri Nov 30 23:52:56 2012	(r308049)
+++ head/science/felt/pkg-plist	Sat Dec  1 00:00:12 2012	(r308050)
@@ -7,102 +7,102 @@ bin/velvet
 bin/yardstick
 lib/X11/app-defaults/Velvet.ad
 %%PORTDOCS%%%%DOCSDIR%%/FAQ.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/frame3.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/axisymm.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam3d_2d.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam3d_a.flt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam3d_b.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/brick_ring.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/brick_cap.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam3d_dist.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam3d_dist_a.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam_lc.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam_nl.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam_range.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam_ss.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamspec.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bicycle_boys.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bicycle_girls.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/boxtruss.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/brick.flt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/brick_beam.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/brick_cap.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/brick_ring.flt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bridge.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bridge_dyn.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bridge_spec.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ctg.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ctg_simple.flt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cube.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iso.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pstress.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pstress_a.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/truss3d.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/truss_d.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/displ.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dist_mult.flt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/distrib.flt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/distrib_a.flt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/distrib_b.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/distrib_c.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/distrib_d.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/distrib_e.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dynamic.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dynframe.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dynspect.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errors.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/flexure.flt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/frame.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/frame3.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/german.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/global.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/global3d.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/global3d_a.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/global3d_b.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/global_a.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/golden.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/heat.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/heat_transient.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hinged.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/htk.flt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/htk_modal.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mixed_dist.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mixed.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pstress_dist.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/truss.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/truss_a.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam3d_2d.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iso.flt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iso_a.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/distrib_c.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iso_b.flt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iso_c.flt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iso_tri.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/truss_trig.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wrench.flt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/isoq_dist.flt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/isoq_tri.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/distrib_d.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam3d_dist.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pstress_new.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/loadcase1.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mixed.flt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mixed_dist.ans
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/displ.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam3d_dist_a.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/german.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errors.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/distrib_e.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/timoshenko.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/timoshenko_a.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/timoshenko_c.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/global.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/global_a.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hinged.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tower.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/global3d_a.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/global3d.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/global3d_b.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bicycle_boys.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bicycle_girls.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dynamic.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dynframe.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/golden.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bridge_dyn.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/htk.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/truss_canvas.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/brick.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam_ss.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dist_mult.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mixed_dist.flt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/modal.flt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/modal_8.flt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/modal_sample.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ctg.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ctg_simple.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/heat.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/modal_test.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nl_range.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pstress.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pstress_a.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pstress_dist.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pstress_new.flt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rod.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamspec.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/heat_transient.flt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rod_transient.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dynspect.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spring_modal.flt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/spring2.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/truss_spec.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/boxtruss.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bridge_spec.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/loadcase1.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/axisymm.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam_lc.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam_nl.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam_range.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/flexure.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/modal_test.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nl_range.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spring_modal.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/timoshenko.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/timoshenko_a.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/timoshenko_c.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tower.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/truss.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/truss3d.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/truss_a.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/truss_canvas.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/truss_d.flt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/truss_nl.flt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam3d_a.flt
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/truss_spec.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/truss_trig.flt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wrench.flt
 %%DATADIR%%/beam.defaults
-%%DATADIR%%/material.defaults
-%%DATADIR%%/truss.defaults
 %%DATADIR%%/german.trn
 %%DATADIR%%/german_new.trn
+%%DATADIR%%/material.defaults
 %%DATADIR%%/spanish.trn
+%%DATADIR%%/truss.defaults
 @dirrm %%DATADIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212010000.qB100D7c081859>