[pkgsrc/trunk]: pkgsrc/security/libsecret libsecret: Directly pa...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/65aa61375d9f
branches:  trunk
changeset: 308324:65aa61375d9f
user:      leot <leot%pkgsrc.org@localhost>
date:      Mon May 21 07:24:20 2018 +0000

description:
libsecret: Directly patch Makefile.in to avoid automake

Previously if `automake' was not available during the build,
patch-libsecret_Makefile.am was effectively not applied to the Makefile.
To avoid to depends on `automake' just directly patch the Makefile.in.

Should fix the problem reported by Mayuresh on pkgsrc-users@
regarding the use of dollar single quotes ($'...') (also if `automake' is not
available!).

diffstat:

 security/libsecret/distinfo                            |   4 ++--
 security/libsecret/patches/patch-Makefile.in           |  16 ++++++++++++++++
 security/libsecret/patches/patch-libsecret_Makefile.am |  16 ----------------
 3 files changed, 18 insertions(+), 18 deletions(-)

diffs (53 lines):

diff -r 0cdf0c8b88a2 -r 65aa61375d9f security/libsecret/distinfo
--- a/security/libsecret/distinfo       Sun May 20 23:44:13 2018 +0000
+++ b/security/libsecret/distinfo       Mon May 21 07:24:20 2018 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2018/05/20 17:30:04 leot Exp $
+$NetBSD: distinfo,v 1.10 2018/05/21 07:24:20 leot Exp $
 
 SHA1 (libsecret-0.18.6.tar.xz) = e840a40062c135f4eec41f057a326d9ed519ff4f
 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) = 5a780adc70bfbf8b6724cbda6675cedd4bea042e
+SHA1 (patch-Makefile.in) = ef56257d405013db5bb20b1bb53f0541c50aa7e4
diff -r 0cdf0c8b88a2 -r 65aa61375d9f security/libsecret/patches/patch-Makefile.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/libsecret/patches/patch-Makefile.in      Mon May 21 07:24:20 2018 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-Makefile.in,v 1.3 2018/05/21 07:24:20 leot Exp $
+
+Avoid to use not-so-ubiquitous/non-standard dollar single quotes use ($'...').
+
+--- Makefile.in.orig   2018-03-29 12:31:33.000000000 +0000
++++ Makefile.in
+@@ -2647,7 +2647,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
diff -r 0cdf0c8b88a2 -r 65aa61375d9f security/libsecret/patches/patch-libsecret_Makefile.am
--- a/security/libsecret/patches/patch-libsecret_Makefile.am    Sun May 20 23:44:13 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-libsecret_Makefile.am,v 1.1 2018/05/20 17:30:04 leot Exp $
-
-Avoid to use not-so-ubiquitous/non-standard dollar single quotes use ($'...').
-
---- 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