From 5ed3c6159b4fd163a322660517ffb56116171fb5 Mon Sep 17 00:00:00 2001
From: markd <markd>
Date: Sun, 21 Apr 2002 23:19:53 +0000
Subject: Stop complaints about PKGDIR being redefined. Fixes pkg/16408 from
 Robert Elz.

---
 editors/ted/Makefile         |  4 ++--
 editors/ted/distinfo         |  4 +++-
 editors/ted/patches/patch-ae | 15 +++++++++++++++
 editors/ted/patches/patch-af | 15 +++++++++++++++
 4 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 editors/ted/patches/patch-ae
 create mode 100644 editors/ted/patches/patch-af

diff --git a/editors/ted/Makefile b/editors/ted/Makefile
index f7ebcf980ac..21d2930f567 100644
--- a/editors/ted/Makefile
+++ b/editors/ted/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/04/09 02:13:37 markd Exp $
+# $NetBSD: Makefile,v 1.10 2002/04/21 23:19:54 markd Exp $
 
 DISTNAME=	ted-2.11.src
 PKGNAME=	ted-2.11
@@ -20,7 +20,7 @@ INFODIR=	${PREFIX}/share/doc/Ted
 MAKE_ENV+=	DEF_PKGDIR='-DPKGDIR=\"${PREFIX}\"' \
 		DEF_AFMDIR='-DAFMDIR=\"${AFMDIR}\"' \
 		DEF_INDDIR='-DINDDIR=\"${INDDIR}\"' \
-		DEF_INFODIR='-DINFODIR=\"${INFODIR}\"'
+		DEF_INFODIR='-DDOCUMENT_DIR=\"${INFODIR}\"'
 
 ALL_TARGET=	compile.shared
 INSTALL_TARGET=	install.shared
diff --git a/editors/ted/distinfo b/editors/ted/distinfo
index 168378c63e9..a263bb4295a 100644
--- a/editors/ted/distinfo
+++ b/editors/ted/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/04/09 02:30:24 markd Exp $
+$NetBSD: distinfo,v 1.6 2002/04/21 23:19:54 markd Exp $
 
 SHA1 (ted-2.11.src.tar.gz) = d4f0ff443a2632d7f665cea8999045b2dbea40a6
 Size (ted-2.11.src.tar.gz) = 2377582 bytes
@@ -6,3 +6,5 @@ SHA1 (patch-aa) = d8673fb67176c17beb90a87adebb9ab94a1e15ba
 SHA1 (patch-ab) = fddf769a9e48c68a61512fdb60973415a43ea0e6
 SHA1 (patch-ac) = e7e575a50f7e8ee4140f573f16fe8bd2c3e32f0b
 SHA1 (patch-ad) = 8dbde13c8e2470deac088c64d1bc901ed1944a92
+SHA1 (patch-ae) = 9cea02ede59d7f6a88a0c8ec1f93e5d814e6b994
+SHA1 (patch-af) = 369a2d0324538860c50653a140d660d50c2383b9
diff --git a/editors/ted/patches/patch-ae b/editors/ted/patches/patch-ae
new file mode 100644
index 00000000000..d46794f26f1
--- /dev/null
+++ b/editors/ted/patches/patch-ae
@@ -0,0 +1,15 @@
+--- 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
new file mode 100644
index 00000000000..1267464d0bc
--- /dev/null
+++ b/editors/ted/patches/patch-af
@@ -0,0 +1,15 @@
+--- 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
-- 
cgit v1.2.3