From c24c4c3a426a395c44f21c0a56e2cb80426ee3ea Mon Sep 17 00:00:00 2001
From: jmmv <jmmv>
Date: Wed, 2 Jul 2003 18:06:40 +0000
Subject: Avoid hardcoding /usr/pkg in patch files (untested, sorry).

---
 x11/kdebase/Makefile         | 4 +++-
 x11/kdebase/distinfo         | 4 ++--
 x11/kdebase/patches/patch-bc | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/x11/kdebase/Makefile b/x11/kdebase/Makefile
index 206d389b17a..d82ebdabb03 100644
--- a/x11/kdebase/Makefile
+++ b/x11/kdebase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2003/03/14 19:38:05 jlam Exp $
+# $NetBSD: Makefile,v 1.89 2003/07/02 18:06:40 jmmv Exp $
 # FreeBSD Id: Makefile,v 1.6 1997/11/27 00:35:27 se Exp
 
 DISTNAME=	kdebase-1.1.2
@@ -31,6 +31,8 @@ CONFIGURE_ENV=	KDEDIR=${PREFIX} \
 FIX_RPATH+=	KDE_LDFLAGS
 KDE_LDFLAGS=	-L${LOCALBASE}/lib -Wl,${RPATH_FLAG}${LOCALBASE}/lib -L${X11BASE}/lib -Wl,${RPATH_FLAG}${X11BASE}/lib
 
+CFLAGS+=	-DPREFIX=\"\\\"${PREFIX}\\\"\"
+
 EXTRACT_ONLY=	${DISTNAME}.tar.bz2
 PLIST_SRC=	${WRKDIR}/PLIST
 PLIST_DIRS=	share/kde/applnk share/kde/apps/kappfinder \
diff --git a/x11/kdebase/distinfo b/x11/kdebase/distinfo
index 8c87f280af2..8718298f74c 100644
--- a/x11/kdebase/distinfo
+++ b/x11/kdebase/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2001/09/10 08:28:27 skrll Exp $
+$NetBSD: distinfo,v 1.5 2003/07/02 18:06:40 jmmv Exp $
 
 SHA1 (kdebase-1.1.2.tar.bz2) = d48e7f48f1b6305c37b0a4b42c017e525bee012b
 Size (kdebase-1.1.2.tar.bz2) = 7181379 bytes
@@ -34,7 +34,7 @@ SHA1 (patch-ay) = e9152d0d81e6245ab5aefbff65dacc72c97a349c
 SHA1 (patch-az) = 972be8473f6a42352f6aab72cfa2da1c471c4223
 SHA1 (patch-ba) = 00311ea6581f325b4db6eab29ac8bc01dc005e4b
 SHA1 (patch-bb) = 721f055bcf65211c5bbd8f721d66e32c53e10f46
-SHA1 (patch-bc) = f5db41722d9f79c9177bdefd8f564018562061af
+SHA1 (patch-bc) = 8e41eeed30c840ec8253f6c257eb09125971ded1
 SHA1 (patch-bd) = f1ff5a7d305d3bf3ee93c55bcb542bafbfe80aac
 SHA1 (patch-be) = 09dc8e7fca408e70daf6257b2a3b0ddb485d47a0
 SHA1 (patch-bf) = 641f2f9ec589415c27db842e19d4a147b00c5eb8
diff --git a/x11/kdebase/patches/patch-bc b/x11/kdebase/patches/patch-bc
index 198d1095084..0b48e86a9d8 100644
--- a/x11/kdebase/patches/patch-bc
+++ b/x11/kdebase/patches/patch-bc
@@ -1,4 +1,4 @@
-$NetBSD: patch-bc,v 1.4 2001/09/10 08:23:20 skrll Exp $
+$NetBSD: patch-bc,v 1.5 2003/07/02 18:06:40 jmmv Exp $
 
 --- kdehelp/man.cpp.orig	Thu Aug 19 20:32:11 1999
 +++ kdehelp/man.cpp
@@ -24,9 +24,9 @@ $NetBSD: patch-bc,v 1.4 2001/09/10 08:23:20 skrll Exp $
              searchPath[numPaths++] = StrDup("/usr/X11R6/man");
 +#else
 +#ifdef __NetBSD__
++            searchPath[numPaths++] = StrDup(PREFIX "/man");
 +            searchPath[numPaths++] = StrDup("/usr/share/man");
 +            searchPath[numPaths++] = StrDup("/usr/X11R6/man");
-+            searchPath[numPaths++] = StrDup("/usr/pkg/man");
 +#else
 +            searchPath[numPaths++] = StrDup("/usr/man");
 +#endif
-- 
cgit v1.2.3