[pkgsrc/trunk]: pkgsrc/chat/smirk - Handle ncurses dependency properly, elimi...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a7de8d37cfef
branches:  trunk
changeset: 543991:a7de8d37cfef
user:      bjs <bjs%pkgsrc.org@localhost>
date:      Mon Jun 30 22:23:34 2008 +0000

description:
- Handle ncurses dependency properly, eliminating unintentional inclusion
   of mk/curses.b3.mk after devel/ncurses/b3.mk.

 - Define DATADIR correctly so that it knows where to look for help files.

 - Remove quotes around DOCS_PATH in snprintf() call so that smirk can
   actually open the help files.

 - Bump PKGREVISION.

diffstat:

 chat/smirk/Makefile         |  14 ++++++++------
 chat/smirk/PLIST            |   9 +++++----
 chat/smirk/distinfo         |   3 ++-
 chat/smirk/patches/patch-aa |  13 +++++++++++++
 4 files changed, 28 insertions(+), 11 deletions(-)

diffs (80 lines):

diff -r f70cdf7fe56b -r a7de8d37cfef chat/smirk/Makefile
--- a/chat/smirk/Makefile       Mon Jun 30 15:54:30 2008 +0000
+++ b/chat/smirk/Makefile       Mon Jun 30 22:23:34 2008 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2008/04/21 15:09:07 bjs Exp $
+# $NetBSD: Makefile,v 1.4 2008/06/30 22:23:34 bjs Exp $
 #
 
 DISTNAME=      smirk-20080111
+PKGREVISION=   1
 CATEGORIES=    chat
 MASTER_SITES=  ${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=  .tar.bz2
@@ -13,11 +14,13 @@
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 GNU_CONFIGURE=         yes
-USE_NCURSES=           yes
-USE_TOOLS+=            gmake
+CONFIGURE_ARGS+=       --datadir=${DATADIR:Q}
 
-BUILDLINK_TRANSFORM+=  l:curses:ncurses
-HELP_DIR=              ${PREFIX}/share/${PKGBASE}
+USE_TOOLS+=            gmake
+USE_NCURSES=           yes
+
+DATADIR=               ${PREFIX}/share/${PKGBASE}
+HELP_DIR=              ${DATADIR}/help
 HELP_FILES=            clientcmnds.hlp irccmnds.hlp keys.hlp
 
 do-install:
@@ -29,5 +32,4 @@
 .endfor
 
 .include "../../devel/ncurses/buildlink3.mk"
-.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r f70cdf7fe56b -r a7de8d37cfef chat/smirk/PLIST
--- a/chat/smirk/PLIST  Mon Jun 30 15:54:30 2008 +0000
+++ b/chat/smirk/PLIST  Mon Jun 30 22:23:34 2008 +0000
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/01/12 05:56:15 bjs Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/06/30 22:23:34 bjs Exp $
 bin/smirk
-share/smirk/clientcmnds.hlp
-share/smirk/irccmnds.hlp
-share/smirk/keys.hlp
+share/smirk/help/clientcmnds.hlp
+share/smirk/help/irccmnds.hlp
+share/smirk/help/keys.hlp
+@dirrm share/smirk/help
 @dirrm share/smirk
diff -r f70cdf7fe56b -r a7de8d37cfef chat/smirk/distinfo
--- a/chat/smirk/distinfo       Mon Jun 30 15:54:30 2008 +0000
+++ b/chat/smirk/distinfo       Mon Jun 30 22:23:34 2008 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/01/12 05:56:15 bjs Exp $
+$NetBSD: distinfo,v 1.2 2008/06/30 22:23:34 bjs Exp $
 
 SHA1 (smirk-20080111.tar.bz2) = a5cfacbd655e76f39d3d8093b724266f9d6c92ac
 RMD160 (smirk-20080111.tar.bz2) = b834e5c78e7882710d109e603f528fc2fccb7167
 Size (smirk-20080111.tar.bz2) = 151171 bytes
+SHA1 (patch-aa) = 05f337326017d2d457e9d5ee4f369ec1ecf3f30e
diff -r f70cdf7fe56b -r a7de8d37cfef chat/smirk/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/smirk/patches/patch-aa       Mon Jun 30 22:23:34 2008 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2008/06/30 22:23:34 bjs Exp $
+
+--- src/screen.c.orig  2007-05-08 10:18:18.000000000 -0400
++++ src/screen.c
+@@ -2195,7 +2195,7 @@ int print_help_file(help *H, char *filen
+       char line[4096];
+       char path[4096];
+ 
+-    sprintf(path,"%s/%s/%s","DOCS_PATH","help",filename);
++    sprintf(path,"%s/%s/%s",DOCS_PATH,"help",filename);
+ 
+       fp = fopen(path, "rb");
+