5 files changed, 24 insertions, 27 deletions

diff --git a/editors/ted/Makefile b/editors/ted/Makefile
index e31ee923ef9f..3e5ae63fd5d0 100644
--- a/editors/ted/Makefile
+++ b/editors/ted/Makefile
@@ -1,29 +1,26 @@
-# Ports collection makefile for:  ted
-# Date created:			  23 Aug 2001
-# Whom:				  Kris Kennaway <kris@FreeBSD.org>
-#
+# Created by: Kris Kennaway <kris@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	ted
-PORTVERSION=	2.22
-PORTREVISION=	2
+PORTVERSION=	2.23
 CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/
+MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/ \
+		http://fossies.org/linux/misc/
 EXTRACT_SUFX=	.src.tar.gz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	pclin@FreeBSD.org
 COMMENT=	X11 based RTF editor
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	pcre.3:${PORTSDIR}/devel/pcre \
+LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre \
 		png15:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		paper.2:${PORTSDIR}/print/libpaper
-RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts
+		tiff:${PORTSDIR}/graphics/tiff \
+		paper:${PORTSDIR}/print/libpaper
+RUN_DEPENDS=	gsfonts>0:${PORTSDIR}/print/gsfonts
 
 OPTIONS_DEFINE=	GTK2 DOCS
+GTK2_DESC=	Use GTK2 instead of MOTIF
 
 WRKSRC=		${WRKDIR}/Ted-${PORTVERSION}
 
@@ -58,7 +55,7 @@ CONFIGURE_ARGS+=--with-MOTIF
 .endif
 
 post-extract:
-	@cd ${WRKSRC}/tedPackage && ${TAR} xf TedBindist.tar
+	@cd ${WRKSRC}/tedPackage && ${TAR} xf TedDatadir.tar
 	@${INSTALL_SCRIPT} ${FILESDIR}/configure ${WRKSRC}
 
 post-patch:
@@ -72,18 +69,18 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/Ted/Ted ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/tedPackage/Ted/rtf2*.sh ${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/tedPackage/Ted/Ted.1 ${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/tedPackage/Ted/rtf2*.1 ${MANPREFIX}/man/man1
+	${INSTALL_SCRIPT} ${WRKSRC}/tedPackage/examples/rtf2*.sh ${PREFIX}/bin/
+	${INSTALL_MAN} ${WRKSRC}/tedPackage/doc/Ted.1 ${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/tedPackage/doc/rtf2*.1 ${MANPREFIX}/man/man1
 	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/tedPackage/Ted/*.ps ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/tedPackage/ps/*.ps ${DATADIR}
 	@${MKDIR} ${AFMDIR}
-	${INSTALL_DATA} ${WRKSRC}/tedPackage/Ted/afm/*.afm ${AFMDIR}
+	${INSTALL_DATA} ${WRKSRC}/tedPackage/afm/*.afm ${AFMDIR}
 	@${MKDIR} ${INDDIR}
-	${INSTALL_DATA} ${WRKSRC}/tedPackage/Ted/dfa/*.dfa ${INDDIR}
+	${INSTALL_DATA} ${WRKSRC}/tedPackage/dfa/*.dfa ${INDDIR}
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/tedPackage/Ted/TedDocument-en_US.rtf ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/tedPackage/TedDocument-en_US.rtf ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/editors/ted/distinfo b/editors/ted/distinfo
index 48a8a470ad7e..c71097b4c2f9 100644
--- a/editors/ted/distinfo
+++ b/editors/ted/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ted-2.22.src.tar.gz) = 93040d5ff259dbf7707a97f8c1ab4a7c1ec8adae63d35760e20dd6f60520fa4a
-SIZE (ted-2.22.src.tar.gz) = 4267772
+SHA256 (ted-2.23.src.tar.gz) = 3fa992c2bc96af3ca788ef941cb5314f4a1d843202efd0201b8b4ee9adbf316c
+SIZE (ted-2.23.src.tar.gz) = 4672208
diff --git a/editors/ted/files/patch-Ted__makefile.in b/editors/ted/files/patch-Ted__makefile.in
index b141ff6cdf29..16bd6b445d50 100644
--- a/editors/ted/files/patch-Ted__makefile.in
+++ b/editors/ted/files/patch-Ted__makefile.in
@@ -1,6 +1,6 @@
 --- 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 @@
+@@ -57,7 +57,8 @@
  	-I../bitmap		\
  	-I../ind		\
  	-I../include		\
diff --git a/editors/ted/files/patch-appUtil::utilPrinter.c b/editors/ted/files/patch-appUtil-utilPrinter.c
index 5851e93e36ba..87b9ee1e2cd0 100644
--- a/editors/ted/files/patch-appUtil::utilPrinter.c
+++ b/editors/ted/files/patch-appUtil-utilPrinter.c
@@ -2,7 +2,7 @@
  
  --- appUtil/utilPrinter.c	Sun Aug 17 19:14:01 2003
  +++ appUtil/utilPrinter.c	Sun Aug 17 19:15:54 2003
- @@ -281,14 +281,14 @@
+ @@ -331,14 +331,14 @@
       /*  1  */
       if  ( count == 0 )
   	{
diff --git a/editors/ted/pkg-plist b/editors/ted/pkg-plist
index 7ff4f5a7cc73..c362d5b9455e 100644
--- a/editors/ted/pkg-plist
+++ b/editors/ted/pkg-plist
@@ -1,9 +1,9 @@
 bin/Ted
+bin/rtf2epub.sh
+bin/rtf2html.sh
 bin/rtf2pdf.sh
 bin/rtf2ps.sh
 bin/rtf2txt.sh
-bin/rtf2epub.sh
-bin/rtf2html.sh
 %%DATADIR%%/afm/AvantGarde-Book.afm
 %%DATADIR%%/afm/AvantGarde-BookOblique.afm
 %%DATADIR%%/afm/AvantGarde-Demi.afm