cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Update to 2.0.1

Browse Source 
PR:		212271
Submitted by:	bob@eager.cx (maintainer)
This commit is contained in:
Dmitry Marakasov 2016-08-31 17:00:56 +00:00
parent 753f79a771
commit 1c7690d885
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=421173
6 changed files with 65 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ftp/rexx-curl/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= curl
PORTVERSION= 2.0
PORTVERSION= 2.0.1
CATEGORIES= ftp
MASTER_SITES= SF/rexx${PORTNAME}/rexx${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= rexx-
@ -31,6 +31,12 @@ DATADIR= ${PREFIX}/share/rexx${PORTNAME}
OPTIONS_DEFINE= DOCS
do-extract:
# avoid extracting circular hard links in distfile!
@${MKDIR} ${WRKDIR}
@tar -x -C ${WRKDIR} --exclude='*common/filterexports*' --exclude='*common/fixrc*' \
-f ${DISTDIR}/${DISTNAME}.tar.gz
post-patch:
@${REINPLACE_CMD} -e "s| -lc | |g" \
-e "/\$.sharedir)\/images/d" \

6
ftp/rexx-curl/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1471614869
SHA256 (RexxCURL-2.0.tar.gz) = 6ada98c9dfa2be459fb6d664829b734360244f00ec943e66f1edd116b4055bea
SIZE (RexxCURL-2.0.tar.gz) = 336923
TIMESTAMP = 1472503050
SHA256 (RexxCURL-2.0.1.tar.gz) = 83b857686af41323f238722dccbb0ded85d1317e7fe95410ebe8978daadaa51a
SIZE (RexxCURL-2.0.1.tar.gz) = 455919

62
ftp/rexx-curl/files/patch-Makefile.in
View File

@ -1,14 +1,14 @@
--- Makefile.in.orig 2012-04-29 00:23:57 UTC
--- Makefile.in.orig 2015-04-12 10:29:42 UTC
+++ Makefile.in
@@ -118,7 +118,6 @@ $(PACKAGE_DIR)/makefile.* $(PACKAGE_DIR)
@@ -120,7 +120,6 @@ $(PACKAGE_DIR)/makefile.* $(PACKAGE_DIR)
$(PACKAGE_DIR)/config.guess $(PACKAGE_DIR)/config.sub $(PACKAGE_DIR)/install-sh $(PACKAGE_DIR)/preinst.rexx \
$(PACKAGE_DIR)/aclocal.m4 $(PACKAGE_DIR)/configure.in $(PACKAGE_DIR)/def2exp.rexx \
$(PACKAGE_DIR)/demo/*.rexx $(PACKAGE_DIR)/demo/README.txt $(PACKAGE_DIR)/makew32.rex \
-$(PACKAGE_DIR)/doc/*.html $(PACKAGE_DIR)/doc/images/*.png \
$(PACKAGE_DIR)/rxcurl64.xpm $(PACKAGE_DIR)/RexxCURL.spec.in \
$(PACKAGE_DIR)/debian/*.regina $(PACKAGE_DIR)/debian/*.oorexx $(PACKAGE_DIR)/debian/copyright $(PACKAGE_DIR)/debian/compat
$(PACKAGE_DIR)/RexxCURL.spec \
$(PACKAGE_DIR)/debian/*.rexxtrans $(PACKAGE_DIR)/debian/*.regina $(PACKAGE_DIR)/debian/*.oorexx $(PACKAGE_DIR)/debian/copyright $(PACKAGE_DIR)/debian/compat $(PACKAGE_DIR)/debian/rules $(PACKAGE_DIR)/debian/control
@@ -229,8 +228,6 @@ $(RXDEFEXP1): $(srcdir)/$(PACKAGE_NAME)w
@@ -231,8 +230,6 @@ $(RXDEFEXP1): $(srcdir)/$(PACKAGE_NAME)w
doco:
mkdir images
@ -17,15 +17,15 @@
zip:
zip rexxcurl$(VER) README INSTALL TODO CPLv1.0.txt HISTORY $(ZIPCSRCFILES) $(ZIPHEADERS) $(ZIPCOMMONFILES)
@@ -239,7 +236,6 @@ zip:
@@ -241,7 +238,6 @@ zip:
zip rexxcurl$(VER) config.guess config.sub install-sh preinst.rexx
zip rexxcurl$(VER) aclocal.m4 configure.in def2exp.rexx
zip rexxcurl$(VER) demo/*.rexx demo/README.txt makew32.rex
- zip rexxcurl$(VER) doc/*.html doc/images/*.png
zip rexxcurl$(VER) debian/*.regina debian/*.oorexx debian/copyright debian/compat
zip rexxcurl$(VER) RexxCURL.spec.in rxcurl64.xpm
zip rexxcurl$(VER) RexxCURL.spec
@@ -265,8 +261,6 @@ installbase: all
@@ -259,8 +255,6 @@ installbase: all
$(INSTALL) -d $(DESTDIR)$(bindir)
$(INSTALL) -d $(DESTDIR)$(libdir)
$(INSTALL) -d $(DESTDIR)$(sharedir)
@ -34,17 +34,17 @@
$(INSTALL) -c -m 755 ./$(PACKAGE_NAME)$(binarybitprefix)$(EXE) $(DESTDIR)$(bindir)/$(PACKAGE_NAME)$(binarybitprefix)$(EXE)
$(INSTALL) -c -m 755 ./rexxcurl-config $(DESTDIR)$(bindir)/rexxcurl-config
-$(INSTALL) -c -m 755 ./$(SHLPRE)$(PACKAGE_NAME)$(SHLPST) $(DESTDIR)$(libdir)/$(SHLPRE)$(PACKAGE_NAME)$(SHLPST)
@@ -286,9 +280,6 @@ installbase: all
$(DESTDIR)$(bindir)/$(PACKAGE_NAME)$(binarybitprefix)$(EXE) $(srcdir)/preinst.rexx $(bindir)/$(PACKAGE_NAME)$(binarybitprefix)$(EXE) $(srcdir)/demo/getright.rexx $(DESTDIR)$(sharedir)/getright.rexx
-chmod 755 $(DESTDIR)$(sharedir)/getright.rexx
@@ -273,9 +267,6 @@ installbase: all
$(INSTALL) -c -m 755 $(srcdir)/demo/upload.rexx $(DESTDIR)$(sharedir)/upload.rexx
$(INSTALL) -c -m 755 $(srcdir)/demo/getright.rexx $(DESTDIR)$(sharedir)/getright.rexx
$(INSTALL) -c -m 644 $(srcdir)/demo/README.txt $(DESTDIR)$(sharedir)/README.txt
- $(INSTALL) -c -m 644 $(srcdocdir)/index.html $(DESTDIR)$(docdir)/index.html
- $(INSTALL) -c -m 644 $(srcdocdir)/images/rxcurl64.png $(DESTDIR)$(docdir)/images/rxcurl64.png
- $(INSTALL) -c -m 644 $(srcdir)/CPLv1.0.txt $(DESTDIR)$(docdir)/CPLv1.0.txt
cygwininstall: installbase
mv $(DESTDIR)$(libdir)/$(SHLPRE)$(PACKAGE_NAME)$(SHLPST) $(DESTDIR)$(bindir)/$(SHLPRE)$(PACKAGE_NAME)$(SHLPST)
@@ -318,8 +309,6 @@ beosinstall: all
uninstall:
rm -f $(DESTDIR)$(bindir)/$(PACKAGE_NAME)$(binarybitprefix)$(EXE)
@@ -313,8 +304,6 @@ beosinstall: all
$(INSTALL) -c -m 644 $(srcdir)/demo/README.txt /boot/home/config/bin/rexx/README-rexxcurl.txt
#
# where to put doc for BeOS ?
@ -53,24 +53,24 @@
#
binary: $(BASE_BINARY)
@@ -330,7 +319,6 @@ binarybase: all
@@ -324,7 +313,6 @@ binarybase: all
-mkdir -p ./tmpdir/bin
-mkdir -p ./tmpdir/lib
-mkdir -p ./tmpdir/rexx
-mkdir -p ./tmpdir/doc/rexxcurl
- -mkdir -p ./tmpdir/doc/rexxcurl/images
-mkdir -p ./tmpdir/share/$(PACKAGE_NAME)
- -mkdir -p ./tmpdir/share/doc/rexxcurl/images
cp $(PACKAGE_NAME)$(binarybitprefix)$(EXE) ./tmpdir/bin
cp $(PACKAGE_NAME)-config ./tmpdir/bin
cp $(SHLPRE)$(PACKAGE_NAME)$(SHLPST) ./tmpdir/lib
@@ -340,8 +328,6 @@ binarybase: all
cp $(srcdir)/INSTALL ./tmpdir/doc/rexxcurl
cp $(srcdir)/README ./tmpdir/doc/rexxcurl
cp $(srcdir)/TODO ./tmpdir/doc/rexxcurl
- cp $(srcdir)/doc/index.html ./tmpdir/doc/rexxcurl
- cp $(srcdir)/doc/images/*.png ./tmpdir/doc/rexxcurl/images
cp $(srcdir)/demo/testcurl.rexx ./tmpdir/rexx/testcurl.rexx
cp $(srcdir)/demo/httppost.rexx ./tmpdir/rexx/httppost.rexx
cp $(srcdir)/demo/getmail-pop3.rexx ./tmpdir/rexx/getmail-pop3.rexx
@@ -359,7 +345,6 @@ cygwinbinary: all
@@ -334,8 +322,6 @@ binarybase: all
cp $(srcdir)/INSTALL ./tmpdir/share/doc/rexxcurl
cp $(srcdir)/README ./tmpdir/share/doc/rexxcurl
cp $(srcdir)/TODO ./tmpdir/share/doc/rexxcurl
- cp $(srcdir)/doc/index.html ./tmpdir/share/doc/rexxcurl
- cp $(srcdir)/doc/images/*.png ./tmpdir/share/doc/rexxcurl/images
cp $(srcdir)/demo/testcurl.rexx ./tmpdir/share/$(PACKAGE_NAME)/testcurl.rexx
cp $(srcdir)/demo/httppost.rexx ./tmpdir/share/$(PACKAGE_NAME)/httppost.rexx
cp $(srcdir)/demo/getmail-pop3.rexx ./tmpdir/share/$(PACKAGE_NAME)/getmail-pop3.rexx
@@ -353,7 +339,6 @@ cygwinbinary: all
-mkdir -p ./tmpdir/lib
-mkdir -p ./tmpdir/rexx
-mkdir -p ./tmpdir/doc/rexxcurl
@ -78,7 +78,7 @@
cp $(PACKAGE_NAME)$(binarybitprefix)$(EXE) ./tmpdir/bin
cp $(SHLPRE)$(PACKAGE_NAME)$(SHLPST) ./tmpdir/bin
cp $(LIBPRE)$(PACKAGE_NAME)$(LIBPST) ./tmpdir/lib
@@ -368,8 +353,6 @@ cygwinbinary: all
@@ -362,8 +347,6 @@ cygwinbinary: all
cp $(srcdir)/INSTALL ./tmpdir/doc/rexxcurl
cp $(srcdir)/README ./tmpdir/doc/rexxcurl
cp $(srcdir)/TODO ./tmpdir/doc/rexxcurl
@ -87,7 +87,7 @@
cp $(srcdir)/demo/testcurl.rexx ./tmpdir/rexx/testcurl.rexx
cp $(srcdir)/demo/httppost.rexx ./tmpdir/rexx/httppost.rexx
cp $(srcdir)/demo/getmail-pop3.rexx ./tmpdir/rexx/getmail-pop3.rexx
@@ -387,7 +370,6 @@ beosbinary: all
@@ -381,7 +364,6 @@ beosbinary: all
-mkdir -p ./tmpdir/lib
-mkdir -p ./tmpdir/add-ons/rexx
-mkdir -p ./tmpdir/doc/rexxcurl
@ -95,7 +95,7 @@
cp $(PACKAGE_NAME)$(binarybitprefix)$(EXE) ./tmpdir/bin
cp $(SHLPRE)$(PACKAGE_NAME)$(SHLPST) ./tmpdir/add-ons/rexx
cp $(LIBPRE)$(PACKAGE_NAME)$(LIBPST) ./tmpdir/lib
@@ -396,8 +378,6 @@ beosbinary: all
@@ -390,8 +372,6 @@ beosbinary: all
cp $(srcdir)/INSTALL ./tmpdir/doc/rexxcurl
cp $(srcdir)/README ./tmpdir/doc/rexxcurl
cp $(srcdir)/TODO ./tmpdir/doc/rexxcurl

2
ftp/rexx-curl/files/patch-common_loader.c
View File

@ -1,4 +1,4 @@
--- common/loader.c.orig 2012-04-20 00:41:50 UTC
--- common/loader.c.orig 2012-08-14 01:16:58 UTC
+++ common/loader.c
@@ -225,6 +225,7 @@ int main
/*

11
ftp/rexx-curl/files/patch-common_rxmt__posix.c
View File

@ -1,11 +0,0 @@
--- common/rxmt_posix.c.orig 2011-05-09 01:25:33 UTC
+++ common/rxmt_posix.c
@@ -163,7 +163,7 @@ RxPackageGlobalDataDef *RxPackInitialize
pthread_setspecific( ThreadIndex, retval );
memset( retval, 0, sizeof(RxPackageGlobalDataDef) );
- retval->MTMalloc = MTMalloc;
+ retval->MTMalloc = (void *(*)(const struct _tsd_t * ,long)) MTMalloc;
retval->MTFree = MTFree;
retval->MTExit = MTExit;

112
ftp/rexx-curl/files/patch-rexxcurl.c
View File

@ -1,61 +1,15 @@
--- rexxcurl.c.orig 2012-04-26 09:56:03 UTC
--- rexxcurl.c.orig 2015-04-11 22:53:39 UTC
+++ rexxcurl.c
@@ -384,7 +384,9 @@ static curl_options RexxCurlOptions[] =
#if LIBCURL_VERSION_NUM >= 0x071301
{ "CERTINFO" ,CURLOPT_CERTINFO ,RXCURLOPT_LONG , NULL },
#endif
+#if 0
{ "CLOSEPOLICY" ,CURLOPT_CLOSEPOLICY ,RXCURLOPT_POLICY , NULL },
+#endif
#if LIBCURL_VERSION_NUM >= 0x070f02
{ "CONNECTONLY" ,CURLOPT_CONNECT_ONLY ,RXCURLOPT_LONG , NULL },
#endif
@@ -489,8 +491,13 @@ static curl_options RexxCurlOptions[] =
{ "GSSAPIDELEGATION",CURLOPT_GSSAPI_DELEGATION,RXCURLOPT_GSSAPI_DELEGATION , NULL },
#endif
{ "HEADER" ,CURLOPT_HEADER ,RXCURLOPT_BOOL , NULL },
+#if LIBCURL_VERSION_NUM >= 0x070907
+ { "HEADERFILE" ,CURLOPT_HEADERDATA ,RXCURLOPT_OUTFILE , NULL },
+ { "HEADERSTEM" ,CURLOPT_HEADERDATA ,RXCURLOPT_HEADERSTEM , NULL },
+#else
{ "HEADERFILE" ,CURLOPT_WRITEHEADER ,RXCURLOPT_OUTFILE , NULL },
{ "HEADERSTEM" ,CURLOPT_WRITEHEADER ,RXCURLOPT_HEADERSTEM , NULL },
+#endif
#if LIBCURL_VERSION_NUM >= 0x070a03
{ "HTTP200ALIASES" ,CURLOPT_HTTP200ALIASES ,RXCURLOPT_LIST , NULL },
#endif
@@ -517,9 +524,17 @@ static curl_options RexxCurlOptions[] =
#if LIBCURL_VERSION_NUM >= 0x070e01
{ "IGNORECONTENTLENGTH",CURLOPT_IGNORE_CONTENT_LENGTH,RXCURLOPT_LONG, NULL },
#endif
+#if LIBCURL_VERSION_NUM >= 0x070907
+ { "INFILE" ,CURLOPT_READDATA ,RXCURLOPT_INFILE , NULL },
+#else
{ "INFILE" ,CURLOPT_INFILE ,RXCURLOPT_INFILE , NULL },
+#endif
{ "INTERFACE" ,CURLOPT_INTERFACE ,RXCURLOPT_STRING , NULL },
+#if LIBCURL_VERSION_NUM >= 0x070907
+ { "INSTEM" ,CURLOPT_READDATA ,RXCURLOPT_INSTEM , NULL },
+#else
{ "INSTEM" ,CURLOPT_INFILE ,RXCURLOPT_INSTEM , NULL },
+#endif
#if LIBCURL_VERSION_NUM >= 0x070a08
{ "IPRESOLVE" ,CURLOPT_IPRESOLVE ,RXCURLOPT_IPRESOLVE , NULL },
#endif
@@ -576,8 +591,10 @@ static curl_options RexxCurlOptions[] =
#if LIBCURL_VERSION_NUM >= 0x070a02
{ "NOSIGNAL" ,CURLOPT_NOSIGNAL ,RXCURLOPT_BOOL , NULL },
#endif
- { "OUTFILE" ,CURLOPT_FILE ,RXCURLOPT_OUTFILE , NULL },
- { "OUTSTEM" ,CURLOPT_FILE ,RXCURLOPT_OUTSTEM , NULL },
+#if LIBCURL_VERSION_NUM >= 0x070907
+ { "OUTFILE" ,CURLOPT_WRITEDATA ,RXCURLOPT_OUTFILE , NULL },
+ { "OUTSTEM" ,CURLOPT_WRITEDATA ,RXCURLOPT_OUTSTEM , NULL },
+#endif
#if LIBCURL_VERSION_NUM >= 0x071301
{ "PASSWORD" ,CURLOPT_PASSWORD ,RXCURLOPT_STRING , NULL },
#endif
@@ -1269,7 +1286,7 @@ void RexxCURLSetVersionInfoConstants( Rx
@@ -53,6 +53,8 @@
* internal error set N/A
* cURL runtime errors -1 set
*/
+#pragma clang diagnostic ignored "-Wincompatible-pointer-types-discards-qualifiers"
+
#ifdef HAVE_CONFIG_H
# include "config.h"
#else
@@ -1366,7 +1368,7 @@ void RexxCURLSetVersionInfoConstants( Rx
valuelen = 0;
namelen = sprintf( name, "%sLIBSSH_VERSION", RxGetConstantPrefix( RxPackageGlobalData ) );
#if LIBCURL_VERSION_NUM >= 0x071001
@ -64,35 +18,15 @@
valuelen = (version_info->libssh_version) ? strlen( version_info->libssh_version ) : 0;
#endif
SetRexxVariable( RxPackageGlobalData, name, namelen, support, valuelen );
@@ -2273,9 +2290,10 @@ rxfunc( CurlSetopt )
SetCURLError( RxPackageGlobalData, curl_rc, curl_errors[rc] );
break;
}
+#if LIBCURL_VERSION_NUMBER > 0x070907
switch ( RexxCurlOptions[opt].number )
{
- case CURLOPT_FILE:
+ case CURLOPT_WRITEDATA:
if ( argv[2].strlength )
{
/*
@@ -2293,6 +2311,7 @@ rxfunc( CurlSetopt )
default:
break;
}
+#endif
break;
case RXCURLOPT_INFILE:
/* parameter must be the name of a file to read from or blank to turn it off */
@@ -2317,7 +2336,11 @@ rxfunc( CurlSetopt )
*/
switch ( RexxCurlOptions[opt].number )
{
+#if LIBCURL_VERSION_NUM >= 0x070907
+ case CURLOPT_READDATA:
+#else
case CURLOPT_INFILE:
+#endif
/*
* Always set the file size for the specified INFILE
*/
@@ -1841,9 +1843,9 @@ int rexxcurl_sshkey_callback( CURL *easy
if ( argv == NULL )
return -1;
- rx_knownkeylength_len = sprintf( rx_knownkeylength, "%lu", knownkey->len );
+ rx_knownkeylength_len = sprintf( rx_knownkeylength, "%lu", (unsigned long) knownkey->len );
rx_knownkeytype_len = sprintf( rx_knownkeytype, "%u", knownkey->keytype );
- rx_foundkeylength_len = sprintf( rx_foundkeylength, "%lu", foundkey->len );
+ rx_foundkeylength_len = sprintf( rx_foundkeylength, "%lu", (unsigned long) foundkey->len );
rx_foundkeytype_len = sprintf( rx_foundkeytype, "%u", foundkey->keytype );
rx_libcurlviewofkey_len = sprintf( rx_libcurlviewofkey, "%u", match );