head 1.5; access; symbols pkgsrc-2019Q4:1.4.0.46 pkgsrc-2019Q4-base:1.4 pkgsrc-2019Q3:1.4.0.42 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.40 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.38 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.36 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.34 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.32 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.30 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.28 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.26 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.22 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.20 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.18 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.16 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.14 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.12 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.10 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.8 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.6 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.4 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.2 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.3.0.2 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.2.0.18 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.16 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.14 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.12 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.10 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.8 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.6 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.4 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.2 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.1.0.6 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.4 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.2; locks; strict; comment @# @; 1.5 date 2020.03.01.17.48.25; author nia; state dead; branches; next 1.4; commitid eGqgb5mKjWlAYIYB; 1.4 date 2014.11.21.22.50.42; author schmonz; state Exp; branches; next 1.3; commitid t6Ewu8Uv96FDA6Zx; 1.3 date 2014.08.18.18.19.29; author schmonz; state Exp; branches; next 1.2; commitid VOpayyQjaY9V8SMx; 1.2 date 2012.06.09.07.35.12; author dholland; state Exp; branches; next 1.1; 1.1 date 2011.10.09.09.09.29; author dholland; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2011.10.09.09.09.29; author tron; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2011.10.10.18.15.51; author tron; state Exp; branches; next ; desc @@ 1.5 log @mail: Remove freepops - dead since 2008, fails with OpenSSL 1.1 @ text @$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 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,41 @@@@ diff -ruN lua-curl-0.3.0-orig/Makefile l # Constants genereated starting from the cURL headers: +@@@@ -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/$$/},/" | 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},/" \ +--- 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 */ + @ 1.4 log @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. @ text @d1 1 a1 1 $NetBSD: patch-modules_src_luacurl_lua-curl-0_3_0_diff,v 1.3 2014/08/18 18:19:29 schmonz Exp $ @ 1.3 log @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. @ text @d1 1 a1 1 $NetBSD: patch-modules_src_luacurl_lua-curl-0_3_0_diff,v 1.2 2012/06/09 07:35:12 dholland Exp $ d17 3 a19 3 +@@@@ -121,17 +46,18 @@@@ + > curl_netrcopt.h + d24 1 d26 1 a26 1 + sed "s/ /\",/" | sed "s/$$/},/" > curl_authopt.h @ 1.2 log @Fix build with latest curl. @ text @d1 1 a1 1 $NetBSD: patch-modules_src_luacurl_lua-curl-0_3_0_diff,v 1.1 2011/10/09 09:09:29 dholland Exp $ d13 1 a13 1 @@@@ -177,3 +177,27 @@@@ diff -ruN lua-curl-0.3.0-orig/Makefile l d41 14 @ 1.1 log @Fix build with recent curl. @ text @d1 1 a1 1 $NetBSD$ d13 1 a13 1 @@@@ -177,3 +177,24 @@@@ diff -ruN lua-curl-0.3.0-orig/Makefile l d18 2 d21 2 a22 1 + $(H)cat $(HEADER) | grep "CURLAUTH_" | \ @ 1.1.2.1 log @file patch-modules_src_luacurl_lua-curl-0_3_0_diff was added on branch pkgsrc-2011Q3 on 2011-10-10 18:15:51 +0000 @ text @d1 37 @ 1.1.2.2 log @Pullup ticket #3548 - requested by dholland mail/freepops: build fix Revisions pulled up: - mail/freepops/distinfo 1.6 - mail/freepops/patches/patch-modules_src_luacurl_lua-curl-0_3_0_diff 1.1 --- Module Name: pkgsrc Committed By: dholland Date: Sun Oct 9 09:09:29 UTC 2011 Modified Files: pkgsrc/mail/freepops: distinfo Added Files: pkgsrc/mail/freepops/patches: patch-modules_src_luacurl_lua-curl-0_3_0_diff Log Message: Fix build with recent curl. @ text @a0 37 $NetBSD$ 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},/" \ @