CVS commit: pkgsrc/mail/safecat

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sun Dec 16 06:47:18 UTC 2018

Modified Files:
        pkgsrc/mail/safecat: distinfo
        pkgsrc/mail/safecat/patches: patch-Makefile

Log Message:
Avoid linking duplicate symbols. Fixes FreeBSD build.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/mail/safecat/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/safecat/patches/patch-Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/safecat/distinfo
diff -u pkgsrc/mail/safecat/distinfo:1.12 pkgsrc/mail/safecat/distinfo:1.13
--- pkgsrc/mail/safecat/distinfo:1.12   Thu Jul 27 02:20:30 2017
+++ pkgsrc/mail/safecat/distinfo        Sun Dec 16 06:47:18 2018
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.12 2017/07/27 02:20:30 schmonz Exp $
+$NetBSD: distinfo,v 1.13 2018/12/16 06:47:18 schmonz Exp $
 
 SHA1 (safecat-1.13.tar.gz) = 07b42cb06490abeacefce9429a1dbf96caa1629b
 RMD160 (safecat-1.13.tar.gz) = 614df1d43d13a638ab30a2921b66d78f3fafc4c6
 SHA512 (safecat-1.13.tar.gz) = e6f7401b55a61f70715b3d222c8286c0125c5e7b3b132e5e8d3c8573a6c45dba75b29a459c7e93d7c0760300f0a62635d8ea4eacde9b0b1ff7637b3f6c63e210
 Size (safecat-1.13.tar.gz) = 33953 bytes
-SHA1 (patch-Makefile) = f19e2acb2cb917277f01a5063ef01199d2338a3c
+SHA1 (patch-Makefile) = 425f38bfed1cc4c125966d28ea9e475fb690e299
 SHA1 (patch-hier.c) = b4483673a6eb3a2c55da096a1b01a3a5a9a053a9
 SHA1 (patch-tryulong32.c) = 2ffcf9c1dc8ca5182c915ec9b4da571d67d11dec

Index: pkgsrc/mail/safecat/patches/patch-Makefile
diff -u pkgsrc/mail/safecat/patches/patch-Makefile:1.1 pkgsrc/mail/safecat/patches/patch-Makefile:1.2
--- pkgsrc/mail/safecat/patches/patch-Makefile:1.1      Thu Jul 27 02:20:30 2017
+++ pkgsrc/mail/safecat/patches/patch-Makefile  Sun Dec 16 06:47:18 2018
@@ -1,6 +1,6 @@
-$NetBSD: patch-Makefile,v 1.1 2017/07/27 02:20:30 schmonz Exp $
+$NetBSD: patch-Makefile,v 1.2 2018/12/16 06:47:18 schmonz Exp $
 
-DESTDIR support.
+DESTDIR support. Avoid linking duplicate symbols.
 
 --- Makefile.orig      2004-08-17 00:50:09.000000000 +0000
 +++ Makefile
@@ -51,3 +51,22 @@ DESTDIR support.
  
  find-systype: \
  find-systype.sh auto-ccld.sh
+@@ -219,14 +227,14 @@ compile open_trunc.c open.h
+ 
+ safecat: \
+ load safecat.o getln.a str.a stralloc.a strerr.a substdio.a alloc.o \
+-alloc_re.o byte_copy.o byte_cr.o envread.o error.o error_str.o fmt_uint64.o \
+-hostname.o sig.o stat_dir.o str_diffn.o str_len.o substdio_copy.o \
++alloc_re.o byte_cr.o envread.o error.o error_str.o fmt_uint64.o \
++hostname.o sig.o stat_dir.o str_diffn.o substdio_copy.o \
+ substdi.o substdio.o taia_fmtfrac.o taia_now.o taia_tai.o tempfile.o \
+ writefile.o
+       ./load safecat getln.a str.a stralloc.a strerr.a substdio.a \
+-      alloc.o alloc_re.o byte_copy.o byte_cr.o envread.o error.o \
++      alloc.o alloc_re.o byte_cr.o envread.o error.o \
+       error_str.o fmt_uint64.o hostname.o sig.o stat_dir.o str_diffn.o \
+-      str_len.o substdi.o substdio.o substdio_copy.o taia_fmtfrac.o \
++      substdi.o substdio.o substdio_copy.o taia_fmtfrac.o \
+       taia_now.o taia_tai.o tempfile.o writefile.o
+ 
+ safecat.0: \