diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2004-10-05 09:39:09 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2004-10-05 09:39:09 +0000 |
| commit | 7185e24acf08791a5486328085d115c2597a68d9 (patch) | |
| tree | c5c4c539f2515fb138a4564a161335440ad6e57e /media-libs/compface | |
| parent | static USE flag support and added metadata. (Manifest recommit) (diff) | |
| download | gentoo-2-7185e24acf08791a5486328085d115c2597a68d9.tar.gz gentoo-2-7185e24acf08791a5486328085d115c2597a68d9.tar.bz2 gentoo-2-7185e24acf08791a5486328085d115c2597a68d9.zip | |
Made a DESTDIR patch and use that to fix installation on multilib systems.
Diffstat (limited to 'media-libs/compface')
| -rw-r--r-- | media-libs/compface/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/compface/compface-1.4.ebuild | 13 | ||||
| -rw-r--r-- | media-libs/compface/files/compface-1.4-destdir.diff | 34 |
3 files changed, 45 insertions, 8 deletions
diff --git a/media-libs/compface/ChangeLog b/media-libs/compface/ChangeLog index d7ea1d0b80d0..913b1fa2e480 100644 --- a/media-libs/compface/ChangeLog +++ b/media-libs/compface/ChangeLog @@ -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. diff --git a/media-libs/compface/compface-1.4.ebuild b/media-libs/compface/compface-1.4.ebuild index d7b3df6122f9..ba7df2f98483 100644 --- a/media-libs/compface/compface-1.4.ebuild +++ b/media-libs/compface/compface-1.4.ebuild @@ -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 index 000000000000..46e8c88d2982 --- /dev/null +++ b/media-libs/compface/files/compface-1.4-destdir.diff @@ -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 |