upgrade to jbigkit 1.1
This commit is contained in:
brad
parent
ff73b8f512
commit
fd06d602a7
@ -1,31 +1,24 @@
|
||||
# $OpenBSD: Makefile,v 1.1.1.1 1999/05/08 19:17:39 brad Exp $
|
||||
# $OpenBSD: Makefile,v 1.2 1999/12/27 06:12:08 brad Exp $
|
||||
# $FreeBSD: Makefile,v 1.5 1998/09/14 22:19:05 smace Exp $
|
||||
|
||||
DISTNAME= jbigkit-1.0
|
||||
DISTNAME= jbigkit-1.1
|
||||
CATEGORIES= graphics
|
||||
MASTER_SITES= ftp://ftp.informatik.uni-erlangen.de/pub/doc/ISO/JBIG/
|
||||
|
||||
MAINTAINER= brad@openbsd.org
|
||||
|
||||
WRKSRC= ${WRKDIR}/jbigkit
|
||||
|
||||
# post-patch must be defined before bsd.port.mk is included so it will
|
||||
# be called. However, we need to have the body of the target after
|
||||
# bsd.port.mk is included so NO_SHARED_LIBS is defined.
|
||||
# Define the target twice, using :
|
||||
post-patch:
|
||||
WRKSRC= ${WRKDIR}/jbigkit
|
||||
|
||||
post-install:
|
||||
${MKDIR} ${PREFIX}/share/doc/jbig
|
||||
@mkdir -p ${PREFIX}/share/doc/jbig
|
||||
${INSTALL_DATA} ${WRKSRC}/libjbig/jbig.doc ${PREFIX}/share/doc/jbig
|
||||
${LDCONFIG} -m ${PREFIX}/lib
|
||||
@${LDCONFIG} -m ${PREFIX}/lib
|
||||
|
||||
test: build
|
||||
cd ${WRKSRC} && env LD_LIBRARY_PATH=${WRKSRC}/libjbig make test
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
# The patches assumed shared libs would be build. If building
|
||||
# on a host that does not support shared libs, e.g. the alpha,
|
||||
# apply one more patch.
|
||||
post-patch:
|
||||
.if defined(NO_SHARED_LIBS)
|
||||
@(cd ${DISTDIR}; ${PATCH} ${PATCH_DIST_ARGS} < ${FILESDIR}/patch)
|
||||
.if defined(NO_SHARED_LIBS) && ${NO_SHARED_LIBS:U} == YES
|
||||
MAKE_ENV= NO_SHARED_LIBS=Yes
|
||||
.endif
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (jbigkit-1.0.tar.gz) = 97676df72cd5a1f4b589c28cccf58162
|
||||
RMD160 (jbigkit-1.0.tar.gz) = e84535b2330f6052a2ca3ea3941e21e291b7e916
|
||||
SHA1 (jbigkit-1.0.tar.gz) = 04ed5b5a4e17465f8ef36e4631a281a5a99436b2
|
||||
MD5 (jbigkit-1.1.tar.gz) = 92dd8236874d23c2cd96d0446e88d00a
|
||||
RMD160 (jbigkit-1.1.tar.gz) = 63ed08d1fbb07aa9a12370f3a4727c3c50707f6b
|
||||
SHA1 (jbigkit-1.1.tar.gz) = aa8c67ce81f5df171e31a660da6d76819d590e2a
|
||||
|
||||
@ -1,42 +0,0 @@
|
||||
--- Makefile.orig2 Sat May 8 15:11:39 1999
|
||||
+++ Makefile Sat May 8 15:11:59 1999
|
||||
@@ -61,4 +61,3 @@
|
||||
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.0 ${PREFIX}/lib
|
||||
--- libjbig/Makefile.orig2 Sat May 8 15:13:43 1999
|
||||
+++ libjbig/Makefile Sat May 8 15:13:52 1999
|
||||
@@ -7,9 +7,7 @@
|
||||
# Options for the compiler: A high optimization level is suggested
|
||||
#CFLAGS += -Wall -ansi -pedantic
|
||||
|
||||
-SOJBIGLIB=libjbig.so.1.0
|
||||
-
|
||||
-all: libjbig.a $(SOJBIGLIB)
|
||||
+all: libjbig.a
|
||||
|
||||
tstcodec: tstcodec.c jbig.c jbig.h jbig_tab.o
|
||||
$(CC) $(CFLAGS) -o tstcodec -DTEST_CODEC tstcodec.c jbig.c \
|
||||
@@ -20,20 +18,10 @@
|
||||
ar rc libjbig.a jbig.o jbig_tab.o
|
||||
ranlib libjbig.a
|
||||
|
||||
-$(SOJBIGLIB): jbig.so jbig_tab.so
|
||||
- rm -f ${.TARGET}
|
||||
- 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
|
||||
./tstcodec
|
||||
|
||||
clean:
|
||||
- rm -f *.o *~ core gmon.out dbg_d\=??.pbm tstcodec libjbig.so.1.0 libjbig.a
|
||||
+ rm -f *.o *~ core gmon.out dbg_d\=??.pbm tstcodec libjbig.a
|
||||
@ -1,40 +1,55 @@
|
||||
--- Makefile.orig Mon Oct 12 12:12:48 1998
|
||||
+++ Makefile Sat May 8 14:33:41 1999
|
||||
--- Makefile.orig Tue Nov 16 10:55:22 1999
|
||||
+++ Makefile Mon Dec 27 00:37:06 1999
|
||||
@@ -2,13 +2,14 @@
|
||||
# $Id: patch-aa,v 1.1.1.1 1999/05/08 19:17:39 brad Exp $
|
||||
# $Id: patch-aa,v 1.2 1999/12/27 06:12:09 brad 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 = -O2 -W
|
||||
#CCFLAGS = -O -g -W -Wall -ansi -pedantic #-DDEBUG # developer only
|
||||
|
||||
-CFLAGS = $(CCFLAGS) -I../libjbig
|
||||
+CFLAGS += -I../libjbig
|
||||
+CFLAGS += -Wall -I../libjbig
|
||||
+
|
||||
|
||||
VERSION=1.0
|
||||
VERSION=1.1
|
||||
|
||||
@@ -45,3 +46,19 @@
|
||||
@@ -16,7 +17,12 @@
|
||||
@echo "Enter 'make test' in order to start some automatic tests."
|
||||
|
||||
lib:
|
||||
- (cd libjbig; make "CC=$(CC)" "CFLAGS=$(CFLAGS)")
|
||||
+.if defined(NO_SHARED_LIBS) && ${NO_SHARED_LIBS:U} == YES
|
||||
+ (cd libjbig; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" "VERSION=$(VERSION)" "NO_SHARED_LIBS=Yes")
|
||||
+.else
|
||||
+ (cd libjbig; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" "VERSION=$(VERSION)")
|
||||
+.endif
|
||||
+
|
||||
|
||||
pbm: lib
|
||||
(cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)")
|
||||
@@ -45,3 +51,21 @@
|
||||
scp ANNOUNCE \
|
||||
$(DISTUID)@$(DISTHOST):$(DISTPATH)/jbigkit-$(VERSION)-announce.txt
|
||||
mv ../jbigkit-$(VERSION).tar.gz $(HOME)/.www/download/
|
||||
+
|
||||
+install:
|
||||
+ mkdir -p ${PREFIX}/bin
|
||||
+ mkdir -p ${PREFIX}/include
|
||||
+ mkdir -p ${PREFIX}/lib
|
||||
+ mkdir -p ${PREFIX}/man/man1
|
||||
+ mkdir -p ${PREFIX}/man/man5
|
||||
+ 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.0 ${PREFIX}/lib
|
||||
+ @if [ -f libjbig/libjbig.so.$(VERSION) ]; then \
|
||||
+ install -c -m 644 -o bin -g bin libjbig/libjbig.so.$(VERSION) ${PREFIX}/lib;\
|
||||
+ fi
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
--- libjbig/Makefile.orig Fri Apr 10 21:33:27 1998
|
||||
+++ libjbig/Makefile Wed Jun 9 10:24:38 1999
|
||||
@@ -2,12 +2,14 @@
|
||||
# $Id: patch-ab,v 1.2 1999/06/11 18:28:00 brad Exp $
|
||||
+++ libjbig/Makefile Thu Dec 9 15:43:07 1999
|
||||
@@ -2,26 +2,47 @@
|
||||
# $Id: patch-ab,v 1.3 1999/12/27 06:12:09 brad Exp $
|
||||
|
||||
# Select an ANSI/ISO C compiler here, GNU gcc is recommended
|
||||
-CC = gcc
|
||||
@ -12,31 +12,46 @@
|
||||
+#CFLAGS += -Wall -ansi -pedantic
|
||||
|
||||
-all: libjbig.a tstcodec
|
||||
+SOJBIGLIB=libjbig.so.1.0
|
||||
+SOJBIGLIB=libjbig.so.$(VERSION)
|
||||
+
|
||||
+.if defined(NO_SHARED_LIBS) && ${NO_SHARED_LIBS:U} == YES
|
||||
+all: libjbig.a
|
||||
+.else
|
||||
+all: libjbig.a $(SOJBIGLIB)
|
||||
+.endif
|
||||
|
||||
tstcodec: tstcodec.c jbig.c jbig.h jbig_tab.o
|
||||
$(CC) $(CFLAGS) -o tstcodec -DTEST_CODEC tstcodec.c jbig.c \
|
||||
@@ -18,10 +20,20 @@
|
||||
ar rc libjbig.a jbig.o jbig_tab.o
|
||||
ranlib libjbig.a
|
||||
jbig_tab.o
|
||||
|
||||
libjbig.a: jbig.o jbig_tab.o
|
||||
- rm -f libjbig.a
|
||||
- ar rc libjbig.a jbig.o jbig_tab.o
|
||||
- ranlib libjbig.a
|
||||
+ rm -f ${.TARGET}
|
||||
+ ar rc ${.TARGET} ${.ALLSRC}
|
||||
+ ranlib ${.TARGET}
|
||||
+
|
||||
+$(SOJBIGLIB): jbig.so jbig_tab.so
|
||||
+ rm -f ${.TARGET}
|
||||
+ ld -Bshareable -Bforcearchive -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
|
||||
+.SUFFIXES: .c .o .so
|
||||
+
|
||||
+.c.o:
|
||||
+ ${CC} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
|
||||
+
|
||||
+.c.so:
|
||||
+ ${CC} ${CFLAGS} -fpic -DPIC -c ${.IMPSRC} -o ${.TARGET}
|
||||
|
||||
jbig.o: jbig.c jbig.h
|
||||
+jbig_tab.o: jbig_tab.c jbig.h
|
||||
+jbig.so: jbig.c jbig.h
|
||||
+jbig_tab.so: jbig_tab.c jbig.h
|
||||
|
||||
test: tstcodec
|
||||
./tstcodec
|
||||
|
||||
clean:
|
||||
- rm -f *.o *~ core gmon.out dbg_d\=??.pbm tstcodec
|
||||
+ rm -f *.o *~ core gmon.out dbg_d\=??.pbm tstcodec libjbig.so.1.0 libjbig.a
|
||||
+ rm -f *.o *~ core gmon.out dbg_d\=??.pbm tstcodec libjbig.so.$(VERSION) libjbig.a
|
||||
|
||||
@ -1,11 +1,15 @@
|
||||
--- 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
|
||||
--- pbmtools/Makefile.orig Wed Nov 4 05:00:44 1998
|
||||
+++ pbmtools/Makefile Mon Dec 27 00:38:08 1999
|
||||
@@ -2,14 +2,14 @@
|
||||
# $Id: patch-ac,v 1.2 1999/12/27 06:12:09 brad Exp $
|
||||
|
||||
# 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
|
||||
|
||||
.SUFFIXES: .1 .5 .txt $(SUFFIXES)
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@ include/jbig.h
|
||||
bin/pbmtojbg
|
||||
bin/jbgtopbm
|
||||
lib/libjbig.a
|
||||
lib/libjbig.so.1.0
|
||||
lib/libjbig.so.1.1
|
||||
@exec /sbin/ldconfig -m %B
|
||||
man/man1/jbgtopbm.1
|
||||
man/man1/pbmtojbg.1
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user