From: Charlie <root@crater.dragonflybsd.org>
Date: Fri, 28 May 2010 13:59:03 +0000 (-0700)
Subject: update Fri May 28 06:37:01 PDT 2010
X-Git-Url: https://gitweb.dragonflybsd.org/pkgsrc.git/commitdiff_plain/20643c30fde4817c99f4c2753edb923b75066d53

update Fri May 28 06:37:01 PDT 2010
---

diff --git a/databases/ruby-ldap/Makefile b/databases/ruby-ldap/Makefile
index 0ac4f4cf6c9c..3323dd98cb82 100644
--- a/databases/ruby-ldap/Makefile
+++ b/databases/ruby-ldap/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2010/05/17 01:11:14 obache Exp $
+# $NetBSD: Makefile,v 1.5 2010/05/28 08:25:07 obache Exp $
 
 DISTNAME=	ruby-ldap-${VER}
 PKGNAME=	${RUBY_PKGPREFIX}-ldap-${VER}
 CATEGORIES=	databases ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/68853/
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	-http://github.com/alexey-chebotar/ruby-ldap/tarball/${VER}
 
 MAINTAINER=	obache@NetBSD.org
 HOMEPAGE=	http://rubyforge.org/projects/ruby-ldap/
@@ -13,12 +12,13 @@ LICENSE=	modified-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-VER=		0.9.10
+VER=		0.9.11
 
 REPLACE_RUBY_DIRS=	example/pr_ctl example/cgi/search.cgi
 RUBY_HAS_ARCHLIB=	yes
 USE_RUBY_EXTCONF=	yes
 USE_TOOLS+=		pax
+WRKSRC=			${WRKDIR}/alexey-chebotar-ruby-ldap-8541b7b
 
 CONFIGURE_ARGS+=	--with-openldap2
 CONFIGURE_ARGS+=	--with-ldap-dir=${BUILDLINK_PREFIX.openldap-client}
@@ -34,5 +34,6 @@ post-install:
 	cd ${WRKSRC}/example && pax -rw -pp * ${DESTDIR}${RUBY_EXAMPLESDIR}/ldap
 
 .include "../../databases/openldap-client/buildlink3.mk"
+.include "../../security/cyrus-sasl/buildlink3.mk"
 .include "../../lang/ruby/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/ruby-ldap/distinfo b/databases/ruby-ldap/distinfo
index 4b611ecc8fd9..58e2c86fd77d 100644
--- a/databases/ruby-ldap/distinfo
+++ b/databases/ruby-ldap/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2010/05/17 01:11:14 obache Exp $
+$NetBSD: distinfo,v 1.4 2010/05/28 08:25:07 obache Exp $
 
-SHA1 (ruby-ldap-0.9.10.tar.bz2) = 01a309f64880e28419903bba00a5cf2aadbefe3b
-RMD160 (ruby-ldap-0.9.10.tar.bz2) = 4bca16f5e1d0e95f38f8637bd1c1bcacba6ce2a2
-Size (ruby-ldap-0.9.10.tar.bz2) = 55287 bytes
+SHA1 (ruby-ldap-0.9.11.tar.gz) = bccfec885a86a7da9b73c3a501dc77e355c2aa2e
+RMD160 (ruby-ldap-0.9.11.tar.gz) = d3faab093d15aedfdaf02832033f7ec9bb35a7f6
+Size (ruby-ldap-0.9.11.tar.gz) = 66621 bytes
diff --git a/devel/p5-Curses-UI-POE/Makefile b/devel/p5-Curses-UI-POE/Makefile
index fc5a360a01e7..1a8f500617f8 100644
--- a/devel/p5-Curses-UI-POE/Makefile
+++ b/devel/p5-Curses-UI-POE/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2009/05/12 12:51:07 martti Exp $
+# $NetBSD: Makefile,v 1.9 2010/05/28 10:07:38 martti Exp $
 
-DISTNAME=	Curses-UI-POE-0.031
-PKGNAME=	p5-Curses-UI-POE-0.03100
-PKGREVISION=	1
+DISTNAME=	Curses-UI-POE-0.035
+PKGNAME=	p5-Curses-UI-POE-0.03500
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Curses/}
 
diff --git a/devel/p5-Curses-UI-POE/distinfo b/devel/p5-Curses-UI-POE/distinfo
index 79e7ac5ae874..97185ddcf7c9 100644
--- a/devel/p5-Curses-UI-POE/distinfo
+++ b/devel/p5-Curses-UI-POE/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2008/08/12 09:41:17 martti Exp $
+$NetBSD: distinfo,v 1.3 2010/05/28 10:07:38 martti Exp $
 
-SHA1 (Curses-UI-POE-0.031.tar.gz) = 3bf387c149e6cbb87e27017df9fae8cda529edce
-RMD160 (Curses-UI-POE-0.031.tar.gz) = c4f19915b1041ccda65a481555bec6936d8b7105
-Size (Curses-UI-POE-0.031.tar.gz) = 21932 bytes
+SHA1 (Curses-UI-POE-0.035.tar.gz) = 24fe20cf60974ad5cdf71f56bd64f306d2d1ce35
+RMD160 (Curses-UI-POE-0.035.tar.gz) = 13c1b20e13abffde16735e2078c1c070c50309ff
+Size (Curses-UI-POE-0.035.tar.gz) = 22411 bytes
diff --git a/doc/CHANGES-2010 b/doc/CHANGES-2010
index 3bc2eab2f3d0..4a2762f59489 100644
--- a/doc/CHANGES-2010
+++ b/doc/CHANGES-2010
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2010,v 1.2051 2010/05/28 07:27:12 obache Exp $
+$NetBSD: CHANGES-2010,v 1.2058 2010/05/28 13:25:57 tsutsui Exp $
 
 Changes to the packages collection and infrastructure in 2010:
 
@@ -2695,3 +2695,12 @@ Changes to the packages collection and infrastructure in 2010:
 	Updated databases/ruby-odbc to 0.99991 [taca 2010-05-27]
 	Updated net/bftpd to 2.8 [obache 2010-05-27]
 	Updated mail/enma to 1.1.0nb2 [obache 2010-05-28]
+	Updated mail/milter-manager to 1.4.2nb1 [obache 2010-05-28]
+	Updated www/mediawiki to 1.15.4 [martti 2010-05-28]
+	Updated databases/ruby-ldap to 0.9.11 [obache 2010-05-28]
+	Updated inputmethod/scim-tomoe to 0.6.0nb1 [obache 2010-05-28]
+	Updated wm/fvwm-devel to 2.5.30 [martti 2010-05-28]
+	Updated devel/p5-Curses-UI-POE to 0.03500 [martti 2010-05-28]
+	Updated net/p5-POE-Component-SNMP to 1.1006 [martti 2010-05-28]
+	Updated www/p5-URI-Escape-XS to 0.07 [martti 2010-05-28]
+	Updated emulators/simh to V3.8-1 [tsutsui 2010-05-28]
diff --git a/doc/TODO b/doc/TODO
index 166f9ee0fc9e..80f6637cb247 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.9326 2010/05/27 14:14:55 obache Exp $
+$NetBSD: TODO,v 1.9327 2010/05/28 10:08:21 martti Exp $
 
 Suggested new packages
 ======================
@@ -1066,7 +1066,6 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
 	o p5-Mouse-0.59
 	o p5-POE-1.289 [pkg/43115]
 	o p5-POE-Component-IRC-6.24 [pkg/42801]
-	o p5-POE-Component-SNMP-1.1006 [pkg/43116]
 	o p5-POE-Filter-IRCD-2.42 [pkg/42800]
 	o p5-POE-Test-Loops-1.035 [pkg/43114]
 	o p5-PerlMagick-6.6.2.0
diff --git a/emulators/simh/Makefile b/emulators/simh/Makefile
index 87e09a87bbf5..fb0753ce904b 100644
--- a/emulators/simh/Makefile
+++ b/emulators/simh/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2009/08/25 11:57:45 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2010/05/28 13:21:26 tsutsui Exp $
 #
 
-DISTNAME=	simhv38-0
-PKGNAME=	simh-3.8.0
+DISTNAME=	simhv38-1
+PKGNAME=	simh-3.8.1
 CATEGORIES=	emulators
 MASTER_SITES=	http://simh.trailing-edge.com/sources/
 EXTRACT_SUFX=	.zip
@@ -14,6 +14,8 @@ COMMENT=	Bob Supnik's historical computer simulator
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+USE_TOOLS+=	gmake
+
 BUILDLINK_API_DEPENDS.libpcap+=	libpcap>=0.6
 
 WRKSRC=			${WRKDIR}
@@ -27,6 +29,7 @@ BUILDLINK_TRANSFORM+=	rm:-O2
 INSTALLATION_DIRS=	bin share/simh share/doc/simh
 
 MAKE_FILE=		makefile
+MAKE_FLAGS+=		USE_NETWORK=YES
 
 post-extract:
 	${MKDIR} ${WRKSRC}/BIN
@@ -37,9 +40,7 @@ do-install:
 		${INSTALL_PROGRAM} $$BIN ${DESTDIR}${PREFIX}/bin/simh-$$BIN; \
 		fi ;							\
 	done)
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/simh
 	${INSTALL_DATA} ${WRKSRC}/VAX/ka655x.bin ${DESTDIR}${PREFIX}/share/simh
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/simh
 	(cd ${WRKSRC} && for TXT in *.txt */*.txt; do			\
 		${INSTALL_DATA} $$TXT ${DESTDIR}${PREFIX}/share/doc/simh;		\
 	done)
diff --git a/emulators/simh/distinfo b/emulators/simh/distinfo
index 9a42dfc4a0d6..617fe3ad1cac 100644
--- a/emulators/simh/distinfo
+++ b/emulators/simh/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.14 2008/11/20 21:30:05 chuck Exp $
+$NetBSD: distinfo,v 1.15 2010/05/28 13:21:26 tsutsui Exp $
 
-SHA1 (simhv38-0.zip) = e1afbebede7dc4b2e0f7b13fca3ee6aa8d34f9c1
-RMD160 (simhv38-0.zip) = f1986d45f9b17a905957d1dca4eaa70098a7cae6
-Size (simhv38-0.zip) = 2775593 bytes
-SHA1 (patch-aa) = 427aa8eca1f1ac17f9279708e666d066b24dde7e
+SHA1 (simhv38-1.zip) = 5eac2f8e50be11600727983e05072690a7066702
+RMD160 (simhv38-1.zip) = f085c52ec92425f84f65b3f3605cb7aba8be7b32
+Size (simhv38-1.zip) = 2954982 bytes
+SHA1 (patch-aa) = 88567baeed5af2d834b105935ea1c8706dab1133
 SHA1 (patch-ab) = 85b36e3d92a2bfbd886dbb2e08a0af967edeb0bd
-SHA1 (patch-ac) = 78ecdc9abe248eb8c9a1dc3c297a4a7e5eb812d6
-SHA1 (patch-ad) = 4ab9108d50bc89b41aea3efdf58cc95089137937
+SHA1 (patch-ac) = 16673f3bb5c42cdfd0497cd1f0657cbbe3bbecdb
diff --git a/emulators/simh/patches/patch-aa b/emulators/simh/patches/patch-aa
index 57e5fbc4b4b9..a2cc9899953d 100644
--- a/emulators/simh/patches/patch-aa
+++ b/emulators/simh/patches/patch-aa
@@ -1,83 +1,29 @@
-$NetBSD: patch-aa,v 1.8 2008/11/01 05:15:42 obache Exp $
+$NetBSD: patch-aa,v 1.9 2010/05/28 13:21:26 tsutsui Exp $
 
---- makefile.orig	2008-06-06 06:00:46.000000000 +0000
+--- makefile.orig	2008-11-19 12:53:48.000000000 +0000
 +++ makefile
-@@ -1,32 +1,36 @@
- #
- # CC Command
- #
--ifeq ($(WIN32),)
-+#ifeq ($(WIN32),)
+@@ -5,17 +5,17 @@
    #Unix Environments
--  ifneq (,$(findstring solaris,$(OSTYPE)))
--    OS_CCDEFS = -lm -lsocket -lnsl -lrt -lpthread -D_GNU_SOURCE
--  else
+   ifneq (,$(findstring solaris,$(OSTYPE)))
+     OS_CCDEFS = -lm -lsocket -lnsl -lrt -lpthread -D_GNU_SOURCE
++  else ifneq (,$(findstring darwin,$(OSTYPE)))
++    OS_CCDEFS = -D_GNU_SOURCE
++  else ifneq (,$(findstring linux,$(OSTYPE)))
++    OS_CCDEFS = -lrt -lm -D_GNU_SOURCE
+   else
 -    ifneq (,$(findstring darwin,$(OSTYPE)))
 -      OS_CCDEFS = -D_GNU_SOURCE
 -    else
 -      OS_CCDEFS = -lrt -lm -D_GNU_SOURCE
 -    endif
--  endif
++    OS_CCDEFS = -lm -D_GNU_SOURCE
+   endif
 -  CC = gcc -std=c99 -U__STRICT_ANSI__ -g $(OS_CCDEFS) -I .
--  ifeq ($(USE_NETWORK),)
--  else
++  CC = gcc -std=c99 -U__STRICT_ANSI__ -g -O2 $(OS_CCDEFS) -I .
+   ifeq ($(USE_NETWORK),)
+   else
 -    NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a
--  endif
--else
--  #Win32 Environments
--  LDFLAGS = -lm -lwsock32 -lwinmm
--  CC = gcc -std=c99 -U__STRICT_ANSI__ -O2 -I.
--  EXE = .exe
--  ifeq ($(USE_NETWORK),)
--  else
--    NETWORK_OPT = -DUSE_NETWORK -lwpcap -lpacket
--  endif
--endif
-+#  ifneq (,$(findstring solaris,$(OSTYPE)))
-+#    OS_CCDEFS = -lm -lsocket -lnsl -lrt -lpthread -D_GNU_SOURCE
-+#  else
-+#    ifneq (,$(findstring darwin,$(OSTYPE)))
-+#      OS_CCDEFS = -D_GNU_SOURCE
-+#    else
-+#      OS_CCDEFS = -lrt -lm -D_GNU_SOURCE
-+#    endif
-+#  endif
-+#  CC = gcc -std=c99 -U__STRICT_ANSI__ -g $(OS_CCDEFS) -I .
-+CC ?= gcc
-+CC := ${CC} -std=c99 -O2 -U__STRICT_ANSI__ -g -lm $(OS_CCDEFS) -I .
-+#
-+#  ifeq ($(USE_NETWORK),)
-+#  else
-+#    NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a
-+     NETWORK_OPT = -DUSE_NETWORK -lpcap
-+#  endif
-+#else
-+#  #Win32 Environments
-+#  LDFLAGS = -lm -lwsock32 -lwinmm
-+#  CC = gcc -std=c99 -U__STRICT_ANSI__ -O2 -I.
-+#  EXE = .exe
-+#  ifeq ($(USE_NETWORK),)
-+#  else
-+#    NETWORK_OPT = -DUSE_NETWORK -lwpcap -lpacket
-+#  endif
-+#endif
- 
- #
- # Common Libraries
-@@ -259,11 +263,11 @@ ALL = pdp1 pdp4 pdp7 pdp8 pdp9 pdp15 pdp
- all : ${ALL}
- 
- clean :
--ifeq ($(WIN32),)
--	${RM} ${BIN}*
--else
--	if exist BIN\*.exe del /q BIN\*.exe
--endif
-+#ifeq ($(WIN32),)
-+	rm ${BIN}*
-+#else
-+#	if exist BIN\*.exe del /q BIN\*.exe
-+#endif
- 
- #
- # Individual builds
++    NETWORK_OPT = -DUSE_NETWORK -lpcap
+   endif
+ else
+   #Win32 Environments
diff --git a/emulators/simh/patches/patch-ac b/emulators/simh/patches/patch-ac
index 99030ff7c69f..4b38c32ba979 100644
--- a/emulators/simh/patches/patch-ac
+++ b/emulators/simh/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.5 2008/11/01 05:15:42 obache Exp $
+$NetBSD: patch-ac,v 1.6 2010/05/28 13:21:26 tsutsui Exp $
 
---- sim_console.c.orig	2006-10-01 14:26:58.000000000 +0200
+--- sim_console.c.orig	2008-11-20 04:50:44.000000000 +0000
 +++ sim_console.c
-@@ -391,7 +391,7 @@ for (i = 0; i < sec; i++) {             
+@@ -429,7 +429,7 @@
      if (tmxr_poll_conn (&sim_con_tmxr) >= 0) {          /* poll connect */
          sim_con_ldsc.rcve = 1;                          /* rcv enabled */
          if (i) {                                        /* if delayed */
@@ -11,9 +11,9 @@ $NetBSD: patch-ac,v 1.5 2008/11/01 05:15:42 obache Exp $
              fflush (stdout);
              }
          return SCPE_OK;                                 /* ready to proceed */
-@@ -399,7 +399,7 @@ for (i = 0; i < sec; i++) {             
-     c = sim_os_poll_kbd ();                             /* check for stop char */
-     if ((c == SCPE_STOP) || stop_cpu) return SCPE_STOP;
+@@ -438,7 +438,7 @@
+     if ((c == SCPE_STOP) || stop_cpu)
+         return SCPE_STOP;
      if ((i % 10) == 0) {                                /* Status every 10 sec */
 -        printf ("Waiting for console Telnet connection\n");
 +        printf ("Waiting for console Telnet connection\r\n");
diff --git a/emulators/simh/patches/patch-ad b/emulators/simh/patches/patch-ad
deleted file mode 100644
index 6c09a775a99a..000000000000
--- a/emulators/simh/patches/patch-ad
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2008/11/20 21:30:05 chuck Exp $
-
---- sim_defs.h.orig	2008-11-20 15:36:35.000000000 -0500
-+++ sim_defs.h	2008-11-20 15:40:40.000000000 -0500
-@@ -164,7 +164,20 @@
- /* Inlining */
- 
- #if defined (__GNUC__)                                  /* GCC */
-+
-+#if defined(__APPLE_CC__) && (__APPLE_CC__ > 5400) && \
-+	(__APPLE_CC__ < 5488) && (__STDC_VERSION__ >= 199901L) && \
-+	!defined(__GNUC_STDC_INLINE__)
-+/* old versions of xcode (3.0) don't define this, and they should... */
-+#define __GNUC_STDC_INLINE__
-+#endif
-+
-+#ifdef __GNUC_STDC_INLINE__
-+#define SIM_INLINE extern inline
-+#else
- #define SIM_INLINE inline
-+#endif
-+
- #elif defined (_MSC_VER)                                /* Microsoft C Compilers */
- #define SIM_INLINE __inline
- #else                                                   /* default */
diff --git a/inputmethod/canna-canuum/Makefile b/inputmethod/canna-canuum/Makefile
index 3f6ab20c1c83..72113c9cac99 100644
--- a/inputmethod/canna-canuum/Makefile
+++ b/inputmethod/canna-canuum/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2010/02/20 10:37:24 obache Exp $
+# $NetBSD: Makefile,v 1.11 2010/05/28 11:06:34 obache Exp $
 
 PKGREVISION=	3
 CANNA_MODULE=	canuum
@@ -7,13 +7,15 @@ CANNA_MODULE=	canuum
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 
-PKG_DESTDIR_SUPPORT=	destdir
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 INSTALLATION_DIRS=	${PKGMANDIR}/ja_JP.EUC/man1
 
 CONFIGURE_DIRS=	. canuum
 BUILD_DIRS=	canuum
 
+INSTALL_MAKE_FLAGS+=	INSTUGIDFLAGS=
+
 SPECIAL_PERMS+=	bin/canuum ${SETUID_ROOT_PERMS}
 
 .include "../../inputmethod/canna-lib/buildlink3.mk"
diff --git a/inputmethod/canna-lib/Makefile b/inputmethod/canna-lib/Makefile
index 9e6377813030..9b2360339d32 100644
--- a/inputmethod/canna-lib/Makefile
+++ b/inputmethod/canna-lib/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2009/12/23 21:46:10 abs Exp $
+# $NetBSD: Makefile,v 1.12 2010/05/28 11:06:34 obache Exp $
 
 PKGREVISION=	2
 CANNA_MODULE=	lib
 
-PKG_DESTDIR_SUPPORT= destdir
+PKG_DESTDIR_SUPPORT= user-destdir
 
 .include "../../inputmethod/canna/Makefile.common"
 
@@ -24,17 +24,4 @@ post-patch:
 post-configure:
 	@${LN} -s ${WRKSRC}/server/*.h ${WRKSRC}/include
 
-.include "../../mk/bsd.prefs.mk"
-
-# XXX Work around bug in nbitools where the correct DragonFly library
-# XXX symlinks are not created.
-# XXX
-.if ${OPSYS} == "DragonFly"
-post-install:
-.  for f in RKC RKC16 canna canna16
-	${LN} -s lib${f}.so.1.1 ${PREFIX}/lib/lib${f}.so.1
-	${LN} -s lib${f}.so.1 ${PREFIX}/lib/lib${f}.so
-.  endfor
-.endif
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/canna/Makefile.common b/inputmethod/canna/Makefile.common
index 592761e04104..fe0604892412 100644
--- a/inputmethod/canna/Makefile.common
+++ b/inputmethod/canna/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2010/02/20 10:41:59 obache Exp $
+# $NetBSD: Makefile.common,v 1.21 2010/05/28 11:06:34 obache Exp $
 #
 # Canna common makefile.
 #
@@ -23,7 +23,6 @@ FILESDIR=	${.CURDIR}/../../inputmethod/canna/files
 DISTINFO_FILE=	${.CURDIR}/../../inputmethod/canna/distinfo
 PATCHDIR=	${.CURDIR}/../../inputmethod/canna/patches
 
-USE_TOOLS+=	itools
 USE_IMAKE=	yes
 CANNA_SPOOL=	${VARBASE}/spool/canna
 CANNA_MODE=	0755
@@ -40,3 +39,7 @@ MAKE_ENV+=	${CANNA_ENV}
 SCRIPTS_ENV+=	${CANNA_ENV}
 PLIST_SUBST+=	${CANNA_ENV}
 FILES_SUBST+=	${CANNA_ENV}
+
+INSTALL_MAKE_FLAGS+=	CHOWN=${TRUE}
+INSTALL_MAKE_FLAGS+=	CHGRP=${TRUE}
+INSTALL_MAKE_FLAGS+=	CHMOD=${TRUE}
diff --git a/inputmethod/kimera-tomoe-gtk/Makefile b/inputmethod/kimera-tomoe-gtk/Makefile
index 2a43da8c75b5..073527a7bee0 100644
--- a/inputmethod/kimera-tomoe-gtk/Makefile
+++ b/inputmethod/kimera-tomoe-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/05/20 07:48:09 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/05/28 08:34:29 obache Exp $
 #
 
 DISTNAME=	kimera-tomoe-gtk-0.5
@@ -17,7 +17,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		pkg-config
+USE_TOOLS+=		msgfmt pkg-config
 
 SUBST_CLASSES+=		libtomoe
 SUBST_STAGE.libtomoe=	pre-configure
diff --git a/inputmethod/scim-tomoe/Makefile b/inputmethod/scim-tomoe/Makefile
index 3f1807c578c7..1e2953417be0 100644
--- a/inputmethod/scim-tomoe/Makefile
+++ b/inputmethod/scim-tomoe/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/11/24 12:09:35 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/05/28 09:31:35 obache Exp $
 #
 
 DISTNAME=		scim-tomoe-0.6.0
+PKGREVISION=		1
 CATEGORIES=		inputmethod
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=tomoe/}
 
diff --git a/inputmethod/scim-tomoe/distinfo b/inputmethod/scim-tomoe/distinfo
index cae816c099d1..39bf607254aa 100644
--- a/inputmethod/scim-tomoe/distinfo
+++ b/inputmethod/scim-tomoe/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/11/24 12:09:35 obache Exp $
+$NetBSD: distinfo,v 1.2 2010/05/28 09:31:35 obache Exp $
 
 SHA1 (scim-tomoe-0.6.0.tar.gz) = 481ee2f8f9baa6105a349da36360aed06e432291
 RMD160 (scim-tomoe-0.6.0.tar.gz) = c95059e7f594192c97b082aa61818060391a8591
 Size (scim-tomoe-0.6.0.tar.gz) = 385126 bytes
 SHA1 (patch-aa) = 0554574908f37adae9d8771dcadce2e038c5857a
+SHA1 (patch-ab) = 1c598b251d218a9f1da7c089dd51780e97108d40
diff --git a/inputmethod/scim-tomoe/patches/patch-ab b/inputmethod/scim-tomoe/patches/patch-ab
new file mode 100644
index 000000000000..eca48c8ba590
--- /dev/null
+++ b/inputmethod/scim-tomoe/patches/patch-ab
@@ -0,0 +1,18 @@
+$NetBSD: patch-ab,v 1.1 2010/05/28 09:31:35 obache Exp $
+
+support gucharmap-2
+
+--- src/scim_tomoe_prefs_widget.cpp.orig	2007-05-07 07:49:15.000000000 +0000
++++ src/scim_tomoe_prefs_widget.cpp
+@@ -472,9 +472,9 @@ apply_config (ScimTomoePrefsWidget *pref
+         String (SCIM_TOMOE_CONFIG_UNICODE_TABLE_FONT_DEFAULT));
+ 
+     if (font.length() > 0) {
+-        gucharmap_charmap_set_font (charmap, font.c_str ());
++        gucharmap_charmap_set_font_desc (charmap, pango_font_description_from_string(font.c_str ()));
+     } else {
+-        gucharmap_charmap_set_font (charmap, NULL);
++        gucharmap_charmap_set_font_desc (charmap, pango_font_description_from_string(NULL));
+         set_default_font (prefs, SCIM_TOMOE_CONFIG_CAND_FONT,
+                           GTK_WIDGET (charmap));
+     }
diff --git a/mail/milter-manager/Makefile b/mail/milter-manager/Makefile
index e6f273204781..d9589ceba3bc 100644
--- a/mail/milter-manager/Makefile
+++ b/mail/milter-manager/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/04/09 12:40:23 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/05/28 07:40:22 obache Exp $
 #
 
 DISTNAME=	milter-manager-1.4.2
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=milter-manager/}
 
@@ -43,6 +44,9 @@ PKG_GECOS.${MILTER_MANAGER_USER}=	Milter Manager
 PKG_GROUPS_VARS+=	MILTER_MANAGER_GROUP MILTER_MANAGER_SOCKET_GROUP
 PKG_USERS_VARS=		MILTER_MANAGER_USER
 
+FILES_SUBST+=		MILTER_MANAGER_USER=${MILTER_MANAGER_USER:Q}
+FILES_SUBST+=		MILTER_MANAGER_GROUP=${MILTER_MANAGER_GROUP:Q}
+
 OWN_DIRS+=		${PKG_SYSCONFDIR}/applicable-conditions
 OWN_DIRS+=		${PKG_SYSCONFDIR}/defaults
 OWN_DIRS_PERMS+=	${VARBASE}/run/milter-manager \
diff --git a/mail/milter-manager/files/milter-manager.sh b/mail/milter-manager/files/milter-manager.sh
index ba2cf998ff4d..97d0bab005c2 100644
--- a/mail/milter-manager/files/milter-manager.sh
+++ b/mail/milter-manager/files/milter-manager.sh
@@ -1,6 +1,6 @@
 #! @RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: milter-manager.sh,v 1.2 2010/04/09 12:45:12 obache Exp $
+# $NetBSD: milter-manager.sh,v 1.3 2010/05/28 07:40:22 obache Exp $
 #
 
 # PROVIDE: milter-manager
@@ -17,5 +17,17 @@ pidfile="@VARBASE@/run/milter-manager/milter-manager.pid"
 command_args="--daemon"
 extra_command="reload"
 
+start_precmd="${name}_prestart"
+
+milter_manager_prestart()
+{
+	if [ ! -d @VARBASE@/run/milter-manager ]; then
+		@MKDIR@ @VARBASE@/run/milter-manager
+		@CHOWN@ @MILTER_MANAGER_USER@ @VARBASE@/run/milter-manager
+		@CHGRP@ @MILTER_MANAGER_GROUP@ @VARBASE@/run/milter-manager
+		@CHMOD@ 0755 @VARBASE@/run/milter-manager
+	fi
+}
+
 load_rc_config ${name}
 run_rc_command "$1"
diff --git a/net/p5-POE-Component-SNMP/Makefile b/net/p5-POE-Component-SNMP/Makefile
index d8ba7e73afb9..ee1bd36b6947 100644
--- a/net/p5-POE-Component-SNMP/Makefile
+++ b/net/p5-POE-Component-SNMP/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2009/05/12 12:51:07 martti Exp $
+# $NetBSD: Makefile,v 1.7 2010/05/28 10:07:42 martti Exp $
 
-DISTNAME=	POE-Component-SNMP-1.1001
+DISTNAME=	POE-Component-SNMP-1.1006
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=POE/}
 
diff --git a/net/p5-POE-Component-SNMP/distinfo b/net/p5-POE-Component-SNMP/distinfo
index 984710ba34ba..2d49b9a84651 100644
--- a/net/p5-POE-Component-SNMP/distinfo
+++ b/net/p5-POE-Component-SNMP/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2008/08/12 09:41:37 martti Exp $
+$NetBSD: distinfo,v 1.4 2010/05/28 10:07:42 martti Exp $
 
-SHA1 (POE-Component-SNMP-1.1001.tar.gz) = c87063adde26b9e3c136512a965e29d00ccdf6ad
-RMD160 (POE-Component-SNMP-1.1001.tar.gz) = 25845dfd47393fca01404a9f716cd8dfcd6d0b2a
-Size (POE-Component-SNMP-1.1001.tar.gz) = 36977 bytes
+SHA1 (POE-Component-SNMP-1.1006.tar.gz) = e55a37fcb34637a64e65bec08ccef5ba61fb2ed3
+RMD160 (POE-Component-SNMP-1.1006.tar.gz) = 6d4f9babb42f62f0b60c1bee8d9aa8a116817e60
+Size (POE-Component-SNMP-1.1006.tar.gz) = 37375 bytes
 SHA1 (patch-aa) = 34f76011fc5c5bc89afcef4ac5a82568301f85f2
diff --git a/parallel/mpi-ch/Makefile b/parallel/mpi-ch/Makefile
index 59e4e7aa7cba..0912f9296cc0 100644
--- a/parallel/mpi-ch/Makefile
+++ b/parallel/mpi-ch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2010/05/17 18:27:15 asau Exp $
+# $NetBSD: Makefile,v 1.64 2010/05/28 12:15:42 obache Exp $
 
 DISTNAME=	mpich2-1.2.1p1
 #PKGREVISION=	1
@@ -28,6 +28,8 @@ CONFIGURE_ARGS+=	--docdir=${PREFIX}/share/doc/${PKGBASE}
 CONFIGURE_ARGS+=	--htmldir=${PREFIX}/share/doc/${PKGBASE}/html
 
 CONFIGURE_ARGS+=	--disable-f90	# problems?
+CONFIGURE_ARGS+=	--without-java
+CONFIGURE_ARGS+=	--without-java2
 
 USE_TOOLS+=		perl:run
 
diff --git a/shells/mksh/Makefile b/shells/mksh/Makefile
index be4c7b9fd6c1..cd0c3061e5ed 100644
--- a/shells/mksh/Makefile
+++ b/shells/mksh/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2010/05/07 12:02:44 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2010/05/28 12:26:49 is Exp $
 
-DISTNAME=			mksh-R39
+DISTNAME=			mksh-R39c
 PKGNAME=			${DISTNAME:S/-R/-/}
-PKGREVISION=			1
 CATEGORIES=			shells
 MASTER_SITES=			http://www.mirbsd.org/MirOS/dist/mir/mksh/ \
 				http://pub.allbsd.org/MirOS/dist/mir/mksh/
diff --git a/shells/mksh/distinfo b/shells/mksh/distinfo
index a1a8c284f894..6b26ba2eb872 100644
--- a/shells/mksh/distinfo
+++ b/shells/mksh/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.13 2009/12/05 13:31:18 ahoka Exp $
+$NetBSD: distinfo,v 1.14 2010/05/28 12:26:49 is Exp $
 
-SHA1 (mksh-R39.cpio.gz) = 5bcf609b717fca290b7eecdd120094c54da58994
-RMD160 (mksh-R39.cpio.gz) = 5a5bcbe288e722f9772e27d2fdc36eee174bbb7b
-Size (mksh-R39.cpio.gz) = 278476 bytes
+SHA1 (mksh-R39c.cpio.gz) = 5b40171c736773492257889da0965abe3a3ed706
+RMD160 (mksh-R39c.cpio.gz) = 02a74d4158bef6cf98012ff60c3c0bfe5b095924
+Size (mksh-R39c.cpio.gz) = 296033 bytes
diff --git a/wip/ibus-pinyin/Makefile b/wip/ibus-pinyin/Makefile
index 9a234d293d20..d9669f56cdc9 100644
--- a/wip/ibus-pinyin/Makefile
+++ b/wip/ibus-pinyin/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 #
 
-DISTNAME=	ibus-pinyin-1.3.6
+DISTNAME=	ibus-pinyin-1.3.7
 CATEGORIES=	inputmethod chinese
 MASTER_SITES=	http://ibus.googlecode.com/files/
 DISTFILES=	${DEFAULT_DISTFILES} ${DBTAR}
diff --git a/wip/ibus-pinyin/distinfo b/wip/ibus-pinyin/distinfo
index f6413abb4eeb..256cfea7f6aa 100644
--- a/wip/ibus-pinyin/distinfo
+++ b/wip/ibus-pinyin/distinfo
@@ -1,9 +1,8 @@
 $NetBSD$
 
-SHA1 (ibus-pinyin-1.3.6.tar.gz) = b8bf84fe2da6f8b43b1ca9e5e4eef051d6e5ae92
-RMD160 (ibus-pinyin-1.3.6.tar.gz) = 66643abb89fea250ecd12599f1ed2644374cc433
-Size (ibus-pinyin-1.3.6.tar.gz) = 1631213 bytes
+SHA1 (ibus-pinyin-1.3.7.tar.gz) = e10b813cba55635a8b02346f621918f467cb91ac
+RMD160 (ibus-pinyin-1.3.7.tar.gz) = 25153f0ab812fbfaf392bb6f8a6c5c8ae6b9b159
+Size (ibus-pinyin-1.3.7.tar.gz) = 1640983 bytes
 SHA1 (pinyin-database-1.2.99.tar.bz2) = e38a148a772e9909facda66b2d579e17b94cccbe
 RMD160 (pinyin-database-1.2.99.tar.bz2) = 1679567f31c20a235577f02175df38e16a05e7de
 Size (pinyin-database-1.2.99.tar.bz2) = 9977983 bytes
-SHA1 (patch-aa) = 3f53282962f30126652ccf5729d357dddf3711f8
diff --git a/wip/ibus-pinyin/patches/patch-aa b/wip/ibus-pinyin/patches/patch-aa
deleted file mode 100644
index 97e72a825849..000000000000
--- a/wip/ibus-pinyin/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-http://code.google.com/p/ibus/issues/detail?id=910
-
---- src/PinyinEditor.cc.orig	2010-05-17 02:38:15.000000000 +0000
-+++ src/PinyinEditor.cc
-@@ -628,7 +628,7 @@ PinyinEditor::update (void)
-     updateAuxiliaryText ();
- }
- 
--inline void
-+void
- PinyinEditor::commit (const gchar *str)
- {
-     StaticText text(str);
-@@ -703,7 +703,7 @@ PinyinEditor::selectCandidate (guint i)
-     return FALSE;
- }
- 
--inline gboolean
-+gboolean
- PinyinEditor::selectCandidateInPage (guint i)
- {
-     guint page_size = m_lookup_table.pageSize ();
diff --git a/wm/fvwm-devel/Makefile b/wm/fvwm-devel/Makefile
index 501c6bfe3ca2..ba574bbc9f81 100644
--- a/wm/fvwm-devel/Makefile
+++ b/wm/fvwm-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2010/02/24 12:37:04 martti Exp $
+# $NetBSD: Makefile,v 1.33 2010/05/28 09:33:12 martti Exp $
 
 DISTNAME=	fvwm-${FVWM_VER}
 #PKGREVISION=	1
@@ -12,7 +12,7 @@ COMMENT=	Development version of X11 Virtual window manager
 LICENSE=	gnu-gpl-v2
 
 CONFLICTS=	fvwm1-[0-9]* fvwm2-[0-9]*
-FVWM_VER=	2.5.28
+FVWM_VER=	2.5.30
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/wm/fvwm-devel/distinfo b/wm/fvwm-devel/distinfo
index 53bd90784f5c..b550e7e2d07d 100644
--- a/wm/fvwm-devel/distinfo
+++ b/wm/fvwm-devel/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.19 2010/02/24 12:37:04 martti Exp $
+$NetBSD: distinfo,v 1.20 2010/05/28 09:33:12 martti Exp $
 
-SHA1 (fvwm-2.5.28.tar.bz2) = 26b83b88656faa3d21ab55544269954e534abe08
-RMD160 (fvwm-2.5.28.tar.bz2) = 6df61b9b6477ff35b1b9d4f915c3241ead1a4fa1
-Size (fvwm-2.5.28.tar.bz2) = 2521994 bytes
-SHA1 (patch-aa) = ff40724d0a9ee6b3032ac9329cabf4cdf7d470a0
+SHA1 (fvwm-2.5.30.tar.bz2) = fcc082c8e13b262bb4f86f24ed8142a77c10b4f3
+RMD160 (fvwm-2.5.30.tar.bz2) = 4959a3a5675fd48e622e24520a5d5158dc5ff9b0
+Size (fvwm-2.5.30.tar.bz2) = 2568104 bytes
+SHA1 (patch-aa) = 6796b71fbc4c94e1d44938ab050b10b5f24a78a7
 SHA1 (patch-ab) = ebc58a6c58e6c09ce0c270c0a1d8d861f2dcdab1
 SHA1 (patch-ac) = 9741995ea491250406683c4b25d91c39ec3d9d58
diff --git a/wm/fvwm-devel/patches/patch-aa b/wm/fvwm-devel/patches/patch-aa
index fbde9c027c3a..d1879b7de2ae 100644
--- a/wm/fvwm-devel/patches/patch-aa
+++ b/wm/fvwm-devel/patches/patch-aa
@@ -1,22 +1,21 @@
-$NetBSD: patch-aa,v 1.8 2009/09/22 07:53:28 martti Exp $
+$NetBSD: patch-aa,v 1.9 2010/05/28 09:33:12 martti Exp $
 
 We have a separate package for xpmroot
 
---- bin/Makefile.in.orig	2009-09-20 10:11:53.000000000 +0300
-+++ bin/Makefile.in	2009-09-22 10:03:22.000000000 +0300
-@@ -736,14 +736,8 @@
+--- bin/Makefile.in.orig	2010-05-28 12:28:07.000000000 +0300
++++ bin/Makefile.in	2010-05-28 12:28:14.000000000 +0300
+@@ -819,14 +819,8 @@
  	_fvwm-perllib.1
  
  install-exec-local:
 -	@rm -f $(DESTDIR)$(bindir)/xpmroot
 -	@$(LN_S) fvwm-root $(DESTDIR)$(bindir)/xpmroot || \
 -		echo "Minor warning: $(bindir)/xpmroot symlink was not created"
--
+ 
  install-data-local:
 -	@rm -f $(DESTDIR)$(mandir)/man1/xpmroot.1
 -	@$(LN_S) fvwm-root.1 $(DESTDIR)$(mandir)/man1/xpmroot.1 || \
 -		echo "Minor warning: $(mandir)/man1/xpmroot.1 symlink was not created"
-+
+ 
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/www/mediawiki/Makefile b/www/mediawiki/Makefile
index bc4bd1b642ad..45482174d0ea 100644
--- a/www/mediawiki/Makefile
+++ b/www/mediawiki/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2010/04/07 05:40:11 martti Exp $
+# $NetBSD: Makefile,v 1.12 2010/05/28 08:11:32 martti Exp $
 
 DISTNAME=	mediawiki-${VER}.${PVER}
 CATEGORIES=	www
@@ -20,7 +20,7 @@ INSTALLATION_DIRS=	${EGDIR} share/mediawiki
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 VER=			1.15
-PVER=			3
+PVER=			4
 
 APACHE_USER?=		www
 APACHE_GROUP?=		www
diff --git a/www/mediawiki/distinfo b/www/mediawiki/distinfo
index f684562909c6..bc591a1a245d 100644
--- a/www/mediawiki/distinfo
+++ b/www/mediawiki/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2010/04/07 05:40:11 martti Exp $
+$NetBSD: distinfo,v 1.8 2010/05/28 08:11:32 martti Exp $
 
-SHA1 (mediawiki-1.15.3.tar.gz) = 891bf5fb7479c88fbb4fd155666eafe510b2f92c
-RMD160 (mediawiki-1.15.3.tar.gz) = 77e2d446672ab11832b2f913624d3358a3855651
-Size (mediawiki-1.15.3.tar.gz) = 11486661 bytes
+SHA1 (mediawiki-1.15.4.tar.gz) = c00267663a0a05ace4bd28b53b0b3b0f08dad551
+RMD160 (mediawiki-1.15.4.tar.gz) = f4879c0f9cb1b8a6f5682f9fad14010703d49c27
+Size (mediawiki-1.15.4.tar.gz) = 11531488 bytes
diff --git a/www/p5-URI-Escape-XS/Makefile b/www/p5-URI-Escape-XS/Makefile
index a325c9ef45ef..af2400892c2f 100644
--- a/www/p5-URI-Escape-XS/Makefile
+++ b/www/p5-URI-Escape-XS/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2009/10/24 16:06:07 sno Exp $
+# $NetBSD: Makefile,v 1.6 2010/05/28 10:07:46 martti Exp $
 
-DISTNAME=	URI-Escape-XS-0.06
+DISTNAME=	URI-Escape-XS-0.07
 PKGNAME=	p5-${DISTNAME}
 CATEGORIES=	www net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=URI/}
diff --git a/www/p5-URI-Escape-XS/distinfo b/www/p5-URI-Escape-XS/distinfo
index dd931523683c..cf6ae833909f 100644
--- a/www/p5-URI-Escape-XS/distinfo
+++ b/www/p5-URI-Escape-XS/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2009/10/24 16:06:07 sno Exp $
+$NetBSD: distinfo,v 1.4 2010/05/28 10:07:46 martti Exp $
 
-SHA1 (URI-Escape-XS-0.06.tar.gz) = 1fa9e9a12b10425e9ce156d63e41bcfefbf3e5ca
-RMD160 (URI-Escape-XS-0.06.tar.gz) = 17055f5539c932d03295942d25022abe86b37697
-Size (URI-Escape-XS-0.06.tar.gz) = 9045 bytes
+SHA1 (URI-Escape-XS-0.07.tar.gz) = 924a6fd488285f67f7056b8d1a2602e87f3e28a7
+RMD160 (URI-Escape-XS-0.07.tar.gz) = e1a2049eb39d258e26d0267b64e5b0d3ba883aa5
+Size (URI-Escape-XS-0.07.tar.gz) = 8960 bytes