Attachment #187508 for bug #223270

View | Details | Raw Unified | Return to bug 223270
Collapse All | Expand All

Lines 10-15 Link Here

(-)Makefile (+3 lines)
10	MAINTAINER= mi@aldan.algebra.com	10	MAINTAINER= mi@aldan.algebra.com
11	COMMENT= Lossless compression for bi-level images such as scanned pages, faxes	11	COMMENT= Lossless compression for bi-level images such as scanned pages, faxes
12		12
		13	LICENSE= GPLv2+
		14	LICENSE_FILE= ${WRKSRC}/COPYING
		15
13	USE_LDCONFIG= yes	16	USE_LDCONFIG= yes
14	MANS= jbgtopbm.1 pbmtojbg.1	17	MANS= jbgtopbm.1 pbmtojbg.1
15	BINS= jbgtopbm pbmtojbg jbgtopbm85 pbmtojbg85	18	BINS= jbgtopbm pbmtojbg jbgtopbm85 pbmtojbg85

Lines 1-6 Link Here

(-)files/patch-libjbig_Makefile (-5 / +9 lines)
1	--- libjbig/Makefile 2014-03-27 14:47:15.000000000 -0400	1	--- libjbig/Makefile.orig 2014-03-27 18:47:15 UTC
2	+++ libjbig/Makefile 2014-04-08 08:43:57.000000000 -0400	2	+++ libjbig/Makefile
3	@@ -2,10 +2,14 @@	3	@@ -1,12 +1,16 @@
		4	# Unix makefile for the JBIG-KIT library
4		5
5	# Select an ANSI/ISO C compiler here, GNU gcc is recommended	6	# Select an ANSI/ISO C compiler here, GNU gcc is recommended
6	-CC = gcc	7	-CC = gcc
Lines 18-24 Link Here
18	+ $(CC) -c -fpic -DPIC ${CFLAGS} ${.IMPSRC} -o ${.TARGET}	19	+ $(CC) -c -fpic -DPIC ${CFLAGS} ${.IMPSRC} -o ${.TARGET}
19		20
20	tstcodec: tstcodec.o jbig.o jbig_ar.o	21	tstcodec: tstcodec.o jbig.o jbig_ar.o
21	@@ -20,4 +24,8 @@	22	$(CC) $(CFLAGS) -o tstcodec tstcodec.o jbig.o jbig_ar.o
		23	@@ -19,11 +23,19 @@ libjbig.a: jbig.o jbig_ar.o
		24	ar rc libjbig.a jbig.o jbig_ar.o
22	-ranlib libjbig.a	25	-ranlib libjbig.a
23		26
24	+libjbig.so.2: jbig.So jbig_ar.So	27	+libjbig.so.2: jbig.So jbig_ar.So
Lines 27-33 Link Here
27	+	30	+
28	libjbig85.a: jbig85.o jbig_ar.o	31	libjbig85.a: jbig85.o jbig_ar.o
29	rm -f libjbig85.a	32	rm -f libjbig85.a
30	@@ -25,4 +33,8 @@	33	ar rc libjbig85.a jbig85.o jbig_ar.o
31	-ranlib libjbig85.a	34	-ranlib libjbig85.a
32		35
33	+libjbig85.so.1: jbig85.So jbig_ar.So	36	+libjbig85.so.1: jbig85.So jbig_ar.So
Lines 36-38 Link Here
36	+	39	+
37	jbig.o: jbig.c jbig.h jbig_ar.h	40	jbig.o: jbig.c jbig.h jbig_ar.h
38	jbig85.o: jbig85.c jbig85.h jbig_ar.h	41	jbig85.o: jbig85.c jbig85.h jbig_ar.h
		42	jbig_ar.o: jbig_ar.c jbig_ar.h

Lines 1-6 Link Here

(-)files/patch-pbmtools_Makefile (-4 / +8 lines)
1	--- pbmtools/Makefile 2014-03-27 14:47:15.000000000 -0400	1	--- pbmtools/Makefile.orig 2014-03-27 18:47:15 UTC
2	+++ pbmtools/Makefile 2014-04-08 09:18:42.000000000 -0400	2	+++ pbmtools/Makefile
3	@@ -2,14 +2,14 @@	3	@@ -1,16 +1,16 @@
		4	# Unix makefile for the JBIG-KIT PBM tools
4		5
5	# Select an ANSI/ISO C compiler here, e.g. GNU gcc is recommended	6	# Select an ANSI/ISO C compiler here, e.g. GNU gcc is recommended
6	-CC = gcc	7	-CC = gcc
Lines 19-25 Link Here
19	+all: pbmtojbg jbgtopbm pbmtojbg85 jbgtopbm85	20	+all: pbmtojbg jbgtopbm pbmtojbg85 jbgtopbm85
20		21
21	txt: pbmtojbg.txt jbgtopbm.txt pbm.txt pgm.txt	22	txt: pbmtojbg.txt jbgtopbm.txt pbm.txt pgm.txt
22	@@ -144,6 +144,8 @@	23
		24	@@ -143,8 +143,10 @@ dotest85b: test-$(IMG).pbm
		25	./jbgtopbm85 -B 1 test-$(IMG).jbg85 test-$(IMG).pbm85
23	cmp test-$(IMG).pbm test-$(IMG).pbm85	26	cmp test-$(IMG).pbm test-$(IMG).pbm85
24		27
25	-test-%.pbm: ../examples/%.jbg	28	-test-%.pbm: ../examples/%.jbg
Lines 30-32 Link Here
30	+.endfor	33	+.endfor
31		34
32	test-t82.pbm:	35	test-t82.pbm:
		36	make -C ../libjbig tstcodec

Lines 1-6 Link Here

(-)files/patch-warnings (-7 / +11 lines)
1	--- pbmtools/pbmtojbg85.c 2014-03-27 14:47:15.000000000 -0400	1	--- pbmtools/pbmtojbg.c.orig 2014-03-27 18:47:15 UTC
2	+++ pbmtools/pbmtojbg85.c 2014-04-08 09:00:16.000000000 -0400	2	+++ pbmtools/pbmtojbg.c
3	@@ -71,8 +71,12 @@	3	@@ -86,10 +86,14 @@ static unsigned long getint(FILE *f)
		4	while ((c = getc(f)) != EOF && !(c == 13 \|\| c == 10)) ;
4	if (c != EOF) {	5	if (c != EOF) {
5	ungetc(c, f);	6	ungetc(c, f);
6	- fscanf(f, "%lu", &i);	7	- fscanf(f, "%lu", &i);
Lines 15-24 Link Here
15	- return i;	16	- return i;
16	+ return -1;	17	+ return -1;
17	}	18	}
18		19
19	--- pbmtools/pbmtojbg.c 2014-03-27 14:47:15.000000000 -0400	20
20	+++ pbmtools/pbmtojbg.c 2014-04-08 09:00:16.000000000 -0400	21	--- pbmtools/pbmtojbg85.c.orig 2014-03-27 18:47:15 UTC
21	@@ -87,8 +87,12 @@	22	+++ pbmtools/pbmtojbg85.c
		23	@@ -70,10 +70,14 @@ static unsigned long getint(FILE *f)
		24	while ((c = getc(f)) != EOF && !(c == 13 \|\| c == 10)) ;
22	if (c != EOF) {	25	if (c != EOF) {
23	ungetc(c, f);	26	ungetc(c, f);
24	- fscanf(f, "%lu", &i);	27	- fscanf(f, "%lu", &i);
Lines 34-36 Link Here
34	+ return -1;	37	+ return -1;
35	}	38	}
36		39
		40

Return to bug 223270