From e032aff81ae9f13d38e951fca7124499c56d377c Mon Sep 17 00:00:00 2001
From: Chuck Robey <chuckr@FreeBSD.org>
Date: Wed, 20 May 1998 02:17:20 +0000
Subject: Fix nasty template-instantiation problem that, while it compiled,
 prevented it from running.  The only fix (until FreeBSD goes elf) is to build
 the executeable statically.  I really dislike that, but it's a linker problem
 that's not likely to be fixed.

Much thanks to Victor Balden <victor@eng.uct.ac.za> for pointing
me at this bug.
---
 math/octave/Makefile  | 10 +++++-----
 math/octave/pkg-plist |  5 -----
 2 files changed, 5 insertions(+), 10 deletions(-)

(limited to 'math/octave')

diff --git a/math/octave/Makefile b/math/octave/Makefile
index ddf8da5eecf1..9b7bde6e670b 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 April 1998
 # Whom:			chuckr@freebsd.org
 #
-# $Id: Makefile,v 1.13 1998/05/05 20:37:57 chuckr Exp $
+# $Id: Makefile,v 1.14 1998/05/15 18:44:53 chuckr Exp $
 #
 
 DISTNAME=	octave-2.0.12
@@ -16,14 +16,15 @@ RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	${SETENV} "INSTALL_DATA=$(INSTALL_DATA)" "INSTALL_PROGRAM=$(INSTALL_SCRIPT)"
-CONFIGURE_ARGS=	--prefix=${PREFIX} --exec-prefix=${PREFIX} --with-f2c --enable-shared --host=i386-unknown-freebsd
+CONFIGURE_ARGS=	--prefix=${PREFIX} --exec-prefix=${PREFIX} --with-f2c --disable-shared --host=i386-unknown-freebsd
 USE_GMAKE=	yes
 MAN1=		octave.1
 
-BROKEN=		"core dump problem on startup, working on it."
-
 LIBOCTAVE-INFO= liboctave.info liboctave.info-1 liboctave.info-2 liboctave.info-3
 
+post-build:
+	/usr/bin/strip $(WRKSRC)/src/octave
+
 post-install:
 .ifndef NOPORTDOCS
 	install-info --defentry='* Octave: (octave).	Interactive language for numerical computations.' $(WRKSRC)/doc/interpreter/octave.info $(PREFIX)/info/dir
@@ -43,6 +44,5 @@ post-install:
 	$(RM) -rf $(PREFIX)/libexec/octave/site/oct/i386-unknown-freebsd?
 	$(RM) -rf $(PREFIX)/libexec/octave/site/exec/i386-unknown-freebsd?
 .endif
-	${LDCONFIG} -m $(PREFIX)/lib
 
 .include <bsd.port.mk>
diff --git a/math/octave/pkg-plist b/math/octave/pkg-plist
index a474adb1ec53..3812e814ccb4 100644
--- a/math/octave/pkg-plist
+++ b/math/octave/pkg-plist
@@ -4,13 +4,8 @@ include/octave-2.0.12/config.h
 include/octave-2.0.12/f77-fcn.h
 include/octave-2.0.12/lo-error.h
 lib/libcruft.a
-lib/libcruft.so.2.0
 lib/liboctave.a
-lib/liboctave.so.2.0
 lib/liboctinterp.a
-lib/liboctinterp.so.2.0
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R %B
 include/octave-2.0.12/Bounds.h
 include/octave-2.0.12/CollocWt.h
 include/octave-2.0.12/DAE.h
-- 
cgit v1.2.3