diff options
| -rw-r--r-- | graphics/jbigkit/Makefile | 13 | ||||
| -rw-r--r-- | graphics/jbigkit/distinfo | 2 | ||||
| -rw-r--r-- | graphics/jbigkit/files/patch-aa | 39 | ||||
| -rw-r--r-- | graphics/jbigkit/files/patch-ab | 23 | ||||
| -rw-r--r-- | graphics/jbigkit/files/patch-ac | 16 | ||||
| -rw-r--r-- | graphics/jbigkit/pkg-plist | 6 |
6 files changed, 71 insertions, 28 deletions
diff --git a/graphics/jbigkit/Makefile b/graphics/jbigkit/Makefile index b0c45300529c..21ababca6d23 100644 --- a/graphics/jbigkit/Makefile +++ b/graphics/jbigkit/Makefile @@ -1,25 +1,20 @@ # New ports collection makefile for: jbig -# Version required: 0.9 +# Version required: 1.0 # Date created: 19 November 1996 # Whom: mi # -# $Id: Makefile,v 1.2 1996/12/24 07:35:26 asami Exp $ +# $Id: Makefile,v 1.3 1997/07/17 15:12:42 max Exp $ # -DISTNAME= jbigkit-0.9 +DISTNAME= jbigkit-1.0 CATEGORIES= graphics MASTER_SITES= ftp://ftp.informatik.uni-erlangen.de/pub/doc/ISO/JBIG/ MAINTAINER= mi@aldan.ziplink.net -# Yes, CCFLAGS, not CFLAGS! -mi -MAKE_FLAGS= CCFLAGS="${CFLAGS}" CC="${CC}" WRKSRC= ${WRKDIR}/jbigkit MAN1= jbgtopbm.1 pbmtojbg.1 -MAN5= pbm.5 - -post-build: - cd $(WRKSRC); make test +MAN5= pbm.5 pgm.5 post-install: .if !defined(NOPORTDOCS) diff --git a/graphics/jbigkit/distinfo b/graphics/jbigkit/distinfo index 668018b6ecd9..ef8df2079f87 100644 --- a/graphics/jbigkit/distinfo +++ b/graphics/jbigkit/distinfo @@ -1 +1 @@ -MD5 (jbigkit-0.9.tar.gz) = fbc972a96f3e4e9c90eea96020085e2c +MD5 (jbigkit-1.0.tar.gz) = 9f954ef0071ea222e11ab241c5e818c4 diff --git a/graphics/jbigkit/files/patch-aa b/graphics/jbigkit/files/patch-aa index 23836798c1ba..3023c18325d1 100644 --- a/graphics/jbigkit/files/patch-aa +++ b/graphics/jbigkit/files/patch-aa @@ -1,6 +1,36 @@ ---- Makefile.orig Tue Jan 9 16:26:33 1996 -+++ Makefile Tue Dec 3 18:33:09 1996 -@@ -30,3 +30,18 @@ +--- Makefile.orig Sat Apr 11 09:34:54 1998 ++++ Makefile Thu Jun 25 13:54:14 1998 +@@ -2,13 +2,13 @@ + # $Id: Makefile,v 1.5 1998-04-11 02:34:53+01 mgk25 Rel $ + + # 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 + + all: lib pbm + @echo "Enter 'make test' in order to start some automatic tests." +@@ -19,9 +19,9 @@ + pbm: lib + (cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)") + +-test: +- (cd libjbig; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test) +- (cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test) ++#test: ++# (cd libjbig; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test) ++# (cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test) + + clean: + rm -f *~ core +@@ -31,3 +31,19 @@ distribution: clean rm -f libjbig/libjbig.a (cd ..; tar -c -v --exclude RCS -f jbigkit.tar jbigkit) @@ -14,8 +44,9 @@ + install -c -m 644 -o bin -g bin pbmtools/jbgtopbm.1 ${PREFIX}/man/man1 + mkdir -p ${PREFIX}/man/man5 + install -c -m 644 -o bin -g bin pbmtools/pbm.5 ${PREFIX}/man/man5 ++ install -c -m 644 -o bin -g bin pbmtools/pgm.5 ${PREFIX}/man/man5 + mkdir -p ${PREFIX}/include + install -c -m 644 -o bin -g bin libjbig/jbig.h ${PREFIX}/include + mkdir -p ${PREFIX}/lib + install -c -m 644 -o bin -g bin libjbig/libjbig.a ${PREFIX}/lib -+ install -c -m 644 -o bin -g bin libjbig/libjbig.so.0.9 ${PREFIX}/lib ++ install -c -m 644 -o bin -g bin libjbig/libjbig.so.1.0 ${PREFIX}/lib diff --git a/graphics/jbigkit/files/patch-ab b/graphics/jbigkit/files/patch-ab index 20b6609121dc..93b32951c83c 100644 --- a/graphics/jbigkit/files/patch-ab +++ b/graphics/jbigkit/files/patch-ab @@ -1,30 +1,31 @@ ---- libjbig/Makefile.orig Tue Jan 9 16:18:50 1996 -+++ libjbig/Makefile Sat Dec 21 17:41:00 1996 -@@ -7,7 +7,7 @@ +--- libjbig/Makefile.orig Thu Jun 25 13:26:01 1998 ++++ libjbig/Makefile Thu Jun 25 13:29:44 1998 +@@ -5,9 +5,9 @@ + CC = gcc + # Options for the compiler: A high optimization level is suggested - CFLAGS = -O -Wall -ansi -pedantic +-CFLAGS = -O -Wall -ansi -pedantic ++CFLAGS += -Wall -ansi -pedantic -all: libjbig.a tstcodec -+all: libjbig.a libjbig.so.0.9 tstcodec ++all: libjbig.a libjbig.so.1.0 tstcodec: tstcodec.c jbig.c jbig.h jbig_tab.o $(CC) $(CFLAGS) -o tstcodec -DTEST_CODEC tstcodec.c jbig.c \ -@@ -18,7 +18,19 @@ +@@ -18,7 +18,17 @@ ar rc libjbig.a jbig.o jbig_tab.o ranlib libjbig.a -+libjbig.so.0.9: jbig.so jbig_tab.so -+ rm -f ${.TARGET} ++libjbig.so.1.0: jbig.so jbig_tab.so ++ rm -f libjbig.so.1.0 + ld -Bshareable -o ${.TARGET} ${.ALLSRC} -+ ++ 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 diff --git a/graphics/jbigkit/files/patch-ac b/graphics/jbigkit/files/patch-ac new file mode 100644 index 000000000000..681996343996 --- /dev/null +++ b/graphics/jbigkit/files/patch-ac @@ -0,0 +1,16 @@ +--- pbmtools/Makefile.orig Thu Jun 25 13:30:38 1998 ++++ pbmtools/Makefile Thu Jun 25 13:31:00 1998 +@@ -5,11 +5,11 @@ + 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 diff --git a/graphics/jbigkit/pkg-plist b/graphics/jbigkit/pkg-plist index 5ca740fca7c7..7ff21c29300f 100644 --- a/graphics/jbigkit/pkg-plist +++ b/graphics/jbigkit/pkg-plist @@ -5,8 +5,8 @@ man/man1/jbgtopbm.1.gz man/man1/pbmtojbg.1.gz man/man5/pbm.5.gz lib/libjbig.a -@exec ranlib %D/%F -lib/libjbig.so.0.9 -@exec ldconfig -m %B +lib/libjbig.so.1.0 +@exec /sbin/ldconfig -m %B @unexec /sbin/ldconfig -R share/doc/jbig/jbig.doc +@dirrm share/doc/jbig |