View | Details | Raw Unified | Return to bug 184585 | Differences between
and this patch

Collapse All | Expand All

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

Return to bug 184585