5 files changed, 13 insertions, 113 deletions

diff --git a/editors/ted/Makefile b/editors/ted/Makefile
index e8183a8c3c75..b39283c41eef 100644
--- a/editors/ted/Makefile
+++ b/editors/ted/Makefile
@@ -6,9 +6,8 @@
 #
 
 PORTNAME=	ted
-PORTVERSION=	2.14
-PORTREVISION=	1
-CATEGORIES=	editors textproc print
+PORTVERSION=	2.17
+CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/
 EXTRACT_SUFX=	.src.tar.gz
 
@@ -16,7 +15,6 @@ MAINTAINER=	jon.drews@gmail.com
 COMMENT=	X11 based RTF editor
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff
 RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts
 
@@ -27,6 +25,7 @@ USE_X_PREFIX=	yes
 USE_MOTIF=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--prefix=${PREFIX}
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CC="${CC}" CFLAGS="${CFLAGS}"
 MAKE_ENV=	DEF_AFMDIR="-DAFMDIR=\"\\\"${AFMDIR}\\\"\"" \
@@ -39,21 +38,13 @@ INDDIR=		${PREFIX}/share/Ted/ind
 
 post-extract:
 	cd ${WRKSRC}/tedPackage && ${TAR} xf TedBindist.tar
-
 post-patch:
-	${FIND} ${WRKSRC} -name "configure" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|/usr/apps|${LOCALBASE}|g ; '
 	${REINPLACE_CMD} \
 		's|DEF_PKGDIR|DEF_DOCUMENT_DIR|g' ${WRKSRC}/Ted/makefile.in
 
-post-configure:
-.for dir in appFrame appUtil bitmap ind libreg
-	cd ${WRKSRC}/${dir} && \
-		${SETENV} ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS}
-.endfor
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/Ted/Ted ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/tedPackage/Ted/rtf2*.sh ${PREFIX}/bin/
 	@${MKDIR} ${AFMDIR}
 	${INSTALL_DATA} ${WRKSRC}/tedPackage/afm/* ${AFMDIR}
 	@${MKDIR} ${INDDIR}
diff --git a/editors/ted/distinfo b/editors/ted/distinfo
index 001bd518f03e..50f935836453 100644
--- a/editors/ted/distinfo
+++ b/editors/ted/distinfo
@@ -1 +1,2 @@
-MD5 (ted-2.14.src.tar.gz) = 7ed8207cdc925ee7f8b8770ca0af3e52
+MD5 (ted-2.17.src.tar.gz) = 8adc2ab0a67954b2b5068c9be243c82d
+SIZE (ted-2.17.src.tar.gz) = 3000864
diff --git a/editors/ted/files/patch-appFrame-appFileChooserMotif.c b/editors/ted/files/patch-appFrame-appFileChooserMotif.c
deleted file mode 100644
index 156e7f97464c..000000000000
--- a/editors/ted/files/patch-appFrame-appFileChooserMotif.c
+++ /dev/null
@@ -1,93 +0,0 @@
---- appFrame/appFileChooserMotif.c	Fri Apr  4 06:46:48 2003
-+++ /home/bsd/patches/TedFixes/appFileChooserMotif.c	Sun Jun  1 20:19:07 2003
-@@ -549,6 +549,7 @@
- static int appMakeFileChooser( AppChooserInformation **	pAci,
- 				Widget				relative,
- 				EditApplication *		ea,
-+				int				withFilter,
- 				const char *			defaultFilter,
- 				Widget				option )
-     {
-@@ -624,15 +625,21 @@
- 			NULL );
- 
-     /*  Not necessary
--    XtAddCallback( text, XmNactivateCallback,
-+    if  ( withFilter )
-+	{
-+	XtAddCallback( text, XmNactivateCallback,
- 				    appFileFilterActivated, (void *)aci );
-+	}
-     */
- 
-     filterButton= XmFileSelectionBoxGetChild( aci->aciDialog.adDialog,
- 						    XmDIALOG_APPLY_BUTTON );
- 
--    XtAddCallback( filterButton, XmNactivateCallback,
-+    if  ( withFilter )
-+	{
-+	XtAddCallback( filterButton, XmNactivateCallback,
- 				    appFileFilterActivated, (void *)aci );
-+	}
- 
-     text= XmFileSelectionBoxGetChild( aci->aciDialog.adDialog, XmDIALOG_TEXT );
-     XtVaSetValues( text,
-@@ -705,14 +712,15 @@
- 			EditApplication *	ea )
-     {
-     AppChooserInformation *	aci= (AppChooserInformation *)0;
-+    const int			withFilter= extensionCount > 0;
- 
--    if  ( appMakeFileChooser( &aci, relative, ea, defaultFilter, option ) )
-+    if  ( appMakeFileChooser( &aci, relative, ea, withFilter, defaultFilter, option ) )
- 	{ LDEB(1); return;	}
- 
-     XtAddCallback( aci->aciDialog.adDialog,
- 			XmNokCallback, appOpenChooserOk, (XtPointer)aci );
- 
--    if  ( extensionCount > 0 )
-+    if  ( withFilter )
- 	{
- 	appFileMakeFilter( aci );
- 
-@@ -727,7 +735,7 @@
-     aci->aciOpenDocument= openDocument;
-     aci->aciFilename= (char *)0;
- 
--    if  ( extensionCount > 0 )
-+    if  ( withFilter )
- 	{
- 	WidgetList		children;
- 	Cardinal		childCount= 0;
-@@ -920,16 +928,17 @@
- 				char **			pFilename )
-     {
-     AppChooserInformation *	aci= (AppChooserInformation *)0;
-+    const int			withFilter= ea->eaFileExtensionCount > 0;
-     int				response;
- 
--    if  ( appMakeFileChooser( &aci, relative, ea,
-+    if  ( appMakeFileChooser( &aci, relative, ea, withFilter,
- 					    ea->eaDefaultFileFilter, option ) )
- 	{ return ACIrespFAILURE;	}
- 
-     XtAddCallback( aci->aciDialog.adDialog,
- 			    XmNokCallback, appSaveOkPushed, (XtPointer)aci );
- 
--    if  ( ea->eaFileExtensionCount > 0 )
-+    if  ( withFilter )
- 	{
- 	appFileMakeFilter( aci );
- 
-@@ -977,9 +986,10 @@
- 					char **			pFilename )
-     {
-     AppChooserInformation *	aci= (AppChooserInformation *)0;
-+    const int			withFilter= 0;
-     int				response;
- 
--    if  ( appMakeFileChooser( &aci, panel, ea, "*.ps", option ) )
-+    if  ( appMakeFileChooser( &aci, panel, ea, withFilter, "*.ps", option ) )
- 	{ LDEB(1); return ACIrespFAILURE;	}
- 
-     XtAddCallback( aci->aciDialog.adDialog,
diff --git a/editors/ted/pkg-descr b/editors/ted/pkg-descr
index 7b9483468bd5..9151f5644d70 100644
--- a/editors/ted/pkg-descr
+++ b/editors/ted/pkg-descr
@@ -1,15 +1,12 @@
-Ted is a text editor running under X Windows on Unix/Linux systems.
+Ted 2.17 is a text editor running under X Windows on Unix/Linux systems.
 
 Features 
 --------   
   * Wysiwyg rich text editing. 
   * Ted uses Microsoft RTF as its native file format.
-  * In line bitmap pictures.
+  * In line bitmap, jpeg, gif, ppm, png and xpm pictures.
   * Postscript printing.
-  * Spelling checking in several Latin languages. (English, Dutch, German, 
-    Portuguese, French and Spanish.)
-  * Directly mailing documents from Ted.
-  * Cut/Copy/Paste, also with other applications.
+  * Cut/Copy/Paste, text and images.
   * Find/Replace using regular expressions.
   * Ruler: Paragraph indentation, Indentation of first line, Tabs.
   * Footnotes and endnotes.
@@ -18,5 +15,7 @@ Features
   * Symbols and accented characters are fully supported.
   * Hyperlinks. 
   * Saving a document in HTML format.
+  * Save to *.pdf using /usr/X11R6/bin/rtf2pdf.sh
+  * Numbered or bulleted lists 
 
 WWW: http://www.nllgg.nl/Ted/
diff --git a/editors/ted/pkg-plist b/editors/ted/pkg-plist
index a9fbb80c8fce..935c856ce04a 100644
--- a/editors/ted/pkg-plist
+++ b/editors/ted/pkg-plist
@@ -1,4 +1,6 @@
 bin/Ted
+bin/rtf2pdf.sh
+bin/rtf2ps.sh
 share/Ted/afm/Courier-Bold.afm
 share/Ted/afm/Courier-BoldOblique.afm
 share/Ted/afm/Courier-Oblique.afm