From 70fdff86250304ab5e0e172405812e51d05737ff Mon Sep 17 00:00:00 2001
From: mi <mi@FreeBSD.org>
Date: Tue, 18 Jun 2002 02:36:03 +0000
Subject: Update to 1.4 (from 1.2). No API changes listed in the CHANGES -- bug
 fixes/improvements only, hence no shared library version bump.

PR:		ports/37275
Submitted by:	KATO Tsuguru
---
 graphics/jbigkit/Makefile       |  4 ++--
 graphics/jbigkit/distinfo       |  2 +-
 graphics/jbigkit/files/patch-aa | 37 +++++++++++++++++++++++++++++--------
 3 files changed, 32 insertions(+), 11 deletions(-)

(limited to 'graphics/jbigkit')

diff --git a/graphics/jbigkit/Makefile b/graphics/jbigkit/Makefile
index bd44c1b5f83c..299503747f00 100644
--- a/graphics/jbigkit/Makefile
+++ b/graphics/jbigkit/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	jbigkit
-PORTVERSION=	1.2
+PORTVERSION=	1.4
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.cl.cam.ac.uk/~mgk25/download/
 
@@ -24,7 +24,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/libjbig/jbig.doc ${PREFIX}/share/doc/jbig
 .endif
 
-test: build
+post-build test:
 	cd ${WRKSRC} && env LD_LIBRARY_PATH=${WRKSRC}/libjbig ${MAKE} test
 
 .include <bsd.port.mk>
diff --git a/graphics/jbigkit/distinfo b/graphics/jbigkit/distinfo
index c181fc3fad8c..8793afcf1239 100644
--- a/graphics/jbigkit/distinfo
+++ b/graphics/jbigkit/distinfo
@@ -1 +1 @@
-MD5 (jbigkit-1.2.tar.gz) = 2175611f9d63632d2043cffae9bb1e8e
+MD5 (jbigkit-1.4.tar.gz) = 6e0167e017b4cf7e76bfca6fc6390d4c
diff --git a/graphics/jbigkit/files/patch-aa b/graphics/jbigkit/files/patch-aa
index b029aa06c113..0377d047e905 100644
--- a/graphics/jbigkit/files/patch-aa
+++ b/graphics/jbigkit/files/patch-aa
@@ -1,6 +1,7 @@
---- Makefile.orig	Mon Oct 12 11:12:48 1998
-+++ Makefile	Sun Nov  1 22:16:26 1998
-@@ -3,11 +3,12 @@
+--- Makefile.orig	Tue Apr  9 19:37:13 2002
++++ Makefile	Tue Apr  9 22:45:53 2002
+@@ -2,13 +2,13 @@
+ # $Id: Makefile,v 1.12 2002-04-09 11:37:13+01 mgk25 Exp $
  
  # Select an ANSI/ISO C compiler here, GNU gcc is recommended
 -CC = gcc
@@ -13,12 +14,32 @@
  
 -CFLAGS = $(CCFLAGS) -I../libjbig
 +CFLAGS += -I../libjbig
-+
  
- VERSION=1.0
-@@ -46,2 +47,26 @@
- 	  $(DISTUID)@$(DISTHOST):$(DISTPATH)/jbigkit-$(VERSION)-announce.txt
- 	mv ../jbigkit-$(VERSION).tar.gz $(HOME)/.www/download/
+ VERSION=1.4
+ 
+@@ -16,14 +16,14 @@
+ 	@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)")
+ 
+ pbm: lib
+-	(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)
++	(cd libjbig;  $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
++	(cd pbmtools; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
+ 
+ clean:
+ 	rm -f *~ core
+@@ -36,3 +36,27 @@
+ 	  gzip -9f jbigkit-$(VERSION).tar )
+ 	mv ../jbigkit-$(VERSION).tar.gz $(HOME)/public_html/download/
+ 	cp CHANGES $(HOME)/public_html/jbigkit/
 +
 +install:
 +	mkdir -p ${PREFIX}/bin
-- 
cgit