- Update to 2.20

PR:		136043
Submitted by:	Ports Fury

6 files changed, 96 insertions, 44 deletions

diff --git a/editors/ted/Makefile b/editors/ted/Makefile
index 1ee2a1cab345..9431ae9bdeae 100644
--- a/editors/ted/Makefile
+++ b/editors/ted/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ted
-PORTVERSION=	2.17
-PORTREVISION=	1
+PORTVERSION=	2.20
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/
 EXTRACT_SUFX=	.src.tar.gz
@@ -15,45 +14,60 @@ EXTRACT_SUFX=	.src.tar.gz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X11 based RTF editor
 
-LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre \
+		png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff
 RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts
 
 WRKSRC=		${WRKDIR}/Ted-${PORTVERSION}
 
 USE_MOTIF=	yes
-USE_XORG=	xpm xp xmu xt xext sm ice x11
+USE_XORG=	xext xft
+USE_ICONV=	yes
 USE_GHOSTSCRIPT_RUN=	yes
 GNU_CONFIGURE=	yes
-MAKE_ENV+=	DEF_AFMDIR="-DAFMDIR=\"\\\"${AFMDIR}\\\"\"" \
-		DEF_INDDIR="-DINDDIR=\"\\\"${INDDIR}\\\"\"" \
-		DEF_DOCUMENT_DIR="-DDOCUMENT_DIR=\"\\\"${DOCSDIR}/\\\"\""
+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
 
-AFMDIR=		${PREFIX}/share/Ted/afm
-INDDIR=		${PREFIX}/share/Ted/ind
+MAN1=		Ted.1 rtf2pdf.1 rtf2ps.1
+
+DATADIR=	${PREFIX}/share/Ted
+DOCSDIR=	${PREFIX}/share/doc/Ted
+
+AFMDIR=		${DATADIR}/afm
+INDDIR=		${DATADIR}/dfa
 
 post-extract:
-	cd ${WRKSRC}/tedPackage && ${TAR} xf TedBindist.tar
-	${CP} -p ${FILESDIR}/configure ${WRKSRC}/configure
-	${CHMOD} +x ${WRKSRC}/configure
+	@cd ${WRKSRC}/tedPackage && ${TAR} xf TedBindist.tar
+	@${INSTALL_SCRIPT} ${FILESDIR}/configure ${WRKSRC}
 
 post-patch:
-	${REINPLACE_CMD} 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/*/configure
-	${REINPLACE_CMD} \
-		's|DEF_PKGDIR|DEF_DOCUMENT_DIR|g' ${WRKSRC}/Ted/makefile.in
+	@${FIND} ${WRKSRC} -name "configure" -print0 | ${XARGS} -0 \
+		${REINPLACE_CMD} -e \
+		's|/usr/X11R6|${LOCALBASE}|g ; \
+		 s|/usr/local|${LOCALBASE}|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
 	${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
+	@${MKDIR} ${DATADIR} 
+	${INSTALL_DATA} ${WRKSRC}/tedPackage/Ted/*.ps ${DATADIR}
 	@${MKDIR} ${AFMDIR}
-	${INSTALL_DATA} ${WRKSRC}/tedPackage/afm/* ${AFMDIR}
+	${INSTALL_DATA} ${WRKSRC}/tedPackage/Ted/afm/*.afm ${AFMDIR}
 	@${MKDIR} ${INDDIR}
-	${INSTALL_DATA} ${WRKSRC}/tedPackage/ind/US_English.ind ${INDDIR}
-
-post-install:
+	${INSTALL_DATA} ${WRKSRC}/tedPackage/Ted/dfa/*.dfa ${INDDIR}
 .if !defined(NOPORTDOCS)
-	${MKDIR}  ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/tedPackage/Ted/TedDocument-en_US.rtf ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/tedPackage/Ted/TedDocument-en_US.rtf ${DOCSDIR}
 .endif
+
 .include <bsd.port.mk>
diff --git a/editors/ted/distinfo b/editors/ted/distinfo
index 81323f47c7b5..6ef1176e5d1b 100644
--- a/editors/ted/distinfo
+++ b/editors/ted/distinfo
@@ -1,3 +1,3 @@
-MD5 (ted-2.17.src.tar.gz) = 8adc2ab0a67954b2b5068c9be243c82d
-SHA256 (ted-2.17.src.tar.gz) = e080ef452173ec781feb60026b4b01f37343e06c1a0083ca8ccc899c97c2368a
-SIZE (ted-2.17.src.tar.gz) = 3000864
+MD5 (ted-2.20.src.tar.gz) = f4e613951107dc9ea53d75b811d7ccb0
+SHA256 (ted-2.20.src.tar.gz) = 5cc58ccb7bc38f7f0dacc1dfc836a43d35ac94a32cde54275b583b2e4d6f5335
+SIZE (ted-2.20.src.tar.gz) = 3903673
diff --git a/editors/ted/files/configure b/editors/ted/files/configure
index 0e35ea185431..6f1d0881348e 100644
--- a/editors/ted/files/configure
+++ b/editors/ted/files/configure
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-dirs="Ted appFrame appUtil bitmap ind libreg tedPackage"
+dirs="Ted appFrame appUtil bitmap ind docBuf tedPackage"
 
 for d in $dirs; do
   (cd $d && echo -n "./configure $* in:" && pwd && ./configure $*)
diff --git a/editors/ted/files/patch-Ted__makefile.in b/editors/ted/files/patch-Ted__makefile.in
new file mode 100644
index 000000000000..543fb0716c7a
--- /dev/null
+++ b/editors/ted/files/patch-Ted__makefile.in
@@ -0,0 +1,12 @@
+--- 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	\
+-	$(DEF_PKGDIR)
++	$(DEF_DOCUMENT_DIR)	\
++	$(DEF_PSSCRIPT_DIR)
+ 
+ CFLAGS=			\
+ 	@CFLAGS@	\
diff --git a/editors/ted/pkg-descr b/editors/ted/pkg-descr
index 9151f5644d70..b0ff04f8d90d 100644
--- a/editors/ted/pkg-descr
+++ b/editors/ted/pkg-descr
@@ -1,4 +1,4 @@
-Ted 2.17 is a text editor running under X Windows on Unix/Linux systems.
+Ted is a text editor running under X11 on Unix/Linux systems.
 
 Features 
 --------   
@@ -15,7 +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
+  * Save to *.pdf using /usr/local/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 935c856ce04a..23db473d0ead 100644
--- a/editors/ted/pkg-plist
+++ b/editors/ted/pkg-plist
@@ -1,22 +1,48 @@
 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
-share/Ted/afm/Courier.afm
-share/Ted/afm/Helvetica-Bold.afm
-share/Ted/afm/Helvetica-BoldOblique.afm
-share/Ted/afm/Helvetica-Oblique.afm
-share/Ted/afm/Helvetica.afm
-share/Ted/afm/Symbol.afm
-share/Ted/afm/Times-Bold.afm
-share/Ted/afm/Times-BoldItalic.afm
-share/Ted/afm/Times-Italic.afm
-share/Ted/afm/Times-Roman.afm
-share/Ted/ind/US_English.ind
+bin/rtf2txt.sh
+%%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
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm share/Ted/ind
-@dirrm share/Ted/afm
-@dirrm share/Ted
+@dirrm %%DATADIR%%/dfa
+@dirrm %%DATADIR%%/afm
+@dirrm %%DATADIR%%