5 files changed, 54 insertions, 31 deletions
diff --git a/sysutils/fakeroot/Makefile b/sysutils/fakeroot/Makefile
index 2e9c2e92fd5..2d7512e2310 100644
--- a/sysutils/fakeroot/Makefile
+++ b/sysutils/fakeroot/Makefile
@@ -1,17 +1,21 @@
-# $NetBSD: Makefile,v 1.9 2005/12/31 20:00:56 kristerw Exp $
+# $NetBSD: Makefile,v 1.10 2006/01/13 18:26:04 wiz Exp $
 #
 
-DISTNAME=	fakeroot_0.5.8
-PKGNAME=	fakeroot-0.5.8
-PKGREVISION=	1
+DISTNAME=	fakeroot_1.5.6
+PKGNAME=	fakeroot-1.5.6
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/f/fakeroot/}
 
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Creates a fake root environment
 
-WRKSRC=		${WRKDIR}/fakeroot-0.5.8
+BUILD_DEPENDS+=	po4a-[0-9]*:../../textproc/po4a
+
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
+# 3 test failures in 1.5.6
+TEST_TARGET=	check
 
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/fakeroot/PLIST b/sysutils/fakeroot/PLIST
index 8bf66071d80..690cd558522 100644
--- a/sysutils/fakeroot/PLIST
+++ b/sysutils/fakeroot/PLIST
@@ -1,7 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:53 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/01/13 18:26:04 wiz Exp $
 bin/faked
 bin/fakeroot
 lib/libfakeroot.la
+man/es/man1/faked.1
+man/es/man1/fakeroot.1
+man/fr/man1/faked.1
 man/fr/man1/fakeroot.1
 man/man1/faked.1
 man/man1/fakeroot.1
@@ -9,5 +12,3 @@ man/sv/man1/faked.1
 man/sv/man1/fakeroot.1
 @dirrm man/sv/man1
 @dirrm man/sv
-@dirrm man/fr/man1
-@dirrm man/fr
diff --git a/sysutils/fakeroot/distinfo b/sysutils/fakeroot/distinfo
index 853bb397dbb..ee5dba337b2 100644
--- a/sysutils/fakeroot/distinfo
+++ b/sysutils/fakeroot/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 13:40:52 agc Exp $
+$NetBSD: distinfo,v 1.4 2006/01/13 18:26:04 wiz Exp $
 
-SHA1 (fakeroot_0.5.8.tar.gz) = 84931109b1f734e0aeedd5ada2ef79d503de198b
-RMD160 (fakeroot_0.5.8.tar.gz) = 2fecaeca4265c0fba8ac5ad0fde3758a5bf1cb2d
-Size (fakeroot_0.5.8.tar.gz) = 420642 bytes
-SHA1 (patch-aa) = f0d712b2880c9d4309ba426b98e8600e8ca14ffb
-SHA1 (patch-ab) = cb921a4b9babe356e17cde41a07e92e46d6ebd0a
+SHA1 (fakeroot_1.5.6.tar.gz) = 8101d3eb63e9932e35d678234062421a50e6194b
+RMD160 (fakeroot_1.5.6.tar.gz) = 47a3ac29465c39b431300cc0fc7d851781de6342
+Size (fakeroot_1.5.6.tar.gz) = 980208 bytes
+SHA1 (patch-aa) = 390eaa7976cd22383756541e1e3be9692b87c3bf
+SHA1 (patch-ab) = 5045f46ee3d77ee3e025ca29561b79ef011a23b1
diff --git a/sysutils/fakeroot/patches/patch-aa b/sysutils/fakeroot/patches/patch-aa
index e96c6271ee1..0d01b83ebfa 100644
--- a/sysutils/fakeroot/patches/patch-aa
+++ b/sysutils/fakeroot/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/12/20 11:23:54 lonewolf Exp $
+$NetBSD: patch-aa,v 1.2 2006/01/13 18:26:04 wiz Exp $
 
---- scripts/fakeroot.orig	Sun Nov 24 02:02:55 2002
-+++ scripts/fakeroot
-@@ -14,7 +14,7 @@ BINDIR=`dirname $0`
- PREFIX=`dirname ${BINDIR}`
+--- scripts/fakeroot.in.orig	2005-11-07 02:51:40.000000000 +0100
++++ scripts/fakeroot.in
+@@ -19,7 +19,7 @@ PREFIX=@prefix@
+ BINDIR=@bindir@
      
- LIB=libfakeroot.so.0
--PATHS=${PREFIX}/lib/libfakeroot:${PREFIX}/lib64/libfakeroot
-+PATHS=${PREFIX}/lib:${PREFIX}/lib64
- FAKED=${BINDIR}/faked
+ LIB=lib@fakeroot_transformed@.so
+-PATHS=@libdir@:${PREFIX}/lib64/libfakeroot:${PREFIX}/lib32/libfakeroot
++PATHS=@libdir@:${PREFIX}/lib64:${PREFIX}/lib32
+ FAKED=${BINDIR}/@faked_transformed@
  
- libfound=no
-@@ -63,8 +63,10 @@ then
+ FAKED_MODE="unknown-is-root"
+@@ -101,8 +101,10 @@ then
  	if test -r "$dir/$LIB"
  	then
  	    libfound=yes
@@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/12/20 11:23:54 lonewolf Exp $
  else
      if test -r "$LIB"
      then
-@@ -90,20 +92,16 @@ if test -z "$FAKEROOTKEY" || test -z "$P
+@@ -132,11 +134,7 @@ if test -z "$FAKEROOTKEY" || test -z "$P
    exit 1
  fi
  
@@ -35,6 +35,8 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/12/20 11:23:54 lonewolf Exp $
  if test -n "$LD_PRELOAD"; then
    LIB="$LIB $LD_PRELOAD"
  fi
+@@ -144,10 +142,10 @@ fi
+ export FAKEROOT_FD_BASE
  
  if test -z "$*"; then
 -  FAKEROOTKEY=$FAKEROOTKEY LD_LIBRARY_PATH="$PATHS" LD_PRELOAD="$LIB" ${SHELL:-/bin/sh}
diff --git a/sysutils/fakeroot/patches/patch-ab b/sysutils/fakeroot/patches/patch-ab
index 3a2425b5c3a..614072bdec9 100644
--- a/sysutils/fakeroot/patches/patch-ab
+++ b/sysutils/fakeroot/patches/patch-ab
@@ -1,13 +1,12 @@
-$NetBSD: patch-ab,v 1.1 2003/01/04 11:27:45 cjep Exp $
+$NetBSD: patch-ab,v 1.2 2006/01/13 18:26:04 wiz Exp $
 
---- configure.orig	Wed Dec 11 23:47:39 2002
+--- configure.orig	2005-12-14 03:28:08.000000000 +0000
 +++ configure
-@@ -10587,29 +10587,28 @@ fi
+@@ -22602,34 +22602,34 @@ fi
  
  
  case $target_cpu:$target_os in
--	(alpha*:linux*)
--	(ia64*:linux*)
+-	(alpha*:linux*|ia64*:linux*)
 +	alpha*:linux*|ia64*:linux*)
        		libcpath="/lib/libc.so.6.1"
  		;;
@@ -15,6 +14,10 @@ $NetBSD: patch-ab,v 1.1 2003/01/04 11:27:45 cjep Exp $
 +	*:linux*)
  	        libcpath="/lib/libc.so.6"
  		;;
+-	(*:k*bsd*-gnu)
++	*:k*bsd*-gnu)
+ 	        libcpath="/lib/libc.so.0.1"
+ 		;;
 -	(*:freebsd*)
 +	*:freebsd*)
  		libcpath="/usr/lib/libc.so.4"
@@ -35,8 +38,21 @@ $NetBSD: patch-ab,v 1.1 2003/01/04 11:27:45 cjep Exp $
 +	*:osf*)
  		libcpath="/shlib/libc.so"
  		;;
+-	(*:solaris*)
++	*:solaris*)
+ 		libcpath="/lib/libc.so.1"
+ 		;;
 -	(*)
 +	*)
  		{ echo "$as_me:$LINENO: WARNING: don't know where libc is for $target_os on
  			     $target_cpu, setting to /lib/libc.so" >&5
  echo "$as_me: WARNING: don't know where libc is for $target_os on
+@@ -22777,7 +22777,7 @@ echo "$as_me: error: no SUS compliant sh
+ fi
+ 
+ case "$target_cpu:$target_os" in
+-	(alpha*:linux*)
++	alpha*:linux*)
+ 
+ 
+ 	echo "$as_me:$LINENO: checking if we need to do stat-struct conversion hackery" >&5