- Update to 1.2.0

- Unbreak

PR:		ports/124076
Submitted by:	Ganael Laplanche <ganael.laplanche@martymac.com>
Approved by:	maintainer timeout (15 days)

4 files changed, 74 insertions, 27 deletions

diff --git a/graphics/kallery/Makefile b/graphics/kallery/Makefile
index 9e89a3ca0618..b1ad09b3a963 100644
--- a/graphics/kallery/Makefile
+++ b/graphics/kallery/Makefile
@@ -6,22 +6,20 @@
 #
 
 PORTNAME=	kallery
-PORTVERSION=	1.0.7a
-PORTREVISION=	9
+PORTVERSION=	1.2.0
 CATEGORIES=	graphics www kde
 MASTER_SITES=	http://kallery.kdewebdev.org/releases/
 
 MAINTAINER=	metrol@metrol.net
 COMMENT=	An image gallery generator for KDE
 
-LIB_DEPENDS=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick
-
-BROKEN=		does not build
+LIB_DEPENDS=	MagickCore.1:${PORTSDIR}/graphics/ImageMagick
 
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
+INSTALLS_ICONS=	yes
 
 post-patch:
 .if !defined(NOPORTDOCS)
diff --git a/graphics/kallery/distinfo b/graphics/kallery/distinfo
index 4bdc88600550..2b9b6416455c 100644
--- a/graphics/kallery/distinfo
+++ b/graphics/kallery/distinfo
@@ -1,3 +1,3 @@
-MD5 (kallery-1.0.7a.tar.bz2) = 7378740aaeac45062b35e33c07e329b1
-SHA256 (kallery-1.0.7a.tar.bz2) = c8476cd8ad15ff7856de7f1694de8cc49cb77f3e9afcef4ca51d726a886c4495
-SIZE (kallery-1.0.7a.tar.bz2) = 551760
+MD5 (kallery-1.2.0.tar.bz2) = 5318e3b8d4e04e1ea9f9a53e5a565d9c
+SHA256 (kallery-1.2.0.tar.bz2) = 5465efaa3ddd50b625105625bdd5d0c5fb511142866fd48461dccec1c36be1f7
+SIZE (kallery-1.2.0.tar.bz2) = 1470738
diff --git a/graphics/kallery/files/patch-kallery-Makefile.in b/graphics/kallery/files/patch-kallery-Makefile.in
new file mode 100644
index 000000000000..55c2beaf9123
--- /dev/null
+++ b/graphics/kallery/files/patch-kallery-Makefile.in
@@ -0,0 +1,11 @@
+--- kallery/Makefile.in.orig	2008-05-28 18:26:48.683668332 +0200
++++ kallery/Makefile.in	2008-05-28 18:27:18.705733147 +0200
+@@ -380,7 +380,7 @@
+ 	imagethumbpage.cpp targetpath.cpp descsourcepage.cpp imageoptionspage.cpp \
+ 	htmloptionspage.cpp imagehtmlpage.cpp lastpage.cpp kimagehtmlpage.cpp kdescsourcepage.cpp kimageoptionspage.cpp khtmloptionspage.cpp kthumbsourcepage.cpp ktargetpath.cpp kselectsourcespage.cpp klastpage.cpp kimagethumbpage.cpp kfirstpage.cpp
+ 
+-kallery_LDADD = -lMagick $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET)
++kallery_LDADD = $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET)
+ xdg_apps_DATA = kallery.desktop
+ imagesdir = ${kde_datadir}/kallery/images
+ images_DATA = kallery.png back.png next.png prev.png
diff --git a/graphics/kallery/pkg-plist b/graphics/kallery/pkg-plist
index 6bd574695c84..31e2c0c200ba 100644
--- a/graphics/kallery/pkg-plist
+++ b/graphics/kallery/pkg-plist
@@ -1,31 +1,69 @@
 bin/kallery
-share/applnk/Applications/kallery.desktop
-share/apps/kallery/htmls/blank.htm
-share/apps/kallery/htmls/main_frame.htm
-share/apps/kallery/images/back.png
+share/applications/kde/kallery.desktop
+@dirrmtry share/applications/kde
+@dirrmtry share/applications
+share/apps/kallery/images/prev.png
 share/apps/kallery/images/kallery.png
 share/apps/kallery/images/next.png
-share/apps/kallery/images/prev.png
-share/apps/kallery/templates/fullsize/fullsize_bottom.template
+share/apps/kallery/images/back.png
+share/apps/kallery/htmls/main_frame.html
+share/apps/kallery/htmls/main_frame_top.html
+share/apps/kallery/htmls/description.html
 share/apps/kallery/templates/fullsize/fullsize_near.template
+share/apps/kallery/templates/fullsize/fullsize_bottom.template
 share/apps/kallery/templates/fullsize/fullsize_top.template
 share/apps/kallery/templates/fullsize/fullsize_top_bottom.template
 share/apps/kallery/templates/gallery/gallery.template
+share/apps/kallery/templates/gallery/gallery_full.template
+share/apps/kallery/templates/gallery/gallery_none.template
 share/apps/kallery/templates/gallery/gallery_frame.template
-%%PORTDOCS%%share/doc/HTML/en/kallery/common
-%%PORTDOCS%%share/doc/HTML/en/kallery/index.cache.bz2
-%%PORTDOCS%%share/doc/HTML/en/kallery/index.docbook
-share/icons/hicolor/16x16/apps/kallery.png
-share/icons/hicolor/32x32/apps/kallery.png
-share/icons/locolor/16x16/apps/kallery.png
-share/icons/locolor/32x32/apps/kallery.png
-share/locale/de/LC_MESSAGES/kallery.mo
-share/locale/hu/LC_MESSAGES/kallery.mo
-share/locale/pl/LC_MESSAGES/kallery.mo
-@dirrm share/apps/kallery/htmls
-@dirrm share/apps/kallery/images
-@dirrm share/apps/kallery/templates/fullsize
+share/apps/kallery/templates/gallery/gallery_frame_top.template
 @dirrm share/apps/kallery/templates/gallery
+@dirrm share/apps/kallery/templates/fullsize
 @dirrm share/apps/kallery/templates
+@dirrm share/apps/kallery/images
+@dirrm share/apps/kallery/htmls
 @dirrm share/apps/kallery
+@dirrmtry share/apps
+%%PORTDOCS%%share/doc/HTML/en/kallery/common
+%%PORTDOCS%%share/doc/HTML/en/kallery/index.docbook
+%%PORTDOCS%%share/doc/HTML/en/kallery/screenshot.png
+%%PORTDOCS%%share/doc/HTML/en/kallery/screenshot3.png
+%%PORTDOCS%%share/doc/HTML/en/kallery/screenshot4.png
+%%PORTDOCS%%share/doc/HTML/en/kallery/index.cache.bz2
+%%PORTDOCS%%share/doc/HTML/en/kallery/screenshot10.png
+%%PORTDOCS%%share/doc/HTML/en/kallery/screenshot5.png
+%%PORTDOCS%%share/doc/HTML/en/kallery/screenshot2.png
+%%PORTDOCS%%share/doc/HTML/en/kallery/screenshot1.png
+%%PORTDOCS%%share/doc/HTML/en/kallery/screenshot6.png
+%%PORTDOCS%%share/doc/HTML/en/kallery/screenshot8.png
+%%PORTDOCS%%share/doc/HTML/en/kallery/screenshot9.png
+%%PORTDOCS%%share/doc/HTML/en/kallery/screenshot7.png
 %%PORTDOCS%%@dirrm share/doc/HTML/en/kallery
+%%PORTDOCS%%@dirrmtry share/doc/HTML/en
+%%PORTDOCS%%@dirrmtry share/doc/HTML
+%%PORTDOCS%%@dirrmtry share/doc
+share/icons/hicolor/32x32/apps/kallery.png
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+share/icons/hicolor/22x22/apps/kallery.png
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22
+share/icons/hicolor/16x16/apps/kallery.png
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+share/icons/hicolor/64x64/apps/kallery.png
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+share/icons/hicolor/48x48/apps/kallery.png
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+share/icons/locolor/32x32/apps/kallery.png
+@dirrmtry share/icons/locolor/32x32/apps
+@dirrmtry share/icons/locolor/32x32
+share/icons/locolor/16x16/apps/kallery.png
+@dirrmtry share/icons/locolor/16x16/apps
+@dirrmtry share/icons/locolor/16x16
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons/locolor
+@dirrmtry share/icons