Sun Dec 16 06:09:20 2018 UTC ()
Avoid nroff. Fixes FreeBSD build.


(schmonz)
diff -r1.5 -r1.6 pkgsrc/net/ucspi-tcp6/distinfo
diff -r1.4 -r1.5 pkgsrc/net/ucspi-tcp6/patches/patch-package_man
cvs diff -r1.5 -r1.6 pkgsrc/net/ucspi-tcp6/distinfo (expand / switch to unified diff)

--- pkgsrc/net/ucspi-tcp6/distinfo 2018/12/14 22:52:15 1.5
+++ pkgsrc/net/ucspi-tcp6/distinfo 2018/12/16 06:09:19 1.6
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.5 2018/12/14 22:52:15 schmonz Exp $ 1$NetBSD: distinfo,v 1.6 2018/12/16 06:09:19 schmonz Exp $
2 2
3SHA1 (ucspi-tcp6-1.10.1.tgz) = effea43aa352d4800d6549723f94d2b4c4e9cd24 3SHA1 (ucspi-tcp6-1.10.1.tgz) = effea43aa352d4800d6549723f94d2b4c4e9cd24
4RMD160 (ucspi-tcp6-1.10.1.tgz) = 6114e50579308f719db8de70c5fdcbac0fc151fe 4RMD160 (ucspi-tcp6-1.10.1.tgz) = 6114e50579308f719db8de70c5fdcbac0fc151fe
5SHA512 (ucspi-tcp6-1.10.1.tgz) = b8962220e3fc0f4de1987401a0c6de2b6d78522b8efdbca9c53971a6d52bd050c8fd1f31d1add1336d6c23175022ae5a480f168b2ec283d506b9ca608494eb3f 5SHA512 (ucspi-tcp6-1.10.1.tgz) = b8962220e3fc0f4de1987401a0c6de2b6d78522b8efdbca9c53971a6d52bd050c8fd1f31d1add1336d6c23175022ae5a480f168b2ec283d506b9ca608494eb3f
6Size (ucspi-tcp6-1.10.1.tgz) = 51200 bytes 6Size (ucspi-tcp6-1.10.1.tgz) = 51200 bytes
7SHA1 (patch-package_man) = 774b6adfae66cd94e4f5c87308af6492e9544388 7SHA1 (patch-package_man) = 1a9d609a41aec72e9b42b2b4f6869655d540fad6
8SHA1 (patch-src_rblsmtpd.c) = 05a7e6e0560458f833e4f8cf3201c0ccc1d598b8 8SHA1 (patch-src_rblsmtpd.c) = 05a7e6e0560458f833e4f8cf3201c0ccc1d598b8
cvs diff -r1.4 -r1.5 pkgsrc/net/ucspi-tcp6/patches/Attic/patch-package_man (expand / switch to unified diff)

--- pkgsrc/net/ucspi-tcp6/patches/Attic/patch-package_man 2018/12/14 22:52:15 1.4
+++ pkgsrc/net/ucspi-tcp6/patches/Attic/patch-package_man 2018/12/16 06:09:20 1.5
@@ -1,52 +1,79 @@ @@ -1,52 +1,79 @@
1$NetBSD: patch-package_man,v 1.4 2018/12/14 22:52:15 schmonz Exp $ 1$NetBSD: patch-package_man,v 1.5 2018/12/16 06:09:20 schmonz Exp $
2 2
3Support DESTDIR. 3Support DESTDIR. Avoid nroff.
4 4
5--- package/man.orig 2018-11-10 19:42:10.000000000 +0000 5--- package/man.orig 2018-11-10 19:42:10.000000000 +0000
6+++ package/man 6+++ package/man
7@@ -10,20 +10,11 @@ mandir="" 7@@ -10,20 +10,11 @@ mandir=""
8 usemanpath=0 8 usemanpath=0
9 usemandoc=0 9 usemandoc=0
10  10
11-if [ `which manpath` 2>/dev/null ] 11-if [ `which manpath` 2>/dev/null ]
12-then 12-then
13- usemanpath=1 13- usemanpath=1
14-fi 14-fi
15- 15-
16-if [ `which mandoc` 2>/dev/null ] 16-if [ `which mandoc` 2>/dev/null ]
17-then  17-then
18- usemandoc=1 18- usemandoc=1
19- shout "Using mandoc facility for man files." 19- shout "Using mandoc facility for man files."
20-fi 20-fi
21- 21-
22 safe umask 022 22 safe umask 022
23 [ -d man ] || barf "no man directory" 23 [ -d man ] || barf "no man directory"
24  24
25+destdir=`head -1 conf-destdir` 25+destdir=`head -1 conf-destdir`
26+ 26+
27 if [ -f conf-man ] 27 if [ -f conf-man ]
28 then 28 then
29 mandir=`head -1 conf-man` 29 mandir=`head -1 conf-man`
30@@ -58,7 +49,7 @@ fi 30@@ -49,16 +40,18 @@ else
 31 fi
 32
 33 cd man
 34+if false; then
 35 if [ $usemandoc -eq 1 ]
 36 then
 37 safe make -f Makefile.mandoc
 38 else
 39 safe make
 40 fi
 41+fi
31  42
32 if [ $usemandoc -eq 0 ] 43 if [ $usemandoc -eq 0 ]
33 then 44 then
34- shout "Installing ${me} compressed man-files in ${mandir}." 45- shout "Installing ${me} compressed man-files in ${mandir}."
35+ shout "Installing ${me} man-files in ${mandir}." 46+ shout "Installing ${me} man-files in ${mandir}."
36 else 47 else
37 shout "Installing ${me} un-compressed man-files in ${mandir}." 48 shout "Installing ${me} un-compressed man-files in ${mandir}."
38 fi 49 fi
39@@ -71,11 +62,11 @@ done 50@@ -71,11 +64,11 @@ done
40 for manfile in $all 51 for manfile in $all
41 do 52 do
42 dir="man`echo $manfile | awk -F. '{print $NF}'`" 53 dir="man`echo $manfile | awk -F. '{print $NF}'`"
43- [ -d $mandir/$dir ] || safe mkdir $mandir/$dir 54- [ -d $mandir/$dir ] || safe mkdir $mandir/$dir
44+ [ -d $destdir/$mandir/$dir ] || safe mkdir $destdir/$mandir/$dir 55+ [ -d $destdir/$mandir/$dir ] || safe mkdir $destdir/$mandir/$dir
45 if [ $usemandoc -eq 0 ] 56 if [ $usemandoc -eq 0 ]
46 then 57 then
47 safe gzip $manfile && \ 58 safe gzip $manfile && \
48- cp "$manfile.gz" "$mandir/$dir/$manfile.gz" 59- cp "$manfile.gz" "$mandir/$dir/$manfile.gz"
49+ cp "$manfile.gz" "$destdir/$mandir/$dir/$manfile.gz" 60+ cp "$manfile.gz" "$destdir/$mandir/$dir/$manfile.gz"
50 else 61 else
51 safe cp "$manfile" "$mandir/$dir/$manfile" 62 safe cp "$manfile" "$mandir/$dir/$manfile"
52 fi 63 fi
 64@@ -83,6 +76,7 @@ done
 65
 66 ## nroff: Required for old catman systems only
 67
 68+if false; then
 69 if [ $usemandoc -eq 0 ]
 70 then
 71 shout "Installing ${me} nroff'ed man-files in ${mandir}/catX."
 72@@ -119,6 +113,7 @@ else
 73 shout "Installing ${me} mandoc files in db (man -w)."
 74 fi
 75 fi
 76+fi
 77
 78 cd ..
 79