3 files changed, 42 insertions, 14 deletions

diff --git a/deskutils/basket/Makefile b/deskutils/basket/Makefile
index 487dadcb93c7..cc992afb1449 100644
--- a/deskutils/basket/Makefile
+++ b/deskutils/basket/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=		basket
-PORTVERSION=		0.6.0
+PORTVERSION=		1.0
 CATEGORIES=		deskutils kde
 MASTER_SITES=		http://basket.kde.org/downloads/
 
@@ -21,12 +21,6 @@ USE_AUTOTOOLS=		libtool:15
 
 OPTIONS=	KONTACT	"Kontact plugin" on
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-BROKEN=		Does not compile on 4.x
-.endif
-
 .if !defined(WITHOUT_KONTACT)
 LIB_DEPENDS+=	kontact.1:${PORTSDIR}/deskutils/kdepim3
 PLIST_SUB=	KONTACT=""
@@ -38,4 +32,4 @@ CONFIGURE_ENV+=	DO_NOT_COMPILE="kontact_plugin"
 post-patch:
 	@${REINPLACE_CMD} -e 's/-O2//g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/deskutils/basket/distinfo b/deskutils/basket/distinfo
index bba2593db786..11785a30b1ea 100644
--- a/deskutils/basket/distinfo
+++ b/deskutils/basket/distinfo
@@ -1,3 +1,3 @@
-MD5 (basket-0.6.0.tar.gz) = 968072a1c1dce84a0c6f8b72bd9b65b8
-SHA256 (basket-0.6.0.tar.gz) = da60789c023b89fad8199c1ede7aaab6643fdc219ad2e8c86ceb8c00d42f8149
-SIZE (basket-0.6.0.tar.gz) = 2767681
+MD5 (basket-1.0.tar.gz) = c1a563e1fe7394b04836e95d19180b2c
+SHA256 (basket-1.0.tar.gz) = 51e59ba281294cad52026b12a2642d0ba163cb3e473cecd513e56baa6a28004e
+SIZE (basket-1.0.tar.gz) = 5993766
diff --git a/deskutils/basket/pkg-plist b/deskutils/basket/pkg-plist
index e4f9b4f81994..a64abc037ee4 100644
--- a/deskutils/basket/pkg-plist
+++ b/deskutils/basket/pkg-plist
@@ -1,4 +1,7 @@
 bin/basket
+lib/kde3/basketthumbcreator.a
+lib/kde3/basketthumbcreator.la
+lib/kde3/basketthumbcreator.so
 lib/kde3/kcm_basket.a
 lib/kde3/kcm_basket.la
 lib/kde3/kcm_basket.so
@@ -31,10 +34,12 @@ share/apps/basket/backgrounds/previews/pens.png
 share/apps/basket/backgrounds/previews/pins.png
 share/apps/basket/backgrounds/previews/rainbow-balls.png
 share/apps/basket/backgrounds/previews/rounds-line.png
+share/apps/basket/backgrounds/previews/strings.png
 share/apps/basket/backgrounds/previews/todo.png
 share/apps/basket/backgrounds/previews/working.png
 share/apps/basket/backgrounds/rainbow-balls.png
 share/apps/basket/backgrounds/rounds-line.png
+share/apps/basket/backgrounds/strings.png
 share/apps/basket/backgrounds/todo.png
 share/apps/basket/backgrounds/working.png
 share/apps/basket/basket_part.rc
@@ -58,11 +63,22 @@ share/apps/basket/icons/crystalsvg/16x16/actions/tag_progress_100.png
 share/apps/basket/images/insertion_help.png
 share/apps/basket/images/tag_export_help.png
 share/apps/basket/images/tag_export_on_every_lines_help.png
+share/apps/basket/welcome/Welcome_de.baskets
+share/apps/basket/welcome/Welcome_en_US.baskets
+share/apps/basket/welcome/Welcome_fr.baskets
+share/apps/basket/welcome/Welcome_it.baskets
+share/apps/basket/welcome/Welcome_ja.baskets
+share/apps/basket/welcome/Welcome_nn.baskets
+share/apps/basket/welcome/Welcome_pt.baskets
+share/apps/basket/welcome/Welcome_ru.baskets
 %%KONTACT%%share/apps/kontact/ksettingsdialog/kontact_basketplugin.setdlg
+share/config/magic/basket.magic
 share/doc/HTML/en/basket/common
 share/doc/HTML/en/basket/index.cache.bz2
 share/doc/HTML/en/basket/index.docbook
 share/icons/crystalsvg/128x128/apps/basket.png
+share/icons/crystalsvg/128x128/mimetypes/baskets.png
+share/icons/crystalsvg/128x128/mimetypes/baskett.png
 share/icons/crystalsvg/16x16/actions/likeback_bug.png
 share/icons/crystalsvg/16x16/actions/likeback_dislike.png
 share/icons/crystalsvg/16x16/actions/likeback_feature.png
@@ -84,15 +100,26 @@ share/icons/crystalsvg/16x16/actions/tag_progress_050.png
 share/icons/crystalsvg/16x16/actions/tag_progress_075.png
 share/icons/crystalsvg/16x16/actions/tag_progress_100.png
 share/icons/crystalsvg/16x16/apps/basket.png
+share/icons/crystalsvg/16x16/mimetypes/baskets.png
+share/icons/crystalsvg/16x16/mimetypes/baskett.png
 share/icons/crystalsvg/22x22/apps/basket.png
+share/icons/crystalsvg/22x22/mimetypes/baskets.png
+share/icons/crystalsvg/22x22/mimetypes/baskett.png
 share/icons/crystalsvg/32x32/apps/basket.png
+share/icons/crystalsvg/32x32/mimetypes/baskets.png
+share/icons/crystalsvg/32x32/mimetypes/baskett.png
 share/icons/crystalsvg/48x48/apps/basket.png
+share/icons/crystalsvg/48x48/mimetypes/baskets.png
+share/icons/crystalsvg/48x48/mimetypes/baskett.png
 share/icons/crystalsvg/64x64/apps/basket.png
+share/icons/crystalsvg/64x64/mimetypes/baskets.png
+share/icons/crystalsvg/64x64/mimetypes/baskett.png
 share/icons/crystalsvg/scalable/apps/basket.svg
 share/locale/cs/LC_MESSAGES/basket.mo
 share/locale/de/LC_MESSAGES/basket.mo
 share/locale/es/LC_MESSAGES/basket.mo
 share/locale/fr/LC_MESSAGES/basket.mo
+share/locale/it/LC_MESSAGES/basket.mo
 share/locale/ja/LC_MESSAGES/basket.mo
 share/locale/nl/LC_MESSAGES/basket.mo
 share/locale/nn/LC_MESSAGES/basket.mo
@@ -101,6 +128,8 @@ share/locale/pt/LC_MESSAGES/basket.mo
 share/locale/ru/LC_MESSAGES/basket.mo
 share/locale/tr/LC_MESSAGES/basket.mo
 share/locale/zh_TW/LC_MESSAGES/basket.mo
+share/mimelnk/application/x-basket-archive.desktop
+share/mimelnk/application/x-basket-template.desktop
 share/services/basket_config_apps.desktop
 share/services/basket_config_baskets.desktop
 share/services/basket_config_features.desktop
@@ -109,8 +138,10 @@ share/services/basket_config_new_notes.desktop
 share/services/basket_config_notes.desktop
 share/services/basket_config_notes_appearance.desktop
 share/services/basket_part.desktop
+share/services/basketthumbcreator.desktop
 %%KONTACT%%share/services/kontact/basket.desktop
-%%KONTACT%%@dirrm share/services/kontact
+%%KONTACT%%share/services/kontact/basket_v4.desktop
+%%KONTACT%%@dirrmtry share/services/kontact
 @dirrmtry share/locale/zh_TW/LC_MESSAGES
 @dirrmtry share/locale/zh_TW
 @dirrmtry share/locale/pt/LC_MESSAGES
@@ -122,8 +153,11 @@ share/services/basket_part.desktop
 @dirrmtry share/locale/cs/LC_MESSAGES
 @dirrmtry share/locale/cs
 @dirrm share/doc/HTML/en/basket
-%%KONTACT%%@dirrm share/apps/kontact/ksettingsdialog
-%%KONTACT%%@dirrm share/apps/kontact
+@dirrmtry share/config/magic
+@dirrmtry share/config
+%%KONTACT%%@dirrmtry share/apps/kontact/ksettingsdialog
+%%KONTACT%%@dirrmtry share/apps/kontact
+@dirrm share/apps/basket/welcome
 @dirrm share/apps/basket/images
 @dirrm share/apps/basket/icons/crystalsvg/16x16/actions
 @dirrm share/apps/basket/icons/crystalsvg/16x16