Mon Dec 17 02:56:42 2018 UTC ()
Fix previous: swap link order to unbreak at least NetBSD and SmartOS.
Still works on FreeBSD.


(schmonz)
diff -r1.13 -r1.14 pkgsrc/mail/safecat/distinfo
diff -r1.2 -r1.3 pkgsrc/mail/safecat/patches/patch-Makefile
cvs diff -r1.13 -r1.14 pkgsrc/mail/safecat/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/safecat/distinfo 2018/12/16 06:47:18 1.13
+++ pkgsrc/mail/safecat/distinfo 2018/12/17 02:56:42 1.14
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.13 2018/12/16 06:47:18 schmonz Exp $ 1$NetBSD: distinfo,v 1.14 2018/12/17 02:56:42 schmonz Exp $
2 2
3SHA1 (safecat-1.13.tar.gz) = 07b42cb06490abeacefce9429a1dbf96caa1629b 3SHA1 (safecat-1.13.tar.gz) = 07b42cb06490abeacefce9429a1dbf96caa1629b
4RMD160 (safecat-1.13.tar.gz) = 614df1d43d13a638ab30a2921b66d78f3fafc4c6 4RMD160 (safecat-1.13.tar.gz) = 614df1d43d13a638ab30a2921b66d78f3fafc4c6
5SHA512 (safecat-1.13.tar.gz) = e6f7401b55a61f70715b3d222c8286c0125c5e7b3b132e5e8d3c8573a6c45dba75b29a459c7e93d7c0760300f0a62635d8ea4eacde9b0b1ff7637b3f6c63e210 5SHA512 (safecat-1.13.tar.gz) = e6f7401b55a61f70715b3d222c8286c0125c5e7b3b132e5e8d3c8573a6c45dba75b29a459c7e93d7c0760300f0a62635d8ea4eacde9b0b1ff7637b3f6c63e210
6Size (safecat-1.13.tar.gz) = 33953 bytes 6Size (safecat-1.13.tar.gz) = 33953 bytes
7SHA1 (patch-Makefile) = 425f38bfed1cc4c125966d28ea9e475fb690e299 7SHA1 (patch-Makefile) = e6db6ab21c37d4b1ff9d71f9dd4d17880e370725
8SHA1 (patch-hier.c) = b4483673a6eb3a2c55da096a1b01a3a5a9a053a9 8SHA1 (patch-hier.c) = b4483673a6eb3a2c55da096a1b01a3a5a9a053a9
9SHA1 (patch-tryulong32.c) = 2ffcf9c1dc8ca5182c915ec9b4da571d67d11dec 9SHA1 (patch-tryulong32.c) = 2ffcf9c1dc8ca5182c915ec9b4da571d67d11dec
cvs diff -r1.2 -r1.3 pkgsrc/mail/safecat/patches/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/mail/safecat/patches/patch-Makefile 2018/12/16 06:47:18 1.2
+++ pkgsrc/mail/safecat/patches/patch-Makefile 2018/12/17 02:56:42 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-Makefile,v 1.2 2018/12/16 06:47:18 schmonz Exp $ 1$NetBSD: patch-Makefile,v 1.3 2018/12/17 02:56:42 schmonz Exp $
2 2
3DESTDIR support. Avoid linking duplicate symbols. 3DESTDIR support. Avoid linking duplicate symbols.
4 4
5--- Makefile.orig 2004-08-17 00:50:09.000000000 +0000 5--- Makefile.orig 2004-08-17 00:50:09.000000000 +0000
6+++ Makefile 6+++ Makefile
7@@ -29,6 +29,14 @@ auto-str.o: \ 7@@ -29,6 +29,14 @@ auto-str.o: \
8 compile auto-str.c substdio.h readwrite.h exit.h 8 compile auto-str.c substdio.h readwrite.h exit.h
9 ./compile auto-str.c 9 ./compile auto-str.c
10  10
11+auto_destdir.c: \ 11+auto_destdir.c: \
12+auto-str conf-destdir 12+auto-str conf-destdir
13+ ./auto-str auto_home `head -1 conf-destdir` > auto_destdir.c 13+ ./auto-str auto_home `head -1 conf-destdir` > auto_destdir.c
14+ 14+
@@ -41,32 +41,35 @@ DESTDIR support. Avoid linking duplicate @@ -41,32 +41,35 @@ DESTDIR support. Avoid linking duplicate
41+ ./load instcheck hier.o auto_destdir.o strerr.a substdio.a \ 41+ ./load instcheck hier.o auto_destdir.o strerr.a substdio.a \
42 error.a str.a 42 error.a str.a
43  43
44 instcheck.o: \ 44 instcheck.o: \
45@@ -123,7 +131,7 @@ compile instcheck.c strerr.h error_no.h  45@@ -123,7 +131,7 @@ compile instcheck.c strerr.h error_no.h
46 ./compile instcheck.c 46 ./compile instcheck.c
47  47
48 it: \ 48 it: \
49-maildir safecat man 49-maildir safecat man
50+maildir safecat 50+maildir safecat
51  51
52 find-systype: \ 52 find-systype: \
53 find-systype.sh auto-ccld.sh 53 find-systype.sh auto-ccld.sh
54@@ -219,14 +227,14 @@ compile open_trunc.c open.h 54@@ -218,15 +226,15 @@ compile open_trunc.c open.h
 55 ./compile open_trunc.c
55  56
56 safecat: \ 57 safecat: \
57 load safecat.o getln.a str.a stralloc.a strerr.a substdio.a alloc.o \ 58-load safecat.o getln.a str.a stralloc.a strerr.a substdio.a alloc.o \
58-alloc_re.o byte_copy.o byte_cr.o envread.o error.o error_str.o fmt_uint64.o \ 59-alloc_re.o byte_copy.o byte_cr.o envread.o error.o error_str.o fmt_uint64.o \
59-hostname.o sig.o stat_dir.o str_diffn.o str_len.o substdio_copy.o \ 60-hostname.o sig.o stat_dir.o str_diffn.o str_len.o substdio_copy.o \
 61+load safecat.o getln.a stralloc.a str.a strerr.a substdio.a alloc.o \
60+alloc_re.o byte_cr.o envread.o error.o error_str.o fmt_uint64.o \ 62+alloc_re.o byte_cr.o envread.o error.o error_str.o fmt_uint64.o \
61+hostname.o sig.o stat_dir.o str_diffn.o substdio_copy.o \ 63+hostname.o sig.o stat_dir.o str_diffn.o substdio_copy.o \
62 substdi.o substdio.o taia_fmtfrac.o taia_now.o taia_tai.o tempfile.o \ 64 substdi.o substdio.o taia_fmtfrac.o taia_now.o taia_tai.o tempfile.o \
63 writefile.o 65 writefile.o
64 ./load safecat getln.a str.a stralloc.a strerr.a substdio.a \ 66- ./load safecat getln.a str.a stralloc.a strerr.a substdio.a \
65- alloc.o alloc_re.o byte_copy.o byte_cr.o envread.o error.o \ 67- alloc.o alloc_re.o byte_copy.o byte_cr.o envread.o error.o \
 68+ ./load safecat getln.a stralloc.a str.a strerr.a substdio.a \
66+ alloc.o alloc_re.o byte_cr.o envread.o error.o \ 69+ alloc.o alloc_re.o byte_cr.o envread.o error.o \
67 error_str.o fmt_uint64.o hostname.o sig.o stat_dir.o str_diffn.o \ 70 error_str.o fmt_uint64.o hostname.o sig.o stat_dir.o str_diffn.o \
68- str_len.o substdi.o substdio.o substdio_copy.o taia_fmtfrac.o \ 71- str_len.o substdi.o substdio.o substdio_copy.o taia_fmtfrac.o \
69+ substdi.o substdio.o substdio_copy.o taia_fmtfrac.o \ 72+ substdi.o substdio.o substdio_copy.o taia_fmtfrac.o \
70 taia_now.o taia_tai.o tempfile.o writefile.o 73 taia_now.o taia_tai.o tempfile.o writefile.o
71  74
72 safecat.0: \ 75 safecat.0: \