Update to 2.1.1nb3, the KDE4 version.

Lots of changes since KDE3, check it out!

5 files changed, 75 insertions, 77 deletions

diff --git a/misc/tellico/DESCR b/misc/tellico/DESCR
index a4608e3bc95..1771e0a17d9 100644
--- a/misc/tellico/DESCR
+++ b/misc/tellico/DESCR
@@ -9,4 +9,9 @@ entries are grouped together by any field you like, allowing you
 to see how many are in each group. On the right, selected fields
 are shown in column format, allowing you to sort by any field. On
 the bottom is a customizable HTML view of the current entry. The
-entry editor is a dialog box where you enter the data.
+entry editor is a dialog box where you enter the data. Check out
+the screenshots.
+
+Tellico keeps things simple, so no database server is needed. The
+data is saved in XML format, which makes for easy parsing, portability,
+and styling.
diff --git a/misc/tellico/Makefile b/misc/tellico/Makefile
index 55d6f4089c4..f5f95b7aa37 100644
--- a/misc/tellico/Makefile
+++ b/misc/tellico/Makefile
@@ -1,35 +1,37 @@
-# $NetBSD: Makefile,v 1.19 2010/02/15 14:52:00 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2010/02/15 14:53:43 wiz Exp $
 #
 
-DISTNAME=	tellico-1.3.6
-PKGREVISION=	5
+DISTNAME=	tellico-2.1.1
+PKGREVISION=	3
 CATEGORIES=	misc
-MASTER_SITES=	http://www.periapsis.org/tellico/download/
+MASTER_SITES=	http://tellico-project.org/files/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.periapsis.org/tellico/
-COMMENT=	KDE application for organizing your collections
+HOMEPAGE=	http://tellico-project.org/
+COMMENT=	Collection manager for KDE
+LICENSE=	gnu-gpl-v2
+
+BUILD_DEPENDS+=	automoc4-[0-9]*:../../devel/automoc4
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-GNU_CONFIGURE=		yes
-USE_PKGLOCALEDIR=	yes
-USE_LANGUAGES=		c c++
-USE_TOOLS+=		gmake perl:build pkg-config
+MAKE_JOBS_SAFE=	no
+USE_LANGUAGES=	c c++
+USE_CMAKE=	yes
+USE_TOOLS+=	msgfmt pkg-config
 
-.include "options.mk"
+pre-build:
+	cd ${WRKSRC}/src/core && ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS}
 
 .include "../../audio/taglib/buildlink3.mk"
-.include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../devel/exempi/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../lang/python/extension.mk"
-.include "../../meta-pkgs/kde3/kde3.mk"
-.include "../../misc/kdepim3/buildlink3.mk"
-.include "../../multimedia/kdemultimedia3/buildlink3.mk"
+.include "../../graphics/kdegraphics4/buildlink3.mk"
+.include "../../graphics/qimageblitz/buildlink3.mk"
+.include "../../misc/kdepimlibs4/buildlink3.mk"
+.include "../../multimedia/kdemultimedia4/buildlink3.mk"
 .include "../../net/yaz/buildlink3.mk"
+.include "../../print/poppler-qt4/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../textproc/libxslt/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/kdelibs3/buildlink3.mk"
+.include "../../x11/kdelibs4/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/tellico/PLIST b/misc/tellico/PLIST
index 53388549758..9e874a40c46 100644
--- a/misc/tellico/PLIST
+++ b/misc/tellico/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:07:31 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2010/02/15 14:53:43 wiz Exp $
 bin/tellico
-share/applications/kde/tellico.desktop
-share/doc/kde/HTML/en/tellico/CMakeLists.txt
+share/applications/kde4/tellico.desktop
 share/doc/kde/HTML/en/tellico/advanced.docbook
 share/doc/kde/HTML/en/tellico/amazon-options.png
 share/doc/kde/HTML/en/tellico/common
@@ -23,7 +22,6 @@ share/doc/kde/HTML/en/tellico/fetch-dialog.png
 share/doc/kde/HTML/en/tellico/fields-dialog.png
 share/doc/kde/HTML/en/tellico/filter-dialog.png
 share/doc/kde/HTML/en/tellico/filter-view.png
-share/doc/kde/HTML/en/tellico/freebsd-doc-license.html
 share/doc/kde/HTML/en/tellico/fundamentals.docbook
 share/doc/kde/HTML/en/tellico/general-options.png
 share/doc/kde/HTML/en/tellico/hacking.docbook
@@ -35,54 +33,45 @@ share/doc/kde/HTML/en/tellico/loan-dialog.png
 share/doc/kde/HTML/en/tellico/loan-view.png
 share/doc/kde/HTML/en/tellico/main-window.png
 share/doc/kde/HTML/en/tellico/menus.docbook
-share/doc/kde/HTML/en/tellico/openoffice-dialog.png
 share/doc/kde/HTML/en/tellico/print-options.png
 share/doc/kde/HTML/en/tellico/report-dialog.png
 share/doc/kde/HTML/en/tellico/source-options.png
 share/doc/kde/HTML/en/tellico/sru-options.png
 share/doc/kde/HTML/en/tellico/template-options.png
 share/doc/kde/HTML/en/tellico/z3950-options.png
-share/doc/kde/HTML/fr/tellico/CMakeLists.txt
 share/doc/kde/HTML/fr/tellico/advanced.docbook
-share/doc/kde/HTML/fr/tellico/amazon-options.png
 share/doc/kde/HTML/fr/tellico/common
 share/doc/kde/HTML/fr/tellico/configuration.docbook
-share/doc/kde/HTML/fr/tellico/csv-dialog.png
 share/doc/kde/HTML/fr/tellico/details.docbook
-share/doc/kde/HTML/fr/tellico/entry-editor1.png
-share/doc/kde/HTML/fr/tellico/entry-editor3.png
-share/doc/kde/HTML/fr/tellico/entry-editor4.png
-share/doc/kde/HTML/fr/tellico/entry-editor5.png
-share/doc/kde/HTML/fr/tellico/export-bibtex.png
-share/doc/kde/HTML/fr/tellico/export-csv.png
-share/doc/kde/HTML/fr/tellico/export-html.png
-share/doc/kde/HTML/fr/tellico/export-options.png
-share/doc/kde/HTML/fr/tellico/export-pdb.png
-share/doc/kde/HTML/fr/tellico/externalexec-options.png
 share/doc/kde/HTML/fr/tellico/faqs.docbook
-share/doc/kde/HTML/fr/tellico/fetch-dialog.png
-share/doc/kde/HTML/fr/tellico/fields-dialog.png
-share/doc/kde/HTML/fr/tellico/filter-dialog.png
-share/doc/kde/HTML/fr/tellico/filter-view.png
-share/doc/kde/HTML/fr/tellico/freebsd-doc-license.html
 share/doc/kde/HTML/fr/tellico/fundamentals.docbook
-share/doc/kde/HTML/fr/tellico/general-options.png
 share/doc/kde/HTML/fr/tellico/hacking.docbook
-share/doc/kde/HTML/fr/tellico/imdb-options.png
 share/doc/kde/HTML/fr/tellico/importing-exporting.docbook
 share/doc/kde/HTML/fr/tellico/index.cache.bz2
 share/doc/kde/HTML/fr/tellico/index.docbook
-share/doc/kde/HTML/fr/tellico/loan-dialog.png
-share/doc/kde/HTML/fr/tellico/loan-view.png
-share/doc/kde/HTML/fr/tellico/main-window.png
 share/doc/kde/HTML/fr/tellico/menus.docbook
-share/doc/kde/HTML/fr/tellico/openoffice-dialog.png
-share/doc/kde/HTML/fr/tellico/print-options.png
-share/doc/kde/HTML/fr/tellico/report-dialog.png
-share/doc/kde/HTML/fr/tellico/source-options.png
-share/doc/kde/HTML/fr/tellico/sru-options.png
-share/doc/kde/HTML/fr/tellico/template-options.png
-share/doc/kde/HTML/fr/tellico/z3950-options.png
+share/doc/kde/HTML/sv/tellico/advanced.docbook
+share/doc/kde/HTML/sv/tellico/common
+share/doc/kde/HTML/sv/tellico/configuration.docbook
+share/doc/kde/HTML/sv/tellico/details.docbook
+share/doc/kde/HTML/sv/tellico/faqs.docbook
+share/doc/kde/HTML/sv/tellico/fundamentals.docbook
+share/doc/kde/HTML/sv/tellico/hacking.docbook
+share/doc/kde/HTML/sv/tellico/importing-exporting.docbook
+share/doc/kde/HTML/sv/tellico/index.cache.bz2
+share/doc/kde/HTML/sv/tellico/index.docbook
+share/doc/kde/HTML/sv/tellico/menus.docbook
+share/doc/kde/HTML/uk/tellico/advanced.docbook
+share/doc/kde/HTML/uk/tellico/common
+share/doc/kde/HTML/uk/tellico/configuration.docbook
+share/doc/kde/HTML/uk/tellico/details.docbook
+share/doc/kde/HTML/uk/tellico/faqs.docbook
+share/doc/kde/HTML/uk/tellico/fundamentals.docbook
+share/doc/kde/HTML/uk/tellico/hacking.docbook
+share/doc/kde/HTML/uk/tellico/importing-exporting.docbook
+share/doc/kde/HTML/uk/tellico/index.cache.bz2
+share/doc/kde/HTML/uk/tellico/index.docbook
+share/doc/kde/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
@@ -108,6 +97,8 @@ share/kde/apps/tellico/bluray-logo.png
 share/kde/apps/tellico/cassette-logo.png
 share/kde/apps/tellico/cd-logo.png
 share/kde/apps/tellico/crossref2tellico.xsl
+share/kde/apps/tellico/data-sources/bedetheque.py
+share/kde/apps/tellico/data-sources/bedetheque.py.spec
 share/kde/apps/tellico/data-sources/boardgamegeek.rb
 share/kde/apps/tellico/data-sources/boardgamegeek.rb.spec
 share/kde/apps/tellico/data-sources/dark_horse_comics.py
@@ -182,6 +173,7 @@ share/kde/apps/tellico/report-templates/Title_Listing_(Horizontal).xsl
 share/kde/apps/tellico/report-templates/Title_Listing_(Vertical).xsl
 share/kde/apps/tellico/report-templates/Tri-Column.xsl
 share/kde/apps/tellico/shadowAlpha.png
+share/kde/apps/tellico/srw2tellico.xsl
 share/kde/apps/tellico/tellico-by-author.xsl
 share/kde/apps/tellico/tellico-by-title.xsl
 share/kde/apps/tellico/tellico-common.xsl
@@ -193,28 +185,37 @@ share/kde/apps/tellico/tellico2html.js
 share/kde/apps/tellico/tellico2html.xsl
 share/kde/apps/tellico/tellico2onix.xsl
 share/kde/apps/tellico/tellicoui.rc
-share/kde/apps/tellico/unixref2tellico.xsl
 share/kde/apps/tellico/vhs-logo.png
 share/kde/apps/tellico/welcome.html
+share/kde/apps/tellico/winecom2tellico.xsl
 share/kde/apps/tellico/xmp2tellico.xsl
 share/kde/apps/tellico/yahoo2tellico.xsl
 share/kde/apps/tellico/z3950-servers.cfg
 share/kde/config.kcfg/tellico_config.kcfg
+share/kde/config/tellico-script.knsrc
+share/kde/config/tellico-template.knsrc
 share/kde/config/tellicorc
-share/kde/mime/packages/tellico.xml
 share/kde/mimelnk/application/x-tellico.desktop
 share/locale/bg/LC_MESSAGES/tellico.mo
 share/locale/ca/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
@@ -222,6 +223,10 @@ 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/sk/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/locale/zh_CN/LC_MESSAGES/tellico.mo
+share/locale/zh_TW/LC_MESSAGES/tellico.mo
+share/mime/packages/tellico.xml
diff --git a/misc/tellico/distinfo b/misc/tellico/distinfo
index 7f82f334a2d..bb271bb4789 100644
--- a/misc/tellico/distinfo
+++ b/misc/tellico/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.7 2009/10/19 21:38:28 wiz Exp $
+$NetBSD: distinfo,v 1.8 2010/02/15 14:53:43 wiz Exp $
 
-SHA1 (tellico-1.3.6.tar.gz) = 6405149383655bd072b1443aad1243dd1f6c16a3
-RMD160 (tellico-1.3.6.tar.gz) = bd5d7f5fd1a1389ccecd0e9ea3f7cabed9540bd9
-Size (tellico-1.3.6.tar.gz) = 5216266 bytes
-SHA1 (patch-aa) = 110d5cd17419456a0d2d4e9a7f77cba8b9ffc311
+SHA1 (tellico-2.1.1.tar.bz2) = 6492bfe71dfaf66652fe060722cd3bf187b38401
+RMD160 (tellico-2.1.1.tar.bz2) = 6abea81f4af8637f1f407837f5ced12e4543c46c
+Size (tellico-2.1.1.tar.bz2) = 2434019 bytes
diff --git a/misc/tellico/patches/patch-aa b/misc/tellico/patches/patch-aa
deleted file mode 100644
index 7b2b9f90563..00000000000
--- a/misc/tellico/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2009/03/16 10:18:31 hasso Exp $
-
---- src/translators/freedb_util.cpp.orig	2009-03-16 11:36:38 +0200
-+++ src/translators/freedb_util.cpp	2009-03-16 11:36:57 +0200
-@@ -60,7 +60,7 @@ extern "C" {
-  * to compile on Solaris */
- #define cdte_track_address cdte_addr.lba
- 
--#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
- 
- #include <netinet/in.h>
- #include <sys/cdio.h>