ports/124076: Port update: graphics/kallery - Update to v1.2.0 and unbreak

Wed May 28 20:10:01 UTC 2008

>Number:         124076
>Category:       ports
>Synopsis:       Port update: graphics/kallery - Update to v1.2.0 and unbreak
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 28 20:10:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Ganael Laplanche
>Release:        8.0-CURRENT
>Organization:
http://contribs.martymac.com
>Environment:
FreeBSD home.martymac.com 8.0-CURRENT FreeBSD 8.0-CURRENT #17: Sun May 18 23:44:45 CEST 2008     root@:/usr/obj/usr/src/sys/MYKERNEL  amd64
>Description:
This patch updates graphics/kallery to v1.2.0.

Port changes :
- Fix compilation (files/patch-kallery-Makefile.in) and remove BROKEN flag
- Now use MagickCore.1 instead of MagickWand.1 as dependency
- Define INSTALLS_ICONS

Kallery changes in 1.2.0 (from Changelog) :
  - imported to KDE subversion server (svn.kde.org:/home/kde/trunk/playground/graphics/kallery)
  - break up the code to multiple classes (one class per page)
  - fix some layout issues
  - use standard icons
  - add text to some buttons
  - drop the generated project idea
  - add possibility to use the fullsize images from the target path
  - remove some annoying confirmation dialogs
  - fix "Convert only if larger" behavior
  - add suport for EXIF tags
  - use .html extension instead of .htm
  - fix page title when using frames
  - add new commands to templates
  - add more templates
  - update documentation
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -aurN kallery.orig/Makefile kallery/Makefile

--- kallery.orig/Makefile	2008-05-28 18:05:37.464011923 +0200
+++ kallery/Makefile	2008-05-28 19:33:30.886121995 +0200
@@ -6,22 +6,21 @@
 #
 
 PORTNAME=	kallery
-PORTVERSION=	1.0.7a
-PORTREVISION=	8
+PORTVERSION=	1.2.0
 CATEGORIES=	graphics www kde
 MASTER_SITES=	http://kallery.kdewebdev.org/releases/
 
 MAINTAINER=	metrol at 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
+GNU_CONFIGURE=	yes
+INSTALLS_ICONS=	yes
 
 post-patch:
 .if !defined(NOPORTDOCS)
diff -aurN kallery.orig/distinfo kallery/distinfo
--- kallery.orig/distinfo	2008-05-28 18:05:37.464011923 +0200
+++ kallery/distinfo	2008-05-28 18:07:42.766179936 +0200
@@ -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 -aurN kallery.orig/files/patch-kallery-Makefile.in kallery/files/patch-kallery-Makefile.in
--- kallery.orig/files/patch-kallery-Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ kallery/files/patch-kallery-Makefile.in	2008-05-28 18:27:47.045008670 +0200
@@ -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 -aurN kallery.orig/pkg-plist kallery/pkg-plist
--- kallery.orig/pkg-plist	2008-05-28 18:05:37.464011923 +0200
+++ kallery/pkg-plist	2008-05-28 19:42:31.003191902 +0200
@@ -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
+ at dirrmtry share/applications/kde
+ at 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
- at dirrm share/apps/kallery/htmls
- at dirrm share/apps/kallery/images
- at dirrm share/apps/kallery/templates/fullsize
+share/apps/kallery/templates/gallery/gallery_frame_top.template
 @dirrm share/apps/kallery/templates/gallery
+ at dirrm share/apps/kallery/templates/fullsize
 @dirrm share/apps/kallery/templates
+ at dirrm share/apps/kallery/images
+ at dirrm share/apps/kallery/htmls
 @dirrm share/apps/kallery
+ at 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
+ at dirrmtry share/icons/hicolor/32x32/apps
+ at dirrmtry share/icons/hicolor/32x32
+share/icons/hicolor/22x22/apps/kallery.png
+ at dirrmtry share/icons/hicolor/22x22/apps
+ at dirrmtry share/icons/hicolor/22x22
+share/icons/hicolor/16x16/apps/kallery.png
+ at dirrmtry share/icons/hicolor/16x16/apps
+ at dirrmtry share/icons/hicolor/16x16
+share/icons/hicolor/64x64/apps/kallery.png
+ at dirrmtry share/icons/hicolor/64x64/apps
+ at dirrmtry share/icons/hicolor/64x64
+share/icons/hicolor/48x48/apps/kallery.png
+ at dirrmtry share/icons/hicolor/48x48/apps
+ at dirrmtry share/icons/hicolor/48x48
+share/icons/locolor/32x32/apps/kallery.png
+ at dirrmtry share/icons/locolor/32x32/apps
+ at dirrmtry share/icons/locolor/32x32
+share/icons/locolor/16x16/apps/kallery.png
+ at dirrmtry share/icons/locolor/16x16/apps
+ at dirrmtry share/icons/locolor/16x16
+ at dirrmtry share/icons/hicolor
+ at dirrmtry share/icons/locolor
+ at dirrmtry share/icons


>Release-Note:
>Audit-Trail:
>Unformatted:

