From 1cb511bf1f8c304fd759094364036edd1056653c Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Tue, 2 Sep 2003 03:09:47 +0000
Subject: Sync to HEAD before merging back.

---
 mk/bsd.pkg.mk                |  6 +++---
 mk/bsd.prefs.mk              |  2 +-
 mk/buildlink2/NOTES          | 14 +++++++-------
 mk/buildlink2/libtool-fix-la | 12 +++++++++---
 4 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index a1f313d4eaa..b03b40de5cf 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1216.2.48 2003/08/31 05:28:36 jlam Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1216.2.49 2003/09/02 03:09:47 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -996,16 +996,16 @@ MASTER_SITE_GNOME+=	\
 
 MASTER_SITE_SOURCEFORGE+=	\
 	http://aleron.dl.sourceforge.net/sourceforge/ \
+	http://belnet.dl.sourceforge.net/sourceforge/ \
 	http://cesnet.dl.sourceforge.net/sourceforge/ \
 	http://easynews.dl.sourceforge.net/sourceforge/ \
 	http://flow.dl.sourceforge.net/sourceforge/ \
 	http://heanet.dl.sourceforge.net/sourceforge/ \
-	http://switch.dl.sourceforge.net/sourceforge/ \
+	http://keihanna.dl.sourceforge.net/sourceforge/ \
 	http://telia.dl.sourceforge.net/sourceforge/ \
 	http://twtelecom.dl.sourceforge.net/sourceforge/ \
 	http://umn.dl.sourceforge.net/sourceforge/ \
 	http://unc.dl.sourceforge.net/sourceforge/ \
-	http://osdn.dl.sourceforge.net/sourceforge/ \
 	ftp://ftp3.sourceforge.net/pub/sourceforge/ \
 	ftp://ftp.tuwien.ac.at/linux/sourceforge/
 
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index 55bf519ff73..c81ad7ff664 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.118.2.16 2003/08/30 09:24:22 jlam Exp $
+# $NetBSD: bsd.prefs.mk,v 1.118.2.17 2003/09/02 03:09:49 jlam Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
diff --git a/mk/buildlink2/NOTES b/mk/buildlink2/NOTES
index b9a5f273e21..0edd7b130cd 100644
--- a/mk/buildlink2/NOTES
+++ b/mk/buildlink2/NOTES
@@ -1,4 +1,4 @@
-$NetBSD: NOTES,v 1.11 2002/12/28 23:01:25 schmonz Exp $
+$NetBSD: NOTES,v 1.11.6.1 2003/09/02 03:09:50 jlam Exp $
 
  Caching
  =======
@@ -22,14 +22,14 @@ and performing the tests above, but only building the packages is needed.
 
 Platform			Working?	Full caching?
 --------			--------	-------------
-FreeBSD 4.7			N/A		N/A
+FreeBSD 4.7
 IRIX 6.5 (jschauma)		Yes!		Yes!
-Linux				N/A		N/A
+Linux
 Darwin 5.5 (schmonz)		Yes!		No
 Darwin 6.2 (grant)		Yes!		Yes!
-NetBSD 1.5.x (gendalia)		N/A		N/A
+NetBSD 1.5.x (gendalia)
 NetBSD 1.6 (jlam)		Yes!		Yes!
-OpenBSD (cjep)			N/A		N/A
-Solaris 7			N/A		N/A
+OpenBSD (cjep)
+Solaris 7
 Solaris 8 (grant)		Yes!		Yes!
-Solaris 9 (salo)		N/A		N/A
+Solaris 9 (salo)		Yes!		Yes!
diff --git a/mk/buildlink2/libtool-fix-la b/mk/buildlink2/libtool-fix-la
index 29a82c68e75..a417c1d64ff 100644
--- a/mk/buildlink2/libtool-fix-la
+++ b/mk/buildlink2/libtool-fix-la
@@ -1,4 +1,4 @@
-# $NetBSD: libtool-fix-la,v 1.18.6.2 2003/08/30 07:57:58 jlam Exp $
+# $NetBSD: libtool-fix-la,v 1.18.6.3 2003/09/02 03:09:51 jlam Exp $
 #
 # For *.la files, in the "relink_command" line, we make the following
 # replacements:
@@ -144,11 +144,17 @@ if $test -f $lafile; then
 			case "$i" in
 			$prev)
 				;;
+			-R*)
+				# skip all -R* options... rpath info shouldn't
+				# go into the dependency_libs line.
+				;;
 			-L*)
 				case "$i" in
-				-L${BUILDLINK_DIR}/*|-L${BUILDLINK_X11_DIR}/*)
+				-L${BUILDLINK_DIR}|-L${BUILDLINK_DIR}/*)
+					;;
+				-L${BUILDLINK_X11_DIR}|-L${BUILDLINK_X11_DIR}/*)
 					;;
-				-L@WRKSRC@/*)
+				-L@WRKSRC@|-L@WRKSRC@/*)
 					;;
 				*)
 					case "$L" in
-- 
cgit v1.2.3