DESTDIR support.

3 files changed, 49 insertions, 9 deletions

diff --git a/math/djbfft/Makefile b/math/djbfft/Makefile
index 34d01d7a436..af1da83f7ec 100644
--- a/math/djbfft/Makefile
+++ b/math/djbfft/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2009/05/19 09:07:14 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2010/03/20 01:32:56 schmonz Exp $
 
 DISTNAME=	djbfft-0.76
 CATEGORIES=	math
@@ -9,10 +9,12 @@ HOMEPAGE=	http://cr.yp.to/djbfft.html
 COMMENT=	Extremely fast library for floating-point convolution
 LICENSE=	public-domain
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DJB_RESTRICTED=		no
 NOT_FOR_PLATFORM=	IRIX-*-*
 
-INSTALLATION_DIRS=	include lib
+INSTALLATION_DIRS=	include/djbfft lib
 
 .include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/djbfft/distinfo b/math/djbfft/distinfo
index 1e4d12b499b..9c7578baa4e 100644
--- a/math/djbfft/distinfo
+++ b/math/djbfft/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 12:06:54 agc Exp $
+$NetBSD: distinfo,v 1.3 2010/03/20 01:32:56 schmonz Exp $
 
 SHA1 (djbfft-0.76.tar.gz) = df9d258a75183c10592d937ee2d2befc01a8a0f6
 RMD160 (djbfft-0.76.tar.gz) = 46de3a7ed5d6ca4b245d02a12d969702e57f7381
 Size (djbfft-0.76.tar.gz) = 80092 bytes
-SHA1 (patch-aa) = e148c738090c75576d79e1b5359ada19ccf850ac
+SHA1 (patch-aa) = 5e9fbc1ddeb2dc712ae804902e5ba95094eab082
 SHA1 (patch-ab) = 7aff0e24fd1caf182c9d825f596aaeaf8260ff23
 SHA1 (patch-ac) = 971cfac6454bba698966c574c50b55088d40a400
diff --git a/math/djbfft/patches/patch-aa b/math/djbfft/patches/patch-aa
index 538d18e7129..fd7a5353dc1 100644
--- a/math/djbfft/patches/patch-aa
+++ b/math/djbfft/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/07/24 16:47:52 jschauma Exp $
+$NetBSD: patch-aa,v 1.2 2010/03/20 01:32:56 schmonz Exp $
 
---- Makefile.orig	Thu Sep 30 21:25:58 1999
+--- Makefile.orig	1999-09-30 20:25:58.000000000 +0000
 +++ Makefile
 @@ -569,8 +569,8 @@ compile 8v5.c pre8.c fftc8.h complex8.h 
  	./compile 8v5.c
@@ -24,7 +24,22 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/07/24 16:47:52 jschauma Exp $
  
  accuracy2.o: \
  compile accuracy2.c fftc4.h complex4.h real4.h fftc8.h complex8.h \
-@@ -649,7 +649,7 @@ warn-auto.sh conf-cc
+@@ -601,6 +601,14 @@ trycpp.c compilebase
+ 	&& echo -malign-double || exit 0 ) > auto_align
+ 	rm -f trycpp.o
+ 
++auto_destdir.c: \
++auto-str conf-destdir
++	./auto-str auto_home `head -1 conf-destdir` > auto_destdir.c
++
++auto_destdir.o: \
++compile auto_destdir.c
++	./compile auto_destdir.c
++
+ auto_home.c: \
+ auto-str conf-home
+ 	./auto-str auto_home `head -1 conf-home` > auto_home.c
+@@ -649,7 +657,7 @@ warn-auto.sh conf-cc
  	) > compilebase
  	chmod 755 compilebase
  
@@ -33,7 +48,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/07/24 16:47:52 jschauma Exp $
  makelib 8sc.o 8u5.o 8u4.o 8u3.o 8u2.o 8u1.o 8u0.o 8mc.o 8c0.o 8c1.o \
  8c2.o 8c3.o 8c4.o 8c5.o 8d0.o 8d1.o 8d2.o 8d3.o 8d4.o 8d5.o 8v5.o \
  8v4.o 8v3.o 8v2.o 8v1.o 8v0.o 8mr.o 8r0.o 8r1.o 8r2.o 8r3.o 8r4.o \
-@@ -657,7 +657,7 @@ makelib 8sc.o 8u5.o 8u4.o 8u3.o 8u2.o 8u
+@@ -657,7 +665,7 @@ makelib 8sc.o 8u5.o 8u4.o 8u3.o 8u2.o 8u
  4c1.o 4c2.o 4c3.o 4c4.o 4c5.o 4d0.o 4d1.o 4d2.o 4d3.o 4d4.o 4d5.o \
  4v5.o 4v4.o 4v3.o 4v2.o 4v1.o 4v0.o 4mr.o 4r0.o 4r1.o 4r2.o 4r3.o \
  4r4.o 4r5.o 4sr.o fftfreq.o
@@ -42,7 +57,30 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/07/24 16:47:52 jschauma Exp $
  	8u0.o 8mc.o 8c0.o 8c1.o 8c2.o 8c3.o 8c4.o 8c5.o 8d0.o 8d1.o \
  	8d2.o 8d3.o 8d4.o 8d5.o 8v5.o 8v4.o 8v3.o 8v2.o 8v1.o 8v0.o \
  	8mr.o 8r0.o 8r1.o 8r2.o 8r3.o 8r4.o 8r5.o 8sr.o 4sc.o 4u5.o \
-@@ -758,15 +758,15 @@ compile open_trunc.c open.h
+@@ -695,9 +703,9 @@ compile hier.c auto_home.h
+ 	./compile hier.c
+ 
+ install: \
+-load install.o hier.o auto_home.o strerr.a substdio.a open.a error.a \
++load install.o hier.o auto_destdir.o strerr.a substdio.a open.a error.a \
+ str.a
+-	./load install hier.o auto_home.o strerr.a substdio.a \
++	./load install hier.o auto_destdir.o strerr.a substdio.a \
+ 	open.a error.a str.a 
+ 
+ install.o: \
+@@ -706,8 +714,8 @@ exit.h
+ 	./compile install.c
+ 
+ instcheck: \
+-load instcheck.o hier.o auto_home.o strerr.a substdio.a error.a str.a
+-	./load instcheck hier.o auto_home.o strerr.a substdio.a \
++load instcheck.o hier.o auto_destdir.o strerr.a substdio.a error.a str.a
++	./load instcheck hier.o auto_destdir.o strerr.a substdio.a \
+ 	error.a str.a 
+ 
+ instcheck.o: \
+@@ -758,15 +766,15 @@ compile open_trunc.c open.h
  	./compile open_trunc.c
  
  prog: \