Update to 2.2

PR:		based on ports/142191
Submitted by:	C-S <c-s at c-s.li>

4 files changed, 84 insertions, 114 deletions

diff --git a/misc/tellico-kde4/Makefile b/misc/tellico-kde4/Makefile
index 013075d0e6ba..a57cb69f0c6c 100644
--- a/misc/tellico-kde4/Makefile
+++ b/misc/tellico-kde4/Makefile
@@ -6,54 +6,26 @@
 #
 
 PORTNAME=	tellico
-PORTVERSION=	1.3.5
-PORTREVISION=	3
+PORTVERSION=	2.2
 CATEGORIES=	misc kde
 MASTER_SITES=	http://tellico-project.org/files/
 
-MAINTAINER=	markus@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Collection manager for KDE
 
 LIB_DEPENDS=	tag:${PORTSDIR}/audio/taglib \
-		poppler-qt:${PORTSDIR}/graphics/poppler-qt \
-		yaz.3:${PORTSDIR}/net/yaz \
-		exempi:${PORTSDIR}/textproc/exempi
-
-USE_KDELIBS_VER=3
-USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
-USE_PYTHON=	yes
-
-CONFIGURE_ARGS+=	--disable-cdtext
-
-OPTIONS=	CDDB "CDDB support" on \
-		KCAL "KOrganizer support" on \
-		AMAZON "Amazon search support" on \
-		IMDB "IMDb search support" on
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITHOUT_CDDB)
-CONFIGURE_ARGS+=--disable-libkcddb
-.else
-LIB_DEPENDS+=	kcddb:${PORTSDIR}/multimedia/kdemultimedia3
-.endif
-
-.if defined(WITHOUT_KCAL)
-CONFIGURE_ARGS+=--disable-libkcal
-.else
-LIB_DEPENDS+=	kcal.2:${PORTSDIR}/deskutils/kdepim3
-.endif
-
-.if defined(WITHOUT_AMAZON)
-CONFIGURE_ARGS+=--disable-amazon
-.endif
-
-.if defined(WITHOUT_IMDB)
-CONFIGURE_ARGS+=--disable-imdb
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
-
-.include <bsd.port.post.mk>
+		poppler-qt4:${PORTSDIR}/graphics/poppler-qt4 \
+		yaz:${PORTSDIR}/net/yaz \
+		exempi:${PORTSDIR}/textproc/exempi \
+		kcddb:${PORTSDIR}/multimedia/kdemultimedia4 \
+		ksane:${PORTSDIR}/graphics/kdegraphics4
+
+USE_BZIP2=	yes
+USE_KDE4=	pimlibs kdelibs kdeprefix automoc4
+USE_QT_VER=	4
+QT_COMPONENTS=	qmake_build moc_build uic_build rcc_build
+USE_CMAKE=	yes
+USE_GETTEXT=	yes
+MAKE_JOBS_SAFE=	yes
+
+.include <bsd.port.mk>
diff --git a/misc/tellico-kde4/distinfo b/misc/tellico-kde4/distinfo
index 6894bd757e7c..c6da9fb4a448 100644
--- a/misc/tellico-kde4/distinfo
+++ b/misc/tellico-kde4/distinfo
@@ -1,3 +1,3 @@
-MD5 (tellico-1.3.5.tar.gz) = ca5d9db11fa1dd33dfe317ffe095435c
-SHA256 (tellico-1.3.5.tar.gz) = 1f1a3d846c98711dbe014a1118c98b5442083ac32d636f6bf1cce0123b2eeca5
-SIZE (tellico-1.3.5.tar.gz) = 5085567
+MD5 (tellico-2.2.tar.bz2) = 204cc66527f0ba8f8bda48b1f21a3dcd
+SHA256 (tellico-2.2.tar.bz2) = 462b3ebf0a56d73ad5f1683a92974ba545bfe0e01346b0299ee8c21a85474289
+SIZE (tellico-2.2.tar.bz2) = 2355608
diff --git a/misc/tellico-kde4/pkg-descr b/misc/tellico-kde4/pkg-descr
index 340b019951c3..2491632f913d 100644
--- a/misc/tellico-kde4/pkg-descr
+++ b/misc/tellico-kde4/pkg-descr
@@ -1,24 +1,5 @@
-Tellico is an KDE application for organizing your collections. It provides
-default templates for books, bibliographies, videos, music, coins, stamps,
-trading cards, comic books, and wines.
+Tellico is a KDE application for organizing your collections. It provides
+default templates for books, bibliographies, videos, music, video games,
+coins, stamps, trading cards, comic books, and wines.
 
-Capabilities:
-  - Supports default collections of books, bibliographic entries, videos,
-    music, comic books, coins, stamps, trading cards, and wines.
-  - Supports user-defined custom collections, as well. 
-  - Supports any number of user-defined fields, of eleven different types
-  - Handles entries with multiple authors, genres, keywords, etc.
-  - Automatically formats titles and names
-  - Supports collection searching and view filtering
-  - Sorts and groups collection by various properties
-  - Automatically validates ISBN
-  - Allows customizable entry templates through XSLT
-  - Imports Bibtex, Bibtexml, CSV, and XSLT-filtered data
-  - Exports to Bibtex, Bibtexml, CSV, HTML, PilotDB, and XSLT-filtered data
-  - Includes translations for more than nine languages, other than English
-  - Imports information directly from Amazon.com
-  - Imports CDDB data
-  - Scans and imports audio file collections, such as mp3 or ogg
-  - Imports and exports to Alexandria libraries
-
-WWW: http://tellico-project.org
+WWW:	http://tellico-project.org
diff --git a/misc/tellico-kde4/pkg-plist b/misc/tellico-kde4/pkg-plist
index 87a46784ac91..5d16ee4e973a 100644
--- a/misc/tellico-kde4/pkg-plist
+++ b/misc/tellico-kde4/pkg-plist
@@ -1,5 +1,5 @@
 bin/tellico
-share/applications/kde/tellico.desktop
+share/applications/kde4/tellico.desktop
 share/apps/kconf_update/tellico-1-3-update.pl
 share/apps/kconf_update/tellico-rename.upd
 share/apps/kconf_update/tellico.upd
@@ -13,6 +13,8 @@ share/apps/tellico/bluray-logo.png
 share/apps/tellico/cassette-logo.png
 share/apps/tellico/cd-logo.png
 share/apps/tellico/crossref2tellico.xsl
+share/apps/tellico/data-sources/bedetheque.py
+share/apps/tellico/data-sources/bedetheque.py.spec
 share/apps/tellico/data-sources/boardgamegeek.rb
 share/apps/tellico/data-sources/boardgamegeek.rb.spec
 share/apps/tellico/data-sources/dark_horse_comics.py
@@ -30,10 +32,12 @@ share/apps/tellico/entry-templates/Default.xsl
 share/apps/tellico/entry-templates/Fancy.xsl
 share/apps/tellico/entry-templates/Video.xsl
 share/apps/tellico/gcstar2tellico.xsl
+share/apps/tellico/giantbomb2tellico.xsl
 share/apps/tellico/griffith2tellico.py
 share/apps/tellico/hddvd-logo.png
 share/apps/tellico/isbndb2tellico.xsl
 share/apps/tellico/mods2tellico.xsl
+share/apps/tellico/musicbrainz2tellico.xsl
 share/apps/tellico/pics/README.icons
 share/apps/tellico/pics/README.quesnay
 share/apps/tellico/pics/album.png
@@ -87,6 +91,7 @@ share/apps/tellico/report-templates/Title_Listing_(Horizontal).xsl
 share/apps/tellico/report-templates/Title_Listing_(Vertical).xsl
 share/apps/tellico/report-templates/Tri-Column.xsl
 share/apps/tellico/shadowAlpha.png
+share/apps/tellico/srw2tellico.xsl
 share/apps/tellico/tellico-by-author.xsl
 share/apps/tellico/tellico-by-title.xsl
 share/apps/tellico/tellico-common.xsl
@@ -98,15 +103,17 @@ share/apps/tellico/tellico2html.js
 share/apps/tellico/tellico2html.xsl
 share/apps/tellico/tellico2onix.xsl
 share/apps/tellico/tellicoui.rc
-share/apps/tellico/unixref2tellico.xsl
+share/apps/tellico/tmdb2tellico.xsl
 share/apps/tellico/vhs-logo.png
 share/apps/tellico/welcome.html
+share/apps/tellico/winecom2tellico.xsl
 share/apps/tellico/xmp2tellico.xsl
 share/apps/tellico/yahoo2tellico.xsl
 share/apps/tellico/z3950-servers.cfg
 share/config.kcfg/tellico_config.kcfg
+share/config/tellico-script.knsrc
+share/config/tellico-template.knsrc
 share/config/tellicorc
-share/doc/HTML/en/tellico/CMakeLists.txt
 share/doc/HTML/en/tellico/advanced.docbook
 share/doc/HTML/en/tellico/amazon-options.png
 share/doc/HTML/en/tellico/common
@@ -128,7 +135,6 @@ share/doc/HTML/en/tellico/fetch-dialog.png
 share/doc/HTML/en/tellico/fields-dialog.png
 share/doc/HTML/en/tellico/filter-dialog.png
 share/doc/HTML/en/tellico/filter-view.png
-share/doc/HTML/en/tellico/freebsd-doc-license.html
 share/doc/HTML/en/tellico/fundamentals.docbook
 share/doc/HTML/en/tellico/general-options.png
 share/doc/HTML/en/tellico/hacking.docbook
@@ -140,54 +146,56 @@ share/doc/HTML/en/tellico/loan-dialog.png
 share/doc/HTML/en/tellico/loan-view.png
 share/doc/HTML/en/tellico/main-window.png
 share/doc/HTML/en/tellico/menus.docbook
-share/doc/HTML/en/tellico/openoffice-dialog.png
 share/doc/HTML/en/tellico/print-options.png
 share/doc/HTML/en/tellico/report-dialog.png
 share/doc/HTML/en/tellico/source-options.png
 share/doc/HTML/en/tellico/sru-options.png
 share/doc/HTML/en/tellico/template-options.png
 share/doc/HTML/en/tellico/z3950-options.png
-share/doc/HTML/fr/tellico/CMakeLists.txt
 share/doc/HTML/fr/tellico/advanced.docbook
-share/doc/HTML/fr/tellico/amazon-options.png
 share/doc/HTML/fr/tellico/common
 share/doc/HTML/fr/tellico/configuration.docbook
-share/doc/HTML/fr/tellico/csv-dialog.png
 share/doc/HTML/fr/tellico/details.docbook
-share/doc/HTML/fr/tellico/entry-editor1.png
-share/doc/HTML/fr/tellico/entry-editor3.png
-share/doc/HTML/fr/tellico/entry-editor4.png
-share/doc/HTML/fr/tellico/entry-editor5.png
-share/doc/HTML/fr/tellico/export-bibtex.png
-share/doc/HTML/fr/tellico/export-csv.png
-share/doc/HTML/fr/tellico/export-html.png
-share/doc/HTML/fr/tellico/export-options.png
-share/doc/HTML/fr/tellico/export-pdb.png
-share/doc/HTML/fr/tellico/externalexec-options.png
 share/doc/HTML/fr/tellico/faqs.docbook
-share/doc/HTML/fr/tellico/fetch-dialog.png
-share/doc/HTML/fr/tellico/fields-dialog.png
-share/doc/HTML/fr/tellico/filter-dialog.png
-share/doc/HTML/fr/tellico/filter-view.png
-share/doc/HTML/fr/tellico/freebsd-doc-license.html
 share/doc/HTML/fr/tellico/fundamentals.docbook
-share/doc/HTML/fr/tellico/general-options.png
 share/doc/HTML/fr/tellico/hacking.docbook
-share/doc/HTML/fr/tellico/imdb-options.png
 share/doc/HTML/fr/tellico/importing-exporting.docbook
 share/doc/HTML/fr/tellico/index.cache.bz2
 share/doc/HTML/fr/tellico/index.docbook
-share/doc/HTML/fr/tellico/loan-dialog.png
-share/doc/HTML/fr/tellico/loan-view.png
-share/doc/HTML/fr/tellico/main-window.png
 share/doc/HTML/fr/tellico/menus.docbook
-share/doc/HTML/fr/tellico/openoffice-dialog.png
-share/doc/HTML/fr/tellico/print-options.png
-share/doc/HTML/fr/tellico/report-dialog.png
-share/doc/HTML/fr/tellico/source-options.png
-share/doc/HTML/fr/tellico/sru-options.png
-share/doc/HTML/fr/tellico/template-options.png
-share/doc/HTML/fr/tellico/z3950-options.png
+share/doc/HTML/pt_BR/tellico/advanced.docbook
+share/doc/HTML/pt_BR/tellico/common
+share/doc/HTML/pt_BR/tellico/configuration.docbook
+share/doc/HTML/pt_BR/tellico/details.docbook
+share/doc/HTML/pt_BR/tellico/faqs.docbook
+share/doc/HTML/pt_BR/tellico/fundamentals.docbook
+share/doc/HTML/pt_BR/tellico/hacking.docbook
+share/doc/HTML/pt_BR/tellico/importing-exporting.docbook
+share/doc/HTML/pt_BR/tellico/index.cache.bz2
+share/doc/HTML/pt_BR/tellico/index.docbook
+share/doc/HTML/pt_BR/tellico/menus.docbook
+share/doc/HTML/sv/tellico/advanced.docbook
+share/doc/HTML/sv/tellico/common
+share/doc/HTML/sv/tellico/configuration.docbook
+share/doc/HTML/sv/tellico/details.docbook
+share/doc/HTML/sv/tellico/faqs.docbook
+share/doc/HTML/sv/tellico/fundamentals.docbook
+share/doc/HTML/sv/tellico/hacking.docbook
+share/doc/HTML/sv/tellico/importing-exporting.docbook
+share/doc/HTML/sv/tellico/index.cache.bz2
+share/doc/HTML/sv/tellico/index.docbook
+share/doc/HTML/sv/tellico/menus.docbook
+share/doc/HTML/uk/tellico/advanced.docbook
+share/doc/HTML/uk/tellico/common
+share/doc/HTML/uk/tellico/configuration.docbook
+share/doc/HTML/uk/tellico/details.docbook
+share/doc/HTML/uk/tellico/faqs.docbook
+share/doc/HTML/uk/tellico/fundamentals.docbook
+share/doc/HTML/uk/tellico/hacking.docbook
+share/doc/HTML/uk/tellico/importing-exporting.docbook
+share/doc/HTML/uk/tellico/index.cache.bz2
+share/doc/HTML/uk/tellico/index.docbook
+share/doc/HTML/uk/tellico/menus.docbook
 share/icons/hicolor/128x128/apps/tellico.png
 share/icons/hicolor/128x128/mimetypes/application-x-tellico.png
 share/icons/hicolor/16x16/apps/tellico.png
@@ -202,30 +210,39 @@ share/icons/hicolor/64x64/apps/tellico.png
 share/icons/hicolor/64x64/mimetypes/application-x-tellico.png
 share/locale/bg/LC_MESSAGES/tellico.mo
 share/locale/ca/LC_MESSAGES/tellico.mo
+share/locale/ca@valencia/LC_MESSAGES/tellico.mo
 share/locale/cs/LC_MESSAGES/tellico.mo
+share/locale/da/LC_MESSAGES/tellico.mo
 share/locale/de/LC_MESSAGES/tellico.mo
-share/locale/ee/LC_MESSAGES/tellico.mo
+share/locale/el/LC_MESSAGES/tellico.mo
 share/locale/en_GB/LC_MESSAGES/tellico.mo
+share/locale/eo/LC_MESSAGES/tellico.mo
 share/locale/es/LC_MESSAGES/tellico.mo
+share/locale/et/LC_MESSAGES/tellico.mo
 share/locale/fi/LC_MESSAGES/tellico.mo
 share/locale/fr/LC_MESSAGES/tellico.mo
+share/locale/ga/LC_MESSAGES/tellico.mo
+share/locale/gl/LC_MESSAGES/tellico.mo
 share/locale/hu/LC_MESSAGES/tellico.mo
 share/locale/it/LC_MESSAGES/tellico.mo
+share/locale/lt/LC_MESSAGES/tellico.mo
+share/locale/ms/LC_MESSAGES/tellico.mo
 share/locale/nb/LC_MESSAGES/tellico.mo
+share/locale/nds/LC_MESSAGES/tellico.mo
 share/locale/nl/LC_MESSAGES/tellico.mo
 share/locale/nn/LC_MESSAGES/tellico.mo
 share/locale/pl/LC_MESSAGES/tellico.mo
-share/locale/pt/LC_MESSAGES/tellico.mo
-share/locale/pt_BR/LC_MESSAGES/tellico.mo
-share/locale/ro/LC_MESSAGES/tellico.mo
-share/locale/ru/LC_MESSAGES/tellico.mo
-share/locale/sv/LC_MESSAGES/tellico.mo
-share/locale/tr/LC_MESSAGES/tellico.mo
-share/locale/uk/LC_MESSAGES/tellico.mo
 share/mime/packages/tellico.xml
 share/mimelnk/application/x-tellico.desktop
+@dirrmtry share/mimelnk/application
+@dirrmtry share/mimelnk
 @dirrmtry share/mime/packages
 @dirrmtry share/mime
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
+@dirrm share/doc/HTML/uk/tellico
+@dirrm share/doc/HTML/sv/tellico
+@dirrm share/doc/HTML/pt_BR/tellico
 @dirrm share/doc/HTML/fr/tellico
 @dirrm share/doc/HTML/en/tellico
 @dirrm share/apps/tellico/report-templates