Add DESTDIR support.

Approved by <tnn>.

5 files changed, 31 insertions, 29 deletions

diff --git a/math/octave/Makefile b/math/octave/Makefile
index 307adee24ae..a9837190097 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2008/10/25 08:26:12 adam Exp $
+# $NetBSD: Makefile,v 1.76 2009/01/27 12:04:14 asau Exp $
 
 DISTNAME=	octave-${OCTAVE_VER}
 CATEGORIES=	math
@@ -20,6 +20,8 @@ CONFLICTS+=	octave-2.*
 BROKEN=		Internal compiler error occurs on arm32 (even with gcc-2.95.3)
 .endif
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_GNU_READLINE=	yes
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake makeinfo perl gsed
@@ -74,10 +76,10 @@ post-install:
 	cd ${WRKSRC}/doc/liboctave;					\
 	for f in liboctave.info liboctave.info-[0-9]*; do		\
 		${TEST} ! -f "$$f" ||					\
-		${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR};		\
+		${INSTALL_DATA} "$$f" ${DESTDIR}${PREFIX}/${PKGINFODIR};		\
 	done
 .for f in ${OCTAVE_DOC}
-	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${PREFIX}/share/octave/${OCTAVE_VER}/doc
+	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DESTDIR}${PREFIX}/share/octave/${OCTAVE_VER}/doc
 .endfor
 
 .include "../../audio/libsndfile/buildlink3.mk"
diff --git a/math/octave/distinfo b/math/octave/distinfo
index 04dd6120025..0f6ecb90a40 100644
--- a/math/octave/distinfo
+++ b/math/octave/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2008/10/25 08:26:12 adam Exp $
+$NetBSD: distinfo,v 1.19 2009/01/27 12:04:14 asau Exp $
 
 SHA1 (octave-3.0.3.tar.bz2) = 5c619254521a5fe14b3ec8a6eecbf104f9fa41dc
 RMD160 (octave-3.0.3.tar.bz2) = 1a162862a457675e2d94de306c1ec8f1643c9e07
@@ -6,10 +6,10 @@ Size (octave-3.0.3.tar.bz2) = 10159024 bytes
 SHA1 (patch-aa) = 1c11f2fb487e505bc9d821d2affecfcc93be0257
 SHA1 (patch-ab) = d8d6dbbfdaa0a24f12c25cb1a816c5ce8d1641df
 SHA1 (patch-ac) = 5790b21c5a16f6fab53c0e41d6b3eafe90972e2d
-SHA1 (patch-ad) = 165dcb4599f29edb48a773a586c8ae95bfd10ba2
+SHA1 (patch-ad) = 5dab610cedc11ef829fde1fa5a765c19fe651992
 SHA1 (patch-ae) = 97c3ea2393d40701e996ca650e8bcffec2bb56b9
-SHA1 (patch-af) = d0a0688204807961e49f81905c645ac9d5a52db6
-SHA1 (patch-ag) = b0a8ce27ba055739f609c56e512a2791c2408d3c
+SHA1 (patch-af) = 208f5426de78396895a891a615dad602a75918a8
+SHA1 (patch-ag) = a3399b6560538e43cfc30e022ed292a3f28e0c1a
 SHA1 (patch-ah) = 240fd27ce0b4b9a18e39851139cecd9c71a0bdcc
 SHA1 (patch-ai) = 3010250a18e6b854103d6369015ee2e659bfa186
 SHA1 (patch-aj) = 9353f42e2f0d92f5aec524de2b397aa07908c3f8
diff --git a/math/octave/patches/patch-ad b/math/octave/patches/patch-ad
index ef769c72c7f..c338a6faa07 100644
--- a/math/octave/patches/patch-ad
+++ b/math/octave/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2008/01/11 01:23:44 adam Exp $
+$NetBSD: patch-ad,v 1.5 2009/01/27 12:04:14 asau Exp $
 
---- libcruft/Makefile.in.orig	2007-10-12 23:27:12.000000000 +0200
-+++ libcruft/Makefile.in
-@@ -121,8 +121,8 @@ libraries: cruft.def
+--- libcruft/Makefile.in.orig	2008-09-24 11:13:46.000000000 +0400
++++ libcruft/Makefile.in	2009-01-27 04:57:30.000000000 +0300
+@@ -121,8 +121,8 @@
  
  $(LIBPRE)cruft.$(LIBEXT): $(CRUFT_OBJ)
  	rm -f $@
@@ -13,7 +13,7 @@ $NetBSD: patch-ad,v 1.4 2008/01/11 01:23:44 adam Exp $
  
  $(LIBPRE)cruft.$(SHLEXT_VER): $(LIBPRE)cruft.$(SHLEXT)
  	rm -f $@
-@@ -147,9 +147,8 @@ install::
+@@ -147,9 +147,8 @@
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir)
  	if $(STATIC_LIBS); then \
  	  rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(LIBEXT) ; \
@@ -21,7 +21,7 @@ $NetBSD: patch-ad,v 1.4 2008/01/11 01:23:44 adam Exp $
 -	    $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(LIBEXT) ; \
 -	  $(RANLIB) $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(LIBEXT) ; \
 +	  ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libcruft.$(LIBEXT) \
-+		${PREFIX}/lib; \
++		${DESTDIR}${PREFIX}/lib; \
  	fi
  	if $(SHARED_LIBS); then \
  	  rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(SHLLIB_VER); \
diff --git a/math/octave/patches/patch-af b/math/octave/patches/patch-af
index 6629a90b129..15a6c5fa3de 100644
--- a/math/octave/patches/patch-af
+++ b/math/octave/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.4 2008/01/11 01:23:44 adam Exp $
+$NetBSD: patch-af,v 1.5 2009/01/27 12:04:14 asau Exp $
 
---- liboctave/Makefile.in.orig	2007-11-30 19:53:30.000000000 +0100
-+++ liboctave/Makefile.in
-@@ -256,8 +256,9 @@ endif
+--- liboctave/Makefile.in.orig	2008-09-24 11:13:47.000000000 +0400
++++ liboctave/Makefile.in	2009-01-27 05:00:12.000000000 +0300
+@@ -256,8 +256,9 @@
  
  $(LIBPRE)octave.$(LIBEXT): $(LIBOCTAVE_OBJECTS)
  	rm -f $@
@@ -14,7 +14,7 @@ $NetBSD: patch-af,v 1.4 2008/01/11 01:23:44 adam Exp $
  
  $(LIBPRE)octave.$(SHLEXT_VER): $(LIBPRE)octave.$(SHLEXT)
  	rm -f $@
-@@ -284,9 +285,8 @@ install-lib:
+@@ -284,9 +285,8 @@
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir)
  	if $(STATIC_LIBS); then \
  	  rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(LIBEXT); \
@@ -22,7 +22,7 @@ $NetBSD: patch-af,v 1.4 2008/01/11 01:23:44 adam Exp $
 -	    $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(LIBEXT); \
 -	  $(RANLIB) $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(LIBEXT); \
 +	  ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} liboctave.$(LIBEXT) \
-+		${PREFIX}/lib; \
++		${DESTDIR}${PREFIX}/lib; \
  	fi
  	if $(SHARED_LIBS); then \
  	  rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(SHLLIB_VER); \
diff --git a/math/octave/patches/patch-ag b/math/octave/patches/patch-ag
index 776881067d0..ddf4729cc08 100644
--- a/math/octave/patches/patch-ag
+++ b/math/octave/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.4 2008/01/11 01:23:44 adam Exp $
+$NetBSD: patch-ag,v 1.5 2009/01/27 12:04:14 asau Exp $
 
---- src/Makefile.in.orig	2007-12-05 18:08:28.000000000 +0100
-+++ src/Makefile.in
-@@ -204,7 +204,7 @@ BUILT_EXTRAS := graphics.h mxarray.h
+--- src/Makefile.in.orig	2008-09-24 11:13:49.000000000 +0400
++++ src/Makefile.in	2009-01-27 05:01:58.000000000 +0300
+@@ -204,7 +204,7 @@
  
  EXTRAS := ov-base-int.cc ov-base-mat.cc ov-base-scalar.cc
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ag,v 1.4 2008/01/11 01:23:44 adam Exp $
  
  INCLUDES_FOR_INSTALL := $(INCLUDES) $(EXTRAS) $(BUILT_EXTRAS)
  
-@@ -318,8 +318,9 @@ libraries: $(LIBRARIES)
+@@ -318,8 +318,9 @@
  
  $(LIBPRE)octinterp.$(LIBEXT): $(OBJECTS) $(XERBLA)
  	rm -f $@
@@ -23,7 +23,7 @@ $NetBSD: patch-ag,v 1.4 2008/01/11 01:23:44 adam Exp $
  
  $(LIBPRE)octinterp.$(SHLEXT_VER): $(LIBPRE)octinterp.$(SHLEXT)
  	rm -f $@
-@@ -327,12 +328,13 @@ $(LIBPRE)octinterp.$(SHLEXT_VER): $(LIBP
+@@ -327,12 +328,13 @@
  
  $(LIBPRE)octinterp.$(SHLEXT): $(PICOBJ) $(PIC_XERBLA)
  	rm -f $@
@@ -38,7 +38,7 @@ $NetBSD: patch-ag,v 1.4 2008/01/11 01:23:44 adam Exp $
  	$(LD_CXX) $(CPPFLAGS) $(ALL_CXXFLAGS) $(RDYNAMIC_FLAG) \
  	$(ALL_LDFLAGS) -o $@ \
  	main.o $(DLD_STATIC_OBJ) \
-@@ -421,6 +423,7 @@ install-strip:
+@@ -421,6 +423,7 @@
  install-bin:
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
  	rm -f $(DESTDIR)$(bindir)/octave$(EXEEXT)
@@ -46,7 +46,7 @@ $NetBSD: patch-ag,v 1.4 2008/01/11 01:23:44 adam Exp $
  	$(INSTALL_PROGRAM) octave$(EXEEXT) $(DESTDIR)$(bindir)/octave-$(version)$(EXEEXT)
  	cd $(DESTDIR)$(bindir) ; $(LN_S) octave-$(version)$(EXEEXT) octave$(EXEEXT)
  .PHONY: install-bin
-@@ -431,6 +434,7 @@ install-oct:
+@@ -431,6 +434,7 @@
  	if [ -n "$(OCT_FILES)" ]; then \
  	  xfiles="$(OCT_FILES)"; \
  	  for f in $$xfiles; do \
@@ -54,7 +54,7 @@ $NetBSD: patch-ag,v 1.4 2008/01/11 01:23:44 adam Exp $
  	    $(INSTALL_PROGRAM) $$f $(DESTDIR)$(octfiledir)/$$f; \
  	  done; \
  	fi
-@@ -440,9 +444,8 @@ install-lib:
+@@ -440,9 +444,8 @@
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir)
  	if $(STATIC_LIBS); then \
  	  rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(LIBEXT); \
@@ -62,7 +62,7 @@ $NetBSD: patch-ag,v 1.4 2008/01/11 01:23:44 adam Exp $
 -	    $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(LIBEXT); \
 -	  $(RANLIB) $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(LIBEXT); \
 +	  ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} liboctinterp.$(LIBEXT) \
-+		${PREFIX}/lib; \
++		${DESTDIR}${PREFIX}/lib; \
  	fi
  	if $(SHARED_LIBS); then \
  	  rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(SHLEXT_VER); \