Fri Apr 1 22:29:36 2016 UTC ()
Use PKGMANDIR.


(jperkin)
diff -r1.26 -r1.27 pkgsrc/math/capc-calc/distinfo
diff -r1.9 -r1.10 pkgsrc/math/capc-calc/patches/patch-aa

cvs diff -r1.26 -r1.27 pkgsrc/math/capc-calc/distinfo (expand / switch to unified diff)

--- pkgsrc/math/capc-calc/distinfo 2015/11/03 23:33:31 1.26
+++ pkgsrc/math/capc-calc/distinfo 2016/04/01 22:29:36 1.27
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.26 2015/11/03 23:33:31 agc Exp $ 1$NetBSD: distinfo,v 1.27 2016/04/01 22:29:36 jperkin Exp $
2 2
3SHA1 (calc-2.12.4.13.tar.bz2) = 4d48fb78c903f10e9bcd05c42105498637dea834 3SHA1 (calc-2.12.4.13.tar.bz2) = 4d48fb78c903f10e9bcd05c42105498637dea834
4RMD160 (calc-2.12.4.13.tar.bz2) = c04d995a500ad7b0be27afbb6edaa6978c42437e 4RMD160 (calc-2.12.4.13.tar.bz2) = c04d995a500ad7b0be27afbb6edaa6978c42437e
5SHA512 (calc-2.12.4.13.tar.bz2) = 7b7136c793917652ce2f2b3866b2db16a69dbead729d8a72b8c1359ebb8a4e1d4e7a3a8b214f8e85b9ccf41193ba6ffcb49926cc68f494e2b6cdff58559f2534 5SHA512 (calc-2.12.4.13.tar.bz2) = 7b7136c793917652ce2f2b3866b2db16a69dbead729d8a72b8c1359ebb8a4e1d4e7a3a8b214f8e85b9ccf41193ba6ffcb49926cc68f494e2b6cdff58559f2534
6Size (calc-2.12.4.13.tar.bz2) = 970778 bytes 6Size (calc-2.12.4.13.tar.bz2) = 970778 bytes
7SHA1 (patch-aa) = 4cc64664e4eb3e5f1aea56f74d9615caa75483b2 7SHA1 (patch-aa) = c4a3850a2d1172174f750c795b2c77065bab6af6
8SHA1 (patch-fposval_c) = 8a8d08f8b566e583faa3bd9033c4a9ac90cb343c 8SHA1 (patch-fposval_c) = 8a8d08f8b566e583faa3bd9033c4a9ac90cb343c

cvs diff -r1.9 -r1.10 pkgsrc/math/capc-calc/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/math/capc-calc/patches/Attic/patch-aa 2014/01/15 16:23:31 1.9
+++ pkgsrc/math/capc-calc/patches/Attic/patch-aa 2016/04/01 22:29:36 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-aa,v 1.9 2014/01/15 16:23:31 drochner Exp $ 1$NetBSD: patch-aa,v 1.10 2016/04/01 22:29:36 jperkin Exp $
2 2
3--- Makefile.orig 2013-09-01 23:02:02.000000000 +0000 3--- Makefile.orig 2013-09-01 23:02:02.000000000 +0000
4+++ Makefile 4+++ Makefile
5@@ -585,7 +585,7 @@ HAVE_UNUSED= 5@@ -585,7 +585,7 @@ HAVE_UNUSED=
6  6
7 #INCDIR= /usr/local/include 7 #INCDIR= /usr/local/include
8 #INCDIR= /dev/env/DJDIR/include 8 #INCDIR= /dev/env/DJDIR/include
9-INCDIR= /usr/include 9-INCDIR= /usr/include
10+INCDIR= ${PREFIX}/include 10+INCDIR= ${PREFIX}/include
11  11
12 # Where to install calc related things 12 # Where to install calc related things
13 # 13 #
14@@ -624,15 +624,15 @@ INCDIR= /usr/include 14@@ -624,15 +624,15 @@ INCDIR= /usr/include
@@ -25,27 +25,27 @@ $NetBSD: patch-aa,v 1.9 2014/01/15 16:23 @@ -25,27 +25,27 @@ $NetBSD: patch-aa,v 1.9 2014/01/15 16:23
25  25
26 #CALC_SHAREDIR= /usr/local/lib/calc 26 #CALC_SHAREDIR= /usr/local/lib/calc
27 #CALC_SHAREDIR= /dev/env/DJDIR/share/calc 27 #CALC_SHAREDIR= /dev/env/DJDIR/share/calc
28-CALC_SHAREDIR= /usr/share/calc 28-CALC_SHAREDIR= /usr/share/calc
29+CALC_SHAREDIR= ${PREFIX}/share/calc 29+CALC_SHAREDIR= ${PREFIX}/share/calc
30  30
31 # NOTE: Do not set CALC_INCDIR to /usr/include or /usr/local/include!!! 31 # NOTE: Do not set CALC_INCDIR to /usr/include or /usr/local/include!!!
32 # Always be sure that the CALC_INCDIR path ends in /calc to avoid 32 # Always be sure that the CALC_INCDIR path ends in /calc to avoid
33@@ -710,7 +710,7 @@ T= 33@@ -710,7 +710,7 @@ T=
34 #MANDIR= 34 #MANDIR=
35 #MANDIR= /usr/local/man/man1 35 #MANDIR= /usr/local/man/man1
36 #MANDIR= /usr/man/man1 36 #MANDIR= /usr/man/man1
37-MANDIR= /usr/share/man/man1 37-MANDIR= /usr/share/man/man1
38+MANDIR= ${PREFIX}/man/man1 38+MANDIR= ${PREFIX}/${PKGMANDIR}/man1
39 #MANDIR= /dev/env/DJDIR/man/man1 39 #MANDIR= /dev/env/DJDIR/man/man1
40 #MANDIR= /usr/man/u_man/man1 40 #MANDIR= /usr/man/u_man/man1
41 #MANDIR= /usr/contrib/man/man1 41 #MANDIR= /usr/contrib/man/man1
42@@ -721,7 +721,7 @@ MANDIR= /usr/share/man/man1 42@@ -721,7 +721,7 @@ MANDIR= /usr/share/man/man1
43 # 43 #
44 # Use CATDIR= to disable installation of the calc cat (formatted) page. 44 # Use CATDIR= to disable installation of the calc cat (formatted) page.
45 # 45 #
46-CATDIR= 46-CATDIR=
47+CATDIR= ${PREFIX}/man/cat1 47+CATDIR= ${PREFIX}/man/cat1
48 #CATDIR= /usr/local/man/cat1 48 #CATDIR= /usr/local/man/cat1
49 #CATDIR= /usr/local/catman/cat1 49 #CATDIR= /usr/local/catman/cat1
50 #CATDIR= /usr/man/cat1 50 #CATDIR= /usr/man/cat1
51@@ -742,9 +742,9 @@ MANEXT= 1 51@@ -742,9 +742,9 @@ MANEXT= 1