3 files changed, 48 insertions, 26 deletions

diff --git a/sysutils/pyrenamer/Makefile b/sysutils/pyrenamer/Makefile
index 3ab96b70495f..1d2b8bc0d9dd 100644
--- a/sysutils/pyrenamer/Makefile
+++ b/sysutils/pyrenamer/Makefile
@@ -7,38 +7,45 @@
 #
 
 PORTNAME=	pyrenamer
-DISTVERSION=	0.5.0
-PORTREVISION=	1
+PORTVERSION=	0.6.0
 CATEGORIES=	sysutils python gnome
-MASTER_SITES=	http://www.infinicode.org/code/${PORTNAME}/
+MASTER_SITES=	http://www.infinicode.org/code/pyrenamer/files/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A mass file renamer written in PyGTK
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/eyeD3/__init__.py:${PORTSDIR}/audio/py-eyed3
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/eyeD3/__init__.py:${PORTSDIR}/audio/py-eyed3
-
-USE_GMAKE=	yes
-USE_GNOME=	gnomehack gnomeprefix gconf2 pygtk2
+USE_GNOME=	gconf2 gnomehack pygtk2
 USE_PYTHON=	yes
 USE_GETTEXT=	yes
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-DOCS=		AUTHORS COPYING ChangeLog NEWS README
 MAN1=		pyrenamer.1
 GCONF_SCHEMAS=	pyrenamer.schemas
 
+.if defined(WITHOUT_HACHOIR)
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/eyeD3/__init__.py:${PORTSDIR}/audio/py-eyed3
+.else
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/hachoir_metadata/__init__.py:${PORTSDIR}/sysutils/hachoir-metadata
+.endif
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|[$$][(]datadir[)]/doc/pyrenamer|${EXAMPLESDIR}|g' \
-		${WRKSRC}/doc/Makefile.in
+	@${REINPLACE_CMD} -e '/^SUBDIRS/s|doc||g' ${WRKSRC}/Makefile.in
 
-.ifndef (NOPORTDOCS)
 post-install:
+	${INSTALL_MAN} ${WRKSRC}/doc/pyrenamer.1 ${MANPREFIX}/man/man1
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for i in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+.for file in AUTHORS ChangeLog NEWS README
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
+.endif
+.if !defined(NOPORTEXAMPLES)
+	@${MKDIR} ${EXAMPLESDIR}
+.for file in treefilebrowser_example.py
+	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${EXAMPLESDIR}
 .endfor
 .endif
 
diff --git a/sysutils/pyrenamer/distinfo b/sysutils/pyrenamer/distinfo
index 84c281afcfdc..e0fdfd8c3e5b 100644
--- a/sysutils/pyrenamer/distinfo
+++ b/sysutils/pyrenamer/distinfo
@@ -1,3 +1,3 @@
-MD5 (pyrenamer-0.5.0.tar.gz) = 35d24ebf7aece5fa7367d71a2e507ebc
-SHA256 (pyrenamer-0.5.0.tar.gz) = a5d4f181f7d7d5fce5051e6d0f32b1419cac279f9ce10cdd6a992c0ffa5f41ed
-SIZE (pyrenamer-0.5.0.tar.gz) = 231605
+MD5 (pyrenamer-0.6.0.tar.gz) = a7159f803cd919ab76f17789189c577b
+SHA256 (pyrenamer-0.6.0.tar.gz) = 57afbabd4814efa2378de9b6d84808986eb269bd54d13467f8cf20e0122dc92a
+SIZE (pyrenamer-0.6.0.tar.gz) = 255793
diff --git a/sysutils/pyrenamer/pkg-plist b/sysutils/pyrenamer/pkg-plist
index b0485d581295..261119ece653 100644
--- a/sysutils/pyrenamer/pkg-plist
+++ b/sysutils/pyrenamer/pkg-plist
@@ -11,25 +11,40 @@ bin/pyrenamer
 %%PYTHON_SITELIBDIR%%/pyrenamer/pyrenamer.py
 %%PYTHON_SITELIBDIR%%/pyrenamer/pyrenamer.pyc
 %%PYTHON_SITELIBDIR%%/pyrenamer/pyrenamer.pyo
+%%PYTHON_SITELIBDIR%%/pyrenamer/pyrenamer_filefuncs.py
+%%PYTHON_SITELIBDIR%%/pyrenamer/pyrenamer_filefuncs.pyc
+%%PYTHON_SITELIBDIR%%/pyrenamer/pyrenamer_filefuncs.pyo
 %%PYTHON_SITELIBDIR%%/pyrenamer/pyrenamer_globals.py
 %%PYTHON_SITELIBDIR%%/pyrenamer/pyrenamer_globals.pyc
 %%PYTHON_SITELIBDIR%%/pyrenamer/pyrenamer_globals.pyo
-%%PYTHON_SITELIBDIR%%/pyrenamer/pyrenamerfilefuncs.py
-%%PYTHON_SITELIBDIR%%/pyrenamer/pyrenamerfilefuncs.pyc
-%%PYTHON_SITELIBDIR%%/pyrenamer/pyrenamerfilefuncs.pyo
-%%PYTHON_SITELIBDIR%%/pyrenamer/tooltips.py
-%%PYTHON_SITELIBDIR%%/pyrenamer/tooltips.pyc
-%%PYTHON_SITELIBDIR%%/pyrenamer/tooltips.pyo
+%%PYTHON_SITELIBDIR%%/pyrenamer/pyrenamer_menu_cb.py
+%%PYTHON_SITELIBDIR%%/pyrenamer/pyrenamer_menu_cb.pyc
+%%PYTHON_SITELIBDIR%%/pyrenamer/pyrenamer_menu_cb.pyo
+%%PYTHON_SITELIBDIR%%/pyrenamer/pyrenamer_metadata.py
+%%PYTHON_SITELIBDIR%%/pyrenamer/pyrenamer_metadata.pyc
+%%PYTHON_SITELIBDIR%%/pyrenamer/pyrenamer_metadata.pyo
+%%PYTHON_SITELIBDIR%%/pyrenamer/pyrenamer_pattern_editor.py
+%%PYTHON_SITELIBDIR%%/pyrenamer/pyrenamer_pattern_editor.pyc
+%%PYTHON_SITELIBDIR%%/pyrenamer/pyrenamer_pattern_editor.pyo
+%%PYTHON_SITELIBDIR%%/pyrenamer/pyrenamer_prefs.py
+%%PYTHON_SITELIBDIR%%/pyrenamer/pyrenamer_prefs.pyc
+%%PYTHON_SITELIBDIR%%/pyrenamer/pyrenamer_prefs.pyo
+%%PYTHON_SITELIBDIR%%/pyrenamer/pyrenamer_tooltips.py
+%%PYTHON_SITELIBDIR%%/pyrenamer/pyrenamer_tooltips.pyc
+%%PYTHON_SITELIBDIR%%/pyrenamer/pyrenamer_tooltips.pyo
+%%PYTHON_SITELIBDIR%%/pyrenamer/pyrenamer_undo.py
+%%PYTHON_SITELIBDIR%%/pyrenamer/pyrenamer_undo.pyc
+%%PYTHON_SITELIBDIR%%/pyrenamer/pyrenamer_undo.pyo
 %%PYTHON_SITELIBDIR%%/pyrenamer/treefilebrowser.py
 %%PYTHON_SITELIBDIR%%/pyrenamer/treefilebrowser.pyc
 %%PYTHON_SITELIBDIR%%/pyrenamer/treefilebrowser.pyo
 share/applications/pyrenamer.desktop
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%EXAMPLESDIR%%/treefilebrowser_example.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/treefilebrowser_example.py
+share/locale/de/LC_MESSAGES/pyrenamer.mo
 share/locale/en/LC_MESSAGES/pyrenamer.mo
 share/locale/es/LC_MESSAGES/pyrenamer.mo
 share/locale/fr/LC_MESSAGES/pyrenamer.mo
@@ -39,7 +54,7 @@ share/pixmaps/pyrenamer.png
 %%DATADIR%%/pyrenamer.svg
 %%DATADIR%%/stop.png
 @dirrm %%DATADIR%%
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/applications
 @dirrm %%PYTHON_SITELIBDIR%%/pyrenamer