Introduce _OPSYS_LIB_DIRS and _OPSYS_INCLUDE_DIRS varables.

list of system library and header file directories.

Also add missing _OPSYS_SYSTEM_RPATH for some platforms.

21 files changed, 93 insertions, 20 deletions

diff --git a/mk/platform/AIX.mk b/mk/platform/AIX.mk
index 3edf2f6429d..737a568e0a8 100644
--- a/mk/platform/AIX.mk
+++ b/mk/platform/AIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: AIX.mk,v 1.39 2012/11/19 11:34:15 ryoon Exp $
+# $NetBSD: AIX.mk,v 1.40 2013/04/28 12:53:56 obache Exp $
 #
 # Variable definitions for the AIX operating system.
 
@@ -29,6 +29,10 @@ ULIMIT_CMD_datasize?=	ulimit -d `ulimit -H -d`
 ULIMIT_CMD_stacksize?=	ulimit -s `ulimit -H -s`
 ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
 
+_OPSYS_SYSTEM_RPATH?=		/usr/lib
+_OPSYS_LIB_DIRS?=		/usr/lib
+_OPSYS_INCLUDE_DIRS?=		/usr/include
+
 .if exists(/usr/include/netinet6)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 .else
diff --git a/mk/platform/BSDOS.mk b/mk/platform/BSDOS.mk
index 54351d8c571..d47931aa406 100644
--- a/mk/platform/BSDOS.mk
+++ b/mk/platform/BSDOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: BSDOS.mk,v 1.32 2012/11/19 11:34:15 ryoon Exp $
+# $NetBSD: BSDOS.mk,v 1.33 2013/04/28 12:53:56 obache Exp $
 #
 # Variable definitions for the BSD/OS operating system.
 
@@ -34,6 +34,10 @@ ULIMIT_CMD_datasize?=	ulimit -d `ulimit -H -d`
 ULIMIT_CMD_stacksize?=	ulimit -s `ulimit -H -s`
 ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
 
+_OPSYS_SYSTEM_RPATH?=		/usr/lib
+_OPSYS_LIB_DIRS?=		/usr/lib
+_OPSYS_INCLUDE_DIRS?=		/usr/include
+
 .if exists(/usr/include/netinet6)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 .else
diff --git a/mk/platform/Cygwin.mk b/mk/platform/Cygwin.mk
index d3ab937e191..d611a931e32 100644
--- a/mk/platform/Cygwin.mk
+++ b/mk/platform/Cygwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Cygwin.mk,v 1.11 2013/03/13 12:38:19 obache Exp $
+# $NetBSD: Cygwin.mk,v 1.12 2013/04/28 12:53:56 obache Exp $
 #
 # Variable definitions for the Windows with Cygwin.
 
@@ -40,6 +40,10 @@ ULIMIT_CMD_memorysize?=	ulimit -v `ulimit -H -v`
 
 X11_TYPE?=		native
 
+_OPSYS_SYSTEM_RPATH?=		# /usr/bin
+_OPSYS_LIB_DIRS?=		/lib /usr/lib
+_OPSYS_INCLUDE_DIRS?=		/usr/include
+
 _OPSYS_EXE_SUFFIX=	.exe	# executables may have suffix
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 _OPSYS_HAS_JAVA=	no	# Java is not standard
diff --git a/mk/platform/Darwin.mk b/mk/platform/Darwin.mk
index ad845561085..5f37c4b7663 100644
--- a/mk/platform/Darwin.mk
+++ b/mk/platform/Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.51 2013/04/04 10:24:14 jperkin Exp $
+# $NetBSD: Darwin.mk,v 1.52 2013/04/28 12:53:56 obache Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -71,6 +71,10 @@ _USER_DEPENDS=		user>=20040801:../../sysutils/user_darwin
 
 _OPSYS_EMULDIR.darwin=	# empty
 
+_OPSYS_SYSTEM_RPATH?=		/usr/lib
+_OPSYS_LIB_DIRS?=		/usr/lib
+_OPSYS_INCLUDE_DIRS?=		/usr/include
+
 .if ${OS_VERSION:R} >= 6
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 .else
diff --git a/mk/platform/DragonFly.mk b/mk/platform/DragonFly.mk
index eb835b0e754..e7e0531e706 100644
--- a/mk/platform/DragonFly.mk
+++ b/mk/platform/DragonFly.mk
@@ -1,4 +1,4 @@
-# $NetBSD: DragonFly.mk,v 1.43 2012/11/19 11:34:15 ryoon Exp $
+# $NetBSD: DragonFly.mk,v 1.44 2013/04/28 12:53:56 obache Exp $
 #
 # Variable definitions for the DragonFly operating system.
 
@@ -27,6 +27,8 @@ ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
 _OPSYS_EMULDIR.linux=	/compat/linux
 
 _OPSYS_SYSTEM_RPATH?=		/usr/lib:/usr/lib/gcc41:/usr/lib/gcc34
+_OPSYS_LIB_DIRS?=		/usr/lib
+_OPSYS_INCLUDE_DIRS?=		/usr/include
 
 .if exists(/usr/include/netinet6)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
diff --git a/mk/platform/FreeBSD.mk b/mk/platform/FreeBSD.mk
index a575a087fc2..851ffcaa051 100644
--- a/mk/platform/FreeBSD.mk
+++ b/mk/platform/FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: FreeBSD.mk,v 1.29 2012/11/19 11:34:15 ryoon Exp $
+# $NetBSD: FreeBSD.mk,v 1.30 2013/04/28 12:53:56 obache Exp $
 #
 # Variable definitions for the FreeBSD operating system.
 
@@ -33,6 +33,8 @@ _OPSYS_EMULDIR.freebsd=	# empty
 _OPSYS_EMULDIR.linux=	/compat/linux
 
 _OPSYS_SYSTEM_RPATH?=	/lib:/usr/lib	# STANDARD_LIBRARY_PATH (from rtld.h)
+_OPSYS_LIB_DIRS?=	/lib /usr/lib
+_OPSYS_INCLUDE_DIRS?=	/usr/include
 
 .if exists(/usr/include/netinet6)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
diff --git a/mk/platform/FreeMiNT.mk b/mk/platform/FreeMiNT.mk
index 1ed36b87ce1..94ba01ab815 100644
--- a/mk/platform/FreeMiNT.mk
+++ b/mk/platform/FreeMiNT.mk
@@ -1,4 +1,4 @@
-# $NetBSD: FreeMiNT.mk,v 1.2 2009/07/26 05:32:43 agc Exp $
+# $NetBSD: FreeMiNT.mk,v 1.3 2013/04/28 12:53:56 obache Exp $
 #
 # Variable definitions for the FreeMiNT operating system.
 
@@ -25,6 +25,10 @@ ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
 
 _OPSYS_EMULDIR.osf1=	# empty
 
+_OPSYS_SYSTEM_RPATH?=		/usr/lib
+_OPSYS_LIB_DIRS?=		/usr/lib
+_OPSYS_INCLUDE_DIRS?=		/usr/include
+
 _OPSYS_HAS_INET6=	no	# IPv6 is not standard
 _OPSYS_HAS_JAVA=	no	# Java is standard
 _OPSYS_HAS_MANZ=	no	# MANZ controls gzipping of man pages
diff --git a/mk/platform/HPUX.mk b/mk/platform/HPUX.mk
index a31a81509bd..04dc6ce054a 100644
--- a/mk/platform/HPUX.mk
+++ b/mk/platform/HPUX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: HPUX.mk,v 1.21 2012/11/19 11:34:15 ryoon Exp $
+# $NetBSD: HPUX.mk,v 1.22 2013/04/28 12:53:56 obache Exp $
 #
 # Variable definitions for the HP-UX operating system.
 
@@ -31,6 +31,10 @@ FIX_SYSTEM_HEADERS?=	yes
 
 _OPSYS_EMULDIR.hpux=	# empty
 
+_OPSYS_SYSTEM_RPATH?=	/usr/lib
+_OPSYS_LIB_DIRS?=	/usr/lib
+_OPSYS_INCLUDE_DIRS?=	/usr/include
+
 .if exists(/usr/include/netinet/ip6.h)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 .else
diff --git a/mk/platform/Haiku.mk b/mk/platform/Haiku.mk
index 89e6cafae05..d5a2882363c 100644
--- a/mk/platform/Haiku.mk
+++ b/mk/platform/Haiku.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Haiku.mk,v 1.7 2012/11/19 11:34:15 ryoon Exp $
+# $NetBSD: Haiku.mk,v 1.8 2013/04/28 12:53:56 obache Exp $
 #
 # Variable definitions for the Haiku operating system.
 
@@ -31,6 +31,12 @@ ULIMIT_CMD_stacksize?=	ulimit -s `ulimit -H -s`
 ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
 USERADD?=		/bin/useradd
 
+_OPSYS_SYSTEM_RPATH?=	/boot/common/lib:/boot/system/lib
+_OPSYS_LIB_DIRS?=	/boot/common/lib /boot/system/lib
+_OPSYS_INCLUDE_DIRS?=	/boot/common/include \
+			/boot/develop/headers/posix \
+			/boot/develop/3rdparty
+
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 _OPSYS_HAS_JAVA=	no	# Java is not standard
 _OPSYS_HAS_MANZ=	no	# no MANZ for gzipping of man pages
diff --git a/mk/platform/IRIX.mk b/mk/platform/IRIX.mk
index a0d59a41dd6..f0ae18a8c84 100644
--- a/mk/platform/IRIX.mk
+++ b/mk/platform/IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: IRIX.mk,v 1.40 2012/03/19 12:34:17 joerg Exp $
+# $NetBSD: IRIX.mk,v 1.41 2013/04/28 12:53:56 obache Exp $
 #
 # Variable definitions for the IRIX operating system.
 
@@ -37,6 +37,10 @@ _USER_DEPENDS=		user-[0-9]*:../../sysutils/user_irix
 
 _OPSYS_EMULDIR.irix=	# empty
 
+_OPSYS_SYSTEM_RPATH?=	/usr/lib
+_OPSYS_LIB_DIRS?=	/usr/lib
+_OPSYS_INCLUDE_DIRS?=	/usr/include
+
 .if exists(/usr/include/netinet6)
 _OPSYS_HAS_INET6=	yes		# IPv6 is standard
 .else
diff --git a/mk/platform/Interix.mk b/mk/platform/Interix.mk
index 5b18826bdc3..c3019e4456a 100644
--- a/mk/platform/Interix.mk
+++ b/mk/platform/Interix.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Interix.mk,v 1.68 2012/11/19 11:34:15 ryoon Exp $
+# $NetBSD: Interix.mk,v 1.69 2013/04/28 12:53:56 obache Exp $
 #
 # Variable definitions for the Interix operating system.
 
@@ -105,6 +105,10 @@ ULIMIT_CMD_datasize?=	ulimit -d `ulimit -H -d`
 ULIMIT_CMD_stacksize?=	ulimit -s `ulimit -H -s`
 ULIMIT_CMD_memorysize?=	ulimit -v `ulimit -H -v`
 
+_OPSYS_SYSTEM_RPATH?=	/usr/lib
+_OPSYS_LIB_DIRS?=	/usr/lib
+_OPSYS_INCLUDE_DIRS?=	/usr/include
+
 .if exists(/usr/include/netinet6)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 .else
diff --git a/mk/platform/Linux.mk b/mk/platform/Linux.mk
index 550a81b294d..5b4ba423b9c 100644
--- a/mk/platform/Linux.mk
+++ b/mk/platform/Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Linux.mk,v 1.52 2012/11/19 11:34:15 ryoon Exp $
+# $NetBSD: Linux.mk,v 1.53 2013/04/28 12:53:56 obache Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -49,6 +49,8 @@ _OPSYS_EMULDIR.linux=	# empty
 _OPSYS_EMULDIR.linux32=	# empty
 
 _OPSYS_SYSTEM_RPATH=	/lib${LIBABISUFFIX}:/usr/lib${LIBABISUFFIX}
+_OPSYS_LIB_DIRS?=	/lib${LIBABISUFFIX} /usr/lib${LIBABISUFFIX}
+_OPSYS_INCLUDE_DIRS?=	/usr/include
 
 .if exists(/usr/include/netinet6) || exists(/usr/include/linux/in6.h)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
diff --git a/mk/platform/Minix.mk b/mk/platform/Minix.mk
index d34dfc2193f..f64d8615a75 100644
--- a/mk/platform/Minix.mk
+++ b/mk/platform/Minix.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Minix.mk,v 1.4 2013/03/01 00:09:20 tcort Exp $
+# $NetBSD: Minix.mk,v 1.5 2013/04/28 12:53:56 obache Exp $
 #
 # Variable definitions for the Minix operating system.
 
@@ -26,6 +26,10 @@ USERADD?=		/usr/sbin/useradd
 ULIMIT_CMD_datasize?=	: 
 ULIMIT_CMD_stacksize?=	: 
 
+_OPSYS_SYSTEM_RPATH?=	/usr/lib
+_OPSYS_LIB_DIRS?=	/usr/lib
+_OPSYS_INCLUDE_DIRS?=	/usr/include
+
 _OPSYS_HAS_INET6=	no	# IPv6 is not standard
 _OPSYS_HAS_JAVA=	no	# Java is not standard
 _OPSYS_HAS_MANZ=	no	# no MANZ for gzipping of man pages
diff --git a/mk/platform/MirBSD.mk b/mk/platform/MirBSD.mk
index d990efa1ada..f1f1b931103 100644
--- a/mk/platform/MirBSD.mk
+++ b/mk/platform/MirBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: MirBSD.mk,v 1.8 2012/11/19 11:34:15 ryoon Exp $
+# $NetBSD: MirBSD.mk,v 1.9 2013/04/28 12:53:56 obache Exp $
 #
 # Variable definitions for the MirOS BSD operating system.
 
@@ -29,6 +29,10 @@ ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
 
 X11_TYPE?=		modular
 
+_OPSYS_SYSTEM_RPATH?=	/usr/lib
+_OPSYS_LIB_DIRS?=	/usr/lib
+_OPSYS_INCLUDE_DIRS?=	/usr/include
+
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 _OPSYS_HAS_JAVA=	no	# Java is not standard
 _OPSYS_HAS_MANZ=	no	# MANZ controls gzipping of man pages
diff --git a/mk/platform/NetBSD.mk b/mk/platform/NetBSD.mk
index b7aad3b0475..e6c02cfa0a7 100644
--- a/mk/platform/NetBSD.mk
+++ b/mk/platform/NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.mk,v 1.38 2012/11/19 11:34:15 ryoon Exp $
+# $NetBSD: NetBSD.mk,v 1.39 2013/04/28 12:53:56 obache Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -61,6 +61,8 @@ _OPSYS_EMULDIR.solaris32=	/emul/svr4_32
 _OPSYS_EMULDIR.sunos=		/emul/sunos
 
 _OPSYS_SYSTEM_RPATH?=		/usr/lib
+_OPSYS_LIB_DIRS?=		/usr/lib
+_OPSYS_INCLUDE_DIRS?=		/usr/include
 
 .if exists(/usr/include/netinet6)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
diff --git a/mk/platform/OSF1.mk b/mk/platform/OSF1.mk
index fcc67e06b8a..932af00acea 100644
--- a/mk/platform/OSF1.mk
+++ b/mk/platform/OSF1.mk
@@ -1,4 +1,4 @@
-# $NetBSD: OSF1.mk,v 1.33 2012/11/19 11:34:15 ryoon Exp $
+# $NetBSD: OSF1.mk,v 1.34 2013/04/28 12:53:56 obache Exp $
 #
 # Variable definitions for the OSF1 operating system.
 
@@ -31,6 +31,10 @@ FIX_SYSTEM_HEADERS?=    yes
 
 _OPSYS_EMULDIR.osf1=	# empty
 
+_OPSYS_SYSTEM_RPATH?=	/usr/lib
+_OPSYS_LIB_DIRS?=	/usr/lib
+_OPSYS_INCLUDE_DIRS?=	/usr/include
+
 .if exists(/usr/include/netinet/ip6.h)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 .else
diff --git a/mk/platform/OpenBSD.mk b/mk/platform/OpenBSD.mk
index d9edc9d9a51..c1e8a5d3910 100644
--- a/mk/platform/OpenBSD.mk
+++ b/mk/platform/OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: OpenBSD.mk,v 1.36 2012/11/19 11:34:15 ryoon Exp $
+# $NetBSD: OpenBSD.mk,v 1.37 2013/04/28 12:53:56 obache Exp $
 #
 # Variable definitions for the OpenBSD operating system.
 
@@ -39,6 +39,8 @@ ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
 X11_TYPE?=		native
 
 _OPSYS_SYSTEM_RPATH?=	/usr/lib
+_OPSYS_LIB_DIRS?=	/usr/lib
+_OPSYS_INCLUDE_DIRS?=	/usr/include
 
 .if exists(/usr/include/netinet6)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
diff --git a/mk/platform/QNX.mk b/mk/platform/QNX.mk
index 515cdbe5726..dd2b5570dbb 100644
--- a/mk/platform/QNX.mk
+++ b/mk/platform/QNX.mk
@@ -50,6 +50,9 @@ IMAKE_MISCMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}7
 IMAKE_MANINSTALL?=	maninstall catinstall
 
 _OPSYS_SYSTEM_RPATH?=	/lib:/usr/lib	# STANDARD_LIBRARY_PATH
+_OPSYS_LIB_DIRS?=	/lib /usr/lib
+_OPSYS_INCLUDE_DIRS?=	/usr/include
+
 .if exists(/usr/include/netinet6)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 .else
diff --git a/mk/platform/README b/mk/platform/README
index deb74c1dfe2..da189f88fa5 100644
--- a/mk/platform/README
+++ b/mk/platform/README
@@ -1,4 +1,4 @@
-$NetBSD: README,v 1.2 2013/04/08 13:29:26 obache Exp $
+$NetBSD: README,v 1.3 2013/04/28 12:53:56 obache Exp $
 
 These files contain platform-specific definitions that are used by the
 pkgsrc infrastructure.
@@ -67,6 +67,10 @@ TODO: Document all these variables.
 
     _OPSYS_SYSTEM_RPATH is colon separated list of system rpath.
 
+    _OPSYS_LIB_DIRS is list of system library directories.
+
+    _OPSYS_INCLUDE_DIRS is list of system header file directories.
+
     _OPSYS_HAS_INET6 is "yes" if IPv6 is standard, otherwise "no".
 
     _OPSYS_HAS_JAVA is "yes" if Java is standard, otherwise "no".
diff --git a/mk/platform/SunOS.mk b/mk/platform/SunOS.mk
index 399c98498b8..614ade5f341 100644
--- a/mk/platform/SunOS.mk
+++ b/mk/platform/SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: SunOS.mk,v 1.49 2013/03/01 16:58:51 jperkin Exp $
+# $NetBSD: SunOS.mk,v 1.50 2013/04/28 12:53:56 obache Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -82,6 +82,8 @@ _OPSYS_SYSTEM_RPATH?=	/lib/64:/usr/lib/64
 .else
 _OPSYS_SYSTEM_RPATH?=	/lib:/usr/lib
 .endif
+_OPSYS_LIB_DIRS?=	/lib${LIBABISUFFIX} /usr/lib${LIBABISUFFIX}
+_OPSYS_INCLUDE_DIRS?=	/usr/include
 
 # Enable shlibs checks if readelf is set, not available by default.
 _OPSYS_CAN_CHECK_SHLIBS=	no
diff --git a/mk/platform/UnixWare.mk b/mk/platform/UnixWare.mk
index 99be166a54c..746a0a3b319 100644
--- a/mk/platform/UnixWare.mk
+++ b/mk/platform/UnixWare.mk
@@ -1,4 +1,4 @@
-# $NetBSD: UnixWare.mk,v 1.32 2012/03/19 12:34:18 joerg Exp $
+# $NetBSD: UnixWare.mk,v 1.33 2013/04/28 12:53:56 obache Exp $
 #
 # Variable definitions for the UnixWare 7 operating system.
 
@@ -27,6 +27,10 @@ ULIMIT_CMD_stacksize?=	ulimit -s `ulimit -H -s`
 ULIMIT_CMD_memorysize?=	ulimit -v `ulimit -H -v`
 USERADD?=		/usr/sbin/useradd
 
+_OPSYS_SYSTEM_RPATH?=	/usr/lib
+_OPSYS_LIB_DIRS?=	/usr/lib
+_OPSYS_INCLUDE_DIRS?=	/usr/include
+
 .if exists(/usr/include/netinet/in6.h)
 _OPSYS_HAS_INET6=	yes		# IPv6 is standard
 .else