Patch the pkgsrc patch to patch the included patch that patches the

included lua-curl to also avoid defining an unneeded (and apparently
so old as to be dangling) curl compatibility #define.

Caution: this is a diff to a diff of a diff; cvs diff will give you
a diff of a diff to a diff of a diff.

While here, recenter another pkgsrc patch.

3 files changed, 22 insertions, 8 deletions

diff --git a/mail/freepops/distinfo b/mail/freepops/distinfo
index a2d91bfa076..91cb455e65b 100644
--- a/mail/freepops/distinfo
+++ b/mail/freepops/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2014/02/21 20:26:53 joerg Exp $
+$NetBSD: distinfo,v 1.10 2014/08/18 18:19:29 schmonz Exp $
 
 SHA1 (freepops-0.2.9.tar.gz) = 30e31a3618d07ec0924e9c1ae06c7acd846a13de
 RMD160 (freepops-0.2.9.tar.gz) = c473bd9a523f7bc30dbcfa30c0f1e58418301d24
@@ -9,6 +9,6 @@ SHA1 (patch-ac) = ca0c136b6cee3c164c9382227bcbd534e382927b
 SHA1 (patch-ad) = 90a2313b2e9a3a2321778df515c076e603955502
 SHA1 (patch-ae) = 389693569e978395f2d1e286003ad7d20ce59a14
 SHA1 (patch-af) = b0aabc349df11e73ccbab1943ee2075894c865d4
-SHA1 (patch-ag) = 9c7f944d0f2f5a5303e692844b729e933655f9f4
+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) = bbd7c92b25d262f414662b509acbbe8f3f468ffc
+SHA1 (patch-modules_src_luacurl_lua-curl-0_3_0_diff) = 8afc4d28136bf2d3474c14dfe3c1fa6be2116bbf
diff --git a/mail/freepops/patches/patch-ag b/mail/freepops/patches/patch-ag
index 5194abebf60..c2e2ed03377 100644
--- a/mail/freepops/patches/patch-ag
+++ b/mail/freepops/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.4 2008/11/02 20:51:40 schmonz Exp $
+$NetBSD: patch-ag,v 1.5 2014/08/18 18:19:29 schmonz Exp $
 
---- src/Makefile.orig	2008-11-01 10:25:38.000000000 -0400
+--- src/Makefile.orig	2008-12-08 09:15:14.000000000 +0000
 +++ src/Makefile
-@@ -172,7 +172,7 @@ ifeq "$(OS)" "BeOS"
+@@ -173,7 +173,7 @@ ifeq "$(OS)" "BeOS"
  else
  ifeq "$(SSL)" "openssl"
  	LDFLAGS+=-L ../modules/lib $(addprefix -l,$(LIBSTOLINK))\
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 bd79684af45..82036c3ce38 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.2 2012/06/09 07:35:12 dholland Exp $
+$NetBSD: patch-modules_src_luacurl_lua-curl-0_3_0_diff,v 1.3 2014/08/18 18:19:29 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
@@ -10,7 +10,7 @@ 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,27 @@ diff -ruN lua-curl-0.3.0-orig/Makefile l
+@@ -177,3 +177,41 @@ diff -ruN lua-curl-0.3.0-orig/Makefile l
   
   # Constants genereated starting from the cURL headers:
   
@@ -38,3 +38,17 @@ be miffed in a jiff, and you might even get biffed in a tiff.
 + 		grep "CURLFTPMETHOD_" | \
 + 		grep -v "LAST.*never use" | \
 + 		sed "s/^ *CURL//" | sed "s/^\([^,]*\),.*$$/{\"\1\",CURL\1},/" \
++--- lua-curl-0.3.0/lua-curl.c.orig	2008-10-25 15:26:26.000000000 +0000
+++++ lua-curl-0.3.0/lua-curl.c
++@@ -69,9 +69,11 @@
++ #ifndef CURLOPT_READDATA
++ 	#define CURLOPT_READDATA  CURLOPT_INFILE 
++ #endif
+++/*
++ #ifndef CURLOPT_HEADERDATA
++ 	#define CURLOPT_HEADERDATA CURLOPT_WRITEHEADER
++ #endif
+++*/
++ 
++ /* strings put in the bag, vectorialized for faster/shorter access */
++