- add missing UNWRAP_FILES to clean up some buildlink references in some

installed files.

- libtoolize a few more lines which seem to have been missed in the original
libtoolization.

- enable loading of shared objects which lets the various .oct files installed
by octave-forge actually work instead of just the .m files.

4 files changed, 45 insertions, 28 deletions

diff --git a/math/octave-current/Makefile b/math/octave-current/Makefile
index e894053a97e..ce407baf523 100644
--- a/math/octave-current/Makefile
+++ b/math/octave-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2004/08/14 01:34:50 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.32 2004/09/11 21:47:43 dmcmahill Exp $
 #
 
 DISTNAME=	octave-${OCTAVE_VER}
@@ -35,6 +35,11 @@ GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++ fortran
 GCC_REQD=		3.0
 
+# needed for loading of shared objects such as those in the
+# octave-forge package or user written ones compiled with
+# mkoctfile
+CONFIGURE_ARGS+=	--enable-dl
+
 INFO_FILES=	octave.info liboctave.info
 LIBOCTAVE_INFO=	liboctave.info liboctave.info-1 \
 		liboctave.info-2 liboctave.info-3
@@ -44,8 +49,11 @@ OCTAVE_DOC=	faq/Octave-FAQ.ps interpreter/octave.ps \
 OCTAVE_HTML=	faq/Octave-FAQ_*.html interpreter/octave_*.html \
 		liboctave/liboctave_*.html
 
+UNWRAP_FILES+=	mkoctfile octave-bug src/oct-conf.h
+
 post-extract:
 	${FIND} ${WRKSRC}/doc -type f -name '*.info*' -exec ${RM} -f {} \;
+	${MKDIR} -p ${WRKSRC}/src/pic
 
 post-install:
 .for f in ${LIBOCTAVE_INFO}
diff --git a/math/octave-current/distinfo b/math/octave-current/distinfo
index 08535bfa032..d3a4db7859a 100644
--- a/math/octave-current/distinfo
+++ b/math/octave-current/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.16 2004/03/29 16:20:16 adam Exp $
+$NetBSD: distinfo,v 1.17 2004/09/11 21:47:44 dmcmahill Exp $
 
 SHA1 (octave-2.1.57.tar.bz2) = 126f79fd169a31883d7f7193caa459be19924acd
 Size (octave-2.1.57.tar.bz2) = 4202080 bytes
-SHA1 (patch-aa) = 866fb23c00ff01da8c1f98609827d709227932ae
+SHA1 (patch-aa) = 6ba3dc53ef89230a623e33f5e9433691cdfedeeb
 SHA1 (patch-ac) = 201e5e6a58f6934371daa9ccac8d4f1f01533a4c
 SHA1 (patch-ad) = 03dfbfb17b1262d5094dbc42758a99011e05fdd4
 SHA1 (patch-ae) = 79544d09268d41647b081680fc839f4fe481b111
diff --git a/math/octave-current/patches/patch-aa b/math/octave-current/patches/patch-aa
index cb39b71832f..c8e704b6f56 100644
--- a/math/octave-current/patches/patch-aa
+++ b/math/octave-current/patches/patch-aa
@@ -1,18 +1,20 @@
-$NetBSD: patch-aa,v 1.7 2004/03/29 16:20:16 adam Exp $
-
---- configure.orig	2004-03-05 19:16:10.000000000 +0000
-+++ configure
-@@ -7930,7 +7930,7 @@ if $have_fortran_compiler; then
- %.c : %.f
+--- configure.orig	Fri Mar 12 19:39:23 2004
++++ configure	Mon Sep  6 16:28:24 2004
+@@ -7931,5 +7931,5 @@
  
  %.o : %.f
 -	$(FC) -c $(ALL_FFLAGS) -o $@ $<
 +	${LIBTOOL} --mode=compile --tag=CC $(FC) -c $(ALL_FFLAGS) $<
  
  pic/%.o : %.f
- 	$(FC) -c $(FPICFLAG) $(ALL_FFLAGS) $< -o $@
-@@ -18717,19 +18717,19 @@ case "$canonical_host_type" in
-     cat << \EOF > $bsd_gcc_kluge_targets_frag
+@@ -9831,5 +9831,5 @@
+ library_path_var=LD_LIBRARY_PATH
+ case "$canonical_host_type" in
+-  *-*-386bsd* | *-*-openbsd* | *-*-netbsd*)
++  *-*-386bsd* | *-*-openbsd* )
+     SH_LD=ld
+     SH_LDFLAGS=-Bshareable
+@@ -18718,17 +18718,17 @@
  
  lex.o: lex.cc
 -	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
@@ -35,4 +37,3 @@ $NetBSD: patch-aa,v 1.7 2004/03/29 16:20:16 adam Exp $
 +	${LIBTOOL} --mode=compile $(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
  
  EOF
-   ;;
diff --git a/math/octave-current/patches/patch-ag b/math/octave-current/patches/patch-ag
index 3a43a0789d5..147fc527e66 100644
--- a/math/octave-current/patches/patch-ag
+++ b/math/octave-current/patches/patch-ag
@@ -1,9 +1,17 @@
-$NetBSD: patch-ag,v 1.7 2004/03/29 16:20:16 adam Exp $
-
---- src/Makefile.in.orig	2004-02-20 21:16:54.000000000 +0000
-+++ src/Makefile.in
-@@ -246,8 +246,9 @@ libraries: $(LIBRARIES)
- 
+--- Makefile.in.orig	Fri Feb 20 21:16:54 2004
++++ Makefile.in	Thu Sep  9 01:18:45 2004
+@@ -33,8 +33,8 @@
+   ifdef CXXPICFLAG
+     %.oct : pic/%.o octave$(EXEEXT)
+-	  $(DL_LD) $(DL_LDFLAGS) -o $@ $< $(OCT_LINK_DEPS)
++	  ${LIBTOOL} --mode=link $(DL_LD) $(DL_LDFLAGS) -o $@ $< $(OCT_LINK_DEPS)
+   else
+     %.oct : %.o octave$(EXEEXT)
+-	  $(DL_LD) $(DL_LDFLAGS) -o $@ $< $(OCT_LINK_DEPS)
++	  ${LIBTOOL} --mode=link $(DL_LD) $(DL_LDFLAGS) -o $@ $< $(OCT_LINK_DEPS)
+   endif
+ endif
+@@ -247,6 +247,7 @@
  liboctinterp.$(LIBEXT): $(OBJECTS) $(XERBLA)
  	rm -f $@
 -	$(TEMPLATE_AR) $(TEMPLATE_ARFLAGS) $@ $^
@@ -13,25 +21,26 @@ $NetBSD: patch-ag,v 1.7 2004/03/29 16:20:16 adam Exp $
 +		-version-info ${version:2.1.%=2:%}
  
  liboctinterp.$(SHLEXT_VER): liboctinterp.$(SHLEXT)
+@@ -256,5 +257,5 @@
+ liboctinterp.$(SHLEXT): $(PICOBJ) $(PIC_XERBLA)
  	rm -f $@
-@@ -267,6 +268,7 @@ stamp-prereq: defaults.h oct-conf.h oct-
- 	touch stamp-prereq
+-	$(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ $^ $(OCTINTERP_LINK_DEPS)
++	${LIBTOOL} --mode=link $(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ $^ $(OCTINTERP_LINK_DEPS)
+ 
+ stamp-oct-links: $(OCT_FILES)
+@@ -268,4 +269,5 @@
  
  octave$(EXEEXT): stamp-prereq $(LIBRARIES) main.o $(DLD_STATIC_OBJ)
 +	${LIBTOOL} --mode=link \
  	$(LD_CXX) $(CPPFLAGS) $(ALL_CXXFLAGS) $(RDYNAMIC_FLAG) \
  	$(ALL_LDFLAGS) -o $@ \
- 	main.o $(DLD_STATIC_OBJ) \
-@@ -347,6 +349,7 @@ install-strip:
- install-bin:
+@@ -348,4 +350,5 @@
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
  	rm -f $(DESTDIR)$(bindir)/octave$(EXEEXT)
 +	${LIBTOOL} --mode=install \
  	$(INSTALL_PROGRAM) octave$(EXEEXT) $(DESTDIR)$(bindir)/octave-$(version)$(EXEEXT)
  	$(LN_S) octave-$(version)$(EXEEXT) $(DESTDIR)$(bindir)/octave$(EXEEXT)
- .PHONY: install-bin
-@@ -366,9 +369,8 @@ install-lib:
- 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir)
+@@ -367,7 +370,6 @@
  	if $(STATIC_LIBS); then \
  	  rm -f $(DESTDIR)$(octlibdir)/liboctinterp.$(LIBEXT); \
 -	  $(INSTALL_DATA) liboctinterp.$(LIBEXT) \
@@ -41,4 +50,3 @@ $NetBSD: patch-ag,v 1.7 2004/03/29 16:20:16 adam Exp $
 +	    ${PREFIX}/lib; \
  	fi
  	if $(SHARED_LIBS); then \
- 	  rm -f $(DESTDIR)$(octlibdir)/liboctinterp.$(SHLEXT_VER); \