From owner-svn-ports-head@freebsd.org Fri Aug 19 13:55:58 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5A1B8BBFDB8; Fri, 19 Aug 2016 13:55:58 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 21AC91A31; Fri, 19 Aug 2016 13:55:58 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7JDtv9h038787; Fri, 19 Aug 2016 13:55:57 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7JDtuBa038777; Fri, 19 Aug 2016 13:55:56 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201608191355.u7JDtuBa038777@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 19 Aug 2016 13:55:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420469 - in head: . ftp ftp/rexx-curl ftp/rexx-curl/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Aug 2016 13:55:58 -0000 Author: amdmi3 Date: Fri Aug 19 13:55:56 2016 New Revision: 420469 URL: https://svnweb.freebsd.org/changeset/ports/420469 Log: - Resurrect ftp/rexx-curl Rexx/CURL is an external function package providing an interface to the cURL package. cURL is a general purpose package that allows access to any URL-addressable resource. With Rexx/CURL you can access resources such as web pages, ftp sites, and telnet sessions under control of your Rexx program. WWW: http://rexxcurl.sourceforge.net/ PR: 211920 Submitted by: bob@eager.cx Added: head/ftp/rexx-curl/ - copied from r378067, head/ftp/rexx-curl/ head/ftp/rexx-curl/files/patch-Makefile.in (contents, props changed) head/ftp/rexx-curl/files/patch-common_loader.c (contents, props changed) head/ftp/rexx-curl/files/patch-common_rxmt__posix.c (contents, props changed) Deleted: head/ftp/rexx-curl/files/patch-configure Modified: head/MOVED head/ftp/Makefile head/ftp/rexx-curl/Makefile head/ftp/rexx-curl/distinfo head/ftp/rexx-curl/files/patch-rexxcurl.c head/ftp/rexx-curl/pkg-plist Modified: head/MOVED ============================================================================== --- head/MOVED Fri Aug 19 13:51:11 2016 (r420468) +++ head/MOVED Fri Aug 19 13:55:56 2016 (r420469) @@ -7379,7 +7379,6 @@ audio/qmidinet||2015-01-28|Has expired: audio/wmauda||2015-01-28|Has expired: Broken for more than 6 months audio/x11amp||2015-01-28|Has expired: Broken for more than 6 months devel/p5-Log-Any-Adapter|devel/p5-Log-Any|2015-01-28|Has expired: devel/p5-Log-Any-Adapter merged into devel/p5-Log-Any by upstream -ftp/rexx-curl||2015-01-28|Has expired: Broken for more than 6 months net-im/pidgin-audacious-remote||2015-01-28|Has expired: Broken for more than 6 months www/lifetype||2015-01-28|Has expired: Broken for more than 6 months www/ump||2015-01-28|Has expired: Broken for more than 6 months Modified: head/ftp/Makefile ============================================================================== --- head/ftp/Makefile Fri Aug 19 13:51:11 2016 (r420468) +++ head/ftp/Makefile Fri Aug 19 13:55:56 2016 (r420469) @@ -81,6 +81,7 @@ SUBDIR += py-pyftpdlib SUBDIR += py-tftpy SUBDIR += quftp + SUBDIR += rexx-curl SUBDIR += rubygem-curb SUBDIR += scythia SUBDIR += smbftpd Modified: head/ftp/rexx-curl/Makefile ============================================================================== --- head/ftp/rexx-curl/Makefile Wed Jan 28 15:54:08 2015 (r378067) +++ head/ftp/rexx-curl/Makefile Fri Aug 19 13:55:56 2016 (r420469) @@ -2,41 +2,47 @@ # $FreeBSD$ PORTNAME= curl -PORTVERSION= 1.4 -PORTREVISION= 4 +PORTVERSION= 2.0 CATEGORIES= ftp MASTER_SITES= SF/rexx${PORTNAME}/rexx${PORTNAME}/${PORTVERSION} PKGNAMEPREFIX= rexx- DISTNAME= RexxCURL-${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= bob@eager.cx COMMENT= External function package providing an interface to the cURL package -BROKEN= Fails to install/package with new rexx-regina -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2015-01-26 - -OPTIONS_DEFINE= DOCS - -BUILD_DEPENDS= rexx:${PORTSDIR}/lang/rexx-regina -LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl -RUN_DEPENDS= rexx:${PORTSDIR}/lang/rexx-regina +LICENSE= CPLV1 +LICENSE_NAME= CPL V1.0 license +LICENSE_FILE= ${WRKSRC}/CPLv1.0.txt +LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept + +BUILD_DEPENDS= rexx:lang/rexx-regina +LIB_DEPENDS= libcurl.so:ftp/curl \ + libregina.so:lang/rexx-regina +RUN_DEPENDS= rexx:lang/rexx-regina USES= gmake GNU_CONFIGURE= yes -CPPFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} CONFIGURE_ARGS= --with-rexx=regina USE_LDCONFIG= yes DOCSDIR= ${PREFIX}/share/doc/rexx${PORTNAME} DATADIR= ${PREFIX}/share/rexx${PORTNAME} +OPTIONS_DEFINE= DOCS + post-patch: - @${REINPLACE_CMD} -e "s| -lc | |g" -e "/\$(sharedir)\/images/d" \ - -e "/index.html/d" -e "/rxcurl64.png/d" ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e "s| -lc | |g" \ + -e "/\$.sharedir)\/images/d" \ + -e "/index.html/d" \ + -e "/rxcurl64.png/d" \ + ${WRKSRC}/Makefile.in post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/rexxcurl + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/librexxcurl.so + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/index.html ${STAGEDIR}${DOCSDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR}/images Modified: head/ftp/rexx-curl/distinfo ============================================================================== --- head/ftp/rexx-curl/distinfo Wed Jan 28 15:54:08 2015 (r378067) +++ head/ftp/rexx-curl/distinfo Fri Aug 19 13:55:56 2016 (r420469) @@ -1,2 +1,3 @@ -SHA256 (RexxCURL-1.4.tar.gz) = c40ce301494c0d1b369e45bf36cff55635d3c0e57431857d8c4f5693ac06dc41 -SIZE (RexxCURL-1.4.tar.gz) = 249692 +TIMESTAMP = 1471614869 +SHA256 (RexxCURL-2.0.tar.gz) = 6ada98c9dfa2be459fb6d664829b734360244f00ec943e66f1edd116b4055bea +SIZE (RexxCURL-2.0.tar.gz) = 336923 Added: head/ftp/rexx-curl/files/patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ftp/rexx-curl/files/patch-Makefile.in Fri Aug 19 13:55:56 2016 (r420469) @@ -0,0 +1,106 @@ +--- Makefile.in.orig 2012-04-29 00:23:57 UTC ++++ Makefile.in +@@ -118,7 +118,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 + +@@ -229,8 +228,6 @@ $(RXDEFEXP1): $(srcdir)/$(PACKAGE_NAME)w + + doco: + mkdir images +- cp $(srcdocdir)/index.html . +- cp $(srcdocdir)/images/*.png images + + zip: + zip rexxcurl$(VER) README INSTALL TODO CPLv1.0.txt HISTORY $(ZIPCSRCFILES) $(ZIPHEADERS) $(ZIPCOMMONFILES) +@@ -239,7 +236,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 + +@@ -265,8 +261,6 @@ installbase: all + $(INSTALL) -d $(DESTDIR)$(bindir) + $(INSTALL) -d $(DESTDIR)$(libdir) + $(INSTALL) -d $(DESTDIR)$(sharedir) +- $(INSTALL) -d $(DESTDIR)$(docdir) +- $(INSTALL) -d $(DESTDIR)$(docdir)/images + $(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 + $(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 + $(INSTALL) -c -m 644 $(srcdir)/demo/README.txt /boot/home/config/bin/rexx/README-rexxcurl.txt + # + # where to put doc for BeOS ? +-# $(INSTALL) -c -m 644 $(docdir)/index.html $(DESTDIR)$(sharedir)/index.html +-# $(INSTALL) -c -m 644 $(docdir)/images/rxcurl64.png $(DESTDIR)$(sharedir)/images/rxcurl64.png + # + + binary: $(BASE_BINARY) +@@ -330,7 +319,6 @@ binarybase: all + -mkdir -p ./tmpdir/lib + -mkdir -p ./tmpdir/rexx + -mkdir -p ./tmpdir/doc/rexxcurl +- -mkdir -p ./tmpdir/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 + -mkdir -p ./tmpdir/lib + -mkdir -p ./tmpdir/rexx + -mkdir -p ./tmpdir/doc/rexxcurl +- -mkdir -p ./tmpdir/doc/rexxcurl/images + 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 + 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 +@@ -387,7 +370,6 @@ beosbinary: all + -mkdir -p ./tmpdir/lib + -mkdir -p ./tmpdir/add-ons/rexx + -mkdir -p ./tmpdir/doc/rexxcurl +- -mkdir -p ./tmpdir/doc/rexxcurl/images + 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 + 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 Added: head/ftp/rexx-curl/files/patch-common_loader.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ftp/rexx-curl/files/patch-common_loader.c Fri Aug 19 13:55:56 2016 (r420469) @@ -0,0 +1,10 @@ +--- common/loader.c.orig 2012-04-20 00:41:50 UTC ++++ common/loader.c +@@ -225,6 +225,7 @@ int main + /* + * Get any program options. + */ ++ optind = 1; /* Previously clobbered by regina */ + while ((c = getopt(argc, argv, "Dudivh?f:")) != EOF) + { + switch (c) Added: head/ftp/rexx-curl/files/patch-common_rxmt__posix.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ftp/rexx-curl/files/patch-common_rxmt__posix.c Fri Aug 19 13:55:56 2016 (r420469) @@ -0,0 +1,11 @@ +--- 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; + Modified: head/ftp/rexx-curl/files/patch-rexxcurl.c ============================================================================== --- head/ftp/rexx-curl/files/patch-rexxcurl.c Wed Jan 28 15:54:08 2015 (r378067) +++ head/ftp/rexx-curl/files/patch-rexxcurl.c Fri Aug 19 13:55:56 2016 (r420469) @@ -1,11 +1,98 @@ ---- rexxcurl.c.orig Tue Dec 5 16:30:55 2006 -+++ rexxcurl.c Tue Dec 5 16:31:14 2006 -@@ -323,7 +323,7 @@ - { "RANGE" ,CURLOPT_RANGE ,RXCURLOPT_STRING }, - { "REFERER" ,CURLOPT_REFERER ,RXCURLOPT_STRING }, - { "RESUMEFROM" ,CURLOPT_RESUME_FROM ,RXCURLOPT_LONGLONG }, --#if LIBCURL_VERSION_NUM >= 0x070d00 -+#if LIBCURL_VERSION_NUM >= 0x070d00 && LIBCURL_VERSION_NUM < 0x071000 - { "SOURCEPOSTQUOTE" ,CURLOPT_SOURCE_POSTQUOTE,RXCURLOPT_LIST }, - { "SOURCEPREQUOTE" ,CURLOPT_SOURCE_PREQUOTE ,RXCURLOPT_LIST }, - { "SOURCEQUOTE" ,CURLOPT_SOURCE_QUOTE ,RXCURLOPT_LIST }, +--- rexxcurl.c.orig 2012-04-26 09:56:03 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 + valuelen = 0; + namelen = sprintf( name, "%sLIBSSH_VERSION", RxGetConstantPrefix( RxPackageGlobalData ) ); + #if LIBCURL_VERSION_NUM >= 0x071001 +- support = version_info->libssh_version; ++ support = (char *) version_info->libssh_version; + 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 + */ Modified: head/ftp/rexx-curl/pkg-plist ============================================================================== --- head/ftp/rexx-curl/pkg-plist Wed Jan 28 15:54:08 2015 (r378067) +++ head/ftp/rexx-curl/pkg-plist Fri Aug 19 13:55:56 2016 (r420469) @@ -5,9 +5,10 @@ lib/librexxcurl.so %%PORTDOCS%%%%DOCSDIR%%/images/rxcurl64.png %%PORTDOCS%%%%DOCSDIR%%/index.html %%DATADIR%%/README.txt +%%DATADIR%%/getmail-pop3.rexx %%DATADIR%%/getright.rexx %%DATADIR%%/httppost.rexx -%%DATADIR%%/mirror.rexx %%DATADIR%%/scp.rexx +%%DATADIR%%/sendmail-smtp.rexx %%DATADIR%%/testcurl.rexx %%DATADIR%%/upload.rexx