pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/freepops Generating curl_authopt.h from recent cu...
details: https://anonhg.NetBSD.org/pkgsrc/rev/339e4a6eba7a
branches: trunk
changeset: 641950:339e4a6eba7a
user: schmonz <schmonz%pkgsrc.org@localhost>
date: Fri Nov 21 22:50:41 2014 +0000
description:
Generating curl_authopt.h from recent curl headers produces a
spurious '},' on a line all by itself. Patch our patch to the bundled
patch to add one more sed invocation to clear any such lines.
diffstat:
mail/freepops/distinfo | 4 +-
mail/freepops/patches/patch-modules_src_luacurl_lua-curl-0_3_0_diff | 11 +++++----
2 files changed, 8 insertions(+), 7 deletions(-)
diffs (45 lines):
diff -r b4e1a56758ed -r 339e4a6eba7a mail/freepops/distinfo
--- a/mail/freepops/distinfo Fri Nov 21 22:16:55 2014 +0000
+++ b/mail/freepops/distinfo Fri Nov 21 22:50:41 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2014/08/18 18:19:29 schmonz Exp $
+$NetBSD: distinfo,v 1.11 2014/11/21 22:50:41 schmonz Exp $
SHA1 (freepops-0.2.9.tar.gz) = 30e31a3618d07ec0924e9c1ae06c7acd846a13de
RMD160 (freepops-0.2.9.tar.gz) = c473bd9a523f7bc30dbcfa30c0f1e58418301d24
@@ -11,4 +11,4 @@
SHA1 (patch-af) = b0aabc349df11e73ccbab1943ee2075894c865d4
SHA1 (patch-ag) = 11ef6197d29ea7917ad3efbb8a6bb7df36386e4e
SHA1 (patch-modules_src_getdate_getdate-curl-7.11.0.diff) = 02a71389e023f24f55715cf59714e1da9c7dfe57
-SHA1 (patch-modules_src_luacurl_lua-curl-0_3_0_diff) = 8afc4d28136bf2d3474c14dfe3c1fa6be2116bbf
+SHA1 (patch-modules_src_luacurl_lua-curl-0_3_0_diff) = 778a18e150d73cee8b48276d1805393242bc1820
diff -r b4e1a56758ed -r 339e4a6eba7a mail/freepops/patches/patch-modules_src_luacurl_lua-curl-0_3_0_diff
--- a/mail/freepops/patches/patch-modules_src_luacurl_lua-curl-0_3_0_diff Fri Nov 21 22:16:55 2014 +0000
+++ b/mail/freepops/patches/patch-modules_src_luacurl_lua-curl-0_3_0_diff Fri Nov 21 22:50:41 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-modules_src_luacurl_lua-curl-0_3_0_diff,v 1.3 2014/08/18 18:19:29 schmonz Exp $
+$NetBSD: patch-modules_src_luacurl_lua-curl-0_3_0_diff,v 1.4 2014/11/21 22:50:42 schmonz Exp $
Patch the included patch that patches the included lua-curl to fix
unintended references to /usr/include, and to not choke on certain
@@ -14,15 +14,16 @@
# Constants genereated starting from the cURL headers:
-+@@ -121,17 +46,18 @@
-+ > curl_netrcopt.h
-+
++@@ -119,19 +44,20 @@ curl_netrcopt.h:$(HEADER)
++ > curl_netrcopt.h
++
+ curl_authopt.h:$(HEADER)
+- $(H)cat $(HEADER) | grep "CURLAUTH_" | \
++ $(H)cat $(HEADER) | grep "CURLAUTH_" | grep -v "^ \* " | \
+ sed "s/#define *CURL/{\"/" | sed "s/ *\/\*.*\*\///" | \
++- sed "s/ /\",/" | sed "s/$$/},/" > curl_authopt.h
++ sed "s/ *\/\*.*$$//" |\
-+ sed "s/ /\",/" | sed "s/$$/},/" > curl_authopt.h
+++ sed "s/ /\",/" | sed "s/$$/},/" | sed "s/^},$$//" > curl_authopt.h
+
+ curl_ftpauthopt.h:$(HEADER)
+- $(H)cat /usr/include/curl/curl.h | grep -B10 '} curl_ftpauth' | \
Home |
Main Index |
Thread Index |
Old Index