Update to nucleo-0.7.1. The list of changes is fairly verbose and I do

not have time to include it here (see ChangeLog).

Significant pkgsrc-related changes:

 - ffmpeg plugin now builds (see new SUBST_* declarations).  Use
   ffmpeg-devel instead of ffmpeg.
 - DESTDIR support
 - GNU TLS option (enabled by default, evidently used by XML parser (?))
 - Include graphics/gd, as its dependencies completely overlap and it
   doesn't take too long to build.
 - Add x11/libXi to get Xinput functionality.
 - Yet another header patch (patch-am)
 - TODO file (place reading it on your TODO list today!)

 Next up:  wm/metisse!

7 files changed, 103 insertions, 18 deletions

diff --git a/x11/nucleo/Makefile b/x11/nucleo/Makefile
index ae26272bad2..0020c4e698d 100644
--- a/x11/nucleo/Makefile
+++ b/x11/nucleo/Makefile
@@ -1,35 +1,52 @@
-# $NetBSD: Makefile,v 1.3 2007/08/12 14:26:41 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/07 02:53:41 bjs Exp $
 #
 
-DISTNAME=	nucleo-0.6
-PKGREVISION=	1
+DISTNAME=	nucleo-0.7.1
 CATEGORIES=	x11
-MASTER_SITES=	http://insitu.lri.fr/metisse/download/0.4.0-rc4/
+MASTER_SITES=	http://www.lri.fr/~cardona/sources/nucleo/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://insitu.lri.fr/metisse/
 COMMENT=	Toolkit to explore new uses of video and HCI techniques
 
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	pkg-config
-USE_LANGUAGES+=	c c++
-USE_LIBTOOL=	yes
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+GNU_CONFIGURE=		yes
+USE_TOOLS+=		pkg-config gmake
+USE_LANGUAGES+=		c c++
+USE_LIBTOOL=		yes
 
 REPLACE_PYTHON+=	docs/MacOSX/nBundle.in
+PTHREAD_OPTS+=		require
+###
+### See options.mk for use of PLIST_VARS.
+###
+PLIST_VARS=		gnutls
+
+SUBST_CLASSES+=		mkfiles
+SUBST_FILES.mkfiles=	nucleo/plugins/*/Makefile.in
+SUBST_MESSAGE.mkfiles=	Fixing plugin-descr targets.
+SUBST_SED.mkfiles=	-e 's|@\.\ |&./|'
+SUBST_STAGE.mkfiles=	post-patch
 
 .include "../../lang/python/application.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/gd/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../multimedia/ffmpeg/buildlink3.mk"
+.include "../../multimedia/ffmpeg-devel/buildlink3.mk"
 .include "../../net/mDNSResponder/buildlink3.mk"
 
 .include "../../x11/libICE/buildlink3.mk"
+.include "../../x11/libXi/buildlink3.mk"
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../x11/libXt/buildlink3.mk"
 
+.include "options.mk"
+
+.include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/nucleo/PLIST b/x11/nucleo/PLIST
index fb529d209ff..aeea04442f6 100644
--- a/x11/nucleo/PLIST
+++ b/x11/nucleo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/06/02 08:27:43 agc Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/05/07 02:53:41 bjs Exp $
 bin/nBundle
 bin/nTest
 bin/nucleo-config
@@ -53,9 +53,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
@@ -63,6 +65,7 @@ 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
@@ -87,6 +90,7 @@ include/nucleo/network/udp/UdpPlusSender.H
 include/nucleo/network/udp/UdpReceiver.H
 include/nucleo/network/udp/UdpSender.H
 include/nucleo/network/udp/UdpSocket.H
+${PLIST.gnutls}include/nucleo/network/xmpp/XmppConnection.H
 include/nucleo/nucleo.H
 include/nucleo/utils/AppUtils.H
 include/nucleo/utils/Base64.H
@@ -97,7 +101,12 @@ include/nucleo/utils/MD5.H
 include/nucleo/utils/SignalUtils.H
 include/nucleo/utils/StringUtils.H
 include/nucleo/utils/TimeUtils.H
+${PLIST.gnutls}include/nucleo/xml/XmlParser.H
+${PLIST.gnutls}include/nucleo/xml/XmlStructure.H
+${PLIST.gnutls}include/nucleo/xml/XmlText.H
 lib/libNucleo.la
+lib/nucleo/nPffmpeg.la
+lib/nucleo/nPgd.la
 lib/pkgconfig/nucleo.pc
 share/nucleo/Info.plist.tmpl
 share/nucleo/fonts/Vera.ttf
@@ -115,7 +124,10 @@ share/nucleo/nucleo.pdf
 share/nucleo/plugin-list
 @dirrm share/nucleo/fonts
 @dirrm share/nucleo
+@dirrm lib/nucleo
+${PLIST.gnutls}@dirrm include/nucleo/xml
 @dirrm include/nucleo/utils
+${PLIST.gnutls}@dirrm include/nucleo/network/xmpp
 @dirrm include/nucleo/network/udp
 @dirrm include/nucleo/network/tcp
 @dirrm include/nucleo/network/http
diff --git a/x11/nucleo/TODO b/x11/nucleo/TODO
new file mode 100644
index 00000000000..d4190bdab9f
--- /dev/null
+++ b/x11/nucleo/TODO
@@ -0,0 +1,6 @@
+$NetBSD: TODO,v 1.1 2008/05/07 02:53:41 bjs Exp $
+
+ - Fix build of qt4 plugin.
+ - Add handler for share/nucleo/plugins-list to allow for splitting 
+   plugins out into seperate packages.
+ - Add opencv option (or seperate package) for OpenCV demos.
diff --git a/x11/nucleo/buildlink3.mk b/x11/nucleo/buildlink3.mk
index b6d7c4eceda..070e90b07eb 100644
--- a/x11/nucleo/buildlink3.mk
+++ b/x11/nucleo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/06/02 08:27:43 agc Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2008/05/07 02:53:41 bjs Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 NUCLEO_BUILDLINK3_MK:=	${NUCLEO_BUILDLINK3_MK}+
@@ -14,14 +14,26 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}nucleo
 .if ${NUCLEO_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.nucleo+=	nucleo>=0.6
 BUILDLINK_PKGSRCDIR.nucleo?=	../../x11/nucleo
+pkgbase:=nucleo
+.  include "../../mk/pkg-build-options.mk"
 .endif	# NUCLEO_BUILDLINK3_MK
 
+.if !empty(PKG_BUILD_OPTIONS.nucleo:Mgnutls)
+.  include "../../security/gnutls/buildlink3.mk"
+.endif
+
+#.if !empty(PKG_BUILD_OPTIONS.nucleo:Mqt4)
+#.  include "../../x11/qt4-libs/buildlink3.mk"
+#.endif
+
 .include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/gd/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../multimedia/ffmpeg/buildlink3.mk"
+.include "../../multimedia/ffmpeg-devel/buildlink3.mk"
 .include "../../net/mDNSResponder/buildlink3.mk"
 
+.include "../../mk/pthread.buildlink3.mk"
+
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/nucleo/distinfo b/x11/nucleo/distinfo
index 31a0ea1d734..e4089d59579 100644
--- a/x11/nucleo/distinfo
+++ b/x11/nucleo/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2007/06/12 16:16:56 joerg Exp $
+$NetBSD: distinfo,v 1.3 2008/05/07 02:53:41 bjs Exp $
 
-SHA1 (nucleo-0.6.tar.bz2) = e8935ea8998ec80e24fad65c29a2981bd1b4fccc
-RMD160 (nucleo-0.6.tar.bz2) = d1eefd7dc03645a5a11af299c0225bed118500cf
-Size (nucleo-0.6.tar.bz2) = 806154 bytes
+SHA1 (nucleo-0.7.1.tar.bz2) = 81bcf54ca73167462f63604430375a48c19f67e9
+RMD160 (nucleo-0.7.1.tar.bz2) = cc82c676422a4b07607f6da404064646be707dca
+Size (nucleo-0.7.1.tar.bz2) = 815922 bytes
 SHA1 (patch-aa) = de7e9bb9ab4bca00ef72269357027d6e1748c6cb
 SHA1 (patch-ab) = 6b38f25a856a30826662a3019966250ca8526903
 SHA1 (patch-ac) = 2fb7982057e412ce7c25f7d4193af30f41b2d545
@@ -15,3 +15,4 @@ SHA1 (patch-ai) = 6328c96d45675765c16b4248560a6d918f64bfe4
 SHA1 (patch-aj) = f627182b2feec55f5d8fc60ac8c6e32b846e658a
 SHA1 (patch-ak) = 0f9f442082548e20ed030988b211f59a5eb9827b
 SHA1 (patch-al) = 6684c1b1a3b85defaed2a7457fe4ef1f7c79c117
+SHA1 (patch-am) = 1abd0f40ffe2c9ea42fde983bc784d3a10d1ec02
diff --git a/x11/nucleo/options.mk b/x11/nucleo/options.mk
new file mode 100644
index 00000000000..57c50c64a69
--- /dev/null
+++ b/x11/nucleo/options.mk
@@ -0,0 +1,25 @@
+PKG_OPTIONS_VAR=	PKG_OPTIONS.nucleo
+PKG_SUPPORTED_OPTIONS=	gnutls # qt4
+PKG_SUGGESTED_OPTIONS=	gnutls
+
+.include "../../mk/bsd.options.mk"
+
+###
+### XXX The build currently fails.  This needs to be investigated.
+###
+#.if !empty(PKG_OPTIONS:Mqt4)
+#CONFIGURE_ARGS+=	--with-qt
+#PLIST_VARS+=		qt4
+#.  include "../../x11/qt4-libs/buildlink3.mk"
+#.else
+#CONFIGURE_ARGS+=	--without-qt
+#.endif
+
+.if !empty(PKG_OPTIONS:Mgnutls)
+CONFIGURE_ARGS+=	--with-gnutls
+PLIST.gnutls=		yes
+.  include "../../security/gnutls/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-gnutls
+PLIST.gnutls=		no
+.endif
diff --git a/x11/nucleo/patches/patch-am b/x11/nucleo/patches/patch-am
new file mode 100644
index 00000000000..689615a7fb5
--- /dev/null
+++ b/x11/nucleo/patches/patch-am
@@ -0,0 +1,12 @@
+$NetBSD: patch-am,v 1.1 2008/05/07 02:53:41 bjs Exp $
+
+--- nucleo/image/sink/nudppImageSink.H.orig	2008-01-29 08:54:23.000000000 -0500
++++ nucleo/image/sink/nudppImageSink.H
+@@ -14,6 +14,7 @@
+ 
+ #include <nucleo/image/sink/ImageSink.H>
+ 
++#include <netinet/in_systm.h>
+ #include <netinet/in.h>
+ 
+ namespace nucleo {