diff options
| author | bjs <bjs@pkgsrc.org> | 2008-06-30 22:23:34 +0000 |
|---|---|---|
| committer | bjs <bjs@pkgsrc.org> | 2008-06-30 22:23:34 +0000 |
| commit | a20321c62ee0b761add703949e9d01885708ad5a (patch) | |
| tree | 44458f0d888cee62e4ce8d7f839473e055d5b2f2 /chat | |
| parent | 468e31d8553db455451bbec09c053e9ca74896d7 (diff) | |
| download | pkgsrc-a20321c62ee0b761add703949e9d01885708ad5a.tar.gz | |
- 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 (limited to 'chat')
| -rw-r--r-- | chat/smirk/Makefile | 12 | ||||
| -rw-r--r-- | chat/smirk/PLIST | 9 | ||||
| -rw-r--r-- | chat/smirk/distinfo | 3 | ||||
| -rw-r--r-- | chat/smirk/patches/patch-aa | 13 |
4 files changed, 27 insertions, 10 deletions
diff --git a/chat/smirk/Makefile b/chat/smirk/Makefile index 4db9ce2dba9..8e11be9d9ca 100644 --- a/chat/smirk/Makefile +++ b/chat/smirk/Makefile @@ -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 @@ COMMENT= Revival of the curses-based Rhapsody IRC client PKG_DESTDIR_SUPPORT= user-destdir GNU_CONFIGURE= yes -USE_NCURSES= yes +CONFIGURE_ARGS+= --datadir=${DATADIR:Q} + USE_TOOLS+= gmake +USE_NCURSES= yes -BUILDLINK_TRANSFORM+= l:curses:ncurses -HELP_DIR= ${PREFIX}/share/${PKGBASE} +DATADIR= ${PREFIX}/share/${PKGBASE} +HELP_DIR= ${DATADIR}/help HELP_FILES= clientcmnds.hlp irccmnds.hlp keys.hlp do-install: @@ -29,5 +32,4 @@ do-install: .endfor .include "../../devel/ncurses/buildlink3.mk" -.include "../../mk/curses.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/smirk/PLIST b/chat/smirk/PLIST index d69d40e2945..9a9a9a25c9c 100644 --- a/chat/smirk/PLIST +++ b/chat/smirk/PLIST @@ -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 --git a/chat/smirk/distinfo b/chat/smirk/distinfo index 8167d04a503..daddc8d2fb8 100644 --- a/chat/smirk/distinfo +++ b/chat/smirk/distinfo @@ -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 --git a/chat/smirk/patches/patch-aa b/chat/smirk/patches/patch-aa new file mode 100644 index 00000000000..abab4460533 --- /dev/null +++ b/chat/smirk/patches/patch-aa @@ -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"); + |