diff -urN /usr/ports/editors/ted/Makefile editors/ted/Makefile
--- /usr/ports/editors/ted/Makefile	2012-02-15 01:57:20.000000000 +0900
+++ editors/ted/Makefile	2012-04-09 22:15:47.000000000 +0900
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ted
-PORTVERSION=	2.21
-PORTREVISION=	4
+PORTVERSION=	2.22
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/
 EXTRACT_SUFX=	.src.tar.gz
@@ -15,24 +14,28 @@
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X11 based RTF editor
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	pcre.1:${PORTSDIR}/devel/pcre \
 		png.6:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff
+		tiff.4:${PORTSDIR}/graphics/tiff \
+		paper.2:${PORTSDIR}/print/libpaper
 RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts
 
+OPTIONS=	GTK "Use Gtk+ user intarface" off
+
 WRKSRC=		${WRKDIR}/Ted-${PORTVERSION}
 
-USE_MOTIF=	yes
 USE_XORG=	xext xft
 USE_ICONV=	yes
 USE_GHOSTSCRIPT_RUN=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-MOTIF
 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
+MAKE_JOBS_SAFE=	yes
 
 MAN1=		Ted.1 rtf2pdf.1 rtf2ps.1
 
@@ -42,6 +45,16 @@
 AFMDIR=		${DATADIR}/afm
 INDDIR=		${DATADIR}/dfa
 
+.include <bsd.port.options.mk>
+
+.if defined(WITH_GTK)
+USE_GNOME=	gtk20
+CONFIGURE_ARGS+=--with-GTK
+.else
+USE_MOTIF=	yes
+CONFIGURE_ARGS+=--with-MOTIF
+.endif
+
 post-extract:
 	@cd ${WRKSRC}/tedPackage && ${TAR} xf TedBindist.tar
 	@${INSTALL_SCRIPT} ${FILESDIR}/configure ${WRKSRC}
@@ -51,9 +64,9 @@
 		${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 ; \
 		 s|/iconv.so|/libiconv.so|g'
-	@${REINPLACE_CMD} -e \
-		's|<malloc\.h>|<stdlib.h>|g' ${WRKSRC}/appUtil/csvsheet.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/Ted/Ted ${PREFIX}/bin
diff -urN /usr/ports/editors/ted/distinfo editors/ted/distinfo
--- /usr/ports/editors/ted/distinfo	2011-03-21 02:44:07.000000000 +0900
+++ editors/ted/distinfo	2012-04-09 13:09:41.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (ted-2.21.src.tar.gz) = 6c4bdebb8980fac00cf71ebc6c5f9bddee8ae13ab2327125dda95aa6948b363a
-SIZE (ted-2.21.src.tar.gz) = 3956815
+SHA256 (ted-2.22.src.tar.gz) = 93040d5ff259dbf7707a97f8c1ab4a7c1ec8adae63d35760e20dd6f60520fa4a
+SIZE (ted-2.22.src.tar.gz) = 4267772
diff -urN /usr/ports/editors/ted/files/patch-Ted__makefile.in editors/ted/files/patch-Ted__makefile.in
--- /usr/ports/editors/ted/files/patch-Ted__makefile.in	2009-07-05 05:54:37.000000000 +0900
+++ editors/ted/files/patch-Ted__makefile.in	2012-04-09 20:45:41.000000000 +0900
@@ -1,9 +1,9 @@
---- Ted/makefile.in.orig	2009-06-10 14:41:19.000000000 +0900
-+++ Ted/makefile.in	2009-06-26 01:00:56.000000000 +0900
-@@ -42,7 +42,8 @@
- 	-I../bitmap	\
- 	-I../ind	\
- 	-I../include	\
+--- Ted/makefile.in.orig	2012-04-01 18:57:26.000000000 +0900
++++ Ted/makefile.in	2012-04-09 20:45:17.000000000 +0900
+@@ -56,7 +56,8 @@
+ 	-I../bitmap		\
+ 	-I../ind		\
+ 	-I../include		\
 -	$(DEF_PKGDIR)
 +	$(DEF_DOCUMENT_DIR)	\
 +	$(DEF_PSSCRIPT_DIR)
diff -urN /usr/ports/editors/ted/files/patch-bitmap-bmpng.c editors/ted/files/patch-bitmap-bmpng.c
--- /usr/ports/editors/ted/files/patch-bitmap-bmpng.c	2010-03-30 04:22:20.000000000 +0900
+++ editors/ted/files/patch-bitmap-bmpng.c	1970-01-01 09:00:00.000000000 +0900
@@ -1,10 +0,0 @@
---- bitmap/bmpng.c.orig	2009-10-16 17:20:57.000000000 +0200
-+++ bitmap/bmpng.c	2010-03-29 21:20:37.000000000 +0200
-@@ -284,7 +284,6 @@
- 				png_info *			pngi,
- 				const BitmapDescription *       bd )
-     {
--    png_info_init( pngi );
-     pngi->width= bd->bdPixelsWide;
-     pngi->height= bd->bdPixelsHigh;
-