3 files changed, 68 insertions, 55 deletions

diff --git a/ftp/py-curl/Makefile b/ftp/py-curl/Makefile
index 58ca91055cc2..71ba13c51066 100644
--- a/ftp/py-curl/Makefile
+++ b/ftp/py-curl/Makefile
@@ -6,38 +6,49 @@
 #
 
 PORTNAME=	curl
-PORTVERSION=	7.16.4
-PORTREVISION=	1
+PORTVERSION=	7.19.0
 CATEGORIES=	ftp python
 MASTER_SITES=	http://pycurl.sourceforge.net/download/ \
 		http://pycurl.sourceforge.net/download/00-OLD-VERSIONS/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	py${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	wenheping@gmail.com
 COMMENT=	Python interface to libcurl
 
 LIB_DEPENDS=	curl.5:${PORTSDIR}/ftp/curl
 
+DOCSDIR=	${PREFIX}/share/doc/py-curl
+EXAMPLESDIR=	${PREFIX}/share/examples/py-curl
+DATADIR=	${PREFIX}/share/py-curl
+
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	pycurl
 USE_OPENSSL=	yes
 
-DOCSDIR=	${PREFIX}/share/doc/py-curl
-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"@' \
+		-e 's@data_files=@#data_files=t@' \
 		${WRKSRC}/setup.py
 
-pre-install:
-.if defined(NOPORTDOCS)
-	${RM} -fr ${WRKSRC}/doc
+post-install:
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+.for i in ChangeLog COPYING COPYING2 INSTALL README TODO
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+.endfor
+	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
+.endif
+
+.if !defined(NOPORTEXAMPLES)
+	${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
+.endif
+
+.if !defined(NOPORDATA)
+	${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/tests/* ${DATADIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/ftp/py-curl/distinfo b/ftp/py-curl/distinfo
index f8121d361b16..2d3dc12fb983 100644
--- a/ftp/py-curl/distinfo
+++ b/ftp/py-curl/distinfo
@@ -1,3 +1,3 @@
-MD5 (pycurl-7.16.4.tar.gz) = b2ad729cf4ccc16f8d169d2511764eb6
-SHA256 (pycurl-7.16.4.tar.gz) = cc287aa03fd5b1b044331f981b2c09e11f455e24a7f81147085036a85b9c9388
-SIZE (pycurl-7.16.4.tar.gz) = 68849
+MD5 (pycurl-7.19.0.tar.gz) = 919d58fe37e69fe87ce4534d8b6a1c7b
+SHA256 (pycurl-7.19.0.tar.gz) = eb782dfcc5a7c023539a077462b83c167e178128ee9f7201665b9fbb1a8b0642
+SIZE (pycurl-7.19.0.tar.gz) = 71346
diff --git a/ftp/py-curl/pkg-plist b/ftp/py-curl/pkg-plist
index a5d3e259ee74..c106bca1f5c1 100644
--- a/ftp/py-curl/pkg-plist
+++ b/ftp/py-curl/pkg-plist
@@ -3,48 +3,50 @@
 %%PYTHON_SITELIBDIR%%/curl/__init__.pyo
 %%PYTHON_SITELIBDIR%%/pycurl.so
 @dirrm %%PYTHON_SITELIBDIR%%/curl
-%%EXAMPLESDIR%%/basicfirst.py
-%%EXAMPLESDIR%%/file_upload.py
-%%EXAMPLESDIR%%/linksys.py
-%%EXAMPLESDIR%%/retriever-multi.py
-%%EXAMPLESDIR%%/retriever.py
-%%EXAMPLESDIR%%/sfquery.py
-%%EXAMPLESDIR%%/xmlrpc_curl.py
-@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/COPYING2
 %%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_socket.py
-%%PORTDOCS%%%%DOCSDIR%%/tests/test_multi_timer.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
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/tests
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%%%DOCSDIR%%/callbacks.html
+%%PORTDOCS%%%%DOCSDIR%%/curlmultiobject.html
+%%PORTDOCS%%%%DOCSDIR%%/curlobject.html
+%%PORTDOCS%%%%DOCSDIR%%/curlshareobject.html
+%%PORTDOCS%%%%DOCSDIR%%/pycurl.html
+%%DATADIR%%/test.py
+%%DATADIR%%/test_cb.py
+%%DATADIR%%/test_debug.py
+%%DATADIR%%/test_ftp.py
+%%DATADIR%%/test_getinfo.py
+%%DATADIR%%/test_gtk.py
+%%DATADIR%%/test_internals.py
+%%DATADIR%%/test_memleak.py
+%%DATADIR%%/test_multi.py
+%%DATADIR%%/test_multi2.py
+%%DATADIR%%/test_multi3.py
+%%DATADIR%%/test_multi4.py
+%%DATADIR%%/test_multi5.py
+%%DATADIR%%/test_multi6.py
+%%DATADIR%%/test_multi_socket.py
+%%DATADIR%%/test_multi_timer.py
+%%DATADIR%%/test_multi_vs_thread.py
+%%DATADIR%%/test_multi_socket_select.py
+%%DATADIR%%/test_socketopen.py
+%%DATADIR%%/test_post.py
+%%DATADIR%%/test_post2.py
+%%DATADIR%%/test_post3.py
+%%DATADIR%%/test_share.py
+%%DATADIR%%/test_stringio.py
+%%DATADIR%%/test_xmlrpc.py
+%%DATADIR%%/util.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basicfirst.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/file_upload.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/linksys.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/retriever-multi.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/retriever.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sfquery.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xmlrpc_curl.py
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/
+@dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%