diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2005-01-07 22:35:27 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-01-07 22:35:27 +0000 |
| commit | 39ff7a748a8229575ba5a85394b60caec3cce0a7 (patch) | |
| tree | 85adc8d62a8ad0155a2f4276a48b9a747c06cb74 /media-libs | |
| parent | Fixed destdir patch. (diff) | |
| download | gentoo-2-39ff7a748a8229575ba5a85394b60caec3cce0a7.tar.gz gentoo-2-39ff7a748a8229575ba5a85394b60caec3cce0a7.tar.bz2 gentoo-2-39ff7a748a8229575ba5a85394b60caec3cce0a7.zip | |
Fixed destdir patch.
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/compface/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/compface/compface-1.4.ebuild | 4 | ||||
| -rw-r--r-- | media-libs/compface/compface-1.5.ebuild | 6 | ||||
| -rw-r--r-- | media-libs/compface/files/compface-1.5-destdir.diff | 16 |
4 files changed, 15 insertions, 17 deletions
diff --git a/media-libs/compface/ChangeLog b/media-libs/compface/ChangeLog index bae774722048..4cfdc845e09d 100644 --- a/media-libs/compface/ChangeLog +++ b/media-libs/compface/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/compface # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/compface/ChangeLog,v 1.16 2005/01/06 16:18:24 hattya Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/compface/ChangeLog,v 1.17 2005/01/07 22:30:36 eradicator Exp $ + + 07 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org> + files/compface-1.5-destdir.diff, compface-1.5.ebuild: + Fixed destdir patch. *compface-1.5 (07 Jan 2005) diff --git a/media-libs/compface/compface-1.4.ebuild b/media-libs/compface/compface-1.4.ebuild index ba7df2f98483..7f60564efbc7 100644 --- a/media-libs/compface/compface-1.4.ebuild +++ b/media-libs/compface/compface-1.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 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.22 2004/10/05 09:39:09 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/compface/compface-1.4.ebuild,v 1.23 2005/01/07 22:30:36 eradicator Exp $ IUSE="" diff --git a/media-libs/compface/compface-1.5.ebuild b/media-libs/compface/compface-1.5.ebuild index cfe64a242cbb..fac321f49c40 100644 --- a/media-libs/compface/compface-1.5.ebuild +++ b/media-libs/compface/compface-1.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/compface/compface-1.5.ebuild,v 1.3 2005/01/06 16:21:01 hattya Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/compface/compface-1.5.ebuild,v 1.4 2005/01/07 22:30:36 eradicator Exp $ IUSE="" @@ -17,21 +17,17 @@ SLOT="0" DEPEND="virtual/libc" src_unpack() { - unpack ${A} cd ${S} epatch ${FILESDIR}/${P}-destdir.diff WANT_AUTOCONF=2.5 autoconf - } src_install() { - dodir /usr/share/man/man{1,3} /usr/{bin,include,$(get_libdir)} make DESTDIR="${D}" install || die newbin xbm2xface{.pl,} dodoc README ChangeLog - } diff --git a/media-libs/compface/files/compface-1.5-destdir.diff b/media-libs/compface/files/compface-1.5-destdir.diff index 4ebc12271700..fb7642bbfaca 100644 --- a/media-libs/compface/files/compface-1.5-destdir.diff +++ b/media-libs/compface/files/compface-1.5-destdir.diff @@ -1,15 +1,17 @@ -diff -Naurp compface-1.5.orig/Makefile.in compface-1.5/Makefile.in
---- compface-1.5.orig/Makefile.in 2004-12-23 22:23:08.000000000 -0800
-+++ compface-1.5/Makefile.in 2005-01-07 14:29:46.298182241 -0800
+diff -Naurp compface-1.5.orig/Makefile.in compface-1.5/Makefile.in +--- compface-1.5.orig/Makefile.in 2004-12-23 22:23:08.000000000 -0800 ++++ compface-1.5/Makefile.in 2005-01-07 14:35:05.055230327 -0800 @@ -71,18 +71,16 @@ dist: $(DISTFILES)
$(RM) -rf `cat .fname` .fname
install: $(NAME) $(UNNAME) $(LIBNAME)
- $(INSTALL_PROGRAM) $(srcdir)/$(NAME) $(EXECUTABLE)
-- -chmod 0755 $(EXECUTABLE)
++ $(INSTALL_PROGRAM) $(srcdir)/$(NAME) $(DESTDIR)$(EXECUTABLE)
+ -chmod 0755 $(EXECUTABLE)
- -strip $(EXECUTABLE)
- $(INSTALL_PROGRAM) $(srcdir)/$(UNNAME) $(UNEXECUTABLE)
-- -chmod 0755 $(UNEXECUTABLE)
++ $(INSTALL_PROGRAM) $(srcdir)/$(UNNAME) $(DESTDIR)$(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
@@ -17,10 +19,6 @@ diff -Naurp compface-1.5.orig/Makefile.in compface-1.5/Makefile.in - 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)
-+ $(INSTALL_PROGRAM) $(srcdir)/$(UNNAME) $(DESTDIR)$(UNEXECUTABLE)
-+ -chmod 0755 $(DESTDIR)$(UNEXECUTABLE)
+ $(INSTALL_DATA) $(srcdir)/$(NAME).1 $(DESTDIR)$(MAN1DIR)/$(NAME).1
+ $(LN_S) $(NAME).1 $(DESTDIR)$(MAN1DIR)/$(UNNAME).1
+ $(INSTALL_DATA) $(srcdir)/$(NAME).3 $(DESTDIR)$(MAN3DIR)/$(NAME).3
|