Attachment 138573 Details for Bug 184585 – jbigkit.patch

[patch] jbigkit.patch

jbigkit.patch (text/plain), 12.25 KB, created by Adam Weinberger on 2013-12-07 21:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Weinberger

Created: 2013-12-07 21:40:01 UTC

Size: 12.25 KB

patch

obsolete

>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%%

Actions: View | Diff

Attachments on bug 184585: 138573 | 138574 | 138575 | 138576