6 files changed, 438 insertions, 16 deletions

diff --git a/deskutils/kchmviewer-kde4/Makefile b/deskutils/kchmviewer-kde4/Makefile
index 8bea525779b3..476aaf7999ff 100644
--- a/deskutils/kchmviewer-kde4/Makefile
+++ b/deskutils/kchmviewer-kde4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kchmviewer
-PORTVERSION=	1.3
+PORTVERSION=	2.0
 CATEGORIES=	deskutils kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,10 +14,13 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	markus@FreeBSD.org
 COMMENT=	A Qt/KDE viewer for CHM files
 
+LIB_DEPENDS+=	chm:${PORTSDIR}/misc/chmlib
+
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
-CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS}"
+DO_NOT_COMPILE+=chmlib
+CONFIGURE_ENV+=	LDFLAGS="${PTHREAD_LIBS}" DO_NOT_COMPILE="${DO_NOT_COMPILE}"
 
 .if !defined(WITHOUT_KDE)
 USE_KDELIBS_VER=3
@@ -28,6 +31,7 @@ USE_QT_VER=	3
 PLIST_SUB+=	KDE="@comment "
 CONFIGURE_TARGET=
 CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+DO_NOT_COMPILE+=kio-msits
 .endif
 
 pre-everything::
diff --git a/deskutils/kchmviewer-kde4/distinfo b/deskutils/kchmviewer-kde4/distinfo
index 5d64725e6b55..8fd2f6991819 100644
--- a/deskutils/kchmviewer-kde4/distinfo
+++ b/deskutils/kchmviewer-kde4/distinfo
@@ -1,3 +1,3 @@
-MD5 (kchmviewer-1.3.tar.gz) = 0bda19a63dafd5fbb69ea2e3b7f1fa75
-SHA256 (kchmviewer-1.3.tar.gz) = 316e7b0a4b98187efc3421111e6241ca1173f84deab2302161512d9d390f26d6
-SIZE (kchmviewer-1.3.tar.gz) = 567704
+MD5 (kchmviewer-2.0.tar.gz) = 94203642266aaecffdcc6c6d516f7635
+SHA256 (kchmviewer-2.0.tar.gz) = 6d351962e03c60451b1df3a54694ef04c76719e2e93f2c36cd9d68da5b33722c
+SIZE (kchmviewer-2.0.tar.gz) = 765276
diff --git a/deskutils/kchmviewer-kde4/files/patch-chmlib-chm_lib.c b/deskutils/kchmviewer-kde4/files/patch-chmlib-chm_lib.c
deleted file mode 100644
index 3a2e190bba74..000000000000
--- a/deskutils/kchmviewer-kde4/files/patch-chmlib-chm_lib.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- chmlib/chm_lib.c.orig	Tue Nov  8 16:18:06 2005
-+++ chmlib/chm_lib.c	Tue Nov  8 16:20:05 2005
-@@ -171,7 +171,7 @@
- 
- /* x86-64 */
- /* Note that these may be appropriate for other 64-bit machines. */
--#elif __x86_64__
-+#elif __x86_64__ || __ia64__ || __alpha__ || __sparc64__
- typedef unsigned char           UChar;
- typedef short                   Int16;
- typedef unsigned short          UInt16;
diff --git a/deskutils/kchmviewer-kde4/files/patch-configure b/deskutils/kchmviewer-kde4/files/patch-configure
new file mode 100644
index 000000000000..ddfceaa11b28
--- /dev/null
+++ b/deskutils/kchmviewer-kde4/files/patch-configure
@@ -0,0 +1,79 @@
+--- configure.orig	Sat Feb  4 16:58:12 2006
++++ configure	Sat Feb  4 16:59:57 2006
+@@ -465,7 +465,7 @@
+ 
+ ac_default_prefix=${KDEDIR:-the kde prefix}
+ ac_default_prefix=${prefix:-/usr/local}
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET LIBUCB LIBDL include_x11_TRUE include_x11_FALSE LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KSYCOCA LIB_KFILE LIB_KFM MSGFMT GMSGFMT XGETTEXT BUILD_KIOMSITS_TRUE BUILD_KIOMSITS_FALSE BUILD_CHMLIB_TRUE BUILD_CHMLIB_FALSE EXTRA_SUBDIRS CHM_INCLUDES CHM_LIBS TOPSUBDIRS LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET LIBUCB LIBDL include_x11_TRUE include_x11_FALSE LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KSYCOCA LIB_KFILE LIB_KFM MSGFMT GMSGFMT XGETTEXT BUILD_KIOMSITS_TRUE BUILD_KIOMSITS_FALSE BUILD_CHMLIB_TRUE BUILD_CHMLIB_FALSE EXTRA_SUBDIRS PICS_SUBDIR CHM_INCLUDES CHM_LIBS TOPSUBDIRS LIBOBJS LTLIBOBJS'
+ ac_subst_files=''
+ 
+ # Initialize some variables set by options.
+@@ -31374,6 +31374,7 @@
+ 
+ CHMLIBDIR="chmlib"
+ EXTRA_SUBDIRS=""
++PICS_SUBDIR=""
+ 
+ 
+ # Check whether --with-kde or --without-kde was given.
+@@ -31802,7 +31803,7 @@
+ do
+   for j in $kde_check_header;
+   do
+-    echo "configure: 31805: $i/$j" >&5
++    echo "configure: 31806: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       kde_incdir=$i
+@@ -31832,7 +31833,7 @@
+ do
+   for j in $kde_check_lib;
+   do
+-    echo "configure: 31835: $i/$j" >&5
++    echo "configure: 31836: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       kde_libdir=$i
+@@ -31850,7 +31851,7 @@
+ do
+   for j in "kde3/plugins/designer/kdewidgets.la";
+   do
+-    echo "configure: 31853: $i/$j" >&5
++    echo "configure: 31854: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       kde_widgetdir=$i
+@@ -33352,7 +33353,7 @@
+ do
+   for j in apps/ksgmltools2/customization/kde-chunk.xsl;
+   do
+-    echo "configure: 33355: $i/$j" >&5
++    echo "configure: 33356: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       KDE_XSL_STYLESHEET=$i
+@@ -33642,6 +33643,7 @@
+ _ACEOF
+ 
+ 	EXTRA_SUBDIRS="$EXTRA_SUBDIRS kio-msits"
++	PICS_SUBDIR="$PICS_SUBDIR pics"
+ fi
+ 
+ if test "x$with_kde" != "xyes"; then
+@@ -33776,6 +33778,7 @@
+ 
+ 
+ 
++
+ echo ""
+ echo "Please remember to use GNU make, often installed as gmake."
+ echo ""
+@@ -34738,6 +34741,7 @@
+ s,@BUILD_CHMLIB_TRUE@,$BUILD_CHMLIB_TRUE,;t t
+ s,@BUILD_CHMLIB_FALSE@,$BUILD_CHMLIB_FALSE,;t t
+ s,@EXTRA_SUBDIRS@,$EXTRA_SUBDIRS,;t t
++s,@PICS_SUBDIR@,$PICS_SUBDIR,;t t
+ s,@CHM_INCLUDES@,$CHM_INCLUDES,;t t
+ s,@CHM_LIBS@,$CHM_LIBS,;t t
+ s,@TOPSUBDIRS@,$TOPSUBDIRS,;t t
diff --git a/deskutils/kchmviewer-kde4/files/patch-src-Makefile.in b/deskutils/kchmviewer-kde4/files/patch-src-Makefile.in
new file mode 100644
index 000000000000..c64dc87fee45
--- /dev/null
+++ b/deskutils/kchmviewer-kde4/files/patch-src-Makefile.in
@@ -0,0 +1,347 @@
+--- src/Makefile.in.orig	Sat Feb  4 16:59:20 2006
++++ src/Makefile.in	Sat Feb  4 17:00:02 2006
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.1 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(kchmviewer_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -108,9 +106,23 @@
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kchmviewer_SOURCES)
+ DIST_SOURCES = $(kchmviewer_SOURCES)
++#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++#>- 	html-recursive info-recursive install-data-recursive \
++#>- 	install-exec-recursive install-info-recursive \
++#>- 	install-recursive installcheck-recursive installdirs-recursive \
++#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
++#>- 	uninstall-recursive
++#>+ 6
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive nmcheck-recursive bcheck-recursive
+ HEADERS = $(noinst_HEADERS)
+ ETAGS = etags
+ CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
+ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ #>+ 1
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+@@ -245,6 +257,7 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PERL = @PERL@
++PICS_SUBDIR = @PICS_SUBDIR@
+ QTE_NORTTI = @QTE_NORTTI@
+ QT_INCLUDES = @QT_INCLUDES@
+ QT_LDFLAGS = @QT_LDFLAGS@
+@@ -385,10 +398,11 @@
+ 			kde-qt.h kchmsearchwindow.h xchmfile.h kqtempfile.h kqrunprocess.h \
+ 		filetype_handler.h 
+ 
++SUBDIRS = $(PICS_SUBDIR)
+ #>- all: config.h
+ #>+ 1
+ all: docs-am  config.h
+-	$(MAKE) $(AM_MAKEFLAGS) all-am
++	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+@@ -540,6 +554,77 @@
+ 	-rm -f libtool
+ uninstall-info-am:
+ 
++# This directory's subdirectories are mostly independent; you can cd
++# into them and run `make' without going through this Makefile.
++# To change the values of `make' variables: instead of editing Makefiles,
++# (1) if the variable is set in `config.status', edit `config.status'
++#     (which will cause the Makefiles to be regenerated when you run `make');
++# (2) otherwise, pass the desired values on the `make' command line.
++$(RECURSIVE_TARGETS):
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
++	dot_seen=no; \
++	target=`echo $@ | sed s/-recursive//`; \
++	list='$(SUBDIRS)'; for subdir in $$list; do \
++	  echo "Making $$target in $$subdir"; \
++	  if test "$$subdir" = "."; then \
++	    dot_seen=yes; \
++	    local_target="$$target-am"; \
++	  else \
++	    local_target="$$target"; \
++	  fi; \
++	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
++	  || eval $$failcom; \
++	done; \
++	if test "$$dot_seen" = "no"; then \
++	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
++	fi; test -z "$$fail"
++
++mostlyclean-recursive clean-recursive distclean-recursive \
++maintainer-clean-recursive:
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
++	dot_seen=no; \
++	case "$@" in \
++	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
++	  *) list='$(SUBDIRS)' ;; \
++	esac; \
++	rev=''; for subdir in $$list; do \
++	  if test "$$subdir" = "."; then :; else \
++	    rev="$$subdir $$rev"; \
++	  fi; \
++	done; \
++	rev="$$rev ."; \
++	target=`echo $@ | sed s/-recursive//`; \
++	for subdir in $$rev; do \
++	  echo "Making $$target in $$subdir"; \
++	  if test "$$subdir" = "."; then \
++	    local_target="$$target-am"; \
++	  else \
++	    local_target="$$target"; \
++	  fi; \
++	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
++	  || eval $$failcom; \
++	done && test -z "$$fail"
++tags-recursive:
++	list='$(SUBDIRS)'; for subdir in $$list; do \
++	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
++	done
++ctags-recursive:
++	list='$(SUBDIRS)'; for subdir in $$list; do \
++	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
++	done
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -550,10 +635,23 @@
+ 	mkid -fID $$unique
+ tags: TAGS
+ 
+-TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
++TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
++	  include_option=--etags-include; \
++	  empty_fix=.; \
++	else \
++	  include_option=--include; \
++	  empty_fix=; \
++	fi; \
++	list='$(SUBDIRS)'; for subdir in $$list; do \
++	  if test "$$subdir" = .; then :; else \
++	    test ! -f $$subdir/TAGS || \
++	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
++	  fi; \
++	done; \
+ 	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+ 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+@@ -566,7 +664,7 @@
+ 	    $$tags $$unique; \
+ 	fi
+ ctags: CTAGS
+-CTAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
++CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+@@ -615,22 +713,38 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++	  if test "$$subdir" = .; then :; else \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
++	    || exit 1; \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
++	    (cd $$subdir && \
++	      $(MAKE) $(AM_MAKEFLAGS) \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
++	        distdir) \
++	      || exit 1; \
++	  fi; \
++	done
+ check-am: all-am
+-check: check-am
++check: check-recursive
+ all-am: Makefile $(PROGRAMS) $(HEADERS) config.h
+-installdirs:
++installdirs: installdirs-recursive
++installdirs-am:
+ 	for dir in "$(DESTDIR)$(bindir)"; do \
+ 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ 	done
+-install: install-am
+-install-exec: install-exec-am
+-install-data: install-data-am
+-uninstall: uninstall-am
++install: install-recursive
++install-exec: install-exec-recursive
++install-data: install-data-recursive
++uninstall: uninstall-recursive
+ 
+ install-am: all-am
+ 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+ 
+-installcheck: installcheck-am
++installcheck: installcheck-recursive
+ install-strip:
+ 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ 	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+@@ -646,27 +760,27 @@
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+ 	@echo "it deletes files that may require special tools to rebuild."
+-#>- clean: clean-am
++#>- clean: clean-recursive
+ #>+ 1
+-clean: kde-rpo-clean  clean-am
++clean: kde-rpo-clean  clean-recursive
+ 
+ #>- clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+ #>+ 1
+ clean-am: clean-metasources clean-ui clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+ 
+-distclean: distclean-am
++distclean: distclean-recursive
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+ 	distclean-hdr distclean-libtool distclean-tags
+ 
+-dvi: dvi-am
++dvi: dvi-recursive
+ 
+ dvi-am:
+ 
+-html: html-am
++html: html-recursive
+ 
+-info: info-am
++info: info-recursive
+ 
+ info-am:
+ 
+@@ -674,44 +788,48 @@
+ 
+ install-exec-am: install-binPROGRAMS
+ 
+-install-info: install-info-am
++install-info: install-info-recursive
+ 
+ install-man:
+ 
+ installcheck-am:
+ 
+-maintainer-clean: maintainer-clean-am
++maintainer-clean: maintainer-clean-recursive
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+ 
+-mostlyclean: mostlyclean-am
++mostlyclean: mostlyclean-recursive
+ 
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ 	mostlyclean-libtool
+ 
+-pdf: pdf-am
++pdf: pdf-recursive
+ 
+ pdf-am:
+ 
+-ps: ps-am
++ps: ps-recursive
+ 
+ ps-am:
+ 
+ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+ 
+-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+-	clean-generic clean-libtool ctags distclean distclean-compile \
+-	distclean-generic distclean-hdr distclean-libtool \
+-	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-binPROGRAMS install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-strip installcheck \
+-	installcheck-am installdirs maintainer-clean \
+-	maintainer-clean-generic mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-binPROGRAMS \
+-	uninstall-info-am
++uninstall-info: uninstall-info-recursive
++
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-binPROGRAMS clean-generic clean-libtool \
++	clean-recursive ctags ctags-recursive distclean \
++	distclean-compile distclean-generic distclean-hdr \
++	distclean-libtool distclean-recursive distclean-tags distdir \
++	dvi dvi-am html html-am info info-am install install-am \
++	install-binPROGRAMS install-data install-data-am install-exec \
++	install-exec-am install-info install-info-am install-man \
++	install-strip installcheck installcheck-am installdirs \
++	installdirs-am maintainer-clean maintainer-clean-generic \
++	maintainer-clean-recursive mostlyclean mostlyclean-compile \
++	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
++	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
++	uninstall-binPROGRAMS uninstall-info-am
+ 
+ 
+ messages: rc.cpp
+@@ -783,7 +901,7 @@
+ 	-rm -f  kchmbookmarkwindow.moc.cpp kchmsearchwindow.moc.cpp kchmviewwindow_khtmlpart.moc kchmviewwindow_qtextbrowser.moc.cpp kchmindexwindow.moc.cpp kchmdialogchooseurlfromlist.moc.cpp kchmmainwindow.moc.cpp kchmsearchtoolbar.moc.cpp
+ 
+ #>+ 2
+-KDE_DIST=kchmsetupdialog.ui Makefile.in config.h.in kchmsetupdialog.h Makefile.am 
++KDE_DIST=kchmsetupdialog.ui Makefile.in config.h.in Makefile.am 
+ 
+ #>+ 4
+ clean-ui:
+@@ -813,7 +931,7 @@
+ clean-bcheck: 
+ 	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
+ 
+-bcheck: bcheck-am
++bcheck: bcheck-recursive
+ 
+ bcheck-am:
+ 	@for i in ; do \
+@@ -832,7 +950,7 @@
+ 
+ 
+ #>+ 11
+-kchmviewer.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/iconstorage.cpp $(srcdir)/kchmbookmarkwindow.cpp $(srcdir)/kchmconfig.cpp $(srcdir)/kchmindexwindow.cpp $(srcdir)/kchmmainwindow.cpp $(srcdir)/kchmsearchtoolbar.cpp $(srcdir)/kchmsearchwindow.cpp $(srcdir)/kchmsettings.cpp $(srcdir)/kchmsourcefactory.cpp $(srcdir)/kchmtextencoding.cpp $(srcdir)/kchmtreeviewitem.cpp $(srcdir)/kchmviewwindow.cpp $(srcdir)/main.cpp $(srcdir)/xchmfile.cpp $(srcdir)/kchmdialogchooseurlfromlist.cpp $(srcdir)/kde-qt.cpp $(srcdir)/kchmviewwindow_qtextbrowser.cpp $(srcdir)/kchmviewwindow_khtmlpart.cpp $(srcdir)/kqtempfile.cpp $(srcdir)/kchmsetupdialog.cpp kchmsearchwindow.moc.cpp kchmbookmarkwindow.moc.cpp kchmindexwindow.moc.cpp kchmviewwindow_qtextbrowser.moc.cpp kchmdialogchooseurlfromlist.moc.cpp kchmmainwindow.moc.cpp kchmsearchtoolbar.moc.cpp  kchmsetupdialog.moc kchmviewwindow_khtmlpart.moc
++kchmviewer.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/iconstorage.cpp $(srcdir)/kchmbookmarkwindow.cpp $(srcdir)/kchmconfig.cpp $(srcdir)/kchmindexwindow.cpp $(srcdir)/kchmmainwindow.cpp $(srcdir)/kchmsearchtoolbar.cpp $(srcdir)/kchmsearchwindow.cpp $(srcdir)/kchmsettings.cpp $(srcdir)/kchmsourcefactory.cpp $(srcdir)/kchmtextencoding.cpp $(srcdir)/kchmtreeviewitem.cpp $(srcdir)/kchmviewwindow.cpp $(srcdir)/main.cpp $(srcdir)/xchmfile.cpp $(srcdir)/kchmdialogchooseurlfromlist.cpp $(srcdir)/kde-qt.cpp $(srcdir)/kchmviewwindow_qtextbrowser.cpp $(srcdir)/kchmviewwindow_khtmlpart.cpp $(srcdir)/kqtempfile.cpp kchmsetupdialog.cpp kchmsearchwindow.moc.cpp kchmbookmarkwindow.moc.cpp kchmindexwindow.moc.cpp kchmviewwindow_qtextbrowser.moc.cpp kchmdialogchooseurlfromlist.moc.cpp kchmmainwindow.moc.cpp kchmsearchtoolbar.moc.cpp  kchmsetupdialog.moc kchmviewwindow_khtmlpart.moc
+ 	@echo 'creating kchmviewer.all_cpp.cpp ...'; \
+ 	rm -f kchmviewer.all_cpp.files kchmviewer.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kchmviewer.all_cpp.final; \
diff --git a/deskutils/kchmviewer-kde4/pkg-plist b/deskutils/kchmviewer-kde4/pkg-plist
index 47e1550fb9b9..ce729903c066 100644
--- a/deskutils/kchmviewer-kde4/pkg-plist
+++ b/deskutils/kchmviewer-kde4/pkg-plist
@@ -3,4 +3,7 @@ bin/kchmviewer
 %%KDE%%lib/kde3/kio_msits.la
 %%KDE%%lib/kde3/kio_msits.so
 %%KDE%%share/applnk/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
 %%KDE%%share/services/msits.protocol