From 0aba595f84c0722d477bdb3a419f9626a2d80f70 Mon Sep 17 00:00:00 2001
From: Wen Heping <wen@FreeBSD.org>
Date: Sun, 17 Feb 2013 00:01:20 +0000
Subject: [PATCH] - Update to 3.2.0 - Trim Makefile headers [1] - Convert to
 optionsNG [1]

PR:		173822 [1]
Submitted by:	Chris Petrik <c.petrik.sosa@gmail.com> [1]
---
 astro/py-RO/Makefile  | 23 +++++++++++------------
 astro/py-RO/distinfo  |  4 ++--
 astro/py-RO/pkg-plist | 15 ++++++++++++---
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/astro/py-RO/Makefile b/astro/py-RO/Makefile
index 6c66055141fc..a76ff93e1d3a 100644
--- a/astro/py-RO/Makefile
+++ b/astro/py-RO/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	py-RO
-# Date created:				Dec 26, 2010
-# Whom:					Wen Heping <wenheping@gmail.com>
-#
+# Created by: Wen Heping <wenheping@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	RO
-PORTVERSION=	2.9.3
+PORTVERSION=	3.2.0
 CATEGORIES=	astro python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,24 +13,27 @@ COMMENT=	Package of Python astronomical utilities
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/numpy/core/numeric.py:${PORTSDIR}/math/py-numpy
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-OPTIONS=	MATPLOTLIB "Add support for Matplotlib" Off \
-		PYFITS     "Add Support for PyFITS" On \
-		PYGAME     "Add Support for PyGame" Off
+OPTIONS_DEFINE=		MATPLOTLIB PYFITS PYGAME
+OPTIONS_DEFAULT=	PYFITS
+
+MATPLOTLIB_DESC=	Add support for Matplotlib
+PYFITS_DESC=		Add Support for PyFITS
+PYGAME_DESC=		Add Support for PyGame
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_MATPLOTLIB)
+.if ${PORT_OPTIONS:MMATPLOTLIB}
 RUN_DEPENDS+=	${PKGNAMEPREFIX}matplotlib>=0.98:${PORTSDIR}/math/py-matplotlib
 .endif
 
-.if !defined(WITHOUT_PYFITS)
+.if ${PORT_OPTIONS:MPYFITS}
 RUN_DEPENDS+=	${PKGNAMEPREFIX}pyfits>=1.1:${PORTSDIR}/astro/py-pyfits
 .endif
 
-.if defined(WITH_PYGAME)
+.if ${PORT_OPTIONS:MPYGAME}
 RUN_DEPENDS+=	${PKGNAMEPREFIX}game>=1.8.1:${PORTSDIR}/devel/py-game
 .endif
 
diff --git a/astro/py-RO/distinfo b/astro/py-RO/distinfo
index 9d1a7e3d9ccb..a547112eca3a 100644
--- a/astro/py-RO/distinfo
+++ b/astro/py-RO/distinfo
@@ -1,2 +1,2 @@
-SHA256 (RO-2.9.3.tar.gz) = 00bef6e0d618e50c5e46d1f0f3f76cad385e933564236dfa87fb358ff8e1271c
-SIZE (RO-2.9.3.tar.gz) = 674589
+SHA256 (RO-3.2.0.tar.gz) = 766b25a1e82cd5742a543f152a56a43d83a33604409ac9ec9ad0fdbe1a5220ca
+SIZE (RO-3.2.0.tar.gz) = 685706
diff --git a/astro/py-RO/pkg-plist b/astro/py-RO/pkg-plist
index 553114722447..9ad77bcb2f56 100644
--- a/astro/py-RO/pkg-plist
+++ b/astro/py-RO/pkg-plist
@@ -244,12 +244,18 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RO/CnvUtil.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RO/CnvUtil.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RO/CnvUtil.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RO/Comm/BaseSocket.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RO/Comm/BaseSocket.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RO/Comm/BaseSocket.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RO/Comm/BrowseURL.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RO/Comm/BrowseURL.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RO/Comm/BrowseURL.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RO/Comm/FTPGet.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RO/Comm/FTPGet.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RO/Comm/FTPGet.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RO/Comm/Generic.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RO/Comm/Generic.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RO/Comm/Generic.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RO/Comm/HTTPGet.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RO/Comm/HTTPGet.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RO/Comm/HTTPGet.pyo
@@ -268,6 +274,12 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RO/Comm/TkSocket.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RO/Comm/TkSocket.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RO/Comm/TkSocket.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RO/Comm/TwistedSocket.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RO/Comm/TwistedSocket.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RO/Comm/TwistedSocket.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RO/Comm/TwistedTimer.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RO/Comm/TwistedTimer.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RO/Comm/TwistedTimer.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RO/Comm/VMSTelnet.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RO/Comm/VMSTelnet.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RO/Comm/VMSTelnet.pyo
@@ -514,9 +526,6 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RO/Wdg/sampleDroplet.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RO/Wdg/sampleDroplet.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RO/Wdg/testImage.fits
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RO/Wdg/ztry StripChartWdg with joined axes; needs drawEvent work.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RO/Wdg/ztry StripChartWdg with joined axes; needs drawEvent work.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RO/Wdg/ztry StripChartWdg with joined axes; needs drawEvent work.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RO/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RO/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/RO/__init__.pyo