5 files changed, 74 insertions, 33 deletions

diff --git a/graphics/fly/Makefile b/graphics/fly/Makefile
index d110ced92d5c..7f190010777d 100644
--- a/graphics/fly/Makefile
+++ b/graphics/fly/Makefile
@@ -6,20 +6,30 @@
 #
 
 PORTNAME=	fly
-PORTVERSION=	1.6.5
+PORTVERSION=	2.0.0
 CATEGORIES=	graphics
-MASTER_SITES=	http://members.optushome.com.au/martingleeson/fly/dist/
+MASTER_SITES=	http://members.optushome.com.au/martingleeson/%SUBDIR%/ \
+		http://martin.gleeson.com/%SUBDIR%/
+MASTER_SITE_SUBDIR=	${PORTNAME}/dist
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple drawing language to generate GIFs on the fly
 
-#this doesn't matter.. the program builds its own libgd.a.
-#BUILD_DEPENDS=	${PREFIX}/lib/libgd\.a #can't use ports' gd..
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 
-MAKE_ENV=	PREFIX="${PREFIX}"
-PLIST_FILES=	bin/fly
+do-build:
+	cd ${WRKSRC} && ${CC} ${CFLAGS} -I${LOCALBASE}/include fly.c -o fly \
+		-L${LOCALBASE}/lib -lgd
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/fly ${PREFIX}/bin
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC}/doc && ${FIND} . | \
+		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
+	@${MKDIR} ${EXAMPLESDIR}
+	cd ${WRKSRC}/examples && ${FIND} . | \
+		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/graphics/fly/distinfo b/graphics/fly/distinfo
index f928fca306ca..15540e71e371 100644
--- a/graphics/fly/distinfo
+++ b/graphics/fly/distinfo
@@ -1,2 +1,2 @@
-MD5 (fly-1.6.5.tar.gz) = b96a2a6c566f284923d37f16b64aafec
-SIZE (fly-1.6.5.tar.gz) = 127349
+MD5 (fly-2.0.0.tar.gz) = b5efc8435a76ba2b2c592156ec5db4e2
+SIZE (fly-2.0.0.tar.gz) = 46622
diff --git a/graphics/fly/files/patch-Makefile b/graphics/fly/files/patch-Makefile
deleted file mode 100644
index f756894b3aba..000000000000
--- a/graphics/fly/files/patch-Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.orig	Wed Oct 22 16:52:11 2003
-+++ Makefile	Wed Oct 22 16:53:04 2003
-@@ -5,15 +5,16 @@
- # following line
- #       GD = /path/to/gd/directory
-         GD = gd1.3
--        CC = gcc
--    CFLAGS = -O -I$(GD)
-+        CC ?= cc
-+    CFLAGS ?= -O -pipe
-+    CFLAGS += -I$(GD)
-    #CFLAGS = -O -pedantic -Wall -I$(GD)
-       LIBS = -L$(GD) -lgd -lm
- 
- all: gd fly
- 
- gd: $(GD)
--	cd $(GD); make CC=$(CC)
-+	cd $(GD); make CC="$(CC)" CFLAGS="$(CFLAGS)"
- 
- 
- fly.o: fly.c fly.h
diff --git a/graphics/fly/pkg-descr b/graphics/fly/pkg-descr
index 3c47e2a89c49..d27578d33381 100644
--- a/graphics/fly/pkg-descr
+++ b/graphics/fly/pkg-descr
@@ -1,4 +1,5 @@
-fly is a tool to interpret simple drawing commands and generate
-an GIF as the result.
+fly is a C program that creates PNG, JPEG or GIF images on the fly from
+CGI and other programs. Using GD graphics library for fast image creation,
+it provides a command-file interface for creating and modifying images.
 
-WWW:	http://www.unimelb.edu.au/fly/fly.html
+WWW:	http://martin.gleeson.com/fly/
diff --git a/graphics/fly/pkg-plist b/graphics/fly/pkg-plist
new file mode 100644
index 000000000000..933570e8ca39
--- /dev/null
+++ b/graphics/fly/pkg-plist
@@ -0,0 +1,52 @@
+bin/fly
+%%PORTDOCS%%%%DOCSDIR%%/FAQ.html
+%%PORTDOCS%%%%DOCSDIR%%/copyright.html
+%%PORTDOCS%%%%DOCSDIR%%/documentation.html
+%%PORTDOCS%%%%DOCSDIR%%/example.gif
+%%PORTDOCS%%%%DOCSDIR%%/examples.html
+%%PORTDOCS%%%%DOCSDIR%%/feedback.html
+%%PORTDOCS%%%%DOCSDIR%%/flag-au.gif
+%%PORTDOCS%%%%DOCSDIR%%/flag-jp.gif
+%%PORTDOCS%%%%DOCSDIR%%/flag-us.gif
+%%PORTDOCS%%%%DOCSDIR%%/fly-logo.gif
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/installation.html
+%%PORTDOCS%%%%DOCSDIR%%/nav-copyright.gif
+%%PORTDOCS%%%%DOCSDIR%%/nav-docs.gif
+%%PORTDOCS%%%%DOCSDIR%%/nav-feedback.gif
+%%PORTDOCS%%%%DOCSDIR%%/nav-home.gif
+%%PORTDOCS%%%%DOCSDIR%%/new.gif
+%%PORTDOCS%%%%DOCSDIR%%/outthere.html
+%%PORTDOCS%%%%DOCSDIR%%/release-notes.html
+%%PORTDOCS%%%%DOCSDIR%%/style.css
+%%PORTDOCS%%%%DOCSDIR%%/using.html
+%%PORTDOCS%%%%DOCSDIR%%/valid_html.gif
+%%PORTDOCS%%%%EXAMPLESDIR%%/example.csh
+%%PORTDOCS%%%%EXAMPLESDIR%%/gif/small-end.fly
+%%PORTDOCS%%%%EXAMPLESDIR%%/gif/small.fly
+%%PORTDOCS%%%%EXAMPLESDIR%%/jpeg/small-end.fly
+%%PORTDOCS%%%%EXAMPLESDIR%%/jpeg/small.fly
+%%PORTDOCS%%%%EXAMPLESDIR%%/jpeg/test.fly
+%%PORTDOCS%%%%EXAMPLESDIR%%/perl/cgi-perl-example.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/perl/fly-tester.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/perl/perl.example
+%%PORTDOCS%%%%EXAMPLESDIR%%/perl/size.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/png/1.fly
+%%PORTDOCS%%%%EXAMPLESDIR%%/png/2.fly
+%%PORTDOCS%%%%EXAMPLESDIR%%/png/3.fly
+%%PORTDOCS%%%%EXAMPLESDIR%%/png/4.fly
+%%PORTDOCS%%%%EXAMPLESDIR%%/png/5.fly
+%%PORTDOCS%%%%EXAMPLESDIR%%/png/6.fly
+%%PORTDOCS%%%%EXAMPLESDIR%%/png/7.fly
+%%PORTDOCS%%%%EXAMPLESDIR%%/png/8.fly
+%%PORTDOCS%%%%EXAMPLESDIR%%/png/9.fly
+%%PORTDOCS%%%%EXAMPLESDIR%%/png/small-end.fly
+%%PORTDOCS%%%%EXAMPLESDIR%%/png/small.fly
+%%PORTDOCS%%%%EXAMPLESDIR%%/png/small2.fly
+%%PORTDOCS%%%%EXAMPLESDIR%%/png/test.fly
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/png
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/perl
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/jpeg
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/gif
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%