Copy dateutil and pytz from BUILD_DEPENDS to RUN_DEPENDS, since

they are required.

Fix a few portlint nits while I'm here.

PR:		ports/162418
Submitted by:	olgeni
Approved by:	maintainer
Feature safe:	yes
This commit is contained in:
Jimmy Olgeni 2011-11-10 13:20:21 +00:00
parent be2e0e08c5
commit 3417c1452d
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=285444

View file

@ -8,7 +8,7 @@
PORTNAME= matplotlib PORTNAME= matplotlib
PORTVERSION= 1.0.1 PORTVERSION= 1.0.1
PORTREVISION= 1 PORTREVISION= 2
CATEGORIES= math python CATEGORIES= math python
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}/ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -21,13 +21,15 @@ BUILD_DEPENDS= ${PYNUMPY} \
${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz ${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
png.6:${PORTSDIR}/graphics/png png.6:${PORTSDIR}/graphics/png
RUN_DEPENDS= ${PYNUMPY} RUN_DEPENDS= ${PYNUMPY} \
${PYTHON_PKGNAMEPREFIX}dateutil>=1.4:${PORTSDIR}/devel/py-dateutil \
${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz
USE_PYTHON= 2.4+ USE_PYTHON= 2.4+
USE_PYDISTUTILS= yes USE_PYDISTUTILS=yes
CFLAGS+= -I${LOCALBASE}/include CFLAGS+= -I${LOCALBASE}/include
OPTIONS= GTKBACKEND "GTK backend support" ON \ OPTIONS= GTKBACKEND "GTK backend support" ON \
GTKAGGBACKEND "GTKAgg backend support" ON \ GTKAGGBACKEND "GTKAgg backend support" ON \
TKAGGBACKEND "TKAgg backend support" ON \ TKAGGBACKEND "TKAgg backend support" ON \
WXAGGBACKEND "WXAgg backend support" OFF WXAGGBACKEND "WXAgg backend support" OFF
@ -47,23 +49,23 @@ USE_GNOME= gtk20 pygtk2
.endif .endif
.if defined(WITH_GTKBACKEND) && !defined(WITHOUT_GTKBACKEND) .if defined(WITH_GTKBACKEND) && !defined(WITHOUT_GTKBACKEND)
GTK_BACKEND=True GTK_BACKEND= True
PLIST_SUB+= GTKBACKEND="" PLIST_SUB+= GTKBACKEND=""
.else .else
GTK_BACKEND=False GTK_BACKEND= False
PLIST_SUB+= GTKBACKEND="@comment " PLIST_SUB+= GTKBACKEND="@comment "
.endif .endif
.if defined(WITH_GTKAGGBACKEND) .if defined(WITH_GTKAGGBACKEND)
GTKAGG_BACKEND=True GTKAGG_BACKEND= True
PLIST_SUB+= GTKAGGBACKEND="" PLIST_SUB+= GTKAGGBACKEND=""
.else .else
GTKAGG_BACKEND=False GTKAGG_BACKEND= False
PLIST_SUB+= GTKAGGBACKEND="@comment " PLIST_SUB+= GTKAGGBACKEND="@comment "
.endif .endif
.if defined(WITH_TKAGGBACKEND) .if defined(WITH_TKAGGBACKEND)
@ -73,27 +75,27 @@ RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkint
USE_TCL_RUN= yes USE_TCL_RUN= yes
USE_TK_RUN= yes USE_TK_RUN= yes
TKAGG_BACKEND=True TKAGG_BACKEND= True
PLIST_SUB+= TKAGGBACKEND="" PLIST_SUB+= TKAGGBACKEND=""
.else .else
TKAGG_BACKEND=False TKAGG_BACKEND= False
PLIST_SUB+= TKAGGBACKEND="@comment " PLIST_SUB+= TKAGGBACKEND="@comment "
.endif .endif
.if defined(WITH_WXAGGBACKEND) .if defined(WITH_WXAGGBACKEND)
USE_WX= 2.6 USE_WX= 2.6
WX_COMPS= python WX_COMPS= python
CONFIGURE_ENV+= WX_CONFIG="${WX_CONFIG}" CONFIGURE_ENV+= WX_CONFIG="${WX_CONFIG}"
WXAGG_BACKEND=True WXAGG_BACKEND= True
PLIST_SUB+= WXAGGBACKEND="" PLIST_SUB+= WXAGGBACKEND=""
.else .else
WXAGG_BACKEND=False WXAGG_BACKEND= False
PLIST_SUB+= WXAGGBACKEND="@comment " PLIST_SUB+= WXAGGBACKEND="@comment "
.endif .endif
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>