Cleanup ebuild and create softlinks instead of hardlinks.

(Portage version: 2.1_pre6-r5)

3 files changed, 36 insertions, 24 deletions

diff --git a/sys-fs/hfsutils/ChangeLog b/sys-fs/hfsutils/ChangeLog
index e53d9f7b8480..d03b78201099 100644
--- a/sys-fs/hfsutils/ChangeLog
+++ b/sys-fs/hfsutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/hfsutils
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsutils/ChangeLog,v 1.12 2006/01/02 16:44:17 hansmi Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsutils/ChangeLog,v 1.13 2006/03/23 02:06:32 vapier Exp $
+
+  23 Mar 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/hfsutils-3.2.6-softlinks.patch, hfsutils-3.2.6-r4.ebuild:
+  Cleanup ebuild and create softlinks instead of hardlinks.
 
   02 Jan 2006; Michael Hanselmann <hansmi@gentoo.org>
   hfsutils-3.2.6-r4.ebuild:
diff --git a/sys-fs/hfsutils/files/hfsutils-3.2.6-softlinks.patch b/sys-fs/hfsutils/files/hfsutils-3.2.6-softlinks.patch
new file mode 100644
index 000000000000..1be9507756ad
--- /dev/null
+++ b/sys-fs/hfsutils/files/hfsutils-3.2.6-softlinks.patch
@@ -0,0 +1,13 @@
+Create softlinks instead of hardlinks
+
+--- hfsutils-3.2.6/Makefile.in
++++ hfsutils-3.2.6/Makefile.in
+@@ -39,7 +39,7 @@
+ INSTALL =	@INSTALL@
+ BININSTALL =	@INSTALL_PROGRAM@ -m 755
+ LIBINSTALL =	@INSTALL_DATA@
+-HARDLINK =	ln -f
++HARDLINK =	ln -s
+ 
+ CC =		@CC@
+ INCLUDES =	@CPPFLAGS@ -Ilibhfs @TCL_INCLUDES@ @TK_INCLUDES@
diff --git a/sys-fs/hfsutils/hfsutils-3.2.6-r4.ebuild b/sys-fs/hfsutils/hfsutils-3.2.6-r4.ebuild
index 1d46535228da..6d263161adbb 100644
--- a/sys-fs/hfsutils/hfsutils-3.2.6-r4.ebuild
+++ b/sys-fs/hfsutils/hfsutils-3.2.6-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsutils/hfsutils-3.2.6-r4.ebuild,v 1.7 2006/01/02 16:44:17 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsutils/hfsutils-3.2.6-r4.ebuild,v 1.8 2006/03/23 02:06:32 vapier Exp $
 
 inherit eutils toolchain-funcs
 
@@ -13,39 +13,34 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 IUSE="tcltk"
 
-DEPEND="virtual/libc
-	tcltk? ( dev-lang/tcl dev-lang/tk )"
+DEPEND="tcltk? ( dev-lang/tcl dev-lang/tk )"
 RDEPEND=""
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/hfsutils-3.2.6-errno.patch
-	epatch ${FILESDIR}/largerthan2gb.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/hfsutils-3.2.6-errno.patch
+	epatch "${FILESDIR}"/hfsutils-3.2.6-softlinks.patch
+	epatch "${FILESDIR}"/largerthan2gb.patch
 }
 
 src_compile() {
-	local myconf
-	use tcltk && myconf="--with-tcl --with-tk"
-
 	tc-export CC CPP LD RANLIB
-	econf ${myconf} || die
-	emake PREFIX=/usr MANDIR=/usr/share/man || die
-	cd ${S}/hfsck
+	econf \
+		$(use_with tcltk tcl) \
+		$(use_with tcltk tk) \
+		|| die
 	emake PREFIX=/usr MANDIR=/usr/share/man || die
+	emake -C hfsck PREFIX=/usr MANDIR=/usr/share/man || die
 }
 
 src_install() {
-	dodir /usr/bin
-	dodir /usr/lib
-	dodir /usr/share/man/man1
-	cd ${S}
+	dodir /usr/bin /usr/lib /usr/share/man/man1
 	make \
-		prefix=${D}/usr \
-		MANDEST=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
+		prefix="${D}"/usr \
+		MANDEST="${D}"/usr/share/man \
+		infodir="${D}"/usr/share/info \
 		install || die
-	cd ${S}/hfsck
-	install -m0755 hfsck ${D}/usr/bin/
-	cd ${S}
+	dobin hfsck/hfsck || die
+	dodoc BLURB CHANGES README TODO doc/*.txt
 }