CVS commit: pkgsrc/security/libsecret

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

Module Name:    pkgsrc
Committed By:   leot
Date:           Mon May 21 07:24:20 UTC 2018

Modified Files:
        pkgsrc/security/libsecret: distinfo
Added Files:
        pkgsrc/security/libsecret/patches: patch-Makefile.in
Removed Files:
        pkgsrc/security/libsecret/patches: patch-libsecret_Makefile.am

Log Message:
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!).


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/security/libsecret/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/security/libsecret/patches/patch-Makefile.in
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/security/libsecret/patches/patch-libsecret_Makefile.am

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

Modified files:

Index: pkgsrc/security/libsecret/distinfo
diff -u pkgsrc/security/libsecret/distinfo:1.9 pkgsrc/security/libsecret/distinfo:1.10
--- pkgsrc/security/libsecret/distinfo:1.9      Sun May 20 17:30:04 2018
+++ pkgsrc/security/libsecret/distinfo  Mon May 21 07:24:20 2018
@@ -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

Added files:

Index: pkgsrc/security/libsecret/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/security/libsecret/patches/patch-Makefile.in:1.3
--- /dev/null   Mon May 21 07:24:20 2018
+++ pkgsrc/security/libsecret/patches/patch-Makefile.in Mon May 21 07:24:20 2018
@@ -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