Fix build on NetBSD. Add missing libSM dependency. Sort dependencies.

Bump revision.

4 files changed, 50 insertions, 16 deletions

diff --git a/x11/wxGTK30/Makefile b/x11/wxGTK30/Makefile
index 36031e6f189..19fbd4c59ae 100644
--- a/x11/wxGTK30/Makefile
+++ b/x11/wxGTK30/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2014/07/30 06:53:21 dbj Exp $
+# $NetBSD: Makefile,v 1.3 2014/08/13 22:32:43 joerg Exp $
 #
 
 VERSION=	3.0.1
-PKGREVISION=	1
+PKGREVISION=	2
 DISTNAME=	wxWidgets-${VERSION}
 PKGNAME=	wxGTK30-${VERSION}
 CATEGORIES=	x11
@@ -69,22 +69,22 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/changes.txt ${DESTDIR}${PREFIX}/${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/readme.txt ${DESTDIR}${PREFIX}/${DOCDIR}
 
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../multimedia/gstreamer0.10/buildlink3.mk"
-.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
-#.include "../../devel/GConf/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../multimedia/gstreamer0.10/buildlink3.mk"
+.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
-.include "../../graphics/cairo/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libXxf86vm/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/wxGTK30/PLIST b/x11/wxGTK30/PLIST
index 063372c5696..7bb938c822f 100644
--- a/x11/wxGTK30/PLIST
+++ b/x11/wxGTK30/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2014/07/30 06:53:21 dbj Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/08/13 22:32:43 joerg Exp $
 bin/wx-config
 bin/wxrc
 bin/wxrc-3.0
@@ -580,6 +580,7 @@ include/wx-3.0/wx/unix/evtloop.h
 include/wx-3.0/wx/unix/evtloopsrc.h
 include/wx-3.0/wx/unix/execute.h
 include/wx-3.0/wx/unix/fontutil.h
+include/wx-3.0/wx/unix/fswatcher_inotify.h
 include/wx-3.0/wx/unix/fswatcher_kqueue.h
 include/wx-3.0/wx/unix/glx11.h
 include/wx-3.0/wx/unix/joystick.h
diff --git a/x11/wxGTK30/distinfo b/x11/wxGTK30/distinfo
index 5ebaba63c20..6b25b9c3927 100644
--- a/x11/wxGTK30/distinfo
+++ b/x11/wxGTK30/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2014/07/21 06:53:24 dbj Exp $
+$NetBSD: distinfo,v 1.2 2014/08/13 22:32:43 joerg Exp $
 
 SHA1 (wxWidgets-3.0.1-libtool.diff.bz2) = 8910c29ce7c3427c51380d5d192c772a15b0b23a
 RMD160 (wxWidgets-3.0.1-libtool.diff.bz2) = 3ff40c89ac70b3d5cdfbf2456239c50fa13dc24f
@@ -11,4 +11,5 @@ SHA1 (patch-configure) = 897f13daa5bc8246902d7d864096d621f2e54928
 SHA1 (patch-configure.in) = e49b9a83040201f01c22b3e1cbc4b331985f4e99
 SHA1 (patch-src_tiff_configure) = e1c002f5b7d0bf2c0bec399dbb62d0146c14ec20
 SHA1 (patch-src_tiff_configure.ac) = 0d51a7c251f897aa00e58c3a7ec5f348b50d1821
+SHA1 (patch-src_unix_fswatcher__kqueue.cpp) = 49e142dbdd5c8b8f449ab19b4adbe403d515ab95
 SHA1 (patch-src_unix_threadpsx.cpp) = 3ae587d56c5ea1722ff29d80ff25e894dbc16313
diff --git a/x11/wxGTK30/patches/patch-src_unix_fswatcher__kqueue.cpp b/x11/wxGTK30/patches/patch-src_unix_fswatcher__kqueue.cpp
new file mode 100644
index 00000000000..d4201bb2094
--- /dev/null
+++ b/x11/wxGTK30/patches/patch-src_unix_fswatcher__kqueue.cpp
@@ -0,0 +1,32 @@
+$NetBSD: patch-src_unix_fswatcher__kqueue.cpp,v 1.1 2014/08/13 22:32:43 joerg Exp $
+
+--- src/unix/fswatcher_kqueue.cpp.orig	2014-08-13 21:20:42.000000000 +0000
++++ src/unix/fswatcher_kqueue.cpp
+@@ -125,8 +125,13 @@ public:
+         struct kevent event;
+         int action = EV_ADD | EV_ENABLE | EV_CLEAR | EV_ERROR;
+         int flags = Watcher2NativeFlags(watch->GetFlags());
++#ifdef __NetBSD__
++        EV_SET( &event, watch->GetFileDescriptor(), EVFILT_VNODE, action,
++                flags, 0, (intptr_t)watch.get() );
++#else
+         EV_SET( &event, watch->GetFileDescriptor(), EVFILT_VNODE, action,
+                 flags, 0, watch.get() );
++#endif
+ 
+         // TODO more error conditions according to man
+         // TODO best deal with the error here
+@@ -281,10 +286,11 @@ protected:
+ 
+         wxLogTrace(wxTRACE_FSWATCHER, "Event: ident=%d, filter=%d, flags=%u, "
+                    "fflags=%u, data=%d, user_data=%p",
+-                   e.ident, e.filter, e.flags, e.fflags, e.data, e.udata);
++                   e.ident, e.filter, e.flags, e.fflags, e.data,
++                   (const void *)e.udata);
+ 
+         // for ease of use
+-        wxFSWatchEntryKq& w = *(static_cast<wxFSWatchEntry*>(e.udata));
++        wxFSWatchEntryKq& w = *(reinterpret_cast<wxFSWatchEntry*>(e.udata));
+         int nflags = e.fflags;
+ 
+         // clear ignored flags