diff --git a/graphics/jbigkit/Makefile b/graphics/jbigkit/Makefile index 5d0f50cea88..5d1ff2a274b 100644 --- a/graphics/jbigkit/Makefile +++ b/graphics/jbigkit/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.24 2004/01/11 08:20:06 brad Exp $ +# $OpenBSD: Makefile,v 1.25 2004/02/25 20:31:00 brad Exp $ COMMENT= "lossless image compression library" -DISTNAME= jbigkit-1.2 +DISTNAME= jbigkit-1.5 CATEGORIES= graphics -MASTER_SITES= ftp://ftp.informatik.uni-erlangen.de/local/cip/mskuhn/ISO/JBIG/ \ - http://www.cl.cam.ac.uk/~mgk25/download/ +MASTER_SITES= http://www.cl.cam.ac.uk/~mgk25/download/ MAINTAINER= Brad Smith @@ -15,16 +14,26 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes +LIBVERSION= 1.2 + MAKE_ENV= LD_LIBRARY_PATH="${WRKSRC}/libjbig" -MAKE_FLAGS= CC="${CC}" CCFLAGS="${CFLAGS} -Wall" -FAKE_FLAGS= ${MAKE_FLAGS} +MAKE_FLAGS= CC="${CC}" CCFLAGS="${CFLAGS} -Wall" VERSION="${LIBVERSION}" WRKDIST= ${WRKDIR}/jbigkit -REGRESS_TARGET= test - -post-install: +do-install: + ${INSTALL_PROGRAM_DIR} ${PREFIX}/bin + ${INSTALL_DATA_DIR} ${PREFIX}/include + ${INSTALL_DATA_DIR} ${PREFIX}/lib + ${INSTALL_MAN_DIR} ${PREFIX}/man/man1 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/jbig + cd ${WRKSRC}/pbmtools && ${INSTALL_PROGRAM} jbgtopbm pbmtojbg ${PREFIX}/bin && \ + ${INSTALL_MAN} jbgtopbm.1 pbmtojbg.1 ${PREFIX}/man/man1 + ${INSTALL_DATA} ${WRKSRC}/libjbig/jbig.h ${PREFIX}/include + ${INSTALL_DATA} ${WRKSRC}/libjbig/libjbig.a ${PREFIX}/lib + @if [ -f ${WRKSRC}/libjbig/libjbig.so.${LIBVERSION} ]; then \ + ${INSTALL_DATA} ${WRKSRC}/libjbig/libjbig.so.${LIBVERSION} ${PREFIX}/lib; \ + fi ${INSTALL_DATA} ${WRKSRC}/libjbig/jbig.doc ${PREFIX}/share/doc/jbig .include diff --git a/graphics/jbigkit/distinfo b/graphics/jbigkit/distinfo index 5eafc902ce9..f89014c8bbe 100644 --- a/graphics/jbigkit/distinfo +++ b/graphics/jbigkit/distinfo @@ -1,3 +1,3 @@ -MD5 (jbigkit-1.2.tar.gz) = 2175611f9d63632d2043cffae9bb1e8e -RMD160 (jbigkit-1.2.tar.gz) = 245b4eabf9a4be2c3c34e79ebef036eb91bbee46 -SHA1 (jbigkit-1.2.tar.gz) = d3f22a399b92abee891f8d858038987deae73c9c +MD5 (jbigkit-1.5.tar.gz) = d54f65825be7a28728f251b6d4922e07 +RMD160 (jbigkit-1.5.tar.gz) = 4fe880a1a764bc1f50bf3bc6aecf2241c30b82d5 +SHA1 (jbigkit-1.5.tar.gz) = 6fbe5e585224bf3d6c4a8d7cf6f470fb479e15c1 diff --git a/graphics/jbigkit/patches/patch-Makefile b/graphics/jbigkit/patches/patch-Makefile index a2f0797c3c7..d2fedcd418e 100644 --- a/graphics/jbigkit/patches/patch-Makefile +++ b/graphics/jbigkit/patches/patch-Makefile @@ -1,29 +1,34 @@ -$OpenBSD: patch-Makefile,v 1.1 2004/01/11 08:20:06 brad Exp $ ---- Makefile.orig 2000-04-08 07:19:41.000000000 -0400 -+++ Makefile 2004-01-11 03:03:23.000000000 -0500 -@@ -16,7 +16,7 @@ all: lib pbm - @echo "Enter 'make test' in order to start some automatic tests." +$OpenBSD: patch-Makefile,v 1.2 2004/02/25 20:31:01 brad Exp $ +--- Makefile.orig 2003-06-11 12:55:50.000000000 -0400 ++++ Makefile 2004-02-25 15:19:19.000000000 -0500 +@@ -13,22 +13,22 @@ CFLAGS = $(CCFLAGS) -I../libjbig + VERSION=1.5 + + all: lib pbm +- @echo "Enter 'make test' in order to start some automatic tests." ++ @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)" "VERSION=$(VERSION)") ++ (cd libjbig; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" "VERSION=$(VERSION)") pbm: lib - (cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)") -@@ -45,3 +45,16 @@ distribution: clean - scp ANNOUNCE \ - $(DISTUID)@$(DISTHOST):$(DISTPATH)/jbigkit-$(VERSION)-announce.txt - mv ../jbigkit-$(VERSION).tar.gz $(HOME)/.www/download/ -+ -+install: -+ ${BSD_INSTALL_PROGRAM_DIR} ${PREFIX}/bin -+ ${BSD_INSTALL_DATA_DIR} ${PREFIX}/include -+ ${BSD_INSTALL_DATA_DIR} ${PREFIX}/lib -+ ${BSD_INSTALL_MAN_DIR} ${PREFIX}/man/man1 -+ cd pbmtools; ${BSD_INSTALL_PROGRAM} jbgtopbm pbmtojbg ${PREFIX}/bin; \ -+ ${BSD_INSTALL_MAN} jbgtopbm.1 pbmtojbg.1 ${PREFIX}/man/man1 -+ ${BSD_INSTALL_DATA} libjbig/jbig.h ${PREFIX}/include -+ ${BSD_INSTALL_DATA} libjbig/libjbig.a ${PREFIX}/lib -+ @if [ -f libjbig/libjbig.so.$(VERSION) ]; then \ -+ ${BSD_INSTALL_DATA} libjbig/libjbig.so.$(VERSION) ${PREFIX}/lib; \ -+ fi +- (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) ++test regress: lib pbm ++ (cd libjbig; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" test) ++ (cd pbmtools; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" test) + + clean: + rm -f *~ core +- (cd libjbig; make clean) +- (cd pbmtools; make clean) ++ (cd libjbig; $(MAKE) clean) ++ (cd pbmtools; $(MAKE) clean) + + distribution: clean + rm -f libjbig/libjbig.a diff --git a/graphics/jbigkit/patches/patch-libjbig_Makefile b/graphics/jbigkit/patches/patch-libjbig_Makefile index 74516e6891b..9627a706f9f 100644 --- a/graphics/jbigkit/patches/patch-libjbig_Makefile +++ b/graphics/jbigkit/patches/patch-libjbig_Makefile @@ -1,6 +1,6 @@ -$OpenBSD: patch-libjbig_Makefile,v 1.1 2004/01/11 08:20:06 brad Exp $ ---- libjbig/Makefile.orig 2000-04-08 07:15:46.000000000 -0400 -+++ libjbig/Makefile 2004-01-11 03:03:23.000000000 -0500 +$OpenBSD: patch-libjbig_Makefile,v 1.2 2004/02/25 20:31:01 brad Exp $ +--- libjbig/Makefile.orig 2003-06-11 12:57:56.000000000 -0400 ++++ libjbig/Makefile 2004-02-25 15:01:50.000000000 -0500 @@ -7,16 +7,31 @@ CC = gcc # Options for the compiler: A high optimization level is suggested CFLAGS = -O -Wall -ansi -pedantic @@ -21,7 +21,7 @@ $OpenBSD: patch-libjbig_Makefile,v 1.1 2004/01/11 08:20:06 brad Exp $ libjbig.a: jbig.o jbig_tab.o - rm -f libjbig.a - ar rc libjbig.a jbig.o jbig_tab.o -- ranlib libjbig.a +- -ranlib libjbig.a + rm -f ${.TARGET} + ar rc ${.TARGET} ${.ALLSRC} + ranlib ${.TARGET} @@ -29,7 +29,7 @@ $OpenBSD: patch-libjbig_Makefile,v 1.1 2004/01/11 08:20:06 brad Exp $ +libjbig.so.$(VERSION): jbig.so jbig_tab.so + rm -f ${.TARGET} + ${CC} -shared $(PICFLAG) -o ${.TARGET} ${.ALLSRC} -+ ++ +.SUFFIXES: .o .so + +.c.so: