- Update to version 1.0.1

- Add OPTIONS for CDDB support, KOrganizer support, Amazon search support and
  IMDb search support
- Mark BROKEN on 4.x as it doesn't compile

6 files changed, 128 insertions, 68 deletions

diff --git a/misc/tellico-kde4/Makefile b/misc/tellico-kde4/Makefile
index 0f460f5f5b28..69c91d3f34a9 100644
--- a/misc/tellico-kde4/Makefile
+++ b/misc/tellico-kde4/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	tellico
-PORTVERSION=	0.13.8
-PORTREVISION=	1
+PORTVERSION=	1.0.1
 CATEGORIES=	misc kde
 MASTER_SITES=	http://www.periapsis.org/tellico/download/
 
@@ -15,16 +14,47 @@ MAINTAINER=	markus@FreeBSD.org
 COMMENT=	Collection manager for KDE
 
 LIB_DEPENDS=	tag:${PORTSDIR}/audio/taglib \
-		kcddb:${PORTSDIR}/multimedia/kdemultimedia3 \
 		yaz.2:${PORTSDIR}/net/yaz
 
 EXTRA_PATCHES=	${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure
 
 USE_KDELIBS_VER=3
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 
+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 ${OSVERSION} < 500000
+BROKEN=		"Does not compile on FreeBSD 4.x"
+.endif
+
+.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.mk>
+.include <bsd.port.post.mk>
diff --git a/misc/tellico-kde4/distinfo b/misc/tellico-kde4/distinfo
index fdaca9cfc5a2..d949e9e864a3 100644
--- a/misc/tellico-kde4/distinfo
+++ b/misc/tellico-kde4/distinfo
@@ -1,2 +1,2 @@
-MD5 (tellico-0.13.8.tar.gz) = 4fd4debd405ed031df9c454ac5634c02
-SIZE (tellico-0.13.8.tar.gz) = 2474416
+MD5 (tellico-1.0.1.tar.gz) = a775db71781df0012f1c83ad5a7e2895
+SIZE (tellico-1.0.1.tar.gz) = 3070204
diff --git a/misc/tellico-kde4/pkg-plist b/misc/tellico-kde4/pkg-plist
index 45fa9ce939a1..4c2064842125 100644
--- a/misc/tellico-kde4/pkg-plist
+++ b/misc/tellico-kde4/pkg-plist
@@ -1,8 +1,10 @@
 bin/tellico
 share/applnk/Applications/tellico.desktop
 share/apps/kconf_update/tellico-rename.upd
+share/apps/kconf_update/tellico.upd
 share/apps/tellico/MARC21slim2MODS3.xsl
 share/apps/tellico/MARC21slimUtils.xsl
+share/apps/tellico/UNIMARC2MODS3.xsl
 share/apps/tellico/amazon2tellico.xsl
 share/apps/tellico/bibtex-translation.xml
 share/apps/tellico/cassette-logo.png
@@ -23,6 +25,7 @@ share/apps/tellico/pics/card.png
 share/apps/tellico/pics/checkmark.png
 share/apps/tellico/pics/coin.png
 share/apps/tellico/pics/comic.png
+share/apps/tellico/pics/game.png
 share/apps/tellico/pics/person-open.png
 share/apps/tellico/pics/person.png
 share/apps/tellico/pics/stamp.png
@@ -43,7 +46,15 @@ share/apps/tellico/pics/tellico.svg
 share/apps/tellico/pics/tellico_mime.svg
 share/apps/tellico/pics/video.png
 share/apps/tellico/pics/wine.png
+share/apps/tellico/pubmed2tellico.xsl
 share/apps/tellico/record-logo.png
+share/apps/tellico/report-templates/Column_View.xsl
+share/apps/tellico/report-templates/Group_Summary.xsl
+share/apps/tellico/report-templates/Group_View.xsl
+share/apps/tellico/report-templates/Image_List.xsl
+share/apps/tellico/report-templates/Loan_View.xsl
+share/apps/tellico/report-templates/Title_Listing_(Horizontal).xsl
+share/apps/tellico/report-templates/Title_Listing_(Vertical).xsl
 share/apps/tellico/shadowAlpha.png
 share/apps/tellico/tellico-by-author.xsl
 share/apps/tellico/tellico-by-title.xsl
@@ -51,35 +62,44 @@ share/apps/tellico/tellico-common.xsl
 share/apps/tellico/tellico-printing.xsl
 share/apps/tellico/tellico.dtd
 share/apps/tellico/tellico.tips
+share/apps/tellico/tellico2html.js
 share/apps/tellico/tellico2html.xsl
+share/apps/tellico/tellico2onix.xsl
 share/apps/tellico/tellicoui.rc
 share/apps/tellico/vhs-logo.png
+share/doc/HTML/en/tellico/advanced.docbook
 share/doc/HTML/en/tellico/amazon-options.png
 share/doc/HTML/en/tellico/common
 share/doc/HTML/en/tellico/configuration.docbook
 share/doc/HTML/en/tellico/csv-dialog.png
 share/doc/HTML/en/tellico/details.docbook
 share/doc/HTML/en/tellico/entry-editor1.png
-share/doc/HTML/en/tellico/entry-editor2.png
 share/doc/HTML/en/tellico/entry-editor3.png
 share/doc/HTML/en/tellico/entry-editor4.png
 share/doc/HTML/en/tellico/entry-editor5.png
+share/doc/HTML/en/tellico/export-bibtex.png
 share/doc/HTML/en/tellico/export-csv.png
 share/doc/HTML/en/tellico/export-html.png
 share/doc/HTML/en/tellico/export-options.png
+share/doc/HTML/en/tellico/export-pdb.png
+share/doc/HTML/en/tellico/externalexec-options.png
 share/doc/HTML/en/tellico/faqs.docbook
 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/fundamentals.docbook
 share/doc/HTML/en/tellico/general-options.png
 share/doc/HTML/en/tellico/hacking.docbook
 share/doc/HTML/en/tellico/importing-exporting.docbook
 share/doc/HTML/en/tellico/index.cache.bz2
 share/doc/HTML/en/tellico/index.docbook
+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/print-options.png
+share/doc/HTML/en/tellico/report-dialog.png
 share/doc/HTML/en/tellico/source-options.png
 share/doc/HTML/en/tellico/template-options.png
 share/doc/HTML/en/tellico/z3950-options.png
@@ -107,49 +127,29 @@ share/locale/hu/LC_MESSAGES/tellico.mo
 share/locale/it/LC_MESSAGES/tellico.mo
 share/locale/nb/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/ro/LC_MESSAGES/tellico.mo
 share/locale/sv/LC_MESSAGES/tellico.mo
 share/mimelnk/application/x-tellico.desktop
-@unexec rmdir %D/share/mimelnk/application 2>/dev/null || true
-@unexec rmdir %D/share/mimelnk 2>/dev/null || true
 @unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/ro 2>/dev/null || true
 @unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/pt 2>/dev/null || true
+@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/pl 2>/dev/null || true
+@unexec rmdir %D/share/locale/nn/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/nn 2>/dev/null || true
 @unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/fi 2>/dev/null || true
 @unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/cs 2>/dev/null || true
 @unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/ca 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64/mimetypes 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48/mimetypes 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/mimetypes 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22/mimetypes 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/mimetypes 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/128x128/mimetypes 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/128x128/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/128x128 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
 @dirrm share/doc/HTML/en/tellico
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrm share/apps/tellico/report-templates
 @dirrm share/apps/tellico/pics
 @dirrm share/apps/tellico/entry-templates
 @dirrm share/apps/tellico
 @unexec rmdir %D/share/apps/kconf_update 2>/dev/null || true
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
diff --git a/misc/tellico/Makefile b/misc/tellico/Makefile
index 0f460f5f5b28..69c91d3f34a9 100644
--- a/misc/tellico/Makefile
+++ b/misc/tellico/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	tellico
-PORTVERSION=	0.13.8
-PORTREVISION=	1
+PORTVERSION=	1.0.1
 CATEGORIES=	misc kde
 MASTER_SITES=	http://www.periapsis.org/tellico/download/
 
@@ -15,16 +14,47 @@ MAINTAINER=	markus@FreeBSD.org
 COMMENT=	Collection manager for KDE
 
 LIB_DEPENDS=	tag:${PORTSDIR}/audio/taglib \
-		kcddb:${PORTSDIR}/multimedia/kdemultimedia3 \
 		yaz.2:${PORTSDIR}/net/yaz
 
 EXTRA_PATCHES=	${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure
 
 USE_KDELIBS_VER=3
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 
+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 ${OSVERSION} < 500000
+BROKEN=		"Does not compile on FreeBSD 4.x"
+.endif
+
+.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.mk>
+.include <bsd.port.post.mk>
diff --git a/misc/tellico/distinfo b/misc/tellico/distinfo
index fdaca9cfc5a2..d949e9e864a3 100644
--- a/misc/tellico/distinfo
+++ b/misc/tellico/distinfo
@@ -1,2 +1,2 @@
-MD5 (tellico-0.13.8.tar.gz) = 4fd4debd405ed031df9c454ac5634c02
-SIZE (tellico-0.13.8.tar.gz) = 2474416
+MD5 (tellico-1.0.1.tar.gz) = a775db71781df0012f1c83ad5a7e2895
+SIZE (tellico-1.0.1.tar.gz) = 3070204
diff --git a/misc/tellico/pkg-plist b/misc/tellico/pkg-plist
index 45fa9ce939a1..4c2064842125 100644
--- a/misc/tellico/pkg-plist
+++ b/misc/tellico/pkg-plist
@@ -1,8 +1,10 @@
 bin/tellico
 share/applnk/Applications/tellico.desktop
 share/apps/kconf_update/tellico-rename.upd
+share/apps/kconf_update/tellico.upd
 share/apps/tellico/MARC21slim2MODS3.xsl
 share/apps/tellico/MARC21slimUtils.xsl
+share/apps/tellico/UNIMARC2MODS3.xsl
 share/apps/tellico/amazon2tellico.xsl
 share/apps/tellico/bibtex-translation.xml
 share/apps/tellico/cassette-logo.png
@@ -23,6 +25,7 @@ share/apps/tellico/pics/card.png
 share/apps/tellico/pics/checkmark.png
 share/apps/tellico/pics/coin.png
 share/apps/tellico/pics/comic.png
+share/apps/tellico/pics/game.png
 share/apps/tellico/pics/person-open.png
 share/apps/tellico/pics/person.png
 share/apps/tellico/pics/stamp.png
@@ -43,7 +46,15 @@ share/apps/tellico/pics/tellico.svg
 share/apps/tellico/pics/tellico_mime.svg
 share/apps/tellico/pics/video.png
 share/apps/tellico/pics/wine.png
+share/apps/tellico/pubmed2tellico.xsl
 share/apps/tellico/record-logo.png
+share/apps/tellico/report-templates/Column_View.xsl
+share/apps/tellico/report-templates/Group_Summary.xsl
+share/apps/tellico/report-templates/Group_View.xsl
+share/apps/tellico/report-templates/Image_List.xsl
+share/apps/tellico/report-templates/Loan_View.xsl
+share/apps/tellico/report-templates/Title_Listing_(Horizontal).xsl
+share/apps/tellico/report-templates/Title_Listing_(Vertical).xsl
 share/apps/tellico/shadowAlpha.png
 share/apps/tellico/tellico-by-author.xsl
 share/apps/tellico/tellico-by-title.xsl
@@ -51,35 +62,44 @@ share/apps/tellico/tellico-common.xsl
 share/apps/tellico/tellico-printing.xsl
 share/apps/tellico/tellico.dtd
 share/apps/tellico/tellico.tips
+share/apps/tellico/tellico2html.js
 share/apps/tellico/tellico2html.xsl
+share/apps/tellico/tellico2onix.xsl
 share/apps/tellico/tellicoui.rc
 share/apps/tellico/vhs-logo.png
+share/doc/HTML/en/tellico/advanced.docbook
 share/doc/HTML/en/tellico/amazon-options.png
 share/doc/HTML/en/tellico/common
 share/doc/HTML/en/tellico/configuration.docbook
 share/doc/HTML/en/tellico/csv-dialog.png
 share/doc/HTML/en/tellico/details.docbook
 share/doc/HTML/en/tellico/entry-editor1.png
-share/doc/HTML/en/tellico/entry-editor2.png
 share/doc/HTML/en/tellico/entry-editor3.png
 share/doc/HTML/en/tellico/entry-editor4.png
 share/doc/HTML/en/tellico/entry-editor5.png
+share/doc/HTML/en/tellico/export-bibtex.png
 share/doc/HTML/en/tellico/export-csv.png
 share/doc/HTML/en/tellico/export-html.png
 share/doc/HTML/en/tellico/export-options.png
+share/doc/HTML/en/tellico/export-pdb.png
+share/doc/HTML/en/tellico/externalexec-options.png
 share/doc/HTML/en/tellico/faqs.docbook
 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/fundamentals.docbook
 share/doc/HTML/en/tellico/general-options.png
 share/doc/HTML/en/tellico/hacking.docbook
 share/doc/HTML/en/tellico/importing-exporting.docbook
 share/doc/HTML/en/tellico/index.cache.bz2
 share/doc/HTML/en/tellico/index.docbook
+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/print-options.png
+share/doc/HTML/en/tellico/report-dialog.png
 share/doc/HTML/en/tellico/source-options.png
 share/doc/HTML/en/tellico/template-options.png
 share/doc/HTML/en/tellico/z3950-options.png
@@ -107,49 +127,29 @@ share/locale/hu/LC_MESSAGES/tellico.mo
 share/locale/it/LC_MESSAGES/tellico.mo
 share/locale/nb/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/ro/LC_MESSAGES/tellico.mo
 share/locale/sv/LC_MESSAGES/tellico.mo
 share/mimelnk/application/x-tellico.desktop
-@unexec rmdir %D/share/mimelnk/application 2>/dev/null || true
-@unexec rmdir %D/share/mimelnk 2>/dev/null || true
 @unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/ro 2>/dev/null || true
 @unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/pt 2>/dev/null || true
+@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/pl 2>/dev/null || true
+@unexec rmdir %D/share/locale/nn/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/nn 2>/dev/null || true
 @unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/fi 2>/dev/null || true
 @unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/cs 2>/dev/null || true
 @unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/ca 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64/mimetypes 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48/mimetypes 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/mimetypes 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22/mimetypes 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/mimetypes 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/128x128/mimetypes 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/128x128/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/128x128 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
 @dirrm share/doc/HTML/en/tellico
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrm share/apps/tellico/report-templates
 @dirrm share/apps/tellico/pics
 @dirrm share/apps/tellico/entry-templates
 @dirrm share/apps/tellico
 @unexec rmdir %D/share/apps/kconf_update 2>/dev/null || true
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true