Fixed compilation and install issues on OSX. There is no malloc.h and /usr/bin/insta...

Package-Manager: portage-2.0.51.22-r3

diff --git a/app-arch/lha/ChangeLog b/app-arch/lha/ChangeLog
index 140a962fa138b66feb1155d674d669660fd4dfe9..02f1fdcd3ad826969e39162169655ba08067d74a 100644 (file)
--- a/app-arch/lha/ChangeLog
+++ b/app-arch/lha/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-arch/lha
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lha/ChangeLog,v 1.24 2005/10/30 05:33:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lha/ChangeLog,v 1.25 2005/10/30 20:14:52 grobian Exp $
+
+  30 Oct 2005; Fabian Groffen <grobian@gentoo.org>
+  files/lha-114i-build.patch, files/lha-114i-malloc.patch:
+  Fixed compilation and install issues on OSX.  There is no malloc.h and
+  /usr/bin/install doesn't understand -D.
 
 *lha-114i-r5 (30 Oct 2005)
 

diff --git a/app-arch/lha/Manifest b/app-arch/lha/Manifest
index f72cbde569c68ce999b3637491516dcfb1657732..879ce52f326587c618498735974c027105f6b03a 100644 (file)
--- a/app-arch/lha/Manifest
+++ b/app-arch/lha/Manifest
@@ -1,20 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e470eb5963d8ee09bfd2727eeb56bba2 ChangeLog 3054
-MD5 0ca54fececc10dcda9d3e9f649102c78 files/digest-lha-114i-r5 59
-MD5 2be58a222a07490e0347f138f65c97d4 files/lha-114i-build.patch 1341
+MD5 87f8394a1eaec58d059d1283e326daac lha-114i-r5.ebuild 1107
+MD5 ac6dd53f23a9165c38efa159e6c350ec ChangeLog 3281
+MD5 a1ef659783bc7224c48dbc07cf436788 files/lha-114i-sec.patch 1621
 MD5 bf52f3a88c9f88cdbaadda926050333e files/lha-114i-detect-cmd-extract-fail.patch 3151
+MD5 6cea43d9473cb137305f2a1c9175eac6 files/lha-114i-build.patch 1450
 MD5 de7e57548c17115a6a39b8cb5f88234d files/lha-114i-dir_length_bounds_check.patch 502
-MD5 254ee5496c0968b19e8e1a20c3b90289 files/lha-114i-malloc.patch 180
-MD5 a1ef659783bc7224c48dbc07cf436788 files/lha-114i-sec.patch 1621
+MD5 0ca54fececc10dcda9d3e9f649102c78 files/digest-lha-114i-r5 59
+MD5 07b705eca29332c442fab7a7cd7877ce files/lha-114i-malloc.patch 207
 MD5 f44e42e6131c63f0e2e67e49732b6e57 files/lha-114i-sec2.patch 5754
 MD5 d409c5c0a2b75a477e7baa7ebc62a559 files/lha-114i-symlink.patch 228
-MD5 87f8394a1eaec58d059d1283e326daac lha-114i-r5.ebuild 1107
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDZFs+gIKl8Uu19MoRAnYgAJ9ge/iE8+AU14oaU1T2Gw01qhKuAACaA4IV
-RdZKdfcrtbgZ8991ErJZWhQ=
-=9zmV
------END PGP SIGNATURE-----

diff --git a/app-arch/lha/files/lha-114i-build.patch b/app-arch/lha/files/lha-114i-build.patch
index 23d241ff73edee6068143d92be4089320b18891b..29895b329fe38995f4e69b1658d7e4c699b58a5c 100644 (file)
--- a/app-arch/lha/files/lha-114i-build.patch
+++ b/app-arch/lha/files/lha-114i-build.patch
@@ -31,20 +31,22 @@
   'OPTIMIZE=$(OPTIMIZE)' 'MACHINE=$(MACHINE)'
 --- man/Makefile
 +++ man/Makefile
-@@ -11,7 +11,7 @@
+@@ -11,7 +11,8 @@
        $(NROFF) -man lha.n > lha.man
  
  install:
 -      $(INSTALL) $(INSTALLMAN) lha.n $(MANDIR)/man$(MANSECT)/lha.$(MANSECT)
-+      $(INSTALL) -D $(INSTALLMAN) lha.n $(DESTDIR)$(MANDIR)/man$(MANSECT)/lha.$(MANSECT)
++      mkdir -p `dirname $(DESTDIR)$(MANDIR)/man$(MANSECT)/lha.$(MANSECT)`
++      $(INSTALL) $(INSTALLMAN) lha.n $(DESTDIR)$(MANDIR)/man$(MANSECT)/lha.$(MANSECT)
  
  clean:
        rm -f *~
 --- src/Makefile
 +++ src/Makefile
-@@ -49,4 +49,4 @@
+@@ -49,4 +49,5 @@
        rm -f core *.o lha.tar lha.tar.Z *~ \#* *.orig
  
  install:
++      mkdir -p `dirname $(DESTDIR)$(BINDIR)/lha`
++      $(INSTALL) $(INSTALLBIN) lha $(DESTDIR)$(BINDIR)/lha
 -      $(INSTALL) $(INSTALLBIN) lha $(BINDIR)/lha
-+      $(INSTALL) -D $(INSTALLBIN) lha $(DESTDIR)$(BINDIR)/lha

diff --git a/app-arch/lha/files/lha-114i-malloc.patch b/app-arch/lha/files/lha-114i-malloc.patch
index 9f4499aecaff4e74da6de74dcb2143952cc0e06c..8c9d968a9d5812995c28bbb2c52342bda2785a72 100644 (file)
--- a/app-arch/lha/files/lha-114i-malloc.patch
+++ b/app-arch/lha/files/lha-114i-malloc.patch
@@ -1,10 +1,12 @@
 --- lha-114i/src/lha.h
 +++ lha-114i/src/lha.h
-@@ -16,6 +16,7 @@
+@@ -16,6 +16,9 @@
  #include <sys/types.h>
  #include <sys/file.h>
  #include <sys/stat.h>
++#ifndef __APPLE__
 +#include <malloc.h>
++#endif
  
  #include <signal.h>