From e6dd0f03b99cfdc2f2947da40fefffd9883fa2c5 Mon Sep 17 00:00:00 2001
From: Achim Gottinger <achim@gentoo.org>
Date: Wed, 9 May 2001 03:19:44 +0000
Subject: Small fixes

---
 sys-apps/yard/files/configure          | 14 +++++++-------
 sys-apps/yard/files/digest-yard-2.0-r1 |  1 +
 sys-apps/yard/yard-2.0-r1.ebuild       |  7 ++-----
 3 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'sys-apps/yard')

diff --git a/sys-apps/yard/files/configure b/sys-apps/yard/files/configure
index 1794c1be7143..e3aef9f56eb0 100755
--- a/sys-apps/yard/files/configure
+++ b/sys-apps/yard/files/configure
@@ -18,7 +18,7 @@ $lib_dest       =  "lib/yard";
 $config_dest = "etc/yard";
 
 #  Destination for documentation files (in Doc subdirectory)
-$doc_dest	=  "share/doc/yard-${yard_version}";
+$doc_dest	=  "usr/doc/yard-${yard_version}";
 
 
 ##############################################################################
@@ -41,9 +41,9 @@ my($arch_iX86) = $archname =~ /^i\d86-/;
 
 #  These are to test for old bugs.  Probably unnecessary, but  may as
 #  well keep them.
-test_cp();
-test_lstat();
-test_ldconfig();
+#test_cp();
+#test_lstat();
+#test_ldconfig();
 
 ##############################################################################
 #  Convert all paths to use PREFIX
@@ -57,7 +57,7 @@ print "PREFIX = \"$PREFIX\"\n";
 
 #  Prepend PREFIX onto all of these
 $scripts_dest  = "$PREFIX/$scripts_dest";
-$config_dest   = "/$config_dest";
+$config_dest   = "$PREFIX/$config_dest";
 $lib_dest      = "$PREFIX/$lib_dest";
 $doc_dest      = "$PREFIX/$doc_dest";
 
@@ -274,11 +274,11 @@ sub test_ldconfig {
       print "ERROR, cannot execute ldconfig.  Please put it in your path.\n";
       exit;
 
-   } elsif (($CHILD_ERROR ) != 0) {
+   } elsif (($CHILD_ERROR >> 8) != 128) {
       print "ERROR, trouble with ldconfig.  Maybe it's very old?\n";
       exit;
 
-   } elsif ($ldconfig_help =~ /\-r\sROOT/m) {
+   } elsif ($ldconfig_help =~ /\-r\sroot/m) {
       print "Your ldconfig accepts a -r option -- good.\n";
 
    } else {
diff --git a/sys-apps/yard/files/digest-yard-2.0-r1 b/sys-apps/yard/files/digest-yard-2.0-r1
index 41f5511082f8..146a2f6e9d03 100644
--- a/sys-apps/yard/files/digest-yard-2.0-r1
+++ b/sys-apps/yard/files/digest-yard-2.0-r1
@@ -1 +1,2 @@
 MD5 c2d115e0a12945b6057a30e2c47532ae yard-2.0.tar.gz
+MD5 a60d928b6c0e40cc62233e27313506e0 diet-utils.tar.bz2
diff --git a/sys-apps/yard/yard-2.0-r1.ebuild b/sys-apps/yard/yard-2.0-r1.ebuild
index 31c653cbf81c..5e87213cca13 100644
--- a/sys-apps/yard/yard-2.0-r1.ebuild
+++ b/sys-apps/yard/yard-2.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/yard/yard-2.0-r1.ebuild,v 1.4 2001/05/09 02:56:13 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/yard/yard-2.0-r1.ebuild,v 1.5 2001/05/09 03:19:44 achim Exp $
 
 A="${P}.tar.gz diet-utils.tar.bz2"
 S=${WORKDIR}/${P}
@@ -11,7 +11,7 @@ SRC_URI="http://www.croftj.net/~fawcett/yard/${P}.tar.gz"
 HOMEPAGE="http://www.croftj.net/~fawcett/yard/"
 
 src_unpack() {
-    unpack ${A}
+    unpack ${P}.tar.gz
     cd ${S}
     cp ${FILESDIR}/configure .
     cp Makefile.in Makefile.in.orig
@@ -20,9 +20,6 @@ src_unpack() {
     patch -p0 < ${FILESDIR}/${P}-extras-Makefile.in-gentoo.diff
 }
 
-src_unpack() {
-    unpack ${P}.tar.gz
-}
 src_compile() {
 
     cd ${S}
-- 
cgit v1.2.3-65-gdbad