[pkgsrc/trunk]: pkgsrc/devel/pdcurses Try to fix build for X11_TYPE != modular.

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e23e0d65cb4e
branches:  trunk
changeset: 539039:e23e0d65cb4e
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Feb 25 16:45:44 2008 +0000

description:
Try to fix build for X11_TYPE != modular.

diffstat:

 devel/pdcurses/Makefile         |  3 ++-
 devel/pdcurses/distinfo         |  4 ++--
 devel/pdcurses/patches/patch-aa |  6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diffs (58 lines):

diff -r 4346481ad300 -r e23e0d65cb4e devel/pdcurses/Makefile
--- a/devel/pdcurses/Makefile   Mon Feb 25 16:38:00 2008 +0000
+++ b/devel/pdcurses/Makefile   Mon Feb 25 16:45:44 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/02/24 04:57:07 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2008/02/25 16:45:44 jlam Exp $
 
 DISTNAME=      PDCurses-3.3
 PKGNAME=       ${DISTNAME:tl}
@@ -16,6 +16,7 @@
 MAKE_JOBS_SAFE=                no
 
 CONFIGURE_ARGS+=       --with-x
+CONFIGURE_ENV+=                X11BASE=${X11BASE:Q}
 
 # PDCURSES_XAW is the name of the Xaw library.
 #
diff -r 4346481ad300 -r e23e0d65cb4e devel/pdcurses/distinfo
--- a/devel/pdcurses/distinfo   Mon Feb 25 16:38:00 2008 +0000
+++ b/devel/pdcurses/distinfo   Mon Feb 25 16:45:44 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/02/24 04:57:07 jlam Exp $
+$NetBSD: distinfo,v 1.2 2008/02/25 16:45:44 jlam Exp $
 
 SHA1 (PDCurses-3.3.tar.gz) = fde5908ecc417bdbaeac494cd37a8b73011257cc
 RMD160 (PDCurses-3.3.tar.gz) = 8787fa0c3f1ea0e8d85748b1a891ef6bd155cb0a
 Size (PDCurses-3.3.tar.gz) = 329511 bytes
-SHA1 (patch-aa) = 4561c7a62f99906b91bc016994c3cca19c396fe1
+SHA1 (patch-aa) = 18b54bdbc4564e0dd675c23a72e9388556e0c09c
 SHA1 (patch-ab) = 9381721ca10ae80a7fe012634d52ef1b018e3c6c
 SHA1 (patch-ac) = 77caf60fe803d7111de2f7b75a1950284fd9e139
diff -r 4346481ad300 -r e23e0d65cb4e devel/pdcurses/patches/patch-aa
--- a/devel/pdcurses/patches/patch-aa   Mon Feb 25 16:38:00 2008 +0000
+++ b/devel/pdcurses/patches/patch-aa   Mon Feb 25 16:45:44 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/02/24 04:57:07 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2008/02/25 16:45:44 jlam Exp $
 
 --- configure.orig     2007-06-23 18:53:15.000000000 -0400
 +++ configure
@@ -6,7 +6,7 @@
      break
    fi
  done
-+mh_x11_dir="${PREFIX}/include/X11"
++mh_x11_dir="${X11BASE}/include/X11"
  
  
  if test "$with_xaw3d" = yes; then
@@ -14,7 +14,7 @@
      break
    fi
  done
-+mh_x11_xaw_dir="${PREFIX}/include/X11"
++mh_x11_xaw_dir="${X11BASE}/include/X11"
  
  if test "x$mh_x11_dir" != "x" ; then
        mh_x11_dir_no_x11=`echo $mh_x11_dir | sed 's/\/X11$//'`