- Update to version 0.7.6

- Make libexif dependency mandatory: it is no longer considered optional by
  upstream sources, and there is no --without-exif configure script switch
- Ensure that optional dependencies are recorded correctly (prevent silent
  dependency injection)
- Augment list of available plugins (FFmpeg, GD) and add GnuTLS support
- Correctly depend on QT components (via bpm infrastructure)
- Clean up Makefile a bit and rearrange pkg-plist for better readability

9 files changed, 98 insertions, 492 deletions

diff --git a/x11-toolkits/nucleo/Makefile b/x11-toolkits/nucleo/Makefile
index 1dbde27ae6cb..7ed08fcb0849 100644
--- a/x11-toolkits/nucleo/Makefile
+++ b/x11-toolkits/nucleo/Makefile
@@ -6,55 +6,79 @@
 #
 
 PORTNAME=	nucleo
-PORTVERSION=	0.6
-PORTREVISION=	5
+PORTVERSION=	0.7.6
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	http://insitu.lri.fr/metisse/download/latest/ \
-		http://freebsd.nsu.ru/distfiles/metisse/
+MASTER_SITES=	http://insitu.lri.fr/metisse/download/nucleo/
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Toolkit to explore video and human-computer interaction
 
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 		jpeg.11:${PORTSDIR}/graphics/jpeg \
-		png.6:${PORTSDIR}/graphics/png
+		png.6:${PORTSDIR}/graphics/png \
+		exif.12:${PORTSDIR}/graphics/libexif
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GL=		glu
-USE_XORG=	x11 xt
+USE_QT_VER=	4
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 USE_LDCONFIG=	yes
 
-OPTIONS=	EXIF	"Build with EXIF support"	on \
+OPTIONS=	GNUTLS	"Build with GnuTLS support"	off \
 		DNSSD	"Build with DNS-SD support"	off \
-		QT4	"Enable Qt4 plugin"		off
+		FFMPEG	"Enable FFmpeg plugin"		off \
+		QT4	"Enable Qt4 plugin"		off \
+		GD	"Enable GD plugin"		off
 
 .include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_EXIF)
-LIB_DEPENDS+=	exif.12:${PORTSDIR}/graphics/libexif
+.if defined(WITH_GNUTLS)
+LIB_DEPENDS+=	gnutls.40:${PORTSDIR}/security/gnutls
+.else
+CONFIGURE_ARGS+=	--without-gnutls
+.endif
+
+.if defined(WITH_DNSSD)
+.  if exists(${LOCALBASE}/include/avahi-compat-libdns_sd/dns_sd.h)
+LIB_DEPENDS+=	dns_sd.1:${PORTSDIR}/net/avahi-libdns
+.  else
+LIB_DEPENDS+=	dns_sd.1:${PORTSDIR}/net/mDNSResponder
+.  endif
+.else
+CONFIGURE_ARGS+=	--without-dns-sd
+.endif
+
+.if defined(WITH_FFMPEG)
+LIB_DEPENDS+=	avformat.1:${PORTSDIR}/multimedia/ffmpeg
+PLIST_SUB+=	FFMPEG=""
+.else
+CONFIGURE_ARGS+=	--without-ffmpeg
+PLIST_SUB+=	FFMPEG="@comment "
 .endif
 
 .if defined(WITH_QT4)
-LIB_DEPENDS+=	QtCore:${PORTSDIR}/devel/qt4-corelib
+QT_COMPONENTS=	moc_build corelib
 MAKE_ARGS+=	QT4MOC=${LOCALBASE}/bin/moc-qt4
 PLIST_SUB+=	QT4=""
 .else
-CONFIGURE_ARGS+=	--disable-qt
+CONFIGURE_ARGS+=	--without-qt
 PLIST_SUB+=	QT4="@comment "
 .endif
 
-.if exists(${LOCALBASE}/include/avahi-compat-libdns_sd/dns_sd.h)
-LIB_DEPENDS+=	dns_sd.1:${PORTSDIR}/net/avahi-libdns
-.elif defined(WITH_DNSSD)
-LIB_DEPENDS+=	dns_sd.1:${PORTSDIR}/net/mDNSResponder
+.if defined(WITH_GD)
+LIB_DEPENDS+=	gd.4:${PORTSDIR}/graphics/gd
+PLIST_SUB+=	GD=""
+.else
+CONFIGURE_ARGS+=	--without-gd
+PLIST_SUB+=	GD="@comment "
 .endif
 
 post-patch:
-	${REINPLACE_CMD} -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \
+# Fix for libpng 1.4
+	@${REINPLACE_CMD} -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \
 		${WRKSRC}/nucleo/image/encoding/PNGenc.cxx
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/nucleo/distinfo b/x11-toolkits/nucleo/distinfo
index 037815f08d0c..ff1dbfdcbe76 100644
--- a/x11-toolkits/nucleo/distinfo
+++ b/x11-toolkits/nucleo/distinfo
@@ -1,3 +1,3 @@
-MD5 (nucleo-0.6.tar.bz2) = b36f7d8deac7069da2c4db961735d15e
-SHA256 (nucleo-0.6.tar.bz2) = 653564c8a03a94685a33724b6ead21041a8578231fcd300b64c01634411f2094
-SIZE (nucleo-0.6.tar.bz2) = 806154
+MD5 (nucleo-0.7.6.tar.bz2) = 175e601ec8555b9f463ae4f57e7b5570
+SHA256 (nucleo-0.7.6.tar.bz2) = 7d9d7769a2116c9c1a8ffd0cbf56f653e30643eee5d19e882718c6c1152aaff4
+SIZE (nucleo-0.7.6.tar.bz2) = 876827
diff --git a/x11-toolkits/nucleo/files/patch-apps_videoServer_Notifier.cxx b/x11-toolkits/nucleo/files/patch-apps_videoServer_Notifier.cxx
deleted file mode 100644
index 8b3d79ca87c7..000000000000
--- a/x11-toolkits/nucleo/files/patch-apps_videoServer_Notifier.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
---- apps/videoServer/Notifier.cxx.orig	Thu May 24 15:48:08 2007
-+++ apps/videoServer/Notifier.cxx	Thu May 24 15:48:17 2007
-@@ -19,6 +19,7 @@
- #include <unistd.h>
- #include <sys/types.h>
- #include <sys/wait.h>
-+#include <signal.h>
- 
- #include <iostream>
- #include <stdexcept>
diff --git a/x11-toolkits/nucleo/files/patch-avahi+dnssd b/x11-toolkits/nucleo/files/patch-avahi+dnssd
deleted file mode 100644
index 1ddfc34452af..000000000000
--- a/x11-toolkits/nucleo/files/patch-avahi+dnssd
+++ /dev/null
@@ -1,239 +0,0 @@
---- apps/Makefile.in.orig	Mon Jan 29 15:59:00 2007
-+++ apps/Makefile.in	Fri Jun  1 17:46:53 2007
-@@ -109,6 +109,9 @@
- DARWIN_TRUE = @DARWIN_TRUE@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DNS_SD_CPPFLAGS = @DNS_SD_CPPFLAGS@
-+DNS_SD_LDFLAGS = @DNS_SD_LDFLAGS@
-+DNS_SD_LIBS = @DNS_SD_LIBS@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -251,8 +254,8 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- SUBDIRS = videoServer
--AM_CPPFLAGS = -I${top_srcdir}/ -I${top_builddir}
--AM_LDFLAGS = -L${top_builddir}/nucleo -lNucleo
-+AM_CPPFLAGS = -I${top_srcdir}/ -I${top_builddir} $(DNS_SD_CPPFLAGS)
-+AM_LDFLAGS = -L${top_builddir}/nucleo -lNucleo $(DNS_SD_LIBS)
- videoClient_SOURCES = videoClient.cxx
- all: all-recursive
- 
---- apps/videoServer/Makefile.in.orig	Mon Jan 29 15:59:00 2007
-+++ apps/videoServer/Makefile.in	Fri Jun  1 17:48:13 2007
-@@ -112,6 +112,9 @@
- DARWIN_TRUE = @DARWIN_TRUE@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DNS_SD_CPPFLAGS = @DNS_SD_CPPFLAGS@
-+DNS_SD_LDFLAGS = @DNS_SD_LDFLAGS@
-+DNS_SD_LIBS = @DNS_SD_LIBS@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -253,8 +256,8 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir}
--AM_LDFLAGS = -L${top_builddir}/nucleo -lNucleo
-+AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} $(DNS_SD_CPPFLAGS)
-+AM_LDFLAGS = -L${top_builddir}/nucleo -lNucleo $(DNS_SD_LIBS)
- videoServer_SOURCES = main.cxx VideoServer.cxx \
- 	VideoService.cxx Notifier.cxx \
- 	FileStreamer.cxx VideoStreamer.cxx \
---- demos/misc/Makefile.in.orig	Mon Jan 29 15:59:01 2007
-+++ demos/misc/Makefile.in	Fri Jun  1 17:50:33 2007
-@@ -121,6 +121,9 @@
- DARWIN_TRUE = @DARWIN_TRUE@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DNS_SD_CPPFLAGS = @DNS_SD_CPPFLAGS@
-+DNS_SD_LDFLAGS = @DNS_SD_LDFLAGS@
-+DNS_SD_LIBS = @DNS_SD_LIBS@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -262,8 +265,8 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir}
--AM_LDFLAGS = -L${top_builddir}/nucleo -lNucleo
-+AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} $(DNS_SD_CPPFLAGS)
-+AM_LDFLAGS = -L${top_builddir}/nucleo -lNucleo $(DNS_SD_LIBS)
- @HAVE_OPENGL_TRUE@paz_SOURCES = paz.cxx
- @DARWIN_TRUE@@HAVE_OPENGL_TRUE@multitexture_SOURCES = multitexture.cxx
- documentOpener_SOURCES = documentOpener.cxx
---- demos/video/Makefile.in.orig	Mon Jan 29 15:59:01 2007
-+++ demos/video/Makefile.in	Fri Jun  1 17:51:12 2007
-@@ -135,6 +135,9 @@
- DARWIN_TRUE = @DARWIN_TRUE@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DNS_SD_CPPFLAGS = @DNS_SD_CPPFLAGS@
-+DNS_SD_LDFLAGS = @DNS_SD_LDFLAGS@
-+DNS_SD_LIBS = @DNS_SD_LIBS@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -276,8 +279,8 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir}
--AM_LDFLAGS = -L${top_builddir}/nucleo -lNucleo
-+AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} $(DNS_SD_CPPFLAGS)
-+AM_LDFLAGS = -L${top_builddir}/nucleo -lNucleo $(DNS_SD_LIBS)
- simplegl_SOURCES = simplegl.cxx
- blender_SOURCES = blender.cxx
- timeoverlay_SOURCES = timeoverlay.cxx
---- tests/Makefile.in.orig	Mon Jan 29 15:59:08 2007
-+++ tests/Makefile.in	Fri Jun  1 17:53:04 2007
-@@ -226,6 +226,9 @@
- DARWIN_TRUE = @DARWIN_TRUE@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DNS_SD_CPPFLAGS = @DNS_SD_CPPFLAGS@
-+DNS_SD_LDFLAGS = @DNS_SD_LDFLAGS@
-+DNS_SD_LIBS = @DNS_SD_LIBS@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -367,8 +370,8 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir}
--AM_LDFLAGS = -L${top_builddir}/nucleo -lNucleo
-+AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} $(DNS_SD_CPPFLAGS)
-+AM_LDFLAGS = -L${top_builddir}/nucleo -lNucleo $(DNS_SD_LIBS)
- test_reducePath_SOURCES = test-reducePath.cxx
- test_StringUtils_SOURCES = test-StringUtils.cxx
- test_URI_SOURCES = test-URI.cxx
---- nucleo/network/dnssd/Makefile.in.orig	Fri Jun  1 17:59:12 2007
-+++ nucleo/network/dnssd/Makefile.in	Fri Jun  1 17:54:06 2007
-@@ -110,6 +110,9 @@
- DARWIN_TRUE = @DARWIN_TRUE@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DNS_SD_CPPFLAGS = @DNS_SD_CPPFLAGS@
-+DNS_SD_LDFLAGS = @DNS_SD_LDFLAGS@
-+DNS_SD_LIBS = @DNS_SD_LIBS@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -254,7 +251,8 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir}
-+AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} $(DNS_SD_CPPFLAGS)
-+AM_LDFLAGS = $(DNS_SD_LIBS)
- noinst_LTLIBRARIES = libdnssd.la
- libdnssd_la_SOURCES = DNSServiceAnnouncer.cxx DNSServiceBrowser.cxx
- pkginclude_HEADERS = DNSService.H DNSServiceAnnouncer.H DNSServiceBrowser.H
---- configure.orig	Mon Jan 29 15:59:11 2007
-+++ configure	Fri Jun  1 17:43:40 2007
-@@ -894,6 +894,9 @@
- HAVE_FREETYPE2_TRUE
- HAVE_FREETYPE2_FALSE
- HAVE_DNS_SD
-+DNS_SD_CPPFLAGS
-+DNS_SD_LDFLAGS
-+DNS_SD_LIBS
- HAVE_DNS_SD_TRUE
- HAVE_DNS_SD_FALSE
- HAVE_FFMPEG
-@@ -23216,6 +23219,28 @@
- problem_dns_sd=""
- with_dns_sd="yes"
- HAVE_DNS_SD=1
-+if test x$TARGET != xDARWIN ; then
-+  echo "$as_me:$LINENO: checking for avahi-compat-libdns_sd using pkg-config" >&5
-+  echo $ECHO_N "checking for avahi-compat-libdns_sd using pkg-config... $ECHO_C" >&6
-+  HAVE_DNS_SD=0
-+  if test -n "$MY_PKG_CONFIG" && { (echo "$as_me:$LINENO: \$MY_PKG_CONFIG --exists avahi-compat-libdns_sd") >&5
-+  ($MY_PKG_CONFIG --exists avahi-compat-libdns_sd) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+    HAVE_DNS_SD=1
-+    DNS_SD_CPPFLAGS=`$MY_PKG_CONFIG --cflags-only-I avahi-compat-libdns_sd`
-+    DNS_SD_LDFLAGS=`$MY_PKG_CONFIG --libs-only-L avahi-compat-libdns_sd`
-+    DNS_SD_LIBS=`$MY_PKG_CONFIG --libs-only-l avahi-compat-libdns_sd`
-+    echo "$as_me:$LINENO: result: yes" >&5
-+    echo "${ECHO_T}yes" >&6
-+  else
-+    echo "$as_me:$LINENO: result: no" >&5
-+    echo "${ECHO_T}no" >&6
-+  fi
-+fi
-+
-+  if test $HAVE_DNS_SD = 0 ; then
- 
- for ac_header in dns_sd.h
- do
-@@ -23387,8 +23412,6 @@
- 
- done
- 
--if test x$TARGET != xDARWIN; then
--
- { echo "$as_me:$LINENO: checking for DNSServiceRegister in -ldns_sd" >&5
- echo $ECHO_N "checking for DNSServiceRegister in -ldns_sd... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dns_sd_DNSServiceRegister+set}" = set; then
-@@ -23472,6 +23495,7 @@
- _ACEOF
- 
-   LIBS="-ldns_sd $LIBS"
-+  HAVE_DNS_SD=1; with_dns_sd="yes"; problem_dns_sd=""
- 
- else
-   HAVE_DNS_SD=0; with_dns_sd="no"; problem_dns_sd=" (dns_sd library not found)"
-@@ -25092,6 +25116,9 @@
- HAVE_FREETYPE2_TRUE!$HAVE_FREETYPE2_TRUE$ac_delim
- HAVE_FREETYPE2_FALSE!$HAVE_FREETYPE2_FALSE$ac_delim
- HAVE_DNS_SD!$HAVE_DNS_SD$ac_delim
-+DNS_SD_CPPFLAGS!$DNS_SD_CPPFLAGS$ac_delim
-+DNS_SD_LDFLAGS!$DNS_SD_LDFLAGS$ac_delim
-+DNS_SD_LIBS!$DNS_SD_LIBS$ac_delim
- HAVE_DNS_SD_TRUE!$HAVE_DNS_SD_TRUE$ac_delim
- HAVE_DNS_SD_FALSE!$HAVE_DNS_SD_FALSE$ac_delim
- HAVE_FFMPEG!$HAVE_FFMPEG$ac_delim
-@@ -25121,7 +25148,7 @@
- LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
- 
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 70; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 73; then
-     break
-   elif $ac_last_try; then
-     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
---- nucleo.pc.in.orig	2006-04-02 16:49:58
-+++ nucleo.pc.in	2007-02-26 12:41:15
-@@ -6,5 +6,5 @@
- Name: nucleo
- Description: a toolking for exploring new uses of video and new interaction techniques
- Version: @VERSION@
--Cflags: @CPPFLAGS@ -I${includedir}
--Libs: @LDFLAGS@ -L${libdir} -lNucleo @LIBS@
-+Cflags: @CPPFLAGS@ -I${includedir} @DNS_SD_CPPFLAGS@
-+Libs: @LDFLAGS@ -L${libdir} -lNucleo @LIBS@ @DNS_SD_LIBS@
---- nucleo-config.in.orig	2007-01-15 16:33:27
-+++ nucleo-config.in	2007-02-26 12:41:15
-@@ -13,10 +13,10 @@
- libdir=@libdir@
- includedir=@includedir@
- 
--CPPFLAGS="@CPPFLAGS@ -I$includedir"
-+CPPFLAGS="@CPPFLAGS@ -I$includedir @DNS_SD_CPPFLAGS@"
- CXXFLAGS="@CXXFLAGS@"
- LDFLAGS="-L$libdir @LDFLAGS@"
--LIBS="-lNucleo @LIBS@"
-+LIBS="-lNucleo @LIBS@ @DNS_SD_LIBS@"
- 
- case $1 in
-   --cxx)
diff --git a/x11-toolkits/nucleo/files/patch-mandriva-64bit-fixes b/x11-toolkits/nucleo/files/patch-mandriva-64bit-fixes
deleted file mode 100644
index 8dade80d2529..000000000000
--- a/x11-toolkits/nucleo/files/patch-mandriva-64bit-fixes
+++ /dev/null
@@ -1,157 +0,0 @@
-2007-01-17  Gwenole Beauchesne  <gbeauchesne@mandriva.com>
-
-	* 64-bit fixes.
-
---- nucleo/gl/scenegraph/sgNode.H.64bit-fixes	2006-11-29 12:37:37.000000000 +0100
-+++ nucleo/gl/scenegraph/sgNode.H	2007-01-17 16:18:29.000000000 +0100
-@@ -24,6 +24,8 @@ namespace nucleo {
- 
-   class sgNode {
- 
-+    GLuint _id ;
-+
-   public:
- 
-     typedef enum {NODL, USE, CREATE} dlPolicy ;
-@@ -65,7 +67,17 @@ namespace nucleo {
- 
-     void debug(std::ostream& out, int curdepth=0) const ;
- 
--    // --------------------------------------------------------
-+    // -------------------------------------------------------
-+
-+    GLuint getId() const {
-+	return _id ;
-+    }
-+
-+    static GLuint createId(sgNode * const node);
-+    static sgNode * const lookupId(GLuint id);
-+    static void destroyId(GLuint id);
-+
-+    // -------------------------------------------------------
- 
-     std::string &getName() {
- 	 return _name ;
---- nucleo/gl/scenegraph/sgNode.cxx.64bit-fixes	2006-11-29 12:37:37.000000000 +0100
-+++ nucleo/gl/scenegraph/sgNode.cxx	2007-01-18 16:04:53.000000000 +0100
-@@ -15,6 +15,17 @@
- 
- #include <math.h>
- 
-+#if defined __GNUC__
-+#include <ext/hash_map>
-+typedef __gnu_cxx::hash_map<GLuint, void *> sgNodeMap;
-+#endif
-+
-+#if defined __LP64__
-+/* 64-bit Linux platforms may be able to set this to 0 assuming there
-+   is no memory leak and/or brk() can grow reasonably (2^31 nowadays?).  */
-+#define USE_SG_NODE_MAP 1
-+#endif
-+
- static GLfloat Identity[16] = {
-   1.0, 0.0, 0.0, 0.0,
-   0.0, 1.0, 0.0, 0.0,
-@@ -173,6 +184,46 @@ namespace nucleo {
- 
-   // ------------------------------------------------------------------------
- 
-+  static sgNodeMap sgNodes;
-+
-+  GLuint
-+  sgNode::createId(sgNode * const node) {
-+#if USE_SG_NODE_MAP
-+    static GLuint id = 0x66600000; /* FIXME: set to 0 when debugged! */
-+    sgNodes[++id] = (void *)node;
-+    if (debugMode)
-+      std::cout << "sgNode::createId: node " << std::hex << node << ", id " << id << std::endl;
-+    return id;
-+#else
-+    if ((((uintptr_t)node) >> 32) != 0)
-+      std::cout << "sgNode::createId: got a 64-bit addressed node " << std::hex << node << std::endl;
-+    return (uintptr_t)node;
-+#endif
-+  }
-+
-+  sgNode * const
-+  sgNode::lookupId(GLuint id) {
-+#if USE_SG_NODE_MAP
-+    sgNodeMap::const_iterator it = sgNodes.find(id);
-+    if (it != sgNodes.end())
-+      return (sgNode *)(*it).second;
-+    if (debugMode)
-+      std::cout << "sgNode::lookupId: id " << std::hex << id << " not found" << std::endl;
-+    return NULL;
-+#else
-+    return (sgNode *)(uintptr_t)id;
-+#endif
-+  }
-+
-+  void
-+  sgNode::destroyId(GLuint id) {
-+#if USE_SG_NODE_MAP
-+    sgNodes.erase(id);
-+#endif
-+  }
-+
-+  // ------------------------------------------------------------------------
-+
-   void
-   sgNode::debug(std::ostream& out, int curdepth) const {
-     for (int i=0; i<curdepth; ++i) out << "   " ;
-@@ -197,10 +248,12 @@ namespace nucleo {
-     memmove(_savedTransformations,Identity,16*sizeof(GLfloat)) ;
-     _changed = true ;
-     _hidden = false;
-+    _id = sgNode::createId(this);
-   }
- 
-   sgNode::~sgNode(void) {
-     if (_displaylist) glDeleteLists(_displaylist,1) ;
-+    sgNode::destroyId(_id);
-   }
- 
-   // ------------------------------------------------------------------------
-@@ -285,8 +338,8 @@ namespace nucleo {
-     //    if (debugMode) std::cout << "select '" << _name << "' (" << this << ")" << std::endl ;
-     if (_hidden) return;
-     if (debugPushName)
--      std::cerr << "sgNode::selectGraph: pushing " << std::hex << (GLuint)this << " " << (GLuint)(sgNode *)this << std::dec << std::endl ;
--    glPushName((GLuint)(sgNode *)this) ;
-+      std::cerr << "sgNode::selectGraph: pushing " << std::hex << this << " " << (sgNode *)this << std::dec << std::endl ;
-+    glPushName(getId()) ;
-     glPushMatrix() ;
-     glMultMatrixf((const GLfloat *)_transformations) ;
-     select() ;
---- nucleo/gl/scenegraph/sgViewpoint.cxx.64bit-fixes	2006-11-29 23:34:31.000000000 +0100
-+++ nucleo/gl/scenegraph/sgViewpoint.cxx	2007-01-17 16:18:29.000000000 +0100
-@@ -131,7 +131,7 @@ namespace nucleo {
-     glGetDoublev(GL_PROJECTION_MATRIX, projmatrix) ;
- 
-     for (int i=0; i<selectionBufferSize; ++i) {
--	 sgNode *o = (sgNode *)selectionBuffer[i] ;
-+	 sgNode *o = sgNode::lookupId(selectionBuffer[i]) ;
- #if DEBUG_LEVEL>=1
- 	 std::cerr << o->getName() << " < " << std::flush ;
- #endif
-@@ -174,7 +174,7 @@ namespace nucleo {
- 
- 	for (int i=0; i<selectionBufferSize; ++i)
- 	{
--		sgNode *o = (sgNode *)selectionBuffer[i] ;
-+		sgNode *o = sgNode::lookupId(selectionBuffer[i]) ;
- 		o->applyTransformations() ;
- 	}
- 
---- nucleo/gl/window/glWindow_GLX.cxx.64bit-fixes	2006-11-29 23:34:31.000000000 +0100
-+++ nucleo/gl/window/glWindow_GLX.cxx	2007-01-18 16:07:00.000000000 +0100
-@@ -1378,7 +1382,8 @@ namespace nucleo {
- 	   e->time = CurrentTime;
- 	   break;
-       case ClientMessage:
--	   if ((unsigned)xe.xclient.data.l[0] == wmDeleteWindow) {
-+	   if (xe.xclient.format == 32 &&
-+	       (unsigned long)xe.xclient.data.l[0] == wmDeleteWindow) {
- 		e->type = glWindow::event::destroy;
- 	   }
- 	   e->time = CurrentTime;
diff --git a/x11-toolkits/nucleo/files/patch-nucleo_image_sink_nudppImageSink.cxx b/x11-toolkits/nucleo/files/patch-nucleo_image_sink_nudppImageSink.cxx
new file mode 100644
index 000000000000..5842c708df59
--- /dev/null
+++ b/x11-toolkits/nucleo/files/patch-nucleo_image_sink_nudppImageSink.cxx
@@ -0,0 +1,12 @@
+--- nucleo/image/sink/nudppImageSink.cxx.orig	2010-05-14 03:50:14.379819227 +0700
++++ nucleo/image/sink/nudppImageSink.cxx	2010-05-14 03:55:16.360199694 +0700
+@@ -18,6 +18,9 @@
+ #include <unistd.h>
+ #include <sys/socket.h>
+ #include <sys/uio.h>
++#if defined(__FreeBSD__) && __FreeBSD_version < 701104
++#  include <netinet/in_systm.h>
++#endif
+ #include <netinet/ip.h>
+ 
+ #include <stdexcept>
diff --git a/x11-toolkits/nucleo/files/patch-nucleo_network_Makefile.in b/x11-toolkits/nucleo/files/patch-nucleo_network_Makefile.in
deleted file mode 100644
index b6f9aa631c36..000000000000
--- a/x11-toolkits/nucleo/files/patch-nucleo_network_Makefile.in
+++ /dev/null
@@ -1,26 +0,0 @@
---- nucleo/network/Makefile.in.orig	Mon Jan 29 15:59:06 2007
-+++ nucleo/network/Makefile.in	Wed May 30 20:38:34 2007
-@@ -45,8 +45,6 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--@HAVE_DNS_SD_TRUE@am__append_1 = dnssd
--@HAVE_DNS_SD_TRUE@am__append_2 = dnssd/libdnssd.la 
- subdir = nucleo/network
- DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in
-@@ -264,12 +262,11 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--SUBDIRS = http udp tcp $(am__append_1)
-+SUBDIRS = http udp tcp dnssd
- AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir}
- noinst_LTLIBRARIES = libnetwork.la
- libnetwork_la_SOURCES = NetworkUtils.cxx
--libnetwork_la_LIBADD = udp/libudp.la tcp/libtcp.la http/libhttp.la \
--	$(am__append_2)
-+libnetwork_la_LIBADD = udp/libudp.la tcp/libtcp.la http/libhttp.la dnssd/libdnssd.la
- pkginclude_HEADERS = NetworkUtils.H
- all: all-recursive
- 
diff --git a/x11-toolkits/nucleo/files/patch-nucleo_network_dnssd_DNSServiceBrowser.H b/x11-toolkits/nucleo/files/patch-nucleo_network_dnssd_DNSServiceBrowser.H
deleted file mode 100644
index 5fbb7e3d18db..000000000000
--- a/x11-toolkits/nucleo/files/patch-nucleo_network_dnssd_DNSServiceBrowser.H
+++ /dev/null
@@ -1,10 +0,0 @@
---- nucleo/network/dnssd/DNSServiceBrowser.H.orig	Thu May 24 15:41:15 2007
-+++ nucleo/network/dnssd/DNSServiceBrowser.H	Thu May 24 15:41:38 2007
-@@ -21,6 +21,7 @@
- #if NUCLEO_SUPPORTS_DNS_SD
- #include <arpa/inet.h>
- #include <dns_sd.h>
-+#include <sys/socket.h>
- #include <net/if.h>
- #endif
- 
diff --git a/x11-toolkits/nucleo/pkg-plist b/x11-toolkits/nucleo/pkg-plist
index 7f234ebd7ff3..779d29b9f67c 100644
--- a/x11-toolkits/nucleo/pkg-plist
+++ b/x11-toolkits/nucleo/pkg-plist
@@ -11,6 +11,7 @@ include/nucleo/core/TimeKeeper.H
 include/nucleo/core/TimeStamp.H
 include/nucleo/core/URI.H
 include/nucleo/core/UUID.H
+@dirrm include/nucleo/core
 include/nucleo/gl/glIncludes.H
 include/nucleo/gl/glUtils.H
 include/nucleo/gl/scenegraph/sgClipper.H
@@ -28,8 +29,15 @@ include/nucleo/gl/window/_macos2keysym.H
 include/nucleo/gl/window/glWindow.H
 include/nucleo/gl/window/glWindow_GLX.H
 include/nucleo/gl/window/keysym.H
+@dirrm include/nucleo/gl/window
+@dirrm include/nucleo/gl/texture
+@dirrm include/nucleo/gl/text
+@dirrm include/nucleo/gl/shading
+@dirrm include/nucleo/gl/scenegraph
+@dirrm include/nucleo/gl
 include/nucleo/helpers/OpenCV.H
 include/nucleo/helpers/Phone.H
+@dirrm include/nucleo/helpers
 include/nucleo/image/Image.H
 include/nucleo/image/ImageBridge.H
 include/nucleo/image/RegionOfInterest.H
@@ -52,9 +60,11 @@ include/nucleo/image/processing/difference/SceneChangeDetector.H
 include/nucleo/image/processing/gamma/GammaCorrection.H
 include/nucleo/image/processing/noise/PerlinNoise.H
 include/nucleo/image/sink/ImageSink.H
+include/nucleo/image/sink/blackholeImageSink.H
 include/nucleo/image/sink/bufferedImageSink.H
 include/nucleo/image/sink/glwindowImageSink.H
 include/nucleo/image/sink/imagefileImageSink.H
+include/nucleo/image/sink/novImageSink.H
 include/nucleo/image/sink/nserverImageSink.H
 include/nucleo/image/sink/nudpImageSink.H
 include/nucleo/image/sink/nudppImageSink.H
@@ -62,12 +72,24 @@ include/nucleo/image/sink/serverpushImageSink.H
 include/nucleo/image/source/ImageSource.H
 include/nucleo/image/source/imagefileImageSource.H
 include/nucleo/image/source/noiseImageSource.H
+include/nucleo/image/source/novImageSource.H
 include/nucleo/image/source/nucImageSource.H
 include/nucleo/image/source/nudpImageSource.H
 include/nucleo/image/source/nudpcImageSource.H
 include/nucleo/image/source/nudppImageSource.H
 include/nucleo/image/source/serverpushImageSource.H
 include/nucleo/image/source/vssImageSource.H
+@dirrm include/nucleo/image/source
+@dirrm include/nucleo/image/sink
+@dirrm include/nucleo/image/processing/noise
+@dirrm include/nucleo/image/processing/gamma
+@dirrm include/nucleo/image/processing/difference
+@dirrm include/nucleo/image/processing/convolution
+@dirrm include/nucleo/image/processing/chromakeying
+@dirrm include/nucleo/image/processing/basic
+@dirrm include/nucleo/image/processing
+@dirrm include/nucleo/image/encoding
+@dirrm include/nucleo/image
 include/nucleo/network/NetworkUtils.H
 include/nucleo/network/dnssd/DNSService.H
 include/nucleo/network/dnssd/DNSServiceAnnouncer.H
@@ -86,10 +108,19 @@ include/nucleo/network/udp/UdpPlusSender.H
 include/nucleo/network/udp/UdpReceiver.H
 include/nucleo/network/udp/UdpSender.H
 include/nucleo/network/udp/UdpSocket.H
+include/nucleo/network/xmpp/XmppConnection.H
+@dirrm include/nucleo/network/xmpp
+@dirrm include/nucleo/network/udp
+@dirrm include/nucleo/network/tcp
+@dirrm include/nucleo/network/http
+@dirrm include/nucleo/network/dnssd
+@dirrm include/nucleo/network
 include/nucleo/nucleo.H
 %%QT4%%include/nucleo/plugins/qt/qtReactiveEngine.H
 %%QT4%%include/nucleo/plugins/qt/qtFileKeeper.H
 %%QT4%%include/nucleo/plugins/qt/qtTimeKeeper.H
+%%QT4%%@dirrm include/nucleo/plugins/qt
+%%QT4%%@dirrm include/nucleo/plugins
 include/nucleo/utils/AppUtils.H
 include/nucleo/utils/Base64.H
 include/nucleo/utils/ByteOrder.H
@@ -99,12 +130,22 @@ include/nucleo/utils/MD5.H
 include/nucleo/utils/SignalUtils.H
 include/nucleo/utils/StringUtils.H
 include/nucleo/utils/TimeUtils.H
+@dirrm include/nucleo/utils
+include/nucleo/xml/XmlText.H
+include/nucleo/xml/XmlStructure.H
+include/nucleo/xml/XmlParser.H
+@dirrm include/nucleo/xml
+@dirrm include/nucleo
 lib/libNucleo.la
 lib/libNucleo.so
 lib/libNucleo.so.0
+%%FFMPEG%%lib/nucleo/nPffmpeg.la
+%%FFMPEG%%lib/nucleo/nPffmpeg.so
+%%GD%%lib/nucleo/nPgd.la
+%%GD%%lib/nucleo/nPgd.so
 %%QT4%%lib/nucleo/nPqt.la
 %%QT4%%lib/nucleo/nPqt.so
-%%QT4%%lib/nucleo/nPqt.so.0
+@dirrmtry lib/nucleo
 libdata/pkgconfig/nucleo.pc
 %%DATADIR%%/Info.plist.tmpl
 %%DATADIR%%/fonts/Vera.ttf
@@ -122,32 +163,3 @@ libdata/pkgconfig/nucleo.pc
 %%DATADIR%%/plugin-list
 @dirrm share/nucleo/fonts
 @dirrm share/nucleo
-%%QT4%%@dirrm lib/nucleo
-@dirrm include/nucleo/utils
-%%QT4%%@dirrm include/nucleo/plugins/qt
-%%QT4%%@dirrm include/nucleo/plugins
-@dirrm include/nucleo/network/udp
-@dirrm include/nucleo/network/tcp
-@dirrm include/nucleo/network/http
-@dirrm include/nucleo/network/dnssd
-@dirrm include/nucleo/network
-@dirrm include/nucleo/image/source
-@dirrm include/nucleo/image/sink
-@dirrm include/nucleo/image/processing/noise
-@dirrm include/nucleo/image/processing/gamma
-@dirrm include/nucleo/image/processing/difference
-@dirrm include/nucleo/image/processing/convolution
-@dirrm include/nucleo/image/processing/chromakeying
-@dirrm include/nucleo/image/processing/basic
-@dirrm include/nucleo/image/processing
-@dirrm include/nucleo/image/encoding
-@dirrm include/nucleo/image
-@dirrm include/nucleo/helpers
-@dirrm include/nucleo/gl/window
-@dirrm include/nucleo/gl/texture
-@dirrm include/nucleo/gl/text
-@dirrm include/nucleo/gl/shading
-@dirrm include/nucleo/gl/scenegraph
-@dirrm include/nucleo/gl
-@dirrm include/nucleo/core
-@dirrm include/nucleo