- 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

4 files changed, 25 insertions, 34 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
diff --git a/multimedia/gpodder/distinfo b/multimedia/gpodder/distinfo
index 00f6b6090530..971b7d7ae2b8 100644
--- a/multimedia/gpodder/distinfo
+++ b/multimedia/gpodder/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gpodder-3.1.1.tar.gz) = ac4041f3cde2dbe7ffe3b4773e9e79e8d4b663171f6af35a33504d80ad7f3608
-SIZE (gpodder-3.1.1.tar.gz) = 2055832
+SHA256 (gpodder-3.1.2.tar.gz) = af02fa422903905dfe91ac137a69ed3951b5c7f5e0c8e302c79bf59fe10f9ea9
+SIZE (gpodder-3.1.2.tar.gz) = 2088722
diff --git a/multimedia/gpodder/files/patch-setup.py b/multimedia/gpodder/files/patch-setup.py
deleted file mode 100644
index 532044f42616..000000000000
--- a/multimedia/gpodder/files/patch-setup.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./setup.py.orig	2012-02-24 02:54:22.000000000 +0400
-+++ ./setup.py	2012-05-01 11:53:17.000000000 +0400
-@@ -90,7 +90,7 @@
-                     return True
- 
-                 basename, _ = os.path.splitext(filename)
--                result = any(os.path.basename(s) == basename for s in scripts)
-+                result = False
-                 if not result:
-                     info('Skipping manpage without script:', filename)
-                 return result
diff --git a/multimedia/gpodder/pkg-plist b/multimedia/gpodder/pkg-plist
index f6ffc0343c67..7cf8db4d5fc2 100644
--- a/multimedia/gpodder/pkg-plist
+++ b/multimedia/gpodder/pkg-plist
@@ -111,8 +111,6 @@ bin/gpodder-migrate2tres
 %%PYTHON_SITELIBDIR%%/gpodder/youtube.pyc
 %%GTK%%share/applications/gpodder.desktop
 %%GTK%%share/dbus-1/services/org.gpodder.service
-%%PORTDOCS%%%%DOCSDIR%%/PKG-INFO
-%%PORTDOCS%%%%DOCSDIR%%/README
 %%DATADIR%%/credits.txt
 %%DATADIR%%/examples/gpodder_mark_played.py
 %%DATADIR%%/examples/hello_world.py
@@ -154,6 +152,7 @@ bin/gpodder-migrate2tres
 %%GTK%%share/icons/hicolor/48x48/gpodder.png
 %%GTK%%share/icons/hicolor/64x64/gpodder.png
 %%GTK%%share/icons/hicolor/scalable/apps/gpodder.svg
+share/locale/ca/LC_MESSAGES/gpodder.mo
 share/locale/cs/LC_MESSAGES/gpodder.mo
 share/locale/cs_CZ/LC_MESSAGES/gpodder.mo
 share/locale/da/LC_MESSAGES/gpodder.mo
@@ -161,11 +160,13 @@ share/locale/de/LC_MESSAGES/gpodder.mo
 share/locale/el/LC_MESSAGES/gpodder.mo
 share/locale/es/LC_MESSAGES/gpodder.mo
 share/locale/es_ES/LC_MESSAGES/gpodder.mo
+share/locale/es_MX/LC_MESSAGES/gpodder.mo
 share/locale/eu/LC_MESSAGES/gpodder.mo
 share/locale/fi/LC_MESSAGES/gpodder.mo
 share/locale/fr/LC_MESSAGES/gpodder.mo
 share/locale/gl/LC_MESSAGES/gpodder.mo
 share/locale/he/LC_MESSAGES/gpodder.mo
+share/locale/id_ID/LC_MESSAGES/gpodder.mo
 share/locale/it/LC_MESSAGES/gpodder.mo
 share/locale/kk/LC_MESSAGES/gpodder.mo
 share/locale/nb/LC_MESSAGES/gpodder.mo
@@ -185,6 +186,8 @@ share/locale/zh_CN/LC_MESSAGES/gpodder.mo
 @dirrmtry share/locale/tr_TR
 @dirrmtry share/locale/kk/LC_MESSAGES
 @dirrmtry share/locale/kk
+@dirrmtry share/locale/id_ID/LC_MESSAGES
+@dirrmtry share/locale/id_ID
 @dirrmtry share/locale/cs_CZ/LC_MESSAGES
 @dirrmtry share/locale/cs_CZ
 @dirrm %%DATADIR%%/ui/web
@@ -194,7 +197,6 @@ share/locale/zh_CN/LC_MESSAGES/gpodder.mo
 @dirrm %%DATADIR%%/extensions
 @dirrm %%DATADIR%%/examples
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%GTK%%@dirrmtry share/applications
 %%GTK%%@dirrmtry share/icons/hicolor
 %%GTK%%@dirrmtry share/icons/hicolor/26x26