svn commit: r370035 - in head: print/py-trml2pdf www/py-satchmo

[Antoine Brodin]

Author: antoine
Date: Sun Oct  5 06:59:24 2014
New Revision: 370035
URL: https://svnweb.freebsd.org/changeset/ports/370035
QAT: https://qat.redports.org/buildarchive/r370035/

Log:
  Unbreak py-satchmo, it depended on both py-imaging (self+via py-sorl-thumbnail) and py-pillow (via py-trml2pdf)

Modified:
  head/print/py-trml2pdf/Makefile
  head/print/py-trml2pdf/pkg-plist
  head/www/py-satchmo/Makefile

Modified: head/print/py-trml2pdf/Makefile
==============================================================================
--- head/print/py-trml2pdf/Makefile	Sun Oct  5 04:13:48 2014	(r370034)
+++ head/print/py-trml2pdf/Makefile	Sun Oct  5 06:59:24 2014	(r370035)
@@ -3,7 +3,7 @@
 
 PORTNAME=	trml2pdf
 PORTVERSION=	1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print python
 MASTER_SITES=	SF/kraft/${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,13 +11,12 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports at caomhin.org
 COMMENT=	Tiny RML2PDF easily creates PDF documents
 
-RUN_DEPENDS=	${LOCALBASE}/bin/pildriver.py:${PORTSDIR}/graphics/py-imaging \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
 		${PYTHON_PKGNAMEPREFIX}reportlab1>=0:${PORTSDIR}/print/py-reportlab1
 
 NO_BUILD=	yes
 
-USES=	tar:bzip2
-USE_PYTHON=	yes
+USES=		python tar:bzip2
 
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}

Modified: head/print/py-trml2pdf/pkg-plist
==============================================================================
--- head/print/py-trml2pdf/pkg-plist	Sun Oct  5 04:13:48 2014	(r370034)
+++ head/print/py-trml2pdf/pkg-plist	Sun Oct  5 06:59:24 2014	(r370035)
@@ -36,8 +36,3 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rmls/pict/replogo.gif
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rmls/pict/screenshot.jpg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rmls/pict/tiny_logo.png
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/rmls/pict
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/rmls
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
- at dirrm %%PYTHON_SITELIBDIR%%/trml2pdf

Modified: head/www/py-satchmo/Makefile
==============================================================================
--- head/www/py-satchmo/Makefile	Sun Oct  5 04:13:48 2014	(r370034)
+++ head/www/py-satchmo/Makefile	Sun Oct  5 06:59:24 2014	(r370035)
@@ -3,7 +3,7 @@
 
 PORTNAME=	satchmo
 PORTVERSION=	0.9.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	http://www.caomhin.org/ports/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,33 +11,32 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports at caomhin.org
 COMMENT=	Shopping cart application for Django
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_hg>=0.4:${PORTSDIR}/devel/py-setuptools_hg
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>=1.2.3:${PORTSDIR}/www/py-django \
-				${PYTHON_PKGNAMEPREFIX}pycrypto>=0:${PORTSDIR}/security/py-pycrypto \
-				${PYTHON_PKGNAMEPREFIX}reportlab1>=0:${PORTSDIR}/print/py-reportlab1 \
-				${PYTHON_PKGNAMEPREFIX}trml2pdf>=0:${PORTSDIR}/print/py-trml2pdf \
-				${PYTHON_PKGNAMEPREFIX}django-registration>=0.8:${PORTSDIR}/www/py-django-registration \
-				${PYTHON_PKGNAMEPREFIX}yaml>=0:${PORTSDIR}/devel/py-yaml \
-				${PYTHON_PKGNAMEPREFIX}imaging>=0:${PORTSDIR}/graphics/py-imaging \
-				${PYTHON_PKGNAMEPREFIX}sorl-thumbnail<4:${PORTSDIR}/graphics/py-sorl-thumbnail \
-				${PYTHON_PKGNAMEPREFIX}django-caching-app-plugins>=0:${PORTSDIR}/www/py-django-caching-app-plugins \
-				${PYTHON_PKGNAMEPREFIX}django-keyedcache>=0:${PORTSDIR}/www/py-django-keyedcache \
-				${PYTHON_PKGNAMEPREFIX}django-livesettings>=0:${PORTSDIR}/www/py-django-livesettings \
-				${PYTHON_PKGNAMEPREFIX}django-signals-ahoy>=0:${PORTSDIR}/www/py-django-signals-ahoy \
-				${PYTHON_PKGNAMEPREFIX}django-threaded-multihost>=0:${PORTSDIR}/www/py-django-threaded-multihost
-
-USES=		gettext
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+		${PYTHON_PKGNAMEPREFIX}pycrypto>=0:${PORTSDIR}/security/py-pycrypto \
+		${PYTHON_PKGNAMEPREFIX}reportlab1>=0:${PORTSDIR}/print/py-reportlab1 \
+		${PYTHON_PKGNAMEPREFIX}trml2pdf>=0:${PORTSDIR}/print/py-trml2pdf \
+		${PYTHON_PKGNAMEPREFIX}django-registration>=0.8:${PORTSDIR}/www/py-django-registration \
+		${PYTHON_PKGNAMEPREFIX}yaml>=0:${PORTSDIR}/devel/py-yaml \
+		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
+		${PYTHON_PKGNAMEPREFIX}sorl-thumbnail<4:${PORTSDIR}/graphics/py-sorl-thumbnail \
+		${PYTHON_PKGNAMEPREFIX}django-caching-app-plugins>=0:${PORTSDIR}/www/py-django-caching-app-plugins \
+		${PYTHON_PKGNAMEPREFIX}django-keyedcache>=0:${PORTSDIR}/www/py-django-keyedcache \
+		${PYTHON_PKGNAMEPREFIX}django-livesettings>=0:${PORTSDIR}/www/py-django-livesettings \
+		${PYTHON_PKGNAMEPREFIX}django-signals-ahoy>=0:${PORTSDIR}/www/py-django-signals-ahoy \
+		${PYTHON_PKGNAMEPREFIX}django-threaded-multihost>=0:${PORTSDIR}/www/py-django-threaded-multihost
+
+USES=		gettext python
+USE_PYTHON=	distutils autoplist
 
 OPTIONS_DEFINE=	SOUTH FEDEX AKISMET
 OPTIONS_DEFAULT=FEDEX
 
-SOUTH_DESC=		Use South database migration tool for upgrades
-FEDEX_DESC=		Use Fedex web services for shipping
+SOUTH_DESC=	Use South database migration tool for upgrades
+FEDEX_DESC=	Use Fedex web services for shipping
 AKISMET_DESC=	Use Akismet for spam filtering on product reviews
 
 .include <bsd.port.options.mk>