diff options
| author | rillig <rillig@pkgsrc.org> | 2006-11-19 22:48:07 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2006-11-19 22:48:07 +0000 |
| commit | cf86c448bea9dfa3d20d4b4b83ff60536da94550 (patch) | |
| tree | 58a836e08b5900dff059da73177d52117cd55422 /misc | |
| parent | 29d7372e2b7bc7b272cdd2454112c5012de9c45c (diff) | |
| download | pkgsrc-cf86c448bea9dfa3d20d4b4b83ff60536da94550.tar.gz | |
Fixed "test ==" and PKGMANDIR. CHECK_INTERPRETER and CHECK_PERMS still
complain.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/dotfile/Makefile | 12 | ||||
| -rw-r--r-- | misc/dotfile/distinfo | 3 | ||||
| -rw-r--r-- | misc/dotfile/patches/patch-ac | 24 |
3 files changed, 34 insertions, 5 deletions
diff --git a/misc/dotfile/Makefile b/misc/dotfile/Makefile index 9d8cd6b3d81..a82dfbb7019 100644 --- a/misc/dotfile/Makefile +++ b/misc/dotfile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2006/02/14 01:01:17 rillig Exp $ +# $NetBSD: Makefile,v 1.28 2006/11/19 22:48:07 rillig Exp $ DISTNAME= dotfile-2.4.1 PKGREVISION= 2 @@ -20,10 +20,14 @@ DOTFILE_LANG?= english GNU_CONFIGURE= yes NO_BUILD= yes +MAKE_FLAGS+= mandir=${PREFIX}/${PKGMANDIR}/man1 + +post-build: + rm -f ${WRKSRC}/Generator/makeHelp post-install: - ${INSTALL_DATA_DIR} ${PREFIX:Q}/share/doc/${PKGNAME_NOREV:Q} - cd ${WRKSRC:Q}/Doc && ${PAX} -rw . ${PREFIX:Q}/share/doc/${PKGNAME_NOREV:Q} - ${CHOWN} -R ${ROOT_USER}:${ROOT_GROUP} ${PREFIX:Q}/share/doc/${PKGNAME_NOREV:Q} + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${PKGNAME_NOREV} + cd ${WRKSRC:Q}/Doc && ${PAX} -rw -s ',.*\.orig$$,,' . ${PREFIX}/share/doc/${PKGNAME_NOREV} + ${CHOWN} -R ${ROOT_USER}:${ROOT_GROUP} ${PREFIX}/share/doc/${PKGNAME_NOREV} .include "../../mk/bsd.pkg.mk" diff --git a/misc/dotfile/distinfo b/misc/dotfile/distinfo index da916ae0666..96951c9991b 100644 --- a/misc/dotfile/distinfo +++ b/misc/dotfile/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.3 2005/02/24 11:02:51 agc Exp $ +$NetBSD: distinfo,v 1.4 2006/11/19 22:48:07 rillig Exp $ SHA1 (dotfile-2.4.1.tar.gz) = dfbd922ec6c0f34b41a0ec78276f222621bf1c05 RMD160 (dotfile-2.4.1.tar.gz) = 3f09a022e75f3b0b5fa9ef77769e70ef78a75b05 Size (dotfile-2.4.1.tar.gz) = 1015756 bytes SHA1 (patch-aa) = 0b17889ba0a5dca52b01614777092096e86e4306 SHA1 (patch-ab) = 6730793b2b479c2a4df0df1337dccc30780bb140 +SHA1 (patch-ac) = 2696b9d570b3d1e1dc3ac5a8f4f73fde17fbafe7 diff --git a/misc/dotfile/patches/patch-ac b/misc/dotfile/patches/patch-ac new file mode 100644 index 00000000000..d779d8afea9 --- /dev/null +++ b/misc/dotfile/patches/patch-ac @@ -0,0 +1,24 @@ +$NetBSD: patch-ac,v 1.1 2006/11/19 22:48:08 rillig Exp $ + +--- Generator/makeHelp.orig 2000-02-19 20:15:36.000000000 +0100 ++++ Generator/makeHelp 2006-10-24 01:56:01.000000000 +0200 +@@ -1,14 +1,13 @@ + #! /bin/sh +-if [ "$2" == "" ]; then ++ ++if [ $# -ne 2 -a $# -ne 3 ]; then ++ exec 1>&2 + echo "syntax makeHelp <Generator Path> <module help file> [<language>]" + echo "The language defaults to english" ++ exit 1 + fi + +-if [ "$3" == "" ]; then +- language=english +-else +- language=$3 +-fi ++language=${3-english} + + cp $1/help.$language.html helpfile.data + echo "\n\n<h1>---------------</h1>" >> helpfile.data |