Mon Feb 25 16:45:44 2008 UTC ()
Try to fix build for X11_TYPE != modular.


(jlam)
diff -r1.1.1.1 -r1.2 pkgsrc/devel/pdcurses/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/devel/pdcurses/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/devel/pdcurses/patches/patch-aa
cvs diff -r1.1.1.1 -r1.2 pkgsrc/devel/pdcurses/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/pdcurses/Makefile 2008/02/24 04:57:07 1.1.1.1
+++ pkgsrc/devel/pdcurses/Makefile 2008/02/25 16:45:44 1.2
@@ -1,31 +1,32 @@ @@ -1,31 +1,32 @@
1# $NetBSD: Makefile,v 1.1.1.1 2008/02/24 04:57:07 jlam Exp $ 1# $NetBSD: Makefile,v 1.2 2008/02/25 16:45:44 jlam Exp $
2 2
3DISTNAME= PDCurses-3.3 3DISTNAME= PDCurses-3.3
4PKGNAME= ${DISTNAME:tl} 4PKGNAME= ${DISTNAME:tl}
5CATEGORIES= devel x11 5CATEGORIES= devel x11
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pdcurses/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pdcurses/}
7 7
8MAINTAINER= bjs@NetBSD.org 8MAINTAINER= bjs@NetBSD.org
9HOMEPAGE= http://pdcurses.sourceforge.net/ 9HOMEPAGE= http://pdcurses.sourceforge.net/
10COMMENT= public domain implementation of the X/Open curses standard 10COMMENT= public domain implementation of the X/Open curses standard
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16MAKE_JOBS_SAFE= no 16MAKE_JOBS_SAFE= no
17 17
18CONFIGURE_ARGS+= --with-x 18CONFIGURE_ARGS+= --with-x
 19CONFIGURE_ENV+= X11BASE=${X11BASE:Q}
19 20
20# PDCURSES_XAW is the name of the Xaw library. 21# PDCURSES_XAW is the name of the Xaw library.
21# 22#
22# XXX This information should really be provided by the various Xaw-like 23# XXX This information should really be provided by the various Xaw-like
23# XXX buildlink3.mk files. 24# XXX buildlink3.mk files.
24# 25#
25PDCURSES_XAW.3d= Xaw3d 26PDCURSES_XAW.3d= Xaw3d
26PDCURSES_XAW.neXtaw= neXtaw 27PDCURSES_XAW.neXtaw= neXtaw
27PDCURSES_XAW.xpm= Xaw3d 28PDCURSES_XAW.xpm= Xaw3d
28PDCURSES_XAW.standard= Xaw 29PDCURSES_XAW.standard= Xaw
29PDCURSES_XAW= ${PDCURSES_XAW.${XAW_TYPE}} 30PDCURSES_XAW= ${PDCURSES_XAW.${XAW_TYPE}}
30CONFIGURE_ENV+= PDCURSES_XAW=${PDCURSES_XAW:Q} 31CONFIGURE_ENV+= PDCURSES_XAW=${PDCURSES_XAW:Q}
31 32
cvs diff -r1.1.1.1 -r1.2 pkgsrc/devel/pdcurses/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/pdcurses/distinfo 2008/02/24 04:57:07 1.1.1.1
+++ pkgsrc/devel/pdcurses/distinfo 2008/02/25 16:45:44 1.2
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.1.1.1 2008/02/24 04:57:07 jlam Exp $ 1$NetBSD: distinfo,v 1.2 2008/02/25 16:45:44 jlam Exp $
2 2
3SHA1 (PDCurses-3.3.tar.gz) = fde5908ecc417bdbaeac494cd37a8b73011257cc 3SHA1 (PDCurses-3.3.tar.gz) = fde5908ecc417bdbaeac494cd37a8b73011257cc
4RMD160 (PDCurses-3.3.tar.gz) = 8787fa0c3f1ea0e8d85748b1a891ef6bd155cb0a 4RMD160 (PDCurses-3.3.tar.gz) = 8787fa0c3f1ea0e8d85748b1a891ef6bd155cb0a
5Size (PDCurses-3.3.tar.gz) = 329511 bytes 5Size (PDCurses-3.3.tar.gz) = 329511 bytes
6SHA1 (patch-aa) = 4561c7a62f99906b91bc016994c3cca19c396fe1 6SHA1 (patch-aa) = 18b54bdbc4564e0dd675c23a72e9388556e0c09c
7SHA1 (patch-ab) = 9381721ca10ae80a7fe012634d52ef1b018e3c6c 7SHA1 (patch-ab) = 9381721ca10ae80a7fe012634d52ef1b018e3c6c
8SHA1 (patch-ac) = 77caf60fe803d7111de2f7b75a1950284fd9e139 8SHA1 (patch-ac) = 77caf60fe803d7111de2f7b75a1950284fd9e139
cvs diff -r1.1.1.1 -r1.2 pkgsrc/devel/pdcurses/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/devel/pdcurses/patches/patch-aa 2008/02/24 04:57:07 1.1.1.1
+++ pkgsrc/devel/pdcurses/patches/patch-aa 2008/02/25 16:45:44 1.2
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1$NetBSD: patch-aa,v 1.1.1.1 2008/02/24 04:57:07 jlam Exp $ 1$NetBSD: patch-aa,v 1.2 2008/02/25 16:45:44 jlam Exp $
2 2
3--- configure.orig 2007-06-23 18:53:15.000000000 -0400 3--- configure.orig 2007-06-23 18:53:15.000000000 -0400
4+++ configure 4+++ configure
5@@ -4685,6 +4685,7 @@ for ac_dir in $mh_inc_dirs ; do 5@@ -4685,6 +4685,7 @@ for ac_dir in $mh_inc_dirs ; do
6 break 6 break
7 fi 7 fi
8 done 8 done
9+mh_x11_dir="${PREFIX}/include/X11" 9+mh_x11_dir="${X11BASE}/include/X11"
10  10
11  11
12 if test "$with_xaw3d" = yes; then 12 if test "$with_xaw3d" = yes; then
13@@ -4706,6 +4707,7 @@ for ac_dir in $mh_inc_dirs ; do 13@@ -4706,6 +4707,7 @@ for ac_dir in $mh_inc_dirs ; do
14 break 14 break
15 fi 15 fi
16 done 16 done
17+mh_x11_xaw_dir="${PREFIX}/include/X11" 17+mh_x11_xaw_dir="${X11BASE}/include/X11"
18  18
19 if test "x$mh_x11_dir" != "x" ; then 19 if test "x$mh_x11_dir" != "x" ; then
20 mh_x11_dir_no_x11=`echo $mh_x11_dir | sed 's/\/X11$//'` 20 mh_x11_dir_no_x11=`echo $mh_x11_dir | sed 's/\/X11$//'`
21@@ -4770,6 +4772,7 @@ else 21@@ -4770,6 +4772,7 @@ else
22 MH_X11_LIBS="Xaw Xmu Xt X11" 22 MH_X11_LIBS="Xaw Xmu Xt X11"
23 fi 23 fi
24 fi 24 fi
25+MH_X11_LIBS="${PDCURSES_XAW} Xmu Xt X11" 25+MH_X11_LIBS="${PDCURSES_XAW} Xmu Xt X11"
26 MH_X11R6_LIBS="SM ICE Xext" 26 MH_X11R6_LIBS="SM ICE Xext"
27 mh_x11r6=no 27 mh_x11r6=no
28  28
29@@ -4797,27 +4800,8 @@ mh_where_found="" 29@@ -4797,27 +4800,8 @@ mh_where_found=""
30 mh_where_found_dirs="" 30 mh_where_found_dirs=""