Redo the Makefile patch so it doesn't specify install user/group and it

  doesn't strip by default. Keyworded ~x86-fbsd, #189692.
(Portage version: 2.1.3.6)

3 files changed, 28 insertions, 10 deletions

diff --git a/media-libs/openjpeg/ChangeLog b/media-libs/openjpeg/ChangeLog
index d9ced6e3b77b..9605af7b4b2f 100644
--- a/media-libs/openjpeg/ChangeLog
+++ b/media-libs/openjpeg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/openjpeg
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/ChangeLog,v 1.2 2007/06/30 10:34:49 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/ChangeLog,v 1.3 2007/08/23 10:44:07 uberlord Exp $
+
+  23 Aug 2007; Roy Marples <uberlord@gentoo.org>
+  files/openjpeg-1.2-Makefile.patch, openjpeg-1.2.ebuild:
+  Redo the Makefile patch so it doesn't specify install user/group and it
+  doesn't strip by default. Keyworded ~x86-fbsd, #189692.
 
 *openjpeg-1.2 (30 Jun 2007)
 
diff --git a/media-libs/openjpeg/files/openjpeg-1.2-Makefile.patch b/media-libs/openjpeg/files/openjpeg-1.2-Makefile.patch
index 1b3e5373e79e..3ed124d9ab69 100644
--- a/media-libs/openjpeg/files/openjpeg-1.2-Makefile.patch
+++ b/media-libs/openjpeg/files/openjpeg-1.2-Makefile.patch
@@ -1,11 +1,23 @@
---- trunk/Makefile.orig	2007-02-13 09:49:00.000000000 +0100
-+++ trunk/Makefile	2007-02-28 08:28:58.000000000 +0100
-@@ -51,7 +51,7 @@
+diff -ur a/Makefile b/Makefile
+--- a/Makefile	2007-06-04 14:27:25 +0100
++++ b/Makefile	2007-08-23 11:38:25 +0100
+@@ -54,15 +54,15 @@
  	$(AR) r $@ $(MODULES)
  
  $(SHAREDLIB): $(MODULES)
 -	$(CC) -s -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES)
-+	$(CC) $(LDFLAGS) -s -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES)
++	$(CC) $(LDFLAGS) -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES)
  
- install:
- 	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
+ install: OpenJPEG
+ 	install -d '$(DESTDIR)$(INSTALL_LIBDIR)' '$(DESTDIR)$(INSTALL_INCLUDE)'
+-	install -m 644 -o root -g root $(STATICLIB) '$(DESTDIR)$(INSTALL_LIBDIR)'
++	install -m 644 $(STATICLIB) '$(DESTDIR)$(INSTALL_LIBDIR)'
+ 	ranlib '$(DESTDIR)$(INSTALL_LIBDIR)/$(STATICLIB)'
+-	install -m 755 -o root -g root $(SHAREDLIB) '$(DESTDIR)$(INSTALL_LIBDIR)'
++	install -m 755 $(SHAREDLIB) '$(DESTDIR)$(INSTALL_LIBDIR)'
+ 	ln -sf $(SHAREDLIB) '$(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)'
+-	install -m 644 -o root -g root libopenjpeg/openjpeg.h '$(DESTDIR)$(INSTALL_INCLUDE)'
++	install -m 644 libopenjpeg/openjpeg.h '$(DESTDIR)$(INSTALL_INCLUDE)'
+ 	-ldconfig
+ 
+ clean:
diff --git a/media-libs/openjpeg/openjpeg-1.2.ebuild b/media-libs/openjpeg/openjpeg-1.2.ebuild
index c91ee77230c5..23bbcaef28cb 100644
--- a/media-libs/openjpeg/openjpeg-1.2.ebuild
+++ b/media-libs/openjpeg/openjpeg-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/openjpeg-1.2.ebuild,v 1.1 2007/06/30 10:34:49 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/openjpeg-1.2.ebuild,v 1.2 2007/08/23 10:44:07 uberlord Exp $
 
 inherit flag-o-matic toolchain-funcs multilib
 
@@ -10,13 +10,14 @@ SRC_URI="http://www.openjpeg.org/openjpeg_v${PV//./_}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 S="${WORKDIR}/trunk"
 
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
 	epatch "${FILESDIR}"/${P}-Makefile.patch
 }
 
@@ -28,5 +29,5 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" INSTALL_LIBDIR="/usr/$(get_libdir)" install || die "install failed"
 
-	dodoc ChangeLog README.linux
+	dodoc ChangeLog
 }