6 files changed, 22 insertions, 20 deletions

diff --git a/deskutils/kchmviewer-kde4/Makefile b/deskutils/kchmviewer-kde4/Makefile
index 268b3089ae47..81accb954227 100644
--- a/deskutils/kchmviewer-kde4/Makefile
+++ b/deskutils/kchmviewer-kde4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kchmviewer
-PORTVERSION=	4.2
+PORTVERSION=	5.1
 CATEGORIES=	deskutils kde
 MASTER_SITES=	SF
 
@@ -23,5 +23,10 @@ USE_QT_VER=	4
 QT_COMPONENTS=	dbus gui network svg xml designer_build \
 		qmake_build moc_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes
+WRKSRC=		${WRKDIR}/build-${PORTVERSION}
+
+post-install:
+	${MKDIR} ${PREFIX}/share/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/packages/kchmviewer.png ${PREFIX}/share/pixmaps
 
 .include <bsd.port.mk>
diff --git a/deskutils/kchmviewer-kde4/distinfo b/deskutils/kchmviewer-kde4/distinfo
index 06520a65be45..6822dc39eeef 100644
--- a/deskutils/kchmviewer-kde4/distinfo
+++ b/deskutils/kchmviewer-kde4/distinfo
@@ -1,3 +1,3 @@
-MD5 (kchmviewer-4.2.tar.gz) = aef440ee15b395d81c97ba8d2379e298
-SHA256 (kchmviewer-4.2.tar.gz) = d24507ec25c3d5ab865150b194aa29921b370b54820768014747b8b3701715a3
-SIZE (kchmviewer-4.2.tar.gz) = 260935
+MD5 (kchmviewer-5.1.tar.gz) = 9b68c3e233fe3d8e16251ba95526a493
+SHA256 (kchmviewer-5.1.tar.gz) = a1ed61f35e35432d23fb98d9d11bf6755ff388d45571436bb3cadb8c08ecb38f
+SIZE (kchmviewer-5.1.tar.gz) = 263934
diff --git a/deskutils/kchmviewer-kde4/files/patch-packages__CMakeLists.txt b/deskutils/kchmviewer-kde4/files/patch-packages__CMakeLists.txt
new file mode 100644
index 000000000000..20df4cc78b54
--- /dev/null
+++ b/deskutils/kchmviewer-kde4/files/patch-packages__CMakeLists.txt
@@ -0,0 +1,9 @@
+--- ./packages/CMakeLists.txt.orig	2009-12-15 09:27:57.000000000 +0300
++++ ./packages/CMakeLists.txt	2009-12-15 22:51:58.000000000 +0300
+@@ -1,4 +1,4 @@
+-INSTALL( FILES kchmviewer.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} )
+-KDE4_INSTALL_ICONS( ${KDE4_ICON_INSTALL_DIR} )
++INSTALL( FILES kchmviewer.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
++KDE4_INSTALL_ICONS( ${ICON_INSTALL_DIR} )
+ KDE4_UPDATE_ICONCACHE( )
+ 
diff --git a/deskutils/kchmviewer-kde4/files/patch-src__CMakeLists.txt b/deskutils/kchmviewer-kde4/files/patch-src__CMakeLists.txt
index d1adbd60e368..17519a6922af 100644
--- a/deskutils/kchmviewer-kde4/files/patch-src__CMakeLists.txt
+++ b/deskutils/kchmviewer-kde4/files/patch-src__CMakeLists.txt
@@ -1,12 +1,9 @@
---- ./src/CMakeLists.txt.orig	2008-12-02 04:43:24.000000000 +0300
-+++ ./src/CMakeLists.txt	2009-01-17 16:50:48.000000000 +0300
-@@ -46,7 +46,7 @@
+--- ./src/CMakeLists.txt.orig	2009-12-15 09:27:57.000000000 +0300
++++ ./src/CMakeLists.txt	2009-12-15 22:51:12.000000000 +0300
+@@ -51,5 +51,5 @@
  	${KDE4_KHTML_LIBS}
  	${KDE4_KFILE_LIBS}  )
  
 -INSTALL( TARGETS kchmviewer DESTINATION ${KDE4_BIN_INSTALL_DIR} )
--INSTALL( FILES kde/kchmviewer.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR} )
 +INSTALL( TARGETS kchmviewer DESTINATION ${BIN_INSTALL_DIR} )
-+INSTALL( FILES kde/kchmviewer.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
- ADD_SUBDIRECTORY( kde )
  
diff --git a/deskutils/kchmviewer-kde4/files/patch-src__kde__CMakeLists.txt b/deskutils/kchmviewer-kde4/files/patch-src__kde__CMakeLists.txt
deleted file mode 100644
index b90fdd7ea751..000000000000
--- a/deskutils/kchmviewer-kde4/files/patch-src__kde__CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
---- ./src/kde/CMakeLists.txt.orig	2008-06-10 04:46:56.000000000 +0400
-+++ ./src/kde/CMakeLists.txt	2009-01-17 16:52:47.000000000 +0300
-@@ -1,3 +1,3 @@
--KDE4_INSTALL_ICONS( ${KDE4_ICON_INSTALL_DIR} )
-+KDE4_INSTALL_ICONS( ${ICON_INSTALL_DIR} )
- KDE4_UPDATE_ICONCACHE( )
- 
diff --git a/deskutils/kchmviewer-kde4/pkg-plist b/deskutils/kchmviewer-kde4/pkg-plist
index 04dc49aad5e9..65494053a868 100644
--- a/deskutils/kchmviewer-kde4/pkg-plist
+++ b/deskutils/kchmviewer-kde4/pkg-plist
@@ -1,8 +1,5 @@
 bin/kchmviewer
 share/applications/kde4/kchmviewer.desktop
-share/icons/crystalsvg/128x128/apps/kchmviewer.png
-share/icons/crystalsvg/48x48/apps/kchmviewer.png
-share/icons/crystalsvg/64x64/apps/kchmviewer.png
 share/locale/cs/LC_MESSAGES/kchmviewer.mo
 share/locale/fr/LC_MESSAGES/kchmviewer.mo
 share/locale/hu/LC_MESSAGES/kchmviewer.mo
@@ -12,3 +9,4 @@ share/locale/ru/LC_MESSAGES/kchmviewer.mo
 share/locale/sv/LC_MESSAGES/kchmviewer.mo
 share/locale/tr/LC_MESSAGES/kchmviewer.mo
 share/locale/zh_CN/LC_MESSAGES/kchmviewer.mo
+share/pixmaps/kchmviewer.png