diff options
-rw-r--r-- | graphics/xli/Makefile | 18 | ||||
-rw-r--r-- | graphics/xli/PLIST | 4 | ||||
-rw-r--r-- | graphics/xli/distinfo | 11 | ||||
-rw-r--r-- | graphics/xli/patches/patch-aa | 25 | ||||
-rw-r--r-- | graphics/xli/patches/patch-ab | 35 |
5 files changed, 24 insertions, 69 deletions
diff --git a/graphics/xli/Makefile b/graphics/xli/Makefile index 4b7c3a7541f..79f21dd1c10 100644 --- a/graphics/xli/Makefile +++ b/graphics/xli/Makefile @@ -1,25 +1,15 @@ -# $NetBSD: Makefile,v 1.20 2003/12/22 03:06:52 fredb Exp $ +# $NetBSD: Makefile,v 1.21 2003/12/22 04:46:15 fredb Exp $ -DISTNAME= xli-1.16 -PKGREVISION= 4 -WRKSRC= ${WRKDIR} +DISTNAME= xli-1.17.0 CATEGORIES= graphics x11 -MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/} -DISTFILES= xli.1.16.tar.gz \ - xli-png.tar.gz +MASTER_SITES= http://pantransit.reptiles.org/prog/ MAINTAINER= tech-pkg@NetBSD.org COMMENT= Version of xloadimage, an X11 Image Loading Utility -#SITES_xli-png.tar.gz= http://pantransit.reptiles.org/prog/ -SITES_xli-png.tar.gz= ${MASTER_SITE_BACKUP} - USE_BUILDLINK2= YES USE_IMAKE= YES -pre-patch: - ${RM} ${WRKSRC}/png.c,v - @${PATCH} -d ${WRKSRC} -s -p1 < ${WRKSRC}/png.patch - +.include "../../graphics/jpeg/buildlink2.mk" .include "../../graphics/png/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/xli/PLIST b/graphics/xli/PLIST index f01860b20e8..b6d0d6925fa 100644 --- a/graphics/xli/PLIST +++ b/graphics/xli/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.2 2003/03/02 19:47:27 jschauma Exp $ +@comment $NetBSD: PLIST,v 1.3 2003/12/22 04:46:15 fredb Exp $ bin/xli bin/xlito bin/xview bin/xsetbg -lib/X11/app-defaults/Xloadimage +lib/X11/app-defaults/Xli ${IMAKE_MAN_DIR}/xli.${IMAKE_MANNEWSUFFIX} ${IMAKE_MAN_DIR}/xlito.${IMAKE_MANNEWSUFFIX} diff --git a/graphics/xli/distinfo b/graphics/xli/distinfo index a293d72056a..c64de170e52 100644 --- a/graphics/xli/distinfo +++ b/graphics/xli/distinfo @@ -1,9 +1,6 @@ -$NetBSD: distinfo,v 1.9 2003/06/14 17:50:56 fredb Exp $ +$NetBSD: distinfo,v 1.10 2003/12/22 04:46:15 fredb Exp $ -SHA1 (xli.1.16.tar.gz) = ee1f390bacc94760ee5ae83c3c979d4c01eb7986 -Size (xli.1.16.tar.gz) = 287692 bytes -SHA1 (xli-png.tar.gz) = 18ae7d10c31b68be3f978cfa137f5cbad706cfd1 -Size (xli-png.tar.gz) = 6393 bytes -SHA1 (patch-aa) = 0e9bbf5d290db20d67e34f59ce63cf5c78b44ed6 -SHA1 (patch-ab) = 6aaeb485e6bc59f486c4cc1534f03bfa47587441 +SHA1 (xli-1.17.0.tar.gz) = 49ff899602510dda5c701af4104ea7d334ac883a +Size (xli-1.17.0.tar.gz) = 200069 bytes +SHA1 (patch-aa) = 94b5c639175e55562bfdf3413486726246418310 SHA1 (patch-ac) = fc3a9f5b78391f95ef30adcf9aaacaba3019a4ac diff --git a/graphics/xli/patches/patch-aa b/graphics/xli/patches/patch-aa index cae708971d4..cab4dcaf7ba 100644 --- a/graphics/xli/patches/patch-aa +++ b/graphics/xli/patches/patch-aa @@ -1,17 +1,20 @@ -$NetBSD: patch-aa,v 1.7 2001/09/12 06:17:14 jlam Exp $ +$NetBSD: patch-aa,v 1.8 2003/12/22 04:46:15 fredb Exp $ ---- Imakefile.orig Wed Sep 12 02:11:53 2001 +--- Imakefile.orig 2000-02-09 03:23:32.000000000 -0600 +++ Imakefile -@@ -10,10 +10,10 @@ +@@ -12,11 +12,11 @@ CCOPTIONS = -Aa -D_HPUX_SOURCE #endif -- INCLUDES = -I../zlib -I../libpng -+ INCLUDES = -I${BUILDLINK_DIR}/include - SYSPATHFILE = $(XAPPLOADDIR)/Xloadimage - DEPLIBS = $(DEPXLIB) --LOCAL_LIBRARIES = $(XLIB) -L../zlib -L../libpng -lpng -lz -+LOCAL_LIBRARIES = $(XLIB) -L${BUILDLINK_DIR}/lib -Wl,-R${LOCALBASE}/lib -lpng -lz - SYS_LIBRARIES = -lm - DEFINES = -DHAVE_GUNZIP +-JPEG_INCLUDES = +-JPEG_LDFLAGS = ++JPEG_INCLUDES = -I${BUILDLINK_DIR}/include ++JPEG_LDFLAGS = -L${BUILDLINK_DIR}/lib -Wl,-R${LOCALBASE}/lib +-PNG_INCLUDES = +-PNG_LDFLAGS = ++PNG_INCLUDES = -I${BUILDLINK_DIR}/include ++PNG_LDFLAGS = -L${BUILDLINK_DIR}/lib -Wl,-R${LOCALBASE}/lib + + SYSPATHFILE = $(XAPPLOADDIR)/Xli + DEPLIBS = $(DEPXLIB) diff --git a/graphics/xli/patches/patch-ab b/graphics/xli/patches/patch-ab deleted file mode 100644 index f0d82736fdf..00000000000 --- a/graphics/xli/patches/patch-ab +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2002/03/14 05:23:04 fredb Exp $ - ---- png.c.orig Fri Apr 19 21:57:13 1996 -+++ png.c -@@ -120,10 +120,17 @@ - return (Image *) 0; - } - -+ /* initialize the structures */ -+ pngp = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); -+ info = png_create_info_struct(pngp); -+ - /* set error handling */ -- if (setjmp(pngp->jmpbuf)) -+ if (setjmp(png_jmpbuf(pngp))) - { -- png_read_destroy(pngp, info, (png_info *)0); -+ if (info) -+ png_destroy_read_struct(&pngp, &info, NULL); -+ else -+ png_destroy_read_struct(&pngp, NULL, NULL); - zclose(zfp); - lfree(pngp); - lfree(info); -@@ -132,10 +139,6 @@ - /* If we get here, we had a problem reading the file */ - return (Image *) 0; - } -- -- /* initialize the structures, info first for error handling */ -- png_info_init(info); -- png_read_init(pngp); - - /* set up the input control */ - png_set_read_fn(pngp, (void *) zfp, xli_png_read_data); |