Updated patch to fix broken makefile (thanks to flameeyes for the update)

(Portage version: 2.1.2.6)

5 files changed, 65 insertions, 9 deletions

diff --git a/media-libs/jbigkit/ChangeLog b/media-libs/jbigkit/ChangeLog
index dc99b847a4d3..2fefc35aa6b9 100644
--- a/media-libs/jbigkit/ChangeLog
+++ b/media-libs/jbigkit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/jbigkit
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/ChangeLog,v 1.34 2007/02/22 01:49:32 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/ChangeLog,v 1.35 2007/05/19 23:18:24 nerdboy Exp $
+
+  19 May 2007; Steve Arnold <nerdboy@gentoo.org>
+  files/jbigkit-1.6-respect-make.patch:
+  Updated patch to fix broken makefile (thanks to flameeyes for the update).
+  This fixes bug #178240 (no rev bump).  Verified/tested fine on amd64.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/media-libs/jbigkit/files/jbigkit-1.6-respect-make.patch b/media-libs/jbigkit/files/jbigkit-1.6-respect-make.patch
index 46d4107a5690..d7834e3e92de 100644
--- a/media-libs/jbigkit/files/jbigkit-1.6-respect-make.patch
+++ b/media-libs/jbigkit/files/jbigkit-1.6-respect-make.patch
@@ -2,8 +2,12 @@ Index: jbigkit/Makefile
 ===================================================================
 --- jbigkit.orig/Makefile
 +++ jbigkit/Makefile
-@@ -16,19 +16,19 @@ all: lib pbm
- 	@echo "Enter 'make test' in order to start some automatic tests."
+@@ -13,22 +13,22 @@ CFLAGS = $(CCFLAGS) -I../libjbig
+ VERSION=1.6
+ 
+ all: lib pbm
+-	@echo "Enter 'make test' in order to start some automatic tests."
++	@echo "Enter '$(MAKE) test' in order to start some automatic tests."
  
  lib:
 -	(cd libjbig;  make "CC=$(CC)" "CFLAGS=$(CFLAGS)")
@@ -28,3 +32,50 @@ Index: jbigkit/Makefile
  
  distribution: clean
  	rm -f libjbig/libjbig.a
+Index: jbigkit/pbmtools/Makefile
+===================================================================
+--- jbigkit.orig/pbmtools/Makefile
++++ jbigkit/pbmtools/Makefile
+@@ -21,25 +21,25 @@ jbgtopbm.o: jbgtopbm.c ../libjbig/jbig.h
+ pbmtojbg.o: pbmtojbg.c ../libjbig/jbig.h
+ 
+ ../libjbig/libjbig.a: ../libjbig/jbig.c ../libjbig/jbig.h
+-	cd ../libjbig ; make libjbig.a
++	cd ../libjbig ; $(MAKE) libjbig.a
+ 
+ test: pbmtojbg jbgtopbm
+-	make IMG=ccitt1     OPTIONSJ=      OPTIONSP=       dotest1
+-	make IMG=ccitt2     OPTIONSJ=      OPTIONSP=       dotest1
+-	make IMG=ccitt3     OPTIONSJ=      OPTIONSP=       dotest1
+-	make IMG=xvlogo     OPTIONSJ=     "OPTIONSP=-d 3"  dotest1
+-	make IMG=sandra     OPTIONSP=      OPTIONSJ=       dotest2g
+-	make IMG=sandra     OPTIONSP=-b    OPTIONSJ=-b     dotest2g
+-	make IMG=sandra     OPTIONSP=-q    OPTIONSJ=       dotest2g
+-	make IMG=sandra    "OPTIONSP=-o 0" OPTIONSJ=       dotest2g
+-	make IMG=sandra    "OPTIONSP=-o 2" OPTIONSJ=       dotest2g
+-	make IMG=multi      OPTIONSP=      OPTIONSJ=       dotest2g
+-	make IMG=multi      OPTIONSP=-b    OPTIONSJ=-b     dotest2g
+-	make IMG=mx        "OPTIONSP=-q -s 3 -m 128"       dotest1
+-	make IMG=mx        "OPTIONSP=-q -s 3 -m 128"       dotest2b
+-	make IMG=mx        "OPTIONSP=-q -s 3 -m 128 -p 92" dotest2b
+-	make IMG=mx        "OPTIONSP=-q -Y -1"             dotest2b
+-	make IMG=mx        "OPTIONSP=-Y -1"                dotest2b
++	$(MAKE) IMG=ccitt1     OPTIONSJ=      OPTIONSP=       dotest1
++	$(MAKE) IMG=ccitt2     OPTIONSJ=      OPTIONSP=       dotest1
++	$(MAKE) IMG=ccitt3     OPTIONSJ=      OPTIONSP=       dotest1
++	$(MAKE) IMG=xvlogo     OPTIONSJ=     "OPTIONSP=-d 3"  dotest1
++	$(MAKE) IMG=sandra     OPTIONSP=      OPTIONSJ=       dotest2g
++	$(MAKE) IMG=sandra     OPTIONSP=-b    OPTIONSJ=-b     dotest2g
++	$(MAKE) IMG=sandra     OPTIONSP=-q    OPTIONSJ=       dotest2g
++	$(MAKE) IMG=sandra    "OPTIONSP=-o 0" OPTIONSJ=       dotest2g
++	$(MAKE) IMG=sandra    "OPTIONSP=-o 2" OPTIONSJ=       dotest2g
++	$(MAKE) IMG=multi      OPTIONSP=      OPTIONSJ=       dotest2g
++	$(MAKE) IMG=multi      OPTIONSP=-b    OPTIONSJ=-b     dotest2g
++	$(MAKE) IMG=mx        "OPTIONSP=-q -s 3 -m 128"       dotest1
++	$(MAKE) IMG=mx        "OPTIONSP=-q -s 3 -m 128"       dotest2b
++	$(MAKE) IMG=mx        "OPTIONSP=-q -s 3 -m 128 -p 92" dotest2b
++	$(MAKE) IMG=mx        "OPTIONSP=-q -Y -1"             dotest2b
++	$(MAKE) IMG=mx        "OPTIONSP=-Y -1"                dotest2b
+ 	rm -f test-*.jbg test-*.pbm test-*.pgm
+ 	./jbgtopbm ../examples/ccitt1.jbg | ./pbmtojbg > test-ccitt1.jbg
+ 	cmp ../examples/ccitt1.jbg test-ccitt1.jbg
diff --git a/media-libs/jbigkit/jbigkit-1.4.ebuild b/media-libs/jbigkit/jbigkit-1.4.ebuild
index cc8f635b2801..d379cfa4ab1c 100644
--- a/media-libs/jbigkit/jbigkit-1.4.ebuild
+++ b/media-libs/jbigkit/jbigkit-1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/jbigkit-1.4.ebuild,v 1.27 2007/02/28 22:13:22 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/jbigkit-1.4.ebuild,v 1.28 2007/05/19 23:18:24 nerdboy Exp $
 
 inherit flag-o-matic
 
diff --git a/media-libs/jbigkit/jbigkit-1.6-r1.ebuild b/media-libs/jbigkit/jbigkit-1.6-r1.ebuild
index c3838527ca51..48e54909672e 100644
--- a/media-libs/jbigkit/jbigkit-1.6-r1.ebuild
+++ b/media-libs/jbigkit/jbigkit-1.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/jbigkit-1.6-r1.ebuild,v 1.18 2007/02/28 22:13:22 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/jbigkit-1.6-r1.ebuild,v 1.19 2007/05/19 23:18:24 nerdboy Exp $
 
 inherit eutils multilib toolchain-funcs
 
diff --git a/media-libs/jbigkit/jbigkit-1.6.ebuild b/media-libs/jbigkit/jbigkit-1.6.ebuild
index 33b9edaa33a1..e8aa02fd68f2 100644
--- a/media-libs/jbigkit/jbigkit-1.6.ebuild
+++ b/media-libs/jbigkit/jbigkit-1.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/jbigkit-1.6.ebuild,v 1.2 2007/02/28 22:13:22 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/jbigkit-1.6.ebuild,v 1.3 2007/05/19 23:18:24 nerdboy Exp $
 
 inherit eutils