- Apply a patch (files/patch-sonata.py) to solve the conflict

  with net/mpich2 (problem reported by [1])
- Bump PORTREVISION
- Update MASTER_SITES
- Add LICENSE (GPLv3)
- Convert to the new options framework

PR:		ports/150295
Submitted by:	Robert Jenssen <robertjenssen at ozemail.com.au>  [1]

2 files changed, 37 insertions, 22 deletions

diff --git a/audio/sonata/Makefile b/audio/sonata/Makefile
index d52103265022..8e7a79896b65 100644
--- a/audio/sonata/Makefile
+++ b/audio/sonata/Makefile
@@ -7,14 +7,15 @@
 
 PORTNAME=	sonata
 PORTVERSION=	1.6.2.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio python
-MASTER_SITES=	${MASTER_SITE_BERLIOS}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	http://codingteam.net/project/sonata/upload/releases/
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	An elegant music player for MPD
 
+LICENSE=	GPLv3
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mpd>=0.2.0:${PORTSDIR}/audio/py-mpd
 
 USE_GETTEXT=	yes
@@ -24,47 +25,50 @@ USE_PYDISTUTILS=	yes
 
 PYDISTUTILS_PKGNAME=	Sonata
 
-OPTIONS=	MMKEYS	"Enable instance single support for mmkeys" off \
-		MPD	"Install Music Player Daemon" on \
-		PYGNOMEEXTRAS	"Use py-gnome-extras for enhanced system tray" off \
-		TAGLIB	"Install support for editing metadata" off \
-		ZSI	"Install support for automatic lyrics fetching" off
+OPTIONS_DEFINE=	DOCS MANPAGES MMKEYS MPD PYGNOMEEXTRAS TAGLIB ZSI
+OPTIONS_DEFAULT=	MPD
+MMKEYS_DESC=	Enable instance single support for mmkeys
+MPD_DESC=	Install Music Player Daemon
+PYGNOMEEXTRAS_DESC=	Use py-gnome-extras for enhanced system tray
+TAGLIB_DESC=	Install support for editing metadata
+ZSI_DESC=	Install support for automatic lyrics fetching
+
+.include <bsd.port.options.mk>
 
-REINPLACE_ARGS=	-i.bak -e 's,%%DOCSDIR%%,${DOCSDIR},'
+REINPLACE_ARGS=	-i.bak -e 's,%%DOCSDIR%%,${DOCSDIR},' \
+		-e 's,%%PREFIX%%,${PREFIX},'
+
+post-patch:
+	@${REINPLACE_CMD} ${WRKSRC}/${PYSETUP} ${WRKSRC}/sonata.py
 
-.if !defined(NO_INSTALL_MANPAGES)
+.if ${PORT_OPTIONS:MMANPAGES}
 MAN1=	${PORTNAME}.1
 .else
 MAKE_ENV=	NO_INSTALL_MANPAGES=${NO_INSTALL_MANPAGES}
 .endif
 
-.if defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 MAKE_ENV+=	NOPORTDOCS=${NOPORTDOCS}
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} ${WRKSRC}/${PYSETUP}
-
-.include <bsd.port.pre.mk>
-
-.if defined (WITH_MPD)
+.if ${PORT_OPTIONS:MMPD}
 RUN_DEPENDS+=	musicpd:${PORTSDIR}/audio/musicpd
 .endif
 
-.if defined (WITH_MMKEYS)
+.if ${PORT_OPTIONS:MMMKEYS}
 RUN_DEPENDS+=${PYTHON_PKGNAMEPREFIX}dbus>=0.82.4:${PORTSDIR}/devel/py-dbus
 .endif
 
-.if defined (WITH_PYGNOMEEXTRAS)
+.if ${PORT_OPTIONS:MPYGNOMEEXTRAS}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}gnome-extras>=2.25.3_4:${PORTSDIR}/x11-toolkits/py-gnome-extras
 .endif
 
-.if defined (WITH_TAGLIB)
+.if ${PORT_OPTIONS:MTAGLIB}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}tagpy>=0.94.5:${PORTSDIR}/audio/py-tagpy
 .endif
 
-.if defined (WITH_ZSI)
+.if ${PORT_OPTIONS:MZSI}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}zsi>=2.0,1:${PORTSDIR}/net/py-zsi
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/sonata/files/patch-sonata.py b/audio/sonata/files/patch-sonata.py
new file mode 100644
index 000000000000..751d80e0214d
--- /dev/null
+++ b/audio/sonata/files/patch-sonata.py
@@ -0,0 +1,11 @@
+--- ./sonata.py.orig	2012-07-17 15:55:43.000000000 +0200
++++ ./sonata.py	2012-07-17 15:56:48.000000000 +0200
+@@ -59,6 +59,8 @@
+ # https://bugs.launchpad.net/ubuntu/+source/zsi/+bug/208855
+ sys.path.append('/usr/lib/python2.5/site-packages/oldxml')
+ 
++sys.path.remove('%%PREFIX%%/bin')
++
+ # hint for gnome.init to set the process name to 'sonata'
+ if platform.system() == 'Linux':
+ 	sys.argv[0] = 'sonata'