diff options
| author | schmonz <schmonz> | 2014-11-21 22:50:41 +0000 |
|---|---|---|
| committer | schmonz <schmonz> | 2014-11-21 22:50:41 +0000 |
| commit | aee2e39e11bed6a04906ae8b04685766b17dbc77 (patch) | |
| tree | bcff6ed8d690f5ef9c4eb77151c326baad66a2d8 /mail/freepops | |
| parent | 3b8026d59ab8f7a2f5ad135011ea9f3eac955bed (diff) | |
| download | pkgsrc-aee2e39e11bed6a04906ae8b04685766b17dbc77.tar.gz | |
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 (limited to 'mail/freepops')
| -rw-r--r-- | mail/freepops/distinfo | 4 | ||||
| -rw-r--r-- | mail/freepops/patches/patch-modules_src_luacurl_lua-curl-0_3_0_diff | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/mail/freepops/distinfo b/mail/freepops/distinfo index 91cb455e65b..487e3e7b540 100644 --- a/mail/freepops/distinfo +++ b/mail/freepops/distinfo @@ -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-ae) = 389693569e978395f2d1e286003ad7d20ce59a14 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 --git a/mail/freepops/patches/patch-modules_src_luacurl_lua-curl-0_3_0_diff b/mail/freepops/patches/patch-modules_src_luacurl_lua-curl-0_3_0_diff index 82036c3ce38..df64354fbe5 100644 --- a/mail/freepops/patches/patch-modules_src_luacurl_lua-curl-0_3_0_diff +++ b/mail/freepops/patches/patch-modules_src_luacurl_lua-curl-0_3_0_diff @@ -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 @@ be miffed in a jiff, and you might even get biffed in a tiff. # 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' | \ |