update to 1.1

many fixes and improvements

4 files changed, 16 insertions, 76 deletions

diff --git a/audio/picard/Makefile b/audio/picard/Makefile
index b6b20a55ce5..bb12bf994f5 100644
--- a/audio/picard/Makefile
+++ b/audio/picard/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2012/10/02 23:48:04 asau Exp $
+# $NetBSD: Makefile,v 1.17 2012/11/06 18:41:44 drochner Exp $
 #
 
-DISTNAME=	picard-0.16
-PKGREVISION=	2
+DISTNAME=	picard-1.1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.musicbrainz.org/pub/musicbrainz/picard/
 
diff --git a/audio/picard/PLIST b/audio/picard/PLIST
index 9e8271de161..0260311a9df 100644
--- a/audio/picard/PLIST
+++ b/audio/picard/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2012/04/08 20:21:41 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2012/11/06 18:41:44 drochner Exp $
 bin/picard
 ${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/picard/__init__.py
@@ -123,9 +123,15 @@ ${PYSITELIB}/picard/ui/cdlookup.pyo
 ${PYSITELIB}/picard/ui/coverartbox.py
 ${PYSITELIB}/picard/ui/coverartbox.pyc
 ${PYSITELIB}/picard/ui/coverartbox.pyo
+${PYSITELIB}/picard/ui/edittagdialog.py
+${PYSITELIB}/picard/ui/edittagdialog.pyc
+${PYSITELIB}/picard/ui/edittagdialog.pyo
 ${PYSITELIB}/picard/ui/filebrowser.py
 ${PYSITELIB}/picard/ui/filebrowser.pyc
 ${PYSITELIB}/picard/ui/filebrowser.pyo
+${PYSITELIB}/picard/ui/infodialog.py
+${PYSITELIB}/picard/ui/infodialog.pyc
+${PYSITELIB}/picard/ui/infodialog.pyo
 ${PYSITELIB}/picard/ui/item.py
 ${PYSITELIB}/picard/ui/item.pyc
 ${PYSITELIB}/picard/ui/item.pyo
@@ -177,9 +183,6 @@ ${PYSITELIB}/picard/ui/options/matching.pyo
 ${PYSITELIB}/picard/ui/options/metadata.py
 ${PYSITELIB}/picard/ui/options/metadata.pyc
 ${PYSITELIB}/picard/ui/options/metadata.pyo
-${PYSITELIB}/picard/ui/options/moving.py
-${PYSITELIB}/picard/ui/options/moving.pyc
-${PYSITELIB}/picard/ui/options/moving.pyo
 ${PYSITELIB}/picard/ui/options/plugins.py
 ${PYSITELIB}/picard/ui/options/plugins.pyc
 ${PYSITELIB}/picard/ui/options/plugins.pyo
@@ -210,9 +213,6 @@ ${PYSITELIB}/picard/ui/puidsubmit.pyo
 ${PYSITELIB}/picard/ui/ratingwidget.py
 ${PYSITELIB}/picard/ui/ratingwidget.pyc
 ${PYSITELIB}/picard/ui/ratingwidget.pyo
-${PYSITELIB}/picard/ui/tageditor.py
-${PYSITELIB}/picard/ui/tageditor.pyc
-${PYSITELIB}/picard/ui/tageditor.pyo
 ${PYSITELIB}/picard/ui/tagsfromfilenames.py
 ${PYSITELIB}/picard/ui/tagsfromfilenames.pyc
 ${PYSITELIB}/picard/ui/tagsfromfilenames.pyo
@@ -222,9 +222,9 @@ ${PYSITELIB}/picard/ui/ui_cdlookup.pyo
 ${PYSITELIB}/picard/ui/ui_edittagdialog.py
 ${PYSITELIB}/picard/ui/ui_edittagdialog.pyc
 ${PYSITELIB}/picard/ui/ui_edittagdialog.pyo
-${PYSITELIB}/picard/ui/ui_metadata.py
-${PYSITELIB}/picard/ui/ui_metadata.pyc
-${PYSITELIB}/picard/ui/ui_metadata.pyo
+${PYSITELIB}/picard/ui/ui_infodialog.py
+${PYSITELIB}/picard/ui/ui_infodialog.pyc
+${PYSITELIB}/picard/ui/ui_infodialog.pyo
 ${PYSITELIB}/picard/ui/ui_options.py
 ${PYSITELIB}/picard/ui/ui_options.pyc
 ${PYSITELIB}/picard/ui/ui_options.pyo
@@ -258,9 +258,6 @@ ${PYSITELIB}/picard/ui/ui_options_matching.pyo
 ${PYSITELIB}/picard/ui/ui_options_metadata.py
 ${PYSITELIB}/picard/ui/ui_options_metadata.pyc
 ${PYSITELIB}/picard/ui/ui_options_metadata.pyo
-${PYSITELIB}/picard/ui/ui_options_moving.py
-${PYSITELIB}/picard/ui/ui_options_moving.pyc
-${PYSITELIB}/picard/ui/ui_options_moving.pyo
 ${PYSITELIB}/picard/ui/ui_options_plugins.py
 ${PYSITELIB}/picard/ui/ui_options_plugins.pyc
 ${PYSITELIB}/picard/ui/ui_options_plugins.pyo
@@ -288,9 +285,6 @@ ${PYSITELIB}/picard/ui/ui_passworddialog.pyo
 ${PYSITELIB}/picard/ui/ui_puidsubmit.py
 ${PYSITELIB}/picard/ui/ui_puidsubmit.pyc
 ${PYSITELIB}/picard/ui/ui_puidsubmit.pyo
-${PYSITELIB}/picard/ui/ui_tageditor.py
-${PYSITELIB}/picard/ui/ui_tageditor.pyc
-${PYSITELIB}/picard/ui/ui_tageditor.pyo
 ${PYSITELIB}/picard/ui/ui_tagsfromfilenames.py
 ${PYSITELIB}/picard/ui/ui_tagsfromfilenames.pyc
 ${PYSITELIB}/picard/ui/ui_tagsfromfilenames.pyo
@@ -332,54 +326,17 @@ share/icons/hicolor/24x24/apps/picard.png
 share/icons/hicolor/256x256/apps/picard.png
 share/icons/hicolor/32x32/apps/picard.png
 share/icons/hicolor/48x48/apps/picard.png
-share/locale/af/LC_MESSAGES/picard.mo
-share/locale/ar/LC_MESSAGES/picard.mo
-share/locale/ast/LC_MESSAGES/picard.mo
-share/locale/bg/LC_MESSAGES/picard.mo
-share/locale/ca/LC_MESSAGES/picard.mo
-share/locale/cs/LC_MESSAGES/picard.mo
-share/locale/cy/LC_MESSAGES/picard.mo
 share/locale/da/LC_MESSAGES/picard.mo
 share/locale/de/LC_MESSAGES/picard.mo
-share/locale/el/LC_MESSAGES/picard.mo
 share/locale/en/LC_MESSAGES/picard.mo
 share/locale/en_CA/LC_MESSAGES/picard.mo
 share/locale/en_GB/LC_MESSAGES/picard.mo
-share/locale/eo/LC_MESSAGES/picard.mo
 share/locale/es/LC_MESSAGES/picard.mo
 share/locale/et/LC_MESSAGES/picard.mo
-share/locale/fa/LC_MESSAGES/picard.mo
 share/locale/fi/LC_MESSAGES/picard.mo
-share/locale/fo/LC_MESSAGES/picard.mo
 share/locale/fr/LC_MESSAGES/picard.mo
-share/locale/fr_CA/LC_MESSAGES/picard.mo
-share/locale/fy/LC_MESSAGES/picard.mo
-share/locale/gl/LC_MESSAGES/picard.mo
-share/locale/he/LC_MESSAGES/picard.mo
-share/locale/hi/LC_MESSAGES/picard.mo
-share/locale/hu/LC_MESSAGES/picard.mo
-share/locale/id/LC_MESSAGES/picard.mo
-share/locale/is/LC_MESSAGES/picard.mo
 share/locale/it/LC_MESSAGES/picard.mo
-share/locale/ja/LC_MESSAGES/picard.mo
-share/locale/kn/LC_MESSAGES/picard.mo
-share/locale/ko/LC_MESSAGES/picard.mo
-share/locale/lt/LC_MESSAGES/picard.mo
-share/locale/nb/LC_MESSAGES/picard.mo
-share/locale/nds/LC_MESSAGES/picard.mo
 share/locale/nl/LC_MESSAGES/picard.mo
-share/locale/oc/LC_MESSAGES/picard.mo
 share/locale/pl/LC_MESSAGES/picard.mo
-share/locale/pt/LC_MESSAGES/picard.mo
 share/locale/pt_BR/LC_MESSAGES/picard.mo
-share/locale/ro/LC_MESSAGES/picard.mo
-share/locale/ru/LC_MESSAGES/picard.mo
-share/locale/sco/LC_MESSAGES/picard.mo
-share/locale/sk/LC_MESSAGES/picard.mo
-share/locale/sl/LC_MESSAGES/picard.mo
-share/locale/sr/LC_MESSAGES/picard.mo
 share/locale/sv/LC_MESSAGES/picard.mo
-share/locale/ta/LC_MESSAGES/picard.mo
-share/locale/tr/LC_MESSAGES/picard.mo
-share/locale/uk/LC_MESSAGES/picard.mo
-share/locale/zh_CN/LC_MESSAGES/picard.mo
diff --git a/audio/picard/distinfo b/audio/picard/distinfo
index af47ca83985..ff936211a27 100644
--- a/audio/picard/distinfo
+++ b/audio/picard/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.6 2011/12/11 12:39:27 obache Exp $
+$NetBSD: distinfo,v 1.7 2012/11/06 18:41:44 drochner Exp $
 
-SHA1 (picard-0.16.tar.gz) = 274071410550ee29051bb0137d72602921a015f9
-RMD160 (picard-0.16.tar.gz) = 375610cfd8ff03825e22af726730fa85c7cb54fd
-Size (picard-0.16.tar.gz) = 1828595 bytes
-SHA1 (patch-aa) = b045a8e14f88bb242974a31d9390fd48351fd452
+SHA1 (picard-1.1.tar.gz) = 8f4a65a2a2df2f371b907fdea7958c5bd0de6bd7
+RMD160 (picard-1.1.tar.gz) = 72969874a53ce9321a25b6b49ada4cf613de55b4
+Size (picard-1.1.tar.gz) = 1679228 bytes
diff --git a/audio/picard/patches/patch-aa b/audio/picard/patches/patch-aa
deleted file mode 100644
index 2682194304b..00000000000
--- a/audio/picard/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/07/07 09:39:22 drochner Exp $
-
---- setup.py.orig	2009-06-16 17:57:10.000000000 +0200
-+++ setup.py
-@@ -370,8 +370,8 @@ class picard_config(config):
-         if have_pkgconfig:
-             if self.pkgconfig_check_module('avcodec', 'libavcodec libavformat'):
-                 include_dirs = cflags_to_include_dirs(cfg.get('avcodec', 'cflags'))
--                if self.try_compile('#include <avcodec.h>', include_dirs=include_dirs):
--                    cfg.set('avcodec', 'cflags', cfg.get('avcodec', 'cflags') + ' -DUSE_OLD_FFMPEG_LOCATIONS')
-+                if self.try_compile('#include <libavcodec/avcodec.h>', include_dirs=include_dirs):
-+                    pass
-         else:
-             self.check_lib('avcodec', 'av_open_input_file', ['avcodec.h', 'avformat.h'], [['avcodec', 'avformat'], ['avcodec-51', 'avformat-51']])
-