3 files changed, 111 insertions, 108 deletions

diff --git a/science/felt/Makefile b/science/felt/Makefile
index 4d9c311561dd..612690b090e9 100644
--- a/science/felt/Makefile
+++ b/science/felt/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	felt
 PORTVERSION=	3.06
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	felt
@@ -15,9 +16,6 @@ EXTRACT_SUFX=	-devel.src.tar.gz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A system for Finite Element Analysis
 
-LIB_DEPENDS=	Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d \
-		Xm.3:${PORTSDIR}/x11-toolkits/open-motif
-
 USE_X_PREFIX=	yes
 USE_GL=		yes
 USE_REINPLACE=	yes
@@ -28,6 +26,9 @@ MAN1=		burlap.1 corduroy.1 felt.1 patchwork.1 velvet.1 yardstick.1
 MAN3=		Drawing.3
 MAN4=		corduroy.4 felt.4
 
+DOCSDIR=	${PREFIX}/share/doc/FElt
+EXAMPLESDIR=	${PREFIX}/share/examples/FElt
+
 post-patch:
 	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>, ; s,"malloc.h",<stdlib.h>,' \
 	${WRKSRC}/lib/Felt/parser.c \
@@ -41,9 +42,11 @@ post-patch:
 	${WRKSRC}/src/Patchwork/util.c
 
 post-install:
-	${MKDIR} ${PREFIX}/share/examples/FElt
-	${CP} ${WRKSRC}/examples/* ${PREFIX}/share/examples/FElt
-	${MKDIR} ${PREFIX}/share/doc/FElt
-	${CP} ${WRKSRC}/*.html ${PREFIX}/share/doc/FElt
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${EXAMPLESDIR}
+	${CP} ${WRKSRC}/examples/* ${EXAMPLESDIR}
+	${MKDIR} ${DOCSDIR}
+	${CP} ${WRKSRC}/*.html ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/science/felt/files/patch-src-Velvet-Makefile b/science/felt/files/patch-src-Velvet-Makefile
index 7220c8eace9c..3b15c97b59e8 100644
--- a/science/felt/files/patch-src-Velvet-Makefile
+++ b/science/felt/files/patch-src-Velvet-Makefile
@@ -5,7 +5,7 @@
  LDFLAGS	= $(LDOPTS) -L$(X11LIB)
  LIBS	= $(LIBWIDGETS) $(LIBGEN) $(LIBFELT) $(LIBELT) $(LIBMTX)\
 -          -lGLw -lGLU -lGL -lXaw3d -lXmu -lXt -lSM -lICE -lXext -lX11 -lm 
-+          -lGLw -lGLU -lGL -lXaw3d -lXmu -lXt -lSM -lICE -lXext -lXm -lX11 -lm 
++          /usr/X11R6/lib/libGLw.a -lGLU -lGL -lXaw -lXmu -lXt -lSM -lICE -lXext -lX11 -lm 
  #	  /usr/X11R6/lib/libXaw3d.a /usr/X11R6/lib/libXmu.so.6.0 \
  #	  /usr/X11R6/lib/libXt.so.6.0 /usr/X11R6/lib/libSM.so.6.0 \
  #	  /usr/X11R6/lib/libICE.so.6.0 /usr/X11R6/lib/libXext.so.6.0 \
diff --git a/science/felt/pkg-plist b/science/felt/pkg-plist
index 0d72a16e4369..917b5cc54a2e 100644
--- a/science/felt/pkg-plist
+++ b/science/felt/pkg-plist
@@ -6,103 +6,103 @@ bin/patchwork
 bin/velvet
 bin/yardstick
 lib/X11/app-defaults/Velvet.ad
-share/doc/FElt/FAQ.html
-@dirrm share/doc/FElt
-share/examples/FElt/frame3.flt
-share/examples/FElt/beam3d_b.flt
-share/examples/FElt/brick_ring.flt
-share/examples/FElt/brick_cap.flt
-share/examples/FElt/brick_beam.flt
-share/examples/FElt/bridge.flt
-share/examples/FElt/cube.flt
-share/examples/FElt/iso.flt
-share/examples/FElt/pstress.flt
-share/examples/FElt/pstress_a.flt
-share/examples/FElt/truss3d.flt
-share/examples/FElt/truss_d.flt
-share/examples/FElt/distrib.flt
-share/examples/FElt/distrib_a.flt
-share/examples/FElt/distrib_b.flt
-share/examples/FElt/frame.flt
-share/examples/FElt/htk_modal.flt
-share/examples/FElt/mixed_dist.flt
-share/examples/FElt/mixed.flt
-share/examples/FElt/pstress_dist.flt
-share/examples/FElt/truss.flt
-share/examples/FElt/truss_a.flt
-share/examples/FElt/beam.flt
-share/examples/FElt/beam3d_2d.flt
-share/examples/FElt/iso_a.flt
-share/examples/FElt/distrib_c.flt
-share/examples/FElt/README
-share/examples/FElt/iso_b.flt
-share/examples/FElt/iso_c.flt
-share/examples/FElt/iso_tri.flt
-share/examples/FElt/truss_trig.flt
-share/examples/FElt/wrench.flt
-share/examples/FElt/isoq_dist.flt
-share/examples/FElt/isoq_tri.flt
-share/examples/FElt/distrib_d.flt
-share/examples/FElt/beam3d_dist.flt
-share/examples/FElt/pstress_new.flt
-share/examples/FElt/mixed_dist.ans
-share/examples/FElt/displ.flt
-share/examples/FElt/beam3d_dist_a.flt
-share/examples/FElt/german.flt
-share/examples/FElt/errors.flt
-share/examples/FElt/distrib_e.flt
-share/examples/FElt/timoshenko.flt
-share/examples/FElt/timoshenko_a.flt
-share/examples/FElt/timoshenko_c.flt
-share/examples/FElt/global.flt
-share/examples/FElt/global_a.flt
-share/examples/FElt/hinged.flt
-share/examples/FElt/tower.flt
-share/examples/FElt/global3d_a.flt
-share/examples/FElt/global3d.flt
-share/examples/FElt/global3d_b.flt
-share/examples/FElt/bicycle_boys.flt
-share/examples/FElt/bicycle_girls.flt
-share/examples/FElt/dynamic.flt
-share/examples/FElt/dynframe.flt
-share/examples/FElt/golden.flt
-share/examples/FElt/bridge_dyn.flt
-share/examples/FElt/htk.flt
-share/examples/FElt/truss_canvas.flt
-share/examples/FElt/brick.flt
-share/examples/FElt/beam_ss.flt
-share/examples/FElt/dist_mult.flt
-share/examples/FElt/modal.flt
-share/examples/FElt/modal_8.flt
-share/examples/FElt/modal_sample.flt
-share/examples/FElt/ctg.flt
-share/examples/FElt/ctg_simple.flt
-share/examples/FElt/heat.flt
-share/examples/FElt/rod.flt
-share/examples/FElt/beamspec.flt
-share/examples/FElt/heat_transient.flt
-share/examples/FElt/rod_transient.flt
-share/examples/FElt/dynspect.flt
-share/examples/FElt/spring_modal.flt
-share/examples/FElt/spring2.flt
-share/examples/FElt/truss_spec.flt
-share/examples/FElt/boxtruss.flt
-share/examples/FElt/bridge_spec.flt
-share/examples/FElt/loadcase1.flt
-share/examples/FElt/axisymm.flt
-share/examples/FElt/beam_lc.flt
-share/examples/FElt/beam_nl.flt
-share/examples/FElt/beam_range.flt
-share/examples/FElt/flexure.flt
-share/examples/FElt/modal_test.flt
-share/examples/FElt/nl_range.flt
-share/examples/FElt/truss_nl.flt
-share/examples/FElt/beam3d_a.flt
-@dirrm share/examples/FElt
-share/felt/beam.defaults
-share/felt/material.defaults
-share/felt/truss.defaults
-share/felt/german.trn
-share/felt/german_new.trn
-share/felt/spanish.trn
-@dirrm share/felt
+%%PORTDOCS%%%%DOCSDIR%%/FAQ.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%EXAMPLESDIR%%/frame3.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/beam3d_b.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/brick_ring.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/brick_cap.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/brick_beam.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/bridge.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/cube.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/iso.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/pstress.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/pstress_a.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/truss3d.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/truss_d.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/distrib.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/distrib_a.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/distrib_b.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/frame.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/htk_modal.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/mixed_dist.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/mixed.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/pstress_dist.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/truss.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/truss_a.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/beam.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/beam3d_2d.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/iso_a.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/distrib_c.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/iso_b.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/iso_c.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/iso_tri.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/truss_trig.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/wrench.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/isoq_dist.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/isoq_tri.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/distrib_d.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/beam3d_dist.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/pstress_new.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/mixed_dist.ans
+%%PORTDOCS%%%%EXAMPLESDIR%%/displ.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/beam3d_dist_a.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/german.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/errors.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/distrib_e.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/timoshenko.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/timoshenko_a.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/timoshenko_c.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/global.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/global_a.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/hinged.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/tower.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/global3d_a.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/global3d.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/global3d_b.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/bicycle_boys.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/bicycle_girls.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/dynamic.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/dynframe.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/golden.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/bridge_dyn.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/htk.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/truss_canvas.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/brick.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/beam_ss.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/dist_mult.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/modal.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/modal_8.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/modal_sample.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/ctg.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/ctg_simple.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/heat.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/rod.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/beamspec.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/heat_transient.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/rod_transient.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/dynspect.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/spring_modal.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/spring2.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/truss_spec.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/boxtruss.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/bridge_spec.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/loadcase1.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/axisymm.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/beam_lc.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/beam_nl.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/beam_range.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/flexure.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/modal_test.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/nl_range.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/truss_nl.flt
+%%PORTDOCS%%%%EXAMPLESDIR%%/beam3d_a.flt
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%DATADIR%%/beam.defaults
+%%DATADIR%%/material.defaults
+%%DATADIR%%/truss.defaults
+%%DATADIR%%/german.trn
+%%DATADIR%%/german_new.trn
+%%DATADIR%%/spanish.trn
+@dirrm %%DATADIR%%