* Need some pre-created directories.

 * Avoid check of target directory in configure script, it may not exists.
 * Honor PKGMANDIR.

Bump PKGREVISION.

4 files changed, 37 insertions, 12 deletions

diff --git a/net/tinyfugue/Makefile b/net/tinyfugue/Makefile
index 055eb136fb1..ecdaa3eee15 100644
--- a/net/tinyfugue/Makefile
+++ b/net/tinyfugue/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2007/12/02 13:04:13 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2007/12/27 11:43:51 obache Exp $
 
 DISTNAME=	tf-40s1
 PKGNAME=	tf-4.0s1
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	net games
 MASTER_SITES=	ftp://laurel.actlab.utexas.edu/pub/tinyfugue/ \
 		${MASTER_SITE_SOURCEFORGE:=tinyfugue/}
@@ -19,5 +19,7 @@ PATCH_SITES=	http://discworld.imaginary.com/external/taffyd/
 PATCHFILES=	tf-40s1-mccp-patch.gz
 PATCH_DIST_STRIP=-p1
 
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/tinyfugue/distinfo b/net/tinyfugue/distinfo
index 8fcae37620a..df15527d96e 100644
--- a/net/tinyfugue/distinfo
+++ b/net/tinyfugue/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2006/06/20 03:37:04 minskim Exp $
+$NetBSD: distinfo,v 1.8 2007/12/27 11:43:51 obache Exp $
 
 SHA1 (tf-40s1.tar.gz) = 89ee75d0d8501dd7fe5440c81cf9b294e5ccf746
 RMD160 (tf-40s1.tar.gz) = 2852daa3363bb134f29cc25d3177e9599ecacc1f
@@ -7,6 +7,6 @@ SHA1 (tf-40s1-mccp-patch.gz) = 9a8d12ef8a6e0b6c315e6ae83efcbd179a930a6a
 RMD160 (tf-40s1-mccp-patch.gz) = af0d27a8b3585c8cc61669c79f26a8382c272424
 Size (tf-40s1-mccp-patch.gz) = 7182 bytes
 SHA1 (patch-aa) = 8e6d68c7017ab4f4294451bd0d808f48e413f9b6
-SHA1 (patch-ab) = 1849febe594874cc41b42e3d69a121e3f934112c
-SHA1 (patch-ac) = fddc7d415ca8716be1fc45c95a5b5e6888cbf1ae
+SHA1 (patch-ab) = 2eaa60d90a3f930f10f5b151dee45270946aa13c
+SHA1 (patch-ac) = d56d5c80e922a99a5f9bf62e2898309ec9ed0dc0
 SHA1 (patch-ad) = 4ff9f85b0b05857560b00e354496a9ed2a01e6e2
diff --git a/net/tinyfugue/patches/patch-ab b/net/tinyfugue/patches/patch-ab
index 33af96241ea..d1b9e299b11 100644
--- a/net/tinyfugue/patches/patch-ab
+++ b/net/tinyfugue/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.4 2002/12/12 21:02:58 jmmv Exp $
+$NetBSD: patch-ab,v 1.5 2007/12/27 11:43:51 obache Exp $
 
---- unix/Config.orig	Sat Mar  6 23:43:28 1999
+--- unix/Config.orig	1999-03-06 22:43:28.000000000 +0000
 +++ unix/Config
 @@ -33,9 +33,12 @@
  #   even if an old version is currently in use.  You can remove
@@ -25,7 +25,7 @@ $NetBSD: patch-ab,v 1.4 2002/12/12 21:02:58 jmmv Exp $
 -# MANTYPE="nroff"
 -# MANPAGE="/usr/local/man/man1/tf.1"
 +MANTYPE="nroff"
-+MANPAGE="${PREFIX}/man/man1/tf.1"
++MANPAGE="${PREFIX}/${PKGMANDIR}/man1/tf.1"
  
  
  ### Flags.
diff --git a/net/tinyfugue/patches/patch-ac b/net/tinyfugue/patches/patch-ac
index 7d561773a38..b8fe92b27f8 100644
--- a/net/tinyfugue/patches/patch-ac
+++ b/net/tinyfugue/patches/patch-ac
@@ -1,8 +1,31 @@
-$NetBSD: patch-ac,v 1.3 1999/11/27 23:13:43 rh Exp $
+$NetBSD: patch-ac,v 1.4 2007/12/27 11:43:51 obache Exp $
 
---- unix/tfconfig.orig	Sun Nov 28 00:12:19 1999
-+++ unix/tfconfig	Sun Nov 28 00:12:19 1999
-@@ -224,17 +224,17 @@
+--- unix/tfconfig.orig	2007-12-27 11:03:19.000000000 +0000
++++ unix/tfconfig
+@@ -168,18 +168,18 @@ fi
+ # The cd;pwd is needed to normalize the directory name in case of links, etc.
+ 
+ DIR1=`echo $TF      | sed 's;/[^/]*$;;'`
+-DIR1=`cd $DIR1 && pwd`
++#DIR1=`cd $DIR1 && pwd`
+ DIR2=`echo $LIBDIR  | sed 's;/[^/]*$;;'`
+-DIR2=`cd $DIR2 && pwd`
++#DIR2=`cd $DIR2 && pwd`
+ DIR3=`echo $SYMLINK | sed 's;/[^/]*$;;'`
+-DIR3=`cd $DIR3 && pwd`
++#DIR3=`cd $DIR3 && pwd`
+ 
+ if [ -z "$DIR1" ] || [ -z "$DIR2" ] || [ -z "$DIR3" ]; then
+     echo "Error in directory."
+     exit 1;
+ fi
+ 
+-DIR1=`cd $DIR1 && pwd || { echo "Error in directory $DIR1."; false; }`
++#DIR1=`cd $DIR1 && pwd || { echo "Error in directory $DIR1."; false; }`
+ 
+ BUILDTREE=`cd .. && pwd`
+ if echo "${DIR1}/" | egrep "^${BUILDTREE}/" >/dev/null 2>&1 ||
+@@ -223,17 +223,17 @@ fi
  echo
  
  echo 'To change these locations type "n" now and edit the unix/Config file.'