aboutsummaryrefslogtreecommitdiff
path: root/graphics/jbigkit/files/patch-aa
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/jbigkit/files/patch-aa')
-rw-r--r--graphics/jbigkit/files/patch-aa134
1 files changed, 80 insertions, 54 deletions
diff --git a/graphics/jbigkit/files/patch-aa b/graphics/jbigkit/files/patch-aa
index 5c1736d1bad3..64f1eaa79da5 100644
--- a/graphics/jbigkit/files/patch-aa
+++ b/graphics/jbigkit/files/patch-aa
@@ -1,54 +1,80 @@
---- Makefile.orig Fri Apr 10 20:34:54 1998
-+++ Makefile Mon Sep 14 16:45:26 1998
-@@ -2,13 +2,14 @@
- # $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 +20,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 +32,20 @@
- distribution: clean
- rm -f libjbig/libjbig.a
- (cd ..; tar -c -v --exclude RCS -f jbigkit.tar jbigkit)
-+
-+install:
-+ mkdir -p ${PREFIX}/bin
-+ install -c -s -m 755 -o bin -g bin pbmtools/jbgtopbm ${PREFIX}/bin
-+ install -c -s -m 755 -o bin -g bin pbmtools/pbmtojbg ${PREFIX}/bin
-+ mkdir -p ${PREFIX}/man/man1
-+ install -c -m 644 -o bin -g bin pbmtools/pbmtojbg.1 ${PREFIX}/man/man1
-+ 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.1 ${PREFIX}/lib
-+ (cd ${PREFIX}/lib; ln -sf libjbig.so.1 libjbig.so)
+*** Makefile.orig Fri Apr 10 20:34:54 1998
+--- Makefile Wed Sep 16 09:09:47 1998
+***************
+*** 2,14 ****
+ # $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
+
+ # Options for the compiler: A high optimization level is suggested
+! CCFLAGS = -O2 -W
+ #CCFLAGS = -O -g -W -Wall -ansi -pedantic #-DDEBUG # developer only
+
+! CFLAGS = $(CCFLAGS) -I../libjbig
+
+ all: lib pbm
+ @echo "Enter 'make test' in order to start some automatic tests."
+--- 2,15 ----
+ # $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
+
+ # Options for the compiler: A high optimization level is suggested
+! #CCFLAGS = -O2 -W
+ #CCFLAGS = -O -g -W -Wall -ansi -pedantic #-DDEBUG # developer only
+
+! CFLAGS += -I../libjbig
+!
+
+ all: lib pbm
+ @echo "Enter 'make test' in order to start some automatic tests."
+***************
+*** 19,27 ****
+ 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)
+
+ clean:
+ rm -f *~ core
+--- 20,28 ----
+ 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)
+
+ clean:
+ rm -f *~ core
+***************
+*** 31,33 ****
+--- 32,55 ----
+ distribution: clean
+ rm -f libjbig/libjbig.a
+ (cd ..; tar -c -v --exclude RCS -f jbigkit.tar jbigkit)
++
++ install:
++ mkdir -p ${PREFIX}/bin
++ install -c -s -m 755 -o bin -g bin pbmtools/jbgtopbm ${PREFIX}/bin
++ install -c -s -m 755 -o bin -g bin pbmtools/pbmtojbg ${PREFIX}/bin
++ mkdir -p ${PREFIX}/man/man1
++ install -c -m 644 -o bin -g bin pbmtools/pbmtojbg.1 ${PREFIX}/man/man1
++ 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
++ .if ${PORTOBJFORMAT} == elf
++ install -c -m 644 -o bin -g bin libjbig/libjbig.so.1 ${PREFIX}/lib
++ (cd ${PREFIX}/lib; ln -sf libjbig.so.1 libjbig.so)
++ .else
++ install -c -m 644 -o bin -g bin libjbig/libjbig.so.1.0 ${PREFIX}/lib
++ .endif