- update to 3.5.2

- use option helpers
- support staging

changelog:
http://blog.gpodder.org/2013/09/gpodder-352-prime-mover-released.html

3 files changed, 19 insertions, 32 deletions

diff --git a/multimedia/gpodder/Makefile b/multimedia/gpodder/Makefile
index e666e81dc98a..97f9d5754c54 100644
--- a/multimedia/gpodder/Makefile
+++ b/multimedia/gpodder/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gpodder
-PORTVERSION=	3.5.1
+PORTVERSION=	3.5.2
 CATEGORIES=	multimedia python
 MASTER_SITES=	http://gpodder.org/src/
 
@@ -19,31 +19,30 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3
 		${PYTHON_PKGNAMEPREFIX}dbus>=0:${PORTSDIR}/devel/py-dbus \
 		${PYTHON_PKGNAMEPREFIX}eyed3>=0:${PORTSDIR}/audio/py-eyed3
 
-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
+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
+NOTIFY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}notify>=0:${PORTSDIR}/devel/py-notify
+MUTAGEN_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mutagen>=0:${PORTSDIR}/audio/py-mutagen
+OGG2MP3_RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame \
+			oggdec:${PORTSDIR}/audio/vorbis-tools
 
 ALL_TARGET=	messages
 MAKE_ENV=	GPODDER_MANPATH_NO_SHARE="yes"
 MAKEFILE=	makefile
-USES=		gettext
-USE_GMAKE=	yes
-USE_PYTHON=	-2.7
+USES=		gettext gmake shebangfix
+USE_PYTHON=	2
+SHEBANG_FILES=	src/gpodder/*.py share/gpodder/examples/*.py share/gpodder/extensions/*.py
 WANT_GNOME=	yes
-INSTALLS_EGGINFO=yes
 INSTALLS_ICONS=	yes
 PORTDOCS=	PKG-INFO README
 
-MAN1=		gpo.1
-
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .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
@@ -52,23 +51,9 @@ USE_GNOME=	pygtk2
 MAKE_ENV+=	GPODDER_INSTALL_UIS="cli"
 PLIST_SUB+=	GTK="@comment "
 .endif
-.if ${PORT_OPTIONS:MNOTIFY}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}notify>=0:${PORTSDIR}/devel/py-notify
-.endif
-.if ${PORT_OPTIONS:MMUTAGEN}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mutagen>=0:${PORTSDIR}/audio/py-mutagen
-.endif
-.if ${PORT_OPTIONS:MOGG2MP3}
-RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame \
-		oggdec:${PORTSDIR}/audio/vorbis-tools
-.endif
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-.for file in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/multimedia/gpodder/distinfo b/multimedia/gpodder/distinfo
index c602409701f4..803676b6cf2c 100644
--- a/multimedia/gpodder/distinfo
+++ b/multimedia/gpodder/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gpodder-3.5.1.tar.gz) = 444870458462a520c77982ae97855158d90914f203e3868dc8cd6dafb457d6f0
-SIZE (gpodder-3.5.1.tar.gz) = 1541924
+SHA256 (gpodder-3.5.2.tar.gz) = cfbaa7174e4153a82c094c87bd3669c5d7484aaed78a9428dd5f310dc2ec6fd5
+SIZE (gpodder-3.5.2.tar.gz) = 1546770
diff --git a/multimedia/gpodder/pkg-plist b/multimedia/gpodder/pkg-plist
index db3390c73ae2..105a078e6906 100644
--- a/multimedia/gpodder/pkg-plist
+++ b/multimedia/gpodder/pkg-plist
@@ -1,4 +1,6 @@
 bin/gpo
+man/man1/gpo.1.gz
+%%GTK%%man/man1/gpodder.1.gz
 %%GTK%%bin/gpodder
 bin/gpodder-migrate2tres
 %%PYTHON_SITELIBDIR%%/gpodder/__init__.py