Fix building libjbig85; don't overwrite CC and CFLAGS.

4 files changed, 17 insertions, 30 deletions

diff --git a/graphics/jbigkit/Makefile b/graphics/jbigkit/Makefile
index 29c4cec395e..6ccfdcd9acd 100644
--- a/graphics/jbigkit/Makefile
+++ b/graphics/jbigkit/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/10/06 14:11:00 asau Exp $
-#
+# $NetBSD: Makefile,v 1.4 2013/08/04 09:22:25 adam Exp $
 
 DISTNAME=	jbigkit-2.0
 CATEGORIES=	graphics
@@ -10,20 +9,20 @@ HOMEPAGE=	http://www.cl.cam.ac.uk/~mgk25/jbigkit/
 COMMENT=	JBIG-KIT lossless image compression library
 LICENSE=	gnu-gpl-v2
 
-USE_TOOLS+=	gmake
 USE_LIBTOOL=	yes
+USE_TOOLS+=	gmake
 
-WRKSRC=	${WRKDIR}/jbigkit
+WRKSRC=		${WRKDIR}/jbigkit
 
 TEST_TARGET=	test
 
-MAKE_JOBS_SAFE=	no
+CFLAGS+=	-I../libjbig
+MAKEFLAGS+=	CC=${CC:Q} CFLAGS=${CFLAGS:Q}
 
 INSTALLATION_DIRS=	bin include lib ${PKGMANDIR}/man1 share/doc/jbig
 
 do-install:
-	${RUN} \
-	cd ${WRKSRC}/libjbig; \
+	${RUN} cd ${WRKSRC}/libjbig; \
 	for h in *.h; do \
 		${INSTALL_DATA} "$${h}" ${DESTDIR}${PREFIX}/include; \
 	done; \
diff --git a/graphics/jbigkit/distinfo b/graphics/jbigkit/distinfo
index 4bc92649bbd..91a320f1985 100644
--- a/graphics/jbigkit/distinfo
+++ b/graphics/jbigkit/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/01/21 12:35:31 obache Exp $
+$NetBSD: distinfo,v 1.2 2013/08/04 09:22:25 adam Exp $
 
 SHA1 (jbigkit-2.0.tar.gz) = cfb7d3121f02a74bfb229217858a0d149b6589ef
 RMD160 (jbigkit-2.0.tar.gz) = 4b1b8358203c2bd86e034703d666c1453c60e572
 Size (jbigkit-2.0.tar.gz) = 435027 bytes
-SHA1 (patch-aa) = 3a38112fef5d83ba86787ef7e04bb78ed1690d4b
-SHA1 (patch-ab) = 85c63f8e915121ef36d43d4428f74b9c87a0c9f5
+SHA1 (patch-aa) = f11a943be8a0061dc535d210a4374721e453abe9
+SHA1 (patch-ab) = 0e8cc75d45ca6d3ca475d37b486f97284618d205
diff --git a/graphics/jbigkit/patches/patch-aa b/graphics/jbigkit/patches/patch-aa
index 444c8c9516a..abdb536ccca 100644
--- a/graphics/jbigkit/patches/patch-aa
+++ b/graphics/jbigkit/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2010/01/21 12:35:31 obache Exp $
+$NetBSD: patch-aa,v 1.2 2013/08/04 09:22:25 adam Exp $
 
 libtoolize
 
@@ -15,7 +15,7 @@ libtoolize
  
 -tstcodec: tstcodec.o jbig.o jbig_ar.o
 -	$(CC) $(CFLAGS) -o tstcodec $+
-+all: libjbig.la tstcodec tstcodec85
++all: libjbig.la libjbig85.la tstcodec tstcodec85
  
 -tstcodec85: tstcodec85.o jbig85.o jbig_ar.o
 -	$(CC) $(CFLAGS) -o tstcodec85 $+
diff --git a/graphics/jbigkit/patches/patch-ab b/graphics/jbigkit/patches/patch-ab
index 7fffc9314ad..e20820e6e7d 100644
--- a/graphics/jbigkit/patches/patch-ab
+++ b/graphics/jbigkit/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.1.1.1 2010/01/21 12:35:31 obache Exp $
+$NetBSD: patch-ab,v 1.2 2013/08/04 09:22:25 adam Exp $
 
 libtoolize
 
 --- pbmtools/Makefile.orig	2008-08-25 22:26:39.000000000 +0000
 +++ pbmtools/Makefile
-@@ -7,35 +7,38 @@ CC = gcc
+@@ -7,27 +7,30 @@ CC = gcc
  # Options for the compiler
  CFLAGS = -g -Wall -ansi -pedantic -I../libjbig # --coverage
  
@@ -19,7 +19,7 @@ libtoolize
  
 -pbmtojbg: pbmtojbg.o ../libjbig/libjbig.a
 -	$(CC) $(CFLAGS) -o pbmtojbg pbmtojbg.o -L../libjbig -ljbig
-+pbmtojbg: pbmtojbg.lo ../libjbig/libjbig.la
++pbmtojbg: pbmtojbg.lo
 +	${LIBTOOL} --mode=link --tag=CC $(CC) $(CFLAGS) -o pbmtojbg pbmtojbg.lo ../libjbig/libjbig.la
  
 -jbgtopbm: jbgtopbm.o ../libjbig/libjbig.a
@@ -29,12 +29,12 @@ libtoolize
  
 -pbmtojbg85: pbmtojbg85.o ../libjbig/libjbig85.a
 -	$(CC) $(CFLAGS) -o pbmtojbg85 pbmtojbg85.o -L../libjbig -ljbig85
-+pbmtojbg85: pbmtojbg85.lo ../libjbig/libjbig85.la
++pbmtojbg85: pbmtojbg85.lo
 +	${LIBTOOL} --mode=link --tag=CC $(CC) $(CFLAGS) -o pbmtojbg85 pbmtojbg85.lo ../libjbig/libjbig85.la
  
 -jbgtopbm85: jbgtopbm85.o ../libjbig/libjbig85.a
 -	$(CC) $(CFLAGS) -o jbgtopbm85 jbgtopbm85.o -L../libjbig -ljbig85
-+jbgtopbm85: jbgtopbm85.lo ../libjbig/libjbig85.la
++jbgtopbm85: jbgtopbm85.lo
 +	${LIBTOOL} --mode=link --tag=CC $(CC) $(CFLAGS) -o jbgtopbm85 jbgtopbm85.lo ../libjbig/libjbig85.la
  
 -jbgtopbm.o: jbgtopbm.c ../libjbig/jbig.h
@@ -46,17 +46,5 @@ libtoolize
 +jbgtopbm85.lo: jbgtopbm85.c ../libjbig/jbig85.h
 +pbmtojbg85.lo: pbmtojbg85.c ../libjbig/jbig85.h
  
--../libjbig/libjbig.a: ../libjbig/jbig.c ../libjbig/jbig.h \
-+../libjbig/libjbig.la: ../libjbig/jbig.c ../libjbig/jbig.h \
+ ../libjbig/libjbig.a: ../libjbig/jbig.c ../libjbig/jbig.h \
  	../libjbig/jbig_ar.c ../libjbig/jbig_ar.h
--	make -C ../libjbig libjbig.a
-+	make -C ../libjbig libjbig.la
- 
--../libjbig/libjbig85.a: ../libjbig/jbig85.c ../libjbig/jbig85.h \
-+../libjbig/libjbig85.la: ../libjbig/jbig85.c ../libjbig/jbig85.h \
- 	../libjbig/jbig_ar.c ../libjbig/jbig_ar.h
--	make -C ../libjbig libjbig85.a
-+	make -C ../libjbig libjbig85.la
- 
- test: test82 test85
-