aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpav <pav@FreeBSD.org>2005-01-30 21:50:46 +0800
committerpav <pav@FreeBSD.org>2005-01-30 21:50:46 +0800
commit12ca7c3b8afaabae6a0a9c7bfcdefdffbe91c212 (patch)
treedf9ca5ce176e4ee7338fb65a65243c5b4191c87a
parent57a2d2ee18ef17a605aaf8a647fb13154a28c005 (diff)
downloadfreebsd-ports-gnome-12ca7c3b8afaabae6a0a9c7bfcdefdffbe91c212.tar.gz
freebsd-ports-gnome-12ca7c3b8afaabae6a0a9c7bfcdefdffbe91c212.tar.zst
freebsd-ports-gnome-12ca7c3b8afaabae6a0a9c7bfcdefdffbe91c212.zip
- Fix build on 5.x: add dependency on motif [1]
- Fix plist nit PR: ports/76824 [1] Submitted by: Johan van Selst <johans@stack.nl>
-rw-r--r--science/felt/Makefile11
-rw-r--r--science/felt/files/patch-src-Velvet-Makefile11
-rw-r--r--science/felt/pkg-plist1
3 files changed, 15 insertions, 8 deletions
diff --git a/science/felt/Makefile b/science/felt/Makefile
index c1259ed5e565..6f27149b589e 100644
--- a/science/felt/Makefile
+++ b/science/felt/Makefile
@@ -15,7 +15,8 @@ EXTRACT_SUFX= -devel.src.tar.gz
MAINTAINER= ports@FreeBSD.org
COMMENT= A system for Finite Element Analysis
-LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
+LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d \
+ Xm.3:${PORTSDIR}/x11-toolkits/open-motif
USE_X_PREFIX= yes
USE_GL= yes
@@ -27,12 +28,6 @@ MAN1= burlap.1 corduroy.1 felt.1 patchwork.1 velvet.1 yardstick.1
MAN3= Drawing.3
MAN4= corduroy.4 felt.4
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 502126
-BROKEN= "Does not build on FreeBSD >= 5.x"
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>, ; s,"malloc.h",<stdlib.h>,' \
${WRKSRC}/lib/Felt/parser.c \
@@ -51,4 +46,4 @@ post-install:
${MKDIR} ${PREFIX}/share/doc/FElt
${CP} ${WRKSRC}/*.html ${PREFIX}/share/doc/FElt
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/science/felt/files/patch-src-Velvet-Makefile b/science/felt/files/patch-src-Velvet-Makefile
new file mode 100644
index 000000000000..7220c8eace9c
--- /dev/null
+++ b/science/felt/files/patch-src-Velvet-Makefile
@@ -0,0 +1,11 @@
+--- src/Velvet/Makefile.orig Sat Jan 29 18:21:57 2005
++++ src/Velvet/Makefile Sat Jan 29 18:19:36 2005
+@@ -18,7 +18,7 @@
+ CFLAGS = $(CCOPTS) -I$(X11INC) -I$(TOPDIR)/include
+ 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/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 d61d3a2beab2..0d72a16e4369 100644
--- a/science/felt/pkg-plist
+++ b/science/felt/pkg-plist
@@ -5,6 +5,7 @@ bin/loom
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