+ Support user-destdir installation.

+ Include termcap.buildlink3.mk because curses.so is linked against
  -ltermcap, so we need it to be transformed into the right library
  depending on the platform and PREFER_* settings.

  Bump the PKGREVISION to 1.

+ Because we are asking for ncurses (by include ncurses/buildlink3.mk),
  check for <ncurses.h> and -lncurses instead of <curses.h> and
  -lcurses.  The curses.c file gets it wrong otherwise.

3 files changed, 16 insertions, 18 deletions

diff --git a/devel/ruby-curses/Makefile b/devel/ruby-curses/Makefile
index f6d98d92630..e4faa3c34fd 100644
--- a/devel/ruby-curses/Makefile
+++ b/devel/ruby-curses/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2007/03/15 16:42:32 taca Exp $
+# $NetBSD: Makefile,v 1.12 2008/03/13 21:55:48 jlam Exp $
 #
 
 DISTNAME=		${RUBY_DISTNAME}
 PKGNAME=		${RUBY_PKGPREFIX}-curses-${RUBY_VERSION_SUFFIX}
+PKGREVISION=		1
 CATEGORIES=		devel ruby
 MASTER_SITES=		${MASTER_SITE_RUBY}
 
@@ -10,6 +11,8 @@ MAINTAINER=		taca@NetBSD.org
 HOMEPAGE=		${RUBY_HOMEPAGE}
 COMMENT=		Ruby extension to curses library
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 RUBY_HAS_ARCHLIB=	yes
 USE_RUBY_EXTCONF=	yes
 EXTRACT_ELEMENTS=	${RUBY_DISTNAME}/ext/curses
@@ -19,12 +22,13 @@ CURSES_EXAMPLES=	hello.rb rain.rb view.rb view2.rb
 REPLACE_RUBY=		${CURSES_EXAMPLES}
 
 post-install:
-	${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/curses
+	${INSTALL_DATA_DIR} ${DESTDIR}${RUBY_EXAMPLESDIR}/curses
 .for f in ${CURSES_EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_EXAMPLESDIR}/curses
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${RUBY_EXAMPLESDIR}/curses
 .endfor
 
 .include "../../lang/ruby/modules.mk"
 .include "../../lang/ruby/Makefile.common"
 .include "../../devel/ncurses/buildlink3.mk"
+.include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ruby-curses/distinfo b/devel/ruby-curses/distinfo
index faaee014815..84746a393ec 100644
--- a/devel/ruby-curses/distinfo
+++ b/devel/ruby-curses/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2008/03/09 13:31:18 taca Exp $
+$NetBSD: distinfo,v 1.13 2008/03/13 21:55:48 jlam Exp $
 
 SHA1 (ruby-1.8.6-p114.tar.bz2) = 9929782935ebb77d040593a010b8d65b03ce6e23
 RMD160 (ruby-1.8.6-p114.tar.bz2) = 332d6e98ef79ad8175ce699ed5293407763f769f
 Size (ruby-1.8.6-p114.tar.bz2) = 3920921 bytes
-SHA1 (patch-aa) = 8c98c46b88e90f70b171d9e909653239ff9fe68e
+SHA1 (patch-aa) = 5e5dcea99e02716e42a428a2d01769c5709f0f45
diff --git a/devel/ruby-curses/patches/patch-aa b/devel/ruby-curses/patches/patch-aa
index 12e31fa4c53..c7b4c6cefd6 100644
--- a/devel/ruby-curses/patches/patch-aa
+++ b/devel/ruby-curses/patches/patch-aa
@@ -1,20 +1,14 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/11/27 14:35:15 taca Exp $
+$NetBSD: patch-aa,v 1.2 2008/03/13 21:55:48 jlam Exp $
 
---- extconf.rb.orig	2003-12-16 16:47:58.000000000 +0900
+--- extconf.rb.orig	2007-02-12 18:01:19.000000000 -0500
 +++ extconf.rb
-@@ -7,14 +7,7 @@ dir_config('termcap')
- make=false
- have_library("mytinfo", "tgetent") if /bow/ =~ RUBY_PLATFORM
- have_library("tinfo", "tgetent") or have_library("termcap", "tgetent")
--if have_header(*curses=%w"ncurses.h") and have_library("ncurses", "initscr")
--  make=true
--elsif have_header(*curses=%w"ncurses/curses.h") and have_library("ncurses", "initscr")
--  make=true
+@@ -11,9 +11,6 @@ if have_header(*curses=%w"ncurses.h") an
+   make=true
+ elsif have_header(*curses=%w"ncurses/curses.h") and have_library("ncurses", "initscr")
+   make=true
 -elsif have_header(*curses=%w"curses_colr/curses.h") and have_library("cur_colr", "initscr")
 -  curses.unshift("varargs.h")
 -  make=true
--elsif have_header(*curses=%w"curses.h") and have_library("curses", "initscr")
-+if have_header(*curses=%w"curses.h") and have_library("curses", "initscr")
+ elsif have_header(*curses=%w"curses.h") and have_library("curses", "initscr")
    make=true
  end
-