From 48559e46002e8635fecb395f3eebd84f5d603f38 Mon Sep 17 00:00:00 2001
From: dholland <dholland@pkgsrc.org>
Date: Sat, 9 Jun 2012 07:35:12 +0000
Subject: Fix build with latest curl.

---
 mail/freepops/distinfo                                           | 4 ++--
 .../patches/patch-modules_src_luacurl_lua-curl-0_3_0_diff        | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'mail')

diff --git a/mail/freepops/distinfo b/mail/freepops/distinfo
index 963e90d72d1..fbba4a6eb45 100644
--- a/mail/freepops/distinfo
+++ b/mail/freepops/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2011/10/09 09:09:29 dholland Exp $
+$NetBSD: distinfo,v 1.7 2012/06/09 07:35:12 dholland Exp $
 
 SHA1 (freepops-0.2.8.tar.gz) = 5bbf5ed41916c2fee04938abb0c440d98b325710
 RMD160 (freepops-0.2.8.tar.gz) = e209a2b2f289e5b431c1d5ab3aaf5d5b09a87135
@@ -10,4 +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
+SHA1 (patch-modules_src_luacurl_lua-curl-0_3_0_diff) = bbd7c92b25d262f414662b509acbbe8f3f468ffc
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 56acdc35f8c..bd79684af45 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.1 2011/10/09 09:09:29 dholland Exp $
+$NetBSD: patch-modules_src_luacurl_lua-curl-0_3_0_diff,v 1.2 2012/06/09 07:35:12 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
@@ -10,13 +10,16 @@ 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
+@@ -177,3 +177,27 @@ diff -ruN lua-curl-0.3.0-orig/Makefile l
   
   # Constants genereated starting from the cURL headers:
   
 +@@ -121,17 +46,18 @@
++		> curl_netrcopt.h
++
 + curl_authopt.h:$(HEADER)
-+ 	$(H)cat $(HEADER) | grep "CURLAUTH_" | \
++-	$(H)cat $(HEADER) | grep "CURLAUTH_" | \
+++	$(H)cat $(HEADER) | grep "CURLAUTH_" | grep -v "^ \* " | \
 + 		sed "s/#define *CURL/{\"/" | sed "s/ *\/\*.*\*\///" | \
 ++		sed "s/ *\/\*.*$$//" |\
 + 		sed "s/ /\",/" | sed "s/$$/},/" > curl_authopt.h
-- 
cgit v1.2.3