CVS commit: pkgsrc/www/SOGo

["Emmanuel Dreyfus" <manu%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   manu
Date:           Thu Apr 16 09:42:42 UTC 2020

Modified Files:
        pkgsrc/www/SOGo: Makefile distinfo
Added Files:
        pkgsrc/www/SOGo/patches: patch-general.make

Log Message:
Fix packaging

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


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 pkgsrc/www/SOGo/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/www/SOGo/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/www/SOGo/patches/patch-general.make

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

Modified files:

Index: pkgsrc/www/SOGo/Makefile
diff -u pkgsrc/www/SOGo/Makefile:1.59 pkgsrc/www/SOGo/Makefile:1.60
--- pkgsrc/www/SOGo/Makefile:1.59       Sun Apr 12 08:29:16 2020
+++ pkgsrc/www/SOGo/Makefile    Thu Apr 16 09:42:42 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2020/04/12 08:29:16 adam Exp $
+# $NetBSD: Makefile,v 1.60 2020/04/16 09:42:42 manu Exp $
 #
 
 DISTNAME=      SOGo-2.3.23

Index: pkgsrc/www/SOGo/distinfo
diff -u pkgsrc/www/SOGo/distinfo:1.22 pkgsrc/www/SOGo/distinfo:1.23
--- pkgsrc/www/SOGo/distinfo:1.22       Wed Mar 21 14:36:39 2018
+++ pkgsrc/www/SOGo/distinfo    Thu Apr 16 09:42:42 2020
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.22 2018/03/21 14:36:39 taca Exp $
+$NetBSD: distinfo,v 1.23 2020/04/16 09:42:42 manu Exp $
 
 SHA1 (SOGo-2.3.23.tar.gz) = 2d3811e0a4d374586a8f53ed3bc3e7add3f1308f
 RMD160 (SOGo-2.3.23.tar.gz) = 8409fc9427e31e30a6cd60fff32b2f3ac944a947
 SHA512 (SOGo-2.3.23.tar.gz) = abd2d0133b3e7db91e0e9426c76d65d32d9e47ab6a37dbc96213dabbd24d45f7bfc6835570c22355649d7651df9a36a6614d874b16dbd796bff4eabee0a48eb6
 Size (SOGo-2.3.23.tar.gz) = 12521303 bytes
 SHA1 (patch-SoObjects_SOGo_NSData+Crypto.m) = 2b121f06f409f9d8ddfb717e5b3d13547c7d18a0
+SHA1 (patch-general.make) = d1517f3fc9133c7edb4293612b87674504d3ac5f

Added files:

Index: pkgsrc/www/SOGo/patches/patch-general.make
diff -u /dev/null pkgsrc/www/SOGo/patches/patch-general.make:1.1
--- /dev/null   Thu Apr 16 09:42:42 2020
+++ pkgsrc/www/SOGo/patches/patch-general.make  Thu Apr 16 09:42:42 2020
@@ -0,0 +1,16 @@
+$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)
+