[pkgsrc/trunk]: pkgsrc Fix packaging

[manu <manu%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/03b2d8bdfb99
branches:  trunk
changeset: 429092:03b2d8bdfb99
user:      manu <manu%pkgsrc.org@localhost>
date:      Thu Apr 16 09:40:50 2020 +0000

description:
Fix packaging

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

diffstat:

 devel/SOPE/Makefile                   |   2 +-
 devel/SOPE/distinfo                   |   3 ++-
 devel/SOPE/patches/patch-general.make |  16 ++++++++++++++++
 www/SOGo/Makefile                     |   2 +-
 www/SOGo/distinfo                     |   3 ++-
 www/SOGo/patches/patch-general.make   |  16 ++++++++++++++++
 6 files changed, 38 insertions(+), 4 deletions(-)

diffs (86 lines):

diff -r 7607b7d9a0ad -r 03b2d8bdfb99 devel/SOPE/Makefile
--- a/devel/SOPE/Makefile       Thu Apr 16 09:35:35 2020 +0000
+++ b/devel/SOPE/Makefile       Thu Apr 16 09:40:50 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2020/04/12 08:28:28 adam Exp $
+# $NetBSD: Makefile,v 1.49 2020/04/16 09:40:50 manu Exp $
 #
 
 DISTNAME=      SOPE-2.3.23
diff -r 7607b7d9a0ad -r 03b2d8bdfb99 devel/SOPE/distinfo
--- a/devel/SOPE/distinfo       Thu Apr 16 09:35:35 2020 +0000
+++ b/devel/SOPE/distinfo       Thu Apr 16 09:40:50 2020 +0000
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.21 2018/03/21 14:34:31 taca Exp $
+$NetBSD: distinfo,v 1.22 2020/04/16 09:40:50 manu Exp $
 
 SHA1 (SOPE-2.3.23.tar.gz) = ad9632a8ba20060179591ceb91bfbc9313311867
 RMD160 (SOPE-2.3.23.tar.gz) = b2decc467ebebf3518a4b3bbb55f1964fb1b33a7
 SHA512 (SOPE-2.3.23.tar.gz) = d10d3ac530f31dfe5a18ce0bdd89efe0545714a9a52bb0ff07b0566025e90438035e2363390ab7e5daae55a77bf3a7ba766f1ebc96dc764af28dbe756398516d
 Size (SOPE-2.3.23.tar.gz) = 2283214 bytes
+SHA1 (patch-general.make) = 080d097aca56c4aae59beadd0c0829c6b1798aa3
 SHA1 (patch-sope-core_NGStreams_NGActiveSocket.m) = c06a04b009f894eee0161eb8bd3f9c7011b6de3e
 SHA1 (patch-sope-core_NGStreams_NGDescriptorFunctions.m) = e3045db3205cd859d78c3953e0f1565626c69d04
 SHA1 (patch-sope-core_NGStreams_NGInternetSocketAddress.m) = e0262b32d6ac3766b06a797d19a976180078a780
diff -r 7607b7d9a0ad -r 03b2d8bdfb99 devel/SOPE/patches/patch-general.make
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/SOPE/patches/patch-general.make     Thu Apr 16 09:40:50 2020 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-general.make,v 1.1 2020/04/16 09:40:50 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 09:51:06.284218723 +0200
++++ general.make       2020-04-15 09:51:25.863408691 +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)
+ 
diff -r 7607b7d9a0ad -r 03b2d8bdfb99 www/SOGo/Makefile
--- a/www/SOGo/Makefile Thu Apr 16 09:35:35 2020 +0000
+++ b/www/SOGo/Makefile Thu Apr 16 09:40:50 2020 +0000
@@ -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
diff -r 7607b7d9a0ad -r 03b2d8bdfb99 www/SOGo/distinfo
--- a/www/SOGo/distinfo Thu Apr 16 09:35:35 2020 +0000
+++ b/www/SOGo/distinfo Thu Apr 16 09:40:50 2020 +0000
@@ -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
diff -r 7607b7d9a0ad -r 03b2d8bdfb99 www/SOGo/patches/patch-general.make
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/SOGo/patches/patch-general.make       Thu Apr 16 09:40:50 2020 +0000
@@ -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)
+