Date: Mon, 8 Apr 2019 17:47:09 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r498399 - in head/ftp/rexx-curl: . files Message-ID: <201904081747.x38Hl9fh032777@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Mon Apr 8 17:47:09 2019 New Revision: 498399 URL: https://svnweb.freebsd.org/changeset/ports/498399 Log: ftp/rexx-curl: Update to 2.1.0 and fix LLD_UNSAFE PR: 237076 Submitted by: bob@eager.cx (maintainer) Deleted: head/ftp/rexx-curl/files/patch-common_loader.c Modified: head/ftp/rexx-curl/Makefile (contents, props changed) head/ftp/rexx-curl/distinfo (contents, props changed) head/ftp/rexx-curl/files/patch-Makefile.in (contents, props changed) head/ftp/rexx-curl/files/patch-rexxcurl.c (contents, props changed) head/ftp/rexx-curl/pkg-plist (contents, props changed) Modified: head/ftp/rexx-curl/Makefile ============================================================================== --- head/ftp/rexx-curl/Makefile Mon Apr 8 17:42:15 2019 (r498398) +++ head/ftp/rexx-curl/Makefile Mon Apr 8 17:47:09 2019 (r498399) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= curl -PORTVERSION= 2.0.1 -PORTREVISION= 1 +PORTVERSION= 2.1.0 CATEGORIES= ftp MASTER_SITES= SF/rexx${PORTNAME}/rexx${PORTNAME}/${PORTVERSION} PKGNAMEPREFIX= rexx- @@ -23,37 +22,34 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ RUN_DEPENDS= rexx:lang/rexx-regina USES= gmake + GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-rexx=regina +CONFIGURE_ARGS= --with-rexx=regina LDFLAGS=-L/usr/lib USE_LDCONFIG= yes -LLD_UNSAFE= yes -DOCSDIR= ${PREFIX}/share/doc/rexx${PORTNAME} +OPTIONS_DEFINE= DOCS EXAMPLES + DATADIR= ${PREFIX}/share/rexx${PORTNAME} +DOCSDIR= ${PREFIX}/share/doc/rexx${PORTNAME} +EXAMPLESDIR= ${PREFIX}/share/examples/rexx${PORTNAME} -OPTIONS_DEFINE= DOCS +DOCFILES= getright.rexx getmail-pop3.rexx httppost.rexx scp.rexx \ + sendmail-smtp.rexx testcurl.rexx upload.rexx README.txt +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/rexxcurl ${STAGEDIR}${PREFIX}/bin + ${INSTALL_LIB} ${WRKSRC}/librexxcurl.so ${STAGEDIR}${PREFIX}/lib + ${INSTALL_DATA} ${WRKSRC}/librexxcurl.a ${STAGEDIR}${PREFIX}/lib -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" \ - -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: +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/index.html ${STAGEDIR}${DOCSDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR}/images ${INSTALL_DATA} ${WRKSRC}/doc/images/rxcurl64.png ${STAGEDIR}${DOCSDIR}/images + +do-install-EXAMPLES-on: + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} +.for f in ${DOCFILES} + ${INSTALL_DATA} ${WRKSRC}/demo/$f ${STAGEDIR}${EXAMPLESDIR} +.endfor .include <bsd.port.mk> Modified: head/ftp/rexx-curl/distinfo ============================================================================== --- head/ftp/rexx-curl/distinfo Mon Apr 8 17:42:15 2019 (r498398) +++ head/ftp/rexx-curl/distinfo Mon Apr 8 17:47:09 2019 (r498399) @@ -1,3 +1,3 @@ -TIMESTAMP = 1472503050 -SHA256 (RexxCURL-2.0.1.tar.gz) = 83b857686af41323f238722dccbb0ded85d1317e7fe95410ebe8978daadaa51a -SIZE (RexxCURL-2.0.1.tar.gz) = 455919 +TIMESTAMP = 1554585945 +SHA256 (RexxCURL-2.1.0.tar.gz) = 734b7d733ceda0f2c189f99b54f0a86e98cb5f04269c726a4b6873c94f1a46a5 +SIZE (RexxCURL-2.1.0.tar.gz) = 461774 Modified: head/ftp/rexx-curl/files/patch-Makefile.in ============================================================================== --- head/ftp/rexx-curl/files/patch-Makefile.in Mon Apr 8 17:42:15 2019 (r498398) +++ head/ftp/rexx-curl/files/patch-Makefile.in Mon Apr 8 17:47:09 2019 (r498399) @@ -1,23 +1,14 @@ ---- Makefile.in.orig 2015-04-12 10:29:42 UTC +--- Makefile.in.orig 2019-02-10 22:01:43 UTC +++ Makefile.in -@@ -120,7 +120,6 @@ $(PACKAGE_DIR)/makefile.* $(PACKAGE_DIR) +@@ -123,7 +123,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)/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 + $(PACKAGE_DIR)/debian/control.rexxtrans $(PACKAGE_DIR)/debian/control.regina $(PACKAGE_DIR)/debian/control.oorexx $(PACKAGE_DIR)/debian/copyright $(PACKAGE_DIR)/debian/compat $(PACKAGE_DIR)/debian/rules.in -@@ -231,8 +230,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) -@@ -241,7 +238,6 @@ zip: +@@ -243,7 +242,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 @@ -25,26 +16,7 @@ zip rexxcurl$(VER) debian/*.regina debian/*.oorexx debian/copyright debian/compat zip rexxcurl$(VER) RexxCURL.spec -@@ -259,8 +255,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) -@@ -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 - - uninstall: - rm -f $(DESTDIR)$(bindir)/$(PACKAGE_NAME)$(binarybitprefix)$(EXE) -@@ -313,8 +304,6 @@ beosinstall: all +@@ -331,8 +329,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,7 +25,7 @@ # binary: $(BASE_BINARY) -@@ -324,7 +313,6 @@ binarybase: all +@@ -342,7 +338,6 @@ binarybase: all -mkdir -p ./tmpdir/bin -mkdir -p ./tmpdir/lib -mkdir -p ./tmpdir/share/$(PACKAGE_NAME) @@ -61,7 +33,7 @@ cp $(PACKAGE_NAME)$(binarybitprefix)$(EXE) ./tmpdir/bin cp $(PACKAGE_NAME)-config ./tmpdir/bin cp $(SHLPRE)$(PACKAGE_NAME)$(SHLPST) ./tmpdir/lib -@@ -334,8 +322,6 @@ binarybase: all +@@ -352,8 +347,6 @@ binarybase: all cp $(srcdir)/INSTALL ./tmpdir/share/doc/rexxcurl cp $(srcdir)/README ./tmpdir/share/doc/rexxcurl cp $(srcdir)/TODO ./tmpdir/share/doc/rexxcurl @@ -70,7 +42,7 @@ 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 +@@ -371,7 +364,6 @@ cygwinbinary: all -mkdir -p ./tmpdir/lib -mkdir -p ./tmpdir/rexx -mkdir -p ./tmpdir/doc/rexxcurl @@ -78,7 +50,7 @@ cp $(PACKAGE_NAME)$(binarybitprefix)$(EXE) ./tmpdir/bin cp $(SHLPRE)$(PACKAGE_NAME)$(SHLPST) ./tmpdir/bin cp $(LIBPRE)$(PACKAGE_NAME)$(LIBPST) ./tmpdir/lib -@@ -362,8 +347,6 @@ cygwinbinary: all +@@ -380,8 +372,6 @@ cygwinbinary: all cp $(srcdir)/INSTALL ./tmpdir/doc/rexxcurl cp $(srcdir)/README ./tmpdir/doc/rexxcurl cp $(srcdir)/TODO ./tmpdir/doc/rexxcurl @@ -87,7 +59,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 -@@ -381,7 +364,6 @@ beosbinary: all +@@ -399,7 +389,6 @@ beosbinary: all -mkdir -p ./tmpdir/lib -mkdir -p ./tmpdir/add-ons/rexx -mkdir -p ./tmpdir/doc/rexxcurl @@ -95,7 +67,7 @@ cp $(PACKAGE_NAME)$(binarybitprefix)$(EXE) ./tmpdir/bin cp $(SHLPRE)$(PACKAGE_NAME)$(SHLPST) ./tmpdir/add-ons/rexx cp $(LIBPRE)$(PACKAGE_NAME)$(LIBPST) ./tmpdir/lib -@@ -390,8 +372,6 @@ beosbinary: all +@@ -408,8 +397,6 @@ beosbinary: all cp $(srcdir)/INSTALL ./tmpdir/doc/rexxcurl cp $(srcdir)/README ./tmpdir/doc/rexxcurl cp $(srcdir)/TODO ./tmpdir/doc/rexxcurl Modified: head/ftp/rexx-curl/files/patch-rexxcurl.c ============================================================================== --- head/ftp/rexx-curl/files/patch-rexxcurl.c Mon Apr 8 17:42:15 2019 (r498398) +++ head/ftp/rexx-curl/files/patch-rexxcurl.c Mon Apr 8 17:47:09 2019 (r498399) @@ -1,6 +1,6 @@ ---- rexxcurl.c.orig 2015-04-11 22:53:39 UTC +--- rexxcurl.c.orig 2019-02-10 22:51:41 UTC +++ rexxcurl.c -@@ -53,6 +53,8 @@ +@@ -52,6 +52,8 @@ * internal error set N/A * cURL runtime errors -1 set */ @@ -9,16 +9,7 @@ #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 -- 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 ); -@@ -1841,9 +1843,9 @@ int rexxcurl_sshkey_callback( CURL *easy +@@ -1879,9 +1881,9 @@ int rexxcurl_sshkey_callback( CURL *easy if ( argv == NULL ) return -1; @@ -30,3 +21,18 @@ rx_foundkeytype_len = sprintf( rx_foundkeytype, "%u", foundkey->keytype ); rx_libcurlviewofkey_len = sprintf( rx_libcurlviewofkey, "%u", match ); +@@ -1964,11 +1966,11 @@ int debug_function( CURL *handle, curl_i + int c; + char *prefix = "*<><><>"; + if ( type == CURLINFO_TEXT ) +- fprintf( fp, "text: %c %.*s", prefix[type],size, data ); ++ fprintf( fp, "text: %c %.*s", prefix[type],(int)size, data ); + if ( type == CURLINFO_HEADER_IN ) +- fprintf( fp, "header_in: %c %.*s", prefix[type],size, data ); ++ fprintf( fp, "header_in: %c %.*s", prefix[type],(int)size, data ); + if ( type == CURLINFO_HEADER_OUT ) +- fprintf( fp, "header_out:%c %.*s", prefix[type],size, data ); ++ fprintf( fp, "header_out:%c %.*s", prefix[type],(int)size, data ); + if ( type == CURLINFO_SSL_DATA_IN ) + { + fprintf( fp, "ssl_data_in: " ); Modified: head/ftp/rexx-curl/pkg-plist ============================================================================== --- head/ftp/rexx-curl/pkg-plist Mon Apr 8 17:42:15 2019 (r498398) +++ head/ftp/rexx-curl/pkg-plist Mon Apr 8 17:47:09 2019 (r498399) @@ -1,14 +1,13 @@ bin/rexxcurl -bin/rexxcurl-config lib/librexxcurl.a 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%%/scp.rexx -%%DATADIR%%/sendmail-smtp.rexx -%%DATADIR%%/testcurl.rexx -%%DATADIR%%/upload.rexx +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.txt +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/getmail-pop3.rexx +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/getright.rexx +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/httppost.rexx +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scp.rexx +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sendmail-smtp.rexx +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testcurl.rexx +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/upload.rexx
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904081747.x38Hl9fh032777>