- add license comment

- set LD_LIBRARY_PATH via MAKE_ENV
- remove test target
- sync patch names with update-patches

graphics/jbigkit/Makefile

@@ -1,21 +1,21 @@
-# $OpenBSD: Makefile,v 1.23 2002/10/27 00:01:16 naddy Exp $
-# $FreeBSD: Makefile,v 1.5 1998/09/14 22:19:05 smace Exp $
+# $OpenBSD: Makefile,v 1.24 2004/01/11 08:20:06 brad Exp $
 
 COMMENT=	"lossless image compression library"
 
 DISTNAME=	jbigkit-1.2
 CATEGORIES=	graphics
-
 MASTER_SITES=	ftp://ftp.informatik.uni-erlangen.de/local/cip/mskuhn/ISO/JBIG/ \
 		http://www.cl.cam.ac.uk/~mgk25/download/
 
 MAINTAINER=	Brad Smith <brad@openbsd.org>
 
+# GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+MAKE_ENV=	LD_LIBRARY_PATH="${WRKSRC}/libjbig"
 MAKE_FLAGS=	CC="${CC}" CCFLAGS="${CFLAGS} -Wall"
 FAKE_FLAGS=	${MAKE_FLAGS}
 
@@ -27,9 +27,6 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/jbig
 	${INSTALL_DATA} ${WRKSRC}/libjbig/jbig.doc ${PREFIX}/share/doc/jbig
 
-test:	build
-	@cd ${WRKBUILD} && ${SETENV} LD_LIBRARY_PATH="${WRKBUILD}/libjbig" ${MAKE} ${MAKE_FLAGS} -f ${MAKE_FILE} test
-
 .include <bsd.port.mk>
 
 .if defined(NO_SHARED_LIBS) && ${NO_SHARED_LIBS:L} == "yes"

graphics/jbigkit/patches/patch-Makefile

@@ -1,6 +1,7 @@
---- Makefile.orig	Sat Apr  8 07:19:41 2000
-+++ Makefile	Sat Sep 23 22:23:53 2000
-@@ -16,7 +16,7 @@
+$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."
  
  lib:
@@ -9,7 +10,7 @@
  
  pbm: lib
  	(cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)")
-@@ -45,3 +45,16 @@
+@@ -45,3 +45,16 @@ distribution: clean
  	scp ANNOUNCE \
  	  $(DISTUID)@$(DISTHOST):$(DISTPATH)/jbigkit-$(VERSION)-announce.txt
  	mv ../jbigkit-$(VERSION).tar.gz $(HOME)/.www/download/

graphics/jbigkit/patches/patch-ac

@@ -1,11 +0,0 @@
---- pbmtools/Makefile.orig	Wed Nov  4 05:00:44 1998
-+++ pbmtools/Makefile	Wed Mar 22 20:31:08 2000
-@@ -9,7 +9,7 @@
- 
- .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

graphics/jbigkit/patches/patch-libjbig_Makefile

@@ -1,6 +1,7 @@
---- libjbig/Makefile.orig	Sat Apr  8 07:15:46 2000
-+++ libjbig/Makefile	Mon Oct 16 15:18:00 2000
-@@ -7,16 +7,31 @@
+$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
+@@ -7,16 +7,31 @@ CC = gcc
  # Options for the compiler: A high optimization level is suggested
  CFLAGS = -O -Wall -ansi -pedantic
  
@@ -32,11 +33,11 @@
 +.SUFFIXES: .o .so
 +
 +.c.so:
-+	${CC} ${CFLAGS} $(PICFLAG) -DPIC -c ${.IMPSRC} -o ${.TARGET}
++	${CC} ${CFLAGS} $(PICFLAG) -c ${.IMPSRC} -o ${.TARGET}
  
  jbig.o: jbig.c jbig.h
  
-@@ -24,4 +39,4 @@
+@@ -24,4 +39,4 @@ test: tstcodec
  	./tstcodec
  
  clean:

graphics/jbigkit/patches/patch-pbmtools_Makefile

@@ -0,0 +1,12 @@
+$OpenBSD: patch-pbmtools_Makefile,v 1.1 2004/01/11 08:20:06 brad Exp $
+--- pbmtools/Makefile.orig	2000-04-08 07:15:52.000000000 -0400
++++ pbmtools/Makefile	2004-01-11 03:03:23.000000000 -0500
+@@ -9,7 +9,7 @@ CFLAGS = -g -Wall -ansi -pedantic -I../l
+ 
+ .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

graphics/jbigkit/pkg/PFRAG.shared

@@ -1,3 +1,3 @@
-@comment $OpenBSD: PFRAG.shared,v 1.2 2000/07/04 02:09:24 krw Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.3 2004/01/11 08:20:06 brad Exp $
 lib/libjbig.so.1.2
-DYNLIBDIR(%B)
+DYNLIBDIR(%D/lib)