[pkgsrc/trunk]: pkgsrc/misc/dotfile Fixed "test ==" and PKGMANDIR. CHECK_INTE...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2be86b1ceadb
branches:  trunk
changeset: 521751:2be86b1ceadb
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Nov 19 22:48:07 2006 +0000

description:
Fixed "test ==" and PKGMANDIR. CHECK_INTERPRETER and CHECK_PERMS still
complain.

diffstat:

 misc/dotfile/Makefile         |  12 ++++++++----
 misc/dotfile/distinfo         |   3 ++-
 misc/dotfile/patches/patch-ac |  24 ++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 5 deletions(-)

diffs (68 lines):

diff -r b047b57b79ab -r 2be86b1ceadb misc/dotfile/Makefile
--- a/misc/dotfile/Makefile     Sun Nov 19 22:36:20 2006 +0000
+++ b/misc/dotfile/Makefile     Sun Nov 19 22:48:07 2006 +0000
@@ -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 @@
 
 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 -r b047b57b79ab -r 2be86b1ceadb misc/dotfile/distinfo
--- a/misc/dotfile/distinfo     Sun Nov 19 22:36:20 2006 +0000
+++ b/misc/dotfile/distinfo     Sun Nov 19 22:48:07 2006 +0000
@@ -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 -r b047b57b79ab -r 2be86b1ceadb misc/dotfile/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/dotfile/patches/patch-ac     Sun Nov 19 22:48:07 2006 +0000
@@ -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