Import of pkgsrc-2015Q2

2015-08-30 02:56:09 -07:00
parent 4af1cdf7a9
commit f641581404
15409 changed files with 267784 additions and 121624 deletions
--- a/misc/Addresses/Makefile
+++ b/misc/Addresses/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2014/10/07 16:47:12 adam Exp $
+# $NetBSD: Makefile,v 1.31 2015/04/06 08:17:15 adam Exp $
 #

 DISTNAME=		Addresses-0.4.8
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		misc gnustep
 MASTER_SITES=		http://savannah.nongnu.org/download/gap/

--- a/misc/Addresses/buildlink3.mk
+++ b/misc/Addresses/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2014/10/07 16:47:12 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2015/04/06 08:17:15 adam Exp $

 BUILDLINK_TREE+=	Addresses

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	Addresses
 ADDRESSES_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.Addresses+=	Addresses>=0.4.8
-BUILDLINK_ABI_DEPENDS.Addresses+=	Addresses>=0.4.8nb5
+BUILDLINK_ABI_DEPENDS.Addresses+=	Addresses>=0.4.8nb6
 BUILDLINK_PKGSRCDIR.Addresses?=	../../misc/Addresses

 .include "../../devel/gnustep-make/gnustep.mk"
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.451 2015/03/12 14:00:14 nros Exp $
+# $NetBSD: Makefile,v 1.454 2015/06/04 20:28:06 youri Exp $
 #

 COMMENT=	Miscellaneous utilities
@@ -40,6 +40,7 @@ SUBDIR+=	cowsay
 SUBDIR+=	cstream
 SUBDIR+=	cuecat
 SUBDIR+=	cuetools
+SUBDIR+=	cw
 SUBDIR+=	deskbar-applet
 SUBDIR+=	dgpsip
 SUBDIR+=	dialog
@@ -134,6 +135,7 @@ SUBDIR+=	kdeplasma-addons4
 SUBDIR+=	kdeutils3
 SUBDIR+=	kdrill
 SUBDIR+=	kgeography
+SUBDIR+=	khard
 SUBDIR+=	kig
 SUBDIR+=	kiten
 SUBDIR+=	klettres
@@ -333,6 +335,7 @@ SUBDIR+=	whohas
 SUBDIR+=	window
 SUBDIR+=	xchm
 SUBDIR+=	xdg-utils
+SUBDIR+=	xfce4-time-out-plugin
 SUBDIR+=	xfce4-weather-plugin
 SUBDIR+=	xjdic
 SUBDIR+=	xorg-docs
--- a/misc/attica/Makefile
+++ b/misc/attica/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2014/02/12 23:18:11 tron Exp $
+# $NetBSD: Makefile,v 1.29 2015/04/25 14:23:31 tnn Exp $

 DISTNAME=	attica-0.4.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_KDE:=attica/}
 EXTRACT_SUFX=	.tar.bz2
--- a/misc/attica/buildlink3.mk
+++ b/misc/attica/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.23 2014/02/12 23:18:11 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2015/04/25 14:23:31 tnn Exp $

 BUILDLINK_TREE+=	attica

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	attica
 ATTICA_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.attica+=	attica>=0.1.2
-BUILDLINK_ABI_DEPENDS.attica+=	attica>=0.4.2nb1
+BUILDLINK_ABI_DEPENDS.attica+=	attica>=0.4.2nb2
 BUILDLINK_PKGSRCDIR.attica?=	../../misc/attica

 .include "../../x11/qt4-libs/buildlink3.mk"
--- a/misc/basket/Makefile
+++ b/misc/basket/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2014/08/22 11:24:37 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2015/04/25 14:23:31 tnn Exp $

 DISTNAME=		basket-1.0.2
-PKGREVISION=		32
+PKGREVISION=		33
 CATEGORIES=		misc
 MASTER_SITES=		http://basket.kde.org/downloads/

--- a/misc/bbweather/Makefile
+++ b/misc/bbweather/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2014/05/29 23:36:57 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2015/06/12 10:50:33 wiz Exp $
 #

 DISTNAME=	bbweather-0.6.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	http://www.netmeister.org/apps/
 EXTRACT_SUFX=	.tar.bz2
--- a/misc/bibletime/Makefile
+++ b/misc/bibletime/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2015/03/12 13:54:30 nros Exp $
+# $NetBSD: Makefile,v 1.4 2015/04/25 14:23:31 tnn Exp $

 DISTNAME=		bibletime-2.10.1
-PKGREVISION=		2
+PKGREVISION=		5
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=bibletime/}
 EXTRACT_SUFX=		.tar.xz
--- a/misc/blccc/Makefile
+++ b/misc/blccc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2014/05/05 00:48:08 ryoon Exp $
+# $NetBSD: Makefile,v 1.36 2015/04/25 14:23:31 tnn Exp $
 #

 DISTNAME=		blccc-1.99
-PKGREVISION=		25
+PKGREVISION=		26
 CATEGORIES=		misc
 MASTER_SITES=		http://sven.gimp.org/blinkenlights/

--- a/misc/byobu/Makefile
+++ b/misc/byobu/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2014/07/13 07:13:21 ryoon Exp $
+# $NetBSD: Makefile,v 1.6 2015/06/12 10:50:33 wiz Exp $

 BYOBUVER=	5.81
 DISTNAME=	byobu_${BYOBUVER}.orig
 PKGNAME=	${DISTNAME:S/_/-/:S/.orig//}
+PKGREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://byobu.co/download/

--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.96 2015/03/16 22:28:38 wiz Exp $
+# $NetBSD: Makefile,v 1.106 2015/06/10 09:00:40 wiz Exp $

-DISTNAME=	calibre-2.21.0
-PKGREVISION=	1
+DISTNAME=	calibre-2.30.0
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=calibre/}
 EXTRACT_SUFX=	.tar.xz
--- a/misc/calibre/PLIST
+++ b/misc/calibre/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.33 2015/03/16 22:28:38 wiz Exp $
+@comment $NetBSD: PLIST,v 1.39 2015/06/10 09:00:40 wiz Exp $
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
@@ -243,8 +243,13 @@ lib/calibre/calibre/ebooks/docx/to_html.py
 lib/calibre/calibre/ebooks/docx/toc.py
 lib/calibre/calibre/ebooks/docx/writer/__init__.py
 lib/calibre/calibre/ebooks/docx/writer/container.py
+lib/calibre/calibre/ebooks/docx/writer/fonts.py
 lib/calibre/calibre/ebooks/docx/writer/from_html.py
+lib/calibre/calibre/ebooks/docx/writer/images.py
+lib/calibre/calibre/ebooks/docx/writer/links.py
+lib/calibre/calibre/ebooks/docx/writer/lists.py
 lib/calibre/calibre/ebooks/docx/writer/styles.py
+lib/calibre/calibre/ebooks/docx/writer/tables.py
 lib/calibre/calibre/ebooks/docx/writer/utils.py
 lib/calibre/calibre/ebooks/epub/__init__.py
 lib/calibre/calibre/ebooks/epub/cfi/__init__.py
@@ -681,6 +686,8 @@ lib/calibre/calibre/gui2/convert/debug.py
 lib/calibre/calibre/gui2/convert/debug_ui.py
 lib/calibre/calibre/gui2/convert/docx_input.py
 lib/calibre/calibre/gui2/convert/docx_input_ui.py
+lib/calibre/calibre/gui2/convert/docx_output.py
+lib/calibre/calibre/gui2/convert/docx_output_ui.py
 lib/calibre/calibre/gui2/convert/epub_output.py
 lib/calibre/calibre/gui2/convert/epub_output_ui.py
 lib/calibre/calibre/gui2/convert/fb2_input.py
@@ -765,7 +772,6 @@ lib/calibre/calibre/gui2/dialogs/check_library.py
 lib/calibre/calibre/gui2/dialogs/choose_format.py
 lib/calibre/calibre/gui2/dialogs/choose_format_device.py
 lib/calibre/calibre/gui2/dialogs/choose_format_device_ui.py
-lib/calibre/calibre/gui2/dialogs/choose_format_ui.py
 lib/calibre/calibre/gui2/dialogs/choose_library.py
 lib/calibre/calibre/gui2/dialogs/choose_library_ui.py
 lib/calibre/calibre/gui2/dialogs/choose_plugin_toolbars.py
@@ -916,7 +922,6 @@ lib/calibre/calibre/gui2/search_box.py
 lib/calibre/calibre/gui2/search_restriction_mixin.py
 lib/calibre/calibre/gui2/shortcuts.py
 lib/calibre/calibre/gui2/shortcuts_ui.py
-lib/calibre/calibre/gui2/splash.py
 lib/calibre/calibre/gui2/store/__init__.py
 lib/calibre/calibre/gui2/store/basic_config.py
 lib/calibre/calibre/gui2/store/basic_config_widget_ui.py
@@ -1146,6 +1151,7 @@ lib/calibre/calibre/plugins/_patiencediff_c.so
 lib/calibre/calibre/plugins/_regex.so
 lib/calibre/calibre/plugins/bzzdec.so
 lib/calibre/calibre/plugins/cPalmdoc.so
+lib/calibre/calibre/plugins/certgen.so
 lib/calibre/calibre/plugins/chm_extra.so
 lib/calibre/calibre/plugins/chmlib.so
 lib/calibre/calibre/plugins/freetype.so
@@ -1172,6 +1178,26 @@ lib/calibre/calibre/spell/__init__.py
 lib/calibre/calibre/spell/break_iterator.py
 lib/calibre/calibre/spell/dictionary.py
 lib/calibre/calibre/spell/import_from.py
+lib/calibre/calibre/srv/__init__.py
+lib/calibre/calibre/srv/bonjour.py
+lib/calibre/calibre/srv/errors.py
+lib/calibre/calibre/srv/handler.py
+lib/calibre/calibre/srv/http_request.py
+lib/calibre/calibre/srv/http_response.py
+lib/calibre/calibre/srv/loop.py
+lib/calibre/calibre/srv/opts.py
+lib/calibre/calibre/srv/pool.py
+lib/calibre/calibre/srv/pre_activated.py
+lib/calibre/calibre/srv/routes.py
+lib/calibre/calibre/srv/sendfile.py
+lib/calibre/calibre/srv/standalone.py
+lib/calibre/calibre/srv/tests/__init__.py
+lib/calibre/calibre/srv/tests/base.py
+lib/calibre/calibre/srv/tests/http.py
+lib/calibre/calibre/srv/tests/loop.py
+lib/calibre/calibre/srv/tests/main.py
+lib/calibre/calibre/srv/tests/routes.py
+lib/calibre/calibre/srv/utils.py
 lib/calibre/calibre/startup.py
 lib/calibre/calibre/test_build.py
 lib/calibre/calibre/translations/__init__.py
@@ -1182,6 +1208,7 @@ lib/calibre/calibre/utils/__init__.py
 lib/calibre/calibre/utils/apsw_shell.py
 lib/calibre/calibre/utils/bibtex.py
 lib/calibre/calibre/utils/browser.py
+lib/calibre/calibre/utils/certgen.py
 lib/calibre/calibre/utils/chm/__init__.py
 lib/calibre/calibre/utils/chm/chm.py
 lib/calibre/calibre/utils/chm/chmlib.py
@@ -1286,6 +1313,7 @@ lib/calibre/calibre/utils/titlecase.py
 lib/calibre/calibre/utils/unrar.py
 lib/calibre/calibre/utils/unsmarten.py
 lib/calibre/calibre/utils/winreg/__init__.py
+lib/calibre/calibre/utils/winreg/dde.py
 lib/calibre/calibre/utils/winreg/default_programs.py
 lib/calibre/calibre/utils/winreg/lib.py
 lib/calibre/calibre/utils/wmf/__init__.py
@@ -1648,7 +1676,6 @@ share/calibre/images/plus.png
 share/calibre/images/plusplus.png
 share/calibre/images/polish.png
 share/calibre/images/previous.png
-share/calibre/images/print-preview.png
 share/calibre/images/print.png
 share/calibre/images/publisher.png
 share/calibre/images/random.png
@@ -1710,6 +1737,7 @@ share/calibre/mime.types
 share/calibre/quick_start/deu.epub
 share/calibre/quick_start/eng.epub
 share/calibre/quick_start/fra.epub
+share/calibre/quick_start/ita.epub
 share/calibre/recipes/10minutos.recipe
 share/calibre/recipes/180.recipe
 share/calibre/recipes/20_minutos.recipe
@@ -2050,6 +2078,7 @@ share/calibre/recipes/dilbert.recipe
 share/calibre/recipes/dilemaveche.recipe
 share/calibre/recipes/dingoo_a320.recipe
 share/calibre/recipes/discover_magazine.recipe
+share/calibre/recipes/discover_magazine_monthly.recipe
 share/calibre/recipes/disinformatico.recipe
 share/calibre/recipes/divahair.recipe
 share/calibre/recipes/dn_se.recipe
@@ -2599,7 +2628,6 @@ share/calibre/recipes/marketing_sensoriale.recipe
 share/calibre/recipes/mateusz_czytania.recipe
 share/calibre/recipes/matichon.recipe
 share/calibre/recipes/max_planck.recipe
-share/calibre/recipes/maximum_pc.recipe
 share/calibre/recipes/mayra.recipe
 share/calibre/recipes/mdj.recipe
 share/calibre/recipes/media2.recipe
@@ -2609,7 +2637,6 @@ share/calibre/recipes/mediapart.recipe
 share/calibre/recipes/medscape.recipe
 share/calibre/recipes/melbourne_herald_sun.recipe
 share/calibre/recipes/men24_gr.recipe
-share/calibre/recipes/menorca.recipe
 share/calibre/recipes/mens_health.recipe
 share/calibre/recipes/merco_press.recipe
 share/calibre/recipes/mesec.recipe
@@ -2627,6 +2654,7 @@ share/calibre/recipes/ming_pao.recipe
 share/calibre/recipes/ming_pao_toronto.recipe
 share/calibre/recipes/ming_pao_vancouver.recipe
 share/calibre/recipes/miradasalsur.recipe
+share/calibre/recipes/mit_technology_review.recipe
 share/calibre/recipes/mlody_technik_pl.recipe
 share/calibre/recipes/mmc_rtv.recipe
 share/calibre/recipes/mobile_bulgaria.recipe
@@ -3037,7 +3065,6 @@ share/calibre/recipes/sportowefakty.recipe
 share/calibre/recipes/sportsillustrated.recipe
 share/calibre/recipes/sportsillustrated_columnists.recipe
 share/calibre/recipes/st_louis_post_dispatch.recipe
-share/calibre/recipes/st_petersburg_times.recipe
 share/calibre/recipes/stackoverflow.recipe
 share/calibre/recipes/stamgasten.recipe
 share/calibre/recipes/standardmedia_ke.recipe
@@ -3122,6 +3149,7 @@ share/calibre/recipes/the_sun.recipe
 share/calibre/recipes/the_verge.recipe
 share/calibre/recipes/the_week_magazine_free.recipe
 share/calibre/recipes/the_workingham_times.recipe
+share/calibre/recipes/thecodelesscode.recipe
 share/calibre/recipes/thecultofghoul.recipe
 share/calibre/recipes/thedailywtf.recipe
 share/calibre/recipes/thedgesingapore.recipe
@@ -3513,4 +3541,3 @@ share/doc/calibre/Changelog.yaml
 share/doc/calibre/INSTALL
 share/doc/calibre/LICENSE.rtf
 share/doc/calibre/README.md
-@pkgdir lib/calibre/calibre/plugins/.libs
--- a/misc/calibre/distinfo
+++ b/misc/calibre/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.33 2015/03/15 21:23:47 wiz Exp $
+$NetBSD: distinfo,v 1.41 2015/06/10 09:00:40 wiz Exp $

-SHA1 (calibre-2.21.0.tar.xz) = eb420d22b6a740a4b0cbd05d7f5277a1615c2b86
-RMD160 (calibre-2.21.0.tar.xz) = 28b595e091b07f7d7116d5c636b61e18e37ec77d
-Size (calibre-2.21.0.tar.xz) = 36415844 bytes
+SHA1 (calibre-2.30.0.tar.xz) = 0b95fe511ad77d541d6115cbb39cbce28021e699
+RMD160 (calibre-2.30.0.tar.xz) = 6a3e84fde6e5bf1b9036425c67b26ec0d440f00e
+Size (calibre-2.30.0.tar.xz) = 36851416 bytes
 SHA1 (patch-setup_build__environment.py) = b620c36fee9a4c403af0fecced8ea8189dc8e25c
 SHA1 (patch-setup_extensions.py) = dcf89bab3a9ff7012af6e009bf68779302d2a556
--- a/misc/calibre1/Makefile
+++ b/misc/calibre1/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2015/03/09 09:02:20 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2015/04/25 14:23:31 tnn Exp $

 DISTNAME=	calibre-1.48.0
-PKGREVISION=	5
+PKGREVISION=	7
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=calibre/}
 EXTRACT_SUFX=	.tar.xz
--- a/misc/celestia/Makefile
+++ b/misc/celestia/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.63 2014/10/19 22:27:46 alnsn Exp $
+# $NetBSD: Makefile,v 1.64 2015/04/25 14:23:31 tnn Exp $

 DISTNAME=	celestia-1.6.1
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	misc x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=celestia/}

--- a/misc/colorize/Makefile
+++ b/misc/colorize/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2014/05/29 23:36:57 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2015/06/12 10:50:33 wiz Exp $
 #

 DISTNAME=	colorize_0.3.0
 PKGNAME=	colorize-0.3.0
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	misc
 MASTER_SITES=	http://colorize.raszi.hu/downloads/
 EXTRACT_SUFX=	.tar.bz2
--- a/misc/cowsay/Makefile
+++ b/misc/cowsay/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2014/05/29 23:36:57 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2015/06/12 10:50:33 wiz Exp $

 DISTNAME=		cowsay-3.03
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		misc
 MASTER_SITES=		# ftp://ftp.nog.net/pub/tony/cowsay/

--- a/misc/cw/DESCR
+++ b/misc/cw/DESCR
@@ -0,0 +1,8 @@
+Cw is a non-intrusive real-time ANSI color wrapper for common unix-based
+command. It is designed to simulate the environment of the commands being
+executed, so that if a person types 'du', 'df', 'ping', etc.  in their
+shell it will automatically color the output in real-time according to
+a definition file containing the color format desired.  cw has support
+for wildcard match coloring, tokenized coloring, headers/footers, case
+scenario coloring, command line dependent definition coloring, and
+includes over 50 pre-made definition files.
--- a/misc/cw/Makefile
+++ b/misc/cw/Makefile
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile,v 1.2 2015/06/04 21:56:48 youri Exp $
+
+DISTNAME=	cw-1.0.16
+CATEGORIES=	misc
+MASTER_SITES=	http://cwrapper.sourceforge.net/
+
+MAINTAINER=	youri@NetBSD.org
+HOMEPAGE=	http://cwrapper.sourceforge.net/
+COMMENT=	Non-intrusive color wrapper for common commands
+LICENSE=	gnu-gpl-v2
+
+GNU_CONFIGURE=	yes
+USE_TOOLS+=	gmake
+
+SUBST_CLASSES+=		path
+SUBST_STAGE.path=	pre-build
+SUBST_MESSAGE.path=	Updating intepreter path
+SUBST_FILES.path=	def/*
+SUBST_SED.path=		-e 's,/cw,${PREFIX}/bin/cw,1'
+
+.include "../../mk/bsd.pkg.mk"
--- a/misc/cw/PLIST
+++ b/misc/cw/PLIST
@@ -0,0 +1,123 @@
+@comment $NetBSD: PLIST,v 1.1 2015/06/04 20:27:53 youri Exp $
+bin/color
+bin/colorcfg
+bin/cw
+bin/cwu
+lib/cw/arp
+lib/cw/arping
+lib/cw/auth.log@
+lib/cw/blockdev
+lib/cw/cal
+lib/cw/cksum
+lib/cw/clock
+lib/cw/configure
+lib/cw/cpuinfo@
+lib/cw/crontab@
+lib/cw/cw-pipe
+lib/cw/cw-test.cgi
+lib/cw/date
+lib/cw/df
+lib/cw/diff
+lib/cw/dig
+lib/cw/dmesg
+lib/cw/du
+lib/cw/env
+lib/cw/etc/1line-blu.ftr
+lib/cw/etc/1line-blu.hdr
+lib/cw/etc/1line-cyn.ftr
+lib/cw/etc/1line-cyn.hdr
+lib/cw/etc/1line-grn.ftr
+lib/cw/etc/1line-grn.hdr
+lib/cw/etc/1line-gry.ftr
+lib/cw/etc/1line-gry.hdr
+lib/cw/etc/1line-grydash.ftr
+lib/cw/etc/1line-grydash.hdr
+lib/cw/etc/1line-gryfade.ftr
+lib/cw/etc/1line-gryfade.hdr
+lib/cw/etc/1line-prp.ftr
+lib/cw/etc/1line-prp.hdr
+lib/cw/etc/1line-red.ftr
+lib/cw/etc/1line-red.hdr
+lib/cw/etc/1line-ylw.ftr
+lib/cw/etc/1line-ylw.hdr
+lib/cw/etc/README
+lib/cw/etc/bendingbars.ftr
+lib/cw/etc/bendingbars.hdr
+lib/cw/etc/chrome.ftr
+lib/cw/etc/chrome.hdr
+lib/cw/etc/goop-cyngrn.ftr
+lib/cw/etc/goop-cyngrn.hdr
+lib/cw/etc/goop-redprp.ftr
+lib/cw/etc/goop-redprp.hdr
+lib/cw/figlet
+lib/cw/file
+lib/cw/find
+lib/cw/finger
+lib/cw/free
+lib/cw/fstab@
+lib/cw/fuser
+lib/cw/g++
+lib/cw/gcc
+lib/cw/group@
+lib/cw/groups
+lib/cw/hdparm
+lib/cw/hexdump
+lib/cw/host
+lib/cw/hosts@
+lib/cw/id
+lib/cw/ifconfig
+lib/cw/inittab@
+lib/cw/iptables
+lib/cw/last
+lib/cw/lastlog
+lib/cw/lsattr
+lib/cw/lsmod
+lib/cw/lsof
+lib/cw/ltrace-color
+lib/cw/make
+lib/cw/md5sum
+lib/cw/meminfo@
+lib/cw/messages@
+lib/cw/mount
+lib/cw/mpg123
+lib/cw/netstat
+lib/cw/nfsstat
+lib/cw/nmap
+lib/cw/nslookup
+lib/cw/objdump
+lib/cw/passwd@
+lib/cw/ping
+lib/cw/pmap
+lib/cw/pmap_dump
+lib/cw/praliases
+lib/cw/profile@
+lib/cw/protocols@
+lib/cw/ps
+lib/cw/pstree
+lib/cw/quota
+lib/cw/quotastats
+lib/cw/resolv.conf@
+lib/cw/route
+lib/cw/routel
+lib/cw/sdiff
+lib/cw/services@
+lib/cw/showmount
+lib/cw/smbstatus
+lib/cw/stat
+lib/cw/strace-color
+lib/cw/sysctl
+lib/cw/syslog
+lib/cw/tar
+lib/cw/tcpdump
+lib/cw/tracepath
+lib/cw/traceroute
+lib/cw/umount
+lib/cw/uname
+lib/cw/uptime
+lib/cw/users
+lib/cw/vmstat
+lib/cw/w
+lib/cw/wc
+lib/cw/whereis
+lib/cw/who
+lib/cw/xferlog@
--- a/misc/cw/distinfo
+++ b/misc/cw/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1 2015/06/04 20:27:53 youri Exp $
+
+SHA1 (cw-1.0.16.tar.gz) = aede60d3f7a9c384e98836a84072dc7b459ce616
+RMD160 (cw-1.0.16.tar.gz) = 7040d32ca9cc82d7a341a237343bfbb7cf9eda75
+Size (cw-1.0.16.tar.gz) = 85621 bytes
+SHA1 (patch-Makefile.in) = 483926acea84aad117ccdce0c4cd644c7ef08a94
+SHA1 (patch-src_cw.c) = 766b3d30a54ccbec1d08eaaadbf77b39c3bb3fb6
--- a/misc/cw/patches/patch-Makefile.in
+++ b/misc/cw/patches/patch-Makefile.in
@@ -0,0 +1,121 @@
+$NetBSD: patch-Makefile.in,v 1.1 2015/06/04 20:27:53 youri Exp $
+
+Fix the Makefile for DESTDIR support.
+
+--- Makefile.in.orig	2010-06-20 04:39:51.000000000 +0000
+++ Makefile.in
+@@ -2,101 +2,21 @@
+ PREFIX=@prefix@
+ BINDIR=${PREFIX}/bin
+ LIBDIR=${PREFIX}/lib
+-MANDIR=@mandir@
+ SHELL=@SHELL@
+ CC=@CC@
+-ECHO=echo
+-LN=ln
+-RM=rm
+-MKDIR=mkdir
+-INSTALL=@INSTALL@
+ 
+ all:
+-	@$(ECHO) "* Type \"make local\" to just compile local binaries."
+-	@$(ECHO) "* Type \"make installlocal\" to compile/install in"\
+-        "your home directory."
+-	@$(ECHO) "* Type \"make install\" to compile/install globally."
+	$(CC) src/cw.c -o bin/cw @CFLAGS@ @LIBS@ @DEFS@
+	$(CC) src/cwu.c -o bin/cwu @CFLAGS@
+ 
+-cw:
+-	@$(ECHO) "* Compiling cw(color wrapper)..."
+-	@$(CC) src/cw.c -o bin/cw @CFLAGS@ @LIBS@ @DEFS@
+-
+-cwu:
+-	@$(ECHO) "* Compiling cwu(color wrapper directive updater)..."
+-	@$(CC) src/cwu.c -o bin/cwu @CFLAGS@
+-
+-local: cw cwu
+-
+-installlocal: cleanlocal local
+-	@$(ECHO) "* Installing color wrapper locally..."
+-	@$(MKDIR) -m 755 $(HOME)/.cw $(HOME)/.cw/bin $(HOME)/.cw/def $(HOME)/.cw/def/etc
+-	@for FILE in bin/*;do $(INSTALL) -m 755 $$FILE $(HOME)/.cw/bin/;done
+-	@$(LN) -sf $(HOME)/.cw/bin/cw $(HOME)/.cw/bin/cwe
+-	@$(ECHO) "* Installing color wrapper generic definition files..."
+-	@for FILE in def/*;do $(INSTALL) -m 755 $$FILE $(HOME)/.cw/def/;done
+-	@$(ECHO) "* Installing color wrapper generic header/footer files..."
+-	@for FILE in etc/*;do $(INSTALL) -m 644 $$FILE $(HOME)/.cw/def/etc/;done
+-	@$(ECHO) "* Updating definition files..."
+-	@bin/cwu $(HOME)/.cw/def/ $(HOME)/.cw/bin/cw
+-	@$(ECHO) "-----------------------------------------------------------"
+-	@$(ECHO) "* Complete, definitions are stored in: ~/.cw/def"
+-	@$(ECHO) "* For bash: place 'export PATH=\"~/.cw/def:\$$PATH\"'"\
+-        "at the end of ~/.bash_profile"
+-	@$(ECHO) "* For tcsh: place 'setenv PATH \"~/.cw/def:\$$PATH\"'"\
+-        "at the end of ~/.login"
+-	@$(ECHO) "* Or to automate the two lines above use the"\
+-        "\"~/.cw/bin/colorcfg\" command. (and add optional anti-coloring"\
+-        "precautions)"
+-	@$(ECHO) "* Once the desired shell(s) are setup, use the"\
+-        "\"~/.cw/bin/color\" command, or the environmental variable"\
+-        "NOCOLOR=1 to turn color wrapping on and off."
+-	@$(ECHO) ""
+-	@$(ECHO) "* PLEASE view the ./README file for more information if"\
+-        "you haven't already."
+-
+-install: cleanpub cw cwu
+-	@$(ECHO) "* Installing color wrapper..."
+-	@for FILE in bin/*;do $(INSTALL) -o 0 -g 0 -m 755 $$FILE $(BINDIR);done
+-	@$(LN) -sf $(BINDIR)/cw $(BINDIR)/cwe
+-	@$(ECHO) "* Installing color wrapper generic definition files..."
+-	@$(MKDIR) -m 755 $(LIBDIR)/cw/
+-	@for FILE in def/*;do $(INSTALL) -o 0 -g 0 -m 755 $$FILE $(LIBDIR)/cw/;done
+-	@$(ECHO) "* Installing color wrapper generic header/footer files..."
+-	@$(MKDIR) -m 755 $(LIBDIR)/cw/etc
+-	@for FILE in etc/*;do $(INSTALL) -o 0 -g 0 -m 644 $$FILE $(LIBDIR)/cw/etc;done
+-	@$(ECHO) "* Installing manual pages..."
+-	@for FILE in man/*;do $(INSTALL) -o 0 -g 0 -m 644 $$FILE $(MANDIR)/man1/;done
+-	@$(ECHO) "* Updating definition files..."
+-	@$(BINDIR)/cwu $(LIBDIR)/cw $(BINDIR)/cw
+-	@$(ECHO) "-----------------------------------------------------------"
+-	@$(ECHO) "* Complete, definitions are stored in: $(LIBDIR)/cw"
+-	@$(ECHO) "* For bash: place 'export PATH=\"$(LIBDIR)/cw:\$$PATH\"'"\
+-        "at the end of ~/.bash_profile(or /etc/profile globally)"
+-	@$(ECHO) "* For tcsh: place 'setenv PATH \"$(LIBDIR)/cw:\$$PATH\"'"\
+-        "at the end of ~/.login(or /etc/csh.login globally)"
+-	@$(ECHO) "* Or to automate the two lines above use the"\
+-        "\"colorcfg\" command. (and add optional anti-coloring precautions)"
+-	@$(ECHO) "* Once the desired shell(s) are setup, use the"\
+-        "\"color\" command, or the environmental variable NOCOLOR=1 to turn"\
+-        "color wrapping on and off."
+-	@$(ECHO) ""
+-	@$(ECHO) "* PLEASE view the ./README file for more information if"\
+-        "you haven't already."
+-
+-clean:
+-	@$(ECHO) "* Cleaning compiling content..."
+-	@$(RM) -rf Makefile config.status config.cache config.log config.h\
+-        bin/cw bin/cwu bin/cw.exe bin/cwu.exe
+-
+-cleanlocal:
+-	@$(ECHO) "* Cleaning local content..."
+-	@$(RM) -rf $(HOME)/.cw
+-
+-cleanpub:
+-	@$(ECHO) "* Cleaning cw and cwu binaries, and definitions..."
+-	@$(RM) -rf $(BINDIR)/cw $(BINDIR)/cwu $(BINDIR)/cwe\
+-        $(BINDIR)/cw.exe $(BINDIR)/cwu.exe $(BINDIR)/color $(BINDIR)/colorcfg\
+-        $(LIBDIR)/cw $(MANDIR)/man1/cw.1.gz $(MANDIR)/man1/cwu.1.gz\
+-        $(MANDIR)/man1/cwe.1.gz
+-
+-cleanall: clean cleanlocal cleanpub
+.PHONY: install
+install: 
+	mkdir -p $(DESTDIR)$(LIBDIR)/cw/etc
+	mkdir -p $(DESTDIR)$(LIBDIR)
+	mkdir -p $(DESTDIR)$(BINDIR)
+	install -pm 755 bin/cw $(DESTDIR)$(BINDIR)/
+	install -pm 755 bin/cwu $(DESTDIR)$(BINDIR)/
+	install -pm 755 bin/color $(DESTDIR)$(BINDIR)/
+	install -pm 755 bin/colorcfg $(DESTDIR)$(BINDIR)/
+	install -pm 755 def/* $(DESTDIR)$(LIBDIR)/cw/
+	install -pm 644 etc/* $(DESTDIR)$(LIBDIR)/cw/etc/
--- a/misc/cw/patches/patch-src_cw.c
+++ b/misc/cw/patches/patch-src_cw.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_cw.c,v 1.1 2015/06/04 20:27:53 youri Exp $
+
+fprintf requires the format.
+
+--- src/cw.c.orig	2010-06-20 04:39:51.000000000 +0000
+++ src/cw.c
+@@ -643,7 +643,7 @@ void sighandler(signed int sig){
+  else if(sig==SIGUSR1)ext=1;
+  else if(sig==SIGALRM)ext=2;
+  else if(sig==SIGPIPE||sig==SIGINT){
+-  fprintf(stderr,pal2[16]);
+  fprintf(stderr,"%s\n",pal2[16]);
+   fflush(stderr);
+   cwexit(0,0);
+  }
--- a/misc/deskbar-applet/Makefile
+++ b/misc/deskbar-applet/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.88 2014/10/07 16:47:30 adam Exp $
+# $NetBSD: Makefile,v 1.90 2015/04/25 14:23:32 tnn Exp $

 DISTNAME=	deskbar-applet-2.32.0
-PKGREVISION=	35
+PKGREVISION=	37
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/deskbar-applet/2.32/}
 EXTRACT_SUFX=	.tar.bz2
--- a/misc/dialog/Makefile
+++ b/misc/dialog/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.72 2015/03/01 15:14:49 wiz Exp $
+# $NetBSD: Makefile,v 1.74 2015/05/31 13:06:24 wiz Exp $

-DISTNAME=	dialog-1.2-20150225
+DISTNAME=	dialog-1.2-20150528
 PKGNAME=	${DISTNAME:C/-2/.2/}
 CATEGORIES=	misc
 MASTER_SITES=	ftp://invisible-island.net/dialog/
--- a/misc/dialog/distinfo
+++ b/misc/dialog/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.42 2015/03/01 15:14:49 wiz Exp $
+$NetBSD: distinfo,v 1.45 2015/05/31 13:06:24 wiz Exp $

-SHA1 (dialog-1.2-20150225.tgz) = 6820c84e68ffac69a540b86aa31e93b1aa0d17af
-RMD160 (dialog-1.2-20150225.tgz) = b049fcbaf8c2eea667bf91edea3d7cbf897dba1d
-Size (dialog-1.2-20150225.tgz) = 473318 bytes
+SHA1 (dialog-1.2-20150528.tgz) = 5032701bc453a742e07da41c8a57e08bc27bfe77
+RMD160 (dialog-1.2-20150528.tgz) = 5f52fbc69d95948f2a5e6ddb732a4c329ec3257a
+Size (dialog-1.2-20150528.tgz) = 497650 bytes
--- a/misc/dpkg/Makefile
+++ b/misc/dpkg/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.30 2014/05/29 23:36:57 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2015/06/12 10:50:33 wiz Exp $
 #

 DISTNAME=	dpkg_1.16.10
 PKGNAME=	${DISTNAME:S/_/-/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/d/dpkg/}
 EXTRACT_SUFX=	.tar.xz
--- a/misc/fbreader/Makefile
+++ b/misc/fbreader/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2014/05/05 00:48:08 ryoon Exp $
+# $NetBSD: Makefile,v 1.41 2015/04/25 14:23:32 tnn Exp $

 DISTNAME=	fbreader-sources-0.99.4
 PKGNAME=	${DISTNAME:S/-sources//}
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	misc
 MASTER_SITES=	http://www.fbreader.org/files/desktop/
 EXTRACT_SUFX=	.tgz
--- a/misc/gelemental/Makefile
+++ b/misc/gelemental/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2014/05/05 00:48:08 ryoon Exp $
+# $NetBSD: Makefile,v 1.27 2015/04/25 14:23:32 tnn Exp $
 #

 DISTNAME=	gelemental-1.2.0
-PKGREVISION=	21
+PKGREVISION=	22
 CATEGORIES=	misc
 MASTER_SITES=	http://www.kdau.com/files/
 EXTRACT_SUFX=	.tar.bz2
--- a/misc/gkrellm-flynn/Makefile
+++ b/misc/gkrellm-flynn/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.41 2014/05/05 00:48:08 ryoon Exp $
+# $NetBSD: Makefile,v 1.42 2015/04/25 14:23:32 tnn Exp $
 #

 DISTNAME=	gkrellflynn-0.8
 PKGNAME=	${DISTNAME:S/gkrell/gkrellm-/}
-PKGREVISION=	29
+PKGREVISION=	30
 CATEGORIES=	misc
 MASTER_SITES=	http://bax.comlab.uni-rostock.de/fileadmin/downloads/

--- a/misc/gkrellm-launch/Makefile
+++ b/misc/gkrellm-launch/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.39 2014/05/05 00:48:08 ryoon Exp $
+# $NetBSD: Makefile,v 1.40 2015/04/25 14:23:32 tnn Exp $
 #

 DISTNAME=	gkrellmlaunch-0.5
 PKGNAME=	${DISTNAME:S/gkrellm/gkrellm-/}
-PKGREVISION=	29
+PKGREVISION=	30
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gkrellmlaunch/}

--- a/misc/gkrellm-leds/Makefile
+++ b/misc/gkrellm-leds/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.41 2014/05/05 00:48:08 ryoon Exp $
+# $NetBSD: Makefile,v 1.42 2015/04/25 14:23:32 tnn Exp $
 #

 DISTNAME=	gkleds-0.8.2
 PKGNAME=	${DISTNAME:S/^gk/gkrellm-/}
-PKGREVISION=	27
+PKGREVISION=	28
 CATEGORIES=	misc
 MASTER_SITES=	http://heim.ifi.uio.no/~oyvinha/files/files/

--- a/misc/gkrellm-moon/Makefile
+++ b/misc/gkrellm-moon/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.46 2014/05/05 00:48:09 ryoon Exp $
+# $NetBSD: Makefile,v 1.47 2015/04/25 14:23:32 tnn Exp $
 #

 DISTNAME=		gkrellmoon-0.6
 PKGNAME=		gkrellm-moon-0.6
-PKGREVISION=		29
+PKGREVISION=		30
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gkrellmoon/}

--- a/misc/gkrellm-weather/Makefile
+++ b/misc/gkrellm-weather/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.57 2014/05/29 23:36:57 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2015/06/12 10:50:33 wiz Exp $

 DISTNAME=	gkrellweather-2.0.7
 PKGNAME=	gkrellm-weather-2.0.7
-PKGREVISION=	28
+PKGREVISION=	30
 CATEGORIES=	misc
 MASTER_SITES=	http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/
 EXTRACT_SUFX=	.tgz
--- a/misc/gnome-utils/Makefile
+++ b/misc/gnome-utils/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.144 2014/10/07 16:47:30 adam Exp $
+# $NetBSD: Makefile,v 1.147 2015/06/12 10:50:33 wiz Exp $

 DISTNAME=		gnome-utils-2.32.0
-PKGREVISION=		38
+PKGREVISION=		41
 CATEGORIES=		misc gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-utils/2.32/}
 EXTRACT_SUFX=		.tar.bz2
--- a/misc/goffice0.10/Makefile
+++ b/misc/goffice0.10/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2014/05/05 00:48:09 ryoon Exp $
+# $NetBSD: Makefile,v 1.15 2015/04/25 14:23:32 tnn Exp $

 DISTNAME=		goffice-0.10.9
 PKGNAME=		${DISTNAME:S/goffice/goffice0.10/}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/goffice/0.10/}
 EXTRACT_SUFX=		.tar.xz
--- a/misc/goffice0.10/buildlink3.mk
+++ b/misc/goffice0.10/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2014/05/05 00:48:09 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2015/04/25 14:23:32 tnn Exp $

 BUILDLINK_TREE+=	goffice0.10

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	goffice0.10
 GOFFICE0.10_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.goffice0.10+=	goffice0.10>=0.10.0
-BUILDLINK_ABI_DEPENDS.goffice0.10+=	goffice0.10>=0.10.9nb1
+BUILDLINK_ABI_DEPENDS.goffice0.10+=	goffice0.10>=0.10.9nb2
 BUILDLINK_PKGSRCDIR.goffice0.10?=	../../misc/goffice0.10

 .include "../../devel/glib2/buildlink3.mk"
--- a/misc/goffice0.6/Makefile
+++ b/misc/goffice0.6/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.39 2014/05/05 00:48:09 ryoon Exp $
+# $NetBSD: Makefile,v 1.40 2015/04/25 14:23:32 tnn Exp $
 #

 DISTNAME=		goffice-0.6.6
 PKGNAME=		goffice0.6-0.6.6
-PKGREVISION=		29
+PKGREVISION=		30
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/goffice/0.6/}

--- a/misc/goffice0.6/buildlink3.mk
+++ b/misc/goffice0.6/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.30 2014/05/05 00:48:09 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.31 2015/04/25 14:23:32 tnn Exp $

 BUILDLINK_TREE+=	goffice0.6

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	goffice0.6
 GOFFICE0.6_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.goffice0.6+=	goffice0.6>=0.6.1
-BUILDLINK_ABI_DEPENDS.goffice0.6+=	goffice0.6>=0.6.6nb29
+BUILDLINK_ABI_DEPENDS.goffice0.6+=	goffice0.6>=0.6.6nb30
 BUILDLINK_PKGSRCDIR.goffice0.6?=	../../misc/goffice0.6

 #.include "../../converters/libiconv/buildlink3.mk"
--- a/misc/goffice0.8/Makefile
+++ b/misc/goffice0.8/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.37 2014/05/05 00:48:09 ryoon Exp $
+# $NetBSD: Makefile,v 1.38 2015/04/25 14:23:32 tnn Exp $
 #

 DISTNAME=		goffice-0.8.17
 PKGNAME=		${DISTNAME:S/goffice/goffice0.8/}
-PKGREVISION=		17
+PKGREVISION=		18
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/goffice/0.8/}
 EXTRACT_SUFX=		.tar.bz2
--- a/misc/goffice0.8/buildlink3.mk
+++ b/misc/goffice0.8/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2014/05/05 00:48:09 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2015/04/25 14:23:32 tnn Exp $

 BUILDLINK_TREE+=	goffice0.8

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	goffice0.8
 GOFFICE0.8_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.goffice0.8+=	goffice0.8>=0.8.0
-BUILDLINK_ABI_DEPENDS.goffice0.8+=	goffice0.8>=0.8.17nb17
+BUILDLINK_ABI_DEPENDS.goffice0.8+=	goffice0.8>=0.8.17nb18
 BUILDLINK_PKGSRCDIR.goffice0.8?=	../../misc/goffice0.8

 #.include "../../converters/libiconv/buildlink3.mk"
--- a/misc/gok/Makefile
+++ b/misc/gok/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.88 2014/05/05 00:48:09 ryoon Exp $
+# $NetBSD: Makefile,v 1.89 2015/04/25 14:23:32 tnn Exp $
 #

 DISTNAME=		gok-2.28.1
-PKGREVISION=		22
+PKGREVISION=		23
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gok/2.28/}
 EXTRACT_SUFX=		.tar.bz2
--- a/misc/gperiodic/Makefile
+++ b/misc/gperiodic/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.67 2014/05/05 00:48:09 ryoon Exp $
+# $NetBSD: Makefile,v 1.68 2015/04/25 14:23:32 tnn Exp $

 DISTNAME=		gperiodic-2.0.10
-PKGREVISION=		17
+PKGREVISION=		18
 CATEGORIES=		misc x11
 MASTER_SITES=		http://www.frantz.fi/software/

--- a/misc/gwaei/Makefile
+++ b/misc/gwaei/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2015/03/07 00:43:51 ryoon Exp $
+# $NetBSD: Makefile,v 1.45 2015/06/12 10:50:33 wiz Exp $
 #

 DISTNAME=	gwaei-3.6.2
+PKGREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gwaei/}
 EXTRACT_SUFX=	.tar.xz
--- a/misc/howm/Makefile
+++ b/misc/howm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2014/03/26 13:26:45 taca Exp $
+# $NetBSD: Makefile,v 1.10 2015/06/11 17:24:30 taca Exp $

 DISTNAME=	howm-1.4.1
 CATEGORIES=	misc
@@ -12,8 +12,6 @@ LICENSE=	gnu-gpl-v2
 DEPENDS+=	${RUBY_PKGPREFIX}-migemo-[0-9]*:../../textproc/migemo
 DEPENDS+=	${EMACS_PKGNAME_PREFIX}migemo-elisp-[0-9]*:../../textproc/migemo-elisp

-RUBY_VERSION_SUPPORTED= 21 200 193
-
 GNU_CONFIGURE=	yes

 .include "../../editors/emacs/modules.mk"
--- a/misc/ipbt/Makefile
+++ b/misc/ipbt/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2014/05/29 23:36:57 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2015/06/12 10:50:33 wiz Exp $
 #

 DISTNAME=	ipbt-r8765
 PKGNAME=	ipbt-8765
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	misc
 # The upstream distfile is apparently rebuilt every night with
 # newly regenerated docs that have different timestamps. Use the
--- a/misc/kaccessible/Makefile
+++ b/misc/kaccessible/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2014/11/13 19:19:06 markd Exp $
+# $NetBSD: Makefile,v 1.28 2015/04/25 14:23:33 tnn Exp $

 DISTNAME=	kaccessible-${_KDE_VERSION}
+PKGREVISION=	2
 CATEGORIES=	misc
 COMMENT=	Provides accessibility services like focus tracking for KDE

--- a/misc/kalzium/Makefile
+++ b/misc/kalzium/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2014/11/13 19:19:08 markd Exp $
+# $NetBSD: Makefile,v 1.29 2015/04/25 14:23:33 tnn Exp $

 DISTNAME=	kalzium-${_KDE_VERSION}
+PKGREVISION=	2
 CATEGORIES=	misc
 COMMENT=	Periodic table of elements

--- a/misc/kanjipad/Makefile
+++ b/misc/kanjipad/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2014/05/29 23:36:57 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2015/06/12 10:50:33 wiz Exp $
 #

 DISTNAME=		kanjipad-2.0.0
-PKGREVISION=	27
+PKGREVISION=	29
 CATEGORIES=		misc
 MASTER_SITES=		http://fishsoup.net/software/kanjipad/

--- a/misc/kbruch/Makefile
+++ b/misc/kbruch/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2014/11/13 19:19:07 markd Exp $
+# $NetBSD: Makefile,v 1.28 2015/04/25 14:23:33 tnn Exp $

 DISTNAME=	kbruch-${_KDE_VERSION}
+PKGREVISION=	2
 CATEGORIES=	misc
 COMMENT=	KDE exercise fractions

--- a/misc/kcharselect/Makefile
+++ b/misc/kcharselect/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2014/11/13 19:19:08 markd Exp $
+# $NetBSD: Makefile,v 1.28 2015/04/25 14:23:33 tnn Exp $

 DISTNAME=	kcharselect-${_KDE_VERSION}
+PKGREVISION=	2
 CATEGORIES=	misc
 COMMENT=	KDE character selector

--- a/misc/kchm/Makefile
+++ b/misc/kchm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2014/08/22 11:24:37 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2015/04/25 14:23:33 tnn Exp $
 #

 DISTNAME=	kchm-0.6.5
-PKGREVISION=	35
+PKGREVISION=	36
 CATEGORIES=	kde misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kchmnew/}
 EXTRACT_SUFX=	.tar.bz2
--- a/misc/kchmviewer/Makefile
+++ b/misc/kchmviewer/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2015/02/21 23:35:40 ryoon Exp $
+# $NetBSD: Makefile,v 1.52 2015/05/04 21:14:24 wiz Exp $

 DISTNAME=		kchmviewer-7.2.1
-PKGREVISION=		1
+PKGREVISION=		6
 CATEGORIES=		misc x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=kchmviewer/}

--- a/misc/kde-wallpapers4/Makefile
+++ b/misc/kde-wallpapers4/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2014/11/13 19:19:06 markd Exp $
+# $NetBSD: Makefile,v 1.28 2015/04/25 14:23:33 tnn Exp $

 DISTNAME=	kde-wallpapers-${_KDE_VERSION}
 PKGNAME=	${DISTNAME:S/-4/4-4/}
+PKGREVISION=	2
 CATEGORIES=	misc
 COMMENT=	Wallpapers for the KDE integrated X11 desktop

--- a/misc/kdeaccessibility3/Makefile
+++ b/misc/kdeaccessibility3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.70 2014/08/22 11:24:37 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2015/04/25 14:23:33 tnn Exp $

 DISTNAME=	kdeaccessibility-${_KDE_VERSION}
-PKGREVISION=	29
+PKGREVISION=	30
 CATEGORIES=	misc
 COMMENT=	Accessibility support for the KDE integrated X11 desktop

--- a/misc/kdeaddons3/Makefile
+++ b/misc/kdeaddons3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.99 2014/10/01 16:09:35 wiz Exp $
+# $NetBSD: Makefile,v 1.100 2015/04/25 14:23:33 tnn Exp $

 DISTNAME=	kdeaddons-${_KDE_VERSION}
-PKGREVISION=	39
+PKGREVISION=	40
 CATEGORIES=	misc
 COMMENT=	Add ons for the KDE integrated X11 desktop

--- a/misc/kdeadmin3/Makefile
+++ b/misc/kdeadmin3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.76 2014/08/22 11:24:37 wiz Exp $
+# $NetBSD: Makefile,v 1.77 2015/04/25 14:23:33 tnn Exp $

 DISTNAME=	kdeadmin-${_KDE_VERSION}
-PKGREVISION=	28
+PKGREVISION=	29
 CATEGORIES=	misc
 COMMENT=	System administration tools for the KDE integrated X11 desktop

--- a/misc/kdeartwork3/Makefile
+++ b/misc/kdeartwork3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.82 2014/08/22 11:24:37 wiz Exp $
+# $NetBSD: Makefile,v 1.83 2015/04/25 14:23:33 tnn Exp $

 DISTNAME=	kdeartwork-${_KDE_VERSION}
-PKGREVISION=	30
+PKGREVISION=	31
 CATEGORIES=	misc
 COMMENT=	Artwork for the KDE integrated X11 desktop

--- a/misc/kdeartwork4/Makefile
+++ b/misc/kdeartwork4/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.47 2014/11/13 19:19:06 markd Exp $
+# $NetBSD: Makefile,v 1.49 2015/04/25 14:23:34 tnn Exp $

 DISTNAME=	kdeartwork-${_KDE_VERSION}
 PKGNAME=	${DISTNAME:S/-4/4-4/}
+PKGREVISION=	2
 CATEGORIES=	misc
 COMMENT=	Artwork for the KDE integrated X11 desktop

--- a/misc/kdeedu3/Makefile
+++ b/misc/kdeedu3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.83 2014/08/22 11:24:37 wiz Exp $
+# $NetBSD: Makefile,v 1.84 2015/04/25 14:23:34 tnn Exp $

 DISTNAME=	kdeedu-${_KDE_VERSION}
-PKGREVISION=	32
+PKGREVISION=	33
 CATEGORIES=	misc
 COMMENT=	Edu{tainment,cation} tools for the KDE integrated X11 desktop

--- a/misc/kdepim-runtime4/Makefile
+++ b/misc/kdepim-runtime4/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.57 2014/11/13 19:19:09 markd Exp $
+# $NetBSD: Makefile,v 1.59 2015/04/25 14:23:34 tnn Exp $

 DISTNAME=	kdepim-runtime-${_KDE_VERSION}
 PKGNAME=	${DISTNAME:S/-4/4-4/}
+PKGREVISION=	2
 CATEGORIES=	misc
 COMMENT=	Runtime requirements for the KDE PIM tools

--- a/misc/kdepim3/Makefile
+++ b/misc/kdepim3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.122 2014/10/07 16:47:30 adam Exp $
+# $NetBSD: Makefile,v 1.125 2015/06/12 10:50:33 wiz Exp $

 DISTNAME=	kdepim-${_KDE_VERSION}
-PKGREVISION=	39
+PKGREVISION=	42
 CATEGORIES=	misc
 COMMENT=	Personal Information Management tools for the KDE desktop

--- a/misc/kdepim3/buildlink3.mk
+++ b/misc/kdepim3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.52 2014/08/22 11:24:26 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.53 2015/04/25 14:23:34 tnn Exp $

 BUILDLINK_TREE+=	kdepim

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	kdepim
 KDEPIM_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.kdepim+=	kdepim>=3.5.0nb1
-BUILDLINK_ABI_DEPENDS.kdepim+=	kdepim>=3.5.10nb38
+BUILDLINK_ABI_DEPENDS.kdepim+=	kdepim>=3.5.10nb41
 BUILDLINK_PKGSRCDIR.kdepim?=	../../misc/kdepim3

 pkgbase := kdepim
--- a/misc/kdepim3/distinfo
+++ b/misc/kdepim3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.68 2013/05/17 13:19:10 joerg Exp $
+$NetBSD: distinfo,v 1.69 2015/06/15 09:24:31 joerg Exp $

 SHA1 (kdepim-3.5.10.tar.bz2) = 537da60fe3564ecc0ed2802e744fbf96386909a9
 RMD160 (kdepim-3.5.10.tar.bz2) = 52a834dc8eb377d397404a16a09c8a59b568b305
@@ -19,6 +19,7 @@ SHA1 (patch-as) = bfcde6d85ca844ebe4cff93ca0ed42deb2cefbff
 SHA1 (patch-at) = 670b61b45eed92c854808991e6241f29bee47554
 SHA1 (patch-certmanager_lib_backends_qgpgme_qgpgmejob.cpp) = f6d7967f5456cb574a1046255229c8c731b7ebba
 SHA1 (patch-configure) = c25992299b78b3c45f9f5f3dfcbd5f92a4df89ac
+SHA1 (patch-dcopidlng_kdocAstUtil.pm) = d1679f33c6ed4fa25ab978da57b4b690a3797878
 SHA1 (patch-karm_karmstorage.h) = e30049edeef91dd365138d545bd744a4556cbbdc
 SHA1 (patch-karm_task.h) = 6a87ec8898ed41f330a8b5aea556237f17dfbc68
 SHA1 (patch-kitchensync_src_configguildap.h) = a08a79894d08757fd315bec83033f49e3f41f3c6
--- a/misc/kdepim3/patches/patch-dcopidlng_kdocAstUtil.pm
+++ b/misc/kdepim3/patches/patch-dcopidlng_kdocAstUtil.pm
@@ -0,0 +1,14 @@
+$NetBSD: patch-dcopidlng_kdocAstUtil.pm,v 1.1 2015/06/15 09:24:31 joerg Exp $
+
+--- dcopidlng/kdocAstUtil.pm.orig	2015-06-14 19:23:52.000000000 +0000
+++ dcopidlng/kdocAstUtil.pm
+@@ -647,8 +647,7 @@ sub dumpAst
+ 		dumpAst( $kid );
+ 	}
+ 
+-	print "\t" x $depth, "Documentation nodes:\n" if defined 
+-		@{ $node->{Doc}->{ "Text" }};
+	print "\t" x $depth, "Documentation nodes:\n" if (@{ $node->{Doc}->{ "Text" }});
+ 
+ 	foreach $kid ( @{ $node->{Doc}->{ "Text" }} ) {
+ 		dumpAst( $kid );
--- a/misc/kdepim4/Makefile
+++ b/misc/kdepim4/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.70 2014/11/13 19:19:08 markd Exp $
+# $NetBSD: Makefile,v 1.73 2015/06/12 10:50:33 wiz Exp $

 DISTNAME=	kdepim-${_KDE_VERSION}
 PKGNAME=	${DISTNAME:S/-4/4-4/}
+PKGREVISION=	3
 CATEGORIES=	misc
 COMMENT=	Personal Information Management tools for the KDE desktop

--- a/misc/kdepimlibs4/Makefile
+++ b/misc/kdepimlibs4/Makefile
@@ -1,12 +1,19 @@
-# $NetBSD: Makefile,v 1.68 2014/11/13 19:19:06 markd Exp $
+# $NetBSD: Makefile,v 1.71 2015/04/25 14:23:34 tnn Exp $

 DISTNAME=	kdepimlibs-${_KDE_VERSION}
 PKGNAME=	${DISTNAME:S/-4/4-4/}
+PKGREVISION=	3
 CATEGORIES=	misc
 COMMENT=	Support libraries for PIM for the KDE integrated X11 desktop

 .include "../../meta-pkgs/kde4/Makefile.kde4"

+SUBST_CLASSES+=			phononrelpath
+SUBST_STAGE.phononrelpath=	post-configure
+SUBST_MESSAGE.phononrelpath=	Fixing phonon RELWITHDEBINFO path
+SUBST_FILES.phononrelpath=	_KDE_build/CMakeFiles/Export/${LOCALBASE:S^/^_^}/lib/cmake/KdepimLibs/KDEPimLibsLibraryTargetsWithPrefix-${TARGET_NAME}.cmake
+SUBST_SED.phononrelpath=	-e 's:[^"]*/\.buildlink/lib/libphonon\.so::'
+
 CMAKE_DEPENDENCIES_REWRITE= _KDE_build/KDEPimLibsDependencies.cmake

 CMAKE_ARGS+=	-DKDE4_BUILD_TESTS:BOOL=OFF
--- a/misc/kdepimlibs4/buildlink3.mk
+++ b/misc/kdepimlibs4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.45 2014/11/07 19:39:25 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.47 2015/04/25 14:23:34 tnn Exp $

 BUILDLINK_TREE+=	kdepimlibs

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	kdepimlibs
 KDEPIMLIBS_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.kdepimlibs+=	kdepimlibs4>=4.0.0
-BUILDLINK_ABI_DEPENDS.kdepimlibs+=	kdepimlibs4>=4.11.5nb6
+BUILDLINK_ABI_DEPENDS.kdepimlibs+=	kdepimlibs4>=4.14.3nb3
 BUILDLINK_PKGSRCDIR.kdepimlibs?=	../../misc/kdepimlibs4

 .include "../../mk/bsd.fast.prefs.mk"
--- a/misc/kdeplasma-addons4/Makefile
+++ b/misc/kdeplasma-addons4/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.62 2014/11/13 19:19:08 markd Exp $
+# $NetBSD: Makefile,v 1.64 2015/04/25 14:23:34 tnn Exp $

 DISTNAME=	kdeplasma-addons-${_KDE_VERSION}
 PKGNAME=	${DISTNAME:S/-4/4-4/}
+PKGREVISION=	2
 CATEGORIES=	misc
 COMMENT=	Plasmoids

--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.106 2014/08/22 11:24:38 wiz Exp $
+# $NetBSD: Makefile,v 1.107 2015/04/25 14:23:34 tnn Exp $

 DISTNAME=	kdeutils-${_KDE_VERSION}
-PKGREVISION=	35
+PKGREVISION=	36
 COMMENT=	Utilities for the KDE integrated X11 desktop

 .include "../../meta-pkgs/kde3/Makefile.kde3"
--- a/misc/kgeography/Makefile
+++ b/misc/kgeography/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2014/11/13 19:19:07 markd Exp $
+# $NetBSD: Makefile,v 1.31 2015/04/25 14:23:34 tnn Exp $

 DISTNAME=	kgeography-${_KDE_VERSION}
+PKGREVISION=	2
 CATEGORIES=	misc
 COMMENT=	KDE geography trainer

--- a/misc/khard/DESCR
+++ b/misc/khard/DESCR
@@ -0,0 +1,4 @@
+Khard is an address book for the Linux console. It creates, reads,
+modifies and removes CardDAV address book entries at your local
+machine. Khard is also compatible to the email clients mutt and
+alot and the SIP client twinkle.
--- a/misc/khard/Makefile
+++ b/misc/khard/Makefile
@@ -0,0 +1,27 @@
+# $NetBSD: Makefile,v 1.1 2015/04/02 22:35:34 wiz Exp $
+
+DISTNAME=		khard-0.3.0
+CATEGORIES=		misc net
+MASTER_SITES=		${MASTER_SITE_GITHUB:=scheibler/}
+
+MAINTAINER=		pkgsrc-users@NetBSD.org
+HOMEPAGE=		https://github.com/scheibler/khard
+COMMENT=		CLI contacts application built around CardDAV
+LICENSE=		gnu-gpl-v3
+
+GITHUB_TAG=		v${PKGVERSION_NOREV}
+DEPENDS+=		${PYPKGPREFIX}-configobj-[0-9]*:../../devel/py-configobj
+DEPENDS+=		${PYPKGPREFIX}-vobject-[0-9]*:../../textproc/py-vobject
+DEPENDS+=		${PYPKGPREFIX}-argparse-[0-9]*:../../devel/py-argparse
+
+PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 0.3.0
+
+INSTALLATION_DIRS=	share/examples/khard
+REPLACE_PYTHON+=	*/*.py
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/khard.conf.example ${DESTDIR}${PREFIX}/share/examples/khard
+
+.include "../../lang/python/application.mk"
+.include "../../lang/python/egg.mk"
+.include "../../mk/bsd.pkg.mk"
--- a/misc/khard/PLIST
+++ b/misc/khard/PLIST
@@ -0,0 +1,34 @@
+@comment $NetBSD: PLIST,v 1.1 2015/04/02 22:35:34 wiz Exp $
+bin/davcontroller
+bin/khard
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/davcontroller/__init__.py
+${PYSITELIB}/davcontroller/__init__.pyc
+${PYSITELIB}/davcontroller/__init__.pyo
+${PYSITELIB}/davcontroller/davcontroller.py
+${PYSITELIB}/davcontroller/davcontroller.pyc
+${PYSITELIB}/davcontroller/davcontroller.pyo
+${PYSITELIB}/khard/__init__.py
+${PYSITELIB}/khard/__init__.pyc
+${PYSITELIB}/khard/__init__.pyo
+${PYSITELIB}/khard/carddav_object.py
+${PYSITELIB}/khard/carddav_object.pyc
+${PYSITELIB}/khard/carddav_object.pyo
+${PYSITELIB}/khard/config.py
+${PYSITELIB}/khard/config.pyc
+${PYSITELIB}/khard/config.pyo
+${PYSITELIB}/khard/helpers.py
+${PYSITELIB}/khard/helpers.pyc
+${PYSITELIB}/khard/helpers.pyo
+${PYSITELIB}/khard/khard.py
+${PYSITELIB}/khard/khard.pyc
+${PYSITELIB}/khard/khard.pyo
+${PYSITELIB}/khard/version.py
+${PYSITELIB}/khard/version.pyc
+${PYSITELIB}/khard/version.pyo
+share/examples/khard/khard.conf.example
--- a/misc/khard/distinfo
+++ b/misc/khard/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2015/04/02 22:35:34 wiz Exp $
+
+SHA1 (khard-0.3.0.tar.gz) = 9a5e4557776aeeab2c64d099a14df0c6a635541b
+RMD160 (khard-0.3.0.tar.gz) = 758e9eca409327fb0cff860a243ba5ff5604b348
+Size (khard-0.3.0.tar.gz) = 5051405 bytes
--- a/misc/kig/Makefile
+++ b/misc/kig/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2014/11/13 19:19:08 markd Exp $
+# $NetBSD: Makefile,v 1.29 2015/04/25 14:23:34 tnn Exp $

 DISTNAME=	kig-${_KDE_VERSION}
+PKGREVISION=	2
 CATEGORIES=	misc
 COMMENT=	KDE interactive geometry

--- a/misc/kiten/Makefile
+++ b/misc/kiten/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2014/11/13 19:19:07 markd Exp $
+# $NetBSD: Makefile,v 1.28 2015/04/25 14:23:34 tnn Exp $

 DISTNAME=	kiten-${_KDE_VERSION}
+PKGREVISION=	2
 CATEGORIES=	misc
 COMMENT=	KDE Japanese reference/learning tool

--- a/misc/klettres/Makefile
+++ b/misc/klettres/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2014/11/13 19:19:07 markd Exp $
+# $NetBSD: Makefile,v 1.29 2015/04/25 14:23:34 tnn Exp $

 DISTNAME=	klettres-${_KDE_VERSION}
+PKGREVISION=	2
 CATEGORIES=	misc
 COMMENT=	KDE app to teach the alphabet and read some syllables in languages

--- a/misc/kmag/Makefile
+++ b/misc/kmag/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2014/11/13 19:19:06 markd Exp $
+# $NetBSD: Makefile,v 1.28 2015/04/25 14:23:34 tnn Exp $

 DISTNAME=	kmag-${_KDE_VERSION}
+PKGREVISION=	2
 CATEGORIES=	misc
 COMMENT=	KDE screen magnifier

--- a/misc/kmousetool/Makefile
+++ b/misc/kmousetool/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2014/11/13 19:19:06 markd Exp $
+# $NetBSD: Makefile,v 1.28 2015/04/25 14:23:34 tnn Exp $

 DISTNAME=	kmousetool-${_KDE_VERSION}
+PKGREVISION=	2
 CATEGORIES=	misc
 COMMENT=	KDE mouse manipulation tool

--- a/misc/kmouth/Makefile
+++ b/misc/kmouth/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2014/11/13 19:19:06 markd Exp $
+# $NetBSD: Makefile,v 1.28 2015/04/25 14:23:35 tnn Exp $

 DISTNAME=	kmouth-${_KDE_VERSION}
+PKGREVISION=	2
 CATEGORIES=	misc
 COMMENT=	KDE Speech Synthesizer frontend

--- a/misc/koffice/Makefile
+++ b/misc/koffice/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.168 2015/03/09 09:02:20 wiz Exp $
+# $NetBSD: Makefile,v 1.170 2015/06/12 10:50:33 wiz Exp $

 DISTNAME=	koffice-1.6.3
-PKGREVISION=	61
+PKGREVISION=	63
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE:=koffice-1.6.3/src/}
 EXTRACT_SUFX=	.tar.bz2
--- a/misc/kremotecontrol/Makefile
+++ b/misc/kremotecontrol/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2014/11/13 19:19:08 markd Exp $
+# $NetBSD: Makefile,v 1.29 2015/04/25 14:23:35 tnn Exp $

 DISTNAME=	kremotecontrol-${_KDE_VERSION}
+PKGREVISION=	2
 CATEGORIES=	misc
 COMMENT=	KDE frontend for your remote controls

--- a/misc/kstars/Makefile
+++ b/misc/kstars/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2014/11/13 19:19:07 markd Exp $
+# $NetBSD: Makefile,v 1.39 2015/04/25 14:23:35 tnn Exp $

 DISTNAME=	kstars-${_KDE_VERSION}
+PKGREVISION=	2
 CATEGORIES=	misc
 COMMENT=	KDE desktop planetarium

--- a/misc/kteatime/Makefile
+++ b/misc/kteatime/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2014/11/13 19:19:07 markd Exp $
+# $NetBSD: Makefile,v 1.11 2015/04/25 14:23:35 tnn Exp $

 DISTNAME=	kteatime-${_KDE_VERSION}
+PKGREVISION=	2
 CATEGORIES=	misc
 COMMENT=	KDE Tea Cooker

--- a/misc/ktouch/Makefile
+++ b/misc/ktouch/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2014/11/13 19:19:07 markd Exp $
+# $NetBSD: Makefile,v 1.28 2015/04/25 14:23:35 tnn Exp $

 DISTNAME=	ktouch-${_KDE_VERSION}
+PKGREVISION=	2
 CATEGORIES=	misc
 COMMENT=	KDE touch typing tutor

--- a/misc/kturtle/Makefile
+++ b/misc/kturtle/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2014/11/13 19:19:07 markd Exp $
+# $NetBSD: Makefile,v 1.28 2015/04/25 14:23:35 tnn Exp $

 DISTNAME=	kturtle-${_KDE_VERSION}
+PKGREVISION=	2
 CATEGORIES=	misc
 COMMENT=	KDE educational programming environment

--- a/misc/ktux/Makefile
+++ b/misc/ktux/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2014/11/13 19:19:07 markd Exp $
+# $NetBSD: Makefile,v 1.11 2015/04/25 14:23:35 tnn Exp $

 DISTNAME=	ktux-${_KDE_VERSION}
+PKGREVISION=	2
 CATEGORIES=	misc
 COMMENT=	Tux Screen Saver

--- a/misc/kwordquiz/Makefile
+++ b/misc/kwordquiz/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2014/11/13 19:19:07 markd Exp $
+# $NetBSD: Makefile,v 1.28 2015/04/25 14:23:35 tnn Exp $

 DISTNAME=	kwordquiz-${_KDE_VERSION}
+PKGREVISION=	2
 CATEGORIES=	misc
 COMMENT=	KDE flash card trainer

--- a/misc/less/Makefile
+++ b/misc/less/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2014/12/08 00:55:58 rodent Exp $
+# $NetBSD: Makefile,v 1.25 2015/04/13 12:33:49 tnn Exp $

-DISTNAME=	less-470
+DISTNAME=	less-475
 CATEGORIES=	misc
 MASTER_SITES=	http://www.greenwoodsoftware.com/less/

--- a/misc/less/distinfo
+++ b/misc/less/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.14 2014/12/08 00:55:58 rodent Exp $
+$NetBSD: distinfo,v 1.15 2015/04/13 12:33:49 tnn Exp $

-SHA1 (less-470.tar.gz) = 167c0b65bb086895b2a9583a52b6a74e10d5e933
-RMD160 (less-470.tar.gz) = c24bd0994b597b953b55d8e928136ccb76f3c88c
-Size (less-470.tar.gz) = 316014 bytes
-SHA1 (patch-ac) = d50886aff976d81f23684cd96b5c9e7f94554b93
+SHA1 (less-475.tar.gz) = 8232220364ce95fe2397fd717cad4ecffa6bcbce
+RMD160 (less-475.tar.gz) = a1404028b0d17492a1f8f28a2e4638de0975e6dd
+Size (less-475.tar.gz) = 316345 bytes
--- a/misc/less/patches/patch-ac
+++ b/misc/less/patches/patch-ac
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2011/07/08 10:42:53 tron Exp $
-
-Fix resource leak found by Coverity scan of the NetBSD sources.
-
--- edit.c.orig	2005-12-03 21:20:32.000000000 +0100
-+++ edit.c
-@@ -711,7 +711,8 @@ use_logfile(filename)
- 	 */
- 	filename = shell_unquote(filename);
- 	exists = open(filename, OPEN_READ);
-	close(exists);
-+	if (exists >= 0)
-+		close(exists);
- 	exists = (exists >= 0);
- 
- 	/*
--- a/misc/libcdio-paranoia/Makefile
+++ b/misc/libcdio-paranoia/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2015/01/14 00:00:39 wiedi Exp $
+# $NetBSD: Makefile,v 1.4 2015/06/12 10:50:34 wiz Exp $

 DISTNAME=	libcdio-paranoia-10.2+0.93+1
 PKGNAME=	libcdio-paranoia-0.93
+PKGREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GNU:=libcdio/}
 EXTRACT_SUFX=	.tar.bz2
--- a/misc/libcdio/Makefile
+++ b/misc/libcdio/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2014/10/09 14:06:42 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2015/06/12 10:50:34 wiz Exp $

 DISTNAME=	libcdio-0.93
+PKGREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GNU:=libcdio/}
 EXTRACT_SUFX=	.tar.bz2
--- a/misc/libcec/Makefile
+++ b/misc/libcec/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/02/13 11:12:23 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2015/04/28 01:27:40 mef Exp $

 DISTNAME=	libcec-2.2.0-repack
-PKGNAME=	libcec-2.2.0
+PKGNAME=	${DISTNAME:S/-repack//}
 CATEGORIES=	misc
-MASTER_SITES=	https://github.com/Pulse-Eight/libcec/archive/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=Pulse-Eight/}
+GITHUB_PROJECT=	libcec
+GITHUB_TAG=	${DISTNAME}

 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://libcec.pulse-eight.com/
--- a/misc/libkdeedu/Makefile
+++ b/misc/libkdeedu/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2014/11/13 19:19:06 markd Exp $
+# $NetBSD: Makefile,v 1.28 2015/04/25 14:23:35 tnn Exp $

 DISTNAME=	libkdeedu-${_KDE_VERSION}
+PKGREVISION=	2
 CATEGORIES=	misc
 COMMENT=	Common library for KDE educational apps

--- a/misc/libkdeedu/buildlink3.mk
+++ b/misc/libkdeedu/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2014/11/07 19:39:25 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2015/04/25 14:23:35 tnn Exp $

 BUILDLINK_TREE+=	libkdeedu

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libkdeedu
 LIBKDEEDU_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.libkdeedu+=	libkdeedu>=4.8.0
-BUILDLINK_ABI_DEPENDS.libkdeedu?=	libkdeedu>=4.11.5nb5
+BUILDLINK_ABI_DEPENDS.libkdeedu?=	libkdeedu>=4.14.3nb2
 BUILDLINK_PKGSRCDIR.libkdeedu?=	../../misc/libkdeedu

 .include "../../x11/kdelibs4/buildlink3.mk"
--- a/misc/libkgeomap/Makefile
+++ b/misc/libkgeomap/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2014/11/15 20:56:40 markd Exp $
+# $NetBSD: Makefile,v 1.28 2015/04/25 14:23:35 tnn Exp $
 #

 PKGNAME=	libkgeomap-4.4.0
+PKGREVISION=	2
 DISTNAME=	digikam-4.4.0
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_KDE:=digikam/}
--- a/misc/libkgeomap/buildlink3.mk
+++ b/misc/libkgeomap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2014/11/07 19:39:25 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2015/04/25 14:23:35 tnn Exp $

 BUILDLINK_TREE+=	libkgeomap

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libkgeomap
 LIBKGEOMAP_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.libkgeomap+=	libkgeomap>=2.5.0
-BUILDLINK_ABI_DEPENDS.libkgeomap?=	libkgeomap>=3.5.0nb6
+BUILDLINK_ABI_DEPENDS.libkgeomap?=	libkgeomap>=4.4.0nb2
 BUILDLINK_PKGSRCDIR.libkgeomap?=	../../misc/libkgeomap

 .include "../../misc/marble/buildlink3.mk"
--- a/misc/libkvkontakte/Makefile
+++ b/misc/libkvkontakte/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2014/11/15 20:55:24 markd Exp $
+# $NetBSD: Makefile,v 1.28 2015/04/25 14:23:35 tnn Exp $
 #

 PKGNAME=	libkvkontakte-4.4.0
+PKGREVISION=	2
 DISTNAME=	digikam-4.4.0
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_KDE:=digikam/}
--- a/Show More
+++ b/Show More