Re: security/libsecret build error

[Leonardo Taccari <leot%NetBSD.org@localhost>]

Hello Mayuresh,

Mayuresh writes:
> ===> Building for libsecret-0.18.6
>   GEN      temp-dbus-generated.c
>   GEN      secret-dbus-generated.c
> sed: -e expression #1, char 2: unknown command: `1'
> Makefile:2650: recipe for target 'secret-dbus-generated.c' failed
> gmake: *** [secret-dbus-generated.c] Error 1

I think that the problem is not sed but the usage of sh(1) Dollar
Single Quotes (i.e. `$'...'').

Can you please test the attached patch and let us know if that fixes the
problem?


Thank you!

Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/security/libsecret/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo	16 Apr 2018 13:06:57 -0000	1.8
+++ distinfo	20 May 2018 12:58:47 -0000
@@ -4,3 +4,4 @@ SHA1 (libsecret-0.18.6.tar.xz) = e840a40
 RMD160 (libsecret-0.18.6.tar.xz) = 95ba50baf3d4e54cfdc86d7531e5a5761d32f4cc
 SHA512 (libsecret-0.18.6.tar.xz) = 4997519762f1470cfc0a4b3a791362d030af3c9b6ce6f58f8f8073b3a8adeea9b8caacedc884163997081dc39f395f9172330dbb41fed45d6c43ac5809de48e3
 Size (libsecret-0.18.6.tar.xz) = 487836 bytes
+SHA1 (patch-libsecret_Makefile.am) = 415bb25352268c02508260aae6639230d9e8e66e
Index: patches/patch-libsecret_Makefile.am
===================================================================
RCS file: patches/patch-libsecret_Makefile.am
diff -N patches/patch-libsecret_Makefile.am
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-libsecret_Makefile.am	20 May 2018 12:58:47 -0000
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Avoid non-standard dollar single quote use (i.e. $'...').
+
+--- libsecret/Makefile.am.orig	2017-12-05 13:16:03.000000000 +0000
++++ libsecret/Makefile.am
+@@ -89,7 +89,8 @@ temp-dbus-generated.c: $(DBUS_XML_DEFINI
+ 	$(AM_V_GEN) gdbus-codegen --interface-prefix org.freedesktop.Secret. \
+ 		--generate-c-code temp-dbus-generated --c-namespace SecretGen $<
+ secret-dbus-generated.c: temp-dbus-generated.c Makefile.am
+-	$(AM_V_GEN) sed -e $$'1i\\\n#define GLIB_DISABLE_DEPRECATION_WARNINGS' \
++	$(AM_V_GEN) sed -e '1i\
++#define GLIB_DISABLE_DEPRECATION_WARNINGS' \
+ 		-e 's/secret_gen_/_secret_gen_/g' -e 's/type-/type/g' \
+ 		-e 's/temp-dbus-generated.h/secret-dbus-generated.h/g' \
+ 		temp-dbus-generated.c > secret-dbus-generated.c