aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--deskutils/py-bugwarrior/Makefile3
-rw-r--r--devel/py-grab/Makefile3
-rw-r--r--finance/py-stripe/Makefile3
-rw-r--r--ftp/Makefile2
-rw-r--r--ftp/py-pycurl/Makefile (renamed from ftp/py-curl/Makefile)5
-rw-r--r--ftp/py-pycurl/distinfo (renamed from ftp/py-curl/distinfo)0
-rw-r--r--ftp/py-pycurl/pkg-descr (renamed from ftp/py-curl/pkg-descr)0
-rw-r--r--multimedia/miro/Makefile4
-rw-r--r--multimedia/spotify-websocket-api/Makefile4
-rw-r--r--net/nsscache/Makefile4
-rw-r--r--print/system-config-printer/Makefile4
-rw-r--r--www/py-urlgrabber/Makefile6
-rw-r--r--www/py-urljr/Makefile4
13 files changed, 22 insertions, 20 deletions
diff --git a/deskutils/py-bugwarrior/Makefile b/deskutils/py-bugwarrior/Makefile
index 80292ceecdc9..0ac01c279ec9 100644
--- a/deskutils/py-bugwarrior/Makefile
+++ b/deskutils/py-bugwarrior/Makefile
@@ -3,6 +3,7 @@
PORTNAME= bugwarrior
PORTVERSION= 1.1.4
+PORTREVISION= 1
CATEGORIES= deskutils python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -23,7 +24,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twiggy>0:${PORTSDIR}/devel/py-twiggy \
${PYTHON_PKGNAMEPREFIX}keyring>0:${PORTSDIR}/security/py-keyring \
${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.2:${PORTSDIR}/devel/py-Jinja2 \
- ${PYTHON_PKGNAMEPREFIX}curl>0:${PORTSDIR}/ftp/py-curl \
+ ${PYTHON_PKGNAMEPREFIX}pycurl>0:${PORTSDIR}/ftp/py-pycurl \
${PYTHON_PKGNAMEPREFIX}dogpile.cache>=0.5.3:${PORTSDIR}/devel/py-dogpile.cache \
${PYTHON_PKGNAMEPREFIX}lockfile>=0.9.1:${PORTSDIR}/devel/py-lockfile \
${PYTHON_PKGNAMEPREFIX}click>0:${PORTSDIR}/devel/py-click \
diff --git a/devel/py-grab/Makefile b/devel/py-grab/Makefile
index 7260a0ef1127..4d22ec68379a 100644
--- a/devel/py-grab/Makefile
+++ b/devel/py-grab/Makefile
@@ -2,6 +2,7 @@
PORTNAME= grab
PORTVERSION= 0.6.29
+PORTREVISION= 1
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT= Site scraping framework
LICENSE= MIT
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \
- ${PYTHON_PKGNAMEPREFIX}curl>0:${PORTSDIR}/ftp/py-curl \
+ ${PYTHON_PKGNAMEPREFIX}pycurl>0:${PORTSDIR}/ftp/py-pycurl \
${PYTHON_PKGNAMEPREFIX}weblib>0:${PORTSDIR}/devel/py-weblib \
${PYTHON_PKGNAMEPREFIX}selection>0:${PORTSDIR}/devel/py-selection \
${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
diff --git a/finance/py-stripe/Makefile b/finance/py-stripe/Makefile
index a462b24c57fa..61b68d7806a3 100644
--- a/finance/py-stripe/Makefile
+++ b/finance/py-stripe/Makefile
@@ -4,6 +4,7 @@
PORTNAME= stripe
PORTVERSION= 1.25.0
+PORTREVISION= 1
CATEGORIES= finance python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +15,7 @@ COMMENT= Stripe Python bindings
LICENSE= MIT
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0.8.8:${PORTSDIR}/www/py-requests
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}curl>=7.19:${PORTSDIR}/ftp/py-curl \
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycurl>=7.19:${PORTSDIR}/ftp/py-pycurl \
${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:${PORTSDIR}/devel/py-mock
OPTIONS_DEFINE= TESTS
diff --git a/ftp/Makefile b/ftp/Makefile
index fcc500674397..de0acd7d91b8 100644
--- a/ftp/Makefile
+++ b/ftp/Makefile
@@ -77,8 +77,8 @@
SUBDIR += puf
SUBDIR += pure-ftpd
SUBDIR += pureadmin
- SUBDIR += py-curl
SUBDIR += py-ftputil
+ SUBDIR += py-pycurl
SUBDIR += py-pyftpdlib
SUBDIR += py-tftpy
SUBDIR += quftp
diff --git a/ftp/py-curl/Makefile b/ftp/py-pycurl/Makefile
index 228d46adc128..f2f9eeb1e001 100644
--- a/ftp/py-curl/Makefile
+++ b/ftp/py-pycurl/Makefile
@@ -1,7 +1,7 @@
# Created by: Hye-Shik Chang
# $FreeBSD$
-PORTNAME= curl
+PORTNAME= pycurl
PORTVERSION= 7.19.5.3
PORTREVISION= 1
CATEGORIES= ftp python
@@ -9,7 +9,6 @@ MASTER_SITES= CHEESESHOP \
http://pycurl.sourceforge.net/download/ \
http://pycurl.sourceforge.net/download/00-OLD-VERSIONS/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-DISTNAME= py${PORTNAME}-${PORTVERSION}
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= Python interface to libcurl
@@ -23,6 +22,6 @@ USE_PYTHON= autoplist concurrent distutils
USES= python
post-install:
- ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/pycurl.so
+ ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}.so
.include <bsd.port.mk>
diff --git a/ftp/py-curl/distinfo b/ftp/py-pycurl/distinfo
index 3b849aea2005..3b849aea2005 100644
--- a/ftp/py-curl/distinfo
+++ b/ftp/py-pycurl/distinfo
diff --git a/ftp/py-curl/pkg-descr b/ftp/py-pycurl/pkg-descr
index f3afd1ea220a..f3afd1ea220a 100644
--- a/ftp/py-curl/pkg-descr
+++ b/ftp/py-pycurl/pkg-descr
diff --git a/multimedia/miro/Makefile b/multimedia/miro/Makefile
index 3499f38ffb3b..50172afe95d0 100644
--- a/multimedia/miro/Makefile
+++ b/multimedia/miro/Makefile
@@ -3,7 +3,7 @@
PORTNAME= miro
PORTVERSION= 6.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= multimedia
MASTER_SITES= ftp://ftp.osuosl.org/pub/pculture.org/miro/src/ \
http://ftp.osuosl.org/pub/pculture.org/miro/src/
@@ -27,7 +27,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bsddb>0:${PORTSDIR}/databases/py-bsddb \
${PYTHON_SITELIBDIR}/libtorrent.so:${PORTSDIR}/net-p2p/libtorrent-rasterbar-python \
${PYTHON_SITELIBDIR}/webkit/webkit.so:${PORTSDIR}/www/py-webkitgtk \
${PYTHON_SITELIBDIR}/gtk-2.0/gconf.so:${PORTSDIR}/x11-toolkits/py-gnome2 \
- ${PYTHON_SITELIBDIR}/pycurl.so:${PORTSDIR}/ftp/py-curl \
+ ${PYTHON_SITELIBDIR}/pycurl.so:${PORTSDIR}/ftp/py-pycurl \
${PYTHON_SITELIBDIR}/mutagen/__init__.py:${PORTSDIR}/audio/py-mutagen
BUILD_WRKSRC= ${WRKSRC}/linux
diff --git a/multimedia/spotify-websocket-api/Makefile b/multimedia/spotify-websocket-api/Makefile
index dd47129204fb..df98ec833c34 100644
--- a/multimedia/spotify-websocket-api/Makefile
+++ b/multimedia/spotify-websocket-api/Makefile
@@ -3,7 +3,7 @@
PORTNAME= SpotifyWebsocketAPI
PORTVERSION= 0.2
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= multimedia python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -42,7 +42,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests1>=1.1.0:${PORTSDIR}/www/py-requests
EXAMPLES_LIB_DEPENDS=libao.so:${PORTSDIR}/audio/libao \
libmpg123.so:${PORTSDIR}/audio/mpg123
-EXAMPLES_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}curl>=0:${PORTSDIR}/ftp/py-curl \
+EXAMPLES_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}pycurl>=0:${PORTSDIR}/ftp/py-pycurl \
${PYTHON_PKGNAMEPREFIX}gobject>=0:${PORTSDIR}/devel/py-gobject
EXAMPLES_USE= GSTREAMER=python
diff --git a/net/nsscache/Makefile b/net/nsscache/Makefile
index 336cb93b23fd..3d5eafde3181 100644
--- a/net/nsscache/Makefile
+++ b/net/nsscache/Makefile
@@ -3,7 +3,7 @@
PORTNAME= nsscache
PORTVERSION= 0.30
-PORTREVISION= 1
+PORTREVISION= 2
DISTVERSIONPREFIX= version/
CATEGORIES= net python
@@ -13,7 +13,7 @@ COMMENT= Python utility to create a local cache of directory services
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pycurl.so:${PORTSDIR}/ftp/py-curl \
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pycurl.so:${PORTSDIR}/ftp/py-pycurl \
${PYTHON_PKGNAMEPREFIX}ldap>0:${PORTSDIR}/net/py-ldap
USES= python:2
diff --git a/print/system-config-printer/Makefile b/print/system-config-printer/Makefile
index 0981975e324d..d77f9f21cba2 100644
--- a/print/system-config-printer/Makefile
+++ b/print/system-config-printer/Makefile
@@ -3,7 +3,7 @@
PORTNAME= system-config-printer
PORTVERSION= 1.4.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= print gnome
MASTER_SITES= http://cyberelk.net/tim/data/${PORTNAME}/${PORTVERSION:R}/
@@ -14,7 +14,7 @@ BUILD_DEPENDS= xmlto:${PORTSDIR}/textproc/xmlto \
docbook-xml>0:${PORTSDIR}/textproc/docbook-xml
LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cups.so:${PORTSDIR}/print/py-pycups \
- ${PYTHON_SITELIBDIR}/pycurl.so:${PORTSDIR}/ftp/py-curl \
+ ${PYTHON_SITELIBDIR}/pycurl.so:${PORTSDIR}/ftp/py-pycurl \
${LOCALBASE}/libexec/cups-pk-helper-mechanism:${PORTSDIR}/print/cups-pk-helper
# 1.5 series is python3 ignore them for now.
diff --git a/www/py-urlgrabber/Makefile b/www/py-urlgrabber/Makefile
index 63ff73389a04..05a2923bced8 100644
--- a/www/py-urlgrabber/Makefile
+++ b/www/py-urlgrabber/Makefile
@@ -3,7 +3,7 @@
PORTNAME= urlgrabber
PORTVERSION= 3.9.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www python
MASTER_SITES= http://urlgrabber.baseurl.org/download/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -14,8 +14,8 @@ COMMENT= High-level cross-protocol url-grabber
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PKGNAMEPREFIX}curl>=7.19.0_1:${PORTSDIR}/ftp/py-curl
-RUN_DEPENDS= ${PKGNAMEPREFIX}curl>=7.19.0_1:${PORTSDIR}/ftp/py-curl
+BUILD_DEPENDS= ${PKGNAMEPREFIX}pycurl>=7.19.0_1:${PORTSDIR}/ftp/py-pycurl
+RUN_DEPENDS= ${PKGNAMEPREFIX}pycurl>=7.19.0_1:${PORTSDIR}/ftp/py-pycurl
USES= python
USE_PYTHON= distutils
diff --git a/www/py-urljr/Makefile b/www/py-urljr/Makefile
index beeb6c968f4e..66d4bb83f5c4 100644
--- a/www/py-urljr/Makefile
+++ b/www/py-urljr/Makefile
@@ -3,7 +3,7 @@
PORTNAME= urljr
PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www python
MASTER_SITES= http://www.openidenabled.com/resources/downloads/python-openid/
MASTER_SITES= http://openidenabled.com/files/python-openid/files/
@@ -15,7 +15,7 @@ COMMENT= Common interface to HTTP fetchers for PycURL or urllib2
BROKEN= unfetchable
-BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/curl:${PORTSDIR}/ftp/py-curl
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycurl>=0:${PORTSDIR}/ftp/py-pycurl
USES= python
USE_PYTHON= autoplist distutils