4 files changed, 124 insertions, 29 deletions

diff --git a/multimedia/quodlibet/Makefile b/multimedia/quodlibet/Makefile
index 5f374f982f66..1f29d1349433 100644
--- a/multimedia/quodlibet/Makefile
+++ b/multimedia/quodlibet/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	quodlibet
-PORTVERSION=	0.15
+PORTVERSION=	0.16
 CATEGORIES=	multimedia audio python
 MASTER_SITES=	http://www.sacredchao.net/~piman/software/
 
-MAINTAINER=	bh@izb.knu.ac.kr
+MAINTAINER=	changbom.yoon@gmail.com
 COMMENT=	A GTK+-based audio player written in Python
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/gst/__init__.py:${PORTSDIR}/multimedia/py-gstreamer \
@@ -60,10 +60,11 @@ do-build:
 .endif
 
 pre-install:
+	@${MKDIR} ${PREFIX}/lib/${PORTNAME}
 	@${MKDIR} ${PREFIX}/share/applications
 
 post-install:
-	@${MKDIR} ${PREFIX}/lib/${PORTNAME}/plugins
-	@${INSTALL_DATA} ${FILESDIR}/qlscrobbler.py ${PREFIX}/lib/${PORTNAME}/plugins
+	@${MKDIR} ${PREFIX}/share/${PORTNAME}/plugins
+	@${INSTALL_DATA} ${FILESDIR}/qlscrobbler.py ${PREFIX}/share/${PORTNAME}/plugins
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/quodlibet/distinfo b/multimedia/quodlibet/distinfo
index 79c6e2338105..1f0e2cec03c3 100644
--- a/multimedia/quodlibet/distinfo
+++ b/multimedia/quodlibet/distinfo
@@ -1,3 +1,3 @@
-MD5 (quodlibet-0.15.tar.gz) = 09b14d03e587af6ba929b18ed8e0df56
-SHA256 (quodlibet-0.15.tar.gz) = 20851cc270f17330204683b0a29ab86dcfbbfdda0e1c399c8f97836347063cf5
-SIZE (quodlibet-0.15.tar.gz) = 476236
+MD5 (quodlibet-0.16.tar.gz) = f47cdc1e8f7197a3cd281bd31b406d94
+SHA256 (quodlibet-0.16.tar.gz) = 8c23a08432f3be60d0d85ee650b7c12a30799a4bd307107b332db94b91db9a9d
+SIZE (quodlibet-0.16.tar.gz) = 552149
diff --git a/multimedia/quodlibet/files/patch-Makefile b/multimedia/quodlibet/files/patch-Makefile
index e6e12b3320ee..ba5e29d9c542 100644
--- a/multimedia/quodlibet/files/patch-Makefile
+++ b/multimedia/quodlibet/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	Fri Nov 11 16:06:26 2005
-+++ Makefile	Wed Dec 28 01:50:43 2005
-@@ -10,7 +10,6 @@
+--- Makefile.orig	2005-12-13 19:46:30.000000000 -0700
++++ Makefile	2006-01-04 03:20:58.787760884 -0700
+@@ -13,7 +13,6 @@
  	@./check.py
  
  make-install-dirs:
@@ -8,17 +8,26 @@
  	mkdir -p $(DESTDIR)$(PREFIX)/bin
  	mkdir -p $(DESTDIR)$(PREFIX)/$(TO)
  
-@@ -27,10 +26,10 @@
+@@ -24,7 +23,7 @@
+ # installing the SVN version will have intltool and so it will build fine.
+ install: make-install-dirs install-dirs install-programs
+ 	install -m 644 $(MODULES) rhythmbox-*.png $(DESTDIR)$(PREFIX)/$(TO)
+-	-for E in $(EXTENSIONS); do (test -e $$E && install -m 755 -D $$E $(DESTDIR)$(PREFIX)/$(TODEP)/$$E); done
++	-for E in $(EXTENSIONS); do (test -e $$E && install -m 755 $$E $(DESTDIR)$(PREFIX)/$(TODEP)/$$E); done
+ 	-cd po && make install-po DESTDIR=$(DESTDIR)
  
- install-%: make-install-dirs
+ install-dirs: $(addprefix dir-install-, $(MODULE_DIRS))
+@@ -37,10 +36,10 @@
+ 
+ app-install-%: make-install-dirs %.desktop
  	install -m 755 $*.py $(DESTDIR)$(PREFIX)/$(TO)
 -	install -m 644 $*.1 $(DESTDIR)$(PREFIX)/share/man/man1/$*.1
 -	install -D -m 644 $*.png $(DESTDIR)$(PREFIX)/share/pixmaps/$*.png
 +	install -m 644 $*.1 $(DESTDIR)$(PREFIX)/man/man1/$*.1
 +	install -m 644 $*.png $(DESTDIR)$(PREFIX)/share/pixmaps/$*.png
- 	install -m 644 $*.png $(DESTDIR)$(PREFIX)/$(TO)
--	install -D -m 644 $*.desktop $(DESTDIR)$(PREFIX)/share/applications/$*.desktop
-+	install -m 644 $*.desktop $(DESTDIR)$(PREFIX)/share/applications/$*.desktop
+ 	install -m 644 $*.svg $*.png $(DESTDIR)$(PREFIX)/$(TO)
+-	-install -D -m 644 $*.desktop $(DESTDIR)$(PREFIX)/share/applications/$*.desktop
++	-install -m 644 $*.desktop $(DESTDIR)$(PREFIX)/share/applications/$*.desktop
  	ln -sf ../$(TO)/$*.py $(DESTDIR)$(PREFIX)/bin/$*
  
  clean:
diff --git a/multimedia/quodlibet/pkg-plist b/multimedia/quodlibet/pkg-plist
index 013b238a3760..ff98634e3c4d 100644
--- a/multimedia/quodlibet/pkg-plist
+++ b/multimedia/quodlibet/pkg-plist
@@ -1,17 +1,7 @@
 bin/exfalso
 bin/quodlibet
-lib/quodlibet/exfalso.png
-lib/quodlibet/exfalso.py
-%%EXTENSIONS:%%lib/quodlibet/mmkeys.so
-lib/quodlibet/plugins/qlscrobbler.py
-lib/quodlibet/ql-volume-max.png
-lib/quodlibet/ql-volume-medium.png
-lib/quodlibet/ql-volume-min.png
-lib/quodlibet/ql-volume-zero.png
-lib/quodlibet/quodlibet.png
-lib/quodlibet/quodlibet.py
-lib/quodlibet/quodlibet.zip
-%%EXTENSIONS:%%lib/quodlibet/trayicon.so
+%%EXTENSIONS:%%lib/quodlibet/_mmkeys.so
+%%EXTENSIONS:%%lib/quodlibet/_trayicon.so
 share/applications/exfalso.desktop
 share/applications/quodlibet.desktop
 share/locale/bg/LC_MESSAGES/quodlibet.mo
@@ -30,8 +20,103 @@ share/locale/pt/LC_MESSAGES/quodlibet.mo
 share/locale/ru/LC_MESSAGES/quodlibet.mo
 share/pixmaps/exfalso.png
 share/pixmaps/quodlibet.png
+share/quodlibet/browsers/__init__.py
+share/quodlibet/browsers/_base.py
+share/quodlibet/browsers/albums.py
+share/quodlibet/browsers/audiofeeds.py
+share/quodlibet/browsers/filesystem.py
+share/quodlibet/browsers/iradio.py
+share/quodlibet/browsers/paned.py
+share/quodlibet/browsers/playlists.py
+share/quodlibet/browsers/search.py
+share/quodlibet/config.py
+share/quodlibet/const.py
+share/quodlibet/exfalso.png
+share/quodlibet/exfalso.py
+share/quodlibet/exfalso.svg
+share/quodlibet/formats/__init__.py
+share/quodlibet/formats/_apev2.py
+share/quodlibet/formats/_audio.py
+share/quodlibet/formats/_vorbis.py
+share/quodlibet/formats/ape.py
+share/quodlibet/formats/flac_.py
+share/quodlibet/formats/mod.py
+share/quodlibet/formats/mp3.py
+share/quodlibet/formats/mp4.py
+share/quodlibet/formats/mpc.py
+share/quodlibet/formats/oggvorbis.py
+share/quodlibet/formats/remote.py
+share/quodlibet/formats/wavpack.py
+share/quodlibet/library.py
+share/quodlibet/mutagen/__init__.py
+share/quodlibet/mutagen/_constants.py
+share/quodlibet/mutagen/apev2.py
+share/quodlibet/mutagen/id3.py
+share/quodlibet/parse/__init__.py
+share/quodlibet/parse/_match.py
+share/quodlibet/parse/_pattern.py
+share/quodlibet/parse/_query.py
+share/quodlibet/player.py
+share/quodlibet/plugins.py
+share/quodlibet/plugins/qlscrobbler.py
+share/quodlibet/qltk/__init__.py
+share/quodlibet/qltk/about.py
+share/quodlibet/qltk/browser.py
+share/quodlibet/qltk/cbes.py
+share/quodlibet/qltk/ccb.py
+share/quodlibet/qltk/chooser.py
+share/quodlibet/qltk/completion.py
+share/quodlibet/qltk/controls.py
+share/quodlibet/qltk/count.py
+share/quodlibet/qltk/cover.py
+share/quodlibet/qltk/delete.py
+share/quodlibet/qltk/downloader.py
+share/quodlibet/qltk/entry.py
+share/quodlibet/qltk/exfalso.py
+share/quodlibet/qltk/filesel.py
+share/quodlibet/qltk/getstring.py
+share/quodlibet/qltk/info.py
+share/quodlibet/qltk/information.py
+share/quodlibet/qltk/mmkeys.py
+share/quodlibet/qltk/msg.py
+share/quodlibet/qltk/playorder.py
+share/quodlibet/qltk/pluginwin.py
+share/quodlibet/qltk/prefs.py
+share/quodlibet/qltk/properties.py
+share/quodlibet/qltk/queue.py
+share/quodlibet/qltk/quodlibet.py
+share/quodlibet/qltk/remote.py
+share/quodlibet/qltk/sliderbutton.py
+share/quodlibet/qltk/songlist.py
+share/quodlibet/qltk/trayicon.py
+share/quodlibet/qltk/views.py
+share/quodlibet/qltk/watcher.py
+share/quodlibet/qltk/wlw.py
+share/quodlibet/qltk/x.py
+share/quodlibet/quodlibet.png
+share/quodlibet/quodlibet.py
+share/quodlibet/quodlibet.svg
+share/quodlibet/rhythmbox-volume-max.png
+share/quodlibet/rhythmbox-volume-medium.png
+share/quodlibet/rhythmbox-volume-min.png
+share/quodlibet/rhythmbox-volume-zero.png
+share/quodlibet/stock.py
+share/quodlibet/util.py
+share/quodlibet/widgets.py
 @unexec rmdir %D/share/applications 2>/dev/null || true
-@exec mkdir -p %D/lib/quodlibet/plugins
-@dirrm lib/quodlibet/plugins
+@exec mkdir -p %D/share/quodlibet/plugins
+@dirrm share/quodlibet/plugins
 @exec mkdir -p %D/lib/quodlibet
 @dirrm lib/quodlibet
+@exec mkdir -p %D/share/quodlibet/browsers
+@dirrm share/quodlibet/browsers
+@exec mkdir -p %D/share/quodlibet/formats
+@dirrm share/quodlibet/formats
+@exec mkdir -p %D/share/quodlibet/mutagen
+@dirrm share/quodlibet/mutagen
+@exec mkdir -p %D/share/quodlibet/parse
+@dirrm share/quodlibet/parse
+@exec mkdir -p %D/share/quodlibet/qltk
+@dirrm share/quodlibet/qltk
+@exec mkdir -p %D/share/quodlibet
+@dirrm share/quodlibet