Thu Apr 16 09:42:42 2020 UTC ()
Fix packaging

Prevent -frecord-gcc-switches to be added, because pkgsrc
checks choke on the presence of working directory strings
inside the binaries.


(manu)
diff -r1.59 -r1.60 pkgsrc/www/SOGo/Makefile
diff -r1.22 -r1.23 pkgsrc/www/SOGo/distinfo
diff -r0 -r1.1 pkgsrc/www/SOGo/patches/patch-general.make
cvs diff -r1.59 -r1.60 pkgsrc/www/SOGo/Makefile (expand / switch to unified diff)

--- pkgsrc/www/SOGo/Makefile 2020/04/12 08:29:16 1.59
+++ pkgsrc/www/SOGo/Makefile 2020/04/16 09:42:42 1.60
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.59 2020/04/12 08:29:16 adam Exp $ 1# $NetBSD: Makefile,v 1.60 2020/04/16 09:42:42 manu Exp $
2# 2#
3 3
4DISTNAME= SOGo-2.3.23 4DISTNAME= SOGo-2.3.23
5PKGREVISION= 14 5PKGREVISION= 14
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= http://www.sogo.nu/files/downloads/SOGo/Sources/ 7MASTER_SITES= http://www.sogo.nu/files/downloads/SOGo/Sources/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.sogo.nu/ 10HOMEPAGE= http://www.sogo.nu/
11COMMENT= Groupware server supporting CalDAV, CardDAV and GroupDAV 11COMMENT= Groupware server supporting CalDAV, CardDAV and GroupDAV
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14HAS_CONFIGURE= yes 14HAS_CONFIGURE= yes
cvs diff -r1.22 -r1.23 pkgsrc/www/SOGo/distinfo (expand / switch to unified diff)

--- pkgsrc/www/SOGo/distinfo 2018/03/21 14:36:39 1.22
+++ pkgsrc/www/SOGo/distinfo 2020/04/16 09:42:42 1.23
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.22 2018/03/21 14:36:39 taca Exp $ 1$NetBSD: distinfo,v 1.23 2020/04/16 09:42:42 manu Exp $
2 2
3SHA1 (SOGo-2.3.23.tar.gz) = 2d3811e0a4d374586a8f53ed3bc3e7add3f1308f 3SHA1 (SOGo-2.3.23.tar.gz) = 2d3811e0a4d374586a8f53ed3bc3e7add3f1308f
4RMD160 (SOGo-2.3.23.tar.gz) = 8409fc9427e31e30a6cd60fff32b2f3ac944a947 4RMD160 (SOGo-2.3.23.tar.gz) = 8409fc9427e31e30a6cd60fff32b2f3ac944a947
5SHA512 (SOGo-2.3.23.tar.gz) = abd2d0133b3e7db91e0e9426c76d65d32d9e47ab6a37dbc96213dabbd24d45f7bfc6835570c22355649d7651df9a36a6614d874b16dbd796bff4eabee0a48eb6 5SHA512 (SOGo-2.3.23.tar.gz) = abd2d0133b3e7db91e0e9426c76d65d32d9e47ab6a37dbc96213dabbd24d45f7bfc6835570c22355649d7651df9a36a6614d874b16dbd796bff4eabee0a48eb6
6Size (SOGo-2.3.23.tar.gz) = 12521303 bytes 6Size (SOGo-2.3.23.tar.gz) = 12521303 bytes
7SHA1 (patch-SoObjects_SOGo_NSData+Crypto.m) = 2b121f06f409f9d8ddfb717e5b3d13547c7d18a0 7SHA1 (patch-SoObjects_SOGo_NSData+Crypto.m) = 2b121f06f409f9d8ddfb717e5b3d13547c7d18a0
 8SHA1 (patch-general.make) = d1517f3fc9133c7edb4293612b87674504d3ac5f
File Added: pkgsrc/www/SOGo/patches/patch-general.make
$NetBSD: patch-general.make,v 1.1 2020/04/16 09:42:42 manu Exp $

Prevent -frecord-gcc-switches to be added, because pkgsrc
checks choke on the presence of working directory strings
inside the binaries.

--- general.make.orig	2020-04-15 11:01:50.012506113 +0200
+++ general.make	2020-04-15 11:02:01.180611005 +0200
@@ -22,6 +22,6 @@
 # Ensure we store in the ELF files minimal debugging
 # information plus the compiler flags used; that can
 # be afterwards read with:
 # readelf -p .GCC.command.line /path/to/elf_file
-ADDITIONAL_OBJCFLAGS += -g $(call cc-option,-frecord-gcc-switches)
+ADDITIONAL_OBJCFLAGS += -g $(call cc-option)