diff options
| -rw-r--r-- | print/transfig/Makefile | 10 | ||||
| -rw-r--r-- | print/transfig/distinfo | 12 | ||||
| -rw-r--r-- | print/transfig/patches/patch-ad | 25 | ||||
| -rw-r--r-- | print/transfig/patches/patch-ae | 12 |
4 files changed, 25 insertions, 34 deletions
diff --git a/print/transfig/Makefile b/print/transfig/Makefile index 77dba1f46fc..c5a11fb97de 100644 --- a/print/transfig/Makefile +++ b/print/transfig/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.39 2011/01/13 13:36:10 wiz Exp $ +# $NetBSD: Makefile,v 1.40 2011/01/19 19:14:15 drochner Exp $ -DISTNAME= transfig.3.2.5 -PKGNAME= transfig-3.2.5 -PKGREVISION= 4 +DISTNAME= transfig.3.2.5d +PKGNAME= transfig-3.2.5d CATEGORIES= graphics print -MASTER_SITES= ftp://epb.lbl.gov/xfig/alpha/ +MASTER_SITES= ftp://epb.lbl.gov/xfig/alpha/ \ + ${MASTER_SITE_SOURCEFORGE:=mcj/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.xfig.org/ diff --git a/print/transfig/distinfo b/print/transfig/distinfo index 8683d6cfd48..6c91c379c92 100644 --- a/print/transfig/distinfo +++ b/print/transfig/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.17 2011/01/19 00:12:50 tron Exp $ +$NetBSD: distinfo,v 1.18 2011/01/19 19:14:15 drochner Exp $ -SHA1 (transfig.3.2.5.tar.gz) = 2657c104d0099dcb4565a8762a9543310e55e767 -RMD160 (transfig.3.2.5.tar.gz) = 435615bded662225127ea564fc746e9cb0058f18 -Size (transfig.3.2.5.tar.gz) = 394296 bytes +SHA1 (transfig.3.2.5d.tar.gz) = 90ff277cc9b3fa0d0313052fcf5e3ffad8652abc +RMD160 (transfig.3.2.5d.tar.gz) = 6d6aff522bd9e886029bf317e7b9dcd495a5c0ef +Size (transfig.3.2.5d.tar.gz) = 497451 bytes SHA1 (patch-aa) = bd898082a8c34825efe04d0102ddb33b2f4cffbd SHA1 (patch-ab) = b056ff88914bccfc172f15adb663eda0f254e125 SHA1 (patch-ac) = 0258794cf6f6d22d3355ed01c2cc89c7ee0088d4 -SHA1 (patch-ad) = 58343868c70e52bd0aee485d590f262a3fdc7b98 -SHA1 (patch-ae) = d3d0eeb08083092f717525914c64e72c7ceaa1fd +SHA1 (patch-ad) = b15995d7b3282d68bbcea0a161ed2db8188141ac +SHA1 (patch-ae) = 07a18544e7c2d6aac7d0d3f950b7820f33869b06 SHA1 (patch-af) = 544bae557e193f9bbee4dbe1aefa454c38100c69 diff --git a/print/transfig/patches/patch-ad b/print/transfig/patches/patch-ad index 3d44fb050d7..e13ece42e2f 100644 --- a/print/transfig/patches/patch-ad +++ b/print/transfig/patches/patch-ad @@ -1,10 +1,10 @@ -$NetBSD: patch-ad,v 1.4 2011/01/19 00:12:50 tron Exp $ +$NetBSD: patch-ad,v 1.5 2011/01/19 19:14:15 drochner Exp $ Fix build with png-1.5. ---- fig2dev/dev/readpng.c.orig 2003-01-13 19:16:41.000000000 +0000 -+++ fig2dev/dev/readpng.c 2011-01-19 00:09:24.000000000 +0000 -@@ -39,6 +39,8 @@ +--- fig2dev/dev/readpng.c.orig 2010-04-21 16:02:14.000000000 +0000 ++++ fig2dev/dev/readpng.c +@@ -39,6 +39,8 @@ read_png(file,filetype,pic,llx,lly) char *ptr; int num_palette; png_colorp palette; @@ -13,7 +13,7 @@ Fix build with png-1.5. png_color_16 png_background; *llx = *lly = 0; -@@ -62,7 +64,7 @@ +@@ -62,7 +64,7 @@ read_png(file,filetype,pic,llx,lly) } /* set long jump here */ @@ -22,31 +22,22 @@ Fix build with png-1.5. /* if we get here there was a problem reading the file */ png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); return 0; -@@ -78,14 +80,14 @@ +@@ -78,14 +80,14 @@ read_png(file,filetype,pic,llx,lly) png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type, &interlace_type, &compression_type, &filter_type); - if (info_ptr->valid & PNG_INFO_gAMA) - png_set_gamma(png_ptr, 2.2, info_ptr->gamma); -+ if (png_get_gAMA(png_ptr, info_ptr, &gamma) & PNG_INFO_gAMA) ++ if (png_get_gAMA(png_ptr, info_ptr, &gamma)) + png_set_gamma(png_ptr, 2.2, gamma); else png_set_gamma(png_ptr, 2.2, 0.45); - if (info_ptr->valid & PNG_INFO_bKGD) -+ if (png_get_bKGD(png_ptr, info_ptr, &file_background) & PNG_INFO_bKGD) ++ if (png_get_bKGD(png_ptr, info_ptr, &file_background)) /* set the background to the one supplied */ - png_set_background(png_ptr, &info_ptr->background, + png_set_background(png_ptr, file_background, PNG_BACKGROUND_GAMMA_FILE, 1, 1.0); else { /* blend the canvas background using the alpha channel */ -@@ -127,7 +129,7 @@ - - if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette)) { - png_get_hIST(png_ptr, info_ptr, &histogram); -- png_set_dither(png_ptr, palette, num_palette, 256, histogram, 0); -+ png_set_quantize(png_ptr, palette, num_palette, 256, histogram, 0); - } - } - if (color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { diff --git a/print/transfig/patches/patch-ae b/print/transfig/patches/patch-ae index 2df1baeaabc..4c2f60f177d 100644 --- a/print/transfig/patches/patch-ae +++ b/print/transfig/patches/patch-ae @@ -1,13 +1,13 @@ -$NetBSD: patch-ae,v 1.4 2005/11/10 14:29:01 itohy Exp $ +$NetBSD: patch-ae,v 1.5 2011/01/19 19:14:15 drochner Exp $ ---- fig2dev/fig2dev.h.orig Wed Jul 16 01:21:12 2003 -+++ fig2dev/fig2dev.h Wed Nov 9 21:52:22 2005 -@@ -213,13 +213,14 @@ +--- fig2dev/fig2dev.h.orig 2010-03-16 18:53:20.000000000 +0000 ++++ fig2dev/fig2dev.h +@@ -214,13 +214,14 @@ struct Cmap { #endif /* MAXPATHLEN */ #endif /* PATH_MAX */ --#if ( !defined(__NetBSD__) && !defined(__DARWIN__)) -+#if ( !defined(__NetBSD__) && !defined(__DARWIN__) && !defined(__FreeBSD__) &&!defined(__DragonFly__)) +-#if ( !defined(__NetBSD__) && !defined(__DARWIN__) && !defined(__FreeBSD) ) ++#if ( !defined(__NetBSD__) && !defined(__DARWIN__) && !defined(__FreeBSD) && !defined(__DragonFly__) ) extern int sys_nerr, errno; #endif |