From 457298be1cc0b27ebbc7d3965ed3f8cd7b56cdf0 Mon Sep 17 00:00:00 2001
From: Martin Wilke <miwi@FreeBSD.org>
Date: Fri, 18 Sep 2009 23:38:53 +0000
Subject: [PATCH] - Update to 2.2.1

PR:		138906
Submitted by:	Anatoly Borodin <anatoly.borodin@gmail.com> (maintainer)
Feature safe: yes
---
 graphics/cfdg/Makefile             |  5 +++--
 graphics/cfdg/distinfo             |  6 +++---
 graphics/cfdg/files/patch-Makefile | 12 ++++++------
 graphics/cfdg/pkg-plist            |  1 -
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/graphics/cfdg/Makefile b/graphics/cfdg/Makefile
index 0c6c412e7ed5..52d09b0a8572 100644
--- a/graphics/cfdg/Makefile
+++ b/graphics/cfdg/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	cfdg
-PORTVERSION=	2.1
+PORTVERSION=	2.2.1
 CATEGORIES=	graphics math
-MASTER_SITES=	http://www.contextfreeart.org/download/
+MASTER_SITES=	http://www.contextfreeart.org/download/ \
+		http://glyphic.s3.amazonaws.com/cfa/download/
 DISTNAME=	ContextFreeSource${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
diff --git a/graphics/cfdg/distinfo b/graphics/cfdg/distinfo
index 175321e3daf7..d51a193b272e 100644
--- a/graphics/cfdg/distinfo
+++ b/graphics/cfdg/distinfo
@@ -1,3 +1,3 @@
-MD5 (ContextFreeSource2.1.tgz) = 477242e74c4f953ceca7bf06e944a46e
-SHA256 (ContextFreeSource2.1.tgz) = 041a67e34292c898890568fe7236eaafd1608d196951bdaccedeb2275ca198b4
-SIZE (ContextFreeSource2.1.tgz) = 1363136
+MD5 (ContextFreeSource2.2.1.tgz) = e9cc2acb195aaa1098781d061e0a4311
+SHA256 (ContextFreeSource2.2.1.tgz) = e4a23cb0f844e1d58cb85ca62c6970cd6c7549d5bccd067b83d611583465c3fd
+SIZE (ContextFreeSource2.2.1.tgz) = 1606247
diff --git a/graphics/cfdg/files/patch-Makefile b/graphics/cfdg/files/patch-Makefile
index 201c9d8ac606..6209228f7ca8 100644
--- a/graphics/cfdg/files/patch-Makefile
+++ b/graphics/cfdg/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2007-04-29 08:51:20.000000000 +0300
-+++ Makefile	2008-03-14 21:17:24.000000000 +0200
-@@ -52,7 +52,7 @@
+--- Makefile.orig
++++ Makefile
+@@ -54,7 +54,7 @@ $(OBJS): $(OBJ_DIR)/Sentry
  # Under Cygwin replace strip $@ with strip $@.exe
  
  cfdg: $(OBJS)
@@ -9,12 +9,12 @@
  	strip $@
  
  
-@@ -103,7 +103,7 @@
+@@ -105,7 +105,7 @@ $(OUTPUT_DIR)/rtest-2k.png: cfdg $(RTEST_CFDG)
  #
  
  CPPFLAGS += $(patsubst %,-I%,$(INC_DIRS))
--CPPFLAGS += -O3
-+CPPFLAGS += `libpng-config --cflags`
+-CPPFLAGS += -O3 -Wall
++CPPFLAGS += -Wall `libpng-config --cflags`
  #CPPFLAGS += -ggdb
  
  $(OBJ_DIR)/%.o : %.cpp
diff --git a/graphics/cfdg/pkg-plist b/graphics/cfdg/pkg-plist
index a899b86dcf65..a6f26a5ba9a6 100644
--- a/graphics/cfdg/pkg-plist
+++ b/graphics/cfdg/pkg-plist
@@ -6,7 +6,6 @@ bin/cfdg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ciliasun.cfdg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo1.cfdg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo2.cfdg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dong.cfdg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/funky_flower.cfdg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/i_curves.cfdg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/i_pix.cfdg