From cd4295b57b0a25e9a83280efa4fd36d4f9f2773f Mon Sep 17 00:00:00 2001 From: dholland Date: Thu, 15 Dec 2011 18:51:43 +0000 Subject: Fix up problems finding libraries. Now it passes configure, but it looks like it needs png patches to build. --- misc/root/Makefile | 8 ++++++-- misc/root/distinfo | 4 ++-- misc/root/patches/patch-am | 18 +++++++++--------- 3 files changed, 17 insertions(+), 13 deletions(-) (limited to 'misc') diff --git a/misc/root/Makefile b/misc/root/Makefile index c1cf90e6a51..f5a90b137b3 100644 --- a/misc/root/Makefile +++ b/misc/root/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2011/12/14 15:01:41 dholland Exp $ +# $NetBSD: Makefile,v 1.43 2011/12/15 18:51:43 dholland Exp $ DISTNAME= root_v5.26.00b.source PKGNAME= root-5.26 @@ -28,13 +28,16 @@ INSTALLATION_DIRS= bin HAS_CONFIGURE= yes CONFIGURE_ARGS+= ${LOWER_OPSYS} CONFIGURE_ARGS+= --prefix=${PREFIX} --mandir=${PREFIX}/${PKGMANDIR}/man1 -CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} +CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} 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 +CONFIGURE_ARGS+= --with-x11-libdir=${BUILDLINK_PREFIX.libX11}/lib +CONFIGURE_ARGS+= --with-xpm-libdir=${BUILDLINK_PREFIX.libXpm}/lib + # option, requires libxml2 CONFIGURE_ARGS+= --disable-xml #.include "../../textproc/libxml2/buildlink3.mk" @@ -60,4 +63,5 @@ post-extract: .include "../../x11/libXmu/buildlink3.mk" .include "../../x11/libXi/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/root/distinfo b/misc/root/distinfo index c34bb485e2f..6c9c1545d59 100644 --- a/misc/root/distinfo +++ b/misc/root/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2010/02/26 10:56:38 drochner Exp $ +$NetBSD: distinfo,v 1.8 2011/12/15 18:51:43 dholland Exp $ SHA1 (root_v5.26.00b.source.tar.gz) = 70db6f9cf6acc29bcf0060a4c2e1f9e24c26702a RMD160 (root_v5.26.00b.source.tar.gz) = 057ce1151a534f00a445ec69392e7a7a3bd55ca8 @@ -15,7 +15,7 @@ SHA1 (patch-ai) = 8b8cc76a1cd1115bd567895b4214d48cef5ab2dd SHA1 (patch-aj) = 1a162338c75483a21904a07bea1b74e8992132a2 SHA1 (patch-ak) = e88d68f70b8022c70d9c8789200fa2a8e3af883f SHA1 (patch-al) = 9f6ba7bceb504f4f3dd47609f73b1467c622be0d -SHA1 (patch-am) = 4cbdb74a3bdac0b2581dbd1d494604efc3a0062f +SHA1 (patch-am) = 05756cbd57e04c0f7ca1f606245749dc3ec58ddc SHA1 (patch-an) = 28a17f5772de4408a1d6d6e4389266ae61e6612c SHA1 (patch-ba) = 1e434d27ecbfc21edc17780b5e9ac5ecd73e7794 SHA1 (patch-bb) = e2bfafb02ff14d6dc6206b0e7fb45788d88292a8 diff --git a/misc/root/patches/patch-am b/misc/root/patches/patch-am index b59cde7a5f4..d6d69697e19 100644 --- a/misc/root/patches/patch-am +++ b/misc/root/patches/patch-am @@ -1,4 +1,4 @@ -$NetBSD: patch-am,v 1.4 2010/02/26 10:56:38 drochner Exp $ +$NetBSD: patch-am,v 1.5 2011/12/15 18:51:43 dholland Exp $ --- configure.orig 2010-02-11 13:21:10.000000000 +0000 +++ configure @@ -7,7 +7,7 @@ $NetBSD: patch-am,v 1.4 2010/02/26 10:56:38 drochner Exp $ /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 ++ /usr/X11/lib /usr/lib/X11R5 ${X11BASE}/lib x11libdir=$found_dir if test "x$found_lib" = "x" ; then @@ -16,7 +16,7 @@ $NetBSD: patch-am,v 1.4 2010/02/26 10:56:38 drochner Exp $ /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 ++ /usr/X11/include /usr/include/X11R5 ${X11BASE}/include if test "x$found_dir" = "x" ; then result "`basename $0`: X11 headers (package x11-devel) MUST be installed" @@ -25,7 +25,7 @@ $NetBSD: patch-am,v 1.4 2010/02/26 10:56:38 drochner Exp $ /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 ++ /usr/X11/include /usr/include/X11R5 ${X11BASE}/include if test "x$found_dir" = "x" ; then result "`basename $0`: Xft headers (libxft-devel) MUST be installed" @@ -34,7 +34,7 @@ $NetBSD: patch-am,v 1.4 2010/02/26 10:56:38 drochner Exp $ /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 ++ /usr/X11/include /usr/include/X11R5 ${X11BASE}/include if test "x$found_dir" = "x" ; then result "`basename $0`: X11/extensions/shape.h header (xorg-x11-proto-devel) MUST be installed" @@ -43,7 +43,7 @@ $NetBSD: patch-am,v 1.4 2010/02/26 10:56:38 drochner Exp $ $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 ++ /usr/X11/lib ${X11BASE}/lib xpmlib=$found_lib xpmlibdir=$found_dir @@ -52,7 +52,7 @@ $NetBSD: patch-am,v 1.4 2010/02/26 10:56:38 drochner Exp $ /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 ++ /usr/X11/lib ${X11BASE}/lib if test "x$found_lib" = "x" ; then result "`basename $0`: libXft (libxft-devel) MUST be installed" @@ -61,7 +61,7 @@ $NetBSD: patch-am,v 1.4 2010/02/26 10:56:38 drochner Exp $ /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 ++ /usr/X11/lib ${X11BASE}/lib if test "x$found_lib" = "x" ; then result "`basename $0`: libXext (libXext-devel) MUST be installed" @@ -79,7 +79,7 @@ $NetBSD: patch-am,v 1.4 2010/02/26 10:56:38 drochner Exp $ /usr/X11/lib /usr/lib/Mesa /usr/local/lib/Mesa /usr/Mesa/lib \ /usr/local/Mesa/lib /usr/Mesa /usr/local/Mesa /opt/Mesa \ - /opt/Mesa/lib /opt/graphics/OpenGL/lib" -+ /opt/Mesa/lib /opt/graphics/OpenGL/lib ${LOCALBASE}/lib" ++ /opt/Mesa/lib /opt/graphics/OpenGL/lib ${X11BASE}/lib ${LOCALBASE}/lib" keep=$opengllibdir check_library "libGL libMesaGL" "$enable_shared" \ -- cgit v1.2.3