* Modify to support gd-1.7.3.

* Finish transforming references to "gif" to "png".

10 files changed, 224 insertions, 31 deletions

diff --git a/graphics/fly/Makefile b/graphics/fly/Makefile
index 6b74d53662c..91069febb2d 100644
--- a/graphics/fly/Makefile
+++ b/graphics/fly/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1999/08/27 10:11:01 agc Exp $
+# $NetBSD: Makefile,v 1.9 1999/11/01 03:31:45 jlam Exp $
 #
 
 DISTNAME=	fly-1.6.5
@@ -8,19 +8,21 @@ 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.6.3:../../graphics/gd
-BUILD_DEPENDS+=	${LOCALBASE}/bin/giftopnm:../../graphics/netpbm
+BUILD_DEPENDS+=	${LOCALBASE}/bin/gif2png:../../graphics/gif2png
+DEPENDS+=	gd-1.7.3:../../graphics/gd
+
+USE_X11=	yes						# -lXpm
+CPPFLAGS+=	-I${X11BASE}/include -I${X11BASE}/include/X11	# Xpm.h
+CPPFLAGS+=	-I${LOCALBASE}/include				# gd.h
+MAKE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 
 do-install:
-	${MKDIR} ${PREFIX}/share/doc/fly
-	${MKDIR} ${PREFIX}/share/examples/fly
 	${INSTALL_PROGRAM} ${WRKSRC}/fly ${PREFIX}/bin
-	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
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fly
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/fly
+	cd ${WRKSRC}/doc; ${LOCALBASE}/bin/gif2png *.gif
+	cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html *.png ${PREFIX}/share/doc/fly
+	${RM} -f ${WRKSRC}/examples/*.orig
+	cd ${WRKSRC}/examples; ${INSTALL_DATA} * ${PREFIX}/share/examples/fly
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/fly/files/patch-sum b/graphics/fly/files/patch-sum
index 154e90a8452..2d8f15b145a 100644
--- a/graphics/fly/files/patch-sum
+++ b/graphics/fly/files/patch-sum
@@ -1,8 +1,8 @@
-$NetBSD: patch-sum,v 1.2 1999/08/27 10:11:02 agc Exp $
+$NetBSD: patch-sum,v 1.3 1999/11/01 03:31:46 jlam Exp $
 
-MD5 (patch-aa) = 966da124ced973f610d36d942384e0dc
+MD5 (patch-aa) = d269dceb3a2e078b66a203d3ebf488cd
 MD5 (patch-ab) = 62365d599cbb86dd58769285b4308d0f
-MD5 (patch-ac) = 6922a532224cd5f804c5b4818d42f841
+MD5 (patch-ac) = e894d3bffe88452e15eee62d6c1664a5
 MD5 (patch-ad) = 070a9a40290714c5afdc0db57c1f4cc3
 MD5 (patch-ae) = 8dce4c6a996a8ab69e37a843fbf95128
 MD5 (patch-af) = 4e64d4e3eff18cd2346e834e9e09d537
@@ -12,3 +12,8 @@ MD5 (patch-ai) = bfb20ff05c062f8c51b0a34e30bd16f5
 MD5 (patch-aj) = f2370cc89b6c4b097da2ab2baed114a5
 MD5 (patch-ak) = 0eec9fefeff540962470ad19b0d7e112
 MD5 (patch-al) = a22854407c5b72e0db4fa0a110d26266
+MD5 (patch-am) = 8d44479b33535c581e796eb6207a7a83
+MD5 (patch-an) = 956d2b089dd1a72751de7a76533d2ab2
+MD5 (patch-ao) = ff2141607527c29cd047d081cd9f0b5e
+MD5 (patch-ap) = 82971dee8618cba097dc77ba063f2afc
+MD5 (patch-aq) = bc6b84b4ce60cdfae8f9eefb81346aa4
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 &quot;tile&quot;
               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
diff --git a/graphics/fly/pkg/COMMENT b/graphics/fly/pkg/COMMENT
index 4cfbb503d87..50195ea4726 100644
--- a/graphics/fly/pkg/COMMENT
+++ b/graphics/fly/pkg/COMMENT
@@ -1 +1 @@
-A command-file interface for creating and modifying PNG images.
+command-file interface for creating and modifying PNG images