summaryrefslogtreecommitdiff
path: root/graphics/fly
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/fly')
-rw-r--r--graphics/fly/Makefile14
-rw-r--r--graphics/fly/files/md54
-rw-r--r--graphics/fly/files/patch-sum15
-rw-r--r--graphics/fly/patches/patch-aa30
-rw-r--r--graphics/fly/patches/patch-ab60
-rw-r--r--graphics/fly/patches/patch-ac103
-rw-r--r--graphics/fly/patches/patch-ad42
-rw-r--r--graphics/fly/patches/patch-ae51
-rw-r--r--graphics/fly/patches/patch-af42
-rw-r--r--graphics/fly/patches/patch-ag72
-rw-r--r--graphics/fly/patches/patch-ah42
-rw-r--r--graphics/fly/patches/patch-ai69
-rw-r--r--graphics/fly/patches/patch-aj51
-rw-r--r--graphics/fly/patches/patch-ak42
-rw-r--r--graphics/fly/patches/patch-al42
-rw-r--r--graphics/fly/pkg/DESCR6
-rw-r--r--graphics/fly/pkg/PLIST25
17 files changed, 681 insertions, 29 deletions
diff --git a/graphics/fly/Makefile b/graphics/fly/Makefile
index 54131d301e9..6b74d53662c 100644
--- a/graphics/fly/Makefile
+++ b/graphics/fly/Makefile
@@ -1,20 +1,26 @@
-# $NetBSD: Makefile,v 1.7 1999/05/03 20:25:36 tv Exp $
+# $NetBSD: Makefile,v 1.8 1999/08/27 10:11:01 agc Exp $
#
-DISTNAME= fly-1.6.1
+DISTNAME= fly-1.6.5
CATEGORIES= graphics www
MASTER_SITES= ftp://www.unimelb.edu.au/pub/www/tools/unix/fly/
MAINTAINER= bouyer@netbsd.org
HOMEPAGE= http://www.unimelb.edu.au/fly/fly.html
-DEPENDS+= gd-1.3p1:../../graphics/gd
+DEPENDS+= gd-1.6.3:../../graphics/gd
+BUILD_DEPENDS+= ${LOCALBASE}/bin/giftopnm:../../graphics/netpbm
do-install:
${MKDIR} ${PREFIX}/share/doc/fly
${MKDIR} ${PREFIX}/share/examples/fly
${INSTALL_PROGRAM} ${WRKSRC}/fly ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/fly
+ for f in example fly-logo nav-copyright nav-docs nav-feedback \
+ nav-home new valid_html; do \
+ ${LOCALBASE}/bin/giftopnm < ${WRKSRC}/doc/$$f.gif | \
+ ${LOCALBASE}/bin/pnmtopng > ${PREFIX}/share/doc/fly/$$f.png; \
+ done
+ ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/fly
${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/fly
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/fly/files/md5 b/graphics/fly/files/md5
index 58f11d2d4dd..deb05c4ea61 100644
--- a/graphics/fly/files/md5
+++ b/graphics/fly/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 1998/08/07 13:21:35 agc Exp $
+$NetBSD: md5,v 1.5 1999/08/27 10:11:02 agc Exp $
-MD5 (fly-1.6.1.tar.gz) = d9dfcd2d8458856966b31bd68bcd4299
+MD5 (fly-1.6.5.tar.gz) = b96a2a6c566f284923d37f16b64aafec
diff --git a/graphics/fly/files/patch-sum b/graphics/fly/files/patch-sum
index 755616357e6..154e90a8452 100644
--- a/graphics/fly/files/patch-sum
+++ b/graphics/fly/files/patch-sum
@@ -1,3 +1,14 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:51:06 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/08/27 10:11:02 agc Exp $
-MD5 (patch-aa) = b98e1166fe989d7d1ed73785f8bbbdec
+MD5 (patch-aa) = 966da124ced973f610d36d942384e0dc
+MD5 (patch-ab) = 62365d599cbb86dd58769285b4308d0f
+MD5 (patch-ac) = 6922a532224cd5f804c5b4818d42f841
+MD5 (patch-ad) = 070a9a40290714c5afdc0db57c1f4cc3
+MD5 (patch-ae) = 8dce4c6a996a8ab69e37a843fbf95128
+MD5 (patch-af) = 4e64d4e3eff18cd2346e834e9e09d537
+MD5 (patch-ag) = 57cc5ab595a190439fe0b40ab3fe5891
+MD5 (patch-ah) = 06faf0812714cd4b2a33f43252e6a216
+MD5 (patch-ai) = bfb20ff05c062f8c51b0a34e30bd16f5
+MD5 (patch-aj) = f2370cc89b6c4b097da2ab2baed114a5
+MD5 (patch-ak) = 0eec9fefeff540962470ad19b0d7e112
+MD5 (patch-al) = a22854407c5b72e0db4fa0a110d26266
diff --git a/graphics/fly/patches/patch-aa b/graphics/fly/patches/patch-aa
index 13632ba06e5..e892dc5a5af 100644
--- a/graphics/fly/patches/patch-aa
+++ b/graphics/fly/patches/patch-aa
@@ -1,28 +1,32 @@
-$NetBSD: patch-aa,v 1.4 1999/05/02 23:17:53 tron Exp $
+$NetBSD: patch-aa,v 1.5 1999/08/27 10:11:02 agc Exp $
---- Makefile.orig Wed May 20 05:45:57 1998
-+++ Makefile Wed Jul 1 18:40:42 1998
-@@ -4,13 +4,14 @@
+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
+@@ -4,13 +4,15 @@
# If you already have gd installed, use the line below and comment out the
# following line
# GD = /path/to/gd/directory
- GD = gd1.3
- CC = gcc
-+# GD = gd1.3
-+# CC = gcc
- # CFLAGS = -O -I$(GD)
-- CFLAGS = -O -pedantic -wall -I$(GD)
+- CFLAGS = -O -I$(GD)
+- #CFLAGS = -O -pedantic -Wall -I$(GD)
- LIBS = -L$(GD) -lgd -lm
-+# CFLAGS = -O -pedantic -wall -I$(GD)
-+ CFLAGS = -O -I$(PREFIX)/include/gd
-+ LIBS = -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib -lgd -lm
++# GD = gd1.3
++# CC = gcc
++# 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
-all: gd fly
+all: fly
gd: $(GD)
- cd $(GD); make
-@@ -26,4 +27,3 @@
+ cd $(GD); make CC=$(CC)
+@@ -27,4 +29,3 @@
clean:
rm -f fly.o fly temp.gif core; cd $(GD); make clean;
diff --git a/graphics/fly/patches/patch-ab b/graphics/fly/patches/patch-ab
new file mode 100644
index 00000000000..69d528a77a8
--- /dev/null
+++ b/graphics/fly/patches/patch-ab
@@ -0,0 +1,60 @@
+$NetBSD: patch-ab,v 1.1 1999/08/27 10:11:02 agc Exp $
+
+Changes for gd-1.6.3 package (GIF -> PNG)
+
+--- fly.c 1999/08/27 09:16:41 1.1
++++ fly.c 1999/08/27 09:17:03
+@@ -661,7 +661,7 @@
+ }
+ else
+ {
+- brush = gdImageCreateFromGif(brushfile);
++ brush = gdImageCreateFromPng(brushfile);
+ gdImageSetBrush(img,brush);
+ brush_on = 1;
+ if (!quiet) fprintf(verbose_out,"## Brush Set ## to: %s\n",s);
+@@ -703,7 +703,7 @@
+ }
+ else
+ {
+- tile = gdImageCreateFromGif(tilefile);
++ tile = gdImageCreateFromPng(tilefile);
+ gdImageSetTile(img,tile);
+ tile_on = TRUE;
+ if (!quiet) fprintf(verbose_out,"## Tile Set ## to: %s\n",s);
+@@ -767,7 +767,7 @@
+ break;
+
+ case END:
+- gdImageGif(img,outfile);
++ gdImagePng(img,outfile);
+ fclose(outfile);
+ gdImageDestroy(img);
+ written_out = TRUE;
+@@ -788,7 +788,7 @@
+
+ /* Write the gd to the GIF output file and exit */
+ FINISH: if(!written_out && img) {
+- gdImageGif(img,outfile);
++ gdImagePng(img,outfile);
+ fclose(outfile);
+ gdImageDestroy(img);
+ }
+@@ -1202,7 +1202,7 @@
+ filename);
+ exit(1);
+ }
+- img_file = gdImageCreateFromGif(img_to_copy);
++ img_file = gdImageCreateFromPng(img_to_copy);
+ fclose(img_to_copy);
+
+ if( resize == 1 )
+@@ -1357,7 +1357,7 @@
+ else {
+ if(!quiet) fprintf(verbose_out,"Creating image from existing gif <%s>\n",
+ filename);
+- image = gdImageCreateFromGif(in);
++ image = gdImageCreateFromPng(in);
+ fclose(in);
+ }
+ }
diff --git a/graphics/fly/patches/patch-ac b/graphics/fly/patches/patch-ac
new file mode 100644
index 00000000000..2a532da952f
--- /dev/null
+++ b/graphics/fly/patches/patch-ac
@@ -0,0 +1,103 @@
+$NetBSD: patch-ac,v 1.1 1999/08/27 10:11:02 agc 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
+@@ -18,7 +18,7 @@
+ <td><h1>fly: Documentation: Using fly</h1>
+ </td>
+ <td><a href="http://www.unimelb.edu.au/fly/"><img
+- src="fly-logo.gif" border="0" hspace="5" vspace="5"
++ src="fly-logo.png" border="0" hspace="5" vspace="5"
+ alt=" [fly] " width="157" height="52"></a>
+ </td>
+ </tr>
+@@ -57,7 +57,7 @@
+ <P> The command file uses a number of directives. It must start with one
+ of the following lines:
+ </P>
+-<DL><DT><KBD>existing /path/to/file.gif</KBD></DT>
++<DL><DT><KBD>existing /path/to/file.png</KBD></DT>
+ <DD>if modifying an existing image, OR</DD>
+ <DT><KBD>new<BR>size x,y</KBD></DT>
+ <DD>for creating a new image of width <B>x</B> pixels, height
+@@ -68,9 +68,9 @@
+ <P> To create more than one image from a command file, use the directive
+ <B><KBD>end</KBD></B>, followed by either
+ </P>
+-<DL><DT><KBD>existing /path/to/file.gif<BR>name &lt;filename.gif&gt;</KBD></DT>
++<DL><DT><KBD>existing /path/to/file.png<BR>name &lt;filename.png&gt;</KBD></DT>
+ <DD>if modifying an existing image, OR</DD>
+- <DT><KBD>new<BR>size x,y<BR>name &lt;filename.gif&gt;</KBD></DT>
++ <DT><KBD>new<BR>size x,y<BR>name &lt;filename.png&gt;</KBD></DT>
+ <DD>for creating a new image.</DD>
+ </DL>
+ <P> <B>Note:</B>
+@@ -203,20 +203,20 @@
+ coordinates supplied.
+ </P>
+ </DD>
+- <DT><STRONG><KBD>copy x,y,x1,y1,x2,y2,[source-filename.gif|`command`]</KBD>
++ <DT><STRONG><KBD>copy x,y,x1,y1,x2,y2,[source-filename.png|`command`]</KBD>
+ </STRONG>
+ </DT>
+- <DD><P> Copies region <B>x1,y1 - x2,y2</B> of <B>source-filename.gif</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>
+ of the image being created/modified. <BR>
+ If <B>x1,y1,x2,y2</B> are all <B>-1</B>, copy the entire image.
+ </P>
+ </DD>
+ <DT><STRONG><KBD>
+- copyresized x1,y1,x2,y2,dx1,dy1,dx2,dy2,[source-filename.gif|`command`]
++ copyresized x1,y1,x2,y2,dx1,dy1,dx2,dy2,[source-filename.png|`command`]
+ </KBD></STRONG>
+ </DT>
+- <DD><P>Copies region <B>x1,y1 - x2,y2</B> of <B>source-filename.gif</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 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
+@@ -238,9 +238,9 @@
+ <DD><P> Changes all pixels of colour <B>R1,G1,B1</B> to <B>R2,G2,B2.</B>
+ </P>
+ </DD>
+- <DT><STRONG><KBD>setbrush filename.gif</KBD></STRONG>
++ <DT><STRONG><KBD>setbrush filename.png</KBD></STRONG>
+ </DT>
+- <DD><P> Sets the current &quot;brush&quot; to <B>filename.gif.</B>
++ <DD><P> Sets the current &quot;brush&quot; to <B>filename.png.</B>
+ Subsequent directives of <KBD>line</KBD>, <KBD>dline</KBD>,
+ <KBD>rect</KBD>, <KBD>poly</KBD> and <KBD>arc</KBD> will use the
+ selected &quot;brush&quot; to draw their lines, until a call of
+@@ -255,9 +255,9 @@
+ width brush.
+ </P>
+ </DD>
+- <DT><STRONG><KBD>settile filename.gif</KBD></STRONG>
++ <DT><STRONG><KBD>settile filename.png</KBD></STRONG>
+ </DT>
+- <DD><P> Sets the current &quot;tile&quot; to <B>filename.gif.</B>
++ <DD><P> Sets the current &quot;tile&quot; to <B>filename.png.</B>
+ Subsequent directives of <KBD>fill</KBD>, and
+ <KBD>fpoly</KBD> will use the selected &quot;tile&quot;
+ as a fill pattern, until a call of <KBD>killtile.</KBD>
+@@ -339,13 +339,13 @@
+ <!-- ===================================================================== -->
+ <hr size="2" noshade>
+
+- <p align="center"><a href="index.html"><img src="nav-home.gif" border="0"
++ <p align="center"><a href="index.html"><img src="nav-home.png" border="0"
+ alt="[Home]" width="52" height="24"></a> <a
+- href="documentation.html"><img src="nav-docs.gif" border="0"
++ href="documentation.html"><img src="nav-docs.png" border="0"
+ alt="[Documentation]" width="120" height="24"></a> <a
+- href="copyright.html"><img src="nav-copyright.gif" border="0"
++ href="copyright.html"><img src="nav-copyright.png" border="0"
+ alt="[Copyright]" width="86" height="24"></a> <a href="feedback.html"><img
+- src="nav-feedback.gif" border="0" alt="[Feedback]" width="80"
++ src="nav-feedback.png" border="0" alt="[Feedback]" width="80"
+ height="24"></a>
+ </p>
+
diff --git a/graphics/fly/patches/patch-ad b/graphics/fly/patches/patch-ad
new file mode 100644
index 00000000000..5f652a7f09e
--- /dev/null
+++ b/graphics/fly/patches/patch-ad
@@ -0,0 +1,42 @@
+$NetBSD: patch-ad,v 1.1 1999/08/27 10:11:02 agc Exp $
+
+Update for PNG support
+
+--- doc/FAQ.html 1999/08/27 09:51:38 1.1
++++ doc/FAQ.html 1999/08/27 09:52:47
+@@ -1,7 +1,7 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <html>
+ <head>
+- <title>GIFs on the fly: Frequently Asked Questions
++ <title>PNGs on the fly: Frequently Asked Questions
+ </title>
+ <link rev="made" href="mailto:gleeson@unimelb.edu.au">
+ <meta name="description"
+@@ -18,7 +18,7 @@
+ <td><h1>fly: Documentation: Frequently Asked Questions</h1>
+ </td>
+ <td><a href="http://www.unimelb.edu.au/fly/"><img
+- src="fly-logo.gif" border="0" hspace="5" vspace="5"
++ src="fly-logo.png" border="0" hspace="5" vspace="5"
+ alt=" [fly] " width="157" height="52"></a>
+ </td>
+ </tr>
+@@ -80,13 +80,13 @@
+ <!-- ===================================================================== -->
+ <hr size="2" noshade>
+
+- <p align="center"><a href="index.html"><img src="nav-home.gif" border="0"
++ <p align="center"><a href="index.html"><img src="nav-home.png" border="0"
+ alt="[Home]" width="52" height="24"></a> <a
+- href="documentation.html"><img src="nav-docs.gif" border="0"
++ href="documentation.html"><img src="nav-docs.png" border="0"
+ alt="[Documentation]" width="120" height="24"></a> <a
+- href="copyright.html"><img src="nav-copyright.gif" border="0"
++ href="copyright.html"><img src="nav-copyright.png" border="0"
+ alt="[Copyright]" width="86" height="24"></a> <a href="feedback.html"><img
+- src="nav-feedback.gif" border="0" alt="[Feedback]" width="80"
++ src="nav-feedback.png" border="0" alt="[Feedback]" width="80"
+ height="24"></a>
+ </p>
+
diff --git a/graphics/fly/patches/patch-ae b/graphics/fly/patches/patch-ae
new file mode 100644
index 00000000000..86aa083aa7e
--- /dev/null
+++ b/graphics/fly/patches/patch-ae
@@ -0,0 +1,51 @@
+$NetBSD: patch-ae,v 1.1 1999/08/27 10:11:03 agc Exp $
+
+Update for PNG support
+
+--- doc/copyright.html 1999/08/27 09:51:38 1.1
++++ doc/copyright.html 1999/08/27 09:55:12
+@@ -1,7 +1,7 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <html>
+ <head>
+- <title>GIFs on the fly: Credits &amp; Copyright Information
++ <title>PNGs on the fly: Credits &amp; Copyright Information
+ </title>
+ <link rev="made" href="mailto:gleeson@unimelb.edu.au">
+ <meta name="description"
+@@ -18,7 +18,7 @@
+ <td><h1>fly: Credits &amp; Copyright Information</h1>
+ </td>
+ <td><a href="http://www.unimelb.edu.au/fly/"><img
+- src="fly-logo.gif" border="0" hspace="5" vspace="5"
++ src="fly-logo.png" border="0" hspace="5" vspace="5"
+ alt=" [fly] " width="157" height="52"></a>
+ </td>
+ </tr>
+@@ -50,13 +50,13 @@
+ <!-- ===================================================================== -->
+ <hr size="2" noshade>
+
+- <p align="center"><a href="index.html"><img src="nav-home.gif" border="0"
++ <p align="center"><a href="index.html"><img src="nav-home.png" border="0"
+ alt="[Home]" width="52" height="24"></a> <a
+- href="documentation.html"><img src="nav-docs.gif" border="0"
++ href="documentation.html"><img src="nav-docs.png" border="0"
+ alt="[Documentation]" width="120" height="24"></a> <a
+- href="copyright.html"><img src="nav-copyright.gif" border="0"
++ href="copyright.html"><img src="nav-copyright.png" border="0"
+ alt="[Copyright]" width="86" height="24"></a> <a href="feedback.html"><img
+- src="nav-feedback.gif" border="0" alt="[Feedback]" width="80"
++ src="nav-feedback.png" border="0" alt="[Feedback]" width="80"
+ height="24"></a>
+ </p>
+
+@@ -81,7 +81,7 @@
+ </td>
+ <td align="RIGHT">
+ <p> <a href="http://www.unimelb.edu.au/html-check/validation-form.html">
+- <img src="http://www.unimelb.edu.au/images/valid_html.4.0.gif"
++ <img src="http://www.unimelb.edu.au/images/valid_html.4.0.png"
+ alt="HTML 4.0 Checked!" border="0"></a>
+ </p>
+ </td>
diff --git a/graphics/fly/patches/patch-af b/graphics/fly/patches/patch-af
new file mode 100644
index 00000000000..76ccd884eff
--- /dev/null
+++ b/graphics/fly/patches/patch-af
@@ -0,0 +1,42 @@
+$NetBSD: patch-af,v 1.1 1999/08/27 10:11:03 agc Exp $
+
+Update for PNG support
+
+--- doc/documentation.html 1999/08/27 09:51:38 1.1
++++ doc/documentation.html 1999/08/27 09:55:15
+@@ -1,7 +1,7 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <html>
+ <head>
+- <title>GIFs on the fly: Documentation
++ <title>PNGs on the fly: Documentation
+ </title>
+ <link rev="made" href="mailto:gleeson@unimelb.edu.au">
+ <meta name="description"
+@@ -18,7 +18,7 @@
+ <td><h1>fly: Documentation</h1>
+ </td>
+ <td><a href="http://www.unimelb.edu.au/fly/"><img
+- src="fly-logo.gif" border="0" hspace="5" vspace="5"
++ src="fly-logo.png" border="0" hspace="5" vspace="5"
+ alt=" [fly] " width="157" height="52"></a>
+ </td>
+ </tr>
+@@ -48,13 +48,13 @@
+ <!-- ===================================================================== -->
+ <hr size="2" noshade>
+
+- <p align="center"><a href="index.html"><img src="nav-home.gif" border="0"
++ <p align="center"><a href="index.html"><img src="nav-home.png" border="0"
+ alt="[Home]" width="52" height="24"></a> <a
+- href="documentation.html"><img src="nav-docs.gif" border="0"
++ href="documentation.html"><img src="nav-docs.png" border="0"
+ alt="[Documentation]" width="120" height="24"></a> <a
+- href="copyright.html"><img src="nav-copyright.gif" border="0"
++ href="copyright.html"><img src="nav-copyright.png" border="0"
+ alt="[Copyright]" width="86" height="24"></a> <a href="feedback.html"><img
+- src="nav-feedback.gif" border="0" alt="[Feedback]" width="80"
++ src="nav-feedback.png" border="0" alt="[Feedback]" width="80"
+ height="24"></a>
+ </p>
+
diff --git a/graphics/fly/patches/patch-ag b/graphics/fly/patches/patch-ag
new file mode 100644
index 00000000000..5faca9b694d
--- /dev/null
+++ b/graphics/fly/patches/patch-ag
@@ -0,0 +1,72 @@
+$NetBSD: patch-ag,v 1.1 1999/08/27 10:11:03 agc Exp $
+
+Update for PNG support
+
+--- doc/examples.html 1999/08/27 09:51:38 1.1
++++ doc/examples.html 1999/08/27 09:55:19
+@@ -1,7 +1,7 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <html>
+ <head>
+- <title>GIFs on the fly: Examples
++ <title>PNGs on the fly: Examples
+ </title>
+ <link rev="made" href="mailto:gleeson@unimelb.edu.au">
+ <meta name="description"
+@@ -18,7 +18,7 @@
+ <td><h1>fly: Documentation: Examples</h1>
+ </td>
+ <td><a href="http://www.unimelb.edu.au/fly/"><img
+- src="fly-logo.gif" border="0" hspace="5" vspace="5"
++ src="fly-logo.png" border="0" hspace="5" vspace="5"
+ alt=" [fly] " width="157" height="52"></a>
+ </td>
+ </tr>
+@@ -36,7 +36,7 @@
+ <PRE>#!/usr/local/bin/perl
+
+ $flyprog = &quot;/usr/local/bin/fly&quot;;
+-$outfile = &quot;temp.gif&quot;;
++$outfile = &quot;temp.png&quot;;
+
+ open(FLY,&quot;| $flyprog -o $outfile &quot;);
+ print FLY &quot;new\n&quot;;
+@@ -70,7 +70,7 @@
+ fill 160,96,0,0,0
+ EOD
+
+-fly -i /tmp/fly.$$ -o test.gif
++fly -i /tmp/fly.$$ -o test.png
+ </PRE>
+ </DD>
+ <DT>Fly Scripts</DT>
+@@ -91,9 +91,9 @@
+ </DD>
+ </DL>
+ <P>Can you guess what the above examples produce?
+- <A HREF="example.gif">Here's the answer!</A>
++ <A HREF="example.png">Here's the answer!</A>
+ </P>
+-<P><IMG SRC="new.gif" ALT="[New!]"> I have created a <A
++<P><IMG SRC="new.png" ALT="[New!]"> I have created a <A
+ HREF="http://www.unimelb.edu.au/%7Egleeson/cgi-bin/fly-tester.pl">Fly
+ Tester</A> CGI program that lets you test fly commands quickly in a
+ convenient interface. The program is also included in the fly
+@@ -102,13 +102,13 @@
+ <!-- ===================================================================== -->
+ <hr size="2" noshade>
+
+- <p align="center"><a href="index.html"><img src="nav-home.gif" border="0"
++ <p align="center"><a href="index.html"><img src="nav-home.png" border="0"
+ alt="[Home]" width="52" height="24"></a> <a
+- href="documentation.html"><img src="nav-docs.gif" border="0"
++ href="documentation.html"><img src="nav-docs.png" border="0"
+ alt="[Documentation]" width="120" height="24"></a> <a
+- href="copyright.html"><img src="nav-copyright.gif" border="0"
++ href="copyright.html"><img src="nav-copyright.png" border="0"
+ alt="[Copyright]" width="86" height="24"></a> <a href="feedback.html"><img
+- src="nav-feedback.gif" border="0" alt="[Feedback]" width="80"
++ src="nav-feedback.png" border="0" alt="[Feedback]" width="80"
+ height="24"></a>
+ </p>
+
diff --git a/graphics/fly/patches/patch-ah b/graphics/fly/patches/patch-ah
new file mode 100644
index 00000000000..9ee7a0f75c2
--- /dev/null
+++ b/graphics/fly/patches/patch-ah
@@ -0,0 +1,42 @@
+$NetBSD: patch-ah,v 1.1 1999/08/27 10:11:03 agc Exp $
+
+Update for PNG support
+
+--- doc/feedback.html 1999/08/27 09:51:38 1.1
++++ doc/feedback.html 1999/08/27 09:55:26
+@@ -1,7 +1,7 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <html>
+ <head>
+- <title>GIFs on the fly: Feedback and Mailing Lists
++ <title>PNGs on the fly: Feedback and Mailing Lists
+ </title>
+ <link rev="made" href="mailto:gleeson@unimelb.edu.au">
+ <meta name="description"
+@@ -18,7 +18,7 @@
+ <td><h1>fly: Feedback and Mailing Lists</h1>
+ </td>
+ <td><a href="http://www.unimelb.edu.au/fly/"><img
+- src="fly-logo.gif" border="0" hspace="5" vspace="5"
++ src="fly-logo.png" border="0" hspace="5" vspace="5"
+ alt=" [fly] " width="157" height="52"></a>
+ </td>
+ </tr>
+@@ -71,13 +71,13 @@
+ <!-- ===================================================================== -->
+ <hr size="2" noshade>
+
+- <p align="center"><a href="index.html"><img src="nav-home.gif" border="0"
++ <p align="center"><a href="index.html"><img src="nav-home.png" border="0"
+ alt="[Home]" width="52" height="24"></a> <a
+- href="documentation.html"><img src="nav-docs.gif" border="0"
++ href="documentation.html"><img src="nav-docs.png" border="0"
+ alt="[Documentation]" width="120" height="24"></a> <a
+- href="copyright.html"><img src="nav-copyright.gif" border="0"
++ href="copyright.html"><img src="nav-copyright.png" border="0"
+ alt="[Copyright]" width="86" height="24"></a> <a href="feedback.html"><img
+- src="nav-feedback.gif" border="0" alt="[Feedback]" width="80"
++ src="nav-feedback.png" border="0" alt="[Feedback]" width="80"
+ height="24"></a>
+ </p>
+
diff --git a/graphics/fly/patches/patch-ai b/graphics/fly/patches/patch-ai
new file mode 100644
index 00000000000..0f7674d1b5b
--- /dev/null
+++ b/graphics/fly/patches/patch-ai
@@ -0,0 +1,69 @@
+$NetBSD: patch-ai,v 1.1 1999/08/27 10:11:03 agc Exp $
+
+Update for PNG support
+
+--- doc/index.html 1999/08/27 09:51:38 1.1
++++ doc/index.html 1999/08/27 09:55:43
+@@ -1,13 +1,13 @@
+ <!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"
+- content="fly: a program to create GIF images from within any program.">
++ content="fly: a program to create PNG images from within any program.">
+ <meta name="keywords"
+- content="fly, GIF, creation, images, program">
++ content="fly, PNG, creation, images, program">
+
+ </head>
+ <body bgcolor="#FFFFFF">
+@@ -15,10 +15,10 @@
+ <hr size="2" noshade>
+ <table border="0" width="100%" cellpadding="5" cellspacing="3">
+ <tr align="center" valign="middle">
+- <td><h1>fly: create GIF images on the fly</h1>
++ <td><h1>fly: create PNG images on the fly</h1>
+ </td>
+ <td><a href="http://www.unimelb.edu.au/fly/"><img
+- src="fly-logo.gif" border="0" hspace="5" vspace="5"
++ src="fly-logo.png" border="0" hspace="5" vspace="5"
+ alt=" [fly] " width="157" height="52"></a>
+ </td>
+ </tr>
+@@ -31,11 +31,11 @@
+ </p>
+ <!-- ====================================================================== -->
+ <hr size="1" noshade>
+-<p> <b>fly</b> is a C program that creates GIF images on
++<p> <b>fly</b> is a C program that creates PNG images on
+ the fly from CGI and other programs. Using Thomas Boutell's
+ <a href="http://www.boutell.com/gd/">gd</a> graphics library
+- for fast GIF creation, it provides a command-file interface for
+- creating and modifying GIF images.
++ for fast PNG creation, it provides a command-file interface for
++ creating and modifying PNG images.
+ </p>
+ <p> <strong>Current version: 1.6.5</strong> <em>15th January 1999</em>
+ </p>
+@@ -79,13 +79,13 @@
+ <!-- ===================================================================== -->
+ <hr size="2" noshade>
+
+- <p align="center"><a href="index.html"><img src="nav-home.gif" border="0"
++ <p align="center"><a href="index.html"><img src="nav-home.png" border="0"
+ alt="[Home]" width="52" height="24"></a> <a
+- href="documentation.html"><img src="nav-docs.gif" border="0"
++ href="documentation.html"><img src="nav-docs.png" border="0"
+ alt="[Documentation]" width="120" height="24"></a> <a
+- href="copyright.html"><img src="nav-copyright.gif" border="0"
++ href="copyright.html"><img src="nav-copyright.png" border="0"
+ alt="[Copyright]" width="86" height="24"></a> <a href="feedback.html"><img
+- src="nav-feedback.gif" border="0" alt="[Feedback]" width="80"
++ src="nav-feedback.png" border="0" alt="[Feedback]" width="80"
+ height="24"></a>
+ </p>
+
diff --git a/graphics/fly/patches/patch-aj b/graphics/fly/patches/patch-aj
new file mode 100644
index 00000000000..592882481dc
--- /dev/null
+++ b/graphics/fly/patches/patch-aj
@@ -0,0 +1,51 @@
+$NetBSD: patch-aj,v 1.1 1999/08/27 10:11:03 agc Exp $
+
+Update for PNG support
+
+--- doc/installation.html 1999/08/27 09:51:38 1.1
++++ doc/installation.html 1999/08/27 09:55:47
+@@ -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: Installation</h1>
+ </td>
+ <td><a href="http://www.unimelb.edu.au/fly/"><img
+- src="fly-logo.gif" border="0" hspace="5" vspace="5"
++ src="fly-logo.png" border="0" hspace="5" vspace="5"
+ alt=" [fly] " width="157" height="52"></a>
+ </td>
+ </tr>
+@@ -259,13 +259,13 @@
+ <!-- ===================================================================== -->
+ <hr size="2" noshade>
+
+- <p align="center"><a href="index.html"><img src="nav-home.gif" border="0"
++ <p align="center"><a href="index.html"><img src="nav-home.png" border="0"
+ alt="[Home]" width="52" height="24"></a> <a
+- href="documentation.html"><img src="nav-docs.gif" border="0"
++ href="documentation.html"><img src="nav-docs.png" border="0"
+ alt="[Documentation]" width="120" height="24"></a> <a
+- href="copyright.html"><img src="nav-copyright.gif" border="0"
++ href="copyright.html"><img src="nav-copyright.png" border="0"
+ alt="[Copyright]" width="86" height="24"></a> <a href="feedback.html"><img
+- src="nav-feedback.gif" border="0" alt="[Feedback]" width="80"
++ src="nav-feedback.png" border="0" alt="[Feedback]" width="80"
+ height="24"></a>
+ </p>
+
+@@ -290,7 +290,7 @@
+ </td>
+ <td align="RIGHT">
+ <p> <a href="http://www.unimelb.edu.au/html-check/validation-form.html">
+- <img src="http://www.unimelb.edu.au/images/valid_html.4.0.gif"
++ <img src="http://www.unimelb.edu.au/images/valid_html.4.0.png"
+ alt="HTML 4.0 Checked!" border="0"></a>
+ </p>
+ </td>
diff --git a/graphics/fly/patches/patch-ak b/graphics/fly/patches/patch-ak
new file mode 100644
index 00000000000..8e6e907b5cf
--- /dev/null
+++ b/graphics/fly/patches/patch-ak
@@ -0,0 +1,42 @@
+$NetBSD: patch-ak,v 1.1 1999/08/27 10:11:03 agc Exp $
+
+Update for PNG support
+
+--- doc/outthere.html 1999/08/27 09:51:38 1.1
++++ doc/outthere.html 1999/08/27 09:55:56
+@@ -1,7 +1,7 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <html>
+ <head>
+- <title>GIFs on the fly: Sites using fly
++ <title>PNGs on the fly: Sites using fly
+ </title>
+ <link rev="made" href="mailto:gleeson@unimelb.edu.au">
+ <meta name="description"
+@@ -18,7 +18,7 @@
+ <td><h1>fly: Fly on the web.</h1>
+ </td>
+ <td><a href="http://www.unimelb.edu.au/fly/"><img
+- src="fly-logo.gif" border="0" hspace="5" vspace="5"
++ src="fly-logo.png" border="0" hspace="5" vspace="5"
+ alt=" [fly] " width="157" height="52"></a>
+ </td>
+ </tr>
+@@ -115,13 +115,13 @@
+ <!-- ===================================================================== -->
+ <hr size="2" noshade>
+
+- <p align="center"><a href="index.html"><img src="nav-home.gif" border="0"
++ <p align="center"><a href="index.html"><img src="nav-home.png" border="0"
+ alt="[Home]" width="52" height="24"></a> <a
+- href="documentation.html"><img src="nav-docs.gif" border="0"
++ href="documentation.html"><img src="nav-docs.png" border="0"
+ alt="[Documentation]" width="120" height="24"></a> <a
+- href="copyright.html"><img src="nav-copyright.gif" border="0"
++ href="copyright.html"><img src="nav-copyright.png" border="0"
+ alt="[Copyright]" width="86" height="24"></a> <a href="feedback.html"><img
+- src="nav-feedback.gif" border="0" alt="[Feedback]" width="80"
++ src="nav-feedback.png" border="0" alt="[Feedback]" width="80"
+ height="24"></a>
+ </p>
+
diff --git a/graphics/fly/patches/patch-al b/graphics/fly/patches/patch-al
new file mode 100644
index 00000000000..0ffb2c09814
--- /dev/null
+++ b/graphics/fly/patches/patch-al
@@ -0,0 +1,42 @@
+$NetBSD: patch-al,v 1.1 1999/08/27 10:11:03 agc Exp $
+
+Update for PNG support
+
+--- doc/release-notes.html 1999/08/27 09:51:38 1.1
++++ doc/release-notes.html 1999/08/27 09:56:48
+@@ -1,7 +1,7 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+ <html>
+ <head>
+- <title>GIFs on the fly: Contributors and Release Notes
++ <title>PNGs on the fly: Contributors and Release Notes
+ </title>
+ <link rev="made" href="mailto:gleeson@unimelb.edu.au">
+ <meta name="description"
+@@ -18,7 +18,7 @@
+ <td><h1>fly: Documentation: Contributors and Release Notes</h1>
+ </td>
+ <td><a href="http://www.unimelb.edu.au/fly/"><img
+- src="fly-logo.gif" border="0" hspace="5" vspace="5"
++ src="fly-logo.png" border="0" hspace="5" vspace="5"
+ alt=" [fly] " width="157" height="52"></a>
+ </td>
+ </tr>
+@@ -322,13 +322,13 @@
+ <!-- ===================================================================== -->
+ <hr size="2" noshade>
+
+- <p align="center"><a href="index.html"><img src="nav-home.gif" border="0"
++ <p align="center"><a href="index.html"><img src="nav-home.png" border="0"
+ alt="[Home]" width="52" height="24"></a> <a
+- href="documentation.html"><img src="nav-docs.gif" border="0"
++ href="documentation.html"><img src="nav-docs.png" border="0"
+ alt="[Documentation]" width="120" height="24"></a> <a
+- href="copyright.html"><img src="nav-copyright.gif" border="0"
++ href="copyright.html"><img src="nav-copyright.png" border="0"
+ alt="[Copyright]" width="86" height="24"></a> <a href="feedback.html"><img
+- src="nav-feedback.gif" border="0" alt="[Feedback]" width="80"
++ src="nav-feedback.png" border="0" alt="[Feedback]" width="80"
+ height="24"></a>
+ </p>
+
diff --git a/graphics/fly/pkg/DESCR b/graphics/fly/pkg/DESCR
index b01c93c97b3..558c026c414 100644
--- a/graphics/fly/pkg/DESCR
+++ b/graphics/fly/pkg/DESCR
@@ -1,8 +1,8 @@
DESCRIPTION
- fly is a C program that creates GIF images on the fly from CGI and
+ fly is a C program that creates PNG images on the fly from CGI and
other programs. Using Thomas Boutell's gd graphics library for fast
- GIF creation, it provides a command-file interface for creating and
- modifying GIF images.
+ PNG creation, it provides a command-file interface for creating and
+ modifying PNG images.
AUTHOR
Martin Gleeson, gleeson@unimelb.edu.au.
diff --git a/graphics/fly/pkg/PLIST b/graphics/fly/pkg/PLIST
index 4d423e0380f..de6cb50fbfc 100644
--- a/graphics/fly/pkg/PLIST
+++ b/graphics/fly/pkg/PLIST
@@ -1,11 +1,26 @@
-@comment $NetBSD: PLIST,v 1.1 1998/04/28 15:00:52 bouyer Exp $
+@comment $NetBSD: PLIST,v 1.2 1999/08/27 10:11:03 agc Exp $
bin/fly
-share/doc/fly/example.gif
-share/doc/fly/fly.html
-share/doc/fly/new.gif
-share/doc/fly/valid_html.gif
+share/doc/fly/FAQ.html
+share/doc/fly/copyright.html
+share/doc/fly/documentation.html
+share/doc/fly/example.png
+share/doc/fly/examples.html
+share/doc/fly/feedback.html
+share/doc/fly/fly-logo.png
+share/doc/fly/index.html
+share/doc/fly/installation.html
+share/doc/fly/nav-copyright.png
+share/doc/fly/nav-docs.png
+share/doc/fly/nav-feedback.png
+share/doc/fly/nav-home.png
+share/doc/fly/new.png
+share/doc/fly/outthere.html
+share/doc/fly/release-notes.html
+share/doc/fly/using.html
+share/doc/fly/valid_html.png
share/examples/fly/cgi-perl-example.pl
share/examples/fly/csh.example
+share/examples/fly/fly-tester.pl
share/examples/fly/perl.example
share/examples/fly/size.pl
share/examples/fly/small-end.fly