cleanup the patch so that manpages dont install into /usr/man

Package-Manager: portage-2.0.53_rc5

diff --git a/app-arch/rzip/Manifest b/app-arch/rzip/Manifest
index 3908c2764ef48798d8d80d075e7403532743bbc3..8f72df0365d802119a2b7fdc0e0a9357da858555 100644 (file)
--- a/app-arch/rzip/Manifest
+++ b/app-arch/rzip/Manifest
@@ -1,7 +1,17 @@
-MD5 32376604ed0f50f578c33e6328647b4f rzip-2.0-r2.ebuild 794
-MD5 008c336582b796079d14538427744f78 rzip-2.0-r1.ebuild 588
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 1dd3f8b19f6527a42462de4f9fd17bb1 ChangeLog 1673
-MD5 6182d392742f77bc19d9d20894486fa4 metadata.xml 373
-MD5 a66dd73d205378bb0f8e086fc01dd511 files/rzip-2.0-darwin.patch 5857
 MD5 08798457dd084bc7a3c20f9fe4c5e398 files/digest-rzip-2.0-r1 59
 MD5 08798457dd084bc7a3c20f9fe4c5e398 files/digest-rzip-2.0-r2 59
+MD5 b1a0147c29f8f84b2e7f68d56611eeb3 files/rzip-2.0-darwin.patch 5035
+MD5 6182d392742f77bc19d9d20894486fa4 metadata.xml 373
+MD5 008c336582b796079d14538427744f78 rzip-2.0-r1.ebuild 588
+MD5 ad05ea26ae9ce10ff4e15677698330c8 rzip-2.0-r2.ebuild 725
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDVuDGgIKl8Uu19MoRAmgYAJ9XmNKwS3RBYaSp6MLdf1PREmzyOQCfVarx
+4jvf3RMKJuyCC1Hl4ODE2AQ=
+=5uLs
+-----END PGP SIGNATURE-----

diff --git a/app-arch/rzip/files/rzip-2.0-darwin.patch b/app-arch/rzip/files/rzip-2.0-darwin.patch
index d6c9440fe871a388434374e904ba7e87164da1ae..b7858d83529c030ba2f908984396323c4789ca16 100644 (file)
--- a/app-arch/rzip/files/rzip-2.0-darwin.patch
+++ b/app-arch/rzip/files/rzip-2.0-darwin.patch
@@ -1,14 +1,13 @@
-diff -urN rzip-2.0/Makefile.in rzip-2.0-darwin/Makefile.in
---- rzip-2.0/Makefile.in       2003-10-06 06:53:00.000000000 -0500
-+++ rzip-2.0-darwin/Makefile.in        2005-09-21 22:48:29.000000000 -0500
+--- rzip-2.0/Makefile.in
++++ rzip-2.0/Makefile.in
 @@ -3,8 +3,8 @@
  
  prefix=@prefix@
  exec_prefix=@exec_prefix@
 -INSTALL_BIN=$(exec_prefix)/bin
 -INSTALL_MAN=$(prefix)/man
-+INSTALL_BIN=$(DESTDIR)/$(exec_prefix)/bin
-+INSTALL_MAN=$(DESTDIR)/$(prefix)/man
++INSTALL_BIN=$(DESTDIR)/@bindir@
++INSTALL_MAN=$(DESTDIR)/@mandir@
  
  LIBS=@LIBS@
  CC=@CC@
@@ -25,13 +24,12 @@ diff -urN rzip-2.0/Makefile.in rzip-2.0-darwin/Makefile.in
        ${INSTALLCMD} -m 755 rzip ${INSTALL_BIN}
        -mkdir -p ${INSTALL_MAN}/man1
        ${INSTALLCMD} -m 644 $(srcdir)/rzip.1 ${INSTALL_MAN}/man1/
-+      -ln -s ${INSTALL_BIN}/rzip runzip
++      ln -s rzip $(INSTALL_BIN)/runzip
  
  rzip: $(OBJS)
        $(CC) $(CFLAGS) -o rzip $(OBJS) $(LIBS)
-diff -urN rzip-2.0/configure.in rzip-2.0-darwin/configure.in
---- rzip-2.0/configure.in      2003-11-03 02:19:11.000000000 -0600
-+++ rzip-2.0-darwin/configure.in       2005-09-21 22:51:47.000000000 -0500
+--- rzip-2.0/configure.in
++++ rzip-2.0/configure.in
 @@ -2,6 +2,12 @@
  AC_INIT(main.c)
  AC_CONFIG_HEADER(config.h)
@@ -92,9 +90,8 @@ diff -urN rzip-2.0/configure.in rzip-2.0-darwin/configure.in
 +AC_CHECK_FUNCS(strndup)
  
  AC_OUTPUT(Makefile)
-diff -urN rzip-2.0/main.c rzip-2.0-darwin/main.c
---- rzip-2.0/main.c    2004-02-11 18:01:08.000000000 -0600
-+++ rzip-2.0-darwin/main.c     2005-09-21 22:37:50.000000000 -0500
+--- rzip-2.0/main.c
++++ rzip-2.0/main.c
 @@ -18,6 +18,7 @@
  /* rzip compression - main program */
  
@@ -112,9 +109,8 @@ diff -urN rzip-2.0/main.c rzip-2.0-darwin/main.c
        v = htonl(st.st_size & 0xFFFFFFFF);
        memcpy(&magic[6], &v, 4);
        v = htonl(st.st_size >> 32);
-diff -urN rzip-2.0/rzip.h rzip-2.0-darwin/rzip.h
---- rzip-2.0/rzip.h    2003-10-07 17:08:28.000000000 -0500
-+++ rzip-2.0-darwin/rzip.h     2005-09-21 22:37:50.000000000 -0500
+--- rzip-2.0/rzip.h
++++ rzip-2.0/rzip.h
 @@ -94,7 +94,7 @@
  #define strerror(i) sys_errlist[i]
  #endif
@@ -124,9 +120,8 @@ diff -urN rzip-2.0/rzip.h rzip-2.0-darwin/rzip.h
  extern int errno;
  #endif
  
-diff -urN rzip-2.0/strutils.c rzip-2.0-darwin/strutils.c
---- rzip-2.0/strutils.c        1969-12-31 18:00:00.000000000 -0600
-+++ rzip-2.0-darwin/strutils.c 2005-09-21 22:37:50.000000000 -0500
+--- rzip-2.0/strutils.c
++++ rzip-2.0/strutils.c
 @@ -0,0 +1,29 @@
 +/* 
 +   Copyright (C) 2005 Gentoo Foundation
@@ -157,9 +152,8 @@ diff -urN rzip-2.0/strutils.c rzip-2.0-darwin/strutils.c
 +      return(memcpy(ret, s, n));
 +}
 +#endif
-diff -urN rzip-2.0/strutils.h rzip-2.0-darwin/strutils.h
---- rzip-2.0/strutils.h        1969-12-31 18:00:00.000000000 -0600
-+++ rzip-2.0-darwin/strutils.h 2005-09-21 22:37:50.000000000 -0500
+--- rzip-2.0/strutils.h
++++ rzip-2.0/strutils.h
 @@ -0,0 +1,31 @@
 +/* 
 +   Copyright (C) 2005 Gentoo Foundation

diff --git a/app-arch/rzip/rzip-2.0-r2.ebuild b/app-arch/rzip/rzip-2.0-r2.ebuild
index 4977f1dfd6d4779957873239fbef15f03101fa5a..0545ab60837f939236afabdd4b6f6676a03aad98 100644 (file)
--- a/app-arch/rzip/rzip-2.0-r2.ebuild
+++ b/app-arch/rzip/rzip-2.0-r2.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/app-arch/rzip/rzip-2.0-r2.ebuild,v 1.2 2005/09/23 15:55:45 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rzip/rzip-2.0-r2.ebuild,v 1.3 2005/10/20 00:09:17 vapier Exp $
 
 inherit autotools
 
@@ -18,13 +18,12 @@ DEPEND="app-arch/bzip2
 RDEPEND="app-arch/bzip2"
 
 src_unpack() {
-       unpack "${A}"
-       epatch "${FILESDIR}/${P}-darwin.patch"
-       cd ${S}
+       unpack ${A}
+       cd "${S}"
+       epatch "${FILESDIR}"/${P}-darwin.patch
        WANT_AUTOCONF="2.5" eautoreconf
 }
 
 src_install() {
        make DESTDIR="${D}" install || die "failed installing"
-       dosym rzip /usr/bin/runzip || die "failed creating runzip symlink"
 }