diff --git a/editors/ted/Makefile b/editors/ted/Makefile
index 2e0ba94f53e4..48893e44745b 100644
--- a/editors/ted/Makefile
+++ b/editors/ted/Makefile
@@ -1,82 +1,79 @@
 PORTNAME=	ted
-PORTVERSION=	2.23
-PORTREVISION=	8
+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=	ports@FreeBSD.org
+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 \
 		libfreetype.so:print/freetype2 \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff \
 		libpaper.so:print/libpaper
 RUN_DEPENDS=	gsfonts>0:print/gsfonts
 
+FLAVORS=	motif gtk2
+FLAVOR?=	${FLAVORS:[1]}
+
 WRKSRC=		${WRKDIR}/Ted-${PORTVERSION}
 
-USES=		ghostscript:x11,run iconv jpeg pkgconfig xorg
+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
 MAKE_ENV=	DEF_AFMDIR="-DAFMDIR=\"\\\"${AFMDIR}/\\\"\"" \
 		DEF_INDDIR="-DINDDIR=\"\\\"${INDDIR}/\\\"\"" \
 		DEF_DOCUMENT_DIR="-DDOCUMENT_DIR=\"\\\"${DOCSDIR}/\\\"\"" \
 		DEF_PSSCRIPT_DIR="-DPSSCRIPT_DIR=\"\\\"${DATADIR}/\\\"\""
 ALL_TARGET=	compile.shared
 CONFIGURE_ARGS=	--datadir=${PREFIX}/share \
-		ac_iconv_includes=${LOCALBASE}/include
+		--with-${${FLAVOR} == motif:?MOTIF:GTK}
+
+CONFLICTS_INSTALL=	${PORTNAME}${${FLAVOR} == motif:?-gtk2:}
 
 DATADIR=	${PREFIX}/share/Ted
 DOCSDIR=	${PREFIX}/share/doc/Ted
 
 AFMDIR=		${DATADIR}/afm
 INDDIR=		${DATADIR}/dfa
 
-OPTIONS_DEFINE=	GTK2 DOCS
-GTK2_DESC=	Use GTK2 instead of MOTIF
-GTK2_USES=	gnome
-GTK2_USE=		GNOME=gtk20
-GTK2_CONFIGURE_ON=	--with-GTK
-GTK2_CPPFLAGS=		`pkg-config --cflags gtk+-2.0 | ${SED} -e 's|-I|-isystem |g'`
-GTK2_USES_OFF=		motif
-GTK2_CONFIGURE_OFF=	--with-MOTIF
-
 .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_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}
-
-do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/tedPackage/TedDocument-en_US.rtf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/editors/ted/pkg-plist b/editors/ted/pkg-plist
index c7741a320052..cc628bbfe990 100644
--- a/editors/ted/pkg-plist
+++ b/editors/ted/pkg-plist
@@ -1,49 +1,49 @@
 bin/Ted
 bin/rtf2epub.sh
 bin/rtf2html.sh
 bin/rtf2pdf.sh
 bin/rtf2ps.sh
 bin/rtf2txt.sh
 share/man/man1/Ted.1.gz
 share/man/man1/rtf2pdf.1.gz
 share/man/man1/rtf2ps.1.gz
 %%DATADIR%%/afm/AvantGarde-Book.afm
 %%DATADIR%%/afm/AvantGarde-BookOblique.afm
 %%DATADIR%%/afm/AvantGarde-Demi.afm
 %%DATADIR%%/afm/AvantGarde-DemiOblique.afm
 %%DATADIR%%/afm/Bookman-Demi.afm
 %%DATADIR%%/afm/Bookman-DemiItalic.afm
 %%DATADIR%%/afm/Bookman-Light.afm
 %%DATADIR%%/afm/Bookman-LightItalic.afm
 %%DATADIR%%/afm/Courier-Bold.afm
 %%DATADIR%%/afm/Courier-BoldOblique.afm
 %%DATADIR%%/afm/Courier-Oblique.afm
 %%DATADIR%%/afm/Courier.afm
 %%DATADIR%%/afm/Helvetica-Bold.afm
 %%DATADIR%%/afm/Helvetica-BoldOblique.afm
 %%DATADIR%%/afm/Helvetica-Narrow-Bold.afm
 %%DATADIR%%/afm/Helvetica-Narrow-BoldOblique.afm
 %%DATADIR%%/afm/Helvetica-Narrow-Oblique.afm
 %%DATADIR%%/afm/Helvetica-Narrow.afm
 %%DATADIR%%/afm/Helvetica-Oblique.afm
 %%DATADIR%%/afm/Helvetica.afm
 %%DATADIR%%/afm/NewCenturySchlbk-Bold.afm
 %%DATADIR%%/afm/NewCenturySchlbk-BoldItalic.afm
 %%DATADIR%%/afm/NewCenturySchlbk-Italic.afm
 %%DATADIR%%/afm/NewCenturySchlbk-Roman.afm
 %%DATADIR%%/afm/Palatino-Bold.afm
 %%DATADIR%%/afm/Palatino-BoldItalic.afm
 %%DATADIR%%/afm/Palatino-Italic.afm
 %%DATADIR%%/afm/Palatino-Roman.afm
 %%DATADIR%%/afm/Symbol.afm
 %%DATADIR%%/afm/Times-Bold.afm
 %%DATADIR%%/afm/Times-BoldItalic.afm
 %%DATADIR%%/afm/Times-Italic.afm
 %%DATADIR%%/afm/Times-Roman.afm
 %%DATADIR%%/afm/ZapfChancery-MediumItalic.afm
 %%DATADIR%%/afm/ZapfDingbats.afm
 %%DATADIR%%/dfa/en_US.dfa
 %%DATADIR%%/gsfontmetrics.ps
 %%DATADIR%%/gslibpath.ps
 %%DATADIR%%/gslsfonts.ps
-%%PORTDOCS%%%%DOCSDIR%%/TedDocument-en_US.rtf
+%%DOCSDIR%%/TedDocument-en_US.rtf