Tue Jun 30 17:24:56 2020 UTC ()
Modernize patch filenames, adding patch comments. NFCI.
(schmonz)
diff -r1.4 -r1.5 pkgsrc/math/djbfft/distinfo
diff -r0 -r1.1 pkgsrc/math/djbfft/patches/patch-Makefile
diff -r0 -r1.1 pkgsrc/math/djbfft/patches/patch-TARGETS
diff -r0 -r1.1 pkgsrc/math/djbfft/patches/patch-hier.c
diff -r1.2 -r0 pkgsrc/math/djbfft/patches/patch-aa
diff -r1.1.1.1 -r0 pkgsrc/math/djbfft/patches/patch-ab
diff -r1.1.1.1 -r0 pkgsrc/math/djbfft/patches/patch-ac
--- pkgsrc/math/djbfft/distinfo 2015/11/03 23:33:32 1.4
+++ pkgsrc/math/djbfft/distinfo 2020/06/30 17:24:56 1.5
| @@ -1,9 +1,9 @@ | | | @@ -1,9 +1,9 @@ |
1 | $NetBSD: distinfo,v 1.4 2015/11/03 23:33:32 agc Exp $ | | 1 | $NetBSD: distinfo,v 1.5 2020/06/30 17:24:56 schmonz Exp $ |
2 | | | 2 | |
3 | SHA1 (djbfft-0.76.tar.gz) = df9d258a75183c10592d937ee2d2befc01a8a0f6 | | 3 | SHA1 (djbfft-0.76.tar.gz) = df9d258a75183c10592d937ee2d2befc01a8a0f6 |
4 | RMD160 (djbfft-0.76.tar.gz) = 46de3a7ed5d6ca4b245d02a12d969702e57f7381 | | 4 | RMD160 (djbfft-0.76.tar.gz) = 46de3a7ed5d6ca4b245d02a12d969702e57f7381 |
5 | SHA512 (djbfft-0.76.tar.gz) = f23e5f80d2737476feea4ed65d7d022c4ca74748a2ff7b3b9338fdea4f72b4009d1c5909325382647feab837bec078231eddc3fc3bd0b5ae3346690e5edef530 | | 5 | SHA512 (djbfft-0.76.tar.gz) = f23e5f80d2737476feea4ed65d7d022c4ca74748a2ff7b3b9338fdea4f72b4009d1c5909325382647feab837bec078231eddc3fc3bd0b5ae3346690e5edef530 |
6 | Size (djbfft-0.76.tar.gz) = 80092 bytes | | 6 | Size (djbfft-0.76.tar.gz) = 80092 bytes |
7 | SHA1 (patch-aa) = 5e9fbc1ddeb2dc712ae804902e5ba95094eab082 | | 7 | SHA1 (patch-Makefile) = 74c4df743ff7df57ad96738f53d9a26ca82f1443 |
8 | SHA1 (patch-ab) = 7aff0e24fd1caf182c9d825f596aaeaf8260ff23 | | 8 | SHA1 (patch-TARGETS) = e0272038ec13e492e9e90818471b02f66e227e42 |
9 | SHA1 (patch-ac) = 971cfac6454bba698966c574c50b55088d40a400 | | 9 | SHA1 (patch-hier.c) = 02a9a586f33fb164ddbc82dc77745c683ea34748 |
$NetBSD: patch-Makefile,v 1.1 2020/06/30 17:24:56 schmonz Exp $
DESTDIR support.
--- 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
accuracy: \
-load accuracy.o djbfft.a math.lib
- ./load accuracy djbfft.a `cat math.lib`
+load accuracy.o libdjbfft.a math.lib
+ ./load accuracy libdjbfft.a `cat math.lib`
accuracy.o: \
compile accuracy.c fftc4.h complex4.h real4.h fftc8.h complex8.h \
@@ -578,8 +578,8 @@ real8.h fftr4.h real4.h fftr8.h real8.h
./compile accuracy.c
accuracy2: \
-load accuracy2.o djbfft.a math.lib
- ./load accuracy2 djbfft.a `cat math.lib`
+load accuracy2.o libdjbfft.a math.lib
+ ./load accuracy2 libdjbfft.a `cat math.lib`
accuracy2.o: \
compile accuracy2.c fftc4.h complex4.h real4.h fftc8.h complex8.h \
@@ -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
-djbfft.a: \
+libdjbfft.a: \
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 +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
- ./makelib djbfft.a 8sc.o 8u5.o 8u4.o 8u3.o 8u2.o 8u1.o \
+ ./makelib libdjbfft.a 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 8r5.o 8sr.o 4sc.o 4u5.o \
@@ -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: \
-djbfft.a accuracy accuracy2 speed speed.out
+libdjbfft.a accuracy accuracy2 speed speed.out
setup: \
it install
./install
speed: \
-load speed.o djbfft.a math.lib
- ./load speed djbfft.a `cat math.lib`
+load speed.o libdjbfft.a math.lib
+ ./load speed libdjbfft.a `cat math.lib`
speed.o: \
compile speed.c fftr4.h real4.h fftr8.h real8.h fftc4.h complex4.h \
$NetBSD: patch-TARGETS,v 1.1 2020/06/30 17:24:56 schmonz Exp $
Adhere to library naming convention.
--- TARGETS.orig 1999-09-30 20:25:58.000000000 +0000
+++ TARGETS
@@ -143,7 +143,7 @@ auto_opt
4sr.c
4sr.o
fftfreq.o
-djbfft.a
+libdjbfft.a
load
accuracy.o
accuracy
$NetBSD: patch-hier.c,v 1.1 2020/06/30 17:24:56 schmonz Exp $
Adjust install paths.
--- hier.c.orig 1999-09-30 20:25:58.000000000 +0000
+++ hier.c
@@ -2,19 +2,16 @@
void hier()
{
- h(auto_home,-1,-1,02755);
+ c(auto_home,"lib","libdjbfft.a",-1,-1,0644);
- d(auto_home,"lib",-1,-1,02755);
- c(auto_home,"lib","djbfft.a",-1,-1,0644);
-
- d(auto_home,"include",-1,-1,02755);
- c(auto_home,"include","real4.h",-1,-1,0644);
- c(auto_home,"include","real8.h",-1,-1,0644);
- c(auto_home,"include","complex4.h",-1,-1,0644);
- c(auto_home,"include","complex8.h",-1,-1,0644);
- c(auto_home,"include","fftc4.h",-1,-1,0644);
- c(auto_home,"include","fftc8.h",-1,-1,0644);
- c(auto_home,"include","fftr4.h",-1,-1,0644);
- c(auto_home,"include","fftr8.h",-1,-1,0644);
- c(auto_home,"include","fftfreq.h",-1,-1,0644);
+ d(auto_home,"include/djbfft",-1,-1,0755);
+ c(auto_home,"include/djbfft","real4.h",-1,-1,0644);
+ c(auto_home,"include/djbfft","real8.h",-1,-1,0644);
+ c(auto_home,"include/djbfft","complex4.h",-1,-1,0644);
+ c(auto_home,"include/djbfft","complex8.h",-1,-1,0644);
+ c(auto_home,"include/djbfft","fftc4.h",-1,-1,0644);
+ c(auto_home,"include/djbfft","fftc8.h",-1,-1,0644);
+ c(auto_home,"include/djbfft","fftr4.h",-1,-1,0644);
+ c(auto_home,"include/djbfft","fftr8.h",-1,-1,0644);
+ c(auto_home,"include/djbfft","fftfreq.h",-1,-1,0644);
}