From d50aa4ae37b6ead9415470b944bb8731e1220354 Mon Sep 17 00:00:00 2001
From: pkgsrc fixup <pkgsrc@dragonflybsd.org>
Date: Sun, 28 Apr 2013 07:22:29 -0700
Subject: [PATCH] Fixup fromcvs/togit conversion

---
 audio/kid3/Makefile                                |   4 +-
 doc/CHANGES-2013                                   |   7 +-
 doc/TODO                                           |   3 +-
 editors/beaver/distinfo                            |   4 +-
 editors/beaver/patches/patch-aa                    |  13 +-
 editors/jove/distinfo                              |   4 +-
 editors/jove/patches/patch-aa                      |  19 +-
 editors/mflteco/Makefile                           |   3 +-
 graphics/digikam/Makefile                          |   4 +-
 graphics/digikam/options.mk                        |  16 +-
 graphics/kipi-plugins/distinfo                     |  13 +-
 .../patches/patch-htmlexport_wizard.cpp            |  13 -
 .../patches/patch-printimages_wizard_cropframe.cpp |  13 -
 .../patches/patch-printimages_wizard_wizard.cpp    |  13 -
 lang/japhar/distinfo                               |   4 +-
 lang/japhar/patches/patch-am                       |  13 +-
 lang/p2c/distinfo                                  |   4 +-
 lang/p2c/patches/patch-aa                          |  15 +-
 misc/kdeplasma-addons4/Makefile                    |   5 +-
 misc/kdeplasma-addons4/PLIST                       |   3 +
 mk/platform/AIX.mk                                 |   6 +-
 mk/platform/BSDOS.mk                               |   6 +-
 mk/platform/Cygwin.mk                              |   6 +-
 mk/platform/Darwin.mk                              |   6 +-
 mk/platform/DragonFly.mk                           |   4 +-
 mk/platform/FreeBSD.mk                             |   4 +-
 mk/platform/FreeMiNT.mk                            |   6 +-
 mk/platform/HPUX.mk                                |   6 +-
 mk/platform/Haiku.mk                               |   8 +-
 mk/platform/IRIX.mk                                |   6 +-
 mk/platform/Interix.mk                             |   6 +-
 mk/platform/Linux.mk                               |   4 +-
 mk/platform/Minix.mk                               |   6 +-
 mk/platform/MirBSD.mk                              |   6 +-
 mk/platform/NetBSD.mk                              |   4 +-
 mk/platform/OSF1.mk                                |   6 +-
 mk/platform/OpenBSD.mk                             |   4 +-
 mk/platform/QNX.mk                                 |   3 +
 mk/platform/README                                 |   6 +-
 mk/platform/SunOS.mk                               |   4 +-
 mk/platform/UnixWare.mk                            |   6 +-
 multimedia/libdvdcss/Makefile                      |   3 +-
 net/ktorrent-kde3/Makefile                         |   4 +-
 sysutils/salt/Makefile                             |  15 +-
 sysutils/salt/PLIST                                | 313 +++++++++++++++++++--
 sysutils/salt/distinfo                             |  10 +-
 sysutils/salt/patches/patch-setup.py               |  16 +-
 x11/kactivities/Makefile                           |   8 +-
 x11/kactivities/PLIST                              |   3 +-
 x11/kactivities/files/activitymanagerrc            |   2 +
 x11/kde-runtime4/Makefile                          |   5 +-
 x11/kde-runtime4/options.mk                        |   8 +-
 x11/xvkbd/Makefile                                 |   4 +-
 x11/xvkbd/distinfo                                 |   8 +-
 54 files changed, 521 insertions(+), 164 deletions(-)
 rewrite graphics/kipi-plugins/distinfo (61%)
 delete mode 100644 graphics/kipi-plugins/patches/patch-htmlexport_wizard.cpp
 delete mode 100644 graphics/kipi-plugins/patches/patch-printimages_wizard_cropframe.cpp
 delete mode 100644 graphics/kipi-plugins/patches/patch-printimages_wizard_wizard.cpp
 create mode 100644 x11/kactivities/files/activitymanagerrc

diff --git a/audio/kid3/Makefile b/audio/kid3/Makefile
index 2ce255a922f..c56659435f7 100644
--- a/audio/kid3/Makefile
+++ b/audio/kid3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2013/02/09 22:11:32 ryoon Exp $
+# $NetBSD: Makefile,v 1.38 2013/02/16 11:20:13 wiz Exp $
 #
 
 DISTNAME=		kid3-1.6
@@ -6,7 +6,7 @@ PKGREVISION=		13
 CATEGORIES=		kde audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=kid3/}
 
-MAINTAINER=		shattered@NetBSD.org
+MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://kid3.sourceforge.net/
 COMMENT=		ID3 tagger for KDE 3
 LICENSE=		gnu-gpl-v2
diff --git a/doc/CHANGES-2013 b/doc/CHANGES-2013
index 5cf1ca8f6da..5e7eccd62d4 100644
--- a/doc/CHANGES-2013
+++ b/doc/CHANGES-2013
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2013,v 1.1521 2013/04/27 17:54:41 tron Exp $
+$NetBSD: CHANGES-2013,v 1.1524 2013/04/28 07:17:38 ryoon Exp $
 
 Changes to the packages collection and infrastructure in 2013:
 
@@ -2117,8 +2117,10 @@ Changes to the packages collection and infrastructure in 2013:
 	Updated devel/py-pip to 1.3.1 [wen 2013-04-13]
 	Added audio/vcf version 0.0.5 [rodent 2013-04-13]
 	Updated x11/kde4-l10n-zh_TW to 4.10.2 [rodent 2013-04-13]
+	Updated emulators/Cygne-SDL to 0.1nb6 [dholland 2013-04-13]
 	Updated x11/kde4-l10n-zh_CN to 4.10.2 [rodent 2013-04-13]
 	Updated x11/kde4-l10n-wa to 4.10.2 [rodent 2013-04-13]
+	Updated graphics/gle to 3.1.0nb3 [dholland 2013-04-13]
 	Updated x11/kde4-l10n-vi to 4.10.2 [rodent 2013-04-13]
 	Updated x11/kde4-l10n-ug to 4.10.2 [rodent 2013-04-13]
 	Updated misc/attica to 0.4.1 [markd 2013-04-13]
@@ -2140,6 +2142,7 @@ Changes to the packages collection and infrastructure in 2013:
 	Added multimedia/libva-driver-vdpau version 0.7.4 [cheusov 2013-04-14]
 	Updated x11/kde4-l10n-pt_BR to 4.10.2 [rodent 2013-04-14]
 	Updated x11/kde4-l10n-pt to 4.10.2 [rodent 2013-04-14]
+	Updated cross/dasm to 2.12nb2 [dholland 2013-04-14]
 	Updated x11/kde4-l10n-pl to 4.10.2 [rodent 2013-04-14]
 	Updated x11/kde4-l10n-pa to 4.10.2 [rodent 2013-04-14]
 	Updated x11/kde4-l10n-nn to 4.10.2 [rodent 2013-04-14]
@@ -2337,3 +2340,5 @@ Changes to the packages collection and infrastructure in 2013:
 	Updated net/libsoup24 to 2.42.2 [drochner 2013-04-27]
 	Updated www/squid3 to 3.3.4 [tron 2013-04-27]
 	Updated archivers/libzip to 0.11.1 [wiz 2013-04-27]
+	Updated x11/xvkbd to 3.4a [ryoon 2013-04-28]
+	Updated sysutils/salt to 0.14.1 [imil 2013-04-28]
diff --git a/doc/TODO b/doc/TODO
index 3973409dc3f..572c3556623 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.12112 2013/04/27 07:44:29 wiz Exp $
+$NetBSD: TODO,v 1.12113 2013/04/27 12:09:24 shattered Exp $
 
 Suggested new packages
 ======================
@@ -1317,7 +1317,6 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html.
 	o xtux-20030306
 	o xvidcap-1.1.7
 	o xview-3.2.1.4.25.5
-	o xvkbd-3.4
 	o xwpe-1.5.30a
 	o xye-0.12.1
 	o xzip-182
diff --git a/editors/beaver/distinfo b/editors/beaver/distinfo
index b392c15da53..8025325bf00 100644
--- a/editors/beaver/distinfo
+++ b/editors/beaver/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2008/08/04 21:34:39 bjs Exp $
+$NetBSD: distinfo,v 1.5 2012/07/03 18:10:50 joerg Exp $
 
 SHA1 (beaver0_3_0_1.tgz) = 7df51cd68367ad0f02d472647e5df23a32108f78
 RMD160 (beaver0_3_0_1.tgz) = 58b8d48340e3aee5a0ce980d74e339b12e1f9189
 Size (beaver0_3_0_1.tgz) = 142255 bytes
-SHA1 (patch-aa) = d1704ecd08ca1839050dd4d623cbc86f3d0b10f8
+SHA1 (patch-aa) = 8e15159bc5ce32d46c0139bcae2a732aee5223f6
 SHA1 (patch-ab) = e2ce6fd1166d052b09fb042a9fcc6d35a32613e3
 SHA1 (patch-src_editor.c) = 0c1e366b63a2c328566671d84301c61df3ec47de
diff --git a/editors/beaver/patches/patch-aa b/editors/beaver/patches/patch-aa
index e031816fda9..d3f57b3e723 100644
--- a/editors/beaver/patches/patch-aa
+++ b/editors/beaver/patches/patch-aa
@@ -1,6 +1,11 @@
-$NetBSD: patch-aa,v 1.2 2008/06/20 01:09:17 joerg Exp $
+$NetBSD: patch-aa,v 1.3 2008/08/04 21:34:39 bjs Exp $
 
---- src/Makefile.orig	2008-06-26 23:33:36.000000000 -0400
+- configure for pkgsrc
+- use libtool (why?)
+- rearrange installation
+- honor PKGMANDIR
+
+--- src/Makefile.orig	2008-06-27 03:33:36.000000000 +0000
 +++ src/Makefile
 @@ -7,20 +7,19 @@
  
@@ -110,9 +115,9 @@ $NetBSD: patch-aa,v 1.2 2008/06/20 01:09:17 joerg Exp $
 +	${BSD_INSTALL_DATA_DIR} $(DESTDIR)${PREFIX}/share/applications
 +	${BSD_INSTALL_DATA} ../beaver.desktop \
 +		$(DESTDIR)${PREFIX}/share/applications/beaver.desktop
-+	${BSD_INSTALL_MAN_DIR} $(DESTDIR)${PREFIX}/man/man1
++	${BSD_INSTALL_MAN_DIR} $(DESTDIR)${PREFIX}/${PKGMANDIR}/man1
 +	${BSD_INSTALL_MAN} ../beaver.1x \
-+		$(DESTDIR)${PREFIX}/man/man1/beaver.1
++		$(DESTDIR)${PREFIX}/${PKGMANDIR}/man1/beaver.1
  .PHONY: clean re
  
  clean	:
diff --git a/editors/jove/distinfo b/editors/jove/distinfo
index 0a308593abe..3342f68751d 100644
--- a/editors/jove/distinfo
+++ b/editors/jove/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2007/02/16 18:28:25 rpaulo Exp $
+$NetBSD: distinfo,v 1.6 2012/05/23 04:43:17 dholland Exp $
 
 SHA1 (jove4.16.0.70.tgz) = a954003c177bdc3a0af560df7caa74ee5b2b5735
 RMD160 (jove4.16.0.70.tgz) = 37fdabc3b91be411e51d71d9029485491d2dec8f
 Size (jove4.16.0.70.tgz) = 451492 bytes
-SHA1 (patch-aa) = 1523093b472f7a6dff8ff1ce28c058aecfe51c92
+SHA1 (patch-aa) = addcef336614ff5908d4a7ba127b4576898100d4
 SHA1 (patch-ac) = 98329cfcbbec9d56cbef7e1bee6685b6dd25e8ac
diff --git a/editors/jove/patches/patch-aa b/editors/jove/patches/patch-aa
index 276a159d91c..360c5097349 100644
--- a/editors/jove/patches/patch-aa
+++ b/editors/jove/patches/patch-aa
@@ -1,7 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2003/09/22 14:10:16 jmmv Exp $
+$NetBSD: patch-aa,v 1.4 2012/05/23 04:43:17 dholland Exp $
 
 - configure for pkgsrc
 - honor PKGMANDIR
+- honor pkgsrc CFLAGS and LDFLAGS
 
 --- Makefile.orig	2005-09-30 22:14:41.000000000 +0000
 +++ Makefile
@@ -63,3 +64,19 @@ $NetBSD: patch-aa,v 1.3 2003/09/22 14:10:16 jmmv Exp $
  
  # For making dependencies under BSD systems
  DEPENDFLAG = -M
+@@ -181,13 +181,13 @@ EXTRALIBS =
+ #	PDP-11 with separate I&D: -i
+ #	PDP-11 without separate I&D: -n
+ 
+-LDFLAGS =
++LDFLAGS+=
+ 
+ # for SCO Xenix, set
+ #	MEMFLAGS = -Mle
+ #	CFLAGS = -LARGE -O -F 3000 -K -Mle  (say -Mle2 for an 80286)
+ 
+-CFLAGS = $(OPTFLAGS) $(SYSDEFS)
++CFLAGS+= $(OPTFLAGS) $(SYSDEFS)
+ 
+ # For SYSVR4 (/usr/ucb/cc will NOT work because of setjmp.h):
+ #	CC = /usr/bin/cc
diff --git a/editors/mflteco/Makefile b/editors/mflteco/Makefile
index ce5e359339b..8e4416ea23d 100644
--- a/editors/mflteco/Makefile
+++ b/editors/mflteco/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/10/03 11:43:37 asau Exp $
+# $NetBSD: Makefile,v 1.7 2012/12/27 06:13:20 dholland Exp $
 #
 
 DISTNAME=		mflteco
@@ -27,4 +27,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/examples/mflteco
 .endfor
 
+.include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile
index 0affb02719f..03e91654cfa 100644
--- a/graphics/digikam/Makefile
+++ b/graphics/digikam/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.92 2013/02/16 11:21:45 wiz Exp $
+# $NetBSD: Makefile,v 1.93 2013/04/03 12:52:04 markd Exp $
 #
 
 DISTNAME=	digikam-3.1.0
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_KDE:=digikam/}
 EXTRACT_SUFX=	.tar.bz2
@@ -21,6 +22,7 @@ REPLACE_PERL=	core/utilities/scripts/digitaglinktree/digitaglinktree
 CMAKE_ARGS+=    -DMYSQLD_PATH:PATH=${BUILDLINK_PREFIX.mysql-server}/libexec
 CMAKE_ARGS+=	-DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS:BOOL=OFF
 USE_TOOLS+=	gawk msgfmt perl:run pkg-config
+CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Debug        
 
 .include "options.mk"
 
diff --git a/graphics/digikam/options.mk b/graphics/digikam/options.mk
index 727699c60f1..19f9468af7a 100644
--- a/graphics/digikam/options.mk
+++ b/graphics/digikam/options.mk
@@ -1,23 +1,25 @@
-# $NetBSD: options.mk,v 1.1 2010/02/15 14:19:45 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2012/03/21 21:14:47 markd Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.digikam
-PKG_SUPPORTED_OPTIONS=	lensfun liblqr marble pim
-PKG_SUGGESTED_OPTIONS=	lensfun liblqr marble pim
+PKG_SUPPORTED_OPTIONS=	lensfun liblqr pim
+PKG_SUGGESTED_OPTIONS=	lensfun liblqr pim
 
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mlensfun)
 .include "../../graphics/lensfun/buildlink3.mk"
+.else
+CMAKE_ARGS+=	-DWITH_LensFun:BOOL=OFF
 .endif
 
 .if !empty(PKG_OPTIONS:Mliblqr)
 .include "../../graphics/liblqr/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mmarble)
-.include "../../misc/marble/buildlink3.mk"
+.else
+CMAKE_ARGS+=	-DWITH_Lqr-1:BOOL=OFF
 .endif
 
 .if !empty(PKG_OPTIONS:Mpim)
 .include "../../misc/kdepimlibs4/buildlink3.mk"
+.else
+CMAKE_ARGS+=	-DWITH_KdepimLibs:BOOL=OFF
 .endif
diff --git a/graphics/kipi-plugins/distinfo b/graphics/kipi-plugins/distinfo
dissimilarity index 61%
index dc403501fd5..3ec6b1c44ea 100644
--- a/graphics/kipi-plugins/distinfo
+++ b/graphics/kipi-plugins/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.27 2012/03/21 21:03:50 markd Exp $
-
-SHA1 (digikam-3.1.0.tar.bz2) = f4ce304acdf10e859ab8f70ce9d53a05d92d4fbd
-RMD160 (digikam-3.1.0.tar.bz2) = 511550a7ee37aac958a0d2e5afaa0a07aa1eab0e
-Size (digikam-3.1.0.tar.bz2) = 58559707 bytes
-SHA1 (patch-htmlexport_wizard.cpp) = 0fa8c9a6fe315bc228e016aba2cd49f502a403c9
-SHA1 (patch-printimages_wizard_cropframe.cpp) = fc3cd2ec0175539d5d6013a2994a8b9bde0ecc57
-SHA1 (patch-printimages_wizard_wizard.cpp) = 18cae2452cab382923f2dbc5254a4ee6e27ad96b
+$NetBSD: distinfo,v 1.29 2013/04/06 09:46:09 markd Exp $
+
+SHA1 (digikam-3.1.0.tar.bz2) = f4ce304acdf10e859ab8f70ce9d53a05d92d4fbd
+RMD160 (digikam-3.1.0.tar.bz2) = 511550a7ee37aac958a0d2e5afaa0a07aa1eab0e
+Size (digikam-3.1.0.tar.bz2) = 58559707 bytes
diff --git a/graphics/kipi-plugins/patches/patch-htmlexport_wizard.cpp b/graphics/kipi-plugins/patches/patch-htmlexport_wizard.cpp
deleted file mode 100644
index 67ec55a8fbf..00000000000
--- a/graphics/kipi-plugins/patches/patch-htmlexport_wizard.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- htmlexport/wizard.cpp.orig	2013-02-28 12:13:45.000000000 +0000
-+++ htmlexport/wizard.cpp
-@@ -78,7 +78,7 @@ class WizardPage : public QWidget, publi
- public:
-     WizardPage(KAssistantDialog* dialog, const QString& title)
-     : QWidget(dialog) {
--        setupUi(this);
-+        this->setupUi(this);
-         layout()->setMargin(0);
-         mPage = dialog->addPage(this, title);
-     }
diff --git a/graphics/kipi-plugins/patches/patch-printimages_wizard_cropframe.cpp b/graphics/kipi-plugins/patches/patch-printimages_wizard_cropframe.cpp
deleted file mode 100644
index 39555cd9bde..00000000000
--- a/graphics/kipi-plugins/patches/patch-printimages_wizard_cropframe.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- printimages/wizard/cropframe.cpp.orig	2013-02-28 12:07:37.000000000 +0000
-+++ printimages/wizard/cropframe.cpp
-@@ -41,7 +41,7 @@
- namespace KIPIPrintImagesPlugin
- {
- 
--CropFrame::CropFrame(QWidget* parent=0)
-+CropFrame::CropFrame(QWidget* parent)
-     : QWidget(parent)
- {
-     m_mouseDown = false;
diff --git a/graphics/kipi-plugins/patches/patch-printimages_wizard_wizard.cpp b/graphics/kipi-plugins/patches/patch-printimages_wizard_wizard.cpp
deleted file mode 100644
index 74767a79da5..00000000000
--- a/graphics/kipi-plugins/patches/patch-printimages_wizard_wizard.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- printimages/wizard/wizard.cpp.orig	2013-02-28 12:09:11.000000000 +0000
-+++ printimages/wizard/wizard.cpp
-@@ -88,7 +88,7 @@ public:
-     WizardPage ( KAssistantDialog* dialog, const QString& title )
-         : QWidget ( dialog )
-     {
--        setupUi ( this );
-+        this->setupUi ( this );
-         layout()->setMargin ( 0 );
-         mPage = dialog->addPage ( this, title );
-     }
diff --git a/lang/japhar/distinfo b/lang/japhar/distinfo
index 82500271648..ed7daee8587 100644
--- a/lang/japhar/distinfo
+++ b/lang/japhar/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2008/09/07 07:31:35 dholland Exp $
+$NetBSD: distinfo,v 1.8 2013/02/26 11:09:09 joerg Exp $
 
 SHA1 (japhar-0.08.tar.gz) = 3f450610ca31061c1c183c8e86d1fcd47660f86d
 RMD160 (japhar-0.08.tar.gz) = 283f47db3a54f8f51d755a61fab94c611de13988
@@ -14,5 +14,5 @@ SHA1 (patch-ai) = c1ec2114b2fdaa00e4d8b5c5bcafc042b50ea077
 SHA1 (patch-aj) = 592306809df6b5f0dd00bf8cfe1c73478222f2dc
 SHA1 (patch-ak) = 0075ab705a19ca055ee3c69d31031efa7091661d
 SHA1 (patch-al) = 8d94f91ad6ec7ff069dc74f6c6b9bc22c5c6885f
-SHA1 (patch-am) = cf3055f178c7f8986e20a73677fde0c2e3a2c12f
+SHA1 (patch-am) = a1b75b9a11bac76fc4c8a46a225f10b72534bd54
 SHA1 (patch-lib_libnative_java.lang_system.c) = b53fe5ea61d130467a2cf4eff6a0e27dd458f80b
diff --git a/lang/japhar/patches/patch-am b/lang/japhar/patches/patch-am
index 5e0a9761238..c5c19bc5d2d 100644
--- a/lang/japhar/patches/patch-am
+++ b/lang/japhar/patches/patch-am
@@ -1,6 +1,6 @@
-$NetBSD$
+$NetBSD: patch-am,v 1.1 2006/06/06 15:40:15 joerg Exp $
 
---- lib/libruntime/Makefile.in.orig	2006-06-06 15:22:19.000000000 +0000
+--- lib/libruntime/Makefile.in.orig	1999-03-16 03:24:42.000000000 +0000
 +++ lib/libruntime/Makefile.in
 @@ -87,8 +87,7 @@ LIBS = 
  @NEED_ZLIB_TRUE@ZLIB_INCLUDES = -I$(top_srcdir)/lib/zlib
@@ -22,3 +22,12 @@ $NetBSD$
  objects.lo objects.o : objects.c ../../include/config.h \
  	../../lib/libjni/include/jniint.h \
  	../../lib/libjni/include/jni.h \
+@@ -527,7 +525,7 @@ mostlyclean distclean maintainer-clean
+ 
+ # Make lookup table from opcode definitions
+ interploop.h: interpfunc.c
+-	grep OPCODE interpfunc.c | grep -v '#define' | sort -n +1 > interploop.h
++	grep OPCODE interpfunc.c | grep -v '#define' | sort -n -k 2 > interploop.h
+ 
+ interploop.c: interploop.h
+ 
diff --git a/lang/p2c/distinfo b/lang/p2c/distinfo
index 594dc1af44a..fe122f636d1 100644
--- a/lang/p2c/distinfo
+++ b/lang/p2c/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2009/09/03 13:14:10 joerg Exp $
+$NetBSD: distinfo,v 1.5 2011/12/18 16:54:08 dholland Exp $
 
 SHA1 (p2c-1.20.tar.Z) = 797c5394d50567d5195548d3919c5a66ab90f680
 RMD160 (p2c-1.20.tar.Z) = 9917ef3f501b1506f2992d572f439398862fba4c
 Size (p2c-1.20.tar.Z) = 579294 bytes
-SHA1 (patch-aa) = 0da0ac982bfc799dae3d291a66abb50239ffa9da
+SHA1 (patch-aa) = 86c1edd87984b0bac7ed422f3437ac9c555075e4
 SHA1 (patch-ab) = ceeda201cff0dfb975fec7f489fdaaca94984935
 SHA1 (patch-ac) = d169a0c722bebd53f9de25c0f6e208236650939a
 SHA1 (patch-ad) = f2ecb3a2f0cf51024b221e02eb92b9e517455d93
diff --git a/lang/p2c/patches/patch-aa b/lang/p2c/patches/patch-aa
index 9bc6051a210..a1034e30076 100644
--- a/lang/p2c/patches/patch-aa
+++ b/lang/p2c/patches/patch-aa
@@ -1,8 +1,10 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/01/31 03:47:27 jwise Exp $
+$NetBSD: patch-aa,v 1.2 2011/12/18 16:54:08 dholland Exp $
 
  - configure for pkgsrc
  - use ranlib properly
  - fix install permissions
+ - honor PKGMANDIR
+ - support MAKE_JOBS
 
 --- Makefile.orig	1991-04-24 20:30:37.000000000 +0000
 +++ Makefile
@@ -21,7 +23,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/01/31 03:47:27 jwise Exp $
 +INCDIR = ${PREFIX}/include/p2c
 +BINDIR = ${PREFIX}/bin
 +LIBDIR = ${PREFIX}/lib
-+MANDIR = ${PREFIX}/man/man1
++MANDIR = ${PREFIX}/${PKGMANDIR}/man1
 +#MANFILE = p2c.cat          # human-readable manual (for cat.1)
 +MANFILE = p2c.man.inst    # uncompressed nroff source (for man.1)
  #MANFILE = p2c.man.Z       # compressed nroff source (for man.1.Z)
@@ -49,6 +51,15 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/01/31 03:47:27 jwise Exp $
  
  MISCSRCS = makeproto.c
  PROTOS = p2c.proto p2c.hdrs
+@@ -73,7 +73,7 @@ HDRS = trans.h p2c.h
+ 
+ 
+ # Top-level targets
+-all: proto p2c libp2c.a p2c.cat
++all: proto .WAIT p2c libp2c.a p2c.cat
+ proto: $(PROTOS)
+ 
+ 
 @@ -129,7 +129,8 @@ p2c.cat: p2c.man.inst
  #  Third, execute "make install" to compile and set things up.
  # (You may need to have a system operator do these steps for you.)
diff --git a/misc/kdeplasma-addons4/Makefile b/misc/kdeplasma-addons4/Makefile
index 4d96df169b4..fb4a8b745dc 100644
--- a/misc/kdeplasma-addons4/Makefile
+++ b/misc/kdeplasma-addons4/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2013/04/03 10:52:18 markd Exp $
+# $NetBSD: Makefile,v 1.42 2013/04/13 23:06:13 markd Exp $
 
 DISTNAME=	kdeplasma-addons-${_KDE_VERSION}
 PKGNAME=	${DISTNAME:S/-4/4-4/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	misc
 COMMENT=	Plasmoids
 
@@ -26,6 +26,7 @@ BUILDLINK_API_DEPENDS.eigen2+=	eigen2>=2.0.3
 .include "../../misc/nepomuk-core/buildlink3.mk"
 .include "../../misc/kdepimlibs4/buildlink3.mk"
 .include "../../security/qca2/buildlink3.mk"
+.include "../../security/qoauth/buildlink3.mk"
 .include "../../x11/kdelibs4/buildlink3.mk"
 .include "../../x11/kde-runtime4/buildlink3.mk"
 .include "../../x11/kde-workspace4/buildlink3.mk"
diff --git a/misc/kdeplasma-addons4/PLIST b/misc/kdeplasma-addons4/PLIST
index 005079a1167..97a9010ae32 100644
--- a/misc/kdeplasma-addons4/PLIST
+++ b/misc/kdeplasma-addons4/PLIST
@@ -167,6 +167,7 @@ lib/kde4/plasma_engine_kdeobservatory.so
 lib/kde4/plasma_engine_kimpanel.so
 lib/kde4/plasma_engine_konqprofiles.so
 lib/kde4/plasma_engine_konsoleprofiles.so
+lib/kde4/plasma_engine_microblog.so
 lib/kde4/plasma_engine_ocs.so
 lib/kde4/plasma_engine_potd.so
 lib/kde4/plasma_engine_rtm.so
@@ -439,6 +440,7 @@ share/kde/apps/plasma/services/org.kde.plasma.dataengine.konsoleprofiles.operati
 share/kde/apps/plasma/services/rtmauth.operations
 share/kde/apps/plasma/services/rtmtask.operations
 share/kde/apps/plasma/services/rtmtasks.operations
+share/kde/apps/plasma/services/tweet.operations
 share/kde/apps/plasma/wallpapers/org.kde.animals/contents/ui/Animal.qml
 share/kde/apps/plasma/wallpapers/org.kde.animals/contents/ui/animals.qml
 share/kde/apps/plasma/wallpapers/org.kde.animals/metadata.desktop
@@ -557,6 +559,7 @@ share/kde4/services/plasma-dataengine-comic.desktop
 share/kde4/services/plasma-dataengine-kimpanel.desktop
 share/kde4/services/plasma-dataengine-konqprofiles.desktop
 share/kde4/services/plasma-dataengine-konsoleprofiles.desktop
+share/kde4/services/plasma-dataengine-microblog.desktop
 share/kde4/services/plasma-dataengine-ocs.desktop
 share/kde4/services/plasma-dataengine-potd.desktop
 share/kde4/services/plasma-dict-default.desktop
diff --git a/mk/platform/AIX.mk b/mk/platform/AIX.mk
index d568e48edac..e950eaabbc7 100644
--- a/mk/platform/AIX.mk
+++ b/mk/platform/AIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: AIX.mk,v 1.38 2012/03/19 12:34:16 joerg Exp $
+# $NetBSD: AIX.mk,v 1.39 2012/11/19 11:34:15 ryoon Exp $
 #
 # Variable definitions for the AIX operating system.
 
@@ -29,6 +29,10 @@ ULIMIT_CMD_datasize?=	ulimit -d `ulimit -H -d`
 ULIMIT_CMD_stacksize?=	ulimit -s `ulimit -H -s`
 ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
 
+_OPSYS_SYSTEM_RPATH?=		/usr/lib
+_OPSYS_LIB_DIRS?=		/usr/lib
+_OPSYS_INCLUDE_DIRS?=		/usr/include
+
 .if exists(/usr/include/netinet6)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 .else
diff --git a/mk/platform/BSDOS.mk b/mk/platform/BSDOS.mk
index e17c98cee74..7acea4b79d7 100644
--- a/mk/platform/BSDOS.mk
+++ b/mk/platform/BSDOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: BSDOS.mk,v 1.31 2012/03/19 12:34:16 joerg Exp $
+# $NetBSD: BSDOS.mk,v 1.32 2012/11/19 11:34:15 ryoon Exp $
 #
 # Variable definitions for the BSD/OS operating system.
 
@@ -34,6 +34,10 @@ ULIMIT_CMD_datasize?=	ulimit -d `ulimit -H -d`
 ULIMIT_CMD_stacksize?=	ulimit -s `ulimit -H -s`
 ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
 
+_OPSYS_SYSTEM_RPATH?=		/usr/lib
+_OPSYS_LIB_DIRS?=		/usr/lib
+_OPSYS_INCLUDE_DIRS?=		/usr/include
+
 .if exists(/usr/include/netinet6)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 .else
diff --git a/mk/platform/Cygwin.mk b/mk/platform/Cygwin.mk
index 44974c94196..56f66202161 100644
--- a/mk/platform/Cygwin.mk
+++ b/mk/platform/Cygwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Cygwin.mk,v 1.10 2013/03/06 12:41:44 obache Exp $
+# $NetBSD: Cygwin.mk,v 1.11 2013/03/13 12:38:19 obache Exp $
 #
 # Variable definitions for the Windows with Cygwin.
 
@@ -40,6 +40,10 @@ ULIMIT_CMD_memorysize?=	ulimit -v `ulimit -H -v`
 
 X11_TYPE?=		native
 
+_OPSYS_SYSTEM_RPATH?=		# /usr/bin
+_OPSYS_LIB_DIRS?=		/lib /usr/lib
+_OPSYS_INCLUDE_DIRS?=		/usr/include
+
 _OPSYS_EXE_SUFFIX=	.exe	# executables may have suffix
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 _OPSYS_HAS_JAVA=	no	# Java is not standard
diff --git a/mk/platform/Darwin.mk b/mk/platform/Darwin.mk
index 2dd991f84b9..3bc66781f10 100644
--- a/mk/platform/Darwin.mk
+++ b/mk/platform/Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.50 2013/02/04 15:53:16 wiz Exp $
+# $NetBSD: Darwin.mk,v 1.51 2013/04/04 10:24:14 jperkin Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -71,6 +71,10 @@ _USER_DEPENDS=		user>=20040801:../../sysutils/user_darwin
 
 _OPSYS_EMULDIR.darwin=	# empty
 
+_OPSYS_SYSTEM_RPATH?=		/usr/lib
+_OPSYS_LIB_DIRS?=		/usr/lib
+_OPSYS_INCLUDE_DIRS?=		/usr/include
+
 .if ${OS_VERSION:R} >= 6
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 .else
diff --git a/mk/platform/DragonFly.mk b/mk/platform/DragonFly.mk
index b9b7264585b..ab9ce858637 100644
--- a/mk/platform/DragonFly.mk
+++ b/mk/platform/DragonFly.mk
@@ -1,4 +1,4 @@
-# $NetBSD: DragonFly.mk,v 1.42 2012/03/19 12:34:16 joerg Exp $
+# $NetBSD: DragonFly.mk,v 1.43 2012/11/19 11:34:15 ryoon Exp $
 #
 # Variable definitions for the DragonFly operating system.
 
@@ -27,6 +27,8 @@ ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
 _OPSYS_EMULDIR.linux=	/compat/linux
 
 _OPSYS_SYSTEM_RPATH?=		/usr/lib:/usr/lib/gcc41:/usr/lib/gcc34
+_OPSYS_LIB_DIRS?=		/usr/lib
+_OPSYS_INCLUDE_DIRS?=		/usr/include
 
 .if exists(/usr/include/netinet6)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
diff --git a/mk/platform/FreeBSD.mk b/mk/platform/FreeBSD.mk
index 64b20ad176e..2af80b8d8af 100644
--- a/mk/platform/FreeBSD.mk
+++ b/mk/platform/FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: FreeBSD.mk,v 1.28 2012/03/19 12:34:17 joerg Exp $
+# $NetBSD: FreeBSD.mk,v 1.29 2012/11/19 11:34:15 ryoon Exp $
 #
 # Variable definitions for the FreeBSD operating system.
 
@@ -33,6 +33,8 @@ _OPSYS_EMULDIR.freebsd=	# empty
 _OPSYS_EMULDIR.linux=	/compat/linux
 
 _OPSYS_SYSTEM_RPATH?=	/lib:/usr/lib	# STANDARD_LIBRARY_PATH (from rtld.h)
+_OPSYS_LIB_DIRS?=	/lib /usr/lib
+_OPSYS_INCLUDE_DIRS?=	/usr/include
 
 .if exists(/usr/include/netinet6)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
diff --git a/mk/platform/FreeMiNT.mk b/mk/platform/FreeMiNT.mk
index c704d667649..517f3e513dd 100644
--- a/mk/platform/FreeMiNT.mk
+++ b/mk/platform/FreeMiNT.mk
@@ -1,4 +1,4 @@
-# $NetBSD: FreeMiNT.mk,v 1.1 2009/03/05 00:02:44 abs Exp $
+# $NetBSD: FreeMiNT.mk,v 1.2 2009/07/26 05:32:43 agc Exp $
 #
 # Variable definitions for the FreeMiNT operating system.
 
@@ -25,6 +25,10 @@ ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
 
 _OPSYS_EMULDIR.osf1=	# empty
 
+_OPSYS_SYSTEM_RPATH?=		/usr/lib
+_OPSYS_LIB_DIRS?=		/usr/lib
+_OPSYS_INCLUDE_DIRS?=		/usr/include
+
 _OPSYS_HAS_INET6=	no	# IPv6 is not standard
 _OPSYS_HAS_JAVA=	no	# Java is standard
 _OPSYS_HAS_MANZ=	no	# MANZ controls gzipping of man pages
diff --git a/mk/platform/HPUX.mk b/mk/platform/HPUX.mk
index 56745dd3436..e4cc22b78cc 100644
--- a/mk/platform/HPUX.mk
+++ b/mk/platform/HPUX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: HPUX.mk,v 1.20 2012/03/19 12:34:17 joerg Exp $
+# $NetBSD: HPUX.mk,v 1.21 2012/11/19 11:34:15 ryoon Exp $
 #
 # Variable definitions for the HP-UX operating system.
 
@@ -31,6 +31,10 @@ FIX_SYSTEM_HEADERS?=	yes
 
 _OPSYS_EMULDIR.hpux=	# empty
 
+_OPSYS_SYSTEM_RPATH?=	/usr/lib
+_OPSYS_LIB_DIRS?=	/usr/lib
+_OPSYS_INCLUDE_DIRS?=	/usr/include
+
 .if exists(/usr/include/netinet/ip6.h)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 .else
diff --git a/mk/platform/Haiku.mk b/mk/platform/Haiku.mk
index 00e3b3ff360..2b9feb4312f 100644
--- a/mk/platform/Haiku.mk
+++ b/mk/platform/Haiku.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Haiku.mk,v 1.6 2012/03/19 12:34:17 joerg Exp $
+# $NetBSD: Haiku.mk,v 1.7 2012/11/19 11:34:15 ryoon Exp $
 #
 # Variable definitions for the Haiku operating system.
 
@@ -31,6 +31,12 @@ ULIMIT_CMD_stacksize?=	ulimit -s `ulimit -H -s`
 ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
 USERADD?=		/bin/useradd
 
+_OPSYS_SYSTEM_RPATH?=	/boot/common/lib:/boot/system/lib
+_OPSYS_LIB_DIRS?=	/boot/common/lib /boot/system/lib
+_OPSYS_INCLUDE_DIRS?=	/boot/common/include \
+			/boot/develop/headers/posix \
+			/boot/develop/3rdparty
+
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 _OPSYS_HAS_JAVA=	no	# Java is not standard
 _OPSYS_HAS_MANZ=	no	# no MANZ for gzipping of man pages
diff --git a/mk/platform/IRIX.mk b/mk/platform/IRIX.mk
index 321ac8b58ed..82a338c0f5b 100644
--- a/mk/platform/IRIX.mk
+++ b/mk/platform/IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: IRIX.mk,v 1.39 2011/09/17 08:13:06 abs Exp $
+# $NetBSD: IRIX.mk,v 1.40 2012/03/19 12:34:17 joerg Exp $
 #
 # Variable definitions for the IRIX operating system.
 
@@ -37,6 +37,10 @@ _USER_DEPENDS=		user-[0-9]*:../../sysutils/user_irix
 
 _OPSYS_EMULDIR.irix=	# empty
 
+_OPSYS_SYSTEM_RPATH?=	/usr/lib
+_OPSYS_LIB_DIRS?=	/usr/lib
+_OPSYS_INCLUDE_DIRS?=	/usr/include
+
 .if exists(/usr/include/netinet6)
 _OPSYS_HAS_INET6=	yes		# IPv6 is standard
 .else
diff --git a/mk/platform/Interix.mk b/mk/platform/Interix.mk
index dcb3322bc3d..6d5a325fca3 100644
--- a/mk/platform/Interix.mk
+++ b/mk/platform/Interix.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Interix.mk,v 1.67 2012/03/19 12:34:17 joerg Exp $
+# $NetBSD: Interix.mk,v 1.68 2012/11/19 11:34:15 ryoon Exp $
 #
 # Variable definitions for the Interix operating system.
 
@@ -105,6 +105,10 @@ ULIMIT_CMD_datasize?=	ulimit -d `ulimit -H -d`
 ULIMIT_CMD_stacksize?=	ulimit -s `ulimit -H -s`
 ULIMIT_CMD_memorysize?=	ulimit -v `ulimit -H -v`
 
+_OPSYS_SYSTEM_RPATH?=	/usr/lib
+_OPSYS_LIB_DIRS?=	/usr/lib
+_OPSYS_INCLUDE_DIRS?=	/usr/include
+
 .if exists(/usr/include/netinet6)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 .else
diff --git a/mk/platform/Linux.mk b/mk/platform/Linux.mk
index ca7c3445437..fc6a847af33 100644
--- a/mk/platform/Linux.mk
+++ b/mk/platform/Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Linux.mk,v 1.51 2012/04/23 08:14:36 sbd Exp $
+# $NetBSD: Linux.mk,v 1.52 2012/11/19 11:34:15 ryoon Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -49,6 +49,8 @@ _OPSYS_EMULDIR.linux=	# empty
 _OPSYS_EMULDIR.linux32=	# empty
 
 _OPSYS_SYSTEM_RPATH=	/lib${LIBABISUFFIX}:/usr/lib${LIBABISUFFIX}
+_OPSYS_LIB_DIRS?=	/lib${LIBABISUFFIX} /usr/lib${LIBABISUFFIX}
+_OPSYS_INCLUDE_DIRS?=	/usr/include
 
 .if exists(/usr/include/netinet6) || exists(/usr/include/linux/in6.h)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
diff --git a/mk/platform/Minix.mk b/mk/platform/Minix.mk
index 955ee5f2ca9..65810f3d491 100644
--- a/mk/platform/Minix.mk
+++ b/mk/platform/Minix.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Minix.mk,v 1.3 2013/02/09 03:40:01 tcort Exp $
+# $NetBSD: Minix.mk,v 1.4 2013/03/01 00:09:20 tcort Exp $
 #
 # Variable definitions for the Minix operating system.
 
@@ -26,6 +26,10 @@ USERADD?=		/usr/sbin/useradd
 ULIMIT_CMD_datasize?=	: 
 ULIMIT_CMD_stacksize?=	: 
 
+_OPSYS_SYSTEM_RPATH?=	/usr/lib
+_OPSYS_LIB_DIRS?=	/usr/lib
+_OPSYS_INCLUDE_DIRS?=	/usr/include
+
 _OPSYS_HAS_INET6=	no	# IPv6 is not standard
 _OPSYS_HAS_JAVA=	no	# Java is not standard
 _OPSYS_HAS_MANZ=	no	# no MANZ for gzipping of man pages
diff --git a/mk/platform/MirBSD.mk b/mk/platform/MirBSD.mk
index 24526c14159..216de065984 100644
--- a/mk/platform/MirBSD.mk
+++ b/mk/platform/MirBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: MirBSD.mk,v 1.7 2012/06/16 20:13:06 bsiegert Exp $
+# $NetBSD: MirBSD.mk,v 1.8 2012/11/19 11:34:15 ryoon Exp $
 #
 # Variable definitions for the MirOS BSD operating system.
 
@@ -29,6 +29,10 @@ ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
 
 X11_TYPE?=		modular
 
+_OPSYS_SYSTEM_RPATH?=	/usr/lib
+_OPSYS_LIB_DIRS?=	/usr/lib
+_OPSYS_INCLUDE_DIRS?=	/usr/include
+
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 _OPSYS_HAS_JAVA=	no	# Java is not standard
 _OPSYS_HAS_MANZ=	no	# MANZ controls gzipping of man pages
diff --git a/mk/platform/NetBSD.mk b/mk/platform/NetBSD.mk
index 4dabaf38b7b..a5b2ee962eb 100644
--- a/mk/platform/NetBSD.mk
+++ b/mk/platform/NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.mk,v 1.37 2012/03/19 12:34:18 joerg Exp $
+# $NetBSD: NetBSD.mk,v 1.38 2012/11/19 11:34:15 ryoon Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -61,6 +61,8 @@ _OPSYS_EMULDIR.solaris32=	/emul/svr4_32
 _OPSYS_EMULDIR.sunos=		/emul/sunos
 
 _OPSYS_SYSTEM_RPATH?=		/usr/lib
+_OPSYS_LIB_DIRS?=		/usr/lib
+_OPSYS_INCLUDE_DIRS?=		/usr/include
 
 .if exists(/usr/include/netinet6)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
diff --git a/mk/platform/OSF1.mk b/mk/platform/OSF1.mk
index 947ba96a819..2f5dd63e917 100644
--- a/mk/platform/OSF1.mk
+++ b/mk/platform/OSF1.mk
@@ -1,4 +1,4 @@
-# $NetBSD: OSF1.mk,v 1.32 2012/03/19 12:34:18 joerg Exp $
+# $NetBSD: OSF1.mk,v 1.33 2012/11/19 11:34:15 ryoon Exp $
 #
 # Variable definitions for the OSF1 operating system.
 
@@ -31,6 +31,10 @@ FIX_SYSTEM_HEADERS?=    yes
 
 _OPSYS_EMULDIR.osf1=	# empty
 
+_OPSYS_SYSTEM_RPATH?=	/usr/lib
+_OPSYS_LIB_DIRS?=	/usr/lib
+_OPSYS_INCLUDE_DIRS?=	/usr/include
+
 .if exists(/usr/include/netinet/ip6.h)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 .else
diff --git a/mk/platform/OpenBSD.mk b/mk/platform/OpenBSD.mk
index 8146c88c745..09335672a75 100644
--- a/mk/platform/OpenBSD.mk
+++ b/mk/platform/OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: OpenBSD.mk,v 1.35 2012/05/13 08:20:11 obache Exp $
+# $NetBSD: OpenBSD.mk,v 1.36 2012/11/19 11:34:15 ryoon Exp $
 #
 # Variable definitions for the OpenBSD operating system.
 
@@ -39,6 +39,8 @@ ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
 X11_TYPE?=		native
 
 _OPSYS_SYSTEM_RPATH?=	/usr/lib
+_OPSYS_LIB_DIRS?=	/usr/lib
+_OPSYS_INCLUDE_DIRS?=	/usr/include
 
 .if exists(/usr/include/netinet6)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
diff --git a/mk/platform/QNX.mk b/mk/platform/QNX.mk
index 515cdbe5726..dd2b5570dbb 100644
--- a/mk/platform/QNX.mk
+++ b/mk/platform/QNX.mk
@@ -50,6 +50,9 @@ IMAKE_MISCMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}7
 IMAKE_MANINSTALL?=	maninstall catinstall
 
 _OPSYS_SYSTEM_RPATH?=	/lib:/usr/lib	# STANDARD_LIBRARY_PATH
+_OPSYS_LIB_DIRS?=	/lib /usr/lib
+_OPSYS_INCLUDE_DIRS?=	/usr/include
+
 .if exists(/usr/include/netinet6)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 .else
diff --git a/mk/platform/README b/mk/platform/README
index c12cffc9c81..35ca0630732 100644
--- a/mk/platform/README
+++ b/mk/platform/README
@@ -1,4 +1,4 @@
-$NetBSD: README,v 1.1 2007/11/20 17:53:40 rillig Exp $
+$NetBSD: README,v 1.2 2013/04/08 13:29:26 obache Exp $
 
 These files contain platform-specific definitions that are used by the
 pkgsrc infrastructure.
@@ -67,6 +67,10 @@ TODO: Document all these variables.
 
     _OPSYS_SYSTEM_RPATH is colon separated list of system rpath.
 
+    _OPSYS_LIB_DIRS is list of system library directories.
+
+    _OPSYS_INCLUDE_DIRS is list of system header file directories.
+
     _OPSYS_HAS_INET6 is "yes" if IPv6 is standard, otherwise "no".
 
     _OPSYS_HAS_JAVA is "yes" if Java is standard, otherwise "no".
diff --git a/mk/platform/SunOS.mk b/mk/platform/SunOS.mk
index fe79c857c7f..d16d22a6612 100644
--- a/mk/platform/SunOS.mk
+++ b/mk/platform/SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: SunOS.mk,v 1.48 2013/02/01 12:36:06 hans Exp $
+# $NetBSD: SunOS.mk,v 1.49 2013/03/01 16:58:51 jperkin Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -82,6 +82,8 @@ _OPSYS_SYSTEM_RPATH?=	/lib/64:/usr/lib/64
 .else
 _OPSYS_SYSTEM_RPATH?=	/lib:/usr/lib
 .endif
+_OPSYS_LIB_DIRS?=	/lib${LIBABISUFFIX} /usr/lib${LIBABISUFFIX}
+_OPSYS_INCLUDE_DIRS?=	/usr/include
 
 # Enable shlibs checks if readelf is set, not available by default.
 _OPSYS_CAN_CHECK_SHLIBS=	no
diff --git a/mk/platform/UnixWare.mk b/mk/platform/UnixWare.mk
index a8bdb2e2f13..4ac70809d5c 100644
--- a/mk/platform/UnixWare.mk
+++ b/mk/platform/UnixWare.mk
@@ -1,4 +1,4 @@
-# $NetBSD: UnixWare.mk,v 1.31 2011/09/17 08:10:33 abs Exp $
+# $NetBSD: UnixWare.mk,v 1.32 2012/03/19 12:34:18 joerg Exp $
 #
 # Variable definitions for the UnixWare 7 operating system.
 
@@ -27,6 +27,10 @@ ULIMIT_CMD_stacksize?=	ulimit -s `ulimit -H -s`
 ULIMIT_CMD_memorysize?=	ulimit -v `ulimit -H -v`
 USERADD?=		/usr/sbin/useradd
 
+_OPSYS_SYSTEM_RPATH?=	/usr/lib
+_OPSYS_LIB_DIRS?=	/usr/lib
+_OPSYS_INCLUDE_DIRS?=	/usr/include
+
 .if exists(/usr/include/netinet/in6.h)
 _OPSYS_HAS_INET6=	yes		# IPv6 is standard
 .else
diff --git a/multimedia/libdvdcss/Makefile b/multimedia/libdvdcss/Makefile
index 68880739e3c..2c08a56a6ee 100644
--- a/multimedia/libdvdcss/Makefile
+++ b/multimedia/libdvdcss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2012/10/08 09:21:06 asau Exp $
+# $NetBSD: Makefile,v 1.27 2013/04/01 20:34:33 adam Exp $
 #
 # In order to ensure compliance with U.S. and international law, please
 # do not modify this file to provide pointers to the source or homepage
@@ -27,6 +27,7 @@ PKGCONFIG_OVERRIDE=	src/libdvdcss.pc.in
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
+CONFIGURE_ENV+=		ac_cv_path_DOXYGEN=
 CONFIGURE_ARGS+=	--disable-apidoc
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/net/ktorrent-kde3/Makefile b/net/ktorrent-kde3/Makefile
index 1e2d702c433..ca590074248 100644
--- a/net/ktorrent-kde3/Makefile
+++ b/net/ktorrent-kde3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2013/02/09 22:11:42 ryoon Exp $
+# $NetBSD: Makefile,v 1.21 2013/02/16 11:23:54 wiz Exp $
 
 DISTNAME=	ktorrent-${KTORRENT_VER}
 PKGREVISION=	22
@@ -8,7 +8,7 @@ EXTRACT_SUFX=	.tar.bz2
 
 KTORRENT_VER=	2.2.8
 
-MAINTAINER=	shattered@NetBSD.org
+MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ktorrent.org/
 COMMENT=	Graphical BitTorrent client for KDE
 LICENSE=	gnu-gpl-v2
diff --git a/sysutils/salt/Makefile b/sysutils/salt/Makefile
index b70ab005ef0..7503f4bd3a2 100644
--- a/sysutils/salt/Makefile
+++ b/sysutils/salt/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2012/10/23 19:51:22 asau Exp $
+# $NetBSD: Makefile,v 1.10 2012/12/06 08:01:21 apb Exp $
 #
 
-DISTNAME=	salt-0.10.5
+DISTNAME=	salt-0.14.1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://cloud.github.com/downloads/saltstack/salt/
+MASTER_SITES=	http://pypi.python.org/packages/source/s/salt/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://saltstack.org/
@@ -21,20 +21,21 @@ SUBST_FILES.fix-paths+=	salt/modules/mysql.py
 SUBST_FILES.fix-paths+=	salt/modules/postgres.py
 SUBST_FILES.fix-paths+=	salt/modules/tls.py
 SUBST_FILES.fix-paths+=	salt/utils/parsers.py
+SUBST_FILES.fix-paths+=	salt/utils/migrations.py
 SUBST_SED.fix-paths+=	-e "s|/etc/salt|${PKG_SYSCONFDIR}|g"
 
 PKG_SYSCONFSUBDIR=	salt
 
 EGDIR=		${PREFIX}/share/examples/salt
 INSTALLATION_DIRS+= ${EGDIR}
-CONF_FILES+=	${EGDIR}/master.template ${PKG_SYSCONFDIR}/master
-CONF_FILES+=	${EGDIR}/minion.template ${PKG_SYSCONFDIR}/minion
+CONF_FILES+=	${EGDIR}/master ${PKG_SYSCONFDIR}/master
+CONF_FILES+=	${EGDIR}/minion ${PKG_SYSCONFDIR}/minion
 
 RCD_SCRIPTS+=	salt_master salt_minion
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/conf/master.template ${DESTDIR}${EGDIR}/
-	${INSTALL_DATA} ${WRKSRC}/conf/minion.template ${DESTDIR}${EGDIR}/
+	${INSTALL_DATA} ${WRKSRC}/conf/master ${DESTDIR}${EGDIR}/
+	${INSTALL_DATA} ${WRKSRC}/conf/minion ${DESTDIR}${EGDIR}/
 
 # Dependencies are documented at
 # http://docs.saltstack.org/en/latest/topics/installation/index.html#dependencies
diff --git a/sysutils/salt/PLIST b/sysutils/salt/PLIST
index 5b16c8ef498..0e5063f5006 100644
--- a/sysutils/salt/PLIST
+++ b/sysutils/salt/PLIST
@@ -1,4 +1,12 @@
-@comment $NetBSD: PLIST,v 1.2 2012/04/08 20:21:55 wiz Exp $
+@comment $NetBSD$
+bin/salt
+bin/salt-call
+bin/salt-cp
+bin/salt-key
+bin/salt-master
+bin/salt-minion
+bin/salt-run
+bin/salt-syndic
 ${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/salt/__init__.py
 ${PYSITELIB}/salt/__init__.pyc
@@ -6,9 +14,15 @@ ${PYSITELIB}/salt/__init__.pyo
 ${PYSITELIB}/salt/_compat.py
 ${PYSITELIB}/salt/_compat.pyc
 ${PYSITELIB}/salt/_compat.pyo
+${PYSITELIB}/salt/_version.py
+${PYSITELIB}/salt/_version.pyc
+${PYSITELIB}/salt/_version.pyo
 ${PYSITELIB}/salt/auth/__init__.py
 ${PYSITELIB}/salt/auth/__init__.pyc
 ${PYSITELIB}/salt/auth/__init__.pyo
+${PYSITELIB}/salt/auth/keystone.py
+${PYSITELIB}/salt/auth/keystone.pyc
+${PYSITELIB}/salt/auth/keystone.pyo
 ${PYSITELIB}/salt/auth/ldap.py
 ${PYSITELIB}/salt/auth/ldap.pyc
 ${PYSITELIB}/salt/auth/ldap.pyo
@@ -45,6 +59,15 @@ ${PYSITELIB}/salt/ext/__init__.pyo
 ${PYSITELIB}/salt/fileclient.py
 ${PYSITELIB}/salt/fileclient.pyc
 ${PYSITELIB}/salt/fileclient.pyo
+${PYSITELIB}/salt/fileserver/__init__.py
+${PYSITELIB}/salt/fileserver/__init__.pyc
+${PYSITELIB}/salt/fileserver/__init__.pyo
+${PYSITELIB}/salt/fileserver/gitfs.py
+${PYSITELIB}/salt/fileserver/gitfs.pyc
+${PYSITELIB}/salt/fileserver/gitfs.pyo
+${PYSITELIB}/salt/fileserver/roots.py
+${PYSITELIB}/salt/fileserver/roots.pyc
+${PYSITELIB}/salt/fileserver/roots.pyo
 ${PYSITELIB}/salt/grains/__init__.py
 ${PYSITELIB}/salt/grains/__init__.pyc
 ${PYSITELIB}/salt/grains/__init__.pyo
@@ -78,6 +101,9 @@ ${PYSITELIB}/salt/modules/__init__.pyo
 ${PYSITELIB}/salt/modules/aliases.py
 ${PYSITELIB}/salt/modules/aliases.pyc
 ${PYSITELIB}/salt/modules/aliases.pyo
+${PYSITELIB}/salt/modules/alternatives.py
+${PYSITELIB}/salt/modules/alternatives.pyc
+${PYSITELIB}/salt/modules/alternatives.pyo
 ${PYSITELIB}/salt/modules/apache.py
 ${PYSITELIB}/salt/modules/apache.pyc
 ${PYSITELIB}/salt/modules/apache.pyo
@@ -105,9 +131,6 @@ ${PYSITELIB}/salt/modules/butterkvm.pyo
 ${PYSITELIB}/salt/modules/cassandra.py
 ${PYSITELIB}/salt/modules/cassandra.pyc
 ${PYSITELIB}/salt/modules/cassandra.pyo
-${PYSITELIB}/salt/modules/cluster.py
-${PYSITELIB}/salt/modules/cluster.pyc
-${PYSITELIB}/salt/modules/cluster.pyo
 ${PYSITELIB}/salt/modules/cmdmod.py
 ${PYSITELIB}/salt/modules/cmdmod.pyc
 ${PYSITELIB}/salt/modules/cmdmod.pyo
@@ -138,12 +161,27 @@ ${PYSITELIB}/salt/modules/disk.pyo
 ${PYSITELIB}/salt/modules/djangomod.py
 ${PYSITELIB}/salt/modules/djangomod.pyc
 ${PYSITELIB}/salt/modules/djangomod.pyo
+${PYSITELIB}/salt/modules/dnsmasq.py
+${PYSITELIB}/salt/modules/dnsmasq.pyc
+${PYSITELIB}/salt/modules/dnsmasq.pyo
+${PYSITELIB}/salt/modules/dnsutil.py
+${PYSITELIB}/salt/modules/dnsutil.pyc
+${PYSITELIB}/salt/modules/dnsutil.pyo
+${PYSITELIB}/salt/modules/dpkg.py
+${PYSITELIB}/salt/modules/dpkg.pyc
+${PYSITELIB}/salt/modules/dpkg.pyo
 ${PYSITELIB}/salt/modules/ebuild.py
 ${PYSITELIB}/salt/modules/ebuild.pyc
 ${PYSITELIB}/salt/modules/ebuild.pyo
+${PYSITELIB}/salt/modules/eix.py
+${PYSITELIB}/salt/modules/eix.pyc
+${PYSITELIB}/salt/modules/eix.pyo
 ${PYSITELIB}/salt/modules/event.py
 ${PYSITELIB}/salt/modules/event.pyc
 ${PYSITELIB}/salt/modules/event.pyo
+${PYSITELIB}/salt/modules/extfs.py
+${PYSITELIB}/salt/modules/extfs.pyc
+${PYSITELIB}/salt/modules/extfs.pyo
 ${PYSITELIB}/salt/modules/file.py
 ${PYSITELIB}/salt/modules/file.pyc
 ${PYSITELIB}/salt/modules/file.pyo
@@ -168,6 +206,9 @@ ${PYSITELIB}/salt/modules/gem.pyo
 ${PYSITELIB}/salt/modules/gentoo_service.py
 ${PYSITELIB}/salt/modules/gentoo_service.pyc
 ${PYSITELIB}/salt/modules/gentoo_service.pyo
+${PYSITELIB}/salt/modules/gentoolkitmod.py
+${PYSITELIB}/salt/modules/gentoolkitmod.pyc
+${PYSITELIB}/salt/modules/gentoolkitmod.pyo
 ${PYSITELIB}/salt/modules/git.py
 ${PYSITELIB}/salt/modules/git.pyc
 ${PYSITELIB}/salt/modules/git.pyo
@@ -180,15 +221,30 @@ ${PYSITELIB}/salt/modules/grains.pyo
 ${PYSITELIB}/salt/modules/groupadd.py
 ${PYSITELIB}/salt/modules/groupadd.pyc
 ${PYSITELIB}/salt/modules/groupadd.pyo
-${PYSITELIB}/salt/modules/grub.py
-${PYSITELIB}/salt/modules/grub.pyc
-${PYSITELIB}/salt/modules/grub.pyo
+${PYSITELIB}/salt/modules/grub_legacy.py
+${PYSITELIB}/salt/modules/grub_legacy.pyc
+${PYSITELIB}/salt/modules/grub_legacy.pyo
+${PYSITELIB}/salt/modules/guestfs.py
+${PYSITELIB}/salt/modules/guestfs.pyc
+${PYSITELIB}/salt/modules/guestfs.pyo
 ${PYSITELIB}/salt/modules/hg.py
 ${PYSITELIB}/salt/modules/hg.pyc
 ${PYSITELIB}/salt/modules/hg.pyo
 ${PYSITELIB}/salt/modules/hosts.py
 ${PYSITELIB}/salt/modules/hosts.pyc
 ${PYSITELIB}/salt/modules/hosts.pyo
+${PYSITELIB}/salt/modules/img.py
+${PYSITELIB}/salt/modules/img.pyc
+${PYSITELIB}/salt/modules/img.pyo
+${PYSITELIB}/salt/modules/iptables.py
+${PYSITELIB}/salt/modules/iptables.pyc
+${PYSITELIB}/salt/modules/iptables.pyo
+${PYSITELIB}/salt/modules/key.py
+${PYSITELIB}/salt/modules/key.pyc
+${PYSITELIB}/salt/modules/key.pyo
+${PYSITELIB}/salt/modules/keyboard.py
+${PYSITELIB}/salt/modules/keyboard.pyc
+${PYSITELIB}/salt/modules/keyboard.pyo
 ${PYSITELIB}/salt/modules/keystone.py
 ${PYSITELIB}/salt/modules/keystone.pyc
 ${PYSITELIB}/salt/modules/keystone.pyo
@@ -201,12 +257,33 @@ ${PYSITELIB}/salt/modules/kvm_hyper.pyo
 ${PYSITELIB}/salt/modules/launchctl.py
 ${PYSITELIB}/salt/modules/launchctl.pyc
 ${PYSITELIB}/salt/modules/launchctl.pyo
+${PYSITELIB}/salt/modules/layman.py
+${PYSITELIB}/salt/modules/layman.pyc
+${PYSITELIB}/salt/modules/layman.pyo
 ${PYSITELIB}/salt/modules/ldapmod.py
 ${PYSITELIB}/salt/modules/ldapmod.pyc
 ${PYSITELIB}/salt/modules/ldapmod.pyo
+${PYSITELIB}/salt/modules/linux_acl.py
+${PYSITELIB}/salt/modules/linux_acl.pyc
+${PYSITELIB}/salt/modules/linux_acl.pyo
+${PYSITELIB}/salt/modules/linux_lvm.py
+${PYSITELIB}/salt/modules/linux_lvm.pyc
+${PYSITELIB}/salt/modules/linux_lvm.pyo
 ${PYSITELIB}/salt/modules/linux_sysctl.py
 ${PYSITELIB}/salt/modules/linux_sysctl.pyc
 ${PYSITELIB}/salt/modules/linux_sysctl.pyo
+${PYSITELIB}/salt/modules/locale.py
+${PYSITELIB}/salt/modules/locale.pyc
+${PYSITELIB}/salt/modules/locale.pyo
+${PYSITELIB}/salt/modules/locate.py
+${PYSITELIB}/salt/modules/locate.pyc
+${PYSITELIB}/salt/modules/locate.pyo
+${PYSITELIB}/salt/modules/logrotate.py
+${PYSITELIB}/salt/modules/logrotate.pyc
+${PYSITELIB}/salt/modules/logrotate.pyo
+${PYSITELIB}/salt/modules/makeconf.py
+${PYSITELIB}/salt/modules/makeconf.pyc
+${PYSITELIB}/salt/modules/makeconf.pyo
 ${PYSITELIB}/salt/modules/mdadm.py
 ${PYSITELIB}/salt/modules/mdadm.pyc
 ${PYSITELIB}/salt/modules/mdadm.pyo
@@ -222,18 +299,27 @@ ${PYSITELIB}/salt/modules/moosefs.pyo
 ${PYSITELIB}/salt/modules/mount.py
 ${PYSITELIB}/salt/modules/mount.pyc
 ${PYSITELIB}/salt/modules/mount.pyo
+${PYSITELIB}/salt/modules/munin.py
+${PYSITELIB}/salt/modules/munin.pyc
+${PYSITELIB}/salt/modules/munin.pyo
 ${PYSITELIB}/salt/modules/mysql.py
 ${PYSITELIB}/salt/modules/mysql.pyc
 ${PYSITELIB}/salt/modules/mysql.pyo
 ${PYSITELIB}/salt/modules/network.py
 ${PYSITELIB}/salt/modules/network.pyc
 ${PYSITELIB}/salt/modules/network.pyo
+${PYSITELIB}/salt/modules/nfs3.py
+${PYSITELIB}/salt/modules/nfs3.pyc
+${PYSITELIB}/salt/modules/nfs3.pyo
 ${PYSITELIB}/salt/modules/nginx.py
 ${PYSITELIB}/salt/modules/nginx.pyc
 ${PYSITELIB}/salt/modules/nginx.pyo
 ${PYSITELIB}/salt/modules/nova.py
 ${PYSITELIB}/salt/modules/nova.pyc
 ${PYSITELIB}/salt/modules/nova.pyo
+${PYSITELIB}/salt/modules/npm.py
+${PYSITELIB}/salt/modules/npm.pyc
+${PYSITELIB}/salt/modules/npm.pyo
 ${PYSITELIB}/salt/modules/nzbget.py
 ${PYSITELIB}/salt/modules/nzbget.pyc
 ${PYSITELIB}/salt/modules/nzbget.pyo
@@ -249,6 +335,12 @@ ${PYSITELIB}/salt/modules/osxdesktop.pyo
 ${PYSITELIB}/salt/modules/pacman.py
 ${PYSITELIB}/salt/modules/pacman.pyc
 ${PYSITELIB}/salt/modules/pacman.pyo
+${PYSITELIB}/salt/modules/pam.py
+${PYSITELIB}/salt/modules/pam.pyc
+${PYSITELIB}/salt/modules/pam.pyo
+${PYSITELIB}/salt/modules/parted.py
+${PYSITELIB}/salt/modules/parted.pyc
+${PYSITELIB}/salt/modules/parted.pyo
 ${PYSITELIB}/salt/modules/pecl.py
 ${PYSITELIB}/salt/modules/pecl.pyc
 ${PYSITELIB}/salt/modules/pecl.pyo
@@ -258,6 +350,9 @@ ${PYSITELIB}/salt/modules/pillar.pyo
 ${PYSITELIB}/salt/modules/pip.py
 ${PYSITELIB}/salt/modules/pip.pyc
 ${PYSITELIB}/salt/modules/pip.pyo
+${PYSITELIB}/salt/modules/pkg_resource.py
+${PYSITELIB}/salt/modules/pkg_resource.pyc
+${PYSITELIB}/salt/modules/pkg_resource.pyo
 ${PYSITELIB}/salt/modules/pkgng.py
 ${PYSITELIB}/salt/modules/pkgng.pyc
 ${PYSITELIB}/salt/modules/pkgng.pyo
@@ -285,6 +380,15 @@ ${PYSITELIB}/salt/modules/pw_group.pyo
 ${PYSITELIB}/salt/modules/pw_user.py
 ${PYSITELIB}/salt/modules/pw_user.pyc
 ${PYSITELIB}/salt/modules/pw_user.pyo
+${PYSITELIB}/salt/modules/qemu_img.py
+${PYSITELIB}/salt/modules/qemu_img.pyc
+${PYSITELIB}/salt/modules/qemu_img.pyo
+${PYSITELIB}/salt/modules/qemu_nbd.py
+${PYSITELIB}/salt/modules/qemu_nbd.pyc
+${PYSITELIB}/salt/modules/qemu_nbd.pyo
+${PYSITELIB}/salt/modules/quota.py
+${PYSITELIB}/salt/modules/quota.pyc
+${PYSITELIB}/salt/modules/quota.pyo
 ${PYSITELIB}/salt/modules/rabbitmq.py
 ${PYSITELIB}/salt/modules/rabbitmq.pyc
 ${PYSITELIB}/salt/modules/rabbitmq.pyo
@@ -304,9 +408,15 @@ ${PYSITELIB}/salt/modules/rh_ip/rh6_eth.jinja
 ${PYSITELIB}/salt/modules/rh_service.py
 ${PYSITELIB}/salt/modules/rh_service.pyc
 ${PYSITELIB}/salt/modules/rh_service.pyo
+${PYSITELIB}/salt/modules/rpm.py
+${PYSITELIB}/salt/modules/rpm.pyc
+${PYSITELIB}/salt/modules/rpm.pyo
 ${PYSITELIB}/salt/modules/rvm.py
 ${PYSITELIB}/salt/modules/rvm.pyc
 ${PYSITELIB}/salt/modules/rvm.pyo
+${PYSITELIB}/salt/modules/s3.py
+${PYSITELIB}/salt/modules/s3.pyc
+${PYSITELIB}/salt/modules/s3.pyo
 ${PYSITELIB}/salt/modules/saltutil.py
 ${PYSITELIB}/salt/modules/saltutil.pyc
 ${PYSITELIB}/salt/modules/saltutil.pyo
@@ -355,12 +465,24 @@ ${PYSITELIB}/salt/modules/supervisord.pyo
 ${PYSITELIB}/salt/modules/svn.py
 ${PYSITELIB}/salt/modules/svn.pyc
 ${PYSITELIB}/salt/modules/svn.pyo
+${PYSITELIB}/salt/modules/sysbench.py
+${PYSITELIB}/salt/modules/sysbench.pyc
+${PYSITELIB}/salt/modules/sysbench.pyo
+${PYSITELIB}/salt/modules/sysmod.py
+${PYSITELIB}/salt/modules/sysmod.pyc
+${PYSITELIB}/salt/modules/sysmod.pyo
+${PYSITELIB}/salt/modules/system.py
+${PYSITELIB}/salt/modules/system.pyc
+${PYSITELIB}/salt/modules/system.pyo
 ${PYSITELIB}/salt/modules/systemd.py
 ${PYSITELIB}/salt/modules/systemd.pyc
 ${PYSITELIB}/salt/modules/systemd.pyo
 ${PYSITELIB}/salt/modules/test.py
 ${PYSITELIB}/salt/modules/test.pyc
 ${PYSITELIB}/salt/modules/test.pyo
+${PYSITELIB}/salt/modules/timezone.py
+${PYSITELIB}/salt/modules/timezone.pyc
+${PYSITELIB}/salt/modules/timezone.pyo
 ${PYSITELIB}/salt/modules/tls.py
 ${PYSITELIB}/salt/modules/tls.pyc
 ${PYSITELIB}/salt/modules/tls.pyo
@@ -400,6 +522,9 @@ ${PYSITELIB}/salt/modules/win_service.pyo
 ${PYSITELIB}/salt/modules/win_shadow.py
 ${PYSITELIB}/salt/modules/win_shadow.pyc
 ${PYSITELIB}/salt/modules/win_shadow.pyo
+${PYSITELIB}/salt/modules/win_status.py
+${PYSITELIB}/salt/modules/win_status.pyc
+${PYSITELIB}/salt/modules/win_status.pyo
 ${PYSITELIB}/salt/modules/win_useradd.py
 ${PYSITELIB}/salt/modules/win_useradd.pyc
 ${PYSITELIB}/salt/modules/win_useradd.pyo
@@ -418,6 +543,9 @@ ${PYSITELIB}/salt/modules/zypper.pyo
 ${PYSITELIB}/salt/output/__init__.py
 ${PYSITELIB}/salt/output/__init__.pyc
 ${PYSITELIB}/salt/output/__init__.pyo
+${PYSITELIB}/salt/output/grains.py
+${PYSITELIB}/salt/output/grains.pyc
+${PYSITELIB}/salt/output/grains.pyo
 ${PYSITELIB}/salt/output/highstate.py
 ${PYSITELIB}/salt/output/highstate.pyc
 ${PYSITELIB}/salt/output/highstate.pyo
@@ -427,6 +555,18 @@ ${PYSITELIB}/salt/output/json_out.pyo
 ${PYSITELIB}/salt/output/key.py
 ${PYSITELIB}/salt/output/key.pyc
 ${PYSITELIB}/salt/output/key.pyo
+${PYSITELIB}/salt/output/nested.py
+${PYSITELIB}/salt/output/nested.pyc
+${PYSITELIB}/salt/output/nested.pyo
+${PYSITELIB}/salt/output/no_out.py
+${PYSITELIB}/salt/output/no_out.pyc
+${PYSITELIB}/salt/output/no_out.pyo
+${PYSITELIB}/salt/output/no_return.py
+${PYSITELIB}/salt/output/no_return.pyc
+${PYSITELIB}/salt/output/no_return.pyo
+${PYSITELIB}/salt/output/overstatestage.py
+${PYSITELIB}/salt/output/overstatestage.pyc
+${PYSITELIB}/salt/output/overstatestage.pyo
 ${PYSITELIB}/salt/output/pprint_out.py
 ${PYSITELIB}/salt/output/pprint_out.pyc
 ${PYSITELIB}/salt/output/pprint_out.pyo
@@ -436,9 +576,15 @@ ${PYSITELIB}/salt/output/raw.pyo
 ${PYSITELIB}/salt/output/txt.py
 ${PYSITELIB}/salt/output/txt.pyc
 ${PYSITELIB}/salt/output/txt.pyo
+${PYSITELIB}/salt/output/virt_query.py
+${PYSITELIB}/salt/output/virt_query.pyc
+${PYSITELIB}/salt/output/virt_query.pyo
 ${PYSITELIB}/salt/output/yaml_out.py
 ${PYSITELIB}/salt/output/yaml_out.pyc
 ${PYSITELIB}/salt/output/yaml_out.pyo
+${PYSITELIB}/salt/overstate.py
+${PYSITELIB}/salt/overstate.pyc
+${PYSITELIB}/salt/overstate.pyo
 ${PYSITELIB}/salt/payload.py
 ${PYSITELIB}/salt/payload.pyc
 ${PYSITELIB}/salt/payload.pyo
@@ -451,15 +597,24 @@ ${PYSITELIB}/salt/pillar/cmd_json.pyo
 ${PYSITELIB}/salt/pillar/cmd_yaml.py
 ${PYSITELIB}/salt/pillar/cmd_yaml.pyc
 ${PYSITELIB}/salt/pillar/cmd_yaml.pyo
+${PYSITELIB}/salt/pillar/cobbler.py
+${PYSITELIB}/salt/pillar/cobbler.pyc
+${PYSITELIB}/salt/pillar/cobbler.pyo
 ${PYSITELIB}/salt/pillar/hiera.py
 ${PYSITELIB}/salt/pillar/hiera.pyc
 ${PYSITELIB}/salt/pillar/hiera.pyo
+${PYSITELIB}/salt/pillar/libvirt.py
+${PYSITELIB}/salt/pillar/libvirt.pyc
+${PYSITELIB}/salt/pillar/libvirt.pyo
 ${PYSITELIB}/salt/pillar/mongo.py
 ${PYSITELIB}/salt/pillar/mongo.pyc
 ${PYSITELIB}/salt/pillar/mongo.pyo
 ${PYSITELIB}/salt/pillar/pillar_ldap.py
 ${PYSITELIB}/salt/pillar/pillar_ldap.pyc
 ${PYSITELIB}/salt/pillar/pillar_ldap.pyo
+${PYSITELIB}/salt/pillar/puppet.py
+${PYSITELIB}/salt/pillar/puppet.pyc
+${PYSITELIB}/salt/pillar/puppet.pyo
 ${PYSITELIB}/salt/renderers/__init__.py
 ${PYSITELIB}/salt/renderers/__init__.pyc
 ${PYSITELIB}/salt/renderers/__init__.pyo
@@ -475,6 +630,9 @@ ${PYSITELIB}/salt/renderers/mako.pyo
 ${PYSITELIB}/salt/renderers/py.py
 ${PYSITELIB}/salt/renderers/py.pyc
 ${PYSITELIB}/salt/renderers/py.pyo
+${PYSITELIB}/salt/renderers/pydsl.py
+${PYSITELIB}/salt/renderers/pydsl.pyc
+${PYSITELIB}/salt/renderers/pydsl.pyo
 ${PYSITELIB}/salt/renderers/stateconf.py
 ${PYSITELIB}/salt/renderers/stateconf.pyc
 ${PYSITELIB}/salt/renderers/stateconf.pyo
@@ -487,6 +645,9 @@ ${PYSITELIB}/salt/renderers/yaml.pyo
 ${PYSITELIB}/salt/returners/__init__.py
 ${PYSITELIB}/salt/returners/__init__.pyc
 ${PYSITELIB}/salt/returners/__init__.pyo
+${PYSITELIB}/salt/returners/carbon_return.py
+${PYSITELIB}/salt/returners/carbon_return.pyc
+${PYSITELIB}/salt/returners/carbon_return.pyo
 ${PYSITELIB}/salt/returners/cassandra_return.py
 ${PYSITELIB}/salt/returners/cassandra_return.pyc
 ${PYSITELIB}/salt/returners/cassandra_return.pyo
@@ -499,9 +660,21 @@ ${PYSITELIB}/salt/returners/mongo_future_return.pyo
 ${PYSITELIB}/salt/returners/mongo_return.py
 ${PYSITELIB}/salt/returners/mongo_return.pyc
 ${PYSITELIB}/salt/returners/mongo_return.pyo
+${PYSITELIB}/salt/returners/mysql.py
+${PYSITELIB}/salt/returners/mysql.pyc
+${PYSITELIB}/salt/returners/mysql.pyo
+${PYSITELIB}/salt/returners/postgres.py
+${PYSITELIB}/salt/returners/postgres.pyc
+${PYSITELIB}/salt/returners/postgres.pyo
 ${PYSITELIB}/salt/returners/redis_return.py
 ${PYSITELIB}/salt/returners/redis_return.pyc
 ${PYSITELIB}/salt/returners/redis_return.pyo
+${PYSITELIB}/salt/returners/sentry_return.py
+${PYSITELIB}/salt/returners/sentry_return.pyc
+${PYSITELIB}/salt/returners/sentry_return.pyo
+${PYSITELIB}/salt/returners/smtp_return.py
+${PYSITELIB}/salt/returners/smtp_return.pyc
+${PYSITELIB}/salt/returners/smtp_return.pyo
 ${PYSITELIB}/salt/returners/syslog_return.py
 ${PYSITELIB}/salt/returners/syslog_return.pyc
 ${PYSITELIB}/salt/returners/syslog_return.pyo
@@ -511,6 +684,15 @@ ${PYSITELIB}/salt/runner.pyo
 ${PYSITELIB}/salt/runners/__init__.py
 ${PYSITELIB}/salt/runners/__init__.pyc
 ${PYSITELIB}/salt/runners/__init__.pyo
+${PYSITELIB}/salt/runners/cache.py
+${PYSITELIB}/salt/runners/cache.pyc
+${PYSITELIB}/salt/runners/cache.pyo
+${PYSITELIB}/salt/runners/doc.py
+${PYSITELIB}/salt/runners/doc.pyc
+${PYSITELIB}/salt/runners/doc.pyo
+${PYSITELIB}/salt/runners/fileserver.py
+${PYSITELIB}/salt/runners/fileserver.pyc
+${PYSITELIB}/salt/runners/fileserver.pyo
 ${PYSITELIB}/salt/runners/jobs.py
 ${PYSITELIB}/salt/runners/jobs.pyc
 ${PYSITELIB}/salt/runners/jobs.pyo
@@ -523,9 +705,27 @@ ${PYSITELIB}/salt/runners/manage.pyo
 ${PYSITELIB}/salt/runners/network.py
 ${PYSITELIB}/salt/runners/network.pyc
 ${PYSITELIB}/salt/runners/network.pyo
+${PYSITELIB}/salt/runners/search.py
+${PYSITELIB}/salt/runners/search.pyc
+${PYSITELIB}/salt/runners/search.pyo
+${PYSITELIB}/salt/runners/state.py
+${PYSITELIB}/salt/runners/state.pyc
+${PYSITELIB}/salt/runners/state.pyo
+${PYSITELIB}/salt/runners/virt.py
+${PYSITELIB}/salt/runners/virt.pyc
+${PYSITELIB}/salt/runners/virt.pyo
+${PYSITELIB}/salt/runners/winrepo.py
+${PYSITELIB}/salt/runners/winrepo.pyc
+${PYSITELIB}/salt/runners/winrepo.pyo
 ${PYSITELIB}/salt/scripts.py
 ${PYSITELIB}/salt/scripts.pyc
 ${PYSITELIB}/salt/scripts.pyo
+${PYSITELIB}/salt/search/__init__.py
+${PYSITELIB}/salt/search/__init__.pyc
+${PYSITELIB}/salt/search/__init__.pyo
+${PYSITELIB}/salt/search/whoosh_search.py
+${PYSITELIB}/salt/search/whoosh_search.pyc
+${PYSITELIB}/salt/search/whoosh_search.pyo
 ${PYSITELIB}/salt/state.py
 ${PYSITELIB}/salt/state.pyc
 ${PYSITELIB}/salt/state.pyo
@@ -535,12 +735,18 @@ ${PYSITELIB}/salt/states/__init__.pyo
 ${PYSITELIB}/salt/states/alias.py
 ${PYSITELIB}/salt/states/alias.pyc
 ${PYSITELIB}/salt/states/alias.pyo
+${PYSITELIB}/salt/states/alternatives.py
+${PYSITELIB}/salt/states/alternatives.pyc
+${PYSITELIB}/salt/states/alternatives.pyo
 ${PYSITELIB}/salt/states/cmd.py
 ${PYSITELIB}/salt/states/cmd.pyc
 ${PYSITELIB}/salt/states/cmd.pyo
 ${PYSITELIB}/salt/states/cron.py
 ${PYSITELIB}/salt/states/cron.pyc
 ${PYSITELIB}/salt/states/cron.pyo
+${PYSITELIB}/salt/states/debconfmod.py
+${PYSITELIB}/salt/states/debconfmod.pyc
+${PYSITELIB}/salt/states/debconfmod.pyo
 ${PYSITELIB}/salt/states/file.py
 ${PYSITELIB}/salt/states/file.pyc
 ${PYSITELIB}/salt/states/file.pyo
@@ -550,6 +756,9 @@ ${PYSITELIB}/salt/states/gem.pyo
 ${PYSITELIB}/salt/states/git.py
 ${PYSITELIB}/salt/states/git.pyc
 ${PYSITELIB}/salt/states/git.pyo
+${PYSITELIB}/salt/states/grains.py
+${PYSITELIB}/salt/states/grains.pyc
+${PYSITELIB}/salt/states/grains.pyo
 ${PYSITELIB}/salt/states/group.py
 ${PYSITELIB}/salt/states/group.pyc
 ${PYSITELIB}/salt/states/group.pyo
@@ -559,9 +768,24 @@ ${PYSITELIB}/salt/states/hg.pyo
 ${PYSITELIB}/salt/states/host.py
 ${PYSITELIB}/salt/states/host.pyc
 ${PYSITELIB}/salt/states/host.pyo
+${PYSITELIB}/salt/states/keyboard.py
+${PYSITELIB}/salt/states/keyboard.pyc
+${PYSITELIB}/salt/states/keyboard.pyo
 ${PYSITELIB}/salt/states/kmod.py
 ${PYSITELIB}/salt/states/kmod.pyc
 ${PYSITELIB}/salt/states/kmod.pyo
+${PYSITELIB}/salt/states/layman.py
+${PYSITELIB}/salt/states/layman.pyc
+${PYSITELIB}/salt/states/layman.pyo
+${PYSITELIB}/salt/states/libvirt.py
+${PYSITELIB}/salt/states/libvirt.pyc
+${PYSITELIB}/salt/states/libvirt.pyo
+${PYSITELIB}/salt/states/locale.py
+${PYSITELIB}/salt/states/locale.pyc
+${PYSITELIB}/salt/states/locale.pyo
+${PYSITELIB}/salt/states/makeconf.py
+${PYSITELIB}/salt/states/makeconf.pyc
+${PYSITELIB}/salt/states/makeconf.pyo
 ${PYSITELIB}/salt/states/module.py
 ${PYSITELIB}/salt/states/module.pyc
 ${PYSITELIB}/salt/states/module.pyo
@@ -586,6 +810,9 @@ ${PYSITELIB}/salt/states/mysql_user.pyo
 ${PYSITELIB}/salt/states/network.py
 ${PYSITELIB}/salt/states/network.pyc
 ${PYSITELIB}/salt/states/network.pyo
+${PYSITELIB}/salt/states/npm.py
+${PYSITELIB}/salt/states/npm.pyc
+${PYSITELIB}/salt/states/npm.pyo
 ${PYSITELIB}/salt/states/pecl.py
 ${PYSITELIB}/salt/states/pecl.pyc
 ${PYSITELIB}/salt/states/pecl.pyo
@@ -598,9 +825,15 @@ ${PYSITELIB}/salt/states/pkg.pyo
 ${PYSITELIB}/salt/states/pkgng.py
 ${PYSITELIB}/salt/states/pkgng.pyc
 ${PYSITELIB}/salt/states/pkgng.pyo
+${PYSITELIB}/salt/states/pkgrepo.py
+${PYSITELIB}/salt/states/pkgrepo.pyc
+${PYSITELIB}/salt/states/pkgrepo.pyo
 ${PYSITELIB}/salt/states/postgres_database.py
 ${PYSITELIB}/salt/states/postgres_database.pyc
 ${PYSITELIB}/salt/states/postgres_database.pyo
+${PYSITELIB}/salt/states/postgres_group.py
+${PYSITELIB}/salt/states/postgres_group.pyc
+${PYSITELIB}/salt/states/postgres_group.pyo
 ${PYSITELIB}/salt/states/postgres_user.py
 ${PYSITELIB}/salt/states/postgres_user.pyc
 ${PYSITELIB}/salt/states/postgres_user.pyo
@@ -637,6 +870,12 @@ ${PYSITELIB}/salt/states/svn.pyo
 ${PYSITELIB}/salt/states/sysctl.py
 ${PYSITELIB}/salt/states/sysctl.pyc
 ${PYSITELIB}/salt/states/sysctl.pyo
+${PYSITELIB}/salt/states/timezone.py
+${PYSITELIB}/salt/states/timezone.pyc
+${PYSITELIB}/salt/states/timezone.pyo
+${PYSITELIB}/salt/states/tomcat.py
+${PYSITELIB}/salt/states/tomcat.pyc
+${PYSITELIB}/salt/states/tomcat.pyo
 ${PYSITELIB}/salt/states/user.py
 ${PYSITELIB}/salt/states/user.pyc
 ${PYSITELIB}/salt/states/user.pyo
@@ -649,9 +888,15 @@ ${PYSITELIB}/salt/template.pyo
 ${PYSITELIB}/salt/tops/__init__.py
 ${PYSITELIB}/salt/tops/__init__.pyc
 ${PYSITELIB}/salt/tops/__init__.pyo
+${PYSITELIB}/salt/tops/cobbler.py
+${PYSITELIB}/salt/tops/cobbler.pyc
+${PYSITELIB}/salt/tops/cobbler.pyo
 ${PYSITELIB}/salt/tops/ext_nodes.py
 ${PYSITELIB}/salt/tops/ext_nodes.pyc
 ${PYSITELIB}/salt/tops/ext_nodes.pyo
+${PYSITELIB}/salt/tops/mongo.py
+${PYSITELIB}/salt/tops/mongo.pyc
+${PYSITELIB}/salt/tops/mongo.pyo
 ${PYSITELIB}/salt/utils/__init__.py
 ${PYSITELIB}/salt/utils/__init__.pyc
 ${PYSITELIB}/salt/utils/__init__.pyo
@@ -682,6 +927,9 @@ ${PYSITELIB}/salt/utils/jinja.pyo
 ${PYSITELIB}/salt/utils/mako.py
 ${PYSITELIB}/salt/utils/mako.pyc
 ${PYSITELIB}/salt/utils/mako.pyo
+${PYSITELIB}/salt/utils/migrations.py
+${PYSITELIB}/salt/utils/migrations.pyc
+${PYSITELIB}/salt/utils/migrations.pyo
 ${PYSITELIB}/salt/utils/minions.py
 ${PYSITELIB}/salt/utils/minions.pyc
 ${PYSITELIB}/salt/utils/minions.pyo
@@ -691,9 +939,18 @@ ${PYSITELIB}/salt/utils/parsers.pyo
 ${PYSITELIB}/salt/utils/process.py
 ${PYSITELIB}/salt/utils/process.pyc
 ${PYSITELIB}/salt/utils/process.pyo
+${PYSITELIB}/salt/utils/pydsl.py
+${PYSITELIB}/salt/utils/pydsl.pyc
+${PYSITELIB}/salt/utils/pydsl.pyo
+${PYSITELIB}/salt/utils/s3.py
+${PYSITELIB}/salt/utils/s3.pyc
+${PYSITELIB}/salt/utils/s3.pyo
 ${PYSITELIB}/salt/utils/saltminionservice.py
 ${PYSITELIB}/salt/utils/saltminionservice.pyc
 ${PYSITELIB}/salt/utils/saltminionservice.pyo
+${PYSITELIB}/salt/utils/schedule.py
+${PYSITELIB}/salt/utils/schedule.pyc
+${PYSITELIB}/salt/utils/schedule.pyo
 ${PYSITELIB}/salt/utils/socket_util.py
 ${PYSITELIB}/salt/utils/socket_util.pyc
 ${PYSITELIB}/salt/utils/socket_util.pyo
@@ -703,12 +960,18 @@ ${PYSITELIB}/salt/utils/templates.pyo
 ${PYSITELIB}/salt/utils/verify.py
 ${PYSITELIB}/salt/utils/verify.pyc
 ${PYSITELIB}/salt/utils/verify.pyo
+${PYSITELIB}/salt/utils/winapi.py
+${PYSITELIB}/salt/utils/winapi.pyc
+${PYSITELIB}/salt/utils/winapi.pyo
 ${PYSITELIB}/salt/utils/winservice.py
 ${PYSITELIB}/salt/utils/winservice.pyc
 ${PYSITELIB}/salt/utils/winservice.pyo
-${PYSITELIB}/salt/utils/yaml.py
-${PYSITELIB}/salt/utils/yaml.pyc
-${PYSITELIB}/salt/utils/yaml.pyo
+${PYSITELIB}/salt/utils/xmlutil.py
+${PYSITELIB}/salt/utils/xmlutil.pyc
+${PYSITELIB}/salt/utils/xmlutil.pyo
+${PYSITELIB}/salt/utils/yamlloader.py
+${PYSITELIB}/salt/utils/yamlloader.pyc
+${PYSITELIB}/salt/utils/yamlloader.pyo
 ${PYSITELIB}/salt/version.py
 ${PYSITELIB}/salt/version.pyc
 ${PYSITELIB}/salt/version.pyo
@@ -727,24 +990,16 @@ ${PYSITELIB}/salt/wheel/key.pyo
 ${PYSITELIB}/salt/wheel/pillar_roots.py
 ${PYSITELIB}/salt/wheel/pillar_roots.pyc
 ${PYSITELIB}/salt/wheel/pillar_roots.pyo
-bin/salt
-bin/salt-call
-bin/salt-cp
-bin/salt-key
-bin/salt-master
-bin/salt-minion
-bin/salt-run
-bin/salt-syndic
+man/man1/salt-call.1
+man/man1/salt-cp.1
+man/man1/salt-key.1
+man/man1/salt-master.1
+man/man1/salt-minion.1
+man/man1/salt-run.1
+man/man1/salt-syndic.1
+man/man1/salt.1
+man/man7/salt.7
 share/examples/rc.d/salt_master
 share/examples/rc.d/salt_minion
-share/examples/salt/master.template
-share/examples/salt/minion.template
-${PKGMANDIR}/man1/salt-call.1
-${PKGMANDIR}/man1/salt-cp.1
-${PKGMANDIR}/man1/salt-key.1
-${PKGMANDIR}/man1/salt-master.1
-${PKGMANDIR}/man1/salt-minion.1
-${PKGMANDIR}/man1/salt-run.1
-${PKGMANDIR}/man1/salt-syndic.1
-${PKGMANDIR}/man1/salt.1
-${PKGMANDIR}/man7/salt.7
+share/examples/salt/master
+share/examples/salt/minion
diff --git a/sysutils/salt/distinfo b/sysutils/salt/distinfo
index a95b993a02e..cd5cb86347c 100644
--- a/sysutils/salt/distinfo
+++ b/sysutils/salt/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1 2012/01/21 20:26:58 apb Exp $
+$NetBSD: distinfo,v 1.2 2012/12/06 08:01:21 apb Exp $
 
-SHA1 (salt-0.10.5.tar.gz) = 42796c7299e0000c250af2b3164fa77ef4f5e460
-RMD160 (salt-0.10.5.tar.gz) = a5de72481b458a2eb909a249e52e2edc354c2a61
-Size (salt-0.10.5.tar.gz) = 793582 bytes
-SHA1 (patch-setup.py) = b9b6c9ef19ad72caa65c1439ae73d40832f35977
+SHA1 (salt-0.14.1.tar.gz) = 3fe6bfd0a97a7f9bc5e9297f4fdf1b566ad4ae97
+RMD160 (salt-0.14.1.tar.gz) = b68985fff2d12f97cc3640ac4299c36ea3c5d5df
+Size (salt-0.14.1.tar.gz) = 3366334 bytes
+SHA1 (patch-setup.py) = 15907268df5ee1d06e1c932dc84fd7701156519d
diff --git a/sysutils/salt/patches/patch-setup.py b/sysutils/salt/patches/patch-setup.py
index 8f59480d9c7..114f26e88f1 100644
--- a/sysutils/salt/patches/patch-setup.py
+++ b/sysutils/salt/patches/patch-setup.py
@@ -1,4 +1,4 @@
-$NetBSD: patch-setup.py,v 1.1 2012/01/21 20:26:58 apb Exp $
+$NetBSD$
 
 * Remove unused example_path and template_path;
 * Set etc_path to the directory where configfiles will be
@@ -7,9 +7,9 @@ $NetBSD: patch-setup.py,v 1.1 2012/01/21 20:26:58 apb Exp $
   via the CONFIG_FILES setting in the pkgsrc Makefile.
 * Install man pages in PKGMANDIR, not PREFIX/share/man.
 
---- setup.py.orig	2012-11-15 01:20:54.000000000 +0000
+--- setup.py.orig	2013-03-29 00:06:49.000000000 +0000
 +++ setup.py
-@@ -87,13 +87,15 @@ DESC = ('Portable, distributed, remote e
+@@ -151,13 +151,15 @@ DESC = ('Portable, distributed, remote e
          'configuration management system')
  mod_path = os.path.join(get_python_lib(), 'salt/modules')
  doc_path = os.path.join(PREFIX, 'share/doc', NAME + '-' + VER)
@@ -28,9 +28,9 @@ $NetBSD: patch-setup.py,v 1.1 2012/01/21 20:26:58 apb Exp $
 -    etc_path = os.path.join(os.path.dirname(PREFIX), 'etc')
 +    man_path = os.path.join(os.path.dirname(PREFIX), 'share/man')
  
- libraries = ['ws2_32'] if sys.platform == 'win32' else []
- 
-@@ -141,7 +143,7 @@ setup_kwargs = {'name': NAME,
+ with open(salt_reqs) as f:
+     lines = f.read().split('\n')
+@@ -210,7 +212,7 @@ setup_kwargs = {'name': NAME,
                               'salt.utils',
                               ],
                  'package_data': {'salt.modules': ['rh_ip/*.jinja']},
@@ -39,7 +39,7 @@ $NetBSD: patch-setup.py,v 1.1 2012/01/21 20:26:58 apb Exp $
                                  ['doc/man/salt-master.1',
                                   'doc/man/salt-key.1',
                                   'doc/man/salt.1',
-@@ -151,7 +153,8 @@ setup_kwargs = {'name': NAME,
+@@ -220,7 +222,8 @@ setup_kwargs = {'name': NAME,
                                   'doc/man/salt-run.1',
                                   'doc/man/salt-minion.1',
                                   ]),
@@ -47,5 +47,5 @@ $NetBSD: patch-setup.py,v 1.1 2012/01/21 20:26:58 apb Exp $
 +                               (os.path.join(man_path, 'man7'),
 +                                ['doc/man/salt.7']),
                                 ],
+                 # Required for esky builds
                  'install_requires': requirements,
-                 # The dynamic module loading in salt.modules makes this
diff --git a/x11/kactivities/Makefile b/x11/kactivities/Makefile
index f43a8f2a1c0..c40610f76f0 100644
--- a/x11/kactivities/Makefile
+++ b/x11/kactivities/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:19:53 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:51:45 markd Exp $
 
 DISTNAME=	kactivities-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	KDE Activity Manager
 
@@ -8,6 +9,11 @@ COMMENT=	KDE Activity Manager
 
 PKGCONFIG_OVERRIDE+=	lib/libkactivities.pc.cmake
 
+INSTALLATION_DIRS= share/kde/config
+
+post-install:
+	${INSTALL_DATA} ${FILESDIR}/activitymanagerrc ${DESTDIR}${PREFIX}/share/kde/config
+
 .include "../../meta-pkgs/kde4/kde4.mk"
 .include "../../misc/nepomuk-core/buildlink3.mk"
 .include "../../x11/kdelibs4/buildlink3.mk"
diff --git a/x11/kactivities/PLIST b/x11/kactivities/PLIST
index a22e88e24af..18bc3e81e56 100644
--- a/x11/kactivities/PLIST
+++ b/x11/kactivities/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD$
+@comment $NetBSD: PLIST,v 1.3 2013/04/03 10:51:45 markd Exp $
 bin/kactivitymanagerd
 include/KDE/KActivities/Consumer
 include/KDE/KActivities/Controller
@@ -49,6 +49,7 @@ share/kde/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents/ui/New
 share/kde/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents/ui/PasswordDialog.qml
 share/kde/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents/ui/uihandler.qml
 share/kde/apps/plasma/packages/org.kde.ActivityManager.UiHandler/metadata.desktop
+share/kde/config/activitymanagerrc
 share/kde4/services/activities.protocol
 share/kde4/services/activitymanager-plugin-activityranking.desktop
 share/kde4/services/activitymanager-plugin-globalshortcuts.desktop
diff --git a/x11/kactivities/files/activitymanagerrc b/x11/kactivities/files/activitymanagerrc
new file mode 100644
index 00000000000..feb9ba29886
--- /dev/null
+++ b/x11/kactivities/files/activitymanagerrc
@@ -0,0 +1,2 @@
+[Plugins]
+org.kde.kactivitymanager.activityrankingEnabled=false
diff --git a/x11/kde-runtime4/Makefile b/x11/kde-runtime4/Makefile
index e68a45b6746..65ac98a9c50 100644
--- a/x11/kde-runtime4/Makefile
+++ b/x11/kde-runtime4/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2013/04/03 10:51:49 markd Exp $
+# $NetBSD: Makefile,v 1.20 2013/04/13 23:05:36 markd Exp $
 
 DISTNAME=	kde-runtime-${_KDE_VERSION}
 PKGNAME=	${DISTNAME:S/-4/4-4/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 COMMENT=	Runtime requirements for the KDE integrated X11 desktop
 
@@ -19,6 +19,7 @@ DEPENDS+=	oxygen-icons-[0-9]*:../../graphics/oxygen-icons
 
 USE_TOOLS+=		gmake
 
+.include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
 # Some files are conditional on 'md5sum' or 'md5' being present.
diff --git a/x11/kde-runtime4/options.mk b/x11/kde-runtime4/options.mk
index 7101058968d..a1f8ee15a83 100644
--- a/x11/kde-runtime4/options.mk
+++ b/x11/kde-runtime4/options.mk
@@ -1,8 +1,12 @@
-# $NetBSD: options.mk,v 1.1 2012/03/19 19:44:03 markd Exp $
+# $NetBSD: options.mk,v 1.2 2012/03/25 20:11:28 markd Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.kde-runtime4
 PKG_SUPPORTED_OPTIONS=	samba alsa
-PKG_SUGGESTED_OPTIONS=	samba alsa
+PKG_SUGGESTED_OPTIONS=	samba
+
+.if ${OPSYS} == "Linux"
+PKG_SUGGESTED_OPTIONS+= alsa
+.endif
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/x11/xvkbd/Makefile b/x11/xvkbd/Makefile
index ae7daa1f261..8c7a07fa709 100644
--- a/x11/xvkbd/Makefile
+++ b/x11/xvkbd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2012/08/11 12:00:57 ryoon Exp $
+# $NetBSD: Makefile,v 1.6 2012/10/29 05:07:24 asau Exp $
 #
 
-DISTNAME=	xvkbd-3.3
+DISTNAME=	xvkbd-3.4a
 CATEGORIES=	x11
 MASTER_SITES=	http://homepage3.nifty.com/tsato/xvkbd/
 
diff --git a/x11/xvkbd/distinfo b/x11/xvkbd/distinfo
index b4c52c2268a..90445680289 100644
--- a/x11/xvkbd/distinfo
+++ b/x11/xvkbd/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/09/08 11:57:36 obache Exp $
+$NetBSD: distinfo,v 1.2 2012/08/11 12:00:57 ryoon Exp $
 
-SHA1 (xvkbd-3.3.tar.gz) = 967b7d2f3e70a4a588fa5b10073d4e9c79c11ce5
-RMD160 (xvkbd-3.3.tar.gz) = 05aa598da3cde93109d62891b9a68719e0ccaa7c
-Size (xvkbd-3.3.tar.gz) = 79576 bytes
+SHA1 (xvkbd-3.4a.tar.gz) = 22806d2eb3f564a57037fd4363552817798b6d98
+RMD160 (xvkbd-3.4a.tar.gz) = a2a26aa1c6dbbe87b36cd597974fe5e050ea6dbc
+Size (xvkbd-3.4a.tar.gz) = 79694 bytes
-- 
2.11.4.GIT