6 files changed, 46 insertions, 78 deletions

diff --git a/deskutils/kchmviewer-kde4/Makefile b/deskutils/kchmviewer-kde4/Makefile
index 908133cd1af4..e5c8cfffa508 100644
--- a/deskutils/kchmviewer-kde4/Makefile
+++ b/deskutils/kchmviewer-kde4/Makefile
@@ -6,65 +6,21 @@
 #
 
 PORTNAME=	kchmviewer
-PORTVERSION=	3.1
-PORTREVISION=	1
+PORTVERSION=	4.0
 CATEGORIES=	deskutils kde
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION}-2
+MASTER_SITES=	SF
 
-MAINTAINER=	markus@FreeBSD.org
+MAINTAINER=	makc@FreeBSD.org
 COMMENT=	A Qt/KDE viewer for CHM files
 
-LIB_DEPENDS+=	chm:${PORTSDIR}/misc/chmlib
+LIB_DEPENDS=	chm.0:${PORTSDIR}/misc/chmlib
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
-DO_NOT_COMPILE+=chmlib
-CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" \
-		CPPFLAGS="-I${LOCALBASE}/include" \
-		DO_NOT_COMPILE="${DO_NOT_COMPILE}"
+LATEST_LINK=	${PORTNAME}-kde4
 
-.if !defined(WITHOUT_KDE)
-USE_KDELIBS_VER=3
-PLIST_SUB+=	KDE=""
-PLIST_SUB+=	QT="@comment "
-CONFIGURE_ARGS+=--with-kde
-.else
-USE_QT_VER=	3
-USE_PERL5_BUILD=yes
-RUN_DEPENDS+=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
-PLIST_SUB+=	KDE="@comment "
-PLIST_SUB+=	QT=""
-DO_NOT_COMPILE+=kio-msits
-.endif
-
-pre-everything::
-.if !defined(WITHOUT_KDE)
-	@${ECHO_MSG} "You can disable KDE support by defining WITHOUT_KDE."
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|-O2||g;s|-lpthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/${CONFIGURE_SCRIPT}
-
-post-configure:
-.if defined(WITHOUT_KDE)
-	@${REINPLACE_CMD} -e 's|src po|src|g' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} \
-		-e 's|kde_icondir =.*|kde_icondir = ${PREFIX}/share/icons|g' \
-		${WRKSRC}/src/pics/Makefile
-	@${REINPLACE_CMD} -e 's|crystalsvg|hicolor|g' \
-		${WRKSRC}/src/pics/Makefile
-.endif
-
-pre-install:
-.if defined(WITHOUT_KDE)
-	@${REINPLACE_CMD} -e 's|Categories=.*|Categories=Utility;|g' \
-		${WRKSRC}/lib/kio-msits/kchmviewer.desktop
-	@${INSTALL_DATA} ${WRKSRC}/lib/kio-msits/kchmviewer.desktop \
-		${PREFIX}/share/applications
-.endif
+USE_CMAKE=	yes
+USE_KDE4=	kdeprefix kdelibs automoc4
+USE_QT_VER=	4
+QT_COMPONENTS=	dbus gui network svg xml designer_build \
+		qmake_build moc_build rcc_build uic_build
 
 .include <bsd.port.mk>
diff --git a/deskutils/kchmviewer-kde4/distinfo b/deskutils/kchmviewer-kde4/distinfo
index 993215045ecf..7701c186c1a3 100644
--- a/deskutils/kchmviewer-kde4/distinfo
+++ b/deskutils/kchmviewer-kde4/distinfo
@@ -1,3 +1,3 @@
-MD5 (kchmviewer-3.1-2.tar.gz) = bc376ce29784f33bf0b5f8d1ae5141bf
-SHA256 (kchmviewer-3.1-2.tar.gz) = e73b4ec4b1b6decbd2ab82f670b843a12813d74653ebc6859deffb3b48abf6db
-SIZE (kchmviewer-3.1-2.tar.gz) = 945640
+MD5 (kchmviewer-4.0.tar.gz) = 5e6b853b00f17f69a3368ce78355aba9
+SHA256 (kchmviewer-4.0.tar.gz) = 09f15bcb42bfca0b6eeed6c52408c5c49e944aae36d15816a32860fdaa7b4a38
+SIZE (kchmviewer-4.0.tar.gz) = 225883
diff --git a/deskutils/kchmviewer-kde4/files/patch-lib__kio-msits__CMakeLists.txt b/deskutils/kchmviewer-kde4/files/patch-lib__kio-msits__CMakeLists.txt
new file mode 100644
index 000000000000..f9758e439d8c
--- /dev/null
+++ b/deskutils/kchmviewer-kde4/files/patch-lib__kio-msits__CMakeLists.txt
@@ -0,0 +1,8 @@
+--- ./lib/kio-msits/CMakeLists.txt.orig	2008-12-01 13:03:06.000000000 +0300
++++ ./lib/kio-msits/CMakeLists.txt	2009-01-17 16:50:48.000000000 +0300
+@@ -2,4 +2,4 @@
+ KDE4_ADD_PLUGIN( kio_msits ${kioSources} )
+ TARGET_LINK_LIBRARIES( kio_msits ${KDE4_KIO_LIBS} ${LIBCHM_LIBRARY} )
+ INSTALL( TARGETS kio_msits DESTINATION ${PLUGIN_INSTALL_DIR} )
+-INSTALL( FILES msits.protocol DESTINATION ${KDE4_SERVICES_INSTALL_DIR} )
++INSTALL( FILES msits.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
diff --git a/deskutils/kchmviewer-kde4/files/patch-src__CMakeLists.txt b/deskutils/kchmviewer-kde4/files/patch-src__CMakeLists.txt
new file mode 100644
index 000000000000..d1adbd60e368
--- /dev/null
+++ b/deskutils/kchmviewer-kde4/files/patch-src__CMakeLists.txt
@@ -0,0 +1,12 @@
+--- ./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 @@
+ 	${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
new file mode 100644
index 000000000000..b90fdd7ea751
--- /dev/null
+++ b/deskutils/kchmviewer-kde4/files/patch-src__kde__CMakeLists.txt
@@ -0,0 +1,7 @@
+--- ./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 256d0a2fde9f..2332cdd5613a 100644
--- a/deskutils/kchmviewer-kde4/pkg-plist
+++ b/deskutils/kchmviewer-kde4/pkg-plist
@@ -1,22 +1,7 @@
 bin/kchmviewer
-%%KDE%%lib/kde3/kio_msits.a
-%%KDE%%lib/kde3/kio_msits.la
-%%KDE%%lib/kde3/kio_msits.so
-lib/libchmfile.a
-%%KDE%%lib/libkdeextra.a
-share/applications/kchmviewer.desktop
-%%KDE%%share/icons/crystalsvg/128x128/apps/kchmviewer.png
-%%KDE%%share/icons/crystalsvg/48x48/apps/kchmviewer.png
-%%KDE%%share/icons/crystalsvg/64x64/apps/kchmviewer.png
-%%QT%%share/icons/hicolor/128x128/apps/kchmviewer.png
-%%QT%%share/icons/hicolor/48x48/apps/kchmviewer.png
-%%QT%%share/icons/hicolor/64x64/apps/kchmviewer.png
-%%KDE%%share/locale/cs/LC_MESSAGES/kchmviewer.mo
-%%KDE%%share/locale/du/LC_MESSAGES/kchmviewer.mo
-%%KDE%%share/locale/fr/LC_MESSAGES/kchmviewer.mo
-%%KDE%%share/locale/ru/LC_MESSAGES/kchmviewer.mo
-%%KDE%%share/locale/tr/LC_MESSAGES/kchmviewer.mo
-%%KDE%%share/locale/zh_CN/LC_MESSAGES/kchmviewer.mo
-%%KDE%%share/services/msits.protocol
-%%KDE%%@dirrmtry share/locale/du/LC_MESSAGES
-%%KDE%%@dirrmtry share/locale/du
+lib/kde4/kio_msits.so
+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/kde4/services/msits.protocol