summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authordholland <dholland@pkgsrc.org>2011-10-09 09:09:29 +0000
committerdholland <dholland@pkgsrc.org>2011-10-09 09:09:29 +0000
commite2a8b048b74fdf488a738191521dda6c5026de3d (patch)
tree2570c6ec7a31d1213917f2882785b716777bf67c /mail
parenta9c835b6dc82fb227cc0ef939f91fc4a81864a85 (diff)
downloadpkgsrc-e2a8b048b74fdf488a738191521dda6c5026de3d.tar.gz
Fix build with recent curl.
Diffstat (limited to 'mail')
-rw-r--r--mail/freepops/distinfo3
-rw-r--r--mail/freepops/patches/patch-modules_src_luacurl_lua-curl-0_3_0_diff37
2 files changed, 39 insertions, 1 deletions
diff --git a/mail/freepops/distinfo b/mail/freepops/distinfo
index 7a5a2f6c4f6..963e90d72d1 100644
--- a/mail/freepops/distinfo
+++ b/mail/freepops/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2008/11/02 20:51:40 schmonz Exp $
+$NetBSD: distinfo,v 1.6 2011/10/09 09:09:29 dholland Exp $
SHA1 (freepops-0.2.8.tar.gz) = 5bbf5ed41916c2fee04938abb0c440d98b325710
RMD160 (freepops-0.2.8.tar.gz) = e209a2b2f289e5b431c1d5ab3aaf5d5b09a87135
@@ -10,3 +10,4 @@ SHA1 (patch-ad) = 90a2313b2e9a3a2321778df515c076e603955502
SHA1 (patch-ae) = 389693569e978395f2d1e286003ad7d20ce59a14
SHA1 (patch-af) = b0a084f1db0f39a4f29cd071765b7d4e6bf21198
SHA1 (patch-ag) = 9c7f944d0f2f5a5303e692844b729e933655f9f4
+SHA1 (patch-modules_src_luacurl_lua-curl-0_3_0_diff) = 906eba58da017b3adc69640a7c2df0bdeaa1314a
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
new file mode 100644
index 00000000000..56acdc35f8c
--- /dev/null
+++ b/mail/freepops/patches/patch-modules_src_luacurl_lua-curl-0_3_0_diff
@@ -0,0 +1,37 @@
+$NetBSD: patch-modules_src_luacurl_lua-curl-0_3_0_diff,v 1.1 2011/10/09 09:09:29 dholland Exp $
+
+Patch the included patch that patches the included lua-curl to fix
+unintended references to /usr/include, and to not choke on certain
+multiline comments.
+
+Caution: this is a diff of a diff; cvs diff will give you a diff of a
+diff of a diff. If you need to update it, don't whiff, or someone will
+be miffed in a jiff, and you might even get biffed in a tiff.
+
+--- modules/src/luacurl/lua-curl-0.3.0.diff.orig 2008-10-25 15:46:06.000000000 +0000
++++ modules/src/luacurl/lua-curl-0.3.0.diff
+@@ -177,3 +177,24 @@ diff -ruN lua-curl-0.3.0-orig/Makefile l
+
+ # Constants genereated starting from the cURL headers:
+
++@@ -121,17 +46,18 @@
++ curl_authopt.h:$(HEADER)
++ $(H)cat $(HEADER) | grep "CURLAUTH_" | \
++ sed "s/#define *CURL/{\"/" | sed "s/ *\/\*.*\*\///" | \
+++ sed "s/ *\/\*.*$$//" |\
++ sed "s/ /\",/" | sed "s/$$/},/" > curl_authopt.h
++
++ curl_ftpauthopt.h:$(HEADER)
++- $(H)cat /usr/include/curl/curl.h | grep -B10 '} curl_ftpauth' | \
+++ $(H)cat $(HEADER) | grep -B10 '} curl_ftpauth' | \
++ grep "CURLFTPAUTH_" | \
++ grep -v "LAST.*never use" | \
++ sed "s/^ *CURL//" | sed "s/^\([^,]*\),.*$$/{\"\1\",CURL\1},/" \
++ > curl_ftpauthopt.h
++
++ curl_ftpmethods.h:$(HEADER)
++- $(H)cat /usr/include/curl/curl.h | grep -B10 '} curl_ftpmethod' | \
+++ $(H)cat $(HEADER) | grep -B10 '} curl_ftpmethod' | \
++ grep "CURLFTPMETHOD_" | \
++ grep -v "LAST.*never use" | \
++ sed "s/^ *CURL//" | sed "s/^\([^,]*\),.*$$/{\"\1\",CURL\1},/" \