Update to 2.2.2

PR:		ports/158005
Submitted by:	Anatoly Borodin <anatoly.borodin@gmail.com> (maintainer)
Approved by:	bapt (mentor)

4 files changed, 20 insertions, 46 deletions

diff --git a/graphics/cfdg/Makefile b/graphics/cfdg/Makefile
index 73cc2d73e2ea..ece1ef6728e7 100644
--- a/graphics/cfdg/Makefile
+++ b/graphics/cfdg/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	cfdg
-PORTVERSION=	2.2.1
-PORTREVISION=	1
+PORTVERSION=	2.2.2
 CATEGORIES=	graphics math
 MASTER_SITES=	http://www.contextfreeart.org/download/ \
 		http://glyphic.s3.amazonaws.com/cfa/download/
@@ -19,11 +18,21 @@ COMMENT=	Context Free Design Grammar compiler
 
 LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
 
-USE_BISON=	build
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+WRKSRC=		${WRKDIR}/${DISTNAME}${EXTRACT_SUFX}
+
 USE_GMAKE=	yes
 
 NO_INSTALL_MANPAGES=	yes
 
+PLIST_FILES=	bin/cfdg
+
+.if !defined(NOPORTEXAMPLES)
+PORTEXAMPLES=	*
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cfdg ${PREFIX}/bin
 .if !defined(NOPORTEXAMPLES)
diff --git a/graphics/cfdg/distinfo b/graphics/cfdg/distinfo
index d51a193b272e..426dc506e36f 100644
--- a/graphics/cfdg/distinfo
+++ b/graphics/cfdg/distinfo
@@ -1,3 +1,2 @@
-MD5 (ContextFreeSource2.2.1.tgz) = e9cc2acb195aaa1098781d061e0a4311
-SHA256 (ContextFreeSource2.2.1.tgz) = e4a23cb0f844e1d58cb85ca62c6970cd6c7549d5bccd067b83d611583465c3fd
-SIZE (ContextFreeSource2.2.1.tgz) = 1606247
+SHA256 (ContextFreeSource2.2.2.tgz) = 2524726ee9a5df7c7dd4ce31364fad8fe2fcad930e0d88af5cf2c6148017705e
+SIZE (ContextFreeSource2.2.2.tgz) = 1635320
diff --git a/graphics/cfdg/files/patch-Makefile b/graphics/cfdg/files/patch-Makefile
index 6209228f7ca8..b232448bbaed 100644
--- a/graphics/cfdg/files/patch-Makefile
+++ b/graphics/cfdg/files/patch-Makefile
@@ -1,20 +1,20 @@
---- Makefile.orig
-+++ Makefile
-@@ -54,7 +54,7 @@ $(OBJS): $(OBJ_DIR)/Sentry
+--- ./Makefile.orig	2010-09-13 06:15:25.000000000 +0200
++++ ./Makefile	2011-06-18 21:42:16.000000000 +0200
+@@ -54,7 +54,7 @@
  # Under Cygwin replace strip $@ with strip $@.exe
  
  cfdg: $(OBJS)
 -	$(LINK.o) $^ -L/usr/local/lib -lstdc++ -lpng -lz -fexceptions -o $@
-+	$(LINK.o) $^ `libpng-config --ldflags` -lstdc++ -fexceptions -o $@
++	$(LINK.o) $^ $(shell libpng-config --ldflags) -lstdc++ -fexceptions -o $@
  	strip $@
  
  
-@@ -105,7 +105,7 @@ $(OUTPUT_DIR)/rtest-2k.png: cfdg $(RTEST_CFDG)
+@@ -105,7 +105,7 @@
  #
  
  CPPFLAGS += $(patsubst %,-I%,$(INC_DIRS))
 -CPPFLAGS += -O3 -Wall
-+CPPFLAGS += -Wall `libpng-config --cflags`
++CPPFLAGS += -O3 -Wall $(shell libpng-config --cflags)
  #CPPFLAGS += -ggdb
  
  $(OBJ_DIR)/%.o : %.cpp
diff --git a/graphics/cfdg/pkg-plist b/graphics/cfdg/pkg-plist
deleted file mode 100644
index a6f26a5ba9a6..000000000000
--- a/graphics/cfdg/pkg-plist
+++ /dev/null
@@ -1,34 +0,0 @@
-bin/cfdg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/aliastest.cfdg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alphabet.cfdg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/chanukah.cfdg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cilia.cfdg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ciliasun.cfdg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo1.cfdg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo2.cfdg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/funky_flower.cfdg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i_curves.cfdg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i_pix.cfdg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i_polygons.cfdg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lesson.cfdg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lesson2.cfdg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/line_ending_tests.tgz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mtree.cfdg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/octopi.cfdg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/point.cfdg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/quadcity.cfdg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rendering-tests.cfdg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rose.cfdg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sierpinski.cfdg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/snowflake.cfdg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tangle.cfdg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/thingy.cfdg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/thorns.cfdg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tree_number_5.cfdg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/triples.cfdg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/underground.cfdg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/weighting_demo.cfdg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/welcome.cfdg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xmas.cfdg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ziggy.cfdg
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%