Attachment #73873 for bug #106992

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




#

PORTNAME=	curl
PORTVERSION=	7.15.5.1
PORTREVISION=	1
CATEGORIES=	ftp python
MASTER_SITES=	http://pycurl.sourceforge.net/download/ \
		http://pycurl.sourceforge.net/download/00-OLD-VERSIONS/

EXAMPLESDIR=	${PREFIX}/share/examples/py-curl

post-patch:
	${REINPLACE_CMD} \
		-e 's@^\(include_dirs = \).*@\1["${LOCALBASE}/include"]@' \
		-e 's@^\(PACKAGE = \).*@\1"py-curl"@' \
		-e 's@\(os.path.join(\)datadir, "examples")@\1"share/examples/py-curl")@' \
		-e 's@name=PACKAGE@name="pycurl"@' \
		${WRKSRC}/setup.py

pre-install:
.if defined(NOPORTDOCS)
	${RM} -fr ${WRKSRC}/doc
.endif

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)/home/lwhsu/ports/ftp/py-curl/distinfo (-3 / +3 lines)
1	MD5 (pycurl-7.15.2.tar.gz) = d96d7392304f4c3c4ebdc05dd479fc41	1	MD5 (pycurl-7.15.5.1.tar.gz) = 464cfbeba150d99d92a407c7c8b751de
2	SHA256 (pycurl-7.15.2.tar.gz) = 039c1f9d38da6b5e4f7edffd62d1fed80cbe6ce43f037345599a2377f0bb6451	2	SHA256 (pycurl-7.15.5.1.tar.gz) = 93a786476a32f88622ada3fe355a1cef136d9658b39ac76806ef4ba154bbd2f9
3	SIZE (pycurl-7.15.2.tar.gz) = 62225	3	SIZE (pycurl-7.15.5.1.tar.gz) = 66075




--- src/pycurl.c.orig	Fri Aug 11 10:37:19 2006
+++ src/pycurl.c	Wed Dec 20 16:11:36 2006
@@ -1475,9 +1475,11 @@
         case CURLOPT_URL:
         case CURLOPT_USERAGENT:
         case CURLOPT_USERPWD:

         case CURLOPT_SOURCE_USERPWD:
         case CURLOPT_SOURCE_PATH:
+#endif
         case CURLOPT_FTP_ALTERNATIVE_TO_USER:
 /* FIXME: check if more of these options allow binary data */
             str = PyString_AsString_NoNUL(obj);
@@ -1646,12 +1648,14 @@
@@ -1279,12 +1281,14 @@
         case CURLOPT_PREQUOTE:
             old_slist = &self->prequote;
             break;

         case CURLOPT_HTTPPOST:
             break;
         default:
@@ -3180,14 +3184,18 @@
     insint_c(d, "FTP_SSL", CURLOPT_FTP_SSL);
     insint_c(d, "POSTFIELDSIZE_LARGE", CURLOPT_POSTFIELDSIZE_LARGE);
     insint_c(d, "TCP_NODELAY", CURLOPT_TCP_NODELAY);




%%PYTHON_SITELIBDIR%%/curl/__init__.pyc
%%PYTHON_SITELIBDIR%%/curl/__init__.pyo
%%PYTHON_SITELIBDIR%%/pycurl.so
%%DOCSDIR%%/COPYING
%%DOCSDIR%%/ChangeLog
%%DOCSDIR%%/INSTALL
%%DOCSDIR%%/README
%%DOCSDIR%%/TODO
%%DOCSDIR%%/html/callbacks.html
%%DOCSDIR%%/html/curlmultiobject.html
%%DOCSDIR%%/html/curlobject.html
%%DOCSDIR%%/html/pycurl.html
%%DOCSDIR%%/tests/test.py
%%DOCSDIR%%/tests/test_cb.py
%%DOCSDIR%%/tests/test_debug.py
%%DOCSDIR%%/tests/test_getinfo.py
%%DOCSDIR%%/tests/test_gtk.py
%%DOCSDIR%%/tests/test_internals.py
%%DOCSDIR%%/tests/test_memleak.py
%%DOCSDIR%%/tests/test_multi.py
%%DOCSDIR%%/tests/test_multi2.py
%%DOCSDIR%%/tests/test_multi3.py
%%DOCSDIR%%/tests/test_multi4.py
%%DOCSDIR%%/tests/test_multi5.py
%%DOCSDIR%%/tests/test_multi6.py
%%DOCSDIR%%/tests/test_multi_vs_thread.py
%%DOCSDIR%%/tests/test_post.py
%%DOCSDIR%%/tests/test_post2.py
%%DOCSDIR%%/tests/test_post3.py
%%DOCSDIR%%/tests/test_stringio.py
%%DOCSDIR%%/tests/test_xmlrpc.py
%%DOCSDIR%%/tests/util.py
%%EXAMPLESDIR%%/basicfirst.py
%%EXAMPLESDIR%%/file_upload.py
%%EXAMPLESDIR%%/linksys.py

%%EXAMPLESDIR%%/retriever.py
%%EXAMPLESDIR%%/sfquery.py
%%EXAMPLESDIR%%/xmlrpc_curl.py
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/TODO
%%PORTDOCS%%%%DOCSDIR%%/html/callbacks.html
%%PORTDOCS%%%%DOCSDIR%%/html/curlmultiobject.html
%%PORTDOCS%%%%DOCSDIR%%/html/curlobject.html
%%PORTDOCS%%%%DOCSDIR%%/html/curlshareobject.html
%%PORTDOCS%%%%DOCSDIR%%/html/pycurl.html
%%PORTDOCS%%%%DOCSDIR%%/tests/test.py
%%PORTDOCS%%%%DOCSDIR%%/tests/test_cb.py
%%PORTDOCS%%%%DOCSDIR%%/tests/test_debug.py
%%PORTDOCS%%%%DOCSDIR%%/tests/test_ftp.py
%%PORTDOCS%%%%DOCSDIR%%/tests/test_getinfo.py
%%PORTDOCS%%%%DOCSDIR%%/tests/test_gtk.py
%%PORTDOCS%%%%DOCSDIR%%/tests/test_internals.py
%%PORTDOCS%%%%DOCSDIR%%/tests/test_memleak.py
%%PORTDOCS%%%%DOCSDIR%%/tests/test_multi.py
%%PORTDOCS%%%%DOCSDIR%%/tests/test_multi2.py
%%PORTDOCS%%%%DOCSDIR%%/tests/test_multi3.py
%%PORTDOCS%%%%DOCSDIR%%/tests/test_multi4.py
%%PORTDOCS%%%%DOCSDIR%%/tests/test_multi5.py
%%PORTDOCS%%%%DOCSDIR%%/tests/test_multi6.py
%%PORTDOCS%%%%DOCSDIR%%/tests/test_multi_vs_thread.py
%%PORTDOCS%%%%DOCSDIR%%/tests/test_post.py
%%PORTDOCS%%%%DOCSDIR%%/tests/test_post2.py
%%PORTDOCS%%%%DOCSDIR%%/tests/test_post3.py
%%PORTDOCS%%%%DOCSDIR%%/tests/test_share.py
%%PORTDOCS%%%%DOCSDIR%%/tests/test_stringio.py
%%PORTDOCS%%%%DOCSDIR%%/tests/test_xmlrpc.py
%%PORTDOCS%%%%DOCSDIR%%/tests/util.py
@dirrm %%PYTHON_SITELIBDIR%%/curl
@dirrm %%EXAMPLESDIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%/tests
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
%%PORTDOCS%%@dirrm %%DOCSDIR%%

Return to bug 106992

Lines 6-13 Link Here

(-)/home/lwhsu/ports/ftp/py-curl/Makefile (-3 / +7 lines)
6	#	6	#
7		7
8	PORTNAME= curl	8	PORTNAME= curl
9	PORTVERSION= 7.15.2	9	PORTVERSION= 7.15.5.1
10	PORTREVISION= 1
11	CATEGORIES= ftp python	10	CATEGORIES= ftp python
12	MASTER_SITES= http://pycurl.sourceforge.net/download/ \	11	MASTER_SITES= http://pycurl.sourceforge.net/download/ \
13	http://pycurl.sourceforge.net/download/00-OLD-VERSIONS/	12	http://pycurl.sourceforge.net/download/00-OLD-VERSIONS/
Lines 27-37 Link Here
27	EXAMPLESDIR= ${PREFIX}/share/examples/py-curl	26	EXAMPLESDIR= ${PREFIX}/share/examples/py-curl
28		27
29	post-patch:	28	post-patch:
30	${REINPLACE_CMD} -e 's@\(curl-config --\)@${LOCALBASE}/bin/\1@g' \	29	${REINPLACE_CMD} \
31	-e 's@^\(include_dirs = \).*@\1["${LOCALBASE}/include"]@' \	30	-e 's@^\(include_dirs = \).*@\1["${LOCALBASE}/include"]@' \
32	-e 's@^\(PACKAGE = \).*@\1"py-curl"@' \	31	-e 's@^\(PACKAGE = \).*@\1"py-curl"@' \
33	-e 's@\(os.path.join(\)datadir, "examples")@\1"share/examples/py-curl")@' \	32	-e 's@\(os.path.join(\)datadir, "examples")@\1"share/examples/py-curl")@' \
34	-e 's@name=PACKAGE@name="pycurl"@' \	33	-e 's@name=PACKAGE@name="pycurl"@' \
35	${WRKSRC}/setup.py	34	${WRKSRC}/setup.py
		35
		36	pre-install:
		37	.if defined(NOPORTDOCS)
		38	${RM} -fr ${WRKSRC}/doc
		39	.endif
36		40
37	.include <bsd.port.mk>	41	.include <bsd.port.mk>

Lines 1-6 Link Here

(-)/home/lwhsu/ports/ftp/py-curl/files/patch-src-pycurl.c (-6 / +6 lines)
1	--- src/pycurl.c.orig Tue Dec 5 17:11:38 2006	1	--- src/pycurl.c.orig Fri Aug 11 10:37:19 2006
2	+++ src/pycurl.c Tue Dec 5 17:13:03 2006	2	+++ src/pycurl.c Wed Dec 20 16:11:36 2006
3	@@ -1109,9 +1109,11 @@	3	@@ -1475,9 +1475,11 @@
4	case CURLOPT_URL:	4	case CURLOPT_URL:
5	case CURLOPT_USERAGENT:	5	case CURLOPT_USERAGENT:
6	case CURLOPT_USERPWD:	6	case CURLOPT_USERPWD:
Lines 9-18 Link Here
9	case CURLOPT_SOURCE_USERPWD:	9	case CURLOPT_SOURCE_USERPWD:
10	case CURLOPT_SOURCE_PATH:	10	case CURLOPT_SOURCE_PATH:
11	+#endif	11	+#endif
		12	case CURLOPT_FTP_ALTERNATIVE_TO_USER:
12	/* FIXME: check if more of these options allow binary data */	13	/* FIXME: check if more of these options allow binary data */
13	str = PyString_AsString_NoNUL(obj);	14	str = PyString_AsString_NoNUL(obj);
14	if (str == NULL)	15	@@ -1646,12 +1648,14 @@
15	@@ -1279,12 +1281,14 @@
16	case CURLOPT_PREQUOTE:	16	case CURLOPT_PREQUOTE:
17	old_slist = &self->prequote;	17	old_slist = &self->prequote;
18	break;	18	break;
Lines 27-33 Link Here
27	case CURLOPT_HTTPPOST:	27	case CURLOPT_HTTPPOST:
28	break;	28	break;
29	default:	29	default:
30	@@ -2689,14 +2693,18 @@	30	@@ -3180,14 +3184,18 @@
31	insint_c(d, "FTP_SSL", CURLOPT_FTP_SSL);	31	insint_c(d, "FTP_SSL", CURLOPT_FTP_SSL);
32	insint_c(d, "POSTFIELDSIZE_LARGE", CURLOPT_POSTFIELDSIZE_LARGE);	32	insint_c(d, "POSTFIELDSIZE_LARGE", CURLOPT_POSTFIELDSIZE_LARGE);
33	insint_c(d, "TCP_NODELAY", CURLOPT_TCP_NODELAY);	33	insint_c(d, "TCP_NODELAY", CURLOPT_TCP_NODELAY);

Lines 2-36 Link Here

(-)/home/lwhsu/ports/ftp/py-curl/pkg-plist (-33 / +36 lines)
2	%%PYTHON_SITELIBDIR%%/curl/__init__.pyc	2	%%PYTHON_SITELIBDIR%%/curl/__init__.pyc
3	%%PYTHON_SITELIBDIR%%/curl/__init__.pyo	3	%%PYTHON_SITELIBDIR%%/curl/__init__.pyo
4	%%PYTHON_SITELIBDIR%%/pycurl.so	4	%%PYTHON_SITELIBDIR%%/pycurl.so
5	%%DOCSDIR%%/COPYING
6	%%DOCSDIR%%/ChangeLog
7	%%DOCSDIR%%/INSTALL
8	%%DOCSDIR%%/README
9	%%DOCSDIR%%/TODO
10	%%DOCSDIR%%/html/callbacks.html
11	%%DOCSDIR%%/html/curlmultiobject.html
12	%%DOCSDIR%%/html/curlobject.html
13	%%DOCSDIR%%/html/pycurl.html
14	%%DOCSDIR%%/tests/test.py
15	%%DOCSDIR%%/tests/test_cb.py
16	%%DOCSDIR%%/tests/test_debug.py
17	%%DOCSDIR%%/tests/test_getinfo.py
18	%%DOCSDIR%%/tests/test_gtk.py
19	%%DOCSDIR%%/tests/test_internals.py
20	%%DOCSDIR%%/tests/test_memleak.py
21	%%DOCSDIR%%/tests/test_multi.py
22	%%DOCSDIR%%/tests/test_multi2.py
23	%%DOCSDIR%%/tests/test_multi3.py
24	%%DOCSDIR%%/tests/test_multi4.py
25	%%DOCSDIR%%/tests/test_multi5.py
26	%%DOCSDIR%%/tests/test_multi6.py
27	%%DOCSDIR%%/tests/test_multi_vs_thread.py
28	%%DOCSDIR%%/tests/test_post.py
29	%%DOCSDIR%%/tests/test_post2.py
30	%%DOCSDIR%%/tests/test_post3.py
31	%%DOCSDIR%%/tests/test_stringio.py
32	%%DOCSDIR%%/tests/test_xmlrpc.py
33	%%DOCSDIR%%/tests/util.py
34	%%EXAMPLESDIR%%/basicfirst.py	5	%%EXAMPLESDIR%%/basicfirst.py
35	%%EXAMPLESDIR%%/file_upload.py	6	%%EXAMPLESDIR%%/file_upload.py
36	%%EXAMPLESDIR%%/linksys.py	7	%%EXAMPLESDIR%%/linksys.py
Lines 38-45 Link Here
38	%%EXAMPLESDIR%%/retriever.py	9	%%EXAMPLESDIR%%/retriever.py
39	%%EXAMPLESDIR%%/sfquery.py	10	%%EXAMPLESDIR%%/sfquery.py
40	%%EXAMPLESDIR%%/xmlrpc_curl.py	11	%%EXAMPLESDIR%%/xmlrpc_curl.py
41	@dirrm %%EXAMPLESDIR%%	12	%%PORTDOCS%%%%DOCSDIR%%/COPYING
42	@dirrm %%DOCSDIR%%/tests	13	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
43	@dirrm %%DOCSDIR%%/html	14	%%PORTDOCS%%%%DOCSDIR%%/INSTALL
44	@dirrm %%DOCSDIR%%	15	%%PORTDOCS%%%%DOCSDIR%%/README
		16	%%PORTDOCS%%%%DOCSDIR%%/TODO
		17	%%PORTDOCS%%%%DOCSDIR%%/html/callbacks.html
		18	%%PORTDOCS%%%%DOCSDIR%%/html/curlmultiobject.html
		19	%%PORTDOCS%%%%DOCSDIR%%/html/curlobject.html
		20	%%PORTDOCS%%%%DOCSDIR%%/html/curlshareobject.html
		21	%%PORTDOCS%%%%DOCSDIR%%/html/pycurl.html
		22	%%PORTDOCS%%%%DOCSDIR%%/tests/test.py
		23	%%PORTDOCS%%%%DOCSDIR%%/tests/test_cb.py
		24	%%PORTDOCS%%%%DOCSDIR%%/tests/test_debug.py
		25	%%PORTDOCS%%%%DOCSDIR%%/tests/test_ftp.py
		26	%%PORTDOCS%%%%DOCSDIR%%/tests/test_getinfo.py
		27	%%PORTDOCS%%%%DOCSDIR%%/tests/test_gtk.py
		28	%%PORTDOCS%%%%DOCSDIR%%/tests/test_internals.py
		29	%%PORTDOCS%%%%DOCSDIR%%/tests/test_memleak.py
		30	%%PORTDOCS%%%%DOCSDIR%%/tests/test_multi.py
		31	%%PORTDOCS%%%%DOCSDIR%%/tests/test_multi2.py
		32	%%PORTDOCS%%%%DOCSDIR%%/tests/test_multi3.py
		33	%%PORTDOCS%%%%DOCSDIR%%/tests/test_multi4.py
		34	%%PORTDOCS%%%%DOCSDIR%%/tests/test_multi5.py
		35	%%PORTDOCS%%%%DOCSDIR%%/tests/test_multi6.py
		36	%%PORTDOCS%%%%DOCSDIR%%/tests/test_multi_vs_thread.py
		37	%%PORTDOCS%%%%DOCSDIR%%/tests/test_post.py
		38	%%PORTDOCS%%%%DOCSDIR%%/tests/test_post2.py
		39	%%PORTDOCS%%%%DOCSDIR%%/tests/test_post3.py
		40	%%PORTDOCS%%%%DOCSDIR%%/tests/test_share.py
		41	%%PORTDOCS%%%%DOCSDIR%%/tests/test_stringio.py
		42	%%PORTDOCS%%%%DOCSDIR%%/tests/test_xmlrpc.py
		43	%%PORTDOCS%%%%DOCSDIR%%/tests/util.py
45	@dirrm %%PYTHON_SITELIBDIR%%/curl	44	@dirrm %%PYTHON_SITELIBDIR%%/curl
		45	@dirrm %%EXAMPLESDIR%%
		46	%%PORTDOCS%%@dirrm %%DOCSDIR%%/tests
		47	%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
		48	%%PORTDOCS%%@dirrm %%DOCSDIR%%