summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authornia <nia@pkgsrc.org>2022-05-19 13:32:47 +0000
committernia <nia@pkgsrc.org>2022-05-19 13:32:47 +0000
commit418af74f7a3c542cc378e59dd8c7e9f01b87ccc7 (patch)
tree175b7fe653cd18b1e235e8bab9d0d33ad8f9a168 /editors
parentcbf607f0de34faa3247262d9ff149714fff3f65c (diff)
downloadpkgsrc-418af74f7a3c542cc378e59dd8c7e9f01b87ccc7.tar.gz
ted, related dictionaries: update to 2.23
(Ted 2.23 February 4, 2013) * Stability fixes. * Many-many annoying bugs fixed. * Some steps to support the few missing features such as absolutely positioned objects and shapes. * Preparations for bidirectional text support (Ted 2.22 April 4, 2012) * Thorough brush-up of the internals. * Undo/Redo/Recovery * Many-many annoying bugs fixed. * Some steps to support the few missing features such as absolutely positioned objects and shapes.
Diffstat (limited to 'editors')
-rw-r--r--editors/Makefile9
-rw-r--r--editors/ted-bg/DESCR1
-rw-r--r--editors/ted-bg/Makefile8
-rw-r--r--editors/ted-bg/PLIST2
-rw-r--r--editors/ted-bg/distinfo5
-rw-r--r--editors/ted-cs/Makefile28
-rw-r--r--editors/ted-cs/PLIST4
-rw-r--r--editors/ted-cs/distinfo8
-rw-r--r--editors/ted-da/Makefile28
-rw-r--r--editors/ted-da/PLIST4
-rw-r--r--editors/ted-da/distinfo8
-rw-r--r--editors/ted-de/Makefile28
-rw-r--r--editors/ted-de/PLIST4
-rw-r--r--editors/ted-de/distinfo8
-rw-r--r--editors/ted-en-gb/Makefile28
-rw-r--r--editors/ted-en-gb/PLIST4
-rw-r--r--editors/ted-en-gb/distinfo8
-rw-r--r--editors/ted-en-us/DESCR1
-rw-r--r--editors/ted-en-us/Makefile28
-rw-r--r--editors/ted-en-us/PLIST2
-rw-r--r--editors/ted-en-us/distinfo5
-rw-r--r--editors/ted-es/Makefile28
-rw-r--r--editors/ted-es/PLIST4
-rw-r--r--editors/ted-es/distinfo8
-rw-r--r--editors/ted-et/DESCR1
-rw-r--r--editors/ted-et/Makefile8
-rw-r--r--editors/ted-et/PLIST2
-rw-r--r--editors/ted-et/distinfo5
-rw-r--r--editors/ted-fr/Makefile28
-rw-r--r--editors/ted-fr/PLIST4
-rw-r--r--editors/ted-fr/distinfo8
-rw-r--r--editors/ted-hr/DESCR1
-rw-r--r--editors/ted-hr/Makefile8
-rw-r--r--editors/ted-hr/PLIST2
-rw-r--r--editors/ted-hr/distinfo5
-rw-r--r--editors/ted-it/Makefile28
-rw-r--r--editors/ted-it/PLIST4
-rw-r--r--editors/ted-it/distinfo8
-rw-r--r--editors/ted-nl/Makefile28
-rw-r--r--editors/ted-nl/PLIST4
-rw-r--r--editors/ted-nl/distinfo8
-rw-r--r--editors/ted-no/Makefile28
-rw-r--r--editors/ted-no/PLIST4
-rw-r--r--editors/ted-no/distinfo8
-rw-r--r--editors/ted-pl/Makefile40
-rw-r--r--editors/ted-pl/PLIST5
-rw-r--r--editors/ted-pl/distinfo8
-rw-r--r--editors/ted-pt/Makefile28
-rw-r--r--editors/ted-pt/PLIST4
-rw-r--r--editors/ted-pt/distinfo8
-rw-r--r--editors/ted-ru/DESCR1
-rw-r--r--editors/ted-ru/Makefile8
-rw-r--r--editors/ted-ru/PLIST2
-rw-r--r--editors/ted-ru/distinfo5
-rw-r--r--editors/ted-sk/DESCR1
-rw-r--r--editors/ted-sk/Makefile8
-rw-r--r--editors/ted-sk/PLIST2
-rw-r--r--editors/ted-sk/distinfo5
-rw-r--r--editors/ted-sl/DESCR1
-rw-r--r--editors/ted-sl/Makefile8
-rw-r--r--editors/ted-sl/PLIST2
-rw-r--r--editors/ted-sl/distinfo5
-rw-r--r--editors/ted-sv/Makefile28
-rw-r--r--editors/ted-sv/PLIST4
-rw-r--r--editors/ted-sv/distinfo8
-rw-r--r--editors/ted/MESSAGE7
-rw-r--r--editors/ted/Makefile51
-rw-r--r--editors/ted/PLIST8
-rw-r--r--editors/ted/dictionary.mk23
-rw-r--r--editors/ted/distinfo17
-rw-r--r--editors/ted/files/README.ind1
-rw-r--r--editors/ted/files/Ted.desktop11
-rw-r--r--editors/ted/patches/patch-aa14
-rw-r--r--editors/ted/patches/patch-ab12
-rw-r--r--editors/ted/patches/patch-ac12
-rw-r--r--editors/ted/patches/patch-ad12
-rw-r--r--editors/ted/patches/patch-ae18
-rw-r--r--editors/ted/patches/patch-af18
-rw-r--r--editors/ted/patches/patch-ag423
-rw-r--r--editors/ted/patches/patch-appFrame_appFontConfig.c15
-rw-r--r--editors/ted/patches/patch-appUtil_csvsheet.c12
81 files changed, 302 insertions, 986 deletions
diff --git a/editors/Makefile b/editors/Makefile
index aa2b16b171f..87983b0666b 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.224 2022/04/20 18:32:32 nia Exp $
+# $NetBSD: Makefile,v 1.225 2022/05/19 13:32:47 nia Exp $
#
COMMENT= Text and binary editors
@@ -144,18 +144,23 @@ SUBDIR+= ssam
SUBDIR+= tamago
SUBDIR+= tea
SUBDIR+= ted
+SUBDIR+= ted-bg
SUBDIR+= ted-cs
SUBDIR+= ted-da
SUBDIR+= ted-de
SUBDIR+= ted-en-gb
-SUBDIR+= ted-en-us
SUBDIR+= ted-es
+SUBDIR+= ted-et
SUBDIR+= ted-fr
+SUBDIR+= ted-hr
SUBDIR+= ted-it
SUBDIR+= ted-nl
SUBDIR+= ted-no
SUBDIR+= ted-pl
SUBDIR+= ted-pt
+SUBDIR+= ted-ru
+SUBDIR+= ted-sk
+SUBDIR+= ted-sl
SUBDIR+= ted-sv
SUBDIR+= tepl4
SUBDIR+= texmaker
diff --git a/editors/ted-bg/DESCR b/editors/ted-bg/DESCR
new file mode 100644
index 00000000000..2b0ed878653
--- /dev/null
+++ b/editors/ted-bg/DESCR
@@ -0,0 +1 @@
+Bulgarian spelling dictionary for the Ted word processor.
diff --git a/editors/ted-bg/Makefile b/editors/ted-bg/Makefile
new file mode 100644
index 00000000000..d2036cecc92
--- /dev/null
+++ b/editors/ted-bg/Makefile
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2022/05/19 13:32:48 nia Exp $
+
+LANGNAME= Bulgarian
+LANGCODE= bg_BG
+PKG_LANGCODE= bg
+
+.include "../../editors/ted/dictionary.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/editors/ted-bg/PLIST b/editors/ted-bg/PLIST
new file mode 100644
index 00000000000..edd5df56ca7
--- /dev/null
+++ b/editors/ted-bg/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2022/05/19 13:32:48 nia Exp $
+share/Ted/dfa/bg_BG.dfa
diff --git a/editors/ted-bg/distinfo b/editors/ted-bg/distinfo
new file mode 100644
index 00000000000..f01e0d5d443
--- /dev/null
+++ b/editors/ted-bg/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2022/05/19 13:32:48 nia Exp $
+
+BLAKE2s (ted_bg_BG-2.23-1.noarch.rpm) = 89c7a37356ea9217364c38da0e08181ed13128657dedcde651da6133a7791c5d
+SHA512 (ted_bg_BG-2.23-1.noarch.rpm) = ee974ec99b91ef2cd5d5539c3b41a5d84136a3c54382720a1d02272f9237e2c8f3a4460a7f3e6e6089fc36a500868162415863cb97f03146e1e5be4512358ec8
+Size (ted_bg_BG-2.23-1.noarch.rpm) = 781744 bytes
diff --git a/editors/ted-cs/Makefile b/editors/ted-cs/Makefile
index 1b9753cd0ed..f95ff3b89f5 100644
--- a/editors/ted-cs/Makefile
+++ b/editors/ted-cs/Makefile
@@ -1,26 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2020/01/26 17:31:06 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2022/05/19 13:32:48 nia Exp $
-DISTNAME= Ted_cs_CZ
-PKGNAME= ted-cs-2.16
-PKGREVISION= 1
-CATEGORIES= editors
-MASTER_SITES= ftp://ftp.nluug.nl/pub/editors/ted/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= https://www.nllgg.nl/Ted/
-COMMENT= Czech spelling dictionary for the Ted word processor
-
-DEPENDS+= ted>=2.6:../../editors/ted
-
-WRKSRC= ${WRKDIR}
-
-DIST_SUBDIR= Ted-2.16
-NO_BUILD= YES
-
-INSTALLATION_DIRS= share/Ted/ind
-
-do-install:
- ${INSTALL_DATA} ${WRKSRC}/ind/Czech.ind \
- ${DESTDIR}${PREFIX}/share/Ted/ind
+LANGNAME= Czech
+LANGCODE= cs_CZ
+PKG_LANGCODE= cs
+.include "../../editors/ted/dictionary.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/ted-cs/PLIST b/editors/ted-cs/PLIST
index 6583b53407e..506d4a0dbcb 100644
--- a/editors/ted-cs/PLIST
+++ b/editors/ted-cs/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:23:33 zuntum Exp $
-share/Ted/ind/Czech.ind
+@comment $NetBSD: PLIST,v 1.2 2022/05/19 13:32:48 nia Exp $
+share/Ted/dfa/cs_CZ.dfa
diff --git a/editors/ted-cs/distinfo b/editors/ted-cs/distinfo
index c6df4c7e81e..6e1d6728680 100644
--- a/editors/ted-cs/distinfo
+++ b/editors/ted-cs/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 10:21:40 nia Exp $
+$NetBSD: distinfo,v 1.10 2022/05/19 13:32:48 nia Exp $
-BLAKE2s (Ted-2.16/Ted_cs_CZ.tar.gz) = 66e903e425a45f6d048a0167c5c02b87c1da5faa30a6886bf8da9580185c64e5
-SHA512 (Ted-2.16/Ted_cs_CZ.tar.gz) = 5754c0fe2d2a9e825e485a51ac020597fd31de47717a5e2cced03dbdb4a9c3ce92fe045fe9010a6c255d3b88f3a7bea80b6052ca5c77d7fdc475a3d0f18593e0
-Size (Ted-2.16/Ted_cs_CZ.tar.gz) = 1066230 bytes
+BLAKE2s (ted_cs_CZ-2.23-1.noarch.rpm) = 22ec897348505f8b4231e4136774c31c152d3bcf9832821d701d1cdb2950ea86
+SHA512 (ted_cs_CZ-2.23-1.noarch.rpm) = 5a7b881fd1f12ae44dbd5a0d25cb43dc9ef584959d2e49f28de98fb0ef5531c134eb9663619517bafa44e8bd5e9ef90a62bb7f6b152aa2745847cb176c8f0dbb
+Size (ted_cs_CZ-2.23-1.noarch.rpm) = 3413986 bytes
diff --git a/editors/ted-da/Makefile b/editors/ted-da/Makefile
index 2cd543bb4bf..90c1aea8082 100644
--- a/editors/ted-da/Makefile
+++ b/editors/ted-da/Makefile
@@ -1,26 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2020/01/26 17:31:06 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2022/05/19 13:32:48 nia Exp $
-DISTNAME= Ted_da_DK
-PKGNAME= ted-da-2.16
-PKGREVISION= 1
-CATEGORIES= editors
-MASTER_SITES= ftp://ftp.nluug.nl/pub/editors/ted/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= https://www.nllgg.nl/Ted/
-COMMENT= Danish spelling dictionary for the Ted word processor
-
-DEPENDS+= ted>=2.6:../../editors/ted
-
-WRKSRC= ${WRKDIR}
-
-DIST_SUBDIR= Ted-2.16
-NO_BUILD= YES
-
-INSTALLATION_DIRS= share/Ted/ind
-
-do-install:
- ${INSTALL_DATA} ${WRKSRC}/ind/Danish.ind \
- ${DESTDIR}${PREFIX}/share/Ted/ind
+LANGNAME= Danish
+LANGCODE= da_DK
+PKG_LANGCODE= da
+.include "../../editors/ted/dictionary.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/ted-da/PLIST b/editors/ted-da/PLIST
index 3f005f5384d..ab3ee0fcbb4 100644
--- a/editors/ted-da/PLIST
+++ b/editors/ted-da/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:23:35 zuntum Exp $
-share/Ted/ind/Danish.ind
+@comment $NetBSD: PLIST,v 1.2 2022/05/19 13:32:48 nia Exp $
+share/Ted/dfa/da_DK.dfa
diff --git a/editors/ted-da/distinfo b/editors/ted-da/distinfo
index 4b0c6201e72..42f1dd9b00b 100644
--- a/editors/ted-da/distinfo
+++ b/editors/ted-da/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 10:21:40 nia Exp $
+$NetBSD: distinfo,v 1.10 2022/05/19 13:32:48 nia Exp $
-BLAKE2s (Ted-2.16/Ted_da_DK.tar.gz) = 4e74d30ebf566bdf9b139b7ea0dc75a53675455228b50110d1fd69fa13141bed
-SHA512 (Ted-2.16/Ted_da_DK.tar.gz) = 909100782c79a55c93c9411a7045f14fb81d5c574ccc338ac737cf870329b7dfd0dab820eab7897009d000fba08e5655427a5cb85bf8d4d9f901778513707dc8
-Size (Ted-2.16/Ted_da_DK.tar.gz) = 1826964 bytes
+BLAKE2s (ted_da_DK-2.23-1.noarch.rpm) = 10b86b3399dcbcbd4a28702ccc8456dbfb80a5cda375926ef0178cfae6394dc4
+SHA512 (ted_da_DK-2.23-1.noarch.rpm) = eee51301faad76a6d651a1321f827a30606b1d5c90c30d3c1e60e69ac5769521e12d83d9d381bf6d55bbbdaf1b8e2fd4e1545579ad2607176c4ce08f1b2411ec
+Size (ted_da_DK-2.23-1.noarch.rpm) = 1769416 bytes
diff --git a/editors/ted-de/Makefile b/editors/ted-de/Makefile
index 656009549be..dfc16996438 100644
--- a/editors/ted-de/Makefile
+++ b/editors/ted-de/Makefile
@@ -1,26 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2020/01/26 17:31:06 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2022/05/19 13:32:48 nia Exp $
-DISTNAME= Ted_de_DE
-PKGNAME= ted-de-2.16
-PKGREVISION= 1
-CATEGORIES= editors
-MASTER_SITES= ftp://ftp.nluug.nl/pub/editors/ted/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= https://www.nllgg.nl/Ted/
-COMMENT= German spelling dictionary for the Ted word processor
-
-DEPENDS+= ted>=2.6:../../editors/ted
-
-WRKSRC= ${WRKDIR}
-
-DIST_SUBDIR= Ted-2.16
-NO_BUILD= YES
-
-INSTALLATION_DIRS= share/Ted/ind
-
-do-install:
- ${INSTALL_DATA} ${WRKSRC}/ind/German.ind \
- ${DESTDIR}${PREFIX}/share/Ted/ind
+LANGNAME= German
+LANGCODE= de_DE
+PKG_LANGCODE= de
+.include "../../editors/ted/dictionary.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/ted-de/PLIST b/editors/ted-de/PLIST
index 6bf0d5dc5f1..409fa86f9eb 100644
--- a/editors/ted-de/PLIST
+++ b/editors/ted-de/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:23:37 zuntum Exp $
-share/Ted/ind/German.ind
+@comment $NetBSD: PLIST,v 1.2 2022/05/19 13:32:48 nia Exp $
+share/Ted/dfa/de_DE.dfa
diff --git a/editors/ted-de/distinfo b/editors/ted-de/distinfo
index a79e32013d0..651da50640e 100644
--- a/editors/ted-de/distinfo
+++ b/editors/ted-de/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 10:21:40 nia Exp $
+$NetBSD: distinfo,v 1.10 2022/05/19 13:32:48 nia Exp $
-BLAKE2s (Ted-2.16/Ted_de_DE.tar.gz) = 95b68a793b4d9c31aaa8149254e281ad889ac2aa1b5c3e443edb29e69ae1c4a0
-SHA512 (Ted-2.16/Ted_de_DE.tar.gz) = 05811e623d64c199e2dd36221235580e17900275836a7c0e7fbfc9a7185e8619655954d19110d850d23dc9154b37c99ac18392941293a3024cb86e66166eee93
-Size (Ted-2.16/Ted_de_DE.tar.gz) = 1856166 bytes
+BLAKE2s (ted_de_DE-2.23-1.noarch.rpm) = a8860c4ddf1111fe5ce736aa46007d9feed640d997d9e831b97bcfd7c880ca1b
+SHA512 (ted_de_DE-2.23-1.noarch.rpm) = 4f60bd26342c48d29749ddfee60b4ca2dbf82c5db471446d0f0bf060182dca89ba555a5f1547cb282d74da570aff74993cc473013b08ce347687ea056fdad7df
+Size (ted_de_DE-2.23-1.noarch.rpm) = 2174544 bytes
diff --git a/editors/ted-en-gb/Makefile b/editors/ted-en-gb/Makefile
index 6bc3bc5346e..6909a4eba5e 100644
--- a/editors/ted-en-gb/Makefile
+++ b/editors/ted-en-gb/Makefile
@@ -1,26 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2020/01/26 17:31:07 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2022/05/19 13:32:48 nia Exp $
-DISTNAME= Ted_en_GB
-PKGNAME= ted-en-gb-2.16
-PKGREVISION= 1
-CATEGORIES= editors
-MASTER_SITES= ftp://ftp.nluug.nl/pub/editors/ted/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= https://www.nllgg.nl/Ted/
-COMMENT= UK English spelling dictionary for the Ted word processor
-
-DEPENDS+= ted>=2.6:../../editors/ted
-
-WRKSRC= ${WRKDIR}
-
-DIST_SUBDIR= Ted-2.16
-NO_BUILD= YES
-
-INSTALLATION_DIRS= share/Ted/ind
-
-do-install:
- ${INSTALL_DATA} ${WRKSRC}/ind/UK_English.ind \
- ${DESTDIR}${PREFIX}/share/Ted/ind
+LANGNAME= British English
+LANGCODE= en_GB
+PKG_LANGCODE= en-gb
+.include "../../editors/ted/dictionary.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/ted-en-gb/PLIST b/editors/ted-en-gb/PLIST
index f4c03c3f9e4..79f1b6936f6 100644
--- a/editors/ted-en-gb/PLIST
+++ b/editors/ted-en-gb/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:23:39 zuntum Exp $
-share/Ted/ind/UK_English.ind
+@comment $NetBSD: PLIST,v 1.2 2022/05/19 13:32:48 nia Exp $
+share/Ted/dfa/en_GB.dfa
diff --git a/editors/ted-en-gb/distinfo b/editors/ted-en-gb/distinfo
index 97cb614ef54..209533a8bb5 100644
--- a/editors/ted-en-gb/distinfo
+++ b/editors/ted-en-gb/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 10:21:40 nia Exp $
+$NetBSD: distinfo,v 1.10 2022/05/19 13:32:48 nia Exp $
-BLAKE2s (Ted-2.16/Ted_en_GB.tar.gz) = e7b35e71de7e6b3bc58256412a585a901e233f8d923a9fc63b9b8ce63b6d0431
-SHA512 (Ted-2.16/Ted_en_GB.tar.gz) = 8a320d81514e4110babfb97dfbe9ed4df2dc9edfdac0cd5258ae1b6faa51acbd696f08d48a8f3607ab835d142e0f11fadbcdc3f151e4c0d218064386791cbfd8
-Size (Ted-2.16/Ted_en_GB.tar.gz) = 1181495 bytes
+BLAKE2s (ted_en_GB-2.23-1.noarch.rpm) = 58a16ddd008d193bcc82f2bd9660317bee57fa1a11681847627e303f039278d9
+SHA512 (ted_en_GB-2.23-1.noarch.rpm) = 5d4f716dca145d9c06a4286feaab10eff2d8a068edb999fa4ad7ecff930c4e970317f61ec3d8276333bef0d6f249d07ff3862d9e7a24486a6449f31fac40f76b
+Size (ted_en_GB-2.23-1.noarch.rpm) = 1372372 bytes
diff --git a/editors/ted-en-us/DESCR b/editors/ted-en-us/DESCR
deleted file mode 100644
index 14ee61107a7..00000000000
--- a/editors/ted-en-us/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-US English spelling dictionary for the Ted word processor.
diff --git a/editors/ted-en-us/Makefile b/editors/ted-en-us/Makefile
deleted file mode 100644
index 577af38e51d..00000000000
--- a/editors/ted-en-us/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.21 2020/01/26 17:31:07 rillig Exp $
-
-DISTNAME= ted-2.16.src
-PKGNAME= ted-en-us-2.16
-PKGREVISION= 1
-CATEGORIES= editors
-MASTER_SITES= ftp://ftp.nluug.nl/pub/editors/ted/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= https://www.nllgg.nl/Ted/
-COMMENT= US English spelling dictionary for the Ted word processor
-
-DEPENDS+= ted>=2.6:../../editors/ted
-
-WRKSRC= ${WRKDIR}/Ted-2.16
-NO_BUILD= YES
-
-USE_TOOLS+= tar
-INSTALLATION_DIRS= share/Ted/ind
-
-post-extract:
- @cd ${WRKSRC} ; ${TAR} xf tedPackage/TedBindist.tar
-
-do-install:
- ${INSTALL_DATA} ${WRKSRC}/ind/US_English.ind \
- ${DESTDIR}${PREFIX}/share/Ted/ind
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/editors/ted-en-us/PLIST b/editors/ted-en-us/PLIST
deleted file mode 100644
index 958030786e8..00000000000
--- a/editors/ted-en-us/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:23:41 zuntum Exp $
-share/Ted/ind/US_English.ind
diff --git a/editors/ted-en-us/distinfo b/editors/ted-en-us/distinfo
deleted file mode 100644
index 64e32370845..00000000000
--- a/editors/ted-en-us/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 10:21:40 nia Exp $
-
-BLAKE2s (ted-2.16.src.tar.gz) = 3c1335a16b27877bfd7947129a425ee42835dcd0da2e762870c5cfd3529576e7
-SHA512 (ted-2.16.src.tar.gz) = c5ff3f52b2b97e6db822e1f89931c83fb3c48dce76bc14dbcae46b462734f75cca6b27ee67da6927dfda9b3a779f0055136f9e7cf4c7b095bee3679870bcf69e
-Size (ted-2.16.src.tar.gz) = 2803601 bytes
diff --git a/editors/ted-es/Makefile b/editors/ted-es/Makefile
index 78f81b596d6..36647a845bf 100644
--- a/editors/ted-es/Makefile
+++ b/editors/ted-es/Makefile
@@ -1,26 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2020/01/26 17:31:07 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2022/05/19 13:32:49 nia Exp $
-DISTNAME= Ted_es_ES
-PKGNAME= ted-es-2.16
-PKGREVISION= 1
-CATEGORIES= editors
-MASTER_SITES= ftp://ftp.nluug.nl/pub/editors/ted/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= https://www.nllgg.nl/Ted/
-COMMENT= Spanish spelling dictionary for the Ted word processor
-
-DEPENDS+= ted>=2.6:../../editors/ted
-
-WRKSRC= ${WRKDIR}
-
-DIST_SUBDIR= Ted-2.16
-NO_BUILD= YES
-
-INSTALLATION_DIRS= share/Ted/ind
-
-do-install:
- ${INSTALL_DATA} ${WRKSRC}/ind/Spanish.ind \
- ${DESTDIR}${PREFIX}/share/Ted/ind
+LANGNAME= Spanish
+LANGCODE= es_ES
+PKG_LANGCODE= es
+.include "../../editors/ted/dictionary.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/ted-es/PLIST b/editors/ted-es/PLIST
index 1e603585270..c4e26cd0fa8 100644
--- a/editors/ted-es/PLIST
+++ b/editors/ted-es/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:23:44 zuntum Exp $
-share/Ted/ind/Spanish.ind
+@comment $NetBSD: PLIST,v 1.2 2022/05/19 13:32:49 nia Exp $
+share/Ted/dfa/es_ES.dfa
diff --git a/editors/ted-es/distinfo b/editors/ted-es/distinfo
index f4a2491d569..013bee2f191 100644
--- a/editors/ted-es/distinfo
+++ b/editors/ted-es/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 10:21:40 nia Exp $
+$NetBSD: distinfo,v 1.10 2022/05/19 13:32:49 nia Exp $
-BLAKE2s (Ted-2.16/Ted_es_ES.tar.gz) = 3698e38a5a56fe21ed438c1f8a0294c3ada42bb0d91c82fc0aec7e1762bf1a45
-SHA512 (Ted-2.16/Ted_es_ES.tar.gz) = b176f1a6296534e55e16c8a4f6d26151ca02ca12eae63d0446812f663df81b7985a45d91353f08a740f907ef207f446e79df3bd2fa5d76157f66c4224c753112
-Size (Ted-2.16/Ted_es_ES.tar.gz) = 750581 bytes
+BLAKE2s (ted_es_ES-2.23-1.noarch.rpm) = c7ce47de672818d4f7df8ac4725a4a5af4b9ad7d6e09a5f737a4d170a8676c0f
+SHA512 (ted_es_ES-2.23-1.noarch.rpm) = 822bb7f1faa2e354a727f028436927017135d31080a9498dc601ff1b821386d6c9b1485c1c9515d774f25fd9c24adb5f63c4f4021b0085f8c9baccc1d804f6b7
+Size (ted_es_ES-2.23-1.noarch.rpm) = 878016 bytes
diff --git a/editors/ted-et/DESCR b/editors/ted-et/DESCR
new file mode 100644
index 00000000000..52421c8918a
--- /dev/null
+++ b/editors/ted-et/DESCR
@@ -0,0 +1 @@
+Estonian spelling dictionary for the Ted word processor.
diff --git a/editors/ted-et/Makefile b/editors/ted-et/Makefile
new file mode 100644
index 00000000000..1cd79d97283
--- /dev/null
+++ b/editors/ted-et/Makefile
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2022/05/19 13:32:49 nia Exp $
+
+LANGNAME= Estonian
+LANGCODE= et_EE
+PKG_LANGCODE= et
+
+.include "../../editors/ted/dictionary.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/editors/ted-et/PLIST b/editors/ted-et/PLIST
new file mode 100644
index 00000000000..7773c20dba2
--- /dev/null
+++ b/editors/ted-et/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2022/05/19 13:32:49 nia Exp $
+share/Ted/dfa/et_EE.dfa
diff --git a/editors/ted-et/distinfo b/editors/ted-et/distinfo
new file mode 100644
index 00000000000..413a55f0bb2
--- /dev/null
+++ b/editors/ted-et/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2022/05/19 13:32:49 nia Exp $
+
+BLAKE2s (ted_et_EE-2.23-1.noarch.rpm) = e4a386f46befc16097f9facb7870e1ba36b3081b620f9663355e805c5de8c90b
+SHA512 (ted_et_EE-2.23-1.noarch.rpm) = 3a72988d72e56f2b84e299dc1d42a5bd795ee537fe441c763ed57d7868f81a66afe67a5bc6cdb95991bf40830596d63743bf2d8c0158bde7f8d0cbed04888734
+Size (ted_et_EE-2.23-1.noarch.rpm) = 538400 bytes
diff --git a/editors/ted-fr/Makefile b/editors/ted-fr/Makefile
index c65f7ae4b91..261212b5328 100644
--- a/editors/ted-fr/Makefile
+++ b/editors/ted-fr/Makefile
@@ -1,26 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2020/01/26 17:31:07 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2022/05/19 13:32:49 nia Exp $
-DISTNAME= Ted_fr_FR
-PKGNAME= ted-fr-2.16
-PKGREVISION= 1
-CATEGORIES= editors
-MASTER_SITES= ftp://ftp.nluug.nl/pub/editors/ted/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= https://www.nllgg.nl/Ted/
-COMMENT= French spelling dictionary for the Ted word processor
-
-DEPENDS+= ted>=2.6:../../editors/ted
-
-WRKSRC= ${WRKDIR}
-
-DIST_SUBDIR= Ted-2.16
-NO_BUILD= YES
-
-INSTALLATION_DIRS= share/Ted/ind
-
-do-install:
- ${INSTALL_DATA} ${WRKSRC}/ind/French.ind \
- ${DESTDIR}${PREFIX}/share/Ted/ind
+LANGNAME= French
+LANGCODE= fr_FR
+PKG_LANGCODE= fr
+.include "../../editors/ted/dictionary.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/ted-fr/PLIST b/editors/ted-fr/PLIST
index bd609013cc0..2a073ba1d33 100644
--- a/editors/ted-fr/PLIST
+++ b/editors/ted-fr/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:23:46 zuntum Exp $
-share/Ted/ind/French.ind
+@comment $NetBSD: PLIST,v 1.2 2022/05/19 13:32:49 nia Exp $
+share/Ted/dfa/fr_FR.dfa
diff --git a/editors/ted-fr/distinfo b/editors/ted-fr/distinfo
index c34285b20b5..e3eb56d0e36 100644
--- a/editors/ted-fr/distinfo
+++ b/editors/ted-fr/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 10:21:41 nia Exp $
+$NetBSD: distinfo,v 1.10 2022/05/19 13:32:49 nia Exp $
-BLAKE2s (Ted-2.16/Ted_fr_FR.tar.gz) = 767aaaf859d1d3915aae5e62db97cd30d952007cf0aa3ce9f0d998fee2bc3134
-SHA512 (Ted-2.16/Ted_fr_FR.tar.gz) = 574268fb85e758d5ba0966d6432277cea1dedc9d9a3c64c0946aaf1f4890091b681c426778163d8c7b893d3de5fdbc4c1d60b6128b410c1e33a39e33914d3f3d
-Size (Ted-2.16/Ted_fr_FR.tar.gz) = 931143 bytes
+BLAKE2s (ted_fr_FR-2.23-1.noarch.rpm) = 567a4740eff8fa1cae74c38acf1972dc5629a8abaa0598680002743e132e1a06
+SHA512 (ted_fr_FR-2.23-1.noarch.rpm) = ae8d5f6d821f96332f3849e47988b735dd566636ca584ceb0cbf946698bde5526f2f02bea5c3eb2874f4b278de7774945e6a947897582f6f12c4092c30ceb91c
+Size (ted_fr_FR-2.23-1.noarch.rpm) = 941298 bytes
diff --git a/editors/ted-hr/DESCR b/editors/ted-hr/DESCR
new file mode 100644
index 00000000000..cdfd646d539
--- /dev/null
+++ b/editors/ted-hr/DESCR
@@ -0,0 +1 @@
+Croatian spelling dictionary for the Ted word processor.
diff --git a/editors/ted-hr/Makefile b/editors/ted-hr/Makefile
new file mode 100644
index 00000000000..a4f12f4c96a
--- /dev/null
+++ b/editors/ted-hr/Makefile
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2022/05/19 13:32:49 nia Exp $
+
+LANGNAME= Croatian
+LANGCODE= hr_HR
+PKG_LANGCODE= hr
+
+.include "../../editors/ted/dictionary.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/editors/ted-hr/PLIST b/editors/ted-hr/PLIST
new file mode 100644
index 00000000000..a1b4776027f
--- /dev/null
+++ b/editors/ted-hr/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2022/05/19 13:32:49 nia Exp $
+share/Ted/dfa/hr_HR.dfa
diff --git a/editors/ted-hr/distinfo b/editors/ted-hr/distinfo
new file mode 100644
index 00000000000..309ac6469f7
--- /dev/null
+++ b/editors/ted-hr/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2022/05/19 13:32:49 nia Exp $
+
+BLAKE2s (ted_hr_HR-2.23-1.noarch.rpm) = 6fa8aaef96776ce1f07d7ee4ab34a05e09323b25975ea1883ed3171135b01caf
+SHA512 (ted_hr_HR-2.23-1.noarch.rpm) = 730fdd090f341a623ffa74303337c80b155e503ca32971f1dfd0ccb950fc8bd02152baec68c7ea9bf5aee562ea6219af1558d3cafb4c1d1b3e330d9587233f94
+Size (ted_hr_HR-2.23-1.noarch.rpm) = 1397265 bytes
diff --git a/editors/ted-it/Makefile b/editors/ted-it/Makefile
index 12cf62f69a8..4900e649a94 100644
--- a/editors/ted-it/Makefile
+++ b/editors/ted-it/Makefile
@@ -1,26 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2020/01/26 17:31:07 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2022/05/19 13:32:49 nia Exp $
-DISTNAME= Ted_it_IT
-PKGNAME= ted-it-2.16
-PKGREVISION= 1
-CATEGORIES= editors
-MASTER_SITES= ftp://ftp.nluug.nl/pub/editors/ted/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= https://www.nllgg.nl/Ted/
-COMMENT= Italian spelling dictionary for the Ted word processor
-
-DEPENDS+= ted>=2.6:../../editors/ted
-
-WRKSRC= ${WRKDIR}
-
-DIST_SUBDIR= Ted-2.16
-NO_BUILD= YES
-
-INSTALLATION_DIRS= share/Ted/ind
-
-do-install:
- ${INSTALL_DATA} ${WRKSRC}/ind/Italian.ind \
- ${DESTDIR}${PREFIX}/share/Ted/ind
+LANGNAME= Italian
+LANGCODE= it_IT
+PKG_LANGCODE= it
+.include "../../editors/ted/dictionary.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/ted-it/PLIST b/editors/ted-it/PLIST
index 9e1e16f2a57..99c3760906b 100644
--- a/editors/ted-it/PLIST
+++ b/editors/ted-it/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:23:48 zuntum Exp $
-share/Ted/ind/Italian.ind
+@comment $NetBSD: PLIST,v 1.2 2022/05/19 13:32:49 nia Exp $
+share/Ted/dfa/it_IT.dfa
diff --git a/editors/ted-it/distinfo b/editors/ted-it/distinfo
index 8f8a39514c2..96ea5c5d4a8 100644
--- a/editors/ted-it/distinfo
+++ b/editors/ted-it/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 10:21:41 nia Exp $
+$NetBSD: distinfo,v 1.10 2022/05/19 13:32:49 nia Exp $
-BLAKE2s (Ted-2.16/Ted_it_IT.tar.gz) = f2180f5130143b0302b4808929e9e5e087a4d687d4c1f73bc2ede02a31676d99
-SHA512 (Ted-2.16/Ted_it_IT.tar.gz) = 983840046683f316a4ebe77d578ef73f0d0a711ac6f4501b6a7e88e80a3298eab98b58cb649b217f34daa506da0f87fb3e23bb8dbd481fcbfb0af8bd1cd31082
-Size (Ted-2.16/Ted_it_IT.tar.gz) = 272135 bytes
+BLAKE2s (ted_it_IT-2.23-1.noarch.rpm) = da41f8170e6dbb03446b06e58e18f43ea76c5f22709bc29b7555f0720b613ee0
+SHA512 (ted_it_IT-2.23-1.noarch.rpm) = d1feec5d06b0ce4a28a5b2d7e2a726b0e7d4b0d3b4dc664bbb321ffaa9f1c6a4b3e56db9ee5b281f8609cd636defbaa2ef61d560902dcb34617c3d43e22fed62
+Size (ted_it_IT-2.23-1.noarch.rpm) = 583806 bytes
diff --git a/editors/ted-nl/Makefile b/editors/ted-nl/Makefile
index 0ed864bf50c..13f7b361a04 100644
--- a/editors/ted-nl/Makefile
+++ b/editors/ted-nl/Makefile
@@ -1,26 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2020/01/26 17:31:07 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2022/05/19 13:32:49 nia Exp $
-DISTNAME= Ted_nl_NL
-PKGNAME= ted-nl-2.16
-PKGREVISION= 1
-CATEGORIES= editors
-MASTER_SITES= ftp://ftp.nluug.nl/pub/editors/ted/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= https://www.nllgg.nl/Ted/
-COMMENT= Dutch spelling dictionary for the Ted word processor
-
-DEPENDS+= ted>=2.6:../../editors/ted
-
-WRKSRC= ${WRKDIR}
-
-DIST_SUBDIR= Ted-2.16
-NO_BUILD= YES
-
-INSTALLATION_DIRS= share/Ted/ind
-
-do-install:
- ${INSTALL_DATA} ${WRKSRC}/ind/Dutch.ind \
- ${DESTDIR}${PREFIX}/share/Ted/ind
+LANGNAME= Dutch
+LANGCODE= nl_NL
+PKG_LANGCODE= nl
+.include "../../editors/ted/dictionary.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/ted-nl/PLIST b/editors/ted-nl/PLIST
index 7dc9cd36742..a3dd8bc2943 100644
--- a/editors/ted-nl/PLIST
+++ b/editors/ted-nl/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:23:49 zuntum Exp $
-share/Ted/ind/Dutch.ind
+@comment $NetBSD: PLIST,v 1.2 2022/05/19 13:32:49 nia Exp $
+share/Ted/dfa/nl_NL.dfa
diff --git a/editors/ted-nl/distinfo b/editors/ted-nl/distinfo
index 71e904d5d4e..ca5949c53da 100644
--- a/editors/ted-nl/distinfo
+++ b/editors/ted-nl/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 10:21:41 nia Exp $
+$NetBSD: distinfo,v 1.10 2022/05/19 13:32:49 nia Exp $
-BLAKE2s (Ted-2.16/Ted_nl_NL.tar.gz) = 869702f3843912991d6339966109d6dd28ffea9bce0a5a0458c11f41cf66eb87
-SHA512 (Ted-2.16/Ted_nl_NL.tar.gz) = 204dd8a6aeb71e6d4b483299b185a0c0a217e06caf417e78319e00436e017338f8db9859ba09f79fb228309bd789a4c4cdc59230907aa7698d3571009c1c5fe1
-Size (Ted-2.16/Ted_nl_NL.tar.gz) = 1987790 bytes
+BLAKE2s (ted_nl_NL-2.23-1.noarch.rpm) = bf7fa7b039570b869154ff6833103fc7050106252694f32d9fe2286a074f1dd2
+SHA512 (ted_nl_NL-2.23-1.noarch.rpm) = 8dcafcf7ec9c423973748e99281e96e16c82dbd8bc40d307585a2b5e199acaa838b1dfc95d45f85bf83f9c664c3a58827dfb080b7304952d9fc3992db626d556
+Size (ted_nl_NL-2.23-1.noarch.rpm) = 2116118 bytes
diff --git a/editors/ted-no/Makefile b/editors/ted-no/Makefile
index 2f32c603d6e..8c6b0849787 100644
--- a/editors/ted-no/Makefile
+++ b/editors/ted-no/Makefile
@@ -1,26 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2020/01/26 17:31:07 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2022/05/19 13:32:49 nia Exp $
-DISTNAME= Ted_no_NO
-PKGNAME= ted-no-2.16
-PKGREVISION= 1
-CATEGORIES= editors
-MASTER_SITES= ftp://ftp.nluug.nl/pub/editors/ted/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= https://www.nllgg.nl/Ted/
-COMMENT= Norwegian spelling dictionary for the Ted word processor
-
-DEPENDS+= ted>=2.6:../../editors/ted
-
-WRKSRC= ${WRKDIR}
-
-DIST_SUBDIR= Ted-2.16
-NO_BUILD= YES
-
-INSTALLATION_DIRS= share/Ted/ind
-
-do-install:
- ${INSTALL_DATA} ${WRKSRC}/ind/Norwegian.ind \
- ${DESTDIR}${PREFIX}/share/Ted/ind
+LANGNAME= Norwegian
+LANGCODE= nb_NO
+PKG_LANGCODE= no
+.include "../../editors/ted/dictionary.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/ted-no/PLIST b/editors/ted-no/PLIST
index 8a3b1e34438..237aae0e7cb 100644
--- a/editors/ted-no/PLIST
+++ b/editors/ted-no/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:23:52 zuntum Exp $
-share/Ted/ind/Norwegian.ind
+@comment $NetBSD: PLIST,v 1.2 2022/05/19 13:32:49 nia Exp $
+share/Ted/dfa/nb_NO.dfa
diff --git a/editors/ted-no/distinfo b/editors/ted-no/distinfo
index 7df72d7504d..42b20e5ba10 100644
--- a/editors/ted-no/distinfo
+++ b/editors/ted-no/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 10:21:41 nia Exp $
+$NetBSD: distinfo,v 1.10 2022/05/19 13:32:49 nia Exp $
-BLAKE2s (Ted-2.16/Ted_no_NO.tar.gz) = e9f4e5cdc0683085e04a46995a7e334197272026faa9501f8840e8aeb549506c
-SHA512 (Ted-2.16/Ted_no_NO.tar.gz) = f6c1a7e64fcc3c2e717b3dfa1e9b564acf6d3e140a380bdc1276d59a3b5fca7f0c46c45bbdb23a7ed235fe7a8d73b3c6e3b143a26c402bb4af40a96b5642de53
-Size (Ted-2.16/Ted_no_NO.tar.gz) = 1599772 bytes
+BLAKE2s (ted_nb_NO-2.23-1.noarch.rpm) = aa76a9ab97e507d61ac4ec737a754edf1d776c8781c648a0b269a86e6f1353a6
+SHA512 (ted_nb_NO-2.23-1.noarch.rpm) = 6a714c99ac47cd82eaa0b0e5f2d5fabc403d67bd8779b5920ff4eb292640fdd41de1d61a38a4d718b323f179d1ed31dc57c1d9a79188f087b67cacac5b9378ad
+Size (ted_nb_NO-2.23-1.noarch.rpm) = 1787799 bytes
diff --git a/editors/ted-pl/Makefile b/editors/ted-pl/Makefile
index 26ac18b5e37..4a305c3c420 100644
--- a/editors/ted-pl/Makefile
+++ b/editors/ted-pl/Makefile
@@ -1,38 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2020/01/26 17:31:07 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2022/05/19 13:32:49 nia Exp $
-DISTNAME= Ted_pl_PL
-PKGNAME= ted-pl-2.16
-PKGREVISION= 1
-CATEGORIES= editors
-MASTER_SITES= ftp://ftp.nluug.nl/pub/editors/ted/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= https://www.nllgg.nl/Ted/
-COMMENT= Polish spelling dictionary for the Ted word processor
-
-DEPENDS+= ted>=2.6:../../editors/ted
-
-WRKSRC= ${WRKDIR}
-
-DIST_SUBDIR= Ted-2.16
-NO_BUILD= YES
-
-INSTALLATION_DIRS= share/Ted/ind
-
-post-extract:
- cd ${WRKSRC};tar xvf Ted/ad/Ted_pl_PL.ad.tar
-
-post-patch:
- ${ECHO} "Ted*fontList: -adobe-helvetica-medium-r-*-*-*-100-*-*-*-*-iso8859-2" \
- >>${WRKSRC}/usr/lib/X11/pl_PL/app-defaults/Ted
- ${ECHO} "Ted.documentFileName: ${PREFIX}/share/doc/Ted/TedDocument-en_US.rtf" \
- >>${WRKSRC}/usr/lib/X11/pl_PL/app-defaults/Ted
-
-do-install:
- ${INSTALL_DATA} ${WRKSRC}/ind/Polish.ind \
- ${DESTDIR}${PREFIX}/share/Ted/ind
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/X11/app-defaults/pl_PL
- ${INSTALL_DATA} ${WRKSRC}/usr/lib/X11/pl_PL/app-defaults/Ted \
- ${DESTDIR}${PREFIX}/lib/X11/app-defaults/pl_PL/
+LANGNAME= Polish
+LANGCODE= pl_PL
+PKG_LANGCODE= pl
+.include "../../editors/ted/dictionary.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/ted-pl/PLIST b/editors/ted-pl/PLIST
index ab4e8383c1f..4083978d902 100644
--- a/editors/ted-pl/PLIST
+++ b/editors/ted-pl/PLIST
@@ -1,3 +1,2 @@
-@comment $NetBSD: PLIST,v 1.2 2018/01/01 22:29:26 rillig Exp $
-lib/X11/app-defaults/pl_PL/Ted
-share/Ted/ind/Polish.ind
+@comment $NetBSD: PLIST,v 1.3 2022/05/19 13:32:49 nia Exp $
+share/Ted/dfa/pl_PL.dfa
diff --git a/editors/ted-pl/distinfo b/editors/ted-pl/distinfo
index bfd8cda45a6..637042c3a6a 100644
--- a/editors/ted-pl/distinfo
+++ b/editors/ted-pl/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 10:21:41 nia Exp $
+$NetBSD: distinfo,v 1.7 2022/05/19 13:32:49 nia Exp $
-BLAKE2s (Ted-2.16/Ted_pl_PL.tar.gz) = eb8ec129073f20f8dbb4d96a48ee8f54d0335d504124f969af8f6b38a5098872
-SHA512 (Ted-2.16/Ted_pl_PL.tar.gz) = 63b502bf15781b9163b208f3f21a4c6c44f19ba3caf771d598f9477138f26737ab2c91e05b27b1661e5c13a28be6f1f0ff2d19b0e8febfb90832dd3a37b5d410
-Size (Ted-2.16/Ted_pl_PL.tar.gz) = 1181498 bytes
+BLAKE2s (ted_pl_PL-2.23-1.noarch.rpm) = ffe29e3bc5789bcccd4c63867b757faa81ddb211f12905703188ac90fce19bcf
+SHA512 (ted_pl_PL-2.23-1.noarch.rpm) = 9cd3eaa6bfad5e171d22d11911582fd2723113f445a331c69d65ab5a34994d72992bb0f71e5e94fe6b58382eef69e3fba2e3187ac96c6c23ef61080983ef0b1b
+Size (ted_pl_PL-2.23-1.noarch.rpm) = 3752677 bytes
diff --git a/editors/ted-pt/Makefile b/editors/ted-pt/Makefile
index 675f7e07624..3e264cd5f8a 100644
--- a/editors/ted-pt/Makefile
+++ b/editors/ted-pt/Makefile
@@ -1,26 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2020/01/26 17:31:07 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2022/05/19 13:32:50 nia Exp $
-DISTNAME= Ted_pt_PT
-PKGNAME= ted-pt-2.16
-PKGREVISION= 1
-CATEGORIES= editors
-MASTER_SITES= ftp://ftp.nluug.nl/pub/editors/ted/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= https://www.nllgg.nl/Ted/
-COMMENT= Portuguese spelling dictionary for the Ted word processor
-
-DEPENDS+= ted>=2.6:../../editors/ted
-
-WRKSRC= ${WRKDIR}
-
-DIST_SUBDIR= Ted-2.16
-NO_BUILD= YES
-
-INSTALLATION_DIRS= share/Ted/ind
-
-do-install:
- ${INSTALL_DATA} ${WRKSRC}/ind/Portuguese.ind \
- ${DESTDIR}${PREFIX}/share/Ted/ind
+LANGNAME= Portugese
+LANGCODE= pt_PT
+PKG_LANGCODE= pt
+.include "../../editors/ted/dictionary.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/ted-pt/PLIST b/editors/ted-pt/PLIST
index 491e80039a6..113e47ee6ef 100644
--- a/editors/ted-pt/PLIST
+++ b/editors/ted-pt/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:23:54 zuntum Exp $
-share/Ted/ind/Portuguese.ind
+@comment $NetBSD: PLIST,v 1.2 2022/05/19 13:32:50 nia Exp $
+share/Ted/dfa/pt_PT.dfa
diff --git a/editors/ted-pt/distinfo b/editors/ted-pt/distinfo
index e6cf4cdca34..7cc22fd144a 100644
--- a/editors/ted-pt/distinfo
+++ b/editors/ted-pt/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 10:21:41 nia Exp $
+$NetBSD: distinfo,v 1.10 2022/05/19 13:32:50 nia Exp $
-BLAKE2s (Ted-2.16/Ted_pt_PT.tar.gz) = e1ac663de56b31c807a83b81a66d67c15de5bfa2214d9b02e3a538c9b1f4e6b8
-SHA512 (Ted-2.16/Ted_pt_PT.tar.gz) = 31d7386b759d0ae52475c130b171a82a005e772370de023b6f27915f7d8569d3c6f4f57b78df6e6d11ae07a65004eec7b0578282d49c6d1dc04f93c917c91b12
-Size (Ted-2.16/Ted_pt_PT.tar.gz) = 534710 bytes
+BLAKE2s (ted_pt_PT-2.23-1.noarch.rpm) = 5ee3f0945d3af83fa0d6ece3eb27823469831d7d28927b40fd665e130ba105d1
+SHA512 (ted_pt_PT-2.23-1.noarch.rpm) = ea72d9797aaa3a202558c9f8ef4af5797dd454daf0e7f69aa65d32b759f066d569b2811cbee25430bdb6524eb12f1dd2eb72c34b01fcdcf31eba176b5e223b38
+Size (ted_pt_PT-2.23-1.noarch.rpm) = 642556 bytes
diff --git a/editors/ted-ru/DESCR b/editors/ted-ru/DESCR
new file mode 100644
index 00000000000..c43b9fb8b98
--- /dev/null
+++ b/editors/ted-ru/DESCR
@@ -0,0 +1 @@
+Russian spelling dictionary for the Ted word processor.
diff --git a/editors/ted-ru/Makefile b/editors/ted-ru/Makefile
new file mode 100644
index 00000000000..3255d0ac545
--- /dev/null
+++ b/editors/ted-ru/Makefile
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2022/05/19 13:32:50 nia Exp $
+
+LANGNAME= Russian
+LANGCODE= ru_RU
+PKG_LANGCODE= ru
+
+.include "../../editors/ted/dictionary.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/editors/ted-ru/PLIST b/editors/ted-ru/PLIST
new file mode 100644
index 00000000000..4368c154c2d
--- /dev/null
+++ b/editors/ted-ru/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2022/05/19 13:32:50 nia Exp $
+share/Ted/dfa/ru_RU.dfa
diff --git a/editors/ted-ru/distinfo b/editors/ted-ru/distinfo
new file mode 100644
index 00000000000..17a847a06de
--- /dev/null
+++ b/editors/ted-ru/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2022/05/19 13:32:50 nia Exp $
+
+BLAKE2s (ted_ru_RU-2.23-1.noarch.rpm) = d8f78d55a2a02a1198a968a3a94eb06c03097062b90f5e228c13c4b2cbbd4f0c
+SHA512 (ted_ru_RU-2.23-1.noarch.rpm) = be48cb9205aef6492afe1c8002deb1468657a8c20e3602277eecc8308eb1d8042038d3f872e9cb0681a3996c093289d7ec8cb75b4c845d6e714e0a5f87ee39e1
+Size (ted_ru_RU-2.23-1.noarch.rpm) = 71892 bytes
diff --git a/editors/ted-sk/DESCR b/editors/ted-sk/DESCR
new file mode 100644
index 00000000000..6c44a2b41ca
--- /dev/null
+++ b/editors/ted-sk/DESCR
@@ -0,0 +1 @@
+Slovak spelling dictionary for the Ted word processor.
diff --git a/editors/ted-sk/Makefile b/editors/ted-sk/Makefile
new file mode 100644
index 00000000000..d817a9ee8f6
--- /dev/null
+++ b/editors/ted-sk/Makefile
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2022/05/19 13:32:50 nia Exp $
+
+LANGNAME= Slovak
+LANGCODE= sk_SK
+PKG_LANGCODE= sk
+
+.include "../../editors/ted/dictionary.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/editors/ted-sk/PLIST b/editors/ted-sk/PLIST
new file mode 100644
index 00000000000..d903e8501f4
--- /dev/null
+++ b/editors/ted-sk/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2022/05/19 13:32:50 nia Exp $
+share/Ted/dfa/sk_SK.dfa
diff --git a/editors/ted-sk/distinfo b/editors/ted-sk/distinfo
new file mode 100644
index 00000000000..ff9a401ef0f
--- /dev/null
+++ b/editors/ted-sk/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2022/05/19 13:32:50 nia Exp $
+
+BLAKE2s (ted_sk_SK-2.23-1.noarch.rpm) = bc15c63943addc0adc397a9f8f1ff63c4d08dec6af49560850d32d29393859da
+SHA512 (ted_sk_SK-2.23-1.noarch.rpm) = 07f95f4121bdef3b195165aa7615f62f1006c8c3b6a189e5e7ab51822aa0e73c0af03f458d706de222977d7789ea9388269013119897c8a164d5f0ae4c27e9b9
+Size (ted_sk_SK-2.23-1.noarch.rpm) = 2591329 bytes
diff --git a/editors/ted-sl/DESCR b/editors/ted-sl/DESCR
new file mode 100644
index 00000000000..c5248bd4f94
--- /dev/null
+++ b/editors/ted-sl/DESCR
@@ -0,0 +1 @@
+Slovene spelling dictionary for the Ted word processor.
diff --git a/editors/ted-sl/Makefile b/editors/ted-sl/Makefile
new file mode 100644
index 00000000000..dfc0c32982f
--- /dev/null
+++ b/editors/ted-sl/Makefile
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2022/05/19 13:32:50 nia Exp $
+
+LANGNAME= Slovene
+LANGCODE= sl_SI
+PKG_LANGCODE= sl
+
+.include "../../editors/ted/dictionary.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/editors/ted-sl/PLIST b/editors/ted-sl/PLIST
new file mode 100644
index 00000000000..7806e9f33c2
--- /dev/null
+++ b/editors/ted-sl/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2022/05/19 13:32:50 nia Exp $
+share/Ted/dfa/sl_SI.dfa
diff --git a/editors/ted-sl/distinfo b/editors/ted-sl/distinfo
new file mode 100644
index 00000000000..6b73de2d106
--- /dev/null
+++ b/editors/ted-sl/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2022/05/19 13:32:50 nia Exp $
+
+BLAKE2s (ted_sl_SI-2.23-1.noarch.rpm) = 33322fc28402e87854cfbda09f5e45e4cf3868e1bfb8c081ce97e4a35af75cfe
+SHA512 (ted_sl_SI-2.23-1.noarch.rpm) = 94051b5e4d2390c4f3304924f0ae77de1a353781b4f5e0d3335773d5cf59005a79f1b6708bb2f8e8bb6f0badf815904cf85370d8c6b03f220b48fb50effb6396
+Size (ted_sl_SI-2.23-1.noarch.rpm) = 319058 bytes
diff --git a/editors/ted-sv/Makefile b/editors/ted-sv/Makefile
index fe137a0cab3..4258a5160ce 100644
--- a/editors/ted-sv/Makefile
+++ b/editors/ted-sv/Makefile
@@ -1,26 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2020/01/26 17:31:08 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2022/05/19 13:32:50 nia Exp $
-DISTNAME= Ted_sv_SE
-PKGNAME= ted-sv-2.16
-PKGREVISION= 1
-CATEGORIES= editors
-MASTER_SITES= ftp://ftp.nluug.nl/pub/editors/ted/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= https://www.nllgg.nl/Ted/
-COMMENT= Swedish spelling dictionary for the Ted word processor
-
-DEPENDS+= ted>=2.6:../../editors/ted
-
-WRKSRC= ${WRKDIR}
-
-DIST_SUBDIR= Ted-2.16
-NO_BUILD= YES
-
-INSTALLATION_DIRS= share/Ted/ind
-
-do-install:
- ${INSTALL_DATA} ${WRKSRC}/ind/Swedish.ind \
- ${DESTDIR}${PREFIX}/share/Ted/ind
+LANGNAME= Swedish
+LANGCODE= sv_SE
+PKG_LANGCODE= sv
+.include "../../editors/ted/dictionary.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/ted-sv/PLIST b/editors/ted-sv/PLIST
index 6eb408cb756..175c3a9902e 100644
--- a/editors/ted-sv/PLIST
+++ b/editors/ted-sv/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:23:57 zuntum Exp $
-share/Ted/ind/Swedish.ind
+@comment $NetBSD: PLIST,v 1.2 2022/05/19 13:32:50 nia Exp $
+share/Ted/dfa/sv_SE.dfa
diff --git a/editors/ted-sv/distinfo b/editors/ted-sv/distinfo
index a44c202d1b8..efe5c36a8a3 100644
--- a/editors/ted-sv/distinfo
+++ b/editors/ted-sv/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 10:21:41 nia Exp $
+$NetBSD: distinfo,v 1.10 2022/05/19 13:32:50 nia Exp $
-BLAKE2s (Ted-2.16/Ted_sv_SE.tar.gz) = 7c0deca47027e4c5e4d5ddf014add5d369b5f2afe2df5ac05d6114b0b6af0c75
-SHA512 (Ted-2.16/Ted_sv_SE.tar.gz) = 0c46d89e71319251baf23837b829d2297fb29ae9f9dc4d74f14dc564b1e48b8e939b68ade1cf261cbbcfbc04d1ab11581502b6d53e0d18699ebc9022a5048b6c
-Size (Ted-2.16/Ted_sv_SE.tar.gz) = 470266 bytes
+BLAKE2s (ted_sv_SE-2.23-1.noarch.rpm) = 1f521255d2c7bd946c32b71d6bcaacd3f1d01ff2de293dcf6e0b0ba2b7033ecf
+SHA512 (ted_sv_SE-2.23-1.noarch.rpm) = 07659e5b09a6f2dafb341801afef2935f79db0bdd2c2bc311705e77de1b36e43c63b0ed3b094eb758faba027506abe5bc545681b0b7dc93aac579739381624b4
+Size (ted_sv_SE-2.23-1.noarch.rpm) = 514104 bytes
diff --git a/editors/ted/MESSAGE b/editors/ted/MESSAGE
deleted file mode 100644
index db7a02aaa39..00000000000
--- a/editors/ted/MESSAGE
+++ /dev/null
@@ -1,7 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/09/24 12:29:58 wiz Exp $
-
-This pkg does not install any spelling dictionaries. Spelling dictionaries
-for various languages are available as separate packages.
-
-===========================================================================
diff --git a/editors/ted/Makefile b/editors/ted/Makefile
index 9d89643913d..2e324adc84f 100644
--- a/editors/ted/Makefile
+++ b/editors/ted/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.65 2020/08/17 20:18:35 leot Exp $
+# $NetBSD: Makefile,v 1.66 2022/05/19 13:32:47 nia Exp $
-DISTNAME= ted-2.21.src
+DISTNAME= ted-2.23.src
PKGNAME= ${DISTNAME:S/.src//}
-PKGREVISION= 13
CATEGORIES= editors
-MASTER_SITES= ftp://ftp.nluug.nl/pub/editors/ted/
+MASTER_SITES= https://ftp.nluug.nl/pub/editors/ted/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= https://www.nllgg.nl/Ted/
@@ -12,13 +11,12 @@ COMMENT= X11 based WordPad-like word processor
LICENSE= gnu-gpl-v2
USE_LANGUAGES= c c++
-USE_TOOLS+= bsdtar
MAKE_JOBS_SAFE= no
-WRKSRC= ${WRKDIR}/Ted-2.21
+WRKSRC= ${WRKDIR}/Ted-${PKGVERSION_NOREV}
AFMDIR= ${PREFIX}/share/Ted/afm
-INDDIR= ${PREFIX}/share/Ted/ind
+INDDIR= ${PREFIX}/share/Ted/dfa
INFODIR= ${PREFIX}/share/doc/Ted
CONFIGURE_ENV+= ac_jpeg_includes="${JPEGBASE}/include"
@@ -42,33 +40,33 @@ LDFLAGS+= -lfontconfig
MAKE_FLAGS+= CONFIGURE_OPTIONS=--x-libraries=${X11BASE}/lib\ --with-MOTIF
MAKE_ENV+= ${CONFIGURE_ENV}
-MAKE_ENV+= DEF_PKGDIR='-DPKGDIR=\"${PREFIX}\"' \
- DEF_AFMDIR='-DAFMDIR=\"${AFMDIR}\"' \
- DEF_INDDIR='-DINDDIR=\"${INDDIR}\"' \
- DEF_INFODIR='-DDOCUMENT_DIR=\"${INFODIR}\"'
+CPPFLAGS+= -DPKGDIR=\"${PREFIX}\"
+CPPFLAGS+= -DAFMDIR=\"${AFMDIR}\"
+CPPFLAGS+= -DINDDIR=\"${INDDIR}\"
+CPPFLAGS+= -DDOCUMENT_DIR=\"${INFODIR}\"
BUILD_TARGET= compile.shared
-INSTALL_TARGET= install.shared
-INSTALLATION_DIRS= bin lib/X11/app-defaults ${AFMDIR} ${INDDIR} ${INFODIR}
+INSTALLATION_DIRS= bin ${AFMDIR} ${INDDIR} ${INFODIR}
+INSTALLATION_DIRS+= ${PKGMANDIR}/man1
+INSTALLATION_DIRS+= share/applications
+INSTALLATION_DIRS+= share/pixmaps
post-extract:
- @cd ${WRKSRC} ; ${TOOLS_PATH.bsdtar} xf tedPackage/TedBindist.tar
-
-post-patch:
- @cd ${WRKSRC}/Ted ; \
- ${SED} -e "s!Ted.afmDirectory:.*!Ted.afmDirectory:${AFMDIR}!g" \
- -e "s!Ted.spellToolSystemDicts:.*!Ted.spellToolSystemDicts:${INDDIR}!g" \
- -e "s!Ted.documentFileName:.*!Ted.documentFileName:${INFODIR}/TedDocument-en_US.rtf!g" \
- Ted.ad.sample > Ted.ad
+ @cd ${WRKSRC} ; tar xf tedPackage/TedDatadir.tar
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/Ted/Ted ${DESTDIR}${PREFIX}/bin/Ted
- ${INSTALL_DATA} ${WRKSRC}/Ted/afm/*.afm ${DESTDIR}${AFMDIR}
- ${INSTALL_DATA} ${FILESDIR}/README.ind ${DESTDIR}${INDDIR}
- ${INSTALL_DATA} ${WRKSRC}/Ted/TedDocument-en_US.rtf ${DESTDIR}${INFODIR}
- ${INSTALL_DATA} ${WRKSRC}/Ted/Ted.ad \
- ${DESTDIR}${PREFIX}/lib/X11/app-defaults/Ted
+ ${INSTALL_MAN} ${WRKSRC}/doc/Ted.1 \
+ ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/Ted.1
+ ${INSTALL_DATA} ${WRKSRC}/afm/*.afm ${DESTDIR}${AFMDIR}
+ ${INSTALL_DATA} ${WRKSRC}/TedDocument-en_US.rtf ${DESTDIR}${INFODIR}
+ ${INSTALL_DATA} ${FILESDIR}/Ted.desktop \
+ ${DESTDIR}${PREFIX}/share/applications
+ ${INSTALL_DATA} ${WRKSRC}/Ted.png \
+ ${DESTDIR}${PREFIX}/share/pixmaps
+ ${INSTALL_DATA} ${WRKSRC}/dfa/*.dfa \
+ ${DESTDIR}${INDDIR}
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/pcre/buildlink3.mk"
@@ -80,5 +78,4 @@ do-install:
.include "../../x11/libXft/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
.include "../../mk/motif.buildlink3.mk"
-
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/ted/PLIST b/editors/ted/PLIST
index 5f2a72eedfd..76ab2118da7 100644
--- a/editors/ted/PLIST
+++ b/editors/ted/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2010/06/14 09:55:04 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2022/05/19 13:32:47 nia Exp $
bin/Ted
-lib/X11/app-defaults/Ted
+man/man1/Ted.1
share/Ted/afm/AvantGarde-Book.afm
share/Ted/afm/AvantGarde-BookOblique.afm
share/Ted/afm/AvantGarde-Demi.afm
@@ -36,5 +36,7 @@ share/Ted/afm/Times-Italic.afm
share/Ted/afm/Times-Roman.afm
share/Ted/afm/ZapfChancery-MediumItalic.afm
share/Ted/afm/ZapfDingbats.afm
-share/Ted/ind/README.ind
+share/Ted/dfa/en_US.dfa
+share/applications/Ted.desktop
share/doc/Ted/TedDocument-en_US.rtf
+share/pixmaps/Ted.png
diff --git a/editors/ted/dictionary.mk b/editors/ted/dictionary.mk
new file mode 100644
index 00000000000..25a45ab9e49
--- /dev/null
+++ b/editors/ted/dictionary.mk
@@ -0,0 +1,23 @@
+# $NetBSD: dictionary.mk,v 1.1 2022/05/19 13:32:47 nia Exp $
+
+DISTNAME= ted_${LANGCODE}-2.23-1.noarch
+PKGNAME= ted-${PKG_LANGCODE}-2.23
+CATEGORIES= editors
+MASTER_SITES= https://ftp.nluug.nl/pub/editors/ted/
+EXTRACT_SUFX= .rpm
+
+MAINTAINER= pkgsrc-users@NetBSD.org
+HOMEPAGE= https://www.nllgg.nl/Ted/
+COMMENT= ${LANGNAME} spelling dictionary for the Ted word processor
+LICENSE= gnu-gpl-v2
+
+DEPENDS+= ted>=2.23:../../editors/ted
+
+USE_LANGUAGES= # none
+NO_BUILD= YES
+
+INSTALLATION_DIRS= share/Ted/dfa
+
+do-install:
+ ${INSTALL_DATA} ${WRKDIR}/usr/share/Ted/dfa/*.dfa \
+ ${DESTDIR}${PREFIX}/share/Ted/dfa
diff --git a/editors/ted/distinfo b/editors/ted/distinfo
index c288a470161..84ad77714f6 100644
--- a/editors/ted/distinfo
+++ b/editors/ted/distinfo
@@ -1,14 +1,5 @@
-$NetBSD: distinfo,v 1.19 2021/10/26 10:21:40 nia Exp $
+$NetBSD: distinfo,v 1.20 2022/05/19 13:32:47 nia Exp $
-BLAKE2s (ted-2.21.src.tar.gz) = ff188280c6a65b0c65148b99268b03bb579620bf447299c63648956e45d6f8de
-SHA512 (ted-2.21.src.tar.gz) = f926d49c1c68ae54b7b4871cccc48e1ff1ad217baa915735be6f12944b710050fe358b1e85b75a3d8ffc236563dc81364be1f64079805993978dccfdb819f735
-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) = c374c5845eba111128e7fe79371c715d3b26a03b
-SHA1 (patch-af) = 0679838112be0e9b2ebead7e27625f6e61345383
-SHA1 (patch-ag) = 3db30b3b2e04b03e4d69704ba00d6182f0c5fd9f
-SHA1 (patch-appFrame_appFontConfig.c) = b73d920231cd426b7db5a5d8cf6dfa87f3469a2c
-SHA1 (patch-appUtil_csvsheet.c) = 70c3accb39099b8926f5681b24f3e4be048fd255
+BLAKE2s (ted-2.23.src.tar.gz) = 5f32fde6f8ea58a0bf505784e5bb998341db78241ed7f0c13e53589170e950c2
+SHA512 (ted-2.23.src.tar.gz) = c6541e5a07545a08b30cb9b33429d9a7675f9252df32ccca5cdb4f2ff09978085d28d015a42922baf8c95db1ea6379a9d1088541aafd9ce45b8870212496849f
+Size (ted-2.23.src.tar.gz) = 4672208 bytes
diff --git a/editors/ted/files/README.ind b/editors/ted/files/README.ind
deleted file mode 100644
index 487c7a51366..00000000000
--- a/editors/ted/files/README.ind
+++ /dev/null
@@ -1 +0,0 @@
-This directory contains the installed spelling dictionaries for Ted.
diff --git a/editors/ted/files/Ted.desktop b/editors/ted/files/Ted.desktop
new file mode 100644
index 00000000000..9eda98daf52
--- /dev/null
+++ b/editors/ted/files/Ted.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Ted RTF text processor
+GenericName=RTF text processor
+omment=A lightweight RTF text processor
+Icon=Ted
+Exec=Ted %F
+Terminal=false
+MimeType=application/rtf;text/rtf;
+Categories=Office;WordProcessor;
diff --git a/editors/ted/patches/patch-aa b/editors/ted/patches/patch-aa
deleted file mode 100644
index 6055433890a..00000000000
--- a/editors/ted/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2002/04/09 02:13:38 markd Exp $
-
---- Ted/makefile.in.orig Sun Mar 3 23:24:16 2002
-+++ Ted/makefile.in Wed Mar 27 11:08:14 2002
-@@ -26,7 +26,8 @@
- -I../bitmap \
- -I../ind \
- -I../include \
-- $(DEF_PKGDIR)
-+ $(DEF_PKGDIR) \
-+ $(DEF_INFODIR)
-
- CFLAGS= \
- @CFLAGS@ \
diff --git a/editors/ted/patches/patch-ab b/editors/ted/patches/patch-ab
deleted file mode 100644
index 1e63e49f82d..00000000000
--- a/editors/ted/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2003/04/09 13:26:46 markd Exp $
-
---- Ted/configure.orig Sat Apr 5 00:46:46 2003
-+++ Ted/configure
-@@ -3392,7 +3392,6 @@ EOF
- then
- # Includes
- for ac_dir in \
-- /usr/include \
- /usr/local/include \
- /usr/pkg/include \
- /usr/local/include/zlib \
diff --git a/editors/ted/patches/patch-ac b/editors/ted/patches/patch-ac
deleted file mode 100644
index 4b0f24c42e6..00000000000
--- a/editors/ted/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2003/04/09 13:26:46 markd Exp $
-
---- appUtil/configure.orig Sat Apr 5 00:46:49 2003
-+++ appUtil/configure
-@@ -1745,7 +1745,6 @@ EOF
- then
- # Includes
- for ac_dir in \
-- /usr/include \
- /usr/local/include \
- /usr/pkg/include \
- /usr/local/include/zlib \
diff --git a/editors/ted/patches/patch-ad b/editors/ted/patches/patch-ad
deleted file mode 100644
index 047fcc9afbb..00000000000
--- a/editors/ted/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2003/04/09 13:26:46 markd Exp $
-
---- bitmap/configure.orig Sat Apr 5 00:46:50 2003
-+++ bitmap/configure
-@@ -3274,7 +3274,6 @@ EOF
- then
- # Includes
- for ac_dir in \
-- /usr/include \
- /usr/local/include \
- /usr/pkg/include \
- /usr/local/include/zlib \
diff --git a/editors/ted/patches/patch-ae b/editors/ted/patches/patch-ae
deleted file mode 100644
index f36482a7e7a..00000000000
--- a/editors/ted/patches/patch-ae
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2019/06/08 10:40:58 rillig Exp $
-
-
---- appFrame/appFrameConfig.h.in.orig Sun Mar 3 23:24:16 2002
-+++ appFrame/appFrameConfig.h.in Mon Apr 22 10:32:15 2002
-@@ -29,12 +29,6 @@
- /* */
- /************************************************************************/
-
--# undef PREFIX
--
--# ifdef PREFIX
--# define PKGDIR PREFIX
--# endif
--
- # ifndef PKGDIR
- # define PKGDIR "/usr/local"
- # endif
diff --git a/editors/ted/patches/patch-af b/editors/ted/patches/patch-af
deleted file mode 100644
index 62519429fac..00000000000
--- a/editors/ted/patches/patch-af
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-af,v 1.3 2019/06/08 10:40:58 rillig Exp $
-
-
---- Ted/tedConfig.h.in.orig Sun Mar 3 23:24:16 2002
-+++ Ted/tedConfig.h.in Mon Apr 22 11:06:41 2002
-@@ -38,12 +38,6 @@
- /* */
- /************************************************************************/
-
--# undef PREFIX
--
--# ifdef PREFIX
--# define PKGDIR PREFIX
--# endif
--
- # ifndef PKGDIR
- # define PKGDIR "/usr/local"
- # endif
diff --git a/editors/ted/patches/patch-ag b/editors/ted/patches/patch-ag
deleted file mode 100644
index 75ecb1b2193..00000000000
--- a/editors/ted/patches/patch-ag
+++ /dev/null
@@ -1,423 +0,0 @@
-$NetBSD: patch-ag,v 1.4 2011/02/12 11:40:41 wiz Exp $
-
-Fix for png-1.5. Version from upstream.
-
---- bitmap/bmpng.c.orig 2009-10-16 15:20:57.000000000 +0000
-+++ bitmap/bmpng.c
-@@ -20,23 +20,32 @@
- /* */
- /************************************************************************/
-
--static int bpPngiToBitmap( const png_info * pngi,
-+static int bpPngiToBitmap( const png_structp pngp,
-+ png_info * pngi,
- BitmapDescription * bd )
- {
- unsigned int col;
-+ png_uint_32 res_x, res_y;
-+ int unit_type= 0;
-
-- bd->bdPixelsWide= pngi->width;
-- bd->bdPixelsHigh= pngi->height;
-+ bd->bdPixelsWide= png_get_image_width( pngp, pngi );
-+ bd->bdPixelsHigh= png_get_image_height( pngp, pngi );
- bd->bdHasAlpha= 0;
-
-- switch( pngi->color_type )
-+ switch( png_get_color_type( pngp, pngi ) )
- {
- case PNG_COLOR_TYPE_PALETTE:
-+ {
-+ int num_palette;
-+ png_colorp palette;
-+
-+ png_get_PLTE( pngp, pngi, &palette, &num_palette );
-+
- bd->bdColorEncoding= BMcoRGB8PALETTE;
-- bd->bdColorCount= pngi->num_palette;
-+ bd->bdColorCount= num_palette;
- bd->bdBitsPerSample= 8;
- bd->bdSamplesPerPixel= 3;
-- bd->bdBitsPerPixel= pngi->bit_depth;
-+ bd->bdBitsPerPixel= png_get_bit_depth( pngp, pngi );
-
- bd->bdRGB8Palette= (RGB8Color *)
- malloc( bd->bdColorCount* sizeof(RGB8Color) );
-@@ -46,47 +55,51 @@ static int bpPngiToBitmap( const png_inf
-
- for ( col= 0; col < bd->bdColorCount; col++ )
- {
-- bd->bdRGB8Palette[col].rgb8Red= pngi->palette[col].red;
-- bd->bdRGB8Palette[col].rgb8Green= pngi->palette[col].green;
-- bd->bdRGB8Palette[col].rgb8Blue= pngi->palette[col].blue;
-+ bd->bdRGB8Palette[col].rgb8Red= palette[col].red;
-+ bd->bdRGB8Palette[col].rgb8Green= palette[col].green;
-+ bd->bdRGB8Palette[col].rgb8Blue= palette[col].blue;
- bd->bdRGB8Palette[col].rgb8Alpha= 0;
- }
-+ }
- break;
-
- case PNG_COLOR_TYPE_RGB:
- bd->bdColorEncoding= BMcoRGB;
-- bd->bdBitsPerSample= pngi->bit_depth;
-- bd->bdSamplesPerPixel= pngi->channels;
-- bd->bdBitsPerPixel= pngi->pixel_depth;
-+ bd->bdBitsPerSample= png_get_bit_depth( pngp, pngi );
-+ bd->bdSamplesPerPixel= png_get_channels( pngp, pngi );
-+ bd->bdBitsPerPixel= bd->bdSamplesPerPixel* bd->bdBitsPerSample;
- break;
-
- case PNG_COLOR_TYPE_GRAY:
- bd->bdColorEncoding= BMcoWHITEBLACK;
-- bd->bdBitsPerSample= pngi->bit_depth;
-- bd->bdSamplesPerPixel= pngi->channels;
-- bd->bdBitsPerPixel= pngi->pixel_depth;
-+ bd->bdBitsPerSample= png_get_bit_depth( pngp, pngi );
-+ bd->bdSamplesPerPixel= png_get_channels( pngp, pngi );
-+ bd->bdBitsPerPixel= bd->bdSamplesPerPixel* bd->bdBitsPerSample;
- break;
-
- case PNG_COLOR_TYPE_RGB_ALPHA:
- bd->bdHasAlpha= 1;
- bd->bdColorEncoding= BMcoRGB;
-- bd->bdBitsPerSample= pngi->bit_depth;
-- bd->bdSamplesPerPixel= pngi->channels;
-- bd->bdBitsPerPixel= pngi->pixel_depth;
-+ bd->bdBitsPerSample= png_get_bit_depth( pngp, pngi );
-+ bd->bdSamplesPerPixel= png_get_channels( pngp, pngi );
-+ bd->bdBitsPerPixel= bd->bdSamplesPerPixel* bd->bdBitsPerSample;
- break;
-
- case PNG_COLOR_TYPE_GRAY_ALPHA:
- bd->bdHasAlpha= 1;
-- LDEB(pngi->color_type); return -1;
-+ LDEB(png_get_color_type( pngp, pngi )); return -1;
-
- default:
-- LDEB(pngi->color_type); return -1;
-+ LDEB(png_get_color_type( pngp, pngi )); return -1;
- }
-
-- bd->bdBytesPerRow= pngi->rowbytes;
-+ bd->bdBytesPerRow= png_get_rowbytes( pngp, pngi );
- bd->bdBufferLength= bd->bdBytesPerRow* bd->bdPixelsHigh;
-
-- switch( pngi->phys_unit_type )
-+ if ( ! png_get_pHYs( pngp, pngi, &res_x, &res_y, &unit_type ) )
-+ { unit_type= PNG_RESOLUTION_UNKNOWN; }
-+
-+ switch( unit_type )
- {
- case PNG_RESOLUTION_UNKNOWN:
- bd->bdUnit= BMunPIXEL;
-@@ -96,12 +109,12 @@ static int bpPngiToBitmap( const png_inf
-
- case PNG_RESOLUTION_METER:
- bd->bdUnit= BMunM;
-- bd->bdXResolution= pngi->x_pixels_per_unit;
-- bd->bdYResolution= pngi->y_pixels_per_unit;
-+ bd->bdXResolution= res_x;
-+ bd->bdYResolution= res_y;
- break;
-
- default:
-- LDEB(pngi->phys_unit_type);
-+ LDEB(unit_type);
- return -1;
- }
-
-@@ -119,11 +132,11 @@ static int bmPngReadContents( png_info *
- unsigned char * buffer;
-
- numberOfPasses= 1;
-- if ( pngi->interlace_type )
-+ if ( png_get_interlace_type( png, pngi ) )
- { numberOfPasses= png_set_interlace_handling( png ); }
-
-- if ( pngi->color_type == PNG_COLOR_TYPE_RGB &&
-- pngi->bit_depth == 16 )
-+ if ( png_get_color_type( png, pngi ) == PNG_COLOR_TYPE_RGB &&
-+ png_get_bit_depth( png, pngi ) == 16 )
- {
- const unsigned short one= 1;
- const unsigned char * testEndian= (const unsigned char *)&one;
-@@ -133,9 +146,6 @@ static int bmPngReadContents( png_info *
- }
-
- png_start_read_image( png );
-- /*
-- png_read_update_info( png, pngi );
-- */
-
- buffer= (unsigned char *)malloc( bd->bdBufferLength );
- if ( ! buffer )
-@@ -236,9 +246,9 @@ int bmPngReadPng( BitmapDescription * bd
-
- png_read_info( pngp, pngip );
-
-- if ( bpPngiToBitmap( pngip, bd ) )
-+ if ( bpPngiToBitmap( pngp, pngip, bd ) )
- {
-- LLLDEB(pngip->color_type,bd->bdColorCount,bd->bdRGB8Palette);
-+ LLDEB(bd->bdColorCount,bd->bdRGB8Palette);
- png_destroy_read_struct( &pngp, &pngip, (png_infop *)0 );
- return -1;
- }
-@@ -282,44 +292,43 @@ int bmCanWritePngFile( const BitmapDescr
-
- static int bpPngiFromBitmap( png_structp png,
- png_info * pngi,
-+ png_colorp * pPalette,
- const BitmapDescription * bd )
- {
-- png_info_init( pngi );
-- pngi->width= bd->bdPixelsWide;
-- pngi->height= bd->bdPixelsHigh;
-+ int bit_depth;
-+ int color_type;
-+ png_color_8 sig_bit;
-
- switch( bd->bdUnit )
- {
- case BMunM:
-- pngi->phys_unit_type= PNG_RESOLUTION_METER;
-- pngi->x_pixels_per_unit= bd->bdXResolution;
-- pngi->y_pixels_per_unit= bd->bdYResolution;
-- pngi->valid |= PNG_INFO_pHYs;
-+ png_set_pHYs( png, pngi,
-+ bd->bdXResolution,
-+ bd->bdYResolution,
-+ PNG_RESOLUTION_METER);
- break;
-
- case BMunINCH:
-- pngi->phys_unit_type= PNG_RESOLUTION_METER;
-- pngi->x_pixels_per_unit= (int)( 39.37* bd->bdXResolution );
-- pngi->y_pixels_per_unit= (int)( 39.37* bd->bdYResolution );
-- pngi->valid |= PNG_INFO_pHYs;
-+ png_set_pHYs( png, pngi,
-+ (int)( 39.37* bd->bdXResolution ),
-+ (int)( 39.37* bd->bdYResolution ),
-+ PNG_RESOLUTION_METER);
- break;
-
- case BMunPOINT:
-- pngi->phys_unit_type= PNG_RESOLUTION_METER;
-- pngi->x_pixels_per_unit= POINTS_PER_M* bd->bdXResolution;
-- pngi->y_pixels_per_unit= POINTS_PER_M* bd->bdYResolution;
-- pngi->valid |= PNG_INFO_pHYs;
-+ png_set_pHYs( png, pngi,
-+ POINTS_PER_M* bd->bdXResolution,
-+ POINTS_PER_M* bd->bdYResolution,
-+ PNG_RESOLUTION_METER);
- break;
-
- case BMunPIXEL:
-- pngi->phys_unit_type= PNG_RESOLUTION_UNKNOWN;
-- pngi->x_pixels_per_unit= 1;
-- pngi->y_pixels_per_unit= 1;
-+ png_set_pHYs(png, pngi, 1, 1, PNG_RESOLUTION_UNKNOWN);
- break;
-
- default:
- LDEB(bd->bdUnit);
-- pngi->phys_unit_type= PNG_RESOLUTION_UNKNOWN;
-+ png_set_pHYs(png, pngi, 1, 1, PNG_RESOLUTION_UNKNOWN);
- break;
- }
-
-@@ -329,41 +338,48 @@ static int bpPngiFromBitmap( png_structp
-
- case BMcoBLACKWHITE:
- case BMcoWHITEBLACK:
-- pngi->bit_depth= bd->bdBitsPerPixel;
-+ bit_depth= bd->bdBitsPerPixel;
- if ( bd->bdHasAlpha )
-- { pngi->color_type= PNG_COLOR_TYPE_GRAY_ALPHA; }
-- else{ pngi->color_type= PNG_COLOR_TYPE_GRAY; }
-- pngi->sig_bit.gray= bd->bdBitsPerSample;
-+ { color_type= PNG_COLOR_TYPE_GRAY_ALPHA; }
-+ else{ color_type= PNG_COLOR_TYPE_GRAY; }
-+ sig_bit.gray= bd->bdBitsPerSample;
- break;
-
- case BMcoRGB:
-- pngi->bit_depth= bd->bdBitsPerSample;
-+ bit_depth= bd->bdBitsPerSample;
- if ( bd->bdHasAlpha )
-- { pngi->color_type= PNG_COLOR_TYPE_RGB_ALPHA; }
-- else{ pngi->color_type= PNG_COLOR_TYPE_RGB; }
-- pngi->sig_bit.red= bd->bdBitsPerSample;
-- pngi->sig_bit.green= bd->bdBitsPerSample;
-- pngi->sig_bit.blue= bd->bdBitsPerSample;
-+ { color_type= PNG_COLOR_TYPE_RGB_ALPHA; }
-+ else{ color_type= PNG_COLOR_TYPE_RGB; }
-+ sig_bit.red= bd->bdBitsPerSample;
-+ sig_bit.green= bd->bdBitsPerSample;
-+ sig_bit.blue= bd->bdBitsPerSample;
- break;
-
- case BMcoRGB8PALETTE:
-- pngi->bit_depth= bd->bdBitsPerPixel;
-- pngi->color_type= PNG_COLOR_TYPE_PALETTE;
-+ bit_depth= bd->bdBitsPerPixel;
-+ color_type= PNG_COLOR_TYPE_PALETTE;
-
-- pngi->valid |= PNG_INFO_PLTE;
-- pngi->palette= (png_color *)malloc( 256* sizeof( png_color ) );
-- if ( ! pngi->palette )
-- { XDEB(pngi->palette); return -1; }
-- pngi->num_palette= bd->bdColorCount;
-- pngi->sig_bit.red= bd->bdBitsPerSample;
-- pngi->sig_bit.green= bd->bdBitsPerSample;
-- pngi->sig_bit.blue= bd->bdBitsPerSample;
-- for ( i= 0; i < pngi->num_palette; i++ )
-+ if ( bd->bdColorCount > PNG_MAX_PALETTE_LENGTH )
- {
-- pngi->palette[i].red= bd->bdRGB8Palette[i].rgb8Red;
-- pngi->palette[i].green= bd->bdRGB8Palette[i].rgb8Green;
-- pngi->palette[i].blue= bd->bdRGB8Palette[i].rgb8Blue;
-+ LLDEB(bd->bdColorCount,PNG_MAX_PALETTE_LENGTH);
-+ return -1;
- }
-+
-+ *pPalette= (png_color *)malloc( PNG_MAX_PALETTE_LENGTH*
-+ sizeof( png_color ) );
-+ if ( ! *pPalette )
-+ { XDEB(*pPalette); return -1; }
-+ sig_bit.red= bd->bdBitsPerSample;
-+ sig_bit.green= bd->bdBitsPerSample;
-+ sig_bit.blue= bd->bdBitsPerSample;
-+ for ( i= 0; i < bd->bdColorCount; i++ )
-+ {
-+ (*pPalette)[i].red= bd->bdRGB8Palette[i].rgb8Red;
-+ (*pPalette)[i].green= bd->bdRGB8Palette[i].rgb8Green;
-+ (*pPalette)[i].blue= bd->bdRGB8Palette[i].rgb8Blue;
-+ }
-+
-+ png_set_PLTE( png, pngi, (*pPalette), bd->bdColorCount );
- break;
-
- default:
-@@ -371,7 +387,13 @@ static int bpPngiFromBitmap( png_structp
- return -1;
- }
-
-- pngi->interlace_type= 0;
-+ png_set_sBIT( png, pngi, &sig_bit );
-+ png_set_IHDR( png, pngi,
-+ bd->bdPixelsWide, bd->bdPixelsHigh,
-+ bit_depth, color_type,
-+ PNG_INTERLACE_NONE,
-+ PNG_COMPRESSION_TYPE_BASE,
-+ PNG_FILTER_TYPE_BASE );
-
- return 0;
- }
-@@ -395,8 +417,8 @@ static void bmPngWriteContents( png_stru
- }
- }
-
-- if ( pngi->color_type == PNG_COLOR_TYPE_RGB &&
-- bd->bdBitsPerSample == 16 )
-+ if ( png_get_color_type( png, pngi ) == PNG_COLOR_TYPE_RGB &&
-+ bd->bdBitsPerSample == 16 )
- {
- const unsigned short one= 1;
- const unsigned char * testEndian= (const unsigned char *)&one;
-@@ -431,9 +453,9 @@ static void bmPngWriteContents( png_stru
- from= scratch;
- }
-
-- if ( pngi->color_type == PNG_COLOR_TYPE_RGB &&
-- bd->bdBitsPerSample == 16 &&
-- scratch )
-+ if ( png_get_color_type( png, pngi ) == PNG_COLOR_TYPE_RGB &&
-+ bd->bdBitsPerSample == 16 &&
-+ scratch )
- {
- int col;
- const BmUint16 * fr= (const BmUint16 *)from;
-@@ -453,10 +475,6 @@ static void bmPngWriteContents( png_stru
-
- png_write_end( png, pngi );
-
-- if ( bd->bdColorEncoding == BMcoRGB8PALETTE &&
-- pngi->palette )
-- { free( pngi->palette ); }
--
- if ( scratch )
- { free( scratch ); }
-
-@@ -510,50 +528,43 @@ int bmPngWritePng( const BitmapDescript
- const unsigned char * buffer,
- SimpleOutputStream * sos )
- {
-+ int rval= 0;
- png_structp pngp= (png_structp)0;
- png_infop pngip= (png_infop)0;
-+ png_colorp palette= (png_colorp)0;
-
- pngp = png_create_write_struct( PNG_LIBPNG_VER_STRING, (void *)0,
- (png_error_ptr)0, (png_error_ptr)0 );
- if ( ! pngp )
-- { LDEB(1); return -1; }
-+ { XDEB(pngp); rval= -1; goto ready; }
-
- pngip = png_create_info_struct( pngp );
- if ( ! pngip )
-- {
-- LDEB(1);
-- png_destroy_write_struct( &pngp, (png_infop *)0 );
-- return -1;
-- }
-+ { XDEB(pngip); rval= -1; goto ready; }
-+
-+ /*
-+ As the info struct is built by libpng this is not needed:
-+ (The call will disappear from libpng in version 1.4)
-+ png_info_init( pngi );
-+ */
-
- if ( setjmp( png_jmpbuf( pngp ) ) )
-- {
-- LDEB(1);
-- png_destroy_write_struct( &pngp, &pngip );
-- /* Crashes:
-- if ( bd->bdColorEncoding == BMcoRGB8PALETTE &&
-- pngip->palette )
-- { free( pngip->palette ); }
-- */
-- return -1;
-- }
-+ { LDEB(1); rval= -1; goto ready; }
-
- png_init_io( pngp, (FILE *)0 );
- png_set_write_fn( pngp, (void *)sos, bmPngWriteBytes, bmPngFlushBytes );
-
-- if ( bpPngiFromBitmap( pngp, pngip, bd ) )
-- {
-- LDEB(bd->bdColorEncoding);
-- png_destroy_write_struct( &pngp, &pngip );
-- return -1;
-- }
--
-- /*
-- png_write_info( pngp, pngip );
-- */
-+ if ( bpPngiFromBitmap( pngp, pngip, &palette, bd ) )
-+ { LDEB(bd->bdColorEncoding); rval= -1; goto ready; }
-
- bmPngWriteContents( pngp, pngip, buffer, bd );
-
-+ ready:
-+
-+ if ( palette )
-+ { free( palette ); }
-+
- png_destroy_write_struct( &pngp, &pngip );
-- return 0;
-+
-+ return rval;
- }
diff --git a/editors/ted/patches/patch-appFrame_appFontConfig.c b/editors/ted/patches/patch-appFrame_appFontConfig.c
deleted file mode 100644
index ced13c1d46c..00000000000
--- a/editors/ted/patches/patch-appFrame_appFontConfig.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-appFrame_appFontConfig.c,v 1.1 2014/02/01 03:46:49 markd Exp $
-
-Build with freetype 2.5.x
-
---- appFrame/appFontConfig.c.orig 2009-10-16 15:20:57.000000000 +0000
-+++ appFrame/appFontConfig.c
-@@ -903,7 +903,7 @@ const char * appFtErrorStr( int e )
-
- static const n2s xftn2s[]=
- {
--# include <freetype/fterrdef.h>
-+# include FT_ERROR_DEFINITIONS_H
- };
-
- for ( i= 0; i < sizeof(xftn2s)/sizeof(n2s); i++ )
diff --git a/editors/ted/patches/patch-appUtil_csvsheet.c b/editors/ted/patches/patch-appUtil_csvsheet.c
deleted file mode 100644
index b53ab3c8f3e..00000000000
--- a/editors/ted/patches/patch-appUtil_csvsheet.c
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-appUtil_csvsheet.c,v 1.1 2014/03/25 23:13:21 asau Exp $
-
---- appUtil/csvsheet.c.orig 2009-10-16 15:20:58.000000000 +0000
-+++ appUtil/csvsheet.c
-@@ -1,7 +1,6 @@
- # include <stdio.h>
- # include <string.h>
- # include <stdlib.h>
--# include <malloc.h>
- # include <time.h>
-
- # include "csv.h"