Index: audio/pulseaudio/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/pulseaudio/Makefile,v
retrieving revision 1.35
diff -u -r1.35 Makefile
--- audio/pulseaudio/Makefile	22 Feb 2010 21:48:03 -0000	1.35
+++ audio/pulseaudio/Makefile	20 Jun 2010 04:00:57 -0000
@@ -92,7 +92,8 @@
 
 # Use native atomic ops on NetBSD >= 5.0, otherwise
 # fallback to libatomic_ops
-.if ${OPSYS} == "NetBSD" && exists(/usr/include/sys/atomic.h)
+.if ${OPSYS} == "NetBSD" && exists(/usr/include/sys/atomic.h) && \
+    ${MACHINE_ARCH} != "arm"
 CONFIGURE_ARGS+=	--enable-netbsd-atomic-ops
 .else
 CONFIGURE_ARGS+=	--disable-netbsd-atomic-ops
Index: audio/pulseaudio/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/audio/pulseaudio/distinfo,v
retrieving revision 1.19
diff -u -r1.19 distinfo
--- audio/pulseaudio/distinfo	2 Feb 2010 12:39:14 -0000	1.19
+++ audio/pulseaudio/distinfo	20 Jun 2010 04:00:57 -0000
@@ -10,6 +10,7 @@
 SHA1 (patch-ae) = 5e6957e73ffd96d2e63e5ea4eb9b0ca9ea016b30
 SHA1 (patch-af) = e11fb419787e3cd1f305b66c995915f11276770e
 SHA1 (patch-ag) = 523743b49476a219f76b108a605b2b57ea63098a
+SHA1 (patch-ah) = 40395bbaf8987ccf3a0a0676c86108bead390e1b
 SHA1 (patch-ca) = 3016b290943c006392bff01d6eae75a432a7e171
 SHA1 (patch-da) = d56957d37bec15bd41d77b99ce60bcdea0ef4f20
 SHA1 (patch-db) = e1e48577618b4eb2586d8b37953b2474e2dcc864
--- /dev/null	2010-06-20 21:10:08.000000000 +0900
+++ audio/pulseaudio/patches/patch-ah	2010-06-19 18:29:11.000000000 +0900
@@ -0,0 +1,17 @@
+--- src/pulsecore/cpu-arm.c.orig	2009-11-23 03:57:07.000000000 +0000
++++ src/pulsecore/cpu-arm.c
+@@ -129,11 +129,11 @@
+           (flags & PA_CPU_ARM_EDSP) ? "EDSP " : "",
+           (flags & PA_CPU_ARM_NEON) ? "NEON " : "",
+           (flags & PA_CPU_ARM_VFPV3) ? "VFPV3 " : "");
+-#else /* defined (__linux__) */
+-    pa_log ("ARM cpu features not yet supported on this OS");
+-#endif /* defined (__linux__) */
+ 
+     if (flags & PA_CPU_ARM_V6)
+         pa_volume_func_init_arm (flags);
++#else /* defined (__linux__) */
++    pa_log ("ARM cpu features not yet supported on this OS");
++#endif /* defined (__linux__) */
+ #endif /* defined (__arm__) */
+ }
Index: multimedia/mplayer-share/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/mplayer-share/distinfo,v
retrieving revision 1.65
diff -u -r1.65 distinfo
--- multimedia/mplayer-share/distinfo	7 Nov 2009 18:43:36 -0000	1.65
+++ multimedia/mplayer-share/distinfo	20 Jun 2010 03:31:46 -0000
@@ -13,5 +13,7 @@
 SHA1 (patch-an) = 3e72fb86abe7ab572f12a4fef002edb623ab6fae
 SHA1 (patch-ao) = 8588d0215e973045b7f1abd7fbc9813409876b99
 SHA1 (patch-ar) = df7e7cdc6fb8187bbcf0b285afc14d275a51e17a
+SHA1 (patch-as) = 80687ad8187c3ba994b67bd2cee4656be3267bce
+SHA1 (patch-at) = ad265f167058ea97223824f1ba60f712544b304c
 SHA1 (patch-vb) = d836d96c849de866cb4177b20eb1c6dec4b7a0ba
 SHA1 (patch-ve_x264) = 1946a2b2a7643bbc1d3f6a8963e21c4f6cbd2c89
--- /dev/null	2010-06-20 21:10:08.000000000 +0900
+++ multimedia/mplayer-share/patches/patch-as	2010-06-20 19:35:18.000000000 +0900
@@ -0,0 +1,30 @@
+--- libavutil/bswap.h.orig	2009-08-17 09:15:51.000000000 +0900
++++ libavutil/bswap.h	2010-06-20 19:07:00.000000000 +0900
+@@ -26,6 +26,8 @@
+ #ifndef AVUTIL_BSWAP_H
+ #define AVUTIL_BSWAP_H
+ 
++#if !defined(__NetBSD__)
++
+ #include <stdint.h>
+ #include "config.h"
+ #include "common.h"
+@@ -98,4 +100,18 @@
+ #define le2me_64(x) (x)
+ #endif
+ 
++#else /* __NetBSD__ */
++#include <sys/endian.h>
++
++#define bswap_16(x) bswap16(x)
++#define bswap_32(x) bswap32(x)
++#define bswap_64(x) bswap64(x)
++#define be2me_16(x) be16toh(x)
++#define be2me_32(x) be32toh(x)
++#define be2me_64(x) be64toh(x)
++#define le2me_16(x) le16toh(x)
++#define le2me_32(x) le32toh(x)
++#define le2me_64(x) le64toh(x)
++#endif /* __NetBSD__ */
++
+ #endif /* AVUTIL_BSWAP_H */
--- /dev/null	2010-06-20 21:10:08.000000000 +0900
+++ multimedia/mplayer-share/patches/patch-at	2010-06-20 19:35:25.000000000 +0900
@@ -0,0 +1,17 @@
+--- libavutil/arm/bswap.h.orig	2009-07-01 09:55:15.000000000 +0900
++++ libavutil/arm/bswap.h	2010-06-20 19:08:18.000000000 +0900
+@@ -19,6 +19,8 @@
+ #ifndef AVUTIL_ARM_BSWAP_H
+ #define AVUTIL_ARM_BSWAP_H
+ 
++#if !defined(__NetBSD__) /* XXX avoid conflict with <arm/bswap.h> in system */
++
+ #include <stdint.h>
+ #include "config.h"
+ #include "libavutil/common.h"
+@@ -69,4 +71,5 @@
+ 
+ #endif /* __ARMCC_VERSION */
+ 
++#endif /* !__NetBSD__ */
+ #endif /* AVUTIL_ARM_BSWAP_H */
Index: pkgtools/x11-links/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/x11-links/Makefile,v
retrieving revision 1.110
diff -u -r1.110 Makefile
--- pkgtools/x11-links/Makefile	20 Feb 2010 16:23:29 -0000	1.110
+++ pkgtools/x11-links/Makefile	20 Jun 2010 03:33:34 -0000
@@ -5,7 +5,7 @@
 #	usually the most recent.
 
 DISTNAME=	x11-links-0.47.${OS_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	pkgtools x11
 MASTER_SITES=	# empty
 DISTFILES=	# empty
Index: pkgtools/x11-links/files/xorg.xextproto
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/x11-links/files/xorg.xextproto,v
retrieving revision 1.2
diff -u -r1.2 xorg.xextproto
--- pkgtools/x11-links/files/xorg.xextproto	5 Oct 2008 21:36:35 -0000	1.2
+++ pkgtools/x11-links/files/xorg.xextproto	20 Jun 2010 03:33:40 -0000
@@ -1,58 +1,143 @@
 # $NetBSD$
+include/X11/extensions/EVI.h
+include/X11/extensions/EVIproto.h
 include/X11/extensions/MITMisc.h
 include/X11/extensions/XEVI.h
-include/X11/extensions/XEVIstr.h
 include/X11/extensions/XI.h
+include/X11/extensions/XI2.h
+include/X11/extensions/XI2proto.h
 include/X11/extensions/XInput.h
+include/X11/extensions/XInput2.h
 include/X11/extensions/XIproto.h
 include/X11/extensions/XKB.h
+include/X11/extensions/XKBbells.h
+include/X11/extensions/XKBconfig.h
+include/X11/extensions/XKBfile.h
 include/X11/extensions/XKBgeom.h
 include/X11/extensions/XKBproto.h
+include/X11/extensions/XKBrules.h
 include/X11/extensions/XKBsrv.h
 include/X11/extensions/XKBstr.h
+include/X11/extensions/XKBui.h
+include/X11/extensions/XKM.h
+include/X11/extensions/XKMformat.h
 include/X11/extensions/XLbx.h
+include/X11/extensions/XRes.h
+include/X11/extensions/XResproto.h
 include/X11/extensions/XShm.h
 include/X11/extensions/XTest.h
 include/X11/extensions/Xag.h
-include/X11/extensions/Xagsrv.h
-include/X11/extensions/Xagstr.h
+include/X11/extensions/Xcomposite.h
 include/X11/extensions/Xcup.h
-include/X11/extensions/Xcupstr.h
+include/X11/extensions/Xdamage.h
 include/X11/extensions/Xdbe.h
-include/X11/extensions/Xdbeproto.h
+include/X11/extensions/Xevie.h
+include/X11/extensions/Xeviestr.h
 include/X11/extensions/Xext.h
+include/X11/extensions/Xfixes.h
 include/X11/extensions/Xge.h
+include/X11/extensions/Xinerama.h
+include/X11/extensions/Xrandr.h
+include/X11/extensions/Xrender.h
 include/X11/extensions/Xv.h
 include/X11/extensions/XvMC.h
+include/X11/extensions/XvMClib.h
 include/X11/extensions/XvMCproto.h
+include/X11/extensions/Xvlib.h
 include/X11/extensions/Xvproto.h
+include/X11/extensions/Xxf86dga.h
+include/X11/extensions/ag.h
+include/X11/extensions/agproto.h
+include/X11/extensions/bigreqsproto.h
 include/X11/extensions/bigreqstr.h
+include/X11/extensions/composite.h
+include/X11/extensions/compositeproto.h
+include/X11/extensions/cup.h
+include/X11/extensions/cupproto.h
+include/X11/extensions/damageproto.h
+include/X11/extensions/damagewire.h
+include/X11/extensions/dbe.h
+include/X11/extensions/dbeproto.h
 include/X11/extensions/dpms.h
-include/X11/extensions/dpmsstr.h
+include/X11/extensions/dpmsconst.h
+include/X11/extensions/dpmsproto.h
+include/X11/extensions/dri2proto.h
+include/X11/extensions/dri2tokens.h
+include/X11/extensions/evieproto.h
 include/X11/extensions/extutil.h
+include/X11/extensions/fontcache.h
+include/X11/extensions/fontcacheP.h
+include/X11/extensions/fontcachstr.h
 include/X11/extensions/ge.h
 include/X11/extensions/geproto.h
+include/X11/extensions/lbx.h
 include/X11/extensions/lbxbuf.h
 include/X11/extensions/lbxbufstr.h
-include/X11/extensions/lbxdeltastr.h
 include/X11/extensions/lbximage.h
-include/X11/extensions/lbxopts.h
-include/X11/extensions/lbxstr.h
-include/X11/extensions/lbxzlib.h
-include/X11/extensions/mitmiscstr.h
+include/X11/extensions/lbxproto.h
+include/X11/extensions/mitmiscconst.h
+include/X11/extensions/mitmiscproto.h
 include/X11/extensions/multibuf.h
-include/X11/extensions/multibufst.h
+include/X11/extensions/multibufconst.h
+include/X11/extensions/multibufproto.h
+include/X11/extensions/panoramiXext.h
+include/X11/extensions/panoramiXproto.h
+include/X11/extensions/randr.h
+include/X11/extensions/randrproto.h
+include/X11/extensions/record.h
+include/X11/extensions/recordconst.h
+include/X11/extensions/recordproto.h
+include/X11/extensions/recordstr.h
+include/X11/extensions/render.h
+include/X11/extensions/renderproto.h
 include/X11/extensions/saver.h
 include/X11/extensions/saverproto.h
+include/X11/extensions/scrnsaver.h
+include/X11/extensions/secur.h
 include/X11/extensions/security.h
-include/X11/extensions/securstr.h
+include/X11/extensions/securproto.h
 include/X11/extensions/shape.h
-include/X11/extensions/shapestr.h
+include/X11/extensions/shapeconst.h
+include/X11/extensions/shapeproto.h
+include/X11/extensions/shm.h
+include/X11/extensions/shmproto.h
 include/X11/extensions/shmstr.h
 include/X11/extensions/sync.h
-include/X11/extensions/syncstr.h
+include/X11/extensions/syncconst.h
+include/X11/extensions/syncproto.h
+include/X11/extensions/vldXvMC.h
+include/X11/extensions/xcmiscproto.h
 include/X11/extensions/xcmiscstr.h
+include/X11/extensions/xf86bigfont.h
+include/X11/extensions/xf86bigfproto.h
+include/X11/extensions/xf86bigfstr.h
+include/X11/extensions/xf86dga.h
+include/X11/extensions/xf86dga1.h
+include/X11/extensions/xf86dga1const.h
+include/X11/extensions/xf86dga1proto.h
+include/X11/extensions/xf86dga1str.h
+include/X11/extensions/xf86dgaconst.h
+include/X11/extensions/xf86dgaproto.h
+include/X11/extensions/xf86dgastr.h
+include/X11/extensions/xf86misc.h
+include/X11/extensions/xf86mscstr.h
+include/X11/extensions/xf86vm.h
+include/X11/extensions/xf86vmode.h
+include/X11/extensions/xf86vmproto.h
+include/X11/extensions/xf86vmstr.h
+include/X11/extensions/xfixesproto.h
+include/X11/extensions/xfixeswire.h
+include/X11/extensions/xtestconst.h
 include/X11/extensions/xtestext1.h
-include/X11/extensions/xteststr.h
+include/X11/extensions/xtestext1const.h
+include/X11/extensions/xtestext1proto.h
+include/X11/extensions/xtestproto.h
+include/X11/extensions/xtrapbits.h
+include/X11/extensions/xtrapddmi.h
+include/X11/extensions/xtrapdi.h
+include/X11/extensions/xtrapemacros.h
+include/X11/extensions/xtraplib.h
+include/X11/extensions/xtraplibp.h
+include/X11/extensions/xtrapproto.h
 lib/pkgconfig/xextensions.pc
 lib/pkgconfig/xextproto.pc
Index: x11/qt3-libs/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/x11/qt3-libs/distinfo,v
retrieving revision 1.51
diff -u -r1.51 distinfo
--- x11/qt3-libs/distinfo	11 Jul 2009 09:11:13 -0000	1.51
+++ x11/qt3-libs/distinfo	20 Jun 2010 03:39:01 -0000
@@ -6,7 +6,7 @@
 SHA1 (patch-aa) = 0247c3694db7bf29556e00809b5d7f26817f3055
 SHA1 (patch-ab) = 4dfee5c06bc322646465f43fe850126873d7bb75
 SHA1 (patch-ac) = aca8761d8adb87624340d7d75df22e91bef8182b
-SHA1 (patch-ad) = 366c411ad5cb8227d5e40165d877c627dbf9c670
+SHA1 (patch-ad) = 9780ceeb4eadd48735803fc789dcdf0da974c23d
 SHA1 (patch-ae) = 2ec0b408edd78daa03c02c654e0ce515933f36e7
 SHA1 (patch-af) = 7ac1629afd6de928d35d0a410795ca45451d5b18
 SHA1 (patch-ag) = a413055f8df258b0bb91e46d6f611e9ec511b913
@@ -31,5 +31,6 @@
 SHA1 (patch-ce) = 6dbf1d619782be1c4522ec019df3936a2538ea39
 SHA1 (patch-cf) = 4a38cf1a82ef03a85ecb5787e5954f0c8a0afbda
 SHA1 (patch-cg) = 4ae34d2556314e6bf35160c018987a453055a0eb
+SHA1 (patch-ch) = 91c5404967d5e154280c9bb18046f3f724981b00
 SHA1 (patch-ia) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112
 SHA1 (patch-ib) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950
Index: x11/qt3-libs/patches/patch-ad
===================================================================
RCS file: /cvsroot/pkgsrc/x11/qt3-libs/patches/patch-ad,v
retrieving revision 1.8
diff -u -r1.8 patch-ad
--- x11/qt3-libs/patches/patch-ad	13 Apr 2005 21:58:05 -0000	1.8
+++ x11/qt3-libs/patches/patch-ad	20 Jun 2010 03:39:01 -0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.8 2005/04/13 21:58:05 bouyer Exp $
+$NetBSD$
 
---- src/tools/qglobal.h.orig	Fri Jan 21 18:16:04 2005
-+++ src/tools/qglobal.h	Fri Apr  8 21:19:49 2005
+--- src/tools/qglobal.h.orig	2007-02-02 14:01:04.000000000 +0000
++++ src/tools/qglobal.h
 @@ -63,6 +63,7 @@
       NETBSD	- NetBSD
       OPENBSD	- OpenBSD
@@ -22,13 +22,22 @@
  #elif defined(macintosh)
  #  define Q_OS_MAC9
  #elif defined(__CYGWIN__)
-@@ -119,6 +120,9 @@
- #  define Q_OS_BSD4
+@@ -120,6 +121,9 @@
  #elif defined(__NetBSD__)
  #  define Q_OS_NETBSD
-+#  define Q_OS_BSD4
+ #  define Q_OS_BSD4
 +#elif defined(__INTERIX)
 +#  define Q_OS_INTERIX
- #  define Q_OS_BSD4
++#  define Q_OS_BSD4
  #elif defined(__OpenBSD__)
  #  define Q_OS_OPENBSD
+ #  define Q_OS_BSD4
+@@ -317,7 +321,7 @@
+    supposedly know what you are doing.) */
+ #  if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP)
+ #    define Q_PACKED __attribute__ ((packed))
+-#    if __GNUC__ == 3 && __GNUC_MINOR__ >= 4
++#    if (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || __GNUC__ >= 4
+ #      define Q_NO_PACKED_REFERENCE
+ #    endif
+ #  endif
--- /dev/null	2010-06-20 21:10:08.000000000 +0900
+++ x11/qt3-libs/patches/patch-ch	2010-06-14 15:32:52.000000000 +0900
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/tools/qstring.h.orig	2007-02-02 14:01:05.000000000 +0000
++++ src/tools/qstring.h
+@@ -194,7 +194,7 @@
+     char latin1() const { return ucs > 0xff ? 0 : (char) ucs; }
+     ushort unicode() const { return ucs; }
+ #ifdef Q_NO_PACKED_REFERENCE
+-    ushort &unicode() { return *(&ucs); }
++    ushort &unicode() { return *(ushort *)(&ucs); }
+ #else
+     ushort &unicode() { return ucs; }
+ #endif