Don't hardcode /usr/pkg in patches.

4 files changed, 17 insertions, 8 deletions

diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 4be3cc6b6b0..76224308ffe 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2003/05/22 02:42:45 markd Exp $
+# $NetBSD: Makefile,v 1.26 2003/07/08 14:05:06 markd Exp $
 
 DISTNAME=	kdebase-3.1.2
 CATEGORIES=	x11
@@ -97,6 +97,15 @@ SPECIAL_PERMS+=	${PREFIX}/bin/konsole_grantpty	${_KDE_SETUID_ROOT}
 SPECIAL_PERMS+=	${PREFIX}/bin/kcheckpass	${_KDE_SETUID_ROOT}
 SPECIAL_PERMS+=	${PREFIX}/bin/ksysguardd	${_KDE_SETUID_ROOT}
 
+pre-configure:
+	cd ${WRKSRC};							\
+	files="kioslave/info/kde-info2html.conf khelpcenter/infoconsts.h"; \
+	for file in $${files}; do					\
+		${SED} -e 's|@LOCALBASE@|${LOCALBASE}|' $${file} >	\
+			$${file}.new;					\
+		${MV} -f $${file}.new $${file};				\
+	done
+
 post-build:
 	cd ${WRKSRC};							\
 	files="kioslave/info/kde-info2html.conf";			\
diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index 46ba11d3358..282711ee7f2 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2003/06/05 21:29:32 drochner Exp $
+$NetBSD: distinfo,v 1.31 2003/07/08 14:05:06 markd Exp $
 
 SHA1 (kdebase-3.1.2.tar.bz2) = 2e75e74f902977c497e8bdc15074909009d8c91a
 Size (kdebase-3.1.2.tar.bz2) = 15229871 bytes
@@ -43,7 +43,7 @@ SHA1 (patch-br) = 778a94f6e7e5900c3036ed0e9c8fd92a78b13c21
 SHA1 (patch-bs) = cd8eedc75f703010da01351daee4efdb8e8ad740
 SHA1 (patch-bt) = 724c0c7aa50b5f600746a86e744b44501207939a
 SHA1 (patch-bv) = 0664e2420988fa50c1d96dfea09c121c89c70e16
-SHA1 (patch-bx) = dcdec38d984452032176946bafddc9a6614b2b6f
+SHA1 (patch-bx) = 0b0c2f7f9f5608500be781d5bd56a0b4a608e5a9
 SHA1 (patch-by) = fcfca10f504c1ac9b0bb136bb941a8ab2899087b
 SHA1 (patch-bz) = 374da5a2a83642a7a0dc4b129cc752dfb989b12e
 SHA1 (patch-cb) = 39f6feb39dbacb5a193ab7b20b365576a5bec43b
@@ -107,7 +107,7 @@ SHA1 (patch-et) = 4a70d356cf351e67bf0b8bb62b0d7522b00a14cd
 SHA1 (patch-eu) = 142d526643d21f02b349e4128dec3c44c7aece93
 SHA1 (patch-ev) = 551dc4d79b637e15a580eb1dcd2f0930ff1e3dbc
 SHA1 (patch-ew) = f8f95cf602a9d88f620d5546ad58b87d5e6be2a5
-SHA1 (patch-ex) = 6dad116e38ba30ea1a9a3529e250b1e512c4865f
+SHA1 (patch-ex) = 989581c86846b7eede2221cb3c4e896f40ad17d5
 SHA1 (patch-fa) = fc8d6f0e22548e86ad4d9f328a657c86ea9f51c4
 SHA1 (patch-fb) = 5f6895322c186813c43a3426dfe4d57a17090346
 SHA1 (patch-fc) = 8bdc76aa9c34e270de2fba14213db0c179c5cd31
diff --git a/x11/kdebase3/patches/patch-bx b/x11/kdebase3/patches/patch-bx
index 625a9412bdb..9e14ebb4e13 100644
--- a/x11/kdebase3/patches/patch-bx
+++ b/x11/kdebase3/patches/patch-bx
@@ -1,4 +1,4 @@
-$NetBSD: patch-bx,v 1.2 2002/08/25 19:23:40 jlam Exp $
+$NetBSD: patch-bx,v 1.3 2003/07/08 14:05:07 markd Exp $
 
 --- kioslave/info/kde-info2html.conf.orig	Wed Aug  2 11:07:17 2000
 +++ kioslave/info/kde-info2html.conf
@@ -6,7 +6,7 @@ $NetBSD: patch-bx,v 1.2 2002/08/25 19:23:40 jlam Exp $
  	    "/usr/share/info",
  	    "/usr/lib/info",
  #	    "/usr/lib/teTeX/info",
-+	    "/usr/pkg/info",
++	    "@LOCALBASE@/info",
  	    "/usr/local/info",
  	    "/usr/local/lib/info",
  	    "/usr/X11R6/info",
diff --git a/x11/kdebase3/patches/patch-ex b/x11/kdebase3/patches/patch-ex
index 19727f78701..a5d46bda00e 100644
--- a/x11/kdebase3/patches/patch-ex
+++ b/x11/kdebase3/patches/patch-ex
@@ -1,4 +1,4 @@
-$NetBSD: patch-ex,v 1.1 2003/03/11 13:10:31 markd Exp $
+$NetBSD: patch-ex,v 1.2 2003/07/08 14:05:07 markd Exp $
 
 --- khelpcenter/infoconsts.h.orig	Sat Aug  3 02:12:14 2002
 +++ khelpcenter/infoconsts.h
@@ -6,7 +6,7 @@ $NetBSD: patch-ex,v 1.1 2003/03/11 13:10:31 markd Exp $
  const unsigned int INFODIRS = 9;
  const QString INFODIR[] = {"", "/usr/info/", "/usr/share/info/",
  			   "/usr/lib/info/",
-+			   "/usr/pkg/info/",
++			   "@LOCALBASE@/info/",
  			   "/usr/local/info/", "/usr/local/lib/info/",
  			   "/usr/X11R6/info/", "/usr/X11R6/lib/info/",
  			   "/usr/X11R6/lib/xemacs/info/"};