ports/84746: Fix ports/science/felt to not need Xaw3D and Motif

[Carlos A M dos Santos]

>Number:         84746
>Category:       ports
>Synopsis:       Fix ports/science/felt to not need Xaw3D and Motif
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 10 12:30:20 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Carlos A M dos Santos
>Release:        FreeBSD 5.4-RELEASE i386
>Organization:
Universidade Regional Integrada
>Environment:
System: FreeBSD sophia.inf.urisan 5.4-RELEASE FreeBSD 5.4-RELEASE #1: Mon May 16 01:34:41 BRT 2005 root at avatar.casantos.org:/share/FreeBSD/5.4-RELEASE/src/sys/i386/compile/A7N266-VM i386
>Description:
	The ports/science/felt package depends on Xaw3D and Motif because of
	one if its programs (velvet). This is a mistake since velvet does not
	use neither one. Motif is needed only if the program is linked to the
	dynamic version of libGLw because it contains modules with references
	to some Xm* symbols. Using the static libGLw makes the linking to
	libXm unnecessary.
>How-To-Repeat:
	N.A.
>Fix:

	Apply the attached patch.

--- science::felt.patch begins here ---
diff -durP ports/science/felt/Makefile ports/science/felt/Makefile
--- ports.orig/science/felt/Makefile	Sun Apr 10 22:20:35 2005
+++ ports/science/felt/Makefile	Mon Aug  8 15:02:16 2005
@@ -14,9 +14,6 @@
 
 MAINTAINER=	ports at 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
diff -durP ports/science/felt/files/patch-src-Velvet-Makefile ports/science/felt/files/patch-src-Velvet-Makefile
--- ports.orig/science/felt/files/patch-src-Velvet-Makefile	Sun Jan 30 11:50:46 2005
+++ ports/science/felt/files/patch-src-Velvet-Makefile	Mon Aug  8 14:58:52 2005
@@ -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 \
--- science::felt.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: