-adapt to modular-x11: add individual libraries and search in ${LOCALBASE}

-explicitely disable the "clarens" web service part because it needs
 an xmlrpc-c version incompatible with the pkgsrc one

3 files changed, 61 insertions, 5 deletions

diff --git a/misc/root/Makefile b/misc/root/Makefile
index 6c5a4fdfab0..1afe504ebf5 100644
--- a/misc/root/Makefile
+++ b/misc/root/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2007/02/22 19:26:50 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2007/08/09 20:13:17 drochner Exp $
 
 DISTNAME=		root_v5.10.00.source
 PKGNAME=		root-5.10
@@ -29,6 +29,8 @@ CONFIGURE_ENV+=		LOCALBASE=${LOCALBASE}
 CONFIGURE_ARGS+=	--enable-soversion
 CONFIGURE_ARGS+=	--disable-builtin-pcre
 CONFIGURE_ARGS+=	--disable-builtin-freetype
+# clarens needs xmlrpc-c, the pkgsrc version is incompatible
+CONFIGURE_ARGS+=	--disable-clarens
 
 # option, requires libxml2
 CONFIGURE_ARGS+=	--disable-xml
@@ -45,8 +47,11 @@ post-extract:
 	${CP} ${FILESDIR}/Makefile.netbsd ${WRKSRC}/config
 
 .include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
+.include "../../x11/libXi/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/root/distinfo b/misc/root/distinfo
index 6825c38e167..14c48760c3f 100644
--- a/misc/root/distinfo
+++ b/misc/root/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2006/05/27 12:38:27 drochner Exp $
+$NetBSD: distinfo,v 1.6 2007/08/09 20:13:17 drochner Exp $
 
 SHA1 (root_v5.10.00.source.tar.gz) = 574cb0ecafe1340c8df425a8e05e9bb4cd2264c5
 RMD160 (root_v5.10.00.source.tar.gz) = 975cc1941cd38428a3afa3ce9cad35106381de64
@@ -15,5 +15,5 @@ SHA1 (patch-ai) = 5c93c20de571c624975d9e55d738fe14ad8a9004
 SHA1 (patch-aj) = f52c4bc7805af6f654a4d57e8a1c42e6a38c50b9
 SHA1 (patch-ak) = 10aa0633340f47a01acf7704ca37506876e4e908
 SHA1 (patch-al) = 9f6ba7bceb504f4f3dd47609f73b1467c622be0d
-SHA1 (patch-am) = 9614180ce0e0dba97204e8596c51fbde7db4bd76
+SHA1 (patch-am) = 4a44396618e2a4bdce1d379ccc540c77f3c0d8a6
 SHA1 (patch-an) = 94be1e1cba4e5de2510da412f03011068c7562f5
diff --git a/misc/root/patches/patch-am b/misc/root/patches/patch-am
index 797544412b9..6c1ce5f98ef 100644
--- a/misc/root/patches/patch-am
+++ b/misc/root/patches/patch-am
@@ -1,7 +1,58 @@
-$NetBSD: patch-am,v 1.2 2006/05/27 12:38:27 drochner Exp $
+$NetBSD: patch-am,v 1.3 2007/08/09 20:13:17 drochner Exp $
 
---- configure.orig	2006-05-26 23:29:18.000000000 +0200
+--- configure.orig	2006-03-02 09:41:46.000000000 +0100
 +++ configure
+@@ -1174,7 +1174,7 @@ if test ! "$platform" = "win32"; then
+     check_library "libX11" "yes" "$x11libdir" \
+ 	/usr/lib /usr/X11R6/lib /usr/lib/X11 /usr/openwin/lib \
+ 	/usr/local/lib /usr/local/lib/X11 /usr/local/X11R6/lib \
+-	/usr/X11/lib /usr/lib/X11R5
++	/usr/X11/lib /usr/lib/X11R5 ${LOCALBASE}/lib
+     x11libdir=$found_dir
+ 
+     if test "x$found_lib" = "x" ; then
+@@ -1185,7 +1185,7 @@ if test ! "$platform" = "win32"; then
+     check_header "X11/Xlib.h" "" \
+ 	/usr/include /usr/X11R6/include /usr/include/X11 /usr/openwin/include \
+ 	/usr/local/include /usr/local/include/X11 /usr/local/X11R6/include \
+-	/usr/X11/include /usr/include/X11R5
++	/usr/X11/include /usr/include/X11R5 ${LOCALBASE}/include
+ 
+     if test "x$found_dir" = "x" ; then
+ 	result "`basename $0`: X11 headers (package x11-devel) MUST be installed"
+@@ -1195,7 +1195,7 @@ if test ! "$platform" = "win32"; then
+     check_library "libXpm" "$enable_shared" "$xpmlibdir" \
+ 	$XPM $XPM/lib /usr/local/lib /usr/lib /usr/lib/X11 \
+ 	/usr/local/lib/X11 /usr/X11R6/lib /usr/local/X11R6/lib \
+-	/usr/X11/lib
++	/usr/X11/lib ${LOCALBASE}/lib
+     xpmlib=$found_lib
+     xpmlibdir=$found_dir
+ 
+@@ -1352,7 +1352,7 @@ if test ! "x$enable_opengl" = "xno" && t
+ 	/usr/local/X11R6/include /usr/local/include \
+ 	/usr/include/Mesa /usr/local/include/Mesa /usr/Mesa/include \
+ 	/usr/local/Mesa/include /usr/Mesa /usr/local/Mesa /opt/Mesa \
+-	/opt/Mesa/include /opt/graphics/OpenGL/include
++	/opt/Mesa/include /opt/graphics/OpenGL/include ${LOCALBASE}/include
+     openglinc=$found_hdr
+     openglincdir=$found_dir
+ 
+@@ -1364,12 +1364,12 @@ if test ! "x$enable_opengl" = "xno" && t
+ 
+     keep=$opengllibdir
+     check_library "libGL libMesaGL" "$enable_shared" \
+-	"$opengllibdir" $opengllibdirs
++	"$opengllibdir" $opengllibdirs ${LOCALBASE}/lib
+     opengllib=$found_lib
+     opengllibdir=$found_dir
+ 
+     check_library "libGLU libMesaGLU" "$enable_shared" \
+-	"$keep" $opengllibdirs
++	"$keep" $opengllibdirs ${LOCALBASE}/lib
+     openglulib=$found_lib
+     openglulibdir=$found_dir
+ 
 @@ -1982,21 +1982,20 @@ if test ! "x$enable_asimage" = "xno" ; t
      # for a system library, then see if we have various headers needed.
      if test "x$enable_builtin_afterimage" = "xyes" ; then