- Update to 2.1.10.

PR:		ports/87309
Submitted by:	maintainer

4 files changed, 7 insertions, 83 deletions

diff --git a/print/ft2demos/Makefile b/print/ft2demos/Makefile
index 0bc7ca538448..2c863176c693 100644
--- a/print/ft2demos/Makefile
+++ b/print/ft2demos/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ft2demos
-PORTVERSION=	2.1.9
+PORTVERSION=	2.1.10
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,freetype,} \
 		http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/%SUBDIR%/ \
@@ -31,7 +31,7 @@ MAKE_ENV=	TOP_DIR="${FREETYPE_WRKSRC}"
 
 FREETYPE_WRKSRC!=	cd ${PORTSDIR}/print/freetype2; ${MAKE} -V WRKSRC
 
-FT_PROGRAMS=	ftbench ftdump ftlint ftmemchk ftmulti ftstring fttimer ftview testname
+FT_PROGRAMS=	ftbench ftchkwd ftdump ftgamma ftlint ftmemchk ftmulti ftstring fttimer ftvalid ftview testname
 
 do-install:
 	@(cd ${WRKSRC}/bin/.libs/; ${INSTALL_PROGRAM} ${FT_PROGRAMS} ${PREFIX}/bin)
diff --git a/print/ft2demos/distinfo b/print/ft2demos/distinfo
index 72b5588e8f74..216209581452 100644
--- a/print/ft2demos/distinfo
+++ b/print/ft2demos/distinfo
@@ -1,2 +1,2 @@
-MD5 (ft2demos-2.1.9.tar.bz2) = 43ca06d7a926d07db4bbb1885c4a2971
-SIZE (ft2demos-2.1.9.tar.bz2) = 117382
+MD5 (ft2demos-2.1.10.tar.bz2) = 4edaff5721fedcf1932e76935f3029b3
+SIZE (ft2demos-2.1.10.tar.bz2) = 122842
diff --git a/print/ft2demos/files/patch-Makefile b/print/ft2demos/files/patch-Makefile
deleted file mode 100644
index 4b601eba8955..000000000000
--- a/print/ft2demos/files/patch-Makefile
+++ /dev/null
@@ -1,79 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.orig
-+++ Makefile
-@@ -322,50 +322,50 @@
-   # overridden by system-specific things.
-   #
-   $(BIN_DIR)/ftlint$E: $(OBJ_DIR)/ftlint.$(SO) $(FTLIB) $(COMMON_OBJ)
--	  $(COMMON_LINK)
-+	  $(COMMON_LINK) $(MATH)
- 
-   $(BIN_DIR)/ftbench$E: $(OBJ_DIR)/ftbench.$(SO) $(FTLIB) $(COMMON_OBJ)
--	  $(COMMON_LINK)
-+	  $(COMMON_LINK) $(MATH)
- 
-   $(BIN_DIR)/ftchkwd$E: $(OBJ_DIR)/ftchkwd.$(SO) $(FTLIB) $(COMMON_OBJ)
--	  $(COMMON_LINK)
-+	  $(COMMON_LINK) $(MATH)
- 
-   $(BIN_DIR)/ftmemchk$E: $(OBJ_DIR)/ftmemchk.$(SO) $(FTLIB) $(COMMON_OBJ)
--	  $(COMMON_LINK)
-+	  $(COMMON_LINK) $(MATH)
- 
-   $(BIN_DIR)/compos$E: $(OBJ_DIR)/compos.$(SO) $(FTLIB) $(COMMON_OBJ)
--	  $(COMMON_LINK)
-+	  $(COMMON_LINK) $(MATH)
- 
-   $(BIN_DIR)/ftdump$E: $(OBJ_DIR)/ftdump.$(SO) $(FTLIB)
--	  $(COMMON_LINK)
-+	  $(COMMON_LINK) $(MATH)
- 
-   $(BIN_DIR)/fttry$E: $(OBJ_DIR)/fttry.$(SO) $(FTLIB)
--	  $(LINK)
-+	  $(LINK) $(MATH)
- 
-   $(BIN_DIR)/ftsbit$E: $(OBJ_DIR)/ftsbit.$(SO) $(FTLIB)
--	  $(LINK)
-+	  $(LINK) $(MATH)
- 
-   $(BIN_DIR)/t1dump$E: $(OBJ_DIR)/t1dump.$(SO) $(FTLIB)
--	  $(LINK)
-+	  $(LINK) $(MATH)
- 
-   $(BIN_DIR)/ttdebug$E: $(OBJ_DIR)/ttdebug.$(SO) $(FTLIB)
--	  $(LINK)
-+	  $(LINK) $(MATH)
- 
-   $(BIN_DIR)/testname$E: $(OBJ_DIR)/testname.$(SO) $(FTLIB)
--	  $(LINK)
-+	  $(LINK) $(MATH)
- 
- 
-   $(BIN_DIR)/ftview$E: $(OBJ_DIR)/ftview.$(SO) $(FTLIB) \
-                        $(GRAPH_LIB) $(COMMON_OBJ)
--	  $(GRAPH_LINK)
-+	  $(GRAPH_LINK) $(MATH)
- 
-   $(BIN_DIR)/ftgamma$E: $(OBJ_DIR)/ftgamma.$(SO) $(FTLIB) \
-                        $(GRAPH_LIB) $(COMMON_OBJ)
--	  $(GRAPH_LINK)
-+	  $(GRAPH_LINK) $(MATH)
- 
-   $(BIN_DIR)/ftmulti$E: $(OBJ_DIR)/ftmulti.$(SO) $(FTLIB) \
-                         $(GRAPH_LIB) $(COMMON_OBJ)
--	  $(GRAPH_LINK)
-+	  $(GRAPH_LINK) $(MATH)
- 
-   $(BIN_DIR)/ftstring$E: $(OBJ_DIR)/ftstring.$(SO) $(FTLIB) \
-                          $(GRAPH_LIB) $(COMMON_OBJ)
-@@ -373,7 +373,7 @@
- 
-   $(BIN_DIR)/fttimer$E: $(OBJ_DIR)/fttimer.$(SO) $(FTLIB) \
-                         $(GRAPH_LIB) $(COMMON_OBJ)
--	  $(GRAPH_LINK)
-+	  $(GRAPH_LINK) $(MATH)
- 
- 
- endif
diff --git a/print/ft2demos/pkg-plist b/print/ft2demos/pkg-plist
index fedf568394f1..5d0bd211674b 100644
--- a/print/ft2demos/pkg-plist
+++ b/print/ft2demos/pkg-plist
@@ -1,9 +1,12 @@
 bin/ftbench
+bin/ftchkwd
 bin/ftdump
+bin/ftgamma
 bin/ftlint
 bin/ftmemchk
 bin/ftmulti
 bin/ftstring
 bin/fttimer
+bin/ftvalid
 bin/ftview
 bin/testname