Attachment #203445 for bug #237076

View | Details | Raw Unified | Return to bug 237076
Collapse All | Expand All




# $FreeBSD: head/ftp/rexx-curl/Makefile 485910 2018-11-26 01:48:42Z swills $

PORTNAME=	curl
PORTVERSION=	2.1.0
PORTREVISION=	1
CATEGORIES=	ftp
MASTER_SITES=	SF/rexx${PORTNAME}/rexx${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX=	rexx-

RUN_DEPENDS=	rexx:lang/rexx-regina

USES=		gmake

GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--with-rexx=regina LDFLAGS=-L/usr/lib
USE_LDCONFIG=	yes
LLD_UNSAFE=	yes

OPTIONS_DEFINE=	DOCS EXAMPLES
DATADIR=	${PREFIX}/share/rexx${PORTNAME}

DATADIR=	${PREFIX}/share/rexx${PORTNAME}
DOCSDIR=	${PREFIX}/share/doc/rexx${PORTNAME}
EXAMPLESDIR=	${PREFIX}/share/examples/rexx${PORTNAME}

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
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

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>

Lines 1-3 Link Here

(-)./distinfo (-3 / +3 lines)
1	TIMESTAMP = 1472503050	1	TIMESTAMP = 1554585945
2	SHA256 (RexxCURL-2.0.1.tar.gz) = 83b857686af41323f238722dccbb0ded85d1317e7fe95410ebe8978daadaa51a	2	SHA256 (RexxCURL-2.1.0.tar.gz) = 734b7d733ceda0f2c189f99b54f0a86e98cb5f04269c726a4b6873c94f1a46a5
3	SIZE (RexxCURL-2.0.1.tar.gz) = 455919	3	SIZE (RexxCURL-2.1.0.tar.gz) = 461774




--- Makefile.in.orig	2019-02-10 22:01:43 UTC
+++ Makefile.in
@@ -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/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
 
@@ -243,7 +242,6 @@ zip:
 
 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:
 	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) debian/*.regina debian/*.oorexx debian/copyright debian/compat
 	zip rexxcurl$(VER) RexxCURL.spec
 
@@ -331,8 +329,6 @@ beosinstall: 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
 	$(INSTALL) -c -m 644 $(srcdir)/demo/README.txt /boot/home/config/bin/rexx/README-rexxcurl.txt
 #
 # where to put doc for BeOS ?

 #
 
 binary: $(BASE_BINARY)
@@ -342,7 +338,6 @@ binarybase: all
 	-mkdir -p ./tmpdir/bin
 	-mkdir -p ./tmpdir/lib
 	-mkdir -p ./tmpdir/share/$(PACKAGE_NAME)

 	cp $(PACKAGE_NAME)$(binarybitprefix)$(EXE) ./tmpdir/bin
 	cp $(PACKAGE_NAME)-config ./tmpdir/bin
 	cp $(SHLPRE)$(PACKAGE_NAME)$(SHLPST) ./tmpdir/lib
@@ -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

 	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
@@ -371,7 +364,6 @@ cygwinbinary: all
 	-mkdir -p ./tmpdir/lib
 	-mkdir -p ./tmpdir/rexx
 	-mkdir -p ./tmpdir/doc/rexxcurl

 	cp $(PACKAGE_NAME)$(binarybitprefix)$(EXE) ./tmpdir/bin
 	cp $(SHLPRE)$(PACKAGE_NAME)$(SHLPST) ./tmpdir/bin
 	cp $(LIBPRE)$(PACKAGE_NAME)$(LIBPST) ./tmpdir/lib
@@ -380,8 +372,6 @@ cygwinbinary: all
 	cp $(srcdir)/INSTALL ./tmpdir/doc/rexxcurl
 	cp $(srcdir)/README ./tmpdir/doc/rexxcurl
 	cp $(srcdir)/TODO ./tmpdir/doc/rexxcurl

 	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
@@ -399,7 +389,6 @@ beosbinary: all
 	-mkdir -p ./tmpdir/lib
 	-mkdir -p ./tmpdir/add-ons/rexx
 	-mkdir -p ./tmpdir/doc/rexxcurl

 	cp $(PACKAGE_NAME)$(binarybitprefix)$(EXE) ./tmpdir/bin
 	cp $(SHLPRE)$(PACKAGE_NAME)$(SHLPST) ./tmpdir/add-ons/rexx
 	cp $(LIBPRE)$(PACKAGE_NAME)$(LIBPST) ./tmpdir/lib
@@ -408,8 +397,6 @@ beosbinary: all
 	cp $(srcdir)/INSTALL ./tmpdir/doc/rexxcurl
 	cp $(srcdir)/README ./tmpdir/doc/rexxcurl
 	cp $(srcdir)/TODO ./tmpdir/doc/rexxcurl

Lines 1-10 Link Here

(-)./files/patch-common_loader.c (-10 lines)
1	--- common/loader.c.orig 2012-08-14 01:16:58 UTC
2	+++ common/loader.c
3	@@ -225,6 +225,7 @@ int main
4	/*
5	* Get any program options.
6	*/
7	+ optind = 1; /* Previously clobbered by regina */
8	while ((c = getopt(argc, argv, "Dudivh?f:")) != EOF)
9	{
10	switch (c)




--- rexxcurl.c.orig	2019-02-10 22:51:41 UTC
+++ rexxcurl.c
@@ -52,6 +52,8 @@
  * internal error                   set                 N/A
  * cURL runtime errors              -1                  set
  */

 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #else
@@ -1879,9 +1881,9 @@ int rexxcurl_sshkey_callback( CURL *easy
    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
       if ( argv == NULL )
          return -1;
 

       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: " );




bin/rexxcurl
bin/rexxcurl-config
lib/librexxcurl.a
lib/librexxcurl.so
%%PORTDOCS%%%%DOCSDIR%%/images/rxcurl64.png
%%PORTDOCS%%%%DOCSDIR%%/index.html
%%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

Return to bug 237076

Lines 2-9 Link Here

(-)./Makefile (-24 / +20 lines)
2	# $FreeBSD: head/ftp/rexx-curl/Makefile 485910 2018-11-26 01:48:42Z swills $	2	# $FreeBSD: head/ftp/rexx-curl/Makefile 485910 2018-11-26 01:48:42Z swills $
3		3
4	PORTNAME= curl	4	PORTNAME= curl
5	PORTVERSION= 2.0.1	5	PORTVERSION= 2.1.0
6	PORTREVISION= 1
7	CATEGORIES= ftp	6	CATEGORIES= ftp
8	MASTER_SITES= SF/rexx${PORTNAME}/rexx${PORTNAME}/${PORTVERSION}	7	MASTER_SITES= SF/rexx${PORTNAME}/rexx${PORTNAME}/${PORTVERSION}
9	PKGNAMEPREFIX= rexx-	8	PKGNAMEPREFIX= rexx-
Lines 23-59 Link Here
23	RUN_DEPENDS= rexx:lang/rexx-regina	22	RUN_DEPENDS= rexx:lang/rexx-regina
24		23
25	USES= gmake	24	USES= gmake
		25
26	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes
27	CONFIGURE_ARGS= --with-rexx=regina	27	CONFIGURE_ARGS= --with-rexx=regina LDFLAGS=-L/usr/lib
28	USE_LDCONFIG= yes	28	USE_LDCONFIG= yes
29	LLD_UNSAFE= yes
30		29
31	DOCSDIR= ${PREFIX}/share/doc/rexx${PORTNAME}	30	OPTIONS_DEFINE= DOCS EXAMPLES
32	DATADIR= ${PREFIX}/share/rexx${PORTNAME}
33		31
34	OPTIONS_DEFINE= DOCS	32	DATADIR= ${PREFIX}/share/rexx${PORTNAME}
		33	DOCSDIR= ${PREFIX}/share/doc/rexx${PORTNAME}
		34	EXAMPLESDIR= ${PREFIX}/share/examples/rexx${PORTNAME}
35		35
36	do-extract:	36	DOCFILES= getright.rexx getmail-pop3.rexx httppost.rexx scp.rexx \
37	# avoid extracting circular hard links in distfile!	37	sendmail-smtp.rexx testcurl.rexx upload.rexx README.txt
38	@${MKDIR} ${WRKDIR}	38	do-install:
39	@tar -x -C ${WRKDIR} --exclude='common/filterexports' --exclude='common/fixrc' \	39	${INSTALL_PROGRAM} ${WRKSRC}/rexxcurl ${STAGEDIR}${PREFIX}/bin
40	-f ${DISTDIR}/${DISTNAME}.tar.gz	40	${INSTALL_LIB} ${WRKSRC}/librexxcurl.so ${STAGEDIR}${PREFIX}/lib
41		41	${INSTALL_DATA} ${WRKSRC}/librexxcurl.a ${STAGEDIR}${PREFIX}/lib
42	post-patch:
43	@${REINPLACE_CMD} -e "s\| -lc \| \|g" \
44	-e "/$$.sharedir)\/images/d" \
45	-e "/index.html/d" \
46	-e "/rxcurl64.png/d" \
47	${WRKSRC}/Makefile.in
48
49	post-install:
50	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/rexxcurl
51	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/librexxcurl.so
52		42
53	post-install-DOCS-on:	43	do-install-DOCS-on:
54	@${MKDIR} ${STAGEDIR}${DOCSDIR}	44	@${MKDIR} ${STAGEDIR}${DOCSDIR}
55	${INSTALL_DATA} ${WRKSRC}/doc/index.html ${STAGEDIR}${DOCSDIR}	45	${INSTALL_DATA} ${WRKSRC}/doc/index.html ${STAGEDIR}${DOCSDIR}
56	@${MKDIR} ${STAGEDIR}${DOCSDIR}/images	46	@${MKDIR} ${STAGEDIR}${DOCSDIR}/images
57	${INSTALL_DATA} ${WRKSRC}/doc/images/rxcurl64.png ${STAGEDIR}${DOCSDIR}/images	47	${INSTALL_DATA} ${WRKSRC}/doc/images/rxcurl64.png ${STAGEDIR}${DOCSDIR}/images
58		48
		49	do-install-EXAMPLES-on:
		50	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
		51	.for f in ${DOCFILES}
		52	${INSTALL_DATA} ${WRKSRC}/demo/$f ${STAGEDIR}${EXAMPLESDIR}
		53	.endfor
		54
59	.include <bsd.port.mk>	55	.include <bsd.port.mk>

Lines 1-23 Link Here

(-)./files/patch-Makefile.in (-39 / +11 lines)
1	--- Makefile.in.orig 2015-04-12 10:29:42 UTC	1	--- Makefile.in.orig 2019-02-10 22:01:43 UTC
2	+++ Makefile.in	2	+++ Makefile.in
3	@@ -120,7 +120,6 @@ $(PACKAGE_DIR)/makefile.* $(PACKAGE_DIR)	3	@@ -123,7 +123,6 @@ $(PACKAGE_DIR)/makefile.* $(PACKAGE_DIR)
4	$(PACKAGE_DIR)/config.guess $(PACKAGE_DIR)/config.sub $(PACKAGE_DIR)/install-sh $(PACKAGE_DIR)/preinst.rexx \	4	$(PACKAGE_DIR)/config.guess $(PACKAGE_DIR)/config.sub $(PACKAGE_DIR)/install-sh $(PACKAGE_DIR)/preinst.rexx \
5	$(PACKAGE_DIR)/aclocal.m4 $(PACKAGE_DIR)/configure.in $(PACKAGE_DIR)/def2exp.rexx \	5	$(PACKAGE_DIR)/aclocal.m4 $(PACKAGE_DIR)/configure.in $(PACKAGE_DIR)/def2exp.rexx \
6	$(PACKAGE_DIR)/demo/*.rexx $(PACKAGE_DIR)/demo/README.txt $(PACKAGE_DIR)/makew32.rex \	6	$(PACKAGE_DIR)/demo/*.rexx $(PACKAGE_DIR)/demo/README.txt $(PACKAGE_DIR)/makew32.rex \
7	-$(PACKAGE_DIR)/doc/.html $(PACKAGE_DIR)/doc/images/.png \	7	-$(PACKAGE_DIR)/doc/.html $(PACKAGE_DIR)/doc/images/.png \
8	$(PACKAGE_DIR)/RexxCURL.spec \	8	$(PACKAGE_DIR)/RexxCURL.spec \
9	$(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	9	$(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
10		10
11	@@ -231,8 +230,6 @@ $(RXDEFEXP1): $(srcdir)/$(PACKAGE_NAME)w	11	@@ -243,7 +242,6 @@ zip:
12
13	doco:
14	mkdir images
15	- cp $(srcdocdir)/index.html .
16	- cp $(srcdocdir)/images/*.png images
17
18	zip:
19	zip rexxcurl$(VER) README INSTALL TODO CPLv1.0.txt HISTORY $(ZIPCSRCFILES) $(ZIPHEADERS) $(ZIPCOMMONFILES)
20	@@ -241,7 +238,6 @@ zip:
21	zip rexxcurl$(VER) config.guess config.sub install-sh preinst.rexx	12	zip rexxcurl$(VER) config.guess config.sub install-sh preinst.rexx
22	zip rexxcurl$(VER) aclocal.m4 configure.in def2exp.rexx	13	zip rexxcurl$(VER) aclocal.m4 configure.in def2exp.rexx
23	zip rexxcurl$(VER) demo/*.rexx demo/README.txt makew32.rex	14	zip rexxcurl$(VER) demo/*.rexx demo/README.txt makew32.rex
Lines 25-50 Link Here
25	zip rexxcurl$(VER) debian/.regina debian/.oorexx debian/copyright debian/compat	16	zip rexxcurl$(VER) debian/.regina debian/.oorexx debian/copyright debian/compat
26	zip rexxcurl$(VER) RexxCURL.spec	17	zip rexxcurl$(VER) RexxCURL.spec
27		18
28	@@ -259,8 +255,6 @@ installbase: all	19	@@ -331,8 +329,6 @@ beosinstall: all
29	$(INSTALL) -d $(DESTDIR)$(bindir)
30	$(INSTALL) -d $(DESTDIR)$(libdir)
31	$(INSTALL) -d $(DESTDIR)$(sharedir)
32	- $(INSTALL) -d $(DESTDIR)$(docdir)
33	- $(INSTALL) -d $(DESTDIR)$(docdir)/images
34	$(INSTALL) -c -m 755 ./$(PACKAGE_NAME)$(binarybitprefix)$(EXE) $(DESTDIR)$(bindir)/$(PACKAGE_NAME)$(binarybitprefix)$(EXE)
35	$(INSTALL) -c -m 755 ./rexxcurl-config $(DESTDIR)$(bindir)/rexxcurl-config
36	-$(INSTALL) -c -m 755 ./$(SHLPRE)$(PACKAGE_NAME)$(SHLPST) $(DESTDIR)$(libdir)/$(SHLPRE)$(PACKAGE_NAME)$(SHLPST)
37	@@ -273,9 +267,6 @@ installbase: all
38	$(INSTALL) -c -m 755 $(srcdir)/demo/upload.rexx $(DESTDIR)$(sharedir)/upload.rexx
39	$(INSTALL) -c -m 755 $(srcdir)/demo/getright.rexx $(DESTDIR)$(sharedir)/getright.rexx
40	$(INSTALL) -c -m 644 $(srcdir)/demo/README.txt $(DESTDIR)$(sharedir)/README.txt
41	- $(INSTALL) -c -m 644 $(srcdocdir)/index.html $(DESTDIR)$(docdir)/index.html
42	- $(INSTALL) -c -m 644 $(srcdocdir)/images/rxcurl64.png $(DESTDIR)$(docdir)/images/rxcurl64.png
43	- $(INSTALL) -c -m 644 $(srcdir)/CPLv1.0.txt $(DESTDIR)$(docdir)/CPLv1.0.txt
44
45	uninstall:
46	rm -f $(DESTDIR)$(bindir)/$(PACKAGE_NAME)$(binarybitprefix)$(EXE)
47	@@ -313,8 +304,6 @@ beosinstall: all
48	$(INSTALL) -c -m 644 $(srcdir)/demo/README.txt /boot/home/config/bin/rexx/README-rexxcurl.txt	20	$(INSTALL) -c -m 644 $(srcdir)/demo/README.txt /boot/home/config/bin/rexx/README-rexxcurl.txt
49	#	21	#
50	# where to put doc for BeOS ?	22	# where to put doc for BeOS ?
Lines 53-59 Link Here
53	#	25	#
54		26
55	binary: $(BASE_BINARY)	27	binary: $(BASE_BINARY)
56	@@ -324,7 +313,6 @@ binarybase: all	28	@@ -342,7 +338,6 @@ binarybase: all
57	-mkdir -p ./tmpdir/bin	29	-mkdir -p ./tmpdir/bin
58	-mkdir -p ./tmpdir/lib	30	-mkdir -p ./tmpdir/lib
59	-mkdir -p ./tmpdir/share/$(PACKAGE_NAME)	31	-mkdir -p ./tmpdir/share/$(PACKAGE_NAME)
Lines 61-67 Link Here
61	cp $(PACKAGE_NAME)$(binarybitprefix)$(EXE) ./tmpdir/bin	33	cp $(PACKAGE_NAME)$(binarybitprefix)$(EXE) ./tmpdir/bin
62	cp $(PACKAGE_NAME)-config ./tmpdir/bin	34	cp $(PACKAGE_NAME)-config ./tmpdir/bin
63	cp $(SHLPRE)$(PACKAGE_NAME)$(SHLPST) ./tmpdir/lib	35	cp $(SHLPRE)$(PACKAGE_NAME)$(SHLPST) ./tmpdir/lib
64	@@ -334,8 +322,6 @@ binarybase: all	36	@@ -352,8 +347,6 @@ binarybase: all
65	cp $(srcdir)/INSTALL ./tmpdir/share/doc/rexxcurl	37	cp $(srcdir)/INSTALL ./tmpdir/share/doc/rexxcurl
66	cp $(srcdir)/README ./tmpdir/share/doc/rexxcurl	38	cp $(srcdir)/README ./tmpdir/share/doc/rexxcurl
67	cp $(srcdir)/TODO ./tmpdir/share/doc/rexxcurl	39	cp $(srcdir)/TODO ./tmpdir/share/doc/rexxcurl
Lines 70-76 Link Here
70	cp $(srcdir)/demo/testcurl.rexx ./tmpdir/share/$(PACKAGE_NAME)/testcurl.rexx	42	cp $(srcdir)/demo/testcurl.rexx ./tmpdir/share/$(PACKAGE_NAME)/testcurl.rexx
71	cp $(srcdir)/demo/httppost.rexx ./tmpdir/share/$(PACKAGE_NAME)/httppost.rexx	43	cp $(srcdir)/demo/httppost.rexx ./tmpdir/share/$(PACKAGE_NAME)/httppost.rexx
72	cp $(srcdir)/demo/getmail-pop3.rexx ./tmpdir/share/$(PACKAGE_NAME)/getmail-pop3.rexx	44	cp $(srcdir)/demo/getmail-pop3.rexx ./tmpdir/share/$(PACKAGE_NAME)/getmail-pop3.rexx
73	@@ -353,7 +339,6 @@ cygwinbinary: all	45	@@ -371,7 +364,6 @@ cygwinbinary: all
74	-mkdir -p ./tmpdir/lib	46	-mkdir -p ./tmpdir/lib
75	-mkdir -p ./tmpdir/rexx	47	-mkdir -p ./tmpdir/rexx
76	-mkdir -p ./tmpdir/doc/rexxcurl	48	-mkdir -p ./tmpdir/doc/rexxcurl
Lines 78-84 Link Here
78	cp $(PACKAGE_NAME)$(binarybitprefix)$(EXE) ./tmpdir/bin	50	cp $(PACKAGE_NAME)$(binarybitprefix)$(EXE) ./tmpdir/bin
79	cp $(SHLPRE)$(PACKAGE_NAME)$(SHLPST) ./tmpdir/bin	51	cp $(SHLPRE)$(PACKAGE_NAME)$(SHLPST) ./tmpdir/bin
80	cp $(LIBPRE)$(PACKAGE_NAME)$(LIBPST) ./tmpdir/lib	52	cp $(LIBPRE)$(PACKAGE_NAME)$(LIBPST) ./tmpdir/lib
81	@@ -362,8 +347,6 @@ cygwinbinary: all	53	@@ -380,8 +372,6 @@ cygwinbinary: all
82	cp $(srcdir)/INSTALL ./tmpdir/doc/rexxcurl	54	cp $(srcdir)/INSTALL ./tmpdir/doc/rexxcurl
83	cp $(srcdir)/README ./tmpdir/doc/rexxcurl	55	cp $(srcdir)/README ./tmpdir/doc/rexxcurl
84	cp $(srcdir)/TODO ./tmpdir/doc/rexxcurl	56	cp $(srcdir)/TODO ./tmpdir/doc/rexxcurl
Lines 87-93 Link Here
87	cp $(srcdir)/demo/testcurl.rexx ./tmpdir/rexx/testcurl.rexx	59	cp $(srcdir)/demo/testcurl.rexx ./tmpdir/rexx/testcurl.rexx
88	cp $(srcdir)/demo/httppost.rexx ./tmpdir/rexx/httppost.rexx	60	cp $(srcdir)/demo/httppost.rexx ./tmpdir/rexx/httppost.rexx
89	cp $(srcdir)/demo/getmail-pop3.rexx ./tmpdir/rexx/getmail-pop3.rexx	61	cp $(srcdir)/demo/getmail-pop3.rexx ./tmpdir/rexx/getmail-pop3.rexx
90	@@ -381,7 +364,6 @@ beosbinary: all	62	@@ -399,7 +389,6 @@ beosbinary: all
91	-mkdir -p ./tmpdir/lib	63	-mkdir -p ./tmpdir/lib
92	-mkdir -p ./tmpdir/add-ons/rexx	64	-mkdir -p ./tmpdir/add-ons/rexx
93	-mkdir -p ./tmpdir/doc/rexxcurl	65	-mkdir -p ./tmpdir/doc/rexxcurl
Lines 95-101 Link Here
95	cp $(PACKAGE_NAME)$(binarybitprefix)$(EXE) ./tmpdir/bin	67	cp $(PACKAGE_NAME)$(binarybitprefix)$(EXE) ./tmpdir/bin
96	cp $(SHLPRE)$(PACKAGE_NAME)$(SHLPST) ./tmpdir/add-ons/rexx	68	cp $(SHLPRE)$(PACKAGE_NAME)$(SHLPST) ./tmpdir/add-ons/rexx
97	cp $(LIBPRE)$(PACKAGE_NAME)$(LIBPST) ./tmpdir/lib	69	cp $(LIBPRE)$(PACKAGE_NAME)$(LIBPST) ./tmpdir/lib
98	@@ -390,8 +372,6 @@ beosbinary: all	70	@@ -408,8 +397,6 @@ beosbinary: all
99	cp $(srcdir)/INSTALL ./tmpdir/doc/rexxcurl	71	cp $(srcdir)/INSTALL ./tmpdir/doc/rexxcurl
100	cp $(srcdir)/README ./tmpdir/doc/rexxcurl	72	cp $(srcdir)/README ./tmpdir/doc/rexxcurl
101	cp $(srcdir)/TODO ./tmpdir/doc/rexxcurl	73	cp $(srcdir)/TODO ./tmpdir/doc/rexxcurl

Lines 1-6 Link Here

(-)./files/patch-rexxcurl.c (-12 / +18 lines)
1	--- rexxcurl.c.orig 2015-04-11 22:53:39 UTC	1	--- rexxcurl.c.orig 2019-02-10 22:51:41 UTC
2	+++ rexxcurl.c	2	+++ rexxcurl.c
3	@@ -53,6 +53,8 @@	3	@@ -52,6 +52,8 @@
4	* internal error set N/A	4	* internal error set N/A
5	* cURL runtime errors -1 set	5	* cURL runtime errors -1 set
6	*/	6	*/
Lines 9-24 Link Here
9	#ifdef HAVE_CONFIG_H	9	#ifdef HAVE_CONFIG_H
10	# include "config.h"	10	# include "config.h"
11	#else	11	#else
12	@@ -1366,7 +1368,7 @@ void RexxCURLSetVersionInfoConstants( Rx	12	@@ -1879,9 +1881,9 @@ int rexxcurl_sshkey_callback( CURL *easy
13	valuelen = 0;
14	namelen = sprintf( name, "%sLIBSSH_VERSION", RxGetConstantPrefix( RxPackageGlobalData ) );
15	#if LIBCURL_VERSION_NUM >= 0x071001
16	- support = version_info->libssh_version;
17	+ support = (char *) version_info->libssh_version;
18	valuelen = (version_info->libssh_version) ? strlen( version_info->libssh_version ) : 0;
19	#endif
20	SetRexxVariable( RxPackageGlobalData, name, namelen, support, valuelen );
21	@@ -1841,9 +1843,9 @@ int rexxcurl_sshkey_callback( CURL *easy
22	if ( argv == NULL )	13	if ( argv == NULL )
23	return -1;	14	return -1;
24		15
Lines 30-32 Link Here
30	rx_foundkeytype_len = sprintf( rx_foundkeytype, "%u", foundkey->keytype );	21	rx_foundkeytype_len = sprintf( rx_foundkeytype, "%u", foundkey->keytype );
31	rx_libcurlviewofkey_len = sprintf( rx_libcurlviewofkey, "%u", match );	22	rx_libcurlviewofkey_len = sprintf( rx_libcurlviewofkey, "%u", match );
32		23
		24	@@ -1964,11 +1966,11 @@ int debug_function( CURL *handle, curl_i
		25	int c;
		26	char prefix = "<><><>";
		27	if ( type == CURLINFO_TEXT )
		28	- fprintf( fp, "text: %c %.*s", prefix[type],size, data );
		29	+ fprintf( fp, "text: %c %.*s", prefix[type],(int)size, data );
		30	if ( type == CURLINFO_HEADER_IN )
		31	- fprintf( fp, "header_in: %c %.*s", prefix[type],size, data );
		32	+ fprintf( fp, "header_in: %c %.*s", prefix[type],(int)size, data );
		33	if ( type == CURLINFO_HEADER_OUT )
		34	- fprintf( fp, "header_out:%c %.*s", prefix[type],size, data );
		35	+ fprintf( fp, "header_out:%c %.*s", prefix[type],(int)size, data );
		36	if ( type == CURLINFO_SSL_DATA_IN )
		37	{
		38	fprintf( fp, "ssl_data_in: " );

Lines 1-14 Link Here

(-)./pkg-plist (-9 / +8 lines)
1	bin/rexxcurl	1	bin/rexxcurl
2	bin/rexxcurl-config
3	lib/librexxcurl.a	2	lib/librexxcurl.a
4	lib/librexxcurl.so	3	lib/librexxcurl.so
5	%%PORTDOCS%%%%DOCSDIR%%/images/rxcurl64.png	4	%%PORTDOCS%%%%DOCSDIR%%/images/rxcurl64.png
6	%%PORTDOCS%%%%DOCSDIR%%/index.html	5	%%PORTDOCS%%%%DOCSDIR%%/index.html
7	%%DATADIR%%/README.txt	6	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.txt
8	%%DATADIR%%/getmail-pop3.rexx	7	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/getmail-pop3.rexx
9	%%DATADIR%%/getright.rexx	8	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/getright.rexx
10	%%DATADIR%%/httppost.rexx	9	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/httppost.rexx
11	%%DATADIR%%/scp.rexx	10	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scp.rexx
12	%%DATADIR%%/sendmail-smtp.rexx	11	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sendmail-smtp.rexx
13	%%DATADIR%%/testcurl.rexx	12	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testcurl.rexx
14	%%DATADIR%%/upload.rexx	13	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/upload.rexx