Stop messing with libtool by hand. Bump revision.

4 files changed, 40 insertions, 6 deletions

diff --git a/sysutils/xfsprogs/Makefile b/sysutils/xfsprogs/Makefile
index c26ab61c6b7..8f5286b6cbf 100644
--- a/sysutils/xfsprogs/Makefile
+++ b/sysutils/xfsprogs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2010/02/03 12:41:47 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2010/10/12 16:43:00 joerg Exp $
 
 DISTNAME=	xfsprogs-2.7.3.src
 PKGNAME=	${DISTNAME:S/.src//}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://oss.sgi.com/projects/xfs/cmd_tars/
 
diff --git a/sysutils/xfsprogs/PLIST b/sysutils/xfsprogs/PLIST
index 00c9763ab0f..094052363bf 100644
--- a/sysutils/xfsprogs/PLIST
+++ b/sysutils/xfsprogs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:16:23 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2010/10/12 16:43:00 joerg Exp $
 bin/xfs_admin
 bin/xfs_bmap
 bin/xfs_check
@@ -13,8 +13,7 @@ bin/xfs_mkfile
 bin/xfs_ncheck
 bin/xfs_quota
 bin/xfs_rtcp
-lib/libhandle.so.1
-lib/libhandle.so.1.0.3
+lib/libhandle.la
 man/man5/xfs.5
 man/man8/fsck.xfs.8
 man/man8/mkfs.xfs.8
diff --git a/sysutils/xfsprogs/distinfo b/sysutils/xfsprogs/distinfo
index 9afa250e592..ed919576c4a 100644
--- a/sysutils/xfsprogs/distinfo
+++ b/sysutils/xfsprogs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2007/03/18 08:38:13 rillig Exp $
+$NetBSD: distinfo,v 1.4 2010/10/12 16:43:00 joerg Exp $
 
 SHA1 (xfsprogs-2.7.3.src.tar.gz) = abfe3ea13475810a0ef854f48b9ca9912ee7fbc5
 RMD160 (xfsprogs-2.7.3.src.tar.gz) = 7a4f6b0d5da640041334cef4b4aa2e60ba43af53
@@ -17,3 +17,4 @@ SHA1 (patch-ak) = d6f9027a339fe3607003b4fe34062936868f47da
 SHA1 (patch-al) = 832d5d90b9314f5aea312908df16ff3c74449d00
 SHA1 (patch-am) = 3d705bee711c5636c9ea73142560d1ff8530a48d
 SHA1 (patch-an) = a4a2b5fcbbcbcc4b49b75d7d3114da8ebd1f0377
+SHA1 (patch-ao) = 89b7c799440ad7c189c4957d5c6179973ca4def8
diff --git a/sysutils/xfsprogs/patches/patch-ao b/sysutils/xfsprogs/patches/patch-ao
new file mode 100644
index 00000000000..dbd63002974
--- /dev/null
+++ b/sysutils/xfsprogs/patches/patch-ao
@@ -0,0 +1,34 @@
+$NetBSD: patch-ao,v 1.1 2010/10/12 16:43:00 joerg Exp $
+
+--- include/buildmacros.orig	2010-10-12 16:28:00.000000000 +0000
++++ include/buildmacros
+@@ -81,10 +81,7 @@ endif
+ 
+ ifeq ($(ENABLE_SHARED),yes)
+ INSTALL_LTLIB = \
+-	cd $(TOPDIR)/$(LIBNAME)/.libs; \
+-	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
+-	../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(PKG_LIB_DIR); \
+-	../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_LIB_DIR)
++	${BSD_INSTALL_LIB_DIR} $(PKG_LIB_DIR); libtool --mode=install ${BSD_INSTALL_LIB} $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(PKG_LIB_DIR)
+ endif
+ 
+ # Libtool thinks the static and shared libs should be in the same dir, so
+@@ -94,16 +91,7 @@ endif
+ # link with the static libs there.  So, another symlink to get the .so into
+ # /usr/lib.
+ ifeq ($(ENABLE_SHARED),yes)
+-INSTALL_LTLIB_DEV = \
+-	cd $(TOPDIR)/$(LIBNAME)/.libs; \
+-	../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \
+-	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR); \
+-	../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
+-	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
+-	../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \
+-	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
+-	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
+-	../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so
++INSTALL_LTLIB_DEV = :
+ else
+ INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
+ endif