3 files changed, 47 insertions, 39 deletions

diff --git a/audio/rbscrobbler/Makefile b/audio/rbscrobbler/Makefile
index fb4c41d66ec3..a0ef5ff74bb4 100644
--- a/audio/rbscrobbler/Makefile
+++ b/audio/rbscrobbler/Makefile
@@ -5,37 +5,45 @@
 # $FreeBSD$
 
 PORTNAME=	rbscrobbler
-PORTVERSION=	0.0.8
-PORTREVISION=	1
+PORTVERSION=	0.0.9
 CATEGORIES=	audio gnome
 MASTER_SITES=	http://members.cox.net/alexrevo/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Rhythmbox plugin for Audioscrobbler
 
-BUILD_DEPENDS=	rhythmbox:${PORTSDIR}/audio/rhythmbox \
-		${PYTHON_SITELIBDIR}/gtk-2.0/gnome/__init__.py:${PORTSDIR}/x11-toolkits/py-gnome2
-RUN_DEPENDS=	rhythmbox:${PORTSDIR}/audio/rhythmbox \
-		${PYTHON_SITELIBDIR}/gtk-2.0/gnome/__init__.py:${PORTSDIR}/x11-toolkits/py-gnome2
+RUN_DEPENDS=	rhythmbox:${PORTSDIR}/audio/rhythmbox
 
+USE_GNOME=	pygnomeextras
 USE_PYTHON=	yes
 USE_REINPLACE=	yes
-CFLAGS+=	"-I${PYTHON_INCLUDEDIR}"
+
+MAN1=		rbscrobbler.1
 
 post-patch:
-	${REINPLACE_CMD} -e "s,CFLAGS =,CFLAGS+= -I${PYTHON_INCLUDEDIR}," \
-		${WRKSRC}/trayicon/Makefile
+	@${FIND} ${WRKSRC} -name "Makefile" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|CFLAGS =|CFLAGS +=|g ; \
+		 s|/usr/include/python2.3/|${PYTHON_INCLUDEDIR}|g'
 
 do-install:
-	${MKDIR} ${DATADIR}
-	cd ${WRKSRC}; ${INSTALL_DATA} Audioscrobbler.py Debug.py MyQueue.py \
-		Rhythmbox_Bonobo.py RLInput.py singletonmixin.py ${DATADIR}
-	cd ${WRKSRC}; ${INSTALL_SCRIPT} rbscrobbler.py ${DATADIR}
-	ln -sf ${DATADIR}/rbscrobbler.py ${PREFIX}/bin/rbscrobbler
-	${MKDIR} ${DATADIR}/images
-	${INSTALL_DATA} ${WRKSRC}/images/*.png ${DATADIR}/images
-	${MKDIR} ${DATADIR}/trayicon
-	cd ${WRKSRC}; ${INSTALL_DATA} trayicon/__init__.py \
-		trayicon/trayicon.so ${DATADIR}/trayicon
+	${INSTALL_MAN} ${WRKSRC}/rbscrobbler.1 ${MANPREFIX}/man/man1
+	@${MKDIR} ${PYTHONPREFIX_SITELIBDIR}/rbscrobbler
+	${INSTALL_SCRIPT} ${WRKSRC}/rbscrobbler.py \
+		${PYTHONPREFIX_SITELIBDIR}/rbscrobbler
+	${LN} -sf ${PYTHONPREFIX_SITELIBDIR}/rbscrobbler/rbscrobbler.py \
+		${PREFIX}/bin/rbscrobbler
+.for file in Audioscrobbler.py Debug.py MyQueue.py Rhythmbox_Bonobo.py \
+	Scrobbler_Musicbrainz.py singletonmixin.py
+	${INSTALL_DATA} ${WRKSRC}/${file} \
+		${PYTHONPREFIX_SITELIBDIR}/rbscrobbler
+.endfor
+	@${MKDIR} ${PYTHONPREFIX_SITELIBDIR}/rbscrobbler/images
+	${INSTALL_DATA} ${WRKSRC}/images/*.png \
+		${PYTHONPREFIX_SITELIBDIR}/rbscrobbler/images
+	@${MKDIR} ${PYTHONPREFIX_SITELIBDIR}/rbscrobbler/trayicon
+.for file in trayicon/__init__.py trayicon/trayicon.so
+	${INSTALL_DATA} ${WRKSRC}/${file} \
+		${PYTHONPREFIX_SITELIBDIR}/rbscrobbler/trayicon
+.endfor
 
 .include <bsd.port.mk>
diff --git a/audio/rbscrobbler/distinfo b/audio/rbscrobbler/distinfo
index 1ef872c5dee1..039f5293fc24 100644
--- a/audio/rbscrobbler/distinfo
+++ b/audio/rbscrobbler/distinfo
@@ -1,2 +1,2 @@
-MD5 (rbscrobbler-0.0.8.tar.gz) = 9b9b0d0df99de8d56e9adad0db8c3737
-SIZE (rbscrobbler-0.0.8.tar.gz) = 25237
+MD5 (rbscrobbler-0.0.9.tar.gz) = 75ad3e39d953a7c46af140f36c71d596
+SIZE (rbscrobbler-0.0.9.tar.gz) = 32577
diff --git a/audio/rbscrobbler/pkg-plist b/audio/rbscrobbler/pkg-plist
index d3f49985cf39..e1572330c086 100644
--- a/audio/rbscrobbler/pkg-plist
+++ b/audio/rbscrobbler/pkg-plist
@@ -1,19 +1,19 @@
 bin/rbscrobbler
-%%DATADIR%%/Audioscrobbler.py
-%%DATADIR%%/Debug.py
-%%DATADIR%%/MyQueue.py
-%%DATADIR%%/Rhythmbox_Bonobo.py
-%%DATADIR%%/RLInput.py
-%%DATADIR%%/singletonmixin.py
-%%DATADIR%%/rbscrobbler.py
-%%DATADIR%%/images/icon-offline.png
-%%DATADIR%%/images/icon-online.png
-%%DATADIR%%/images/notsubmitted.png
-%%DATADIR%%/images/offline.png
-%%DATADIR%%/images/online.png
-%%DATADIR%%/images/submitted.png
-%%DATADIR%%/trayicon/__init__.py
-%%DATADIR%%/trayicon/trayicon.so
-@dirrm %%DATADIR%%/images
-@dirrm %%DATADIR%%/trayicon
-@dirrm %%DATADIR%%
+%%PYTHON_SITELIBDIR%%/rbscrobbler/Audioscrobbler.py
+%%PYTHON_SITELIBDIR%%/rbscrobbler/Debug.py
+%%PYTHON_SITELIBDIR%%/rbscrobbler/MyQueue.py
+%%PYTHON_SITELIBDIR%%/rbscrobbler/Rhythmbox_Bonobo.py
+%%PYTHON_SITELIBDIR%%/rbscrobbler/Scrobbler_Musicbrainz.py
+%%PYTHON_SITELIBDIR%%/rbscrobbler/singletonmixin.py
+%%PYTHON_SITELIBDIR%%/rbscrobbler/rbscrobbler.py
+%%PYTHON_SITELIBDIR%%/rbscrobbler/images/icon-offline.png
+%%PYTHON_SITELIBDIR%%/rbscrobbler/images/icon-online.png
+%%PYTHON_SITELIBDIR%%/rbscrobbler/images/notsubmitted.png
+%%PYTHON_SITELIBDIR%%/rbscrobbler/images/offline.png
+%%PYTHON_SITELIBDIR%%/rbscrobbler/images/online.png
+%%PYTHON_SITELIBDIR%%/rbscrobbler/images/submitted.png
+%%PYTHON_SITELIBDIR%%/rbscrobbler/trayicon/__init__.py
+%%PYTHON_SITELIBDIR%%/rbscrobbler/trayicon/trayicon.so
+@dirrm %%PYTHON_SITELIBDIR%%/rbscrobbler/trayicon
+@dirrm %%PYTHON_SITELIBDIR%%/rbscrobbler/images
+@dirrm %%PYTHON_SITELIBDIR%%/rbscrobbler