diff --git a/editors/ted/Makefile b/editors/ted/Makefile
index 48893e44745b..51918d040df0 100644
--- a/editors/ted/Makefile
+++ b/editors/ted/Makefile
@@ -1,79 +1,82 @@
 PORTNAME=	ted
 DISTVERSION=	2.23
 PORTREVISION=	9
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
 		https://ftp.nluug.nl/pub/editors/ted/
 PKGNAMESUFFIX=	${${FLAVOR} == motif:?:-${FLAVOR}}
 EXTRACT_SUFX=	.src.tar.gz
 
 MAINTAINER=	mce@FreeBSD.org
 COMMENT=	X11 based RTF editor
 WWW=		https://www.nllgg.nl/Ted/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/gpl.txt
 
-LIB_DEPENDS=	libpcre.so:devel/pcre \
-		libfontconfig.so:x11-fonts/fontconfig \
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
+		libpaper.so:print/libpaper \
+		libpcre.so:devel/pcre \
 		libpng.so:graphics/png \
-		libtiff.so:graphics/tiff \
-		libpaper.so:print/libpaper
+		libtiff.so:graphics/tiff
 RUN_DEPENDS=	gsfonts>0:print/gsfonts
 
 FLAVORS=	motif gtk2
 FLAVOR?=	${FLAVORS:[1]}
 
-WRKSRC=		${WRKDIR}/Ted-${PORTVERSION}
-
 USES=		ghostscript:x11,run iconv jpeg pkgconfig xorg \
 		${${FLAVOR} == motif:?motif:gnome}
 USE_GNOME=	${${FLAVOR} == motif:?:gtk20}
 USE_XORG=	ice sm x11 xext xft xmu xorgproto xpm xt
+
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--datadir=${PREFIX}/share \
+		--with-${${FLAVOR} == motif:?MOTIF:GTK}
+
 MAKE_ENV=	DEF_AFMDIR="-DAFMDIR=\"\\\"${AFMDIR}/\\\"\"" \
-		DEF_INDDIR="-DINDDIR=\"\\\"${INDDIR}/\\\"\"" \
 		DEF_DOCUMENT_DIR="-DDOCUMENT_DIR=\"\\\"${DOCSDIR}/\\\"\"" \
+		DEF_INDDIR="-DINDDIR=\"\\\"${INDDIR}/\\\"\"" \
 		DEF_PSSCRIPT_DIR="-DPSSCRIPT_DIR=\"\\\"${DATADIR}/\\\"\""
 ALL_TARGET=	compile.shared
-CONFIGURE_ARGS=	--datadir=${PREFIX}/share \
-		--with-${${FLAVOR} == motif:?MOTIF:GTK}
 
 CONFLICTS_INSTALL=	${PORTNAME}${${FLAVOR} == motif:?-gtk2:}
 
 DATADIR=	${PREFIX}/share/Ted
 DOCSDIR=	${PREFIX}/share/doc/Ted
 
+WRKSRC=		${WRKDIR}/Ted-${DISTVERSION}
+
 AFMDIR=		${DATADIR}/afm
 INDDIR=		${DATADIR}/dfa
 
 .include <bsd.port.pre.mk>
 
 post-extract:
 	@cd ${WRKSRC}/tedPackage && ${TAR} xf TedDatadir.tar
 	@${INSTALL_SCRIPT} ${FILESDIR}/configure ${WRKSRC}
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "configure" -print0 | ${XARGS} -0 \
 		${REINPLACE_CMD} -e \
 		's|/usr/X11R6|${LOCALBASE}|g ; \
 		 s|/usr/local|${LOCALBASE}|g ; \
 		 /paper.h/s|/usr/include|${LOCALBASE}/include|g ; \
 		 /paper.h/s|/usr/lib|${LOCALBASE}/lib|g'
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/Ted/Ted ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/tedPackage/examples/rtf2*.sh ${STAGEDIR}${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/tedPackage/doc/Ted.1 ${STAGEDIR}${PREFIX}/share/man/man1
-	${INSTALL_MAN} ${WRKSRC}/tedPackage/doc/rtf2*.1 ${STAGEDIR}${PREFIX}/share/man/man1
-	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/tedPackage/examples/rtf2*.sh \
+		${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_MAN} ${WRKSRC}/tedPackage/doc/Ted.1 \
+		${WRKSRC}/tedPackage/doc/rtf2*.1 \
+		${STAGEDIR}${PREFIX}/share/man/man1
+	@${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${AFMDIR} \
+		${STAGEDIR}${INDDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/tedPackage/ps/*.ps ${STAGEDIR}${DATADIR}
-	@${MKDIR} ${STAGEDIR}${AFMDIR}
 	${INSTALL_DATA} ${WRKSRC}/tedPackage/afm/*.afm ${STAGEDIR}${AFMDIR}
-	@${MKDIR} ${STAGEDIR}${INDDIR}
 	${INSTALL_DATA} ${WRKSRC}/tedPackage/dfa/*.dfa ${STAGEDIR}${INDDIR}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/tedPackage/TedDocument-en_US.rtf ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/tedPackage/TedDocument-en_US.rtf \
+		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/editors/ted/files/patch-Ted__makefile.in b/editors/ted/files/patch-Ted__makefile.in
index 16bd6b445d50..01830c695ec7 100644
--- a/editors/ted/files/patch-Ted__makefile.in
+++ b/editors/ted/files/patch-Ted__makefile.in
@@ -1,12 +1,12 @@
---- Ted/makefile.in.orig	2012-04-01 18:57:26.000000000 +0900
-+++ Ted/makefile.in	2012-04-09 20:45:17.000000000 +0900
-@@ -57,7 +57,8 @@
+--- Ted/makefile.in.orig	2013-02-01 12:11:08 UTC
++++ Ted/makefile.in
+@@ -57,7 +57,8 @@ INCLUDES=			\
  	-I../bitmap		\
  	-I../ind		\
  	-I../include		\
 -	$(DEF_PKGDIR)
 +	$(DEF_DOCUMENT_DIR)	\
 +	$(DEF_PSSCRIPT_DIR)
  
  CFLAGS=			\
  	@CFLAGS@	\
diff --git a/editors/ted/files/patch-appFrame_appFontConfig.c b/editors/ted/files/patch-appFrame_appFontConfig.c
index 4e7979331e33..aa94b2836974 100644
--- a/editors/ted/files/patch-appFrame_appFontConfig.c
+++ b/editors/ted/files/patch-appFrame_appFontConfig.c
@@ -1,11 +1,11 @@
---- appFrame/appFontConfig.c.orig	2013-12-13 10:45:38.000000000 +0100
-+++ appFrame/appFontConfig.c	2013-12-13 10:46:24.000000000 +0100
-@@ -889,7 +889,7 @@
+--- appFrame/appFontConfig.c.orig	2013-02-01 12:11:08 UTC
++++ appFrame/appFontConfig.c
+@@ -889,7 +889,7 @@ static const char * appFtErrorStr( int e )
  
      static const n2s xftn2s[]=
      {
 -#   include <freetype/fterrdef.h>
 +#   include FT_ERROR_DEFINITIONS_H
      };
  
      for ( i= 0; i < sizeof(xftn2s)/sizeof(n2s); i++ )
diff --git a/editors/ted/files/patch-appUtil-utilPrinter.c b/editors/ted/files/patch-appUtil-utilPrinter.c
deleted file mode 100644
index a12fdaad8dee..000000000000
--- a/editors/ted/files/patch-appUtil-utilPrinter.c
+++ /dev/null
@@ -1,18 +0,0 @@
- --- appUtil/utilPrinter.c	Sun Aug 17 19:14:01 2003
- +++ appUtil/utilPrinter.c	Sun Aug 17 19:15:54 2003
- @@ -331,14 +331,14 @@
-      /*  1  */
-      if  ( count == 0 )
-  	{
- -	utilPrinterGetLprPrinters(  "( lpc status ) 2>/dev/null",
- +	utilPrinterGetLprPrinters(  "( lpc status all) 2>/dev/null",
-  						&defaultPrinter, &count, &pd );
-  	}
-  
-      /*  1b  */
-      if  ( count == 0 )
-  	{
- -	utilPrinterGetLprPrinters(  "( /usr/sbin/lpc status ) 2>/dev/null",
- +	utilPrinterGetLprPrinters(  "( /usr/sbin/lpc status all) 2>/dev/null",
-  						&defaultPrinter, &count, &pd );
-  	}
diff --git a/editors/ted/files/patch-appUtil_utilPrinter.c b/editors/ted/files/patch-appUtil_utilPrinter.c
new file mode 100644
index 000000000000..690b52fad469
--- /dev/null
+++ b/editors/ted/files/patch-appUtil_utilPrinter.c
@@ -0,0 +1,19 @@
+--- appUtil/utilPrinter.c.orig	2013-02-01 12:11:08 UTC
++++ appUtil/utilPrinter.c
+@@ -331,14 +331,14 @@ int utilPrinterGetPrinters(	int *			pPrinterCount,
+     /*  1  */
+     if  ( count == 0 )
+ 	{
+-	utilPrinterGetLprPrinters(  "( lpc status ) 2>/dev/null",
++	utilPrinterGetLprPrinters(  "( lpc status all) 2>/dev/null",
+ 						&defaultPrinter, &count, &pd );
+ 	}
+ 
+     /*  1b  */
+     if  ( count == 0 )
+ 	{
+-	utilPrinterGetLprPrinters(  "( /usr/sbin/lpc status ) 2>/dev/null",
++	utilPrinterGetLprPrinters(  "( /usr/sbin/lpc status all) 2>/dev/null",
+ 						&defaultPrinter, &count, &pd );
+ 	}
+ 
diff --git a/editors/ted/files/patch-textEncoding-sioIconv.c b/editors/ted/files/patch-textEncoding_sioIconv.c
similarity index 100%
rename from editors/ted/files/patch-textEncoding-sioIconv.c
rename to editors/ted/files/patch-textEncoding_sioIconv.c