Don't let kde install it's own "rman". Instead, compile in the correct

path to rman. The determination as to whether it's the package rman
or the XFree86-4.x installed rman is left to bsd.pkg.mk (via USE_RMAN).
Closes PR pkg/8755.

7 files changed, 87 insertions, 32 deletions

diff --git a/x11/kdebase/Makefile b/x11/kdebase/Makefile
index 5e4a7c2e204..71dd70d09c9 100644
--- a/x11/kdebase/Makefile
+++ b/x11/kdebase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2001/02/25 04:18:26 hubertf Exp $
+# $NetBSD: Makefile,v 1.78 2001/03/20 00:20:41 fredb Exp $
 # FreeBSD Id: Makefile,v 1.6 1997/11/27 00:35:27 se Exp
 
 DISTNAME=	kdebase-1.1.2
@@ -22,6 +22,7 @@ DEPENDS+=	libungif-*:../../graphics/libungif
 
 USE_X11BASE=		YES
 USE_MESA=		YES
+USE_RMAN=		YES
 USE_XPM=		YES
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
@@ -33,7 +34,7 @@ CONFIGURE_ARGS=	"--datadir=${PREFIX}/share/kde" \
 		"--with-qt-dir=${QT1DIR}/qt1"
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	KDEDIR=${PREFIX} \
-		CXXFLAGS="${CFLAGS}" \
+		CXXFLAGS="${CFLAGS} -DRMAN='\"${RMAN}\"'" \
 		all_libraries="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -Wl,-R${X11BASE}/lib -L${X11BASE}/lib"
 
 EXTRACT_ONLY=	${DISTNAME}.tar.bz2
diff --git a/x11/kdebase/files/patch-sum b/x11/kdebase/files/patch-sum
index 09dd1ccbd5d..054d36083d7 100644
--- a/x11/kdebase/files/patch-sum
+++ b/x11/kdebase/files/patch-sum
@@ -1,28 +1,31 @@
-$NetBSD: patch-sum,v 1.22 2001/02/26 19:21:57 hubertf Exp $
+$NetBSD: patch-sum,v 1.23 2001/03/20 00:20:41 fredb Exp $
 
-MD5 (patch-aa) = 5fa253df5ddb8b2221b831b0839cac6f
-MD5 (patch-ab) = ef622a6d305665152f61df7a12f534a6
-MD5 (patch-ac) = 5d79d4f388b4e16e2a45d9cfa08ef9eb
-MD5 (patch-ad) = ef88cfb282fd007327c09c2805888fce
-MD5 (patch-ae) = eb7524ce195f70513948a8d6d9b149d0
-MD5 (patch-af) = 62213db1c72661c556cb11b98c074c46
-MD5 (patch-ag) = fd59aec6768c4417dfa7f3cfad56af8a
-MD5 (patch-ah) = 7839408dd4600a09a8d6fba70364f639
-MD5 (patch-ai) = d3364f231ef943a3f2c379472b481ff6
-MD5 (patch-aj) = c7ff59709e6c2181787b54c45b54363d
-MD5 (patch-ak) = 023806a6c0a4afab0927b9c6f8512157
-MD5 (patch-al) = b6b6581538883ebd264540d0f0c43f5f
-MD5 (patch-am) = daf59d5b86cf1fa378313ff94ea1f272
-MD5 (patch-an) = 4b04e0bf15c1492b4b590a803643ec03
-MD5 (patch-ao) = c1c5972a2f0b5c6a3e92b75334707218
-MD5 (patch-ap) = 2f714901d2e2d2b2472ce8bbaa3bde67
-MD5 (patch-aq) = 825a6d67066aa57a3e43e6a64460622c
-MD5 (patch-ar) = 18a1c34da9b75712359ae890edcb1021
-MD5 (patch-as) = c6230c94292cb470ec122275d39baedf
-MD5 (patch-at) = 68c1dd5793b3a29ab95a4c0c62523ebe
-MD5 (patch-au) = b0746e12d13105ec3abe07c985759ffb
-MD5 (patch-av) = b73edd5f08e1805b3303bb95d801b5ce
-MD5 (patch-aw) = a29f93d2ce056aee7afe3771fb1ffb3c
-MD5 (patch-ax) = f4be5b79f43abbc6b97eac7c032352f4
-MD5 (patch-ay) = 7d2602013ddbb3c7f7d2c53542a29c45
-MD5 (patch-az) = cad0fa5b3315bf0a01867deb3d863aa3
+SHA1 (patch-aa) = f5cbf17ad7cc49613fa0377995b2922da6166148
+SHA1 (patch-ab) = f34c3a13e01ed2ba49beef268a4d42d6dc5e8b78
+SHA1 (patch-ac) = 0439450208f093dd7bae6b4bea6dd5067cbe0989
+SHA1 (patch-ad) = f2b0b5cfb0d01e3cefe3fb6575d059ed13e85bc8
+SHA1 (patch-ae) = 3ac8a60f28e343002c3734020af556af0585bbd6
+SHA1 (patch-af) = b7b3b2681aebb30dcc2e9781a92a799f04018aa4
+SHA1 (patch-ag) = 0436c1fd682612bfe8586d25f8d1c74591eb08fb
+SHA1 (patch-ah) = 0cb8be5aefb1cd3325b592a8ca268b8890056918
+SHA1 (patch-ai) = 8953e0cf3eaf775c886ec38d4d7eff6e25646740
+SHA1 (patch-aj) = b72a59db639b66789c0e3546de7e6303db3cac87
+SHA1 (patch-ak) = 0c0af76d0eeaf78ae791626d70b7c16aebc64172
+SHA1 (patch-al) = e3bb9f87c0389bb3018d6b1144a1ef393d8e0af0
+SHA1 (patch-am) = 22b7fef43a7de9cc65958417a2bf199a8b41e149
+SHA1 (patch-an) = 56fa0da91be2e22316a2141974dfa6bdb25edba8
+SHA1 (patch-ao) = a9997380770a8e49a34a2fded6a1af7a923049e2
+SHA1 (patch-ap) = 150f10e590ec8881de97b6b3fe40640c97347c18
+SHA1 (patch-aq) = b7ded99cb9dd2e9c501f62f11691fa8188557bfe
+SHA1 (patch-ar) = 3f58b75670aa17dbc7b6755a67fabd1d831de816
+SHA1 (patch-as) = 666e2bc8e3871d5a4329597b2e92b0c39e5041b1
+SHA1 (patch-at) = d5d62354bc47f1dc40f22f464fe2d6d91556846e
+SHA1 (patch-au) = 07f1b558437017a467012aba02a02e2a717e6371
+SHA1 (patch-av) = 68ccd9c765416731b2bd31175f102d4f7de26430
+SHA1 (patch-aw) = 53e990377d93202224b22bd966dfbabcccb786f1
+SHA1 (patch-ax) = 17b3393f376e755ef76b2e4c07fce06b21ae7308
+SHA1 (patch-ay) = b2385fd02d45e5944475c1ea4252164fc6a0ccf6
+SHA1 (patch-az) = 9481308f531f879e9e33d60258b816342ba8e22d
+SHA1 (patch-ba) = 2620a4ff27f8de77e6de7b9b2924eba296d13f56
+SHA1 (patch-bb) = 37e1e7e134dbf48181fbbaabb0fbd2567428ac52
+SHA1 (patch-bc) = e539a26ce68c39e19ba4389e6d5f8602ca6b3698
diff --git a/x11/kdebase/patches/patch-aa b/x11/kdebase/patches/patch-aa
index 270fa89f962..45377d26468 100644
--- a/x11/kdebase/patches/patch-aa
+++ b/x11/kdebase/patches/patch-aa
@@ -1,4 +1,5 @@
-$NetBSD: patch-aa,v 1.17 2000/04/03 11:01:58 drochner Exp $
+$NetBSD: patch-aa,v 1.18 2001/03/20 00:20:41 fredb Exp $
+
 --- configure.orig	Tue Sep  7 17:21:06 1999
 +++ configure	Sun Apr  2 23:16:38 2000
 @@ -517,9 +517,10 @@
@@ -157,3 +158,11 @@ $NetBSD: patch-aa,v 1.17 2000/04/03 11:01:58 drochner Exp $
  s%@LIBVOLMGT@%$LIBVOLMGT%g
  s%@topdir@%$topdir%g
  s%@RUN_KAPPFINDER@%$RUN_KAPPFINDER%g
+@@ -7567,7 +7608,6 @@
+ 	kdehelp/Makefile \
+ 	kdehelp/index/Makefile \
+ 	kdehelp/search/Makefile \
+-	kdehelp/rman/Makefile \
+ 	kdm/Makefile \
+ 	kdm/config/Makefile \
+ 	kdm/config/kdmrc \
diff --git a/x11/kdebase/patches/patch-ba b/x11/kdebase/patches/patch-ba
new file mode 100644
index 00000000000..b8158d4317f
--- /dev/null
+++ b/x11/kdebase/patches/patch-ba
@@ -0,0 +1,13 @@
+$NetBSD: patch-ba,v 1.1 2001/03/20 00:20:41 fredb Exp $
+
+--- kdehelp/Makefile.am.orig	Sun Aug  8 09:26:45 1999
++++ kdehelp/Makefile.am
+@@ -2,7 +2,7 @@
+ INCLUDES =  $(all_includes)
+ LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ LDADD = $(LIB_KFILE) $(LIB_KHTMLW) $(LIBCOMPAT)
+-SUBDIRS = search index rman
++SUBDIRS = search index
+ 
+ ########## Files ##########
+ 
diff --git a/x11/kdebase/patches/patch-bb b/x11/kdebase/patches/patch-bb
new file mode 100644
index 00000000000..ed59e07de2c
--- /dev/null
+++ b/x11/kdebase/patches/patch-bb
@@ -0,0 +1,13 @@
+$NetBSD: patch-bb,v 1.1 2001/03/20 00:20:41 fredb Exp $
+
+--- kdehelp/Makefile.in.orig	Tue Sep  7 10:20:54 1999
++++ kdehelp/Makefile.in
+@@ -174,7 +174,7 @@
+ INCLUDES = $(all_includes)
+ LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ LDADD = $(LIB_KFILE) $(LIB_KHTMLW) $(LIBCOMPAT)
+-SUBDIRS = search index rman
++SUBDIRS = search index
+ 
+ ########## Files ##########
+ 
diff --git a/x11/kdebase/patches/patch-bc b/x11/kdebase/patches/patch-bc
new file mode 100644
index 00000000000..31f322dfc78
--- /dev/null
+++ b/x11/kdebase/patches/patch-bc
@@ -0,0 +1,17 @@
+$NetBSD: patch-bc,v 1.1 2001/03/20 00:20:41 fredb Exp $
+
+--- kdehelp/man.cpp.orig	Thu Aug 19 14:32:11 1999
++++ kdehelp/man.cpp
+@@ -475,8 +475,12 @@
+ 		sprintf(errFile, "%s/khelpXXXXXX", _PATH_TMP);	// temp file
+ 		mktemp(errFile);
+ 
++#ifdef RMAN
++		sprintf(rmanCmd, "%s -f HTML", RMAN);
++#else
+ 		sprintf(rmanCmd, "%s/rman -f HTML",
+ 			(const char *)KApplication::kde_bindir());
++#endif
+ 
+ 		// create the system cmd to read the man page
+ 		if ( (ptr = strchr(tmpName, '(')) )
diff --git a/x11/kdebase/pkg/PLIST b/x11/kdebase/pkg/PLIST
index c0f5d097c11..4ff7d535610 100644
--- a/x11/kdebase/pkg/PLIST
+++ b/x11/kdebase/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 1999/11/15 00:53:14 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.20 2001/03/20 00:20:42 fredb Exp $
 bin/kappfinder
 bin/kappfinder_restart
 bin/kattraction.kss
@@ -73,7 +73,6 @@ bin/kwm
 bin/kwmcom
 bin/kwmsound
 bin/maudio
-bin/rman
 bin/startkde
 bin/unpack
 libexec/kde-cgi-bin/helpindex