Index: head/astro/weather/Makefile
===================================================================
--- head/astro/weather/Makefile	(revision 300081)
+++ head/astro/weather/Makefile	(revision 300082)
@@ -1,37 +1,40 @@
 # New ports collection makefile for:	weather
 # Date created:		2010-05-25
 # Whom:			Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	weather
-PORTVERSION=	1.5
+PORTVERSION=	2.0
 CATEGORIES=	astro python
 MASTER_SITES=	http://fungi.yuggoth.org/weather/src/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	An utility to provide current weather conditions and forecasts
 
-USE_PYTHON=	-2.7
+USE_PYTHON=	yes
+USE_XZ=		yes
 
-MAN1=		weather.1
-MAN5=		weatherrc.5
-PLIST_FILES=	bin/weather \
+MAN1=		${PORTNAME}.1
+MAN5=		${PORTNAME}rc.5
+PLIST_FILES=	bin/${PORTNAME} \
 		%%PYTHON_SITELIBDIR%%/${PORTNAME}.py \
-		%%PYTHON_SITELIBDIR%%/${PORTNAME}.pyc
+		%%PYTHON_SITELIBDIR%%/${PORTNAME}.pyc \
+		%%PYTHON_SITELIBDIR%%/${PORTNAME}.pyo
 
 post-patch:
-	@${REINPLACE_CMD} -e '1 s/python/${PYTHON_VERSION}/' ${WRKSRC}/weather
+	@${REINPLACE_CMD} -e '1 s|/usr/bin/env python|${PYTHON_CMD}|' ${WRKSRC}/${PORTNAME}
 
 do-build:
-	@${WRKSRC}/weather --version
+	@${PYTHON_CMD} -m compileall ${WRKSRC}/${PORTNAME}.py
+	@${PYTHON_CMD} -O -m compileall ${WRKSRC}/${PORTNAME}.py
 
 do-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/weather ${PREFIX}/bin/
-	@${INSTALL_DATA} ${WRKSRC}/weather.py ${WRKSRC}/weather.pyc ${PYTHON_SITELIBDIR}/
-	@${INSTALL_MAN} ${WRKSRC}/weather.1 ${MANPREFIX}/man/man1/
-	@${INSTALL_MAN} ${WRKSRC}/weatherrc.5 ${MANPREFIX}/man/man5/
+	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}
+	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTNAME}.py ${PORTNAME}.pyc ${PORTNAME}.pyo ${PYTHON_SITELIBDIR}/
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1/${PORTNAME}.1
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}rc.5 ${MANPREFIX}/man/man5/${PORTNAME}rc.5
 
 .include <bsd.port.mk>

Property changes on: head/astro/weather/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/astro/weather/distinfo
===================================================================
--- head/astro/weather/distinfo	(revision 300081)
+++ head/astro/weather/distinfo	(revision 300082)
@@ -1,2 +1,2 @@
-SHA256 (weather-1.5.tar.gz) = 4a88936ada82a7027d97e33edc9aea50222ee5a3092566bf82fc77952222711b
-SIZE (weather-1.5.tar.gz) = 16533
+SHA256 (weather-2.0.tar.xz) = 807aff002d31cd81aeaae096981c28900323c405b8f7d36625d9c7e48719347a
+SIZE (weather-2.0.tar.xz) = 8928144

Property changes on: head/astro/weather/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property