Upgrade from 1.8 to 2.1

PR:		184585
Submitted by:	Adam Weinberger

1 files changed, 28 insertions, 30 deletions

diff --git a/graphics/jbigkit/files/patch-ab b/graphics/jbigkit/files/patch-ab
index cd58dfe7d825..fd98f69787c9 100644
--- a/graphics/jbigkit/files/patch-ab
+++ b/graphics/jbigkit/files/patch-ab
@@ -1,40 +1,38 @@
---- libjbig/Makefile	Fri Apr 10 20:33:27 1998
-+++ libjbig/Makefile	Wed Sep 16 11:57:16 1998
-@@ -5,9 +5,11 @@
+--- libjbig/Makefile	2014-03-27 14:47:15.000000000 -0400
++++ libjbig/Makefile	2014-04-08 08:43:57.000000000 -0400
+@@ -2,10 +2,14 @@
+ 
+ # Select an ANSI/ISO C compiler here, GNU gcc is recommended
 -CC = gcc
++#CC = gcc
  
  # Options for the compiler: A high optimization level is suggested
--CFLAGS = -O -Wall -ansi -pedantic
-+CFLAGS += -Wall -ansi -pedantic
+-CFLAGS = -g -O -W -Wall -ansi -pedantic # --coverage
++CFLAGS += -W -Wall -ansi -pedantic # --coverage
  
--all: libjbig.a tstcodec
-+JBIGLIB=libjbig.a
-+SOJBIGLIB=libjbig.so.1
+-all: libjbig.a libjbig85.a tstcodec tstcodec85
++all: libjbig.a libjbig85.a tstcodec tstcodec85 libjbig.so.2 libjbig85.so.1
 +
-+all: libjbig.a $(SOJBIGLIB)
++.SUFFIXES: .c .So
++.c.So:
++	$(CC) -c -fpic -DPIC ${CFLAGS} ${.IMPSRC} -o ${.TARGET}
  
- tstcodec: tstcodec.c jbig.c jbig.h jbig_tab.o
- 	$(CC) $(CFLAGS) -o tstcodec -DTEST_CODEC tstcodec.c jbig.c \
-@@ -18,10 +25,21 @@
- 	ar rc libjbig.a jbig.o jbig_tab.o
- 	ranlib libjbig.a
+ tstcodec: tstcodec.o jbig.o jbig_ar.o
+@@ -20,4 +24,8 @@
+ 	-ranlib libjbig.a
  
-+$(SOJBIGLIB): jbig.so jbig_tab.so
++libjbig.so.2: jbig.So jbig_ar.So
 +	rm -f ${.TARGET}
-+	$(CC) -o ${.TARGET} ${LDFLAGS} -shared -Wl,-soname,${.TARGET} ${.ALLSRC}         
-+	ln -sf ${.TARGET} `echo ${.TARGET} | sed 's/\.so.*$$/.so/'`
-+	
- jbig.o: jbig.c jbig.h
- 
-+.SUFFIXES: .c .so
-+.c.so:
-+	${CC} -c -fpic -DPIC ${CFLAGS} ${.IMPSRC} -o ${.TARGET}
-+jbig.so: jbig.c jbig.h
-+jbig_tab.so: jbig_tab.c
++	$(CC) -o ${.TARGET} ${LDFLAGS} -shared -Wl,-soname,${.TARGET} ${.ALLSRC}
 +
- test: tstcodec
- 	./tstcodec
+ libjbig85.a: jbig85.o jbig_ar.o
+ 	rm -f libjbig85.a
+@@ -25,4 +33,8 @@
+ 	-ranlib libjbig85.a
  
- clean:
--	rm -f *.o *~ core gmon.out dbg_d\=??.pbm tstcodec
-+	rm -f *.o *~ core gmon.out dbg_d\=??.pbm tstcodec *.so libjbig.so.1 libjbig.so.1.1 libjbig.a
++libjbig85.so.1: jbig85.So jbig_ar.So
++	rm -f ${.TARGET}
++	$(CC) -o ${.TARGET} ${LDFLAGS} -shared -Wl,-soname,${.TARGET} ${.ALLSRC}
++
+ jbig.o: jbig.c jbig.h jbig_ar.h
+ jbig85.o: jbig85.c jbig85.h jbig_ar.h