- update to 3.1.2

- remove no more needed files/patch-setup.py
- convert to optionsng

changelog:
http://blog.gpodder.org/2012/05/gpodder-312-capture-moon-released.html

1 files changed, 18 insertions, 18 deletions

diff --git a/multimedia/gpodder/Makefile b/multimedia/gpodder/Makefile
index d1d8a6b42df7..ff297309f604 100644
--- a/multimedia/gpodder/Makefile
+++ b/multimedia/gpodder/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gpodder
-PORTVERSION=	3.1.1
-PORTREVISION=	1
+PORTVERSION=	3.1.2
 CATEGORIES=	multimedia python
 MASTER_SITES=	http://gpodder.org/src/
 
@@ -23,13 +22,14 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3
 		${PYTHON_PKGNAMEPREFIX}mygpoclient>=1.4:${PORTSDIR}/devel/py-mygpoclient \
 		${PYTHON_PKGNAMEPREFIX}dbus>=0:${PORTSDIR}/devel/py-dbus
 
-OPTIONS=	GTK "With GTK UI" on \
-		NOTIFY "Display notification bubbles for different events" off \
-		MUTAGEN "Allow metadata manipulation" off \
-		OGG2MP3 "Ogg Vorbis conversion to MP3 support" off \
+OPTIONS_DEFINE=	GTK2 NOTIFY MUTAGEN OGG2MP3
+OPTIONS_DEFAULT=GTK2
+MUTAGEN_DESC=	Allow metadata manipulation
+OGG2MP3_DESC=	Ogg Vorbis conversion to MP3 support
+OPTIONS_EXCLUDE=NLS
 
 ALL_TARGET=	messages
-MAKE_ENV=	GPODDER_INSTALL_UIS="cli"
+MAKE_ENV=	GPODDER_MANPATH_NO_SHARE="yes"
 MAKEFILE=	makefile
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
@@ -37,38 +37,38 @@ USE_PYTHON=	-2.7
 WANT_GNOME=	yes
 INSTALLS_EGGINFO=yes
 INSTALLS_ICONS=	yes
+PORTDOCS=	PKG-INFO README
 
-MAN1=		gpo.1 ${PORTNAME}.1
+MAN1=		gpo.1
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_GTK)
-MAKE_ENV=	GPODDER_INSTALL_UIS="cli gtk"
+.if ${PORT_OPTIONS:MGTK2}
+MAKE_ENV+=	GPODDER_INSTALL_UIS="cli gtk"
+MAN1+=		${PORTNAME}.1
 PLIST_SUB+=	GTK=""
 RUN_DEPENDS+=	gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme \
 		xdg-open:${PORTSDIR}/devel/xdg-utils
 USE_GNOME=	pygtk2
 .else
+MAKE_ENV+=	GPODDER_INSTALL_UIS="cli"
 PLIST_SUB+=	GTK="@comment "
 .endif
-.if defined(WITH_NOTIFY)
+.if ${PORT_OPTIONS:MNOTIFY}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}notify>=0:${PORTSDIR}/devel/py-notify
 .endif
-.if defined(WITH_MUTAGEN)
+.if ${PORT_OPTIONS:MMUTAGEN}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mutagen>=0:${PORTSDIR}/audio/py-mutagen
 .endif
-.if defined(WITH_OGG2MP3)
+.if ${PORT_OPTIONS:MOGG2MP3}
 RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame \
 		oggdec:${PORTSDIR}/audio/vorbis-tools
 .endif
 
 post-install:
-.for man in ${MAN1}
-	${INSTALL_MAN} ${WRKSRC}/share/man/man1/${man} ${MANPREFIX}/man/man1/${man}
-.endfor
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-.for file in PKG-INFO README
+.for file in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif