diff options
author | jlam <jlam@pkgsrc.org> | 1999-11-01 03:31:45 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 1999-11-01 03:31:45 +0000 |
commit | 61a5c84807787f7e43d2b5599d41196ffc817662 (patch) | |
tree | d69d0029ad3a1cff886da2ccd644acf6b4f5d497 /graphics/fly/patches | |
parent | 2e2b3511561d94a568e47133fe4966be18de87d0 (diff) | |
download | pkgsrc-61a5c84807787f7e43d2b5599d41196ffc817662.tar.gz |
* Modify to support gd-1.7.3.
* Finish transforming references to "gif" to "png".
Diffstat (limited to 'graphics/fly/patches')
-rw-r--r-- | graphics/fly/patches/patch-aa | 12 | ||||
-rw-r--r-- | graphics/fly/patches/patch-ac | 42 | ||||
-rw-r--r-- | graphics/fly/patches/patch-am | 16 | ||||
-rw-r--r-- | graphics/fly/patches/patch-an | 12 | ||||
-rw-r--r-- | graphics/fly/patches/patch-ao | 22 | ||||
-rw-r--r-- | graphics/fly/patches/patch-ap | 14 | ||||
-rw-r--r-- | graphics/fly/patches/patch-aq | 98 |
7 files changed, 201 insertions, 15 deletions
diff --git a/graphics/fly/patches/patch-aa b/graphics/fly/patches/patch-aa index e892dc5a5af..c20e25b78b3 100644 --- a/graphics/fly/patches/patch-aa +++ b/graphics/fly/patches/patch-aa @@ -1,9 +1,7 @@ -$NetBSD: patch-aa,v 1.5 1999/08/27 10:11:02 agc Exp $ +$NetBSD: patch-aa,v 1.6 1999/11/01 03:31:46 jlam Exp $ -Makefile changes for gd 1.6.3 (PNG support) - ---- Makefile.orig Thu Jan 14 22:42:34 1999 -+++ Makefile Fri Aug 27 10:15:35 1999 +--- Makefile.orig Thu Jan 14 17:42:34 1999 ++++ Makefile Sun Oct 31 00:18:17 1999 @@ -4,13 +4,15 @@ # If you already have gd installed, use the line below and comment out the # following line @@ -18,8 +16,8 @@ Makefile changes for gd 1.6.3 (PNG support) +# CFLAGS = -O -I$(GD) +# #CFLAGS = -O -pedantic -Wall -I$(GD) +# LIBS = -L$(GD) -lgd -lm -+CFLAGS= -O -I${PREFIX}/include -+LIBS= ${LDFLAGS} -lgd -lpng -lz -lm ++CFLAGS += -O ${CPPFLAGS} ++LIBS = ${LDFLAGS} -lgd -lpng -lz -lttf -lintl -lXpm -lX11 -lm -all: gd fly +all: fly diff --git a/graphics/fly/patches/patch-ac b/graphics/fly/patches/patch-ac index 2a532da952f..4ec230e288d 100644 --- a/graphics/fly/patches/patch-ac +++ b/graphics/fly/patches/patch-ac @@ -1,9 +1,16 @@ -$NetBSD: patch-ac,v 1.1 1999/08/27 10:11:02 agc Exp $ +$NetBSD: patch-ac,v 1.2 1999/11/01 03:31:46 jlam Exp $ -Update for PNG graphics. - ---- doc/using.html 1999/08/27 09:45:48 1.1 -+++ doc/using.html 1999/08/27 09:47:09 +--- doc/using.html.orig Thu Jun 10 21:39:56 1999 ++++ doc/using.html Sun Oct 31 00:13:57 1999 +@@ -1,7 +1,7 @@ + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> + <html> + <head> +- <title>GIFs on the fly ++ <title>PNGs on the fly + </title> + <link rev="made" href="mailto:gleeson@unimelb.edu.au"> + <meta name="description" @@ -18,7 +18,7 @@ <td><h1>fly: Documentation: Using fly</h1> </td> @@ -34,7 +41,7 @@ Update for PNG graphics. <DD>for creating a new image.</DD> </DL> <P> <B>Note:</B> -@@ -203,20 +203,20 @@ +@@ -203,21 +203,21 @@ coordinates supplied. </P> </DD> @@ -43,8 +50,9 @@ Update for PNG graphics. </STRONG> </DT> - <DD><P> Copies region <B>x1,y1 - x2,y2</B> of <B>source-filename.gif</B> +- or the GIF output of <B>command</B> to the coordinates <B>x,y</B> + <DD><P> Copies region <B>x1,y1 - x2,y2</B> of <B>source-filename.png</B> - or the GIF output of <B>command</B> to the coordinates <B>x,y</B> ++ or the PNG output of <B>command</B> to the coordinates <B>x,y</B> of the image being created/modified. <BR> If <B>x1,y1,x2,y2</B> are all <B>-1</B>, copy the entire image. </P> @@ -55,10 +63,12 @@ Update for PNG graphics. </KBD></STRONG> </DT> - <DD><P>Copies region <B>x1,y1 - x2,y2</B> of <B>source-filename.gif</B> +- or the GIF output of <B>command</B> to the area <B>dx1,dy1 - + <DD><P>Copies region <B>x1,y1 - x2,y2</B> of <B>source-filename.png</B> - or the GIF output of <B>command</B> to the area <B>dx1,dy1 - ++ or the PNG output of <B>command</B> to the area <B>dx1,dy1 - dx2,dy2</B> of the image being created/modified, resizing the image to fit.<BR> If <B>x1,y1,x2,y2</B> are all <B>-1</B>, copy + the entire image. @@ -238,9 +238,9 @@ <DD><P> Changes all pixels of colour <B>R1,G1,B1</B> to <B>R2,G2,B2.</B> </P> @@ -83,6 +93,22 @@ Update for PNG graphics. Subsequent directives of <KBD>fill</KBD>, and <KBD>fpoly</KBD> will use the selected "tile" as a fill pattern, until a call of <KBD>killtile.</KBD> +@@ -307,13 +307,13 @@ + </DD> + <DT><STRONG><KBD>rotate deg</KBD></STRONG> + </DT> +- <DD><P> Rotates the GIF image <TT>deg</TT> degrees clockwise, where ++ <DD><P> Rotates the PNG image <TT>deg</TT> degrees clockwise, where + <TT>deg</TT> is 90, 180 or 270. + </P> + </DD> + <DT><STRONG><KBD>interlace</KBD></STRONG> + </DT> +- <DD><P> Makes the image output by fly an interlaced GIF. ++ <DD><P> Makes the image output by fly an interlaced PNG. + </P> + </DD> + </DL> @@ -339,13 +339,13 @@ <!-- ===================================================================== --> <hr size="2" noshade> diff --git a/graphics/fly/patches/patch-am b/graphics/fly/patches/patch-am new file mode 100644 index 00000000000..a044aecc509 --- /dev/null +++ b/graphics/fly/patches/patch-am @@ -0,0 +1,16 @@ +$NetBSD: patch-am,v 1.1 1999/11/01 03:31:46 jlam Exp $ + +--- examples/cgi-perl-example.pl.orig Thu Jan 14 17:37:31 1999 ++++ examples/cgi-perl-example.pl Sun Oct 31 00:27:09 1999 +@@ -1,8 +1,8 @@ +-#!/usr/local/bin/perl ++#!/usr/pkg/bin/perl + +-print "Content-type: image/gif\n\n"; ++print "Content-type: image/png\n\n"; + +-$flyprog = "/usr/local/web/bin/fly"; ++$flyprog = "/usr/pkg/bin/fly"; + + $infile = "/tmp/fly.$$"; + diff --git a/graphics/fly/patches/patch-an b/graphics/fly/patches/patch-an new file mode 100644 index 00000000000..710c375d38c --- /dev/null +++ b/graphics/fly/patches/patch-an @@ -0,0 +1,12 @@ +$NetBSD: patch-an,v 1.1 1999/11/01 03:31:46 jlam Exp $ + +--- examples/csh.example.orig Thu Jan 14 17:37:32 1999 ++++ examples/csh.example Sun Oct 31 00:27:21 1999 +@@ -1,6 +1,6 @@ + #!/bin/csh + +-cat <<EOD | ../fly -q -o test.gif ++cat <<EOD | ../fly -q -o test.png + new + size 256,256 + fill 1,1,255,255,255 diff --git a/graphics/fly/patches/patch-ao b/graphics/fly/patches/patch-ao new file mode 100644 index 00000000000..5d3b053b2d2 --- /dev/null +++ b/graphics/fly/patches/patch-ao @@ -0,0 +1,22 @@ +$NetBSD: patch-ao,v 1.1 1999/11/01 03:31:46 jlam Exp $ + +--- examples/fly-tester.pl.orig Thu Jun 10 19:14:53 1999 ++++ examples/fly-tester.pl Sun Oct 31 00:28:28 1999 +@@ -1,4 +1,4 @@ +-#!/usr/local/web/bin/perl ++#!/usr/pkg/bin/perl + ### ---------------------------------------------------------------------- ### + # + # Fly tester +@@ -108,9 +108,9 @@ + exit 0; + } + open INPUT, ">$inputfile" or die "Couldn't open $inputfile for writing: $!\n"; print INPUT $code; close INPUT; +- my $return_code = system("$flyprog -i $inputfile -o $output_area/fly.$$.gif > $outputfile 2>&1"); ++ my $return_code = system("$flyprog -i $inputfile -o $output_area/fly.$$.png > $outputfile 2>&1"); + if($return_code == 0) { +- $cell1 = $q->p({-align=>'center'}, $q->img({-src=>"${graphs_url}/fly.$$.gif", ++ $cell1 = $q->p({-align=>'center'}, $q->img({-src=>"${graphs_url}/fly.$$.png", + -alt=>"[Generated Graph]", -border=>"2"})); + my $url = $q->url(); + if($diags) { diff --git a/graphics/fly/patches/patch-ap b/graphics/fly/patches/patch-ap new file mode 100644 index 00000000000..cad93fc3233 --- /dev/null +++ b/graphics/fly/patches/patch-ap @@ -0,0 +1,14 @@ +$NetBSD: patch-ap,v 1.1 1999/11/01 03:31:46 jlam Exp $ + +--- examples/perl.example.orig Thu Jan 14 17:37:31 1999 ++++ examples/perl.example Sun Oct 31 00:27:45 1999 +@@ -1,7 +1,7 @@ +-#!/usr/local/bin/perl ++#!/usr/pkg/bin/perl + + $flyprog = "../fly"; +-$outfile = "temp.gif"; ++$outfile = "temp.png"; + + $infile = "/tmp/fly.$$"; + diff --git a/graphics/fly/patches/patch-aq b/graphics/fly/patches/patch-aq new file mode 100644 index 00000000000..6634c43f6e7 --- /dev/null +++ b/graphics/fly/patches/patch-aq @@ -0,0 +1,98 @@ +$NetBSD: patch-aq,v 1.1 1999/11/01 03:31:46 jlam Exp $ + +--- examples/test.fly.orig Thu Jan 14 17:37:32 1999 ++++ examples/test.fly Sun Oct 31 00:29:30 1999 +@@ -1,7 +1,7 @@ + new + # + size 256,256 +-#name temp.gif ++#name temp.png + + # background fill, all white + fill 1,1,255,255,255 +@@ -113,7 +113,7 @@ + new + size 128,128 + # set the output filename +-name foo.gif ++name foo.png + # a black background + fill 1,1,0,0,0 + # a diagonal white line top left to bottom right +@@ -125,30 +125,30 @@ + new + size 256,256 + # set the output filename +-name bar.gif ++name bar.png + # a black background + fill 1,1,0,0,0 +-# copy in the previous gif +-copy 127,127,-1,-1,-1,-1,foo.gif ++# copy in the previous png ++copy 127,127,-1,-1,-1,-1,foo.png + # a diagonal white line bottom left to top right + line 0,127,127,0,255,255,255 + end + + # And yet another!! +-#existing bar.gif ++#existing bar.png + # set the output filename +-#name bar2.gif +-# copy in a previous gif ++#name bar2.png ++# copy in a previous png + #copy 127,0,-1,-1,-1,-1,`../fly -i small-end.fly -q` + # a diagonal white line top left to bottom right + #line 127,0,0,127,255,255,255 + #end + + # And yet another!! +-existing temp.gif ++existing temp.png + # set the output filename +-name bar3.gif +-# copy in a previous gif ++name bar3.png ++# copy in a previous png + copyresized -1,-1,-1,-1,20,30,30,40,`../fly -i small-end.fly -q` + # a diagonal white line top left to bottom right + #line 127,0,0,127,255,255,255 +@@ -158,7 +158,7 @@ + new + size 400,400 + # set the output filename +-name foo3.gif ++name foo3.png + # a black background + fill 1,1,0,0,0 + # a diagonal white line top left to bottom right +@@ -172,7 +172,7 @@ + new + size 400,400 + # set the output filename +-name foo4.gif ++name foo4.png + # a black background + fill 1,1,0,0,0 + # a diagonal white line top left to bottom right +@@ -188,7 +188,7 @@ + new + size 400,400 + # set the output filename +-name foo5.gif ++name foo5.png + # a black background + fill 1,1,0,0,0 + # a diagonal white line top left to bottom right +@@ -203,7 +203,7 @@ + new + size 400,400 + # set the output filename +-name foo6.gif ++name foo6.png + # a black background + fill 1,1,0,0,0 + # a diagonal white line top left to bottom right |