Made a DESTDIR patch and use that to fix installation on multilib systems.
authorJeremy Huddleston <eradicator@gentoo.org>
Tue, 5 Oct 2004 09:39:09 +0000 (09:39 +0000)
committerJeremy Huddleston <eradicator@gentoo.org>
Tue, 5 Oct 2004 09:39:09 +0000 (09:39 +0000)
media-libs/compface/ChangeLog
media-libs/compface/Manifest
media-libs/compface/compface-1.4.ebuild
media-libs/compface/files/compface-1.4-destdir.diff [new file with mode: 0644]

index d7ea1d0b80d06ee4a76a24cf73efeb17266e3c53..913b1fa2e48033a0080fceabd6a19f5ba3a05d97 100644 (file)
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/compface
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/compface/ChangeLog,v 1.14 2004/10/01 04:58:09 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/compface/ChangeLog,v 1.15 2004/10/05 09:39:09 eradicator Exp $
+
+  05 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/compface-1.4-destdir.diff:
+  Made a DESTDIR patch and use that to fix installation on multilib systems.
 
   01 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> compface-1.4.ebuild:
   Added to ~ppc-macos; bug #65610.
index cf4759d2fea3f696883f4e45dd9aae297f20c256..c97d2376d8580b292473fc6060dba45d2053a268 100644 (file)
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 49a5c55e254a63b1d509db1fb0f80938 ChangeLog 1673
-MD5 84ee4b012f2f5b73393b487c7b01faf3 compface-1.4.ebuild 819
+MD5 742c6582a6c7564c49a0322de0832bb4 compface-1.4.ebuild 834
+MD5 ca54ef15025ef831ef137118d8ad5f09 ChangeLog 1849
 MD5 99136b248ff383abec90471de2c701ac files/compface-1.4-errno.diff 908
 MD5 9b8d9c4812b5caa0557fe8bc88a688d8 files/digest-compface-1.4 63
+MD5 92cd926808b9b818d1a0228938edd8e4 files/compface-1.4-destdir.diff 1759
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (Darwin)
+Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBXOPrVWNWqTUmv+0RAqh0AKCQ30fUw0xO2bUkFRN5QSA+YZErcQCgr3I+
-ZlKyvfgpqfczShuGbH2uVfQ=
-=8f4S
+iD8DBQFBYmvIArHZZzCEUG0RAg3cAJ0eJkmh0q4HSzMe5ucbCBj6zPpI8ACdHEEi
+299Ejc0VilmkLDK8k5bGpaE=
+=NyXD
 -----END PGP SIGNATURE-----
index d7b3df6122f91e76d732ffad01e10bd78e0851f1..ba7df2f984831b7b3317311c4aa7368a388ae3de 100644 (file)
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/compface/compface-1.4.ebuild,v 1.21 2004/10/01 04:58:09 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/compface/compface-1.4.ebuild,v 1.22 2004/10/05 09:39:09 eradicator Exp $
+
+IUSE=""
 
 inherit eutils
 
@@ -11,7 +13,6 @@ SRC_URI="http://www.ibiblio.org/pub/Linux/apps/graphics/convert/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64 ppc64 ~ppc-macos"
-IUSE=""
 
 DEPEND="virtual/libc"
 
@@ -19,14 +20,12 @@ src_unpack() {
        unpack ${A}
        cd ${S}
        epatch ${FILESDIR}/${P}-errno.diff
+       epatch ${FILESDIR}/${P}-destdir.diff
 }
 
 src_install() {
-       dodir /usr/share/man/man{1,3} /usr/{bin,include,lib}
-       make \
-               prefix=${D}/usr \
-               MANDIR=${D}/usr/share/man \
-               install || die
+       dodir /usr/share/man/man{1,3} /usr/{bin,include,$(get_libdir)}
+       make DESTDIR="${D}" install || die
 
        dodoc README ChangeLog
 }
diff --git a/media-libs/compface/files/compface-1.4-destdir.diff b/media-libs/compface/files/compface-1.4-destdir.diff
new file mode 100644 (file)
index 0000000..46e8c88
--- /dev/null
@@ -0,0 +1,34 @@
+diff -Naur compface-1.4.orig/Makefile.in compface-1.4/Makefile.in
+--- compface-1.4.orig/Makefile.in      2000-11-22 05:38:39.000000000 -0800
++++ compface-1.4/Makefile.in   2004-10-05 02:34:53.307138856 -0700
+@@ -71,18 +71,18 @@
+               $(RM) -rf `cat .fname` .fname
+ 
+ install:      $(NAME) $(UNNAME) $(LIBNAME)
+-              $(INSTALL_PROGRAM) $(srcdir)/$(NAME) $(EXECUTABLE) 
+-              -chmod 0755 $(EXECUTABLE)
+-              -strip $(EXECUTABLE)
+-              $(INSTALL_PROGRAM) $(srcdir)/$(UNNAME) $(UNEXECUTABLE)
+-              -chmod 0755 $(UNEXECUTABLE)
+-              -strip $(UNEXECUTABLE)
+-              $(INSTALL_DATA) $(srcdir)/$(NAME).1 $(MAN1DIR)/$(NAME).1
+-              cd $(MAN1DIR) && $(RM) ./$(UNNAME).1 && $(LN_S) $(NAME).1 $(UNNAME).1
+-              $(INSTALL_DATA) $(srcdir)/$(NAME).3 $(MAN3DIR)/$(NAME).3
+-              cd $(MAN3DIR) && $(RM) ./$(UNNAME).3 && $(LN_S) $(NAME).3 $(UNNAME).3
+-              for hdr in $(INSTALLHEADERS); do $(INSTALL_DATA) $(srcdir)/$${hdr} $(INCLUDEDIR)/$${hdr}; done
+-              $(INSTALL_DATA) $(srcdir)/$(LIBNAME) $(LIBRARY)
++              $(INSTALL_PROGRAM) $(srcdir)/$(NAME) $(DESTDIR)$(EXECUTABLE) 
++              -chmod 0755 $(DESTDIR)$(EXECUTABLE)
++              -strip $(DESTDIR)$(EXECUTABLE)
++              $(INSTALL_PROGRAM) $(srcdir)/$(UNNAME) $(DESTDIR)$(UNEXECUTABLE)
++              -chmod 0755 $(DESTDIR)$(UNEXECUTABLE)
++              -strip $(DESTDIR)$(UNEXECUTABLE)
++              $(INSTALL_DATA) $(srcdir)/$(NAME).1 $(DESTDIR)$(MAN1DIR)/$(NAME).1
++              cd $(DESTDIR)$(MAN1DIR) && $(RM) ./$(UNNAME).1 && $(LN_S) $(NAME).1 $(UNNAME).1
++              $(INSTALL_DATA) $(srcdir)/$(NAME).3 $(DESTDIR)$(MAN3DIR)/$(NAME).3
++              cd $(DESTDIR)$(MAN3DIR) && $(RM) ./$(UNNAME).3 && $(LN_S) $(NAME).3 $(UNNAME).3
++              for hdr in $(INSTALLHEADERS); do $(INSTALL_DATA) $(srcdir)/$${hdr} $(DESTDIR)$(INCLUDEDIR)/$${hdr}; done
++              $(INSTALL_DATA) $(srcdir)/$(LIBNAME) $(DESTDIR)$(LIBRARY)
+ 
+ shar :
+               shar.script $(OTHERS) $(HDRS) $(SOURCES) > $(NAME).sh