3 files changed, 60 insertions, 198 deletions

diff --git a/graphics/showimg/Makefile b/graphics/showimg/Makefile
index bd1d143b7b71..e6fc5c7d906d 100644
--- a/graphics/showimg/Makefile
+++ b/graphics/showimg/Makefile
@@ -7,36 +7,37 @@
 #
 
 PORTNAME=	showimg
-PORTVERSION=	0.9.3
+PORTVERSION=	0.9.4.1
 PORTEPOCH=	1
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.jalix.org/projects/showimg/download/${PORTVERSION}/
+MASTER_SITES=	http://www.jalix.org/projects/showimg/download/0.9.4-1/
+DISTNAME=	showimg-0.9.4-1
 
 MAINTAINER=	shelton@granch.ru
 COMMENT=	A picture viewer designed to run under KDE 3.x
 
+LIB_DEPENDS=	kipi:${PORTSDIR}/graphics/libkipi
+
 USE_BZIP2=	yes
 USE_KDEBASE_VER=	3
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 
+INSTALLS_SHLIB=	yes
+LDCONFIG_DIRS=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
+
 MAN1=		showimg.1
 
-OPTIONS=	DIGIKAM "Digikam plugins support" off
+CONFIGURE_ARGS+=	--enable-debug=full
 
 post-extract:
 	@${TOUCH} ${WRKSRC}/config.h.in
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-O2||g' -e "s,-lpthread,${PTHREAD_LIBS},g" \
+#	@${REINPLACE_CMD} -e 's|-O2||g' -e "s,-lpthread,${PTHREAD_LIBS},g" \
+#		${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -e 's|-O2||g' \
 		${WRKSRC}/${CONFIGURE_SCRIPT}
 
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_DIGIKAM)
-LIB_DEPENDS+=	digikam:${PORTSDIR}/graphics/digikam
-CONFIGURE_ARGS+=	--enable-digiKam-plugin
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/showimg/distinfo b/graphics/showimg/distinfo
index e78ed67f0920..829fa905c8ff 100644
--- a/graphics/showimg/distinfo
+++ b/graphics/showimg/distinfo
@@ -1,2 +1,2 @@
-MD5 (showimg-0.9.3.tar.bz2) = 8d9a579f929ea89f0a5ba1ec327acd70
-SIZE (showimg-0.9.3.tar.bz2) = 1393429
+MD5 (showimg-0.9.4-1.tar.bz2) = d6cebe9a627aaa4f0ec57e95f403d5fa
+SIZE (showimg-0.9.4-1.tar.bz2) = 1574750
diff --git a/graphics/showimg/pkg-plist b/graphics/showimg/pkg-plist
index 125b1677e2bf..ab1b6c14852d 100644
--- a/graphics/showimg/pkg-plist
+++ b/graphics/showimg/pkg-plist
@@ -1,4 +1,9 @@
 bin/showimg
+lib/kde3/libshowimgpart.la
+lib/kde3/libshowimgpart.so
+lib/libshowimgcore.la
+lib/libshowimgcore.so
+lib/libshowimgcore.so.0
 share/applnk/Graphics/showimg.desktop
 share/apps/konqueror/servicemenus/konqshowimg.desktop
 share/apps/showimg/convert2png.pl
@@ -61,6 +66,7 @@ share/apps/showimg/icons/hicolor/32x32/actions/viewmag_w.png
 share/apps/showimg/icons/hicolor/32x32/mimetypes/psd.png
 share/apps/showimg/icons/hicolor/48x48/mimetypes/psd.png
 share/apps/showimg/icons/hicolor/64x64/mimetypes/psd.png
+share/apps/showimg/pics/No-Ones-Laughing-3.jpg
 share/apps/showimg/pics/bgxpm.png
 share/apps/showimg/pics/border.png
 share/apps/showimg/pics/gradient.png
@@ -71,59 +77,10 @@ share/apps/showimg/pics/layout4.png
 share/apps/showimg/pics/logo.png
 share/apps/showimg/showimgui.rc
 share/apps/showimg/tips
-share/doc/HTML/da/showimg/but-back.png
-share/doc/HTML/da/showimg/but-copy.png
-share/doc/HTML/da/showimg/but-cut.png
-share/doc/HTML/da/showimg/but-forward.png
-share/doc/HTML/da/showimg/but-fullscreen.png
-share/doc/HTML/da/showimg/but-go_up.png
-share/doc/HTML/da/showimg/but-home.png
-share/doc/HTML/da/showimg/but-horizontal_flip.png
-share/doc/HTML/da/showimg/but-next_image.png
-share/doc/HTML/da/showimg/but-original_size.png
-share/doc/HTML/da/showimg/but-paste.png
-share/doc/HTML/da/showimg/but-previous_image.png
-share/doc/HTML/da/showimg/but-refresh.png
-share/doc/HTML/da/showimg/but-rotate_left.png
-share/doc/HTML/da/showimg/but-rotate_right.png
-share/doc/HTML/da/showimg/but-slide_show.png
-share/doc/HTML/da/showimg/but-stop.png
-share/doc/HTML/da/showimg/but-toggle_thumbnails.png
-share/doc/HTML/da/showimg/but-vertical_flip.png
-share/doc/HTML/da/showimg/but-zoom_in.png
-share/doc/HTML/da/showimg/but-zoom_out.png
-share/doc/HTML/da/showimg/but-zoom_to_fit.png
+share/apps/showimgpart/showimgpart.rc
 share/doc/HTML/da/showimg/common
-share/doc/HTML/da/showimg/comparison.png
 share/doc/HTML/da/showimg/index.cache.bz2
 share/doc/HTML/da/showimg/index.docbook
-share/doc/HTML/da/showimg/main-window.png
-share/doc/HTML/de/showimg/but-back.png
-share/doc/HTML/de/showimg/but-copy.png
-share/doc/HTML/de/showimg/but-cut.png
-share/doc/HTML/de/showimg/but-forward.png
-share/doc/HTML/de/showimg/but-fullscreen.png
-share/doc/HTML/de/showimg/but-go_up.png
-share/doc/HTML/de/showimg/but-home.png
-share/doc/HTML/de/showimg/but-horizontal_flip.png
-share/doc/HTML/de/showimg/but-next_image.png
-share/doc/HTML/de/showimg/but-original_size.png
-share/doc/HTML/de/showimg/but-paste.png
-share/doc/HTML/de/showimg/but-previous_image.png
-share/doc/HTML/de/showimg/but-refresh.png
-share/doc/HTML/de/showimg/but-rotate_left.png
-share/doc/HTML/de/showimg/but-rotate_right.png
-share/doc/HTML/de/showimg/but-slide_show.png
-share/doc/HTML/de/showimg/but-stop.png
-share/doc/HTML/de/showimg/but-toggle_thumbnails.png
-share/doc/HTML/de/showimg/but-vertical_flip.png
-share/doc/HTML/de/showimg/but-zoom_in.png
-share/doc/HTML/de/showimg/but-zoom_out.png
-share/doc/HTML/de/showimg/but-zoom_to_fit.png
-share/doc/HTML/de/showimg/comparison.png
-share/doc/HTML/de/showimg/index.cache.bz2
-share/doc/HTML/de/showimg/index.docbook
-share/doc/HTML/de/showimg/main-window.png
 share/doc/HTML/en/showimg/but-back.png
 share/doc/HTML/en/showimg/but-copy.png
 share/doc/HTML/en/showimg/but-cut.png
@@ -131,178 +88,79 @@ share/doc/HTML/en/showimg/but-forward.png
 share/doc/HTML/en/showimg/but-fullscreen.png
 share/doc/HTML/en/showimg/but-go_up.png
 share/doc/HTML/en/showimg/but-home.png
+share/doc/HTML/en/showimg/but-horiz-flip.png
 share/doc/HTML/en/showimg/but-horizontal_flip.png
+share/doc/HTML/en/showimg/but-next-image.png
 share/doc/HTML/en/showimg/but-next_image.png
 share/doc/HTML/en/showimg/but-original_size.png
 share/doc/HTML/en/showimg/but-paste.png
+share/doc/HTML/en/showimg/but-prev-image.png
 share/doc/HTML/en/showimg/but-previous_image.png
 share/doc/HTML/en/showimg/but-refresh.png
+share/doc/HTML/en/showimg/but-reload.png
+share/doc/HTML/en/showimg/but-rotate-left.png
+share/doc/HTML/en/showimg/but-rotate-right.png
 share/doc/HTML/en/showimg/but-rotate_left.png
 share/doc/HTML/en/showimg/but-rotate_right.png
+share/doc/HTML/en/showimg/but-slide-show.png
 share/doc/HTML/en/showimg/but-slide_show.png
+share/doc/HTML/en/showimg/but-stop-thumbs.png
 share/doc/HTML/en/showimg/but-stop.png
+share/doc/HTML/en/showimg/but-toggle-thumbs.png
 share/doc/HTML/en/showimg/but-toggle_thumbnails.png
+share/doc/HTML/en/showimg/but-vert-flip.png
 share/doc/HTML/en/showimg/but-vertical_flip.png
+share/doc/HTML/en/showimg/but-zoom-fit-screen.png
+share/doc/HTML/en/showimg/but-zoom-in.png
+share/doc/HTML/en/showimg/but-zoom-original.png
+share/doc/HTML/en/showimg/but-zoom-out.png
 share/doc/HTML/en/showimg/but-zoom_in.png
 share/doc/HTML/en/showimg/but-zoom_out.png
 share/doc/HTML/en/showimg/but-zoom_to_fit.png
+share/doc/HTML/en/showimg/common
 share/doc/HTML/en/showimg/comparison.png
 share/doc/HTML/en/showimg/index.cache.bz2
 share/doc/HTML/en/showimg/index.docbook
 share/doc/HTML/en/showimg/main-window.png
-share/doc/HTML/es/showimg/but-back.png
-share/doc/HTML/es/showimg/but-copy.png
-share/doc/HTML/es/showimg/but-cut.png
-share/doc/HTML/es/showimg/but-forward.png
-share/doc/HTML/es/showimg/but-fullscreen.png
-share/doc/HTML/es/showimg/but-go_up.png
-share/doc/HTML/es/showimg/but-home.png
-share/doc/HTML/es/showimg/but-horizontal_flip.png
-share/doc/HTML/es/showimg/but-next_image.png
-share/doc/HTML/es/showimg/but-original_size.png
-share/doc/HTML/es/showimg/but-paste.png
-share/doc/HTML/es/showimg/but-previous_image.png
-share/doc/HTML/es/showimg/but-refresh.png
-share/doc/HTML/es/showimg/but-rotate_left.png
-share/doc/HTML/es/showimg/but-rotate_right.png
-share/doc/HTML/es/showimg/but-slide_show.png
-share/doc/HTML/es/showimg/but-stop.png
-share/doc/HTML/es/showimg/but-toggle_thumbnails.png
-share/doc/HTML/es/showimg/but-vertical_flip.png
-share/doc/HTML/es/showimg/but-zoom_in.png
-share/doc/HTML/es/showimg/but-zoom_out.png
-share/doc/HTML/es/showimg/but-zoom_to_fit.png
-share/doc/HTML/es/showimg/comparison.png
+share/doc/HTML/es/showimg/common
 share/doc/HTML/es/showimg/index.cache.bz2
 share/doc/HTML/es/showimg/index.docbook
-share/doc/HTML/es/showimg/main-window.png
-share/doc/HTML/et/showimg/but-back.png
-share/doc/HTML/et/showimg/but-copy.png
-share/doc/HTML/et/showimg/but-cut.png
-share/doc/HTML/et/showimg/but-forward.png
-share/doc/HTML/et/showimg/but-fullscreen.png
-share/doc/HTML/et/showimg/but-go_up.png
-share/doc/HTML/et/showimg/but-home.png
-share/doc/HTML/et/showimg/but-horizontal_flip.png
-share/doc/HTML/et/showimg/but-next_image.png
-share/doc/HTML/et/showimg/but-original_size.png
-share/doc/HTML/et/showimg/but-paste.png
-share/doc/HTML/et/showimg/but-previous_image.png
-share/doc/HTML/et/showimg/but-refresh.png
-share/doc/HTML/et/showimg/but-rotate_left.png
-share/doc/HTML/et/showimg/but-rotate_right.png
-share/doc/HTML/et/showimg/but-slide_show.png
-share/doc/HTML/et/showimg/but-stop.png
-share/doc/HTML/et/showimg/but-toggle_thumbnails.png
-share/doc/HTML/et/showimg/but-vertical_flip.png
-share/doc/HTML/et/showimg/but-zoom_in.png
-share/doc/HTML/et/showimg/but-zoom_out.png
-share/doc/HTML/et/showimg/but-zoom_to_fit.png
-share/doc/HTML/et/showimg/comparison.png
+share/doc/HTML/et/showimg/common
 share/doc/HTML/et/showimg/index.cache.bz2
 share/doc/HTML/et/showimg/index.docbook
-share/doc/HTML/et/showimg/main-window.png
-share/doc/HTML/fr/showimg/but-back.png
-share/doc/HTML/fr/showimg/but-copy.png
-share/doc/HTML/fr/showimg/but-cut.png
-share/doc/HTML/fr/showimg/but-forward.png
-share/doc/HTML/fr/showimg/but-fullscreen.png
-share/doc/HTML/fr/showimg/but-go_up.png
-share/doc/HTML/fr/showimg/but-home.png
-share/doc/HTML/fr/showimg/but-horizontal_flip.png
-share/doc/HTML/fr/showimg/but-next_image.png
-share/doc/HTML/fr/showimg/but-original_size.png
-share/doc/HTML/fr/showimg/but-paste.png
-share/doc/HTML/fr/showimg/but-previous_image.png
-share/doc/HTML/fr/showimg/but-refresh.png
-share/doc/HTML/fr/showimg/but-rotate_left.png
-share/doc/HTML/fr/showimg/but-rotate_right.png
-share/doc/HTML/fr/showimg/but-slide_show.png
-share/doc/HTML/fr/showimg/but-stop.png
-share/doc/HTML/fr/showimg/but-toggle_thumbnails.png
-share/doc/HTML/fr/showimg/but-vertical_flip.png
-share/doc/HTML/fr/showimg/but-zoom_in.png
-share/doc/HTML/fr/showimg/but-zoom_out.png
-share/doc/HTML/fr/showimg/but-zoom_to_fit.png
-share/doc/HTML/fr/showimg/comparison.png
+share/doc/HTML/fr/showimg/common
 share/doc/HTML/fr/showimg/index.cache.bz2
 share/doc/HTML/fr/showimg/index.docbook
-share/doc/HTML/fr/showimg/main-window.png
-share/doc/HTML/it/showimg/but-back.png
-share/doc/HTML/it/showimg/but-copy.png
-share/doc/HTML/it/showimg/but-cut.png
-share/doc/HTML/it/showimg/but-forward.png
-share/doc/HTML/it/showimg/but-fullscreen.png
-share/doc/HTML/it/showimg/but-go_up.png
-share/doc/HTML/it/showimg/but-home.png
-share/doc/HTML/it/showimg/but-horizontal_flip.png
-share/doc/HTML/it/showimg/but-next_image.png
-share/doc/HTML/it/showimg/but-original_size.png
-share/doc/HTML/it/showimg/but-paste.png
-share/doc/HTML/it/showimg/but-previous_image.png
-share/doc/HTML/it/showimg/but-refresh.png
-share/doc/HTML/it/showimg/but-rotate_left.png
-share/doc/HTML/it/showimg/but-rotate_right.png
-share/doc/HTML/it/showimg/but-slide_show.png
-share/doc/HTML/it/showimg/but-stop.png
-share/doc/HTML/it/showimg/but-toggle_thumbnails.png
-share/doc/HTML/it/showimg/but-vertical_flip.png
-share/doc/HTML/it/showimg/but-zoom_in.png
-share/doc/HTML/it/showimg/but-zoom_out.png
-share/doc/HTML/it/showimg/but-zoom_to_fit.png
-share/doc/HTML/it/showimg/comparison.png
+share/doc/HTML/it/showimg/common
 share/doc/HTML/it/showimg/index.cache.bz2
 share/doc/HTML/it/showimg/index.docbook
-share/doc/HTML/it/showimg/main-window.png
-share/doc/HTML/sv/showimg/but-back.png
-share/doc/HTML/sv/showimg/but-copy.png
-share/doc/HTML/sv/showimg/but-cut.png
-share/doc/HTML/sv/showimg/but-forward.png
-share/doc/HTML/sv/showimg/but-fullscreen.png
-share/doc/HTML/sv/showimg/but-go_up.png
-share/doc/HTML/sv/showimg/but-home.png
-share/doc/HTML/sv/showimg/but-horizontal_flip.png
-share/doc/HTML/sv/showimg/but-next_image.png
-share/doc/HTML/sv/showimg/but-original_size.png
-share/doc/HTML/sv/showimg/but-paste.png
-share/doc/HTML/sv/showimg/but-previous_image.png
-share/doc/HTML/sv/showimg/but-refresh.png
-share/doc/HTML/sv/showimg/but-rotate_left.png
-share/doc/HTML/sv/showimg/but-rotate_right.png
-share/doc/HTML/sv/showimg/but-slide_show.png
-share/doc/HTML/sv/showimg/but-stop.png
-share/doc/HTML/sv/showimg/but-toggle_thumbnails.png
-share/doc/HTML/sv/showimg/but-vertical_flip.png
-share/doc/HTML/sv/showimg/but-zoom_in.png
-share/doc/HTML/sv/showimg/but-zoom_out.png
-share/doc/HTML/sv/showimg/but-zoom_to_fit.png
-share/doc/HTML/sv/showimg/comparison.png
+share/doc/HTML/pt/showimg/common
+share/doc/HTML/pt/showimg/index.cache.bz2
+share/doc/HTML/pt/showimg/index.docbook
+share/doc/HTML/sv/showimg/common
 share/doc/HTML/sv/showimg/index.cache.bz2
 share/doc/HTML/sv/showimg/index.docbook
-share/doc/HTML/sv/showimg/main-window.png
-share/doc/HTML/de/showimg/common
-share/doc/HTML/en/showimg/common
-share/doc/HTML/es/showimg/common
-share/doc/HTML/et/showimg/common
-share/doc/HTML/fr/showimg/common
-share/doc/HTML/it/showimg/common
-share/doc/HTML/sv/showimg/common
 share/icons/hicolor/32x32/apps/showimg.png
 share/icons/hicolor/48x48/apps/showimg.png
 share/icons/hicolor/64x64/apps/showimg.png
+share/locale/br/LC_MESSAGES/showimg.mo
 share/locale/cs/LC_MESSAGES/showimg.mo
+share/locale/cy/LC_MESSAGES/showimg.mo
 share/locale/da/LC_MESSAGES/showimg.mo
 share/locale/de/LC_MESSAGES/showimg.mo
 share/locale/en_GB/LC_MESSAGES/showimg.mo
 share/locale/es/LC_MESSAGES/showimg.mo
 share/locale/et/LC_MESSAGES/showimg.mo
 share/locale/fr/LC_MESSAGES/showimg.mo
+share/locale/ga/LC_MESSAGES/showimg.mo
+share/locale/hu/LC_MESSAGES/showimg.mo
 share/locale/it/LC_MESSAGES/showimg.mo
 share/locale/ja/LC_MESSAGES/showimg.mo
 share/locale/nl/LC_MESSAGES/showimg.mo
 share/locale/pl/LC_MESSAGES/showimg.mo
 share/locale/pt/LC_MESSAGES/showimg.mo
 share/locale/pt_BR/LC_MESSAGES/showimg.mo
+share/locale/ro/LC_MESSAGES/showimg.mo
 share/locale/ru/LC_MESSAGES/showimg.mo
 share/locale/sk/LC_MESSAGES/showimg.mo
 share/locale/sr/LC_MESSAGES/showimg.mo
@@ -312,6 +170,7 @@ share/locale/tr/LC_MESSAGES/showimg.mo
 share/locale/zh_CN/LC_MESSAGES/showimg.mo
 share/mimelnk/image/x-psd.desktop
 share/mimelnk/image/x-sia.desktop
+share/services/showimgpart.desktop
 @unexec rmdir %D/share/mimelnk/image 2>/dev/null || true
 @unexec rmdir %D/share/mimelnk 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
@@ -326,18 +185,18 @@ share/mimelnk/image/x-sia.desktop
 @unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
 @dirrm share/doc/HTML/da/showimg
 @unexec rmdir %D/share/doc/HTML/da 2>/dev/null || true
-@dirrm share/doc/HTML/de/showimg
-@unexec rmdir %D/share/doc/HTML/de 2>/dev/null || true
 @dirrm share/doc/HTML/es/showimg
-@unexec rmdir %D/share/doc/HTML/es>/dev/null || true
+@unexec rmdir %D/share/doc/HTML/es 2>/dev/null || true
 @dirrm share/doc/HTML/et/showimg
-@unexec rmdir %D/share/doc/HTML/et>/dev/null || true
+@unexec rmdir %D/share/doc/HTML/et 2>/dev/null || true
 @dirrm share/doc/HTML/fr/showimg
-@unexec rmdir %D/share/doc/HTML/fr>/dev/null || true
+@unexec rmdir %D/share/doc/HTML/fr 2>/dev/null || true
 @dirrm share/doc/HTML/it/showimg
-@unexec rmdir %D/share/doc/HTML/it>/dev/null || true
+@unexec rmdir %D/share/doc/HTML/it 2>/dev/null || true
+@dirrm share/doc/HTML/pt/showimg
+@unexec rmdir %D/share/doc/HTML/pt 2>/dev/null || true
 @dirrm share/doc/HTML/sv/showimg
-@unexec rmdir %D/share/doc/HTML/sv>/dev/null || true
+@unexec rmdir %D/share/doc/HTML/sv 2>/dev/null || true
 @unexec rmdir %D/share/doc/HTML 2>/dev/null || true
 @dirrm share/apps/showimg/pics
 @dirrm share/apps/showimg/icons/hicolor/64x64/mimetypes
@@ -364,6 +223,8 @@ share/mimelnk/image/x-sia.desktop
 @dirrm share/apps/showimg
 @unexec rmdir %D/share/apps/konqueror/servicemenus 2>/dev/null || true
 @unexec rmdir %D/share/apps/konqueror 2>/dev/null || true
+@unexec rmdir %D/share/apps/showimgpart 2>/dev/null || true
 @unexec rmdir %D/share/apps 2>/dev/null || true
 @unexec rmdir %D/share/applnk/Graphics 2>/dev/null || true
+
 @unexec rmdir %D/share/applnk 2>/dev/null || true