From 4d02f1e0b801e17c9d7dd8c061baa8acc82985dd Mon Sep 17 00:00:00 2001
From: stacktic <stacktic@pkgsrc.org>
Date: Mon, 16 Nov 2009 15:39:07 +0000
Subject: Updated fs-utils to version 20091116 - Syncd code with HEAD - Fixed
 build on Linux/x86_64 CentOS5 (RHEL5) reported by Nicolas Joly

---
 filesystems/fs-utils/Makefile | 13 +++++++------
 filesystems/fs-utils/distinfo |  8 ++++----
 2 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'filesystems/fs-utils')

diff --git a/filesystems/fs-utils/Makefile b/filesystems/fs-utils/Makefile
index 4e18a4d69bd..2de13aed333 100644
--- a/filesystems/fs-utils/Makefile
+++ b/filesystems/fs-utils/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2009/11/02 19:54:44 stacktic Exp $
+# $NetBSD: Makefile,v 1.9 2009/11/16 15:39:07 stacktic Exp $
 #
 
-DISTNAME=		fs-utils_20091102
+DISTNAME=		fs-utils_20091116
 PKGNAME=		${DISTNAME:S/_/-/}
 CATEGORIES=		filesystems
 MASTER_SITES=		ftp://ftp.NetBSD.org/pub/NetBSD/misc/stacktic/
@@ -20,9 +20,8 @@ INSTALLATION_DIRS=	bin lib include ${PKGMANDIR}/man1 ${PKGMANDIR}/man3
 SUBST_CLASSES+=		path
 SUBST_STAGE.path=	pre-configure
 SUBST_MESSAGE.path=	Adjusting path.
-SUBST_FILES.path=	Makefile.inc
-SUBST_SED.path=		-e "s|/usr/pkg|${LOCALBASE}|g"
-SUBST_SED.path+=	-e "s|^LDADD.*|LDADD+= -ldl -L../../../libnbcompat -lnbcompat|"
+SUBST_FILES.path=	Makefile.gen
+SUBST_SED.path=		-e "s|/usr/pkg|${PREFIX}|g"
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/lib/libfsu_utils/fsu_fts.h \
@@ -38,7 +37,9 @@ OSNAME!=		uname -s
 .if ${OSNAME} != "NetBSD"
 MAKEFLAGS+=			NOGCCERROR=1
 USE_FEATURES=			nbcompat
-NBCOMPAT_CONFIGURE_ARGS+=	CFLAGS='-D_FILE_OFFSET_BITS=64'
+NBCOMPAT_CONFIGURE_ARGS+=	CFLAGS='-D_FILE_OFFSET_BITS=64 -fPIC'
+NBCOMPAT_CONFIGURE_ARGS+=	CPPFLAGS='-DPIC'
+NBCOMPAT_CONFIGURE_ARGS+=	--enable-bsd-getopt
 
 .include "../../misc/rump/buildlink3.mk"
 .endif # !NetBSD
diff --git a/filesystems/fs-utils/distinfo b/filesystems/fs-utils/distinfo
index 571fdfc05bf..d860dafac07 100644
--- a/filesystems/fs-utils/distinfo
+++ b/filesystems/fs-utils/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2009/11/02 18:58:10 stacktic Exp $
+$NetBSD: distinfo,v 1.7 2009/11/16 15:39:07 stacktic Exp $
 
-SHA1 (fs-utils_20091102.tar.gz) = f40a4a114aa68faefdd502c295f474944c834957
-RMD160 (fs-utils_20091102.tar.gz) = df3f59273b423586d0ac99d76e316578dc337197
-Size (fs-utils_20091102.tar.gz) = 161091 bytes
+SHA1 (fs-utils_20091116.tar.gz) = cb49494a66a5d6bf69f2d80d79482b3f7607da29
+RMD160 (fs-utils_20091116.tar.gz) = 8381dfc13d8470560342c96167e033c255233ab2
+Size (fs-utils_20091116.tar.gz) = 153103 bytes
-- 
cgit v1.2.3