Add png support.

4 files changed, 28 insertions, 16 deletions

diff --git a/graphics/xli/Makefile b/graphics/xli/Makefile
index 185b0fa54a3..80648d512d6 100644
--- a/graphics/xli/Makefile
+++ b/graphics/xli/Makefile
@@ -1,14 +1,21 @@
-# $NetBSD: Makefile,v 1.2 1999/04/15 20:39:43 tron Exp $
+# $NetBSD: Makefile,v 1.3 2000/04/22 17:03:35 kim Exp $
 
-DISTNAME=		xli.1.16
-PKGNAME=		xli-1.16
+DISTNAME=		xli-1.16nb1
 CATEGORIES=		graphics x11
-MASTER_SITES=		${MASTER_SITE_XCONTRIB:=applications/}
+MASTER_SITES=		ftp://ftp.libpng.org/pub/png/src/ \
+			${MASTER_SITE_XCONTRIB:=applications/}
+DISTFILES=		xli.1.16.tar.gz \
+			xli-png.tar.gz
 
 MAINTAINER=		packages@netbsd.org
 
+DEPENDS+=		png>=1.0.3:../../graphics/png
+
 NO_WRKSUBDIR=		yes
 
 USE_IMAKE=		yes
 
+pre-patch:
+	@${PATCH} -d ${WRKSRC} -s -p1 < ${WRKSRC}/png.patch
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xli/files/md5 b/graphics/xli/files/md5
index 02ead06fdd4..93e46c7faf5 100644
--- a/graphics/xli/files/md5
+++ b/graphics/xli/files/md5
@@ -1,3 +1,4 @@
-$NetBSD: md5,v 1.1 1998/08/27 11:18:04 frueauf Exp $
+$NetBSD: md5,v 1.2 2000/04/22 17:03:37 kim Exp $
 
 MD5 (xli.1.16.tar.gz) = 96af602a442e7fe670aea38c02a42670
+MD5 (xli-png.tar.gz) = f4e21186dac6510f60bab4e68169bd9b
diff --git a/graphics/xli/files/patch-sum b/graphics/xli/files/patch-sum
index ab14a71a694..2ea1a146900 100644
--- a/graphics/xli/files/patch-sum
+++ b/graphics/xli/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:51:14 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/04/22 17:03:37 kim Exp $
 
-MD5 (patch-aa) = 2071e8729350087543a1a018663dc966
+MD5 (patch-aa) = 730171b66f07c2e961c9b0be45302a7a
diff --git a/graphics/xli/patches/patch-aa b/graphics/xli/patches/patch-aa
index 0b44a6228d4..9bfc3ba2b64 100644
--- a/graphics/xli/patches/patch-aa
+++ b/graphics/xli/patches/patch-aa
@@ -1,13 +1,17 @@
-$NetBSD: patch-aa,v 1.1 1998/08/27 11:18:05 frueauf Exp $
+$NetBSD: patch-aa,v 1.2 2000/04/22 17:03:40 kim Exp $
 
---- Imakefile.orig	Thu Jul 28 20:45:10 1994
-+++ Imakefile	Sun Aug 23 09:01:23 1998
-@@ -14,7 +14,7 @@
+--- Imakefile.orig	Sat Apr 22 12:47:26 2000
++++ Imakefile	Sat Apr 22 12:55:14 2000
+@@ -10,10 +10,10 @@
+       CCOPTIONS = -Aa -D_HPUX_SOURCE
+ #endif
+ 
+-     	INCLUDES = -I../zlib -I../libpng
++       INCLUDES = -I${LOCALBASE}/include
+     SYSPATHFILE = $(XAPPLOADDIR)/Xloadimage
          DEPLIBS = $(DEPXLIB)
- LOCAL_LIBRARIES = $(XLIB)
+-LOCAL_LIBRARIES = $(XLIB) -L../zlib -L../libpng -lpng -lz 
++LOCAL_LIBRARIES = $(XLIB) -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lpng -lz 
  SYS_LIBRARIES   = -lm
--        DEFINES =  
-+        DEFINES = -DHAVE_GUNZIP
+         DEFINES = -DHAVE_GUNZIP
  
- SRCS1 = bright.c clip.c cmuwmrast.c compress.c dither.c faces.c fbm.c  fill.c  g3.c gif.c halftone.c imagetypes.c img.c mac.c mcidas.c  mc_tables.c merge.c misc.c new.c options.c path.c pbm.c pcx.c  reduce.c jpeg.c jpeglib.c rle.c rlelib.c root.c rotate.c send.c smooth.c  sunraster.c  value.c window.c xbitmap.c xli.c  xpixmap.c xwd.c zio.c zoom.c ddxli.c doslib.c tga.c bmp.c pcd.c
- OBJS1 = bright.o clip.o cmuwmrast.o compress.o dither.o faces.o fbm.o  fill.o  g3.o gif.o halftone.o imagetypes.o img.o mac.o mcidas.o  mc_tables.o merge.o misc.o new.o options.o path.o pbm.o pcx.o  reduce.o jpeg.o jpeglib.o rle.o rlelib.o root.o rotate.o send.o smooth.o  sunraster.o  value.o window.o xbitmap.o xli.o  xpixmap.o xwd.o zio.o zoom.o ddxli.o doslib.o tga.o bmp.o pcd.o