updated with gcc 3.2 patch and general cleanups

diff --git a/sys-apps/hfsplusutils/ChangeLog b/sys-apps/hfsplusutils/ChangeLog
index 8c8c797a24747654055dc721569900845941515b..c9ffc97cd897af0640156ab83168614eac72fcda 100644 (file)
--- a/sys-apps/hfsplusutils/ChangeLog
+++ b/sys-apps/hfsplusutils/ChangeLog
@@ -1,9 +1,13 @@
 # ChangeLog for sys-apps/hfsplusutils
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hfsplusutils/ChangeLog,v 1.2 2002/07/14 19:20:18 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hfsplusutils/ChangeLog,v 1.3 2002/10/09 15:12:02 gerk Exp $
 
 *hfsplusutils-1.0.4 (June 17, 2002)
 
+  09 Oct 2002; Mark Guertin <gerk@gentoo.org> hfsplusutils-1.0.4.ebuild :
+  Added patch for fixups with gcc 3.2 9also still works on 2.95.3), thanks
+  Johnathon Nall (nall), closes bug #8289.  Also added -alpha to keywords
+
   14 Jul 2002; phoen][x <phoenix@gentoo.org> hfsplusutils-1.0.4.ebuild :
   Added KEYWORDS.
 

diff --git a/sys-apps/hfsplusutils/files/hfsplusutils-1.0.4-glob.patch b/sys-apps/hfsplusutils/files/hfsplusutils-1.0.4-glob.patch
new file mode 100644 (file)
index 0000000..cd92d0a
--- /dev/null
+++ b/sys-apps/hfsplusutils/files/hfsplusutils-1.0.4-glob.patch
@@ -0,0 +1,12 @@
+--- src/glob.c.orig    2002-10-09 08:02:31.000000000 -0500
++++ src/glob.c 2002-10-09 08:02:46.000000000 -0500
+@@ -48,7 +48,7 @@
+ 
+       switch (*pat)
+       {
+-          case NULL:  // pattern at end
++          case '\0':  // pattern at end
+               return (!*str); // String at end ?
+ 
+           case '*':  // match all
+

diff --git a/sys-apps/hfsplusutils/hfsplusutils-1.0.4.ebuild b/sys-apps/hfsplusutils/hfsplusutils-1.0.4.ebuild
index a0bd39ad644c250fd272098d35ffe6c97154bcf5..be8bbf2d9837c66feba26dc616ee596524929ebe 100644 (file)
--- a/sys-apps/hfsplusutils/hfsplusutils-1.0.4.ebuild
+++ b/sys-apps/hfsplusutils/hfsplusutils-1.0.4.ebuild
@@ -1,38 +1,37 @@
+
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hfsplusutils/hfsplusutils-1.0.4.ebuild,v 1.8 2002/10/04 06:25:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hfsplusutils/hfsplusutils-1.0.4.ebuild,v 1.9 2002/10/09 15:12:02 gerk Exp $
 
-A="hfsplus_1.0.4.src.tar.bz2"
 S=${WORKDIR}/hfsplus-1.0.4
+MY_P="hfsplus_${PV}"
 DESCRIPTION="HFS+ Filesystem Access Utilities (PPC Only)"
-SRC_URI="http://ftp.penguinppc.org/users/hasi/${A}"
+SRC_URI="http://ftp.penguinppc.org/users/hasi/${MY_P}.src.tar.bz2"
 HOMEPAGE="http://ftp.penguinppc.org/users/hasi/"
-KEYWORDS="ppc -x86 -sparc -sparc64"
+KEYWORDS="ppc -x86 -sparc -sparc64 -alpha"
 DEPEND="sys-devel/autoconf
         sys-devel/automake
         sys-apps/bzip2"
 RDEPEND=""
 LICENSE="GPL"
 SLOT="0"
+IUSE=""
 
 MAKEOPTS='PREFIX=/usr MANDIR=/usr/share/man'
 
-pkg_setup() {
-       if [ ${ARCH} != "ppc" ] ; then
-               eerror "Sorry, this is a PPC only package."
-               die "Sorry, this as a PPC only pacakge."
-       fi
-}
-
 src_compile() {
 
        # This does a autoconf, automake, etc.
        emake -f Makefile.cvs all || die
+
+       patch -p0 < ${FILESDIR}/hfsplusutils-1.0.4-glob.patch || die "Patch failed"
+
        ./configure \
                --host=${CHOST} \
                --prefix=/usr \
                --infodir=/usr/share/info \
                --mandir=/usr/share/man || die "./configure failed"
+
        emake || die
 }