Update to 2.21:

Changes since 2.17 not found.

2.17:
Changes: This release finishes the numbered lists. All tools have
a 'Close' button now. The configurable resources mechanism now
works without X11 for command line calls. There is preliminary
support for 'shapes', the newer Word figures mechanism. There is
support for the Euro sign if the font supports it. With some
configuration,
Ted can now use most fonts configured in GhostScript. It uses more
CSS and fewer tables in HTML. Many annoying bugs were fixed.

4 files changed, 54 insertions, 47 deletions

diff --git a/editors/ted/Makefile b/editors/ted/Makefile
index 5edc154c8d3..62c6fe48701 100644
--- a/editors/ted/Makefile
+++ b/editors/ted/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2010/06/13 22:44:13 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2010/06/14 09:55:04 wiz Exp $
 
-DISTNAME=	ted-2.16.src
-PKGNAME=	ted-2.16
-PKGREVISION=	8
+DISTNAME=	ted-2.21.src
+PKGNAME=	${DISTNAME:S/.src//}
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/
 
@@ -13,10 +12,11 @@ COMMENT=	X11 based WordPad-like word processor
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+USE_LANGUAGES=	c c++
 USE_TOOLS+=	gtar
+MAKE_JOBS_SAFE=	no
 
-WRKSRC=		${WRKDIR}/Ted-2.16
-USE_X11BASE=	YES
+WRKSRC=		${WRKDIR}/Ted-2.21
 
 AFMDIR=		${PREFIX}/share/Ted/afm
 INDDIR=		${PREFIX}/share/Ted/ind
@@ -24,9 +24,8 @@ INFODIR=	${PREFIX}/share/doc/Ted
 
 CONFIGURE_ENV+=	ac_jpeg_includes="${BUILDLINK_PREFIX.jpeg}/include"
 CONFIGURE_ENV+=	ac_jpeg_libraries="${BUILDLINK_PREFIX.jpeg}/lib"
-# disabled, has not been update since about libpng-0.90
-#CONFIGURE_ENV+=	ac_png_includes="${BUILDLINK_PREFIX.png}/include"
-#CONFIGURE_ENV+=	ac_png_libraries="${BUILDLINK_PREFIX.png}/lib"
+CONFIGURE_ENV+=	ac_png_includes="${BUILDLINK_PREFIX.png}/include"
+CONFIGURE_ENV+=	ac_png_libraries="${BUILDLINK_PREFIX.png}/lib"
 CONFIGURE_ENV+=	ac_tiff_includes="${BUILDLINK_PREFIX.tiff}/include"
 CONFIGURE_ENV+=	ac_tiff_libraries="${BUILDLINK_PREFIX.tiff}/lib"
 CONFIGURE_ENV+=	ac_xm_includes="${BUILDLINK_PREFIX.openmotif}/include"
@@ -47,7 +46,7 @@ MAKE_ENV+=	DEF_PKGDIR='-DPKGDIR=\"${PREFIX}\"' \
 BUILD_TARGET=	compile.shared
 INSTALL_TARGET=	install.shared
 
-INSTALLATION_DIRS=	bin lib/X11/app-defaults
+INSTALLATION_DIRS=	bin lib/X11/app-defaults ${AFMDIR} ${INDDIR} ${INFODIR}
 
 post-extract:
 	@cd ${WRKSRC} ; ${GTAR} xf tedPackage/TedBindist.tar
@@ -61,32 +60,16 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/Ted/Ted ${DESTDIR}${PREFIX}/bin/Ted
-	${INSTALL_DATA_DIR} ${DESTDIR}${AFMDIR}
-	${INSTALL_DATA} \
-		${WRKSRC}/afm/Courier-Bold.afm \
-		${WRKSRC}/afm/Courier-BoldOblique.afm \
-		${WRKSRC}/afm/Courier-Oblique.afm \
-		${WRKSRC}/afm/Courier.afm \
-		${WRKSRC}/afm/Helvetica-Bold.afm \
-		${WRKSRC}/afm/Helvetica-BoldOblique.afm \
-		${WRKSRC}/afm/Helvetica-Oblique.afm \
-		${WRKSRC}/afm/Helvetica.afm \
-		${WRKSRC}/afm/Symbol.afm \
-		${WRKSRC}/afm/Times-Bold.afm \
-		${WRKSRC}/afm/Times-BoldItalic.afm \
-		${WRKSRC}/afm/Times-Italic.afm \
-		${WRKSRC}/afm/Times-Roman.afm \
-		${DESTDIR}${AFMDIR}
-	${INSTALL_DATA_DIR} ${DESTDIR}${INDDIR}
+	${INSTALL_DATA} ${WRKSRC}/Ted/afm/*.afm ${DESTDIR}${AFMDIR}
 	${INSTALL_DATA} ${FILESDIR}/README.ind ${DESTDIR}${INDDIR}
-	${INSTALL_DATA_DIR} ${DESTDIR}${INFODIR}
 	${INSTALL_DATA} ${WRKSRC}/Ted/TedDocument-en_US.rtf ${DESTDIR}${INFODIR}
 	${INSTALL_DATA}	${WRKSRC}/Ted/Ted.ad \
 		${DESTDIR}${PREFIX}/lib/X11/app-defaults/Ted
 
+.include "../../devel/pcre/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
-#.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
diff --git a/editors/ted/PLIST b/editors/ted/PLIST
index 7315891fd3d..5f2a72eedfd 100644
--- a/editors/ted/PLIST
+++ b/editors/ted/PLIST
@@ -1,18 +1,40 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:50:26 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2010/06/14 09:55:04 wiz Exp $
 bin/Ted
+lib/X11/app-defaults/Ted
+share/Ted/afm/AvantGarde-Book.afm
+share/Ted/afm/AvantGarde-BookOblique.afm
+share/Ted/afm/AvantGarde-Demi.afm
+share/Ted/afm/AvantGarde-DemiOblique.afm
+share/Ted/afm/Bookman-Demi.afm
+share/Ted/afm/Bookman-DemiItalic.afm
+share/Ted/afm/Bookman-Light.afm
+share/Ted/afm/Bookman-LightItalic.afm
 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-Narrow-Bold.afm
+share/Ted/afm/Helvetica-Narrow-BoldOblique.afm
+share/Ted/afm/Helvetica-Narrow-Oblique.afm
+share/Ted/afm/Helvetica-Narrow.afm
 share/Ted/afm/Helvetica-Oblique.afm
 share/Ted/afm/Helvetica.afm
+share/Ted/afm/NewCenturySchlbk-Bold.afm
+share/Ted/afm/NewCenturySchlbk-BoldItalic.afm
+share/Ted/afm/NewCenturySchlbk-Italic.afm
+share/Ted/afm/NewCenturySchlbk-Roman.afm
+share/Ted/afm/Palatino-Bold.afm
+share/Ted/afm/Palatino-BoldItalic.afm
+share/Ted/afm/Palatino-Italic.afm
+share/Ted/afm/Palatino-Roman.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
-lib/X11/app-defaults/Ted
-share/doc/Ted/TedDocument-en_US.rtf
+share/Ted/afm/ZapfChancery-MediumItalic.afm
+share/Ted/afm/ZapfDingbats.afm
 share/Ted/ind/README.ind
+share/doc/Ted/TedDocument-en_US.rtf
diff --git a/editors/ted/distinfo b/editors/ted/distinfo
index bb4e54f8fed..0ce88f5e095 100644
--- a/editors/ted/distinfo
+++ b/editors/ted/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.10 2005/07/18 00:46:18 kristerw Exp $
+$NetBSD: distinfo,v 1.11 2010/06/14 09:55:04 wiz Exp $
 
-SHA1 (ted-2.16.src.tar.gz) = 4608e1cdcf0eeb8eb77032544b933d32bcd8e100
-RMD160 (ted-2.16.src.tar.gz) = 024f12c3e75a2d078071d82ec446a0002fd2ed4e
-Size (ted-2.16.src.tar.gz) = 2803601 bytes
+SHA1 (ted-2.21.src.tar.gz) = 303b15de1fe97e473c4b89a88b6e127ee81e07e9
+RMD160 (ted-2.21.src.tar.gz) = 68935d62d216708c7053910f1261353176cf5c72
+Size (ted-2.21.src.tar.gz) = 3956815 bytes
 SHA1 (patch-aa) = d8673fb67176c17beb90a87adebb9ab94a1e15ba
 SHA1 (patch-ab) = 16fa3f2a88a6b252148735f02541833b7ac56b8a
 SHA1 (patch-ac) = 3ad1300b213e925d50e0490587398e7574452aa8
 SHA1 (patch-ad) = a0761bd537cbef20bf80a74eb59c2352a97e4d99
 SHA1 (patch-ae) = 9cea02ede59d7f6a88a0c8ec1f93e5d814e6b994
 SHA1 (patch-af) = 369a2d0324538860c50653a140d660d50c2383b9
-SHA1 (patch-ag) = 1de6cec39070603d690ed6fc8e3e4dc7dc977b76
+SHA1 (patch-ag) = 83f75717fa0d5cf60ba719aeea67ea3d6ef32c7f
diff --git a/editors/ted/patches/patch-ag b/editors/ted/patches/patch-ag
index 0aed856e16c..c31c69dd65e 100644
--- a/editors/ted/patches/patch-ag
+++ b/editors/ted/patches/patch-ag
@@ -1,12 +1,14 @@
-$NetBSD: patch-ag,v 1.1 2005/07/18 00:46:18 kristerw Exp $
+$NetBSD: patch-ag,v 1.2 2010/06/14 09:55:04 wiz Exp $
 
---- appUtil/psTtf.c.orig	Mon Jul 18 02:43:21 2005
-+++ appUtil/psTtf.c	Mon Jul 18 02:43:28 2005
-@@ -1,7 +1,6 @@
- #   include	<stdio.h>
- #   include	<string.h>
- #   include	<stdlib.h>
--#   include	<malloc.h>
+Fix for png-1.4.2.
+
+--- bitmap/bmpng.c.orig	2009-10-16 15:20:57.000000000 +0000
++++ bitmap/bmpng.c
+@@ -284,7 +284,6 @@ static int bpPngiFromBitmap(	png_structp
+ 				png_info *			pngi,
+ 				const BitmapDescription *       bd )
+     {
+-    png_info_init( pngi );
+     pngi->width= bd->bdPixelsWide;
+     pngi->height= bd->bdPixelsHigh;
  
- #   define	y0	math_y0
- #   define	y1	math_y1