From root@adamw.org  Sat Dec  7 21:33:03 2013
Return-Path: <root@adamw.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id C4EAB5F9
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  7 Dec 2013 21:33:03 +0000 (UTC)
Received: from apnoea.adamw.org (apnoea.adamw.org [204.109.59.150])
	(using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 9C1901AFF
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  7 Dec 2013 21:33:03 +0000 (UTC)
Received: by apnoea.adamw.org (Postfix, from userid 0)
	id D178F11F891; Sat,  7 Dec 2013 15:32:20 -0500 (EST)
Message-Id: <20131207203220.D178F11F891@apnoea.adamw.org>
Date: Sat,  7 Dec 2013 15:32:20 -0500 (EST)
From: Adam Weinberger <adamw@FreeBSD.org>
Reply-To: Adam Weinberger <adamw@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: mi@aldan.algebra.com
Subject: Update graphics/jbigkit to 2.0 [patch]
X-Send-Pr-Version: 3.114
X-GNATS-Notify: mi@aldan.algebra.com

>Number:         184585
>Category:       ports
>Synopsis:       [exp-run] Update graphics/jbigkit to 2.0 [patch]
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    portmgr
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 07 21:40:01 UTC 2013
>Closed-Date:    
>Last-Modified:  Fri Apr 25 05:10:00 UTC 2014
>Originator:     Adam Weinberger
>Release:        FreeBSD 9.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD apnoea.adamw.org 9.2-STABLE FreeBSD 9.2-STABLE #0: Sat Nov 30 11:45:56 EST 2013 root@apnoea.adamw.org:/usr/obj/usr/src/sys/PEEP i386


	
>Description:

Seeing as how it has been *five years* since version 2.0 was released, it's
probably time to update the port.

Attached patch updates to version 2.0, uses staging, respects PORT_OPTIONS:MDOCS,
renames patches to proper names, and moves install logic to the port Makefile where
it belongs.

A number of ports depend on this, so we should request an exp-run for this. Maintainer,
once you approve these changes I will steward it through the rest of the way.
>How-To-Repeat:
>Fix:


--- jbigkit.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 335849)
+++ Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	jbigkit
-PORTVERSION=	1.6
+PORTVERSION=	2.0
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.cl.cam.ac.uk/~mgk25/download/
 
@@ -12,18 +12,29 @@
 WRKSRC=	${WRKDIR}/${PORTNAME}
 USE_LDCONFIG=	yes
 
-MAN1=	jbgtopbm.1 pbmtojbg.1
-
 DOCSDIR?=	${PREFIX}/share/doc/jbig
 
-NO_STAGE=	yes
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/libjbig/jbig.doc ${DOCSDIR}
-.endif
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/pbmtools/jbgtopbm ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/pbmtools/pbmtojbg ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/pbmtools/jbgtopbm85 ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/pbmtools/pbmtojbg85 ${STAGEDIR}${PREFIX}/bin
 
-post-build test:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/libjbig ${MAKE} test
+	${INSTALL_MAN} ${WRKSRC}/pbmtools/pbmtojbg.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/pbmtools/jbgtopbm.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
+	${INSTALL_DATA} ${WRKSRC}/libjbig/jbig.h ${STAGEDIR}${PREFIX}/include
+	${INSTALL_DATA} ${WRKSRC}/libjbig/jbig85.h ${STAGEDIR}${PREFIX}/include
+	${INSTALL_DATA} ${WRKSRC}/libjbig/jbig_ar.h ${STAGEDIR}${PREFIX}/include
+
+	${INSTALL_DATA} ${WRKSRC}/libjbig/libjbig.a ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/libjbig/libjbig.so.1 ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/libjbig/libjbig85.a ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/libjbig/libjbig85.so.1 ${STAGEDIR}${PREFIX}/lib
+	${LN} -sf libjbig.so.1 ${STAGEDIR}${PREFIX}/lib/libjbig.so
+	${LN} -sf libjbig85.so.1 ${STAGEDIR}${PREFIX}/lib/libjbig85.so
+
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/libjbig/jbig.txt ${STAGEDIR}${DOCSDIR}
+
 .include <bsd.port.mk>
Index: distinfo
===================================================================
--- distinfo	(revision 335849)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (jbigkit-1.6.tar.gz) = d841b6d0723c1082450967f3ea500be01810a34ec4a97ad10985ae7071a6150b
-SIZE (jbigkit-1.6.tar.gz) = 405712
+SHA256 (jbigkit-2.0.tar.gz) = f6be61695d18d6315961e473eda92252fdecf9636903bfbf4766a2eeff1f17ee
+SIZE (jbigkit-2.0.tar.gz) = 435027
Index: files/patch-Makefile
===================================================================
--- files/patch-Makefile	(revision 335849)
+++ files/patch-Makefile	(working copy)
@@ -33,29 +33,3 @@
 -	(cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
 +	(cd libjbig;  $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
 +	(cd pbmtools; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
- 
- clean:
- 	rm -f *~ core
-@@ -36,3 +36,22 @@
- 	  gzip -9f jbigkit-$(VERSION).tar )
- 	mv ../jbigkit-$(VERSION).tar.gz $(HOME)/public_html/download/
- 	cp CHANGES $(HOME)/public_html/jbigkit/
-+
-+install:
-+	mkdir -p ${PREFIX}/bin
-+	${BSD_INSTALL_PROGRAM} pbmtools/jbgtopbm pbmtools/pbmtojbg \
-+		${PREFIX}/bin
-+	mkdir -p ${PREFIX}/man/man1
-+	${BSD_INSTALL_MAN} pbmtools/pbmtojbg.1 pbmtools/jbgtopbm.1 \
-+		${PREFIX}/man/man1
-+	# mkdir -p ${PREFIX}/man/man5
-+	# Not installing the pbm(5) man page, because BSD has its own
-+	# install -c -m 644 -o bin -g bin pbmtools/pbm.5 ${PREFIX}/man/man5
-+	# Not installing the pgm(5) man page for it comes with netpbm port
-+	# install -c -m 644 -o bin -g bin pbmtools/pgm.5 ${PREFIX}/man/man5
-+	mkdir -p ${PREFIX}/include
-+	${BSD_INSTALL_DATA} libjbig/jbig.h ${PREFIX}/include
-+	mkdir -p ${PREFIX}/lib
-+	${BSD_INSTALL_DATA} libjbig/libjbig.a ${PREFIX}/lib
-+	${BSD_INSTALL_DATA} libjbig/libjbig.so.1 ${PREFIX}/lib
-+	ln -sf libjbig.so.1 ${PREFIX}/lib/libjbig.so
Index: files/patch-aa
===================================================================
--- files/patch-aa	(revision 335849)
+++ files/patch-aa	(working copy)
@@ -1,61 +0,0 @@
---- Makefile.orig	Tue Apr  9 19:37:13 2002
-+++ Makefile	Tue Apr  9 22:45:53 2002
-@@ -2,13 +2,13 @@
- # $Id: Makefile,v 1.12 2002-04-09 11:37:13+01 mgk25 Exp $
- 
- # 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
--CCFLAGS = -O2 -W
-+#CCFLAGS = -O2 -W
- #CCFLAGS = -O -g -W -Wall -ansi -pedantic #-DDEBUG  # developer only
- 
--CFLAGS = $(CCFLAGS) -I../libjbig
-+CFLAGS += -I../libjbig
- 
- VERSION=1.4
- 
-@@ -16,14 +16,14 @@
- 	@echo "Enter 'make test' in order to start some automatic tests."
- 
- lib:
--	(cd libjbig;  make "CC=$(CC)" "CFLAGS=$(CFLAGS)")
-+	(cd libjbig;  $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)")
- 
- pbm: lib
--	(cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)")
-+	(cd pbmtools; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)")
- 
- test: lib pbm
--	(cd libjbig;  make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
--	(cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
-+	(cd libjbig;  $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
-+	(cd pbmtools; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
- 
- clean:
- 	rm -f *~ core
-@@ -36,3 +36,22 @@
- 	  gzip -9f jbigkit-$(VERSION).tar )
- 	mv ../jbigkit-$(VERSION).tar.gz $(HOME)/public_html/download/
- 	cp CHANGES $(HOME)/public_html/jbigkit/
-+
-+install:
-+	mkdir -p ${PREFIX}/bin
-+	${BSD_INSTALL_PROGRAM} pbmtools/jbgtopbm pbmtools/pbmtojbg \
-+		${PREFIX}/bin
-+	mkdir -p ${PREFIX}/man/man1
-+	${BSD_INSTALL_MAN} pbmtools/pbmtojbg.1 pbmtools/jbgtopbm.1 \
-+		${PREFIX}/man/man1
-+	# mkdir -p ${PREFIX}/man/man5
-+	# Not installing the pbm(5) man page, because BSD has its own
-+	# install -c -m 644 -o bin -g bin pbmtools/pbm.5 ${PREFIX}/man/man5
-+	# Not installing the pgm(5) man page for it comes with netpbm port
-+	# install -c -m 644 -o bin -g bin pbmtools/pgm.5 ${PREFIX}/man/man5
-+	mkdir -p ${PREFIX}/include
-+	${BSD_INSTALL_DATA} libjbig/jbig.h ${PREFIX}/include
-+	mkdir -p ${PREFIX}/lib
-+	${BSD_INSTALL_DATA} libjbig/libjbig.a ${PREFIX}/lib
-+	${BSD_INSTALL_DATA} libjbig/libjbig.so.1 ${PREFIX}/lib
-+	ln -sf libjbig.so.1 ${PREFIX}/lib/libjbig.so
Index: files/patch-ab
===================================================================
--- files/patch-ab	(revision 335849)
+++ files/patch-ab	(working copy)
@@ -1,40 +0,0 @@
---- libjbig/Makefile	Fri Apr 10 20:33:27 1998
-+++ libjbig/Makefile	Wed Sep 16 11:57:16 1998
-@@ -5,9 +5,11 @@
--CC = gcc
- 
- # Options for the compiler: A high optimization level is suggested
--CFLAGS = -O -Wall -ansi -pedantic
-+CFLAGS += -Wall -ansi -pedantic
- 
--all: libjbig.a tstcodec
-+JBIGLIB=libjbig.a
-+SOJBIGLIB=libjbig.so.1
-+
-+all: libjbig.a $(SOJBIGLIB)
- 
- 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
- 
-+$(SOJBIGLIB): jbig.so jbig_tab.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
-+
- test: tstcodec
- 	./tstcodec
- 
- 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
Index: files/patch-ac
===================================================================
--- files/patch-ac	(revision 335849)
+++ files/patch-ac	(working copy)
@@ -1,16 +0,0 @@
---- pbmtools/Makefile.orig	Thu Jun 25 13:30:38 1998
-+++ pbmtools/Makefile	Thu Jun 25 13:31:00 1998
-@@ -5,11 +5,10 @@
--CC = gcc
- 
- # Options for the compiler
--CFLAGS = -g -Wall -ansi -pedantic -I../libjbig
-+CFLAGS += -Wall -ansi -pedantic -I../libjbig
- 
- .SUFFIXES: .1 .5 .txt $(SUFFIXES)
- 
--all: pbmtojbg jbgtopbm pbmtojbg.txt jbgtopbm.txt pbm.txt pgm.txt
-+all: pbmtojbg jbgtopbm
- 
- pbmtojbg: pbmtojbg.o ../libjbig/libjbig.a
- 	$(CC) $(CFLAGS) -o pbmtojbg pbmtojbg.o -L../libjbig -ljbig
Index: files/patch-libjbig_Makefile
===================================================================
--- files/patch-libjbig_Makefile	(revision 335849)
+++ files/patch-libjbig_Makefile	(working copy)
@@ -1,40 +1,46 @@
---- libjbig/Makefile	Fri Apr 10 20:33:27 1998
-+++ libjbig/Makefile	Wed Sep 16 11:57:16 1998
-@@ -5,9 +5,11 @@
+--- libjbig/Makefile.orig	2008-08-30 13:20:52.000000000 -0400
++++ libjbig/Makefile	2013-12-07 15:16:56.000000000 -0500
+@@ -2,12 +2,12 @@
+ # $Id: Makefile 1285 2008-08-18 13:36:45Z mgk25 $
+ 
+ # 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 -Wall -ansi -pedantic # --coverage
++CFLAGS += -Wall -ansi -pedantic # --coverage
  
--all: libjbig.a tstcodec
-+JBIGLIB=libjbig.a
-+SOJBIGLIB=libjbig.so.1
-+
-+all: libjbig.a $(SOJBIGLIB)
+-all: libjbig.a tstcodec tstcodec85
++all: libjbig.a libjbig85.a libjbig.so.1 libjbig85.so.1
  
- 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
+ 	$(CC) $(CFLAGS) -o tstcodec $+
+@@ -20,11 +20,19 @@
+ 	ar rc libjbig.a jbig.o jbig_ar.o
+ 	-ranlib libjbig.a
  
-+$(SOJBIGLIB): jbig.so jbig_tab.so
++libjbig.so.1: jbig.o jbig_ar.o
 +	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
++	$(CC) -o ${.TARGET} ${LDFLAGS} -shared -Wl,-soname,${.TARGET} ${.ALLSRC}
++
+ libjbig85.a: jbig85.o jbig_ar.o
+ 	rm -f libjbig85.a
+ 	ar rc libjbig85.a jbig85.o jbig_ar.o
+ 	-ranlib libjbig85.a
  
++libjbig85.so.1: jbig85.o jbig_ar.o
++	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
+ jbig_ar.o: jbig_ar.c jbig_ar.h
+@@ -46,3 +54,7 @@
+ clean:
+ 	rm -f *.{o,gcda,gcno,gcov} *~ core gmon.out dbg_d\=??.pbm t82test.pbm
+ 	rm -f tstcodec tstcodec85
++
 +.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
-+
- test: tstcodec
- 	./tstcodec
- 
- 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
++	$(CC) -c -fpic -DPIC ${CFLAGS} ${.IMPSRC} -o ${.TARGET}
Index: files/patch-pbmtools_Makefile
===================================================================
--- files/patch-pbmtools_Makefile	(revision 335849)
+++ files/patch-pbmtools_Makefile	(working copy)
@@ -1,16 +1,22 @@
---- pbmtools/Makefile.orig	Thu Jun 25 13:30:38 1998
-+++ pbmtools/Makefile	Thu Jun 25 13:31:00 1998
-@@ -5,11 +5,10 @@
+--- pbmtools/Makefile.orig	2013-12-07 15:03:46.000000000 -0500
++++ pbmtools/Makefile	2013-12-07 15:04:59.000000000 -0500
+@@ -2,15 +2,15 @@
+ # $Id: Makefile 1293 2008-08-25 22:26:39Z mgk25 $
+ 
+ # Select an ANSI/ISO C compiler here, e.g. GNU gcc is recommended
 -CC = gcc
++#CC = gcc
  
  # Options for the compiler
--CFLAGS = -g -Wall -ansi -pedantic -I../libjbig
-+CFLAGS += -Wall -ansi -pedantic -I../libjbig
+-CFLAGS = -g -Wall -ansi -pedantic -I../libjbig # --coverage
++CFLAGS += -Wall -ansi -pedantic -I../libjbig # --coverage
  
  .SUFFIXES: .1 .5 .txt $(SUFFIXES)
  
--all: pbmtojbg jbgtopbm pbmtojbg.txt jbgtopbm.txt pbm.txt pgm.txt
-+all: pbmtojbg jbgtopbm
+-all: pbmtojbg jbgtopbm pbmtojbg85 jbgtopbm85 \
+-	pbmtojbg.txt jbgtopbm.txt pbm.txt pgm.txt
++all: pbmtojbg jbgtopbm pbmtojbg85 jbgtopbm85
++#	pbmtojbg.txt jbgtopbm.txt pbm.txt pgm.txt
  
  pbmtojbg: pbmtojbg.o ../libjbig/libjbig.a
  	$(CC) $(CFLAGS) -o pbmtojbg pbmtojbg.o -L../libjbig -ljbig
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 335849)
+++ pkg-plist	(working copy)
@@ -1,8 +1,17 @@
 bin/jbgtopbm
+bin/jbgtopbm85
 bin/pbmtojbg
+bin/pbmtojbg85
 include/jbig.h
+include/jbig85.h
+include/jbig_ar.h
 lib/libjbig.a
 lib/libjbig.so
 lib/libjbig.so.1
-%%PORTDOCS%%%%DOCSDIR%%/jbig.doc
+lib/libjbig85.a
+lib/libjbig85.so
+lib/libjbig85.so.1
+man/man1/pbmtojbg.1.gz
+man/man1/jbgtopbm.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/jbig.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
--- jbigkit.patch ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->mi 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Dec 7 21:40:15 UTC 2013 
Responsible-Changed-Why:  
mi@aldan.algebra.com => mi@ (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=184585 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sat Dec 7 21:40:17 UTC 2013 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=184585 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: mi@aldan.algebra.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/184585: Update graphics/jbigkit to 2.0 [patch]
Date: Sat, 7 Dec 2013 21:40:16 UT

 Maintainer of graphics/jbigkit,
 
 Please note that PR ports/184585 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/184585
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
State-Changed-From-To: feedback->open 
State-Changed-By: adamw 
State-Changed-When: Sun Dec 29 11:38:53 EST 2013 
State-Changed-Why:  
I'm going to consider this a maintainer timout. I'll take this 
and usher it through the rest of the way. mi, shoot me an email 
if you want otherwise. 


Responsible-Changed-From-To: mi->adamw 
Responsible-Changed-By: adamw 
Responsible-Changed-When: Sun Dec 29 11:38:53 EST 2013 
Responsible-Changed-Why:  
I'm going to consider this a maintainer timout. I'll take this 
and usher it through the rest of the way. mi, shoot me an email 
if you want otherwise. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=184585 
Responsible-Changed-From-To: adamw->portmgr 
Responsible-Changed-By: adamw 
Responsible-Changed-When: Sun Dec 29 11:40:03 EST 2013 
Responsible-Changed-Why:  
Assigning to portmgr. Can we please do an exp-run with this change? 
It *should* be a NOOP, as the old jbigkit library hasn't really 
changed, but I'd like to make sure of it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=184585 
Responsible-Changed-From-To: portmgr->bdrewery 
Responsible-Changed-By: bdrewery 
Responsible-Changed-When: Mon Jan 20 13:47:26 CST 2014 
Responsible-Changed-Why:  
take for exp-run (currently behind) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=184585 

From: Bryan Drewery <bdrewery@FreeBSD.org>
To: bug-followup@FreeBSD.org, adamw@FreeBSD.org
Cc:  
Subject: Re: ports/184585: [exp-run] Update graphics/jbigkit to 2.0 [patch]
Date: Sun, 02 Feb 2014 12:25:32 -0600

 This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
 --dvd3Xx3OaDKU9mAVMOV3cJJ7fGAiPM9QB
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: quoted-printable
 
 Sorry, I have been behind. I went to do the exp-run on this today.
 Unfortunately the patch does not apply.
 
 The patch modifies files/patch-Makefile, files/patch-pbmtools_Makefile
 and files/patch-libjbig_Makefile.
 
 I don't see these files in head or ever existing for graphics/jbigkit
 
 
 --=20
 Regards,
 Bryan Drewery
 
 
 --dvd3Xx3OaDKU9mAVMOV3cJJ7fGAiPM9QB
 Content-Type: application/pgp-signature; name="signature.asc"
 Content-Description: OpenPGP digital signature
 Content-Disposition: attachment; filename="signature.asc"
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (MingW32)
 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
 
 iQEcBAEBAgAGBQJS7o2cAAoJEDXXcbtuRpfPWGAIAN/6WOeGGd72KXs88yuVsFK3
 2T5n/EakVBDKNo9Q2C++RFqKweBnipCmrgoPsJbMKHniMyqNequxGB0+oU8hVAXw
 8U+AJUguMzex+BcX+cSNN5uqUiqNzrQ0nN1oAQROtHNXuInTkp6uDCyypEd7YXfX
 4pYyjh4OIsjpKz3GeP0T3MHuwT4rFxbvtcfBEjloMqg8py/vGuMVYE+dMnk800rq
 mgSprQVUCdhfe0OfPfThyDaN+SrgSn+UEFtLB8j07NUAYV/kh2UdStHDAIxYmkIy
 W2f5PqEuMlYirAw6BoX+WAKeLHqhK4IO+gWMIUnu21wcNMNwszhn1uHYrRc1RBk=
 =6Dhj
 -----END PGP SIGNATURE-----
 
 --dvd3Xx3OaDKU9mAVMOV3cJJ7fGAiPM9QB--

From: "Adam Weinberger" <adamw@adamw.org>
To: "Bryan Drewery" <bdrewery@FreeBSD.org>
Cc: bug-followup@FreeBSD.org, adamw@FreeBSD.org
Subject: Re: ports/184585: [exp-run] Update graphics/jbigkit to 2.0 [patch]
Date: Sun, 02 Feb 2014 13:39:01 -0500

 Yeah, you're right. I had attempted to include some svn mv stuff in 
 there to improve patch filenames but it didn't come out clearly in the 
 patch.
 
 The files/ stuff will apply if you:
 # mv patch-aa patch-Makefile
 # mv patch-ab patch-libjbig_Makefile
 # mv patch-ac patch-pbmtools_Makefile
 
 The Makefile portion is also not likely to apply, as miwi just added 
 STAGE support to the port.
 
 I'll redo the patch again, but if you sit on it for a month again then 
 you get to recreate it next time ;-)
 
 # Adam
 
 
 --
 Adam Weinberger
 adamw@adamw.org
 http://www.adamw.org

From: Adam Weinberger <adamw@FreeBSD.org>
To: Bryan Drewery <bdrewery@FreeBSD.org>
Cc: bug-followup@FreeBSD.org, adamw@FreeBSD.org
Subject: Re: ports/184585: [exp-run] Update graphics/jbigkit to 2.0 [patch]
Date: Sun, 2 Feb 2014 14:10:45 -0500

 --bg08WKrSYDhXBjb5
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 Regenerated patch attached. If I attached it wrong I can put it up on
 people.freebsd.org.
 
 # Adam
 
 
 --
 Adam Weinberger
 adamw@adamw.org
 http://www.adamw.org
 
 --bg08WKrSYDhXBjb5
 Content-Type: text/x-diff; charset=us-ascii
 Content-Disposition: attachment; filename="jbigkit2.patch"
 
 Index: Makefile
 ===================================================================
 --- Makefile	(revision 342354)
 +++ Makefile	(working copy)
 @@ -2,7 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	jbigkit
 -PORTVERSION=	1.6
 +PORTVERSION=	2.0
  CATEGORIES=	graphics
  MASTER_SITES=	http://www.cl.cam.ac.uk/~mgk25/download/
  
 @@ -14,11 +14,31 @@
  
  DOCSDIR?=	${PREFIX}/share/doc/jbig
  
 -post-install:
 +do-install:
 +	${INSTALL_PROGRAM} ${WRKSRC}/pbmtools/jbgtopbm ${STAGEDIR}${PREFIX}/bin
 +	${INSTALL_PROGRAM} ${WRKSRC}/pbmtools/pbmtojbg ${STAGEDIR}${PREFIX}/bin
 +	${INSTALL_PROGRAM} ${WRKSRC}/pbmtools/jbgtopbm85 ${STAGEDIR}${PREFIX}/bin
 +	${INSTALL_PROGRAM} ${WRKSRC}/pbmtools/pbmtojbg85 ${STAGEDIR}${PREFIX}/bin
 +
 +	${INSTALL_MAN} ${WRKSRC}/pbmtools/pbmtojbg.1 ${STAGEDIR}${MANPREFIX}/man/man1
 +	${INSTALL_MAN} ${WRKSRC}/pbmtools/jbgtopbm.1 ${STAGEDIR}${MANPREFIX}/man/man1
 +
 +	${INSTALL_DATA} ${WRKSRC}/libjbig/jbig.h ${STAGEDIR}${PREFIX}/include
 +	${INSTALL_DATA} ${WRKSRC}/libjbig/jbig85.h ${STAGEDIR}${PREFIX}/include
 +	${INSTALL_DATA} ${WRKSRC}/libjbig/jbig_ar.h ${STAGEDIR}${PREFIX}/include
 +
 +	${INSTALL_DATA} ${WRKSRC}/libjbig/libjbig.a ${STAGEDIR}${PREFIX}/lib
 +	${INSTALL_DATA} ${WRKSRC}/libjbig/libjbig.so.1 ${STAGEDIR}${PREFIX}/lib
 +	${INSTALL_DATA} ${WRKSRC}/libjbig/libjbig85.a ${STAGEDIR}${PREFIX}/lib
 +	${INSTALL_DATA} ${WRKSRC}/libjbig/libjbig85.so.1 ${STAGEDIR}${PREFIX}/lib
 +	${LN} -sf libjbig.so.1 ${STAGEDIR}${PREFIX}/lib/libjbig.so
 +	${LN} -sf libjbig85.so.1 ${STAGEDIR}${PREFIX}/lib/libjbig85.so
 +
  	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 -	@${INSTALL_DATA} ${WRKSRC}/libjbig/jbig.doc ${STAGEDIR}${DOCSDIR}
 +	${INSTALL_DATA} ${WRKSRC}/libjbig/jbig.txt ${STAGEDIR}${DOCSDIR}
  
 -post-build test:
 -	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/libjbig ${MAKE} test
 +# Automated tests fail due to strange Makefile incantations.
 +#test:
 +#	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/libjbig ${MAKE} test
  
  .include <bsd.port.mk>
 Index: distinfo
 ===================================================================
 --- distinfo	(revision 342354)
 +++ distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (jbigkit-1.6.tar.gz) = d841b6d0723c1082450967f3ea500be01810a34ec4a97ad10985ae7071a6150b
 -SIZE (jbigkit-1.6.tar.gz) = 405712
 +SHA256 (jbigkit-2.0.tar.gz) = f6be61695d18d6315961e473eda92252fdecf9636903bfbf4766a2eeff1f17ee
 +SIZE (jbigkit-2.0.tar.gz) = 435027
 Index: files/patch-aa
 ===================================================================
 --- files/patch-aa	(revision 342354)
 +++ files/patch-aa	(working copy)
 @@ -33,29 +33,3 @@
  -	(cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
  +	(cd libjbig;  $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
  +	(cd pbmtools; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
 - 
 - clean:
 - 	rm -f *~ core
 -@@ -36,3 +36,22 @@
 - 	  gzip -9f jbigkit-$(VERSION).tar )
 - 	mv ../jbigkit-$(VERSION).tar.gz $(HOME)/public_html/download/
 - 	cp CHANGES $(HOME)/public_html/jbigkit/
 -+
 -+install:
 -+	mkdir -p $(DESTDIR)${PREFIX}/bin
 -+	${BSD_INSTALL_PROGRAM} pbmtools/jbgtopbm pbmtools/pbmtojbg \
 -+		$(DESTDIR)${PREFIX}/bin
 -+	mkdir -p $(DESTDIR)${PREFIX}/man/man1
 -+	${BSD_INSTALL_MAN} pbmtools/pbmtojbg.1 pbmtools/jbgtopbm.1 \
 -+		$(DESTDIR)${PREFIX}/man/man1
 -+	# mkdir -p $(DESTDIR)${PREFIX}/man/man5
 -+	# Not installing the pbm(5) man page, because BSD has its own
 -+	# install -c -m 644 -o bin -g bin pbmtools/pbm.5 ${PREFIX}/man/man5
 -+	# Not installing the pgm(5) man page for it comes with netpbm port
 -+	# install -c -m 644 -o bin -g bin pbmtools/pgm.5 ${PREFIX}/man/man5
 -+	mkdir -p $(DESTDIR)${PREFIX}/include
 -+	${BSD_INSTALL_DATA} libjbig/jbig.h $(DESTDIR)${PREFIX}/include
 -+	mkdir -p $(DESTDIR)${PREFIX}/lib
 -+	${BSD_INSTALL_DATA} libjbig/libjbig.a $(DESTDIR)${PREFIX}/lib
 -+	${BSD_INSTALL_DATA} libjbig/libjbig.so.1 $(DESTDIR)${PREFIX}/lib
 -+	ln -sf libjbig.so.1 $(DESTDIR)${PREFIX}/lib/libjbig.so
 Index: files/patch-ab
 ===================================================================
 --- files/patch-ab	(revision 342354)
 +++ files/patch-ab	(working copy)
 @@ -1,40 +1,53 @@
 ---- libjbig/Makefile	Fri Apr 10 20:33:27 1998
 -+++ libjbig/Makefile	Wed Sep 16 11:57:16 1998
 -@@ -5,9 +5,11 @@
 +--- libjbig/Makefile.orig	2008-08-30 13:20:52.000000000 -0400
 ++++ libjbig/Makefile	2014-02-02 14:04:26.000000000 -0500
 +@@ -2,29 +2,37 @@
 + # $Id: Makefile 1285 2008-08-18 13:36:45Z mgk25 $
 + 
 + # 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 -Wall -ansi -pedantic # --coverage
 ++CFLAGS += -Wall -ansi -pedantic # --coverage
   
 --all: libjbig.a tstcodec
 -+JBIGLIB=libjbig.a
 -+SOJBIGLIB=libjbig.so.1
 -+
 -+all: libjbig.a $(SOJBIGLIB)
 +-all: libjbig.a tstcodec tstcodec85
 ++all: libjbig.a libjbig85.a libjbig.so.1 libjbig85.so.1
   
 - 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
 +-	$(CC) $(CFLAGS) -o tstcodec $+
 ++	$(CC) $(CFLAGS) -o ${.TARGET} ${.ALLSRC}
   
 -+$(SOJBIGLIB): jbig.so jbig_tab.so
 + tstcodec85: tstcodec85.o jbig85.o jbig_ar.o
 +-	$(CC) $(CFLAGS) -o tstcodec85 $+
 ++	$(CC) $(CFLAGS) -o ${.TARGET} ${.ALLSRC}
 + 
 + libjbig.a: jbig.o jbig_ar.o
 + 	rm -f libjbig.a
 + 	ar rc libjbig.a jbig.o jbig_ar.o
 + 	-ranlib libjbig.a
 + 
 ++libjbig.so.1: jbig.o jbig_ar.o
  +	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
 ++	$(CC) -o ${.TARGET} ${LDFLAGS} -shared -Wl,-soname,${.TARGET} ${.ALLSRC}
 ++
 + libjbig85.a: jbig85.o jbig_ar.o
 + 	rm -f libjbig85.a
 + 	ar rc libjbig85.a jbig85.o jbig_ar.o
 + 	-ranlib libjbig85.a
   
 ++libjbig85.so.1: jbig85.o jbig_ar.o
 ++	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
 + jbig_ar.o: jbig_ar.c jbig_ar.h
 +@@ -46,3 +54,7 @@
 + clean:
 + 	rm -f *.{o,gcda,gcno,gcov} *~ core gmon.out dbg_d\=??.pbm t82test.pbm
 + 	rm -f tstcodec tstcodec85
 ++
  +.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
 -+
 - test: tstcodec
 - 	./tstcodec
 - 
 - 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
 ++	$(CC) -c -fpic -DPIC ${CFLAGS} ${.IMPSRC} -o ${.TARGET}
 Index: files/patch-ac
 ===================================================================
 --- files/patch-ac	(revision 342354)
 +++ files/patch-ac	(working copy)
 @@ -1,16 +1,22 @@
 ---- pbmtools/Makefile.orig	Thu Jun 25 13:30:38 1998
 -+++ pbmtools/Makefile	Thu Jun 25 13:31:00 1998
 -@@ -5,11 +5,10 @@
 +--- pbmtools/Makefile.orig	2013-12-07 15:03:46.000000000 -0500
 ++++ pbmtools/Makefile	2013-12-07 15:04:59.000000000 -0500
 +@@ -2,15 +2,15 @@
 + # $Id: Makefile 1293 2008-08-25 22:26:39Z mgk25 $
 + 
 + # Select an ANSI/ISO C compiler here, e.g. GNU gcc is recommended
  -CC = gcc
 ++#CC = gcc
   
   # Options for the compiler
 --CFLAGS = -g -Wall -ansi -pedantic -I../libjbig
 -+CFLAGS += -Wall -ansi -pedantic -I../libjbig
 +-CFLAGS = -g -Wall -ansi -pedantic -I../libjbig # --coverage
 ++CFLAGS += -Wall -ansi -pedantic -I../libjbig # --coverage
   
   .SUFFIXES: .1 .5 .txt $(SUFFIXES)
   
 --all: pbmtojbg jbgtopbm pbmtojbg.txt jbgtopbm.txt pbm.txt pgm.txt
 -+all: pbmtojbg jbgtopbm
 +-all: pbmtojbg jbgtopbm pbmtojbg85 jbgtopbm85 \
 +-	pbmtojbg.txt jbgtopbm.txt pbm.txt pgm.txt
 ++all: pbmtojbg jbgtopbm pbmtojbg85 jbgtopbm85
 ++#	pbmtojbg.txt jbgtopbm.txt pbm.txt pgm.txt
   
   pbmtojbg: pbmtojbg.o ../libjbig/libjbig.a
   	$(CC) $(CFLAGS) -o pbmtojbg pbmtojbg.o -L../libjbig -ljbig
 Index: pkg-plist
 ===================================================================
 --- pkg-plist	(revision 342354)
 +++ pkg-plist	(working copy)
 @@ -1,10 +1,17 @@
  bin/jbgtopbm
 +bin/jbgtopbm85
  bin/pbmtojbg
 +bin/pbmtojbg85
  include/jbig.h
 +include/jbig85.h
 +include/jbig_ar.h
  lib/libjbig.a
  lib/libjbig.so
  lib/libjbig.so.1
 +lib/libjbig85.a
 +lib/libjbig85.so
 +lib/libjbig85.so.1
  man/man1/jbgtopbm.1.gz
  man/man1/pbmtojbg.1.gz
 -%%PORTDOCS%%%%DOCSDIR%%/jbig.doc
 +%%PORTDOCS%%%%DOCSDIR%%/jbig.txt
  %%PORTDOCS%%@dirrm %%DOCSDIR%%
 
 --bg08WKrSYDhXBjb5--

From: Bryan Drewery <bdrewery@FreeBSD.org>
To: Adam Weinberger <adamw@FreeBSD.org>
Cc: "bug-followup@FreeBSD.org" <bug-followup@FreeBSD.org>,
        "adamw@FreeBSD.org" <adamw@FreeBSD.org>
Subject: Re: ports/184585: [exp-run] Update graphics/jbigkit to 2.0 [patch]
Date: Sun, 2 Feb 2014 14:18:55 -0600

 > On Feb 2, 2014, at 13:10, Adam Weinberger <adamw@FreeBSD.org> wrote:
 > 
 > Regenerated patch attached. If I attached it wrong I can put it up on
 > people.freebsd.org.
 > 
 
 Thanks, starting it now. Will have results tomorrow.
 
 > # Adam
 > 
 > 
 > --
 > Adam Weinberger
 > adamw@adamw.org
 > http://www.adamw.org
 > <jbigkit2.patch>

From: Bryan Drewery <bdrewery@FreeBSD.org>
To: bug-followup@FreeBSD.org, adamw@FreeBSD.org
Cc:  
Subject: Re: ports/184585: [exp-run] Update graphics/jbigkit to 2.0 [patch]
Date: Tue, 04 Feb 2014 20:17:54 -0600

 This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
 --IFSLa8ojOafB5fK3odFiSm0fQSjTaM9VG
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: quoted-printable
 
 jbigkit failed:
 
 http://package18.nyi.freebsd.org/bulk/91amd64-default-pr_184585/2014-02-0=
 2_20h39m24s/logs/errors/jbigkit-2.0.log
 
 --=20
 Regards,
 Bryan Drewery
 
 
 --IFSLa8ojOafB5fK3odFiSm0fQSjTaM9VG
 Content-Type: application/pgp-signature; name="signature.asc"
 Content-Description: OpenPGP digital signature
 Content-Disposition: attachment; filename="signature.asc"
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (MingW32)
 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
 
 iQEcBAEBAgAGBQJS8Z9TAAoJEDXXcbtuRpfPbiYIANYX7jZglOt4FVuNk64harLI
 mjaybo695IzBOdE533LI+kdC+bGDoZQX0nPfurpiDrnjmUduFB94NRlhhF4TuwjE
 wOvLMrISbf7fy7lBxsESDo6dUBNL8s5u1YPO4O7oQo/gKnVIkyXpE7iaJzaCupDK
 xN9e1wrE1nkiKun/KHRgH+y6wyelmFMz4y4bPZNIJL5C0tvqr5mJ9kAQijNePIlZ
 ixIVySS+jdmwvAXmzjpJB+JV69qPoEOT+v8a3RbwRwQj5RRc7mr2Vaek0R4Vaqod
 24LXXFHPVyMLJpO+sxNlixRlg6nelHcdjKrfztz8TDLbfg4/qYuPeSw5hFEuqYg=
 =xYyg
 -----END PGP SIGNATURE-----
 
 --IFSLa8ojOafB5fK3odFiSm0fQSjTaM9VG--
Responsible-Changed-From-To: bdrewery->adamw 
Responsible-Changed-By: bdrewery 
Responsible-Changed-When: Tue Feb 11 10:56:31 CST 2014 
Responsible-Changed-Why:  
back to adamw, jbigkit fails 

http://www.freebsd.org/cgi/query-pr.cgi?pr=184585 

From: "Mikhail T." <mi+thun@aldan.algebra.com>
To: bug-followup@FreeBSD.org, adamw@FreeBSD.org, 
 Eitan Adler <eadler@FreeBSD.org>
Cc:  
Subject: Re: ports/184585: [exp-run] Update graphics/jbigkit to 2.0 [patch]
Date: Tue, 08 Apr 2014 09:36:50 -0400

 This is a multi-part message in MIME format.
 --------------090405010608000100060309
 Content-Type: multipart/alternative;
  boundary="------------070209010609020508080101"
 
 
 --------------070209010609020508080101
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 Attached is a patch upgrading the port to 2.1 -- released today the new
 version includes important security fixes (thanks to Eitan for the
 heads-up):
 
     http://www.cl.cam.ac.uk/~mgk25/jbigkit/CHANGES
 
 Though it is unclear, if the security problems addressed apply to our
 current version 1.6, or whether only the newer 2.0 is affected, there is
 not point in delaying either.
 
 I'd commit it myself as the port's maintainer, but it affects a lot of
 things, so an exp-run may be prudent...
 
 My version fixes the problem with miscompilation of shared objects, that
 the earlier exp-run reported. The test-target (a.k.a. regression-test)
 is also enabled.
 
 Please, give it another round. Thank you!
 
     -mi
 
 
 --------------070209010609020508080101
 Content-Type: text/html; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 <html>
   <head>
 
     <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
   </head>
   <body bgcolor="#FFFFFF" text="#000000">
     Attached is a patch upgrading the port to 2.1 -- released today the
     new version includes important security fixes (thanks to Eitan for
     the heads-up):<br>
     <blockquote><a class="moz-txt-link-freetext" href="http://www.cl.cam.ac.uk/~mgk25/jbigkit/CHANGES">http://www.cl.cam.ac.uk/~mgk25/jbigkit/CHANGES</a><br>
     </blockquote>
     Though it is unclear, if the security problems addressed apply to
     our current version 1.6, or whether only the newer 2.0 is affected,
     there is not point in delaying either.<br>
     <br>
     I'd commit it myself as the port's maintainer, but it affects a lot
     of things, so an exp-run may be prudent...<br>
     <br>
     My version fixes the problem with miscompilation of shared objects,
     that the earlier exp-run reported. The test-target (a.k.a.
     regression-test) is also enabled.<br>
     <br>
     Please, give it another round. Thank you!<br>
     <blockquote>-mi<br>
     </blockquote>
   </body>
 </html>
 
 --------------070209010609020508080101--
 
 --------------090405010608000100060309
 Content-Type: text/plain; charset=KOI8-U;
  name="jbig-2.1.patch"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="jbig-2.1.patch"
 
 Index: Makefile
 ===================================================================
 --- Makefile	(revision 350600)
 +++ Makefile	(working copy)
 @@ -2,23 +2,39 @@
  # $FreeBSD$
  
  PORTNAME=	jbigkit
 -PORTVERSION=	1.6
 +PORTVERSION=	2.1
  CATEGORIES=	graphics
  MASTER_SITES=	http://www.cl.cam.ac.uk/~mgk25/download/
  
  MAINTAINER=	mi@aldan.algebra.com
  COMMENT=	Lossless compression for bi-level images such as scanned pages, faxes
  
 -WRKSRC=	${WRKDIR}/${PORTNAME}
  USE_LDCONFIG=	yes
 -
 +MAN1=	jbgtopbm.1 pbmtojbg.1
 +BINS=	jbgtopbm pbmtojbg jbgtopbm85 pbmtojbg85
 +LIBS=	libjbig.a libjbig.so.1 libjbig85.a libjbig85.so.1
  DOCSDIR?=	${PREFIX}/share/doc/jbig
  
 -post-install:
 +do-install:
 +	${INSTALL_PROGRAM}	\
 +		${BINS:S|^|${WRKSRC}/pbmtools/|} ${STAGEDIR}${PREFIX}/bin
 +
 +	${INSTALL_MAN}	\
 +		${MAN1:S|^|${WRKSRC}/pbmtools/|} ${STAGEDIR}${MANPREFIX}/man/man1
 +
 +	${INSTALL_DATA} ${WRKSRC}/libjbig/*.h ${STAGEDIR}${PREFIX}/include
 +
 +	${INSTALL_DATA}	\
 +		${LIBS:S|^|${WRKSRC}/libjbig/|} ${STAGEDIR}${PREFIX}/lib
 +	${LN} -sf libjbig.so.1 ${STAGEDIR}${PREFIX}/lib/libjbig.so
 +	${LN} -sf libjbig85.so.1 ${STAGEDIR}${PREFIX}/lib/libjbig85.so
 +
 +.if !defined(NOPORTDOCS)
  	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 -	@${INSTALL_DATA} ${WRKSRC}/libjbig/jbig.doc ${STAGEDIR}${DOCSDIR}
 +	${INSTALL_DATA} ${WRKSRC}/libjbig/jbig.txt ${STAGEDIR}${DOCSDIR}
 +.endif
  
 -post-build test:
 +regression-test test:
  	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/libjbig ${MAKE} test
  
  .include <bsd.port.mk>
 Index: distinfo
 ===================================================================
 --- distinfo	(revision 350600)
 +++ distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (jbigkit-1.6.tar.gz) = d841b6d0723c1082450967f3ea500be01810a34ec4a97ad10985ae7071a6150b
 -SIZE (jbigkit-1.6.tar.gz) = 405712
 +SHA256 (jbigkit-2.1.tar.gz) = de7106b6bfaf495d6865c7dd7ac6ca1381bd12e0d81405ea81e7f2167263d932
 +SIZE (jbigkit-2.1.tar.gz) = 438710
 Index: files/patch-aa
 ===================================================================
 --- files/patch-aa	(revision 350600)
 +++ files/patch-aa	(working copy)
 @@ -1,61 +1,17 @@
 ---- Makefile.orig	Tue Apr  9 19:37:13 2002
 -+++ Makefile	Tue Apr  9 22:45:53 2002
 -@@ -2,13 +2,13 @@
 - # $Id: Makefile,v 1.12 2002-04-09 11:37:13+01 mgk25 Exp $
 +--- Makefile	2014-03-27 14:47:15.000000000 -0400
 ++++ Makefile	2014-04-08 08:37:59.000000000 -0400
 +@@ -2,12 +2,10 @@
   
   # 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
 --CCFLAGS = -O2 -W
 -+#CCFLAGS = -O2 -W
 - #CCFLAGS = -O -g -W -Wall -ansi -pedantic #-DDEBUG  # developer only
 +-CFLAGS = -O2 -W -Wno-unused-result
 ++CFLAGS += -W # -Wno-unused-result -- older compilers don't have this
 + # CFLAGS = -O -g -W -Wall -Wno-unused-result -ansi -pedantic # -DDEBUG
   
 --CFLAGS = $(CCFLAGS) -I../libjbig
 -+CFLAGS += -I../libjbig
 +-export CC CFLAGS
 +-
 + VERSION=2.1
   
 - VERSION=1.4
 - 
 -@@ -16,14 +16,14 @@
 - 	@echo "Enter 'make test' in order to start some automatic tests."
 - 
 - lib:
 --	(cd libjbig;  make "CC=$(CC)" "CFLAGS=$(CFLAGS)")
 -+	(cd libjbig;  $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)")
 - 
 - pbm: lib
 --	(cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)")
 -+	(cd pbmtools; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)")
 - 
 - test: lib pbm
 --	(cd libjbig;  make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
 --	(cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
 -+	(cd libjbig;  $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
 -+	(cd pbmtools; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
 - 
 - clean:
 - 	rm -f *~ core
 -@@ -36,3 +36,22 @@
 - 	  gzip -9f jbigkit-$(VERSION).tar )
 - 	mv ../jbigkit-$(VERSION).tar.gz $(HOME)/public_html/download/
 - 	cp CHANGES $(HOME)/public_html/jbigkit/
 -+
 -+install:
 -+	mkdir -p $(DESTDIR)${PREFIX}/bin
 -+	${BSD_INSTALL_PROGRAM} pbmtools/jbgtopbm pbmtools/pbmtojbg \
 -+		$(DESTDIR)${PREFIX}/bin
 -+	mkdir -p $(DESTDIR)${PREFIX}/man/man1
 -+	${BSD_INSTALL_MAN} pbmtools/pbmtojbg.1 pbmtools/jbgtopbm.1 \
 -+		$(DESTDIR)${PREFIX}/man/man1
 -+	# mkdir -p $(DESTDIR)${PREFIX}/man/man5
 -+	# Not installing the pbm(5) man page, because BSD has its own
 -+	# install -c -m 644 -o bin -g bin pbmtools/pbm.5 ${PREFIX}/man/man5
 -+	# Not installing the pgm(5) man page for it comes with netpbm port
 -+	# install -c -m 644 -o bin -g bin pbmtools/pgm.5 ${PREFIX}/man/man5
 -+	mkdir -p $(DESTDIR)${PREFIX}/include
 -+	${BSD_INSTALL_DATA} libjbig/jbig.h $(DESTDIR)${PREFIX}/include
 -+	mkdir -p $(DESTDIR)${PREFIX}/lib
 -+	${BSD_INSTALL_DATA} libjbig/libjbig.a $(DESTDIR)${PREFIX}/lib
 -+	${BSD_INSTALL_DATA} libjbig/libjbig.so.1 $(DESTDIR)${PREFIX}/lib
 -+	ln -sf libjbig.so.1 $(DESTDIR)${PREFIX}/lib/libjbig.so
 Index: files/patch-ab
 ===================================================================
 --- files/patch-ab	(revision 350600)
 +++ files/patch-ab	(working copy)
 @@ -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.1 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.1: 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
 ++	$(CC) -o ${.TARGET} ${LDFLAGS} -shared -Wl,-soname,${.TARGET} ${.ALLSRC}
 ++
 + libjbig85.a: jbig85.o jbig_ar.o
 + 	rm -f libjbig85.a
 +@@ -25,4 +33,8 @@
 + 	-ranlib libjbig85.a
   
 -+.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
 ++libjbig85.so.1: jbig85.So jbig_ar.So
 ++	rm -f ${.TARGET}
 ++	$(CC) -o ${.TARGET} ${LDFLAGS} -shared -Wl,-soname,${.TARGET} ${.ALLSRC}
  +
 - test: tstcodec
 - 	./tstcodec
 - 
 - 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
 + jbig.o: jbig.c jbig.h jbig_ar.h
 + jbig85.o: jbig85.c jbig85.h jbig_ar.h
 Index: files/patch-ac
 ===================================================================
 --- files/patch-ac	(revision 350600)
 +++ files/patch-ac	(working copy)
 @@ -1,16 +1,32 @@
 ---- pbmtools/Makefile.orig	Thu Jun 25 13:30:38 1998
 -+++ pbmtools/Makefile	Thu Jun 25 13:31:00 1998
 -@@ -5,11 +5,10 @@
 +--- pbmtools/Makefile	2014-03-27 14:47:15.000000000 -0400
 ++++ pbmtools/Makefile	2014-04-08 09:18:42.000000000 -0400
 +@@ -2,14 +2,14 @@
 + 
 + # Select an ANSI/ISO C compiler here, e.g. GNU gcc is recommended
  -CC = gcc
 ++#CC = gcc
   
   # Options for the compiler
 --CFLAGS = -g -Wall -ansi -pedantic -I../libjbig
 -+CFLAGS += -Wall -ansi -pedantic -I../libjbig
 +-CFLAGS = -g -O -W -Wall -Wno-unused-result -ansi -pedantic # --coverage
 +-CPPFLAGS = -I../libjbig 
 ++CFLAGS += -W -Wall -ansi -pedantic # --coverage -Wno-unused-result
 ++CFLAGS += -I../libjbig 
   
   .SUFFIXES: .1 .5 .txt $(SUFFIXES)
 + .PHONY: txt test test82 test85 clean
   
 --all: pbmtojbg jbgtopbm pbmtojbg.txt jbgtopbm.txt pbm.txt pgm.txt
 -+all: pbmtojbg jbgtopbm
 +-all: pbmtojbg jbgtopbm pbmtojbg85 jbgtopbm85 txt
 ++all: pbmtojbg jbgtopbm pbmtojbg85 jbgtopbm85
   
 - pbmtojbg: pbmtojbg.o ../libjbig/libjbig.a
 - 	$(CC) $(CFLAGS) -o pbmtojbg pbmtojbg.o -L../libjbig -ljbig
 + txt: pbmtojbg.txt jbgtopbm.txt pbm.txt pgm.txt
 +@@ -144,6 +144,8 @@
 + 	cmp test-$(IMG).pbm test-$(IMG).pbm85
 + 
 +-test-%.pbm: ../examples/%.jbg
 +-	./jbgtopbm $< $@
 ++.for i in 1 2 3
 ++test-ccitt$i.pbm: ../examples/ccitt$i.jbg
 ++	./jbgtopbm ${.ALLSRC} ${.TARGET}
 ++.endfor
 + 
 + test-t82.pbm:
 Index: files/patch-warnings
 ===================================================================
 --- files/patch-warnings	(revision 0)
 +++ files/patch-warnings	(working copy)
 @@ -0,0 +1,36 @@
 +--- pbmtools/pbmtojbg85.c	2014-03-27 14:47:15.000000000 -0400
 ++++ pbmtools/pbmtojbg85.c	2014-04-08 09:00:16.000000000 -0400
 +@@ -71,8 +71,12 @@
 +   if (c != EOF) {
 +     ungetc(c, f);
 +-    fscanf(f, "%lu", &i);
 +-  }
 ++    if (fscanf(f, "%lu", &i) == 1)
 ++       return i;
 ++    else
 ++       fprintf(stderr, "%s: corrupt input", progname);
 ++  } else
 ++       fprintf(stderr, "%s: unexpected end of input", progname);
 + 
 +-  return i;
 ++  return -1;
 + }
 +
 +--- pbmtools/pbmtojbg.c	2014-03-27 14:47:15.000000000 -0400
 ++++ pbmtools/pbmtojbg.c	2014-04-08 09:00:16.000000000 -0400
 +@@ -87,8 +87,12 @@
 +   if (c != EOF) {
 +     ungetc(c, f);
 +-    fscanf(f, "%lu", &i);
 +-  }
 ++    if (fscanf(f, "%lu", &i) == 1)
 ++       return i;
 ++    else
 ++       fprintf(stderr, "%s: corrupt input", progname);
 ++  } else
 ++       fprintf(stderr, "%s: unexpected end of input", progname);
 + 
 +-  return i;
 ++  return -1;
 + }
 + 
 Index: pkg-plist
 ===================================================================
 --- pkg-plist	(revision 350600)
 +++ pkg-plist	(working copy)
 @@ -1,10 +1,17 @@
  bin/jbgtopbm
 +bin/jbgtopbm85
  bin/pbmtojbg
 +bin/pbmtojbg85
  include/jbig.h
 +include/jbig85.h
 +include/jbig_ar.h
  lib/libjbig.a
  lib/libjbig.so
  lib/libjbig.so.1
 +lib/libjbig85.a
 +lib/libjbig85.so
 +lib/libjbig85.so.1
  man/man1/jbgtopbm.1.gz
  man/man1/pbmtojbg.1.gz
 -%%PORTDOCS%%%%DOCSDIR%%/jbig.doc
 +%%PORTDOCS%%%%DOCSDIR%%/jbig.txt
  %%PORTDOCS%%@dirrm %%DOCSDIR%%
 
 --------------090405010608000100060309--

From: Adam Weinberger <adamw@adamw.org>
To: "Mikhail T." <mi+thun@aldan.algebra.com>,bug-followup@FreeBSD.org,adamw@FreeBSD.org,Eitan Adler <eadler@FreeBSD.org>
Cc:  
Subject: Re: ports/184585: [exp-run] Update graphics/jbigkit to 2.0 [patch]
Date: Tue, 08 Apr 2014 10:18:36 -0400

 Phew, I'm relieved here... I couldn't figure out the compilation problem.
 
 Your patch should probably avoid NOPORTDOCS though...
 
 # Adam
 
 
 
 -- 
 Adam Weinberger
 adamw@adamw.org
 http://www.adamw.org
 
 
Responsible-Changed-From-To: adamw->portmgr 
Responsible-Changed-By: mi 
Responsible-Changed-When: Fri Apr 18 13:26:31 UTC 2014 
Responsible-Changed-Why:  
Can we, please, have another exp-run? Thank you. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=184585 
Responsible-Changed-From-To: portmgr->bdrewery 
Responsible-Changed-By: bdrewery 
Responsible-Changed-When: Fri Apr 18 10:00:21 CDT 2014 
Responsible-Changed-Why:  
take for exp-run 

http://www.freebsd.org/cgi/query-pr.cgi?pr=184585 
Responsible-Changed-From-To: bdrewery->adamw 
Responsible-Changed-By: bdrewery 
Responsible-Changed-When: Sun Apr 20 20:07:39 CDT 2014 
Responsible-Changed-Why:  
exp-run done, no new failures. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=184585 
Responsible-Changed-From-To: adamw->mi 
Responsible-Changed-By: mi 
Responsible-Changed-When: Mon Apr 21 04:51:26 UTC 2014 
Responsible-Changed-Why:  
I'll see to it... 

http://www.freebsd.org/cgi/query-pr.cgi?pr=184585 
Responsible-Changed-From-To: mi->portmgr 
Responsible-Changed-By: mi 
Responsible-Changed-When: Fri Apr 25 05:02:26 UTC 2014 
Responsible-Changed-Why:  
Another exp-run is, likely, needed because the major number of 
libjbig.so must be bumped from 1 to 2. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=184585 

From: "Mikhail T." <mi+thun@aldan.algebra.com>
To: bug-followup@FreeBSD.org, adamw@FreeBSD.org
Cc:  
Subject: Re: ports/184585: [exp-run] Update graphics/jbigkit to 2.0 [patch]
Date: Fri, 25 Apr 2014 01:02:15 -0400

 This is a multi-part message in MIME format.
 --------------080508050307080704030209
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 Unfortunately, according to Markus Kuhn -- the author of jbigkit -- the
 changes between 1.6 and 2.x are significant enough to require bumping
 the shared library's major number: welcome libjbig.so.2.
 
 The attached patch includes that and, I suspect, warrants yet another
 exp-run.
 
 --------------080508050307080704030209
 Content-Type: text/plain; charset=KOI8-U;
  name="jbigkit-update.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="jbigkit-update.diff"
 
 Index: Makefile
 ===================================================================
 --- Makefile	(revision 350944)
 +++ Makefile	(working copy)
 @@ -2,7 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	jbigkit
 -PORTVERSION=	1.6
 +PORTVERSION=	2.1
  CATEGORIES=	graphics
  MASTER_SITES=	http://www.cl.cam.ac.uk/~mgk25/download/
  
 @@ -9,16 +9,32 @@
  MAINTAINER=	mi@aldan.algebra.com
  COMMENT=	Lossless compression for bi-level images such as scanned pages, faxes
  
 -WRKSRC=	${WRKDIR}/${PORTNAME}
  USE_LDCONFIG=	yes
 -
 +MAN1=	jbgtopbm.1 pbmtojbg.1
 +BINS=	jbgtopbm pbmtojbg jbgtopbm85 pbmtojbg85
 +LIBS=	libjbig.a libjbig.so.2 libjbig85.a libjbig85.so.1
  DOCSDIR?=	${PREFIX}/share/doc/jbig
  
 -post-install:
 +do-install:
 +	${INSTALL_PROGRAM}	\
 +		${BINS:S|^|${WRKSRC}/pbmtools/|} ${STAGEDIR}${PREFIX}/bin
 +
 +	${INSTALL_MAN}	\
 +		${MAN1:S|^|${WRKSRC}/pbmtools/|} ${STAGEDIR}${MANPREFIX}/man/man1
 +
 +	${INSTALL_DATA} ${WRKSRC}/libjbig/*.h ${STAGEDIR}${PREFIX}/include
 +
 +	${INSTALL_DATA}	\
 +		${LIBS:S|^|${WRKSRC}/libjbig/|} ${STAGEDIR}${PREFIX}/lib
 +	${LN} -sf libjbig.so.1 ${STAGEDIR}${PREFIX}/lib/libjbig.so
 +	${LN} -sf libjbig85.so.1 ${STAGEDIR}${PREFIX}/lib/libjbig85.so
 +
 +.if !defined(NOPORTDOCS)
  	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 -	@${INSTALL_DATA} ${WRKSRC}/libjbig/jbig.doc ${STAGEDIR}${DOCSDIR}
 +	${INSTALL_DATA} ${WRKSRC}/libjbig/jbig.txt ${STAGEDIR}${DOCSDIR}
 +.endif
  
 -post-build test:
 +regression-test test:
  	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/libjbig ${MAKE} test
  
  .include <bsd.port.mk>
 Index: distinfo
 ===================================================================
 --- distinfo	(revision 350944)
 +++ distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (jbigkit-1.6.tar.gz) = d841b6d0723c1082450967f3ea500be01810a34ec4a97ad10985ae7071a6150b
 -SIZE (jbigkit-1.6.tar.gz) = 405712
 +SHA256 (jbigkit-2.1.tar.gz) = de7106b6bfaf495d6865c7dd7ac6ca1381bd12e0d81405ea81e7f2167263d932
 +SIZE (jbigkit-2.1.tar.gz) = 438710
 Index: files/patch-aa
 ===================================================================
 --- files/patch-aa	(revision 350944)
 +++ files/patch-aa	(working copy)
 @@ -1,7 +1,6 @@
 ---- Makefile.orig	Tue Apr  9 19:37:13 2002
 -+++ Makefile	Tue Apr  9 22:45:53 2002
 -@@ -2,13 +2,13 @@
 - # $Id: Makefile,v 1.12 2002-04-09 11:37:13+01 mgk25 Exp $
 +--- Makefile	2014-03-27 14:47:15.000000000 -0400
 ++++ Makefile	2014-04-08 08:37:59.000000000 -0400
 +@@ -2,12 +2,10 @@
   
   # Select an ANSI/ISO C compiler here, GNU gcc is recommended
  -CC = gcc
 @@ -8,54 +7,11 @@
  +#CC = gcc
   
   # Options for the compiler: A high optimization level is suggested
 --CCFLAGS = -O2 -W
 -+#CCFLAGS = -O2 -W
 - #CCFLAGS = -O -g -W -Wall -ansi -pedantic #-DDEBUG  # developer only
 +-CFLAGS = -O2 -W -Wno-unused-result
 ++CFLAGS += -W # -Wno-unused-result -- older compilers don't have this
 + # CFLAGS = -O -g -W -Wall -Wno-unused-result -ansi -pedantic # -DDEBUG
   
 --CFLAGS = $(CCFLAGS) -I../libjbig
 -+CFLAGS += -I../libjbig
 +-export CC CFLAGS
 +-
 + VERSION=2.1
   
 - VERSION=1.4
 - 
 -@@ -16,14 +16,14 @@
 - 	@echo "Enter 'make test' in order to start some automatic tests."
 - 
 - lib:
 --	(cd libjbig;  make "CC=$(CC)" "CFLAGS=$(CFLAGS)")
 -+	(cd libjbig;  $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)")
 - 
 - pbm: lib
 --	(cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)")
 -+	(cd pbmtools; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)")
 - 
 - test: lib pbm
 --	(cd libjbig;  make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
 --	(cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
 -+	(cd libjbig;  $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
 -+	(cd pbmtools; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
 - 
 - clean:
 - 	rm -f *~ core
 -@@ -36,3 +36,22 @@
 - 	  gzip -9f jbigkit-$(VERSION).tar )
 - 	mv ../jbigkit-$(VERSION).tar.gz $(HOME)/public_html/download/
 - 	cp CHANGES $(HOME)/public_html/jbigkit/
 -+
 -+install:
 -+	mkdir -p $(DESTDIR)${PREFIX}/bin
 -+	${BSD_INSTALL_PROGRAM} pbmtools/jbgtopbm pbmtools/pbmtojbg \
 -+		$(DESTDIR)${PREFIX}/bin
 -+	mkdir -p $(DESTDIR)${PREFIX}/man/man1
 -+	${BSD_INSTALL_MAN} pbmtools/pbmtojbg.1 pbmtools/jbgtopbm.1 \
 -+		$(DESTDIR)${PREFIX}/man/man1
 -+	# mkdir -p $(DESTDIR)${PREFIX}/man/man5
 -+	# Not installing the pbm(5) man page, because BSD has its own
 -+	# install -c -m 644 -o bin -g bin pbmtools/pbm.5 ${PREFIX}/man/man5
 -+	# Not installing the pgm(5) man page for it comes with netpbm port
 -+	# install -c -m 644 -o bin -g bin pbmtools/pgm.5 ${PREFIX}/man/man5
 -+	mkdir -p $(DESTDIR)${PREFIX}/include
 -+	${BSD_INSTALL_DATA} libjbig/jbig.h $(DESTDIR)${PREFIX}/include
 -+	mkdir -p $(DESTDIR)${PREFIX}/lib
 -+	${BSD_INSTALL_DATA} libjbig/libjbig.a $(DESTDIR)${PREFIX}/lib
 -+	${BSD_INSTALL_DATA} libjbig/libjbig.so.1 $(DESTDIR)${PREFIX}/lib
 -+	ln -sf libjbig.so.1 $(DESTDIR)${PREFIX}/lib/libjbig.so
 Index: files/patch-ab
 ===================================================================
 --- files/patch-ab	(revision 350944)
 +++ files/patch-ab	(working copy)
 @@ -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
 ++	$(CC) -o ${.TARGET} ${LDFLAGS} -shared -Wl,-soname,${.TARGET} ${.ALLSRC}
 ++
 + libjbig85.a: jbig85.o jbig_ar.o
 + 	rm -f libjbig85.a
 +@@ -25,4 +33,8 @@
 + 	-ranlib libjbig85.a
   
 -+.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
 ++libjbig85.so.1: jbig85.So jbig_ar.So
 ++	rm -f ${.TARGET}
 ++	$(CC) -o ${.TARGET} ${LDFLAGS} -shared -Wl,-soname,${.TARGET} ${.ALLSRC}
  +
 - test: tstcodec
 - 	./tstcodec
 - 
 - 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
 + jbig.o: jbig.c jbig.h jbig_ar.h
 + jbig85.o: jbig85.c jbig85.h jbig_ar.h
 Index: files/patch-ac
 ===================================================================
 --- files/patch-ac	(revision 350944)
 +++ files/patch-ac	(working copy)
 @@ -1,16 +1,32 @@
 ---- pbmtools/Makefile.orig	Thu Jun 25 13:30:38 1998
 -+++ pbmtools/Makefile	Thu Jun 25 13:31:00 1998
 -@@ -5,11 +5,10 @@
 +--- pbmtools/Makefile	2014-03-27 14:47:15.000000000 -0400
 ++++ pbmtools/Makefile	2014-04-08 09:18:42.000000000 -0400
 +@@ -2,14 +2,14 @@
 + 
 + # Select an ANSI/ISO C compiler here, e.g. GNU gcc is recommended
  -CC = gcc
 ++#CC = gcc
   
   # Options for the compiler
 --CFLAGS = -g -Wall -ansi -pedantic -I../libjbig
 -+CFLAGS += -Wall -ansi -pedantic -I../libjbig
 +-CFLAGS = -g -O -W -Wall -Wno-unused-result -ansi -pedantic # --coverage
 +-CPPFLAGS = -I../libjbig 
 ++CFLAGS += -W -Wall -ansi -pedantic # --coverage -Wno-unused-result
 ++CFLAGS += -I../libjbig 
   
   .SUFFIXES: .1 .5 .txt $(SUFFIXES)
 + .PHONY: txt test test82 test85 clean
   
 --all: pbmtojbg jbgtopbm pbmtojbg.txt jbgtopbm.txt pbm.txt pgm.txt
 -+all: pbmtojbg jbgtopbm
 +-all: pbmtojbg jbgtopbm pbmtojbg85 jbgtopbm85 txt
 ++all: pbmtojbg jbgtopbm pbmtojbg85 jbgtopbm85
   
 - pbmtojbg: pbmtojbg.o ../libjbig/libjbig.a
 - 	$(CC) $(CFLAGS) -o pbmtojbg pbmtojbg.o -L../libjbig -ljbig
 + txt: pbmtojbg.txt jbgtopbm.txt pbm.txt pgm.txt
 +@@ -144,6 +144,8 @@
 + 	cmp test-$(IMG).pbm test-$(IMG).pbm85
 + 
 +-test-%.pbm: ../examples/%.jbg
 +-	./jbgtopbm $< $@
 ++.for i in 1 2 3
 ++test-ccitt$i.pbm: ../examples/ccitt$i.jbg
 ++	./jbgtopbm ${.ALLSRC} ${.TARGET}
 ++.endfor
 + 
 + test-t82.pbm:
 Index: files/patch-warnings
 ===================================================================
 --- files/patch-warnings	(revision 0)
 +++ files/patch-warnings	(working copy)
 @@ -0,0 +1,36 @@
 +--- pbmtools/pbmtojbg85.c	2014-03-27 14:47:15.000000000 -0400
 ++++ pbmtools/pbmtojbg85.c	2014-04-08 09:00:16.000000000 -0400
 +@@ -71,8 +71,12 @@
 +   if (c != EOF) {
 +     ungetc(c, f);
 +-    fscanf(f, "%lu", &i);
 +-  }
 ++    if (fscanf(f, "%lu", &i) == 1)
 ++       return i;
 ++    else
 ++       fprintf(stderr, "%s: corrupt input", progname);
 ++  } else
 ++       fprintf(stderr, "%s: unexpected end of input", progname);
 + 
 +-  return i;
 ++  return -1;
 + }
 +
 +--- pbmtools/pbmtojbg.c	2014-03-27 14:47:15.000000000 -0400
 ++++ pbmtools/pbmtojbg.c	2014-04-08 09:00:16.000000000 -0400
 +@@ -87,8 +87,12 @@
 +   if (c != EOF) {
 +     ungetc(c, f);
 +-    fscanf(f, "%lu", &i);
 +-  }
 ++    if (fscanf(f, "%lu", &i) == 1)
 ++       return i;
 ++    else
 ++       fprintf(stderr, "%s: corrupt input", progname);
 ++  } else
 ++       fprintf(stderr, "%s: unexpected end of input", progname);
 + 
 +-  return i;
 ++  return -1;
 + }
 + 
 Index: pkg-plist
 ===================================================================
 --- pkg-plist	(revision 350944)
 +++ pkg-plist	(working copy)
 @@ -1,10 +1,15 @@
  bin/jbgtopbm
 +bin/jbgtopbm85
  bin/pbmtojbg
 +bin/pbmtojbg85
  include/jbig.h
 +include/jbig85.h
 +include/jbig_ar.h
  lib/libjbig.a
  lib/libjbig.so
 -lib/libjbig.so.1
 -man/man1/jbgtopbm.1.gz
 -man/man1/pbmtojbg.1.gz
 -%%PORTDOCS%%%%DOCSDIR%%/jbig.doc
 +lib/libjbig.so.2
 +lib/libjbig85.a
 +lib/libjbig85.so
 +lib/libjbig85.so.1
 +%%PORTDOCS%%%%DOCSDIR%%/jbig.txt
  %%PORTDOCS%%@dirrm %%DOCSDIR%%
 
 --------------080508050307080704030209--
>Unformatted:
