sync with HEAD

16 files changed, 446 insertions, 105 deletions

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index ab9a1dd265d..668b16ced6f 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1540.2.23 2005/02/15 16:25:22 tv Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1540.2.24 2005/02/25 14:46:51 tv Exp $
 #
 # This file is in the public domain.
 #
@@ -78,6 +78,10 @@ PLIST_SRC+=		${PKGDIR}/PLIST.common
 .  endif
 .  if exists(${PKGDIR}/PLIST.${OPSYS})
 PLIST_SRC+=		${PKGDIR}/PLIST.${OPSYS}
+.  elif exists(${PKGDIR}/PLIST.${MACHINE_ARCH:C/i[3-6]86/i386/g})
+PLIST_SRC+=		${PKGDIR}/PLIST.${MACHINE_ARCH:C/i[3-6]86/i386/g}
+.  elif exists(${PKGDIR}/PLIST.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g})
+PLIST_SRC+=		${PKGDIR}/PLIST.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g}
 .  elif exists(${PKGDIR}/PLIST)
 PLIST_SRC+=		${PKGDIR}/PLIST
 .  endif
@@ -97,7 +101,7 @@ CONFIGURE_DIRS?=	${WRKSRC}
 CONFIGURE_SCRIPT?=	./configure
 DEPENDS?=		# empty
 DESCR_SRC?=		${PKGDIR}/DESCR
-DIGEST_ALGORITHM?=	SHA1
+DIGEST_ALGORITHMS?=	SHA1 RMD160
 DISTFILES?=		${DISTNAME}${EXTRACT_SUFX}
 DISTINFO_FILE?=		${PKGDIR}/distinfo
 EXTRACT_ONLY?=		${DISTFILES}
@@ -109,6 +113,7 @@ INTERACTIVE_STAGE?=	none
 MAINTAINER?=		tech-pkg@NetBSD.org
 MAKE_FLAGS?=		# empty
 MAKEFILE?=		Makefile
+PATCH_DIGEST_ALGORITHM?=SHA1
 PKG_SUFX?=		.tgz
 PKGFILE?=		${PKGREPOSITORY}/${PKGNAME}${PKG_SUFX}
 PKGREPOSITORY?=		${PACKAGES}/${PKGREPOSITORYSUBDIR}
@@ -727,7 +732,6 @@ _CHECK_VULNERABLE=							\
 		  PKGBASE="${PKGBASE}"					\
 		${AWK} '/^$$/ { next }					\
 			/^\#.*/ { next }				\
-			$$1 !~ ENVIRON["PKGBASE"] { next }		\
 			{ s = sprintf("${PKG_ADMIN} pmatch \"%s\" %s && ${ECHO} \"*** WARNING - %s vulnerability in %s - see %s for more information ***\"", $$1, ENVIRON["PKGNAME"], $$2, ENVIRON["PKGNAME"], $$3); system(s); } \
 		' < ${PKGVULNDIR}/pkg-vulnerabilities || ${ECHO} 'could not check pkg-vulnerabilities file'
 
@@ -813,27 +817,33 @@ do-checksum: uptodate-digest
 	if [ ! -f ${DISTINFO_FILE} ]; then				\
 		${ECHO_MSG} "=> No checksum file.";			\
 	else								\
-		(cd ${DISTDIR}; OK="true";				\
+		(cd ${DISTDIR}; OK="true"; missing=""; 			\
 		  for file in "" ${_CKSUMFILES}; do			\
 		  	if [ "X$$file" = X"" ]; then continue; fi; 	\
-			alg=`${AWK} 'NF == 4 && $$2 == "('$$file')" && $$3 == "=" {print $$1;}' ${DISTINFO_FILE}`; \
-			if [ "X$$alg" = "X" ]; then			\
-				${ECHO_MSG} "=> No checksum recorded for $$file."; \
-				OK="false";				\
-			else						\
-				CKSUM=`${DIGEST} $$alg < $$file`;	\
-				CKSUM2=`${AWK} '$$1 == "'$$alg'" && $$2 == "('$$file')"{print $$4;}' ${DISTINFO_FILE}`; \
-				if [ "$$CKSUM2" = "IGNORE" ]; then	\
-					${ECHO_MSG} "=> Checksum for $$file is set to IGNORE in checksum file even though"; \
-					${ECHO_MSG} "   the file is not in the "'$$'"{IGNOREFILES} list."; \
-					OK="false";			\
-				elif [ "$$CKSUM" = "$$CKSUM2" ]; then	\
-					${ECHO_MSG} "=> Checksum OK for $$file."; \
-				else					\
-					${ECHO_MSG} "=> Checksum mismatch for $$file."; \
-					OK="false";			\
-				fi;					\
-			fi;						\
+			filesummed=false;				\
+			for a in ${DIGEST_ALGORITHMS}; do		\
+				CKSUM2=`${AWK} 'NF == 4 && $$1 == "'$$a'" && $$2 == "('$$file')" && $$3 == "=" {print $$4;}' ${DISTINFO_FILE}`; \
+				case "$${CKSUM2}" in			\
+				"")	${ECHO_MSG} "=> No $$a checksum recorded for $$file."; \
+					;;				\
+				*)	filesummed=true;		\
+					CKSUM=`${DIGEST} $$a < $$file`;	\
+					if [ "$$CKSUM2" = "IGNORE" ]; then \
+						${ECHO_MSG} "=> Checksum for $$file is set to IGNORE in checksum file even though"; \
+						${ECHO_MSG} "   the file is not in the "'$$'"{IGNOREFILES} list."; \
+						OK="false";		\
+					elif [ "$$CKSUM" = "$$CKSUM2" ]; then	\
+						${ECHO_MSG} "=> Checksum $$a OK for $$file."; \
+					else				\
+						${ECHO_MSG} "=> Checksum $$a mismatch for $$file."; \
+						OK="false";		\
+					fi ;;				\
+				esac;					\
+			done;						\
+			case "$$filesummed" in				\
+			false)	missing="$$missing $$file";		\
+				OK=false ;;				\
+			esac;						\
 		  done;							\
 		  for file in "" ${_IGNOREFILES}; do			\
 		  	if [ "X$$file" = X"" ]; then continue; fi; 	\
@@ -848,6 +858,10 @@ do-checksum: uptodate-digest
 			fi;						\
 		  done;							\
 		  if [ "$$OK" != "true" ]; then				\
+			case "$$missing" in				\
+			"")	;;					\
+			*)	${ECHO_MSG} "Missing checksums for $$missing";;	\
+			esac;						\
 			${ECHO_MSG} "Make sure the Makefile and checksum file (${DISTINFO_FILE})"; \
 			${ECHO_MSG} "are up to date.  If you want to override this check, type"; \
 			${ECHO_MSG} "\"${MAKE} NO_CHECKSUM=yes [other args]\"."; \
@@ -1570,7 +1584,7 @@ show-vars show-vars-noeval:
 .  for def in ${EVAL_PREFIX}
 .    if !defined(${def:C/=.*$//})
 ${def:C/=.*$//}_DEFAULT?=${LOCALBASE}
-_${def:C/=.*$//}_CMD=	${PKG_INFO} -qp ${def:C/^.*=//} 2>/dev/null | ${AWK} '{ print $$2; exit }' | grep '' || ${ECHO} ${${def:C/=.*$//}_DEFAULT}
+_${def:C/=.*$//}_CMD=	${PKG_INFO} -qp ${def:C/^.*=//} 2>/dev/null | ${AWK} '{ print $$2; exit }' | ${GREP} . || ${ECHO} ${${def:C/=.*$//}_DEFAULT}
 ${def:C/=.*$//}=	${_${def:C/=.*$//}_CMD:sh}
 .    endif
 .  endfor
@@ -1827,12 +1841,18 @@ makesum: recurse-fetch uptodate-digest
 	cd ${DISTDIR};							\
 	for sumfile in "" ${_CKSUMFILES}; do				\
 		if [ "X$$sumfile" = "X" ]; then continue; fi;		\
-		${DIGEST} ${DIGEST_ALGORITHM} $$sumfile >> $$newfile;	\
+		for a in "" ${DIGEST_ALGORITHMS}; do			\
+			if [ "X$$a" = "X" ]; then continue; fi;		\
+			${DIGEST} $$a $$sumfile >> $$newfile;		\
+		done;							\
 		${WC} -c $$sumfile | ${AWK} '{ print "Size (" $$2 ") = " $$1 " bytes" }' >> $$newfile; \
 	done;								\
 	for ignore in "" ${_IGNOREFILES}; do				\
 		if [ "X$$ignore" = "X" ]; then continue; fi;		\
-		${ECHO} "${DIGEST_ALGORITHM} ($$ignore) = IGNORE" >> $$newfile; \
+		for a in "" ${DIGEST_ALGORITHMS}; do			\
+			if [ "X$$a" = "X" ]; then continue; fi;		\
+			${ECHO} "$$a ($$ignore) = IGNORE" >> $$newfile;	\
+		done;							\
 	done;								\
 	if [ -f ${DISTINFO_FILE} ]; then				\
 		${AWK} '$$2 ~ /\(patch-[a-z0-9]+\)/ { print $$0 }' < ${DISTINFO_FILE} >> $$newfile; \
@@ -1864,7 +1884,7 @@ makepatchsum mps: uptodate-digest
 			case $$sumfile in				\
 				patch-local-*) ;;			\
 				*.orig|*.rej|*~) continue ;;		\
-				*)	${ECHO} "${DIGEST_ALGORITHM} ($$sumfile) = `${SED} -e '/\$$NetBSD.*/d' $$sumfile | ${DIGEST} ${DIGEST_ALGORITHM}`" >> $$newfile;; \
+				*)	${ECHO} "${PATCH_DIGEST_ALGORITHM} ($$sumfile) = `${SED} -e '/\$$NetBSD.*/d' $$sumfile | ${DIGEST} ${DIGEST_ALGORITHM}`" >> $$newfile;; \
 			esac;						\
 		done);							\
 	fi;								\
@@ -1973,7 +1993,7 @@ _FETCH_FILE=								\
 				if [ -n "${FAILOVER_FETCH}" -a -f ${DISTINFO_FILE} -a -f ${_DISTDIR}/$$bfile ]; then \
 					alg=`${AWK} 'NF == 4 && $$2 == "('$$file')" && $$3 == "=" {print $$1;}' ${DISTINFO_FILE}`; \
 					if [ -z "$$alg" ]; then		\
-						alg=${DIGEST_ALGORITHM};\
+						alg=${PATCH_DIGEST_ALGORITHM};\
 					fi;				\
 					CKSUM=`${DIGEST} $$alg < ${_DISTDIR}/$$bfile`; \
 					CKSUM2=`${AWK} '$$1 == "'$$alg'" && $$2 == "('$$file')" {print $$4;}' <${DISTINFO_FILE}`; \
diff --git a/mk/bsd.pkg.subdir.mk b/mk/bsd.pkg.subdir.mk
index 640712f3018..19b272d609d 100644
--- a/mk/bsd.pkg.subdir.mk
+++ b/mk/bsd.pkg.subdir.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.subdir.mk,v 1.55 2004/04/07 14:14:12 tv Exp $
+#	$NetBSD: bsd.pkg.subdir.mk,v 1.55.6.1 2005/02/25 14:46:51 tv Exp $
 #	Derived from: FreeBSD Id: bsd.port.subdir.mk,v 1.19 1997/03/09 23:10:56 wosch Exp 
 #	from: @(#)bsd.subdir.mk	5.9 (Berkeley) 2/1/91
 #
@@ -86,11 +86,10 @@ ${SUBDIR}::
 
 .for __target in all fetch package extract configure build clean \
 		cleandir distclean depend describe reinstall tags checksum \
-		makepatchsum mirror-distfiles deinstall show-downlevel \
-		show-pkgsrc-dir show-var show-vars bulk-install bulk-package \
-		fetch-list-one-pkg fetch-list-recursive \
-		update clean-update \
-		lint \
+		makedistinfo makepatchsum makesum mirror-distfiles deinstall \
+		show-downlevel show-pkgsrc-dir show-var show-vars \
+		bulk-install bulk-package fetch-list-one-pkg \
+		fetch-list-recursive update clean-update lint \
 		${PKG_MISC_TARGETS}
 .if !target(__target)
 ${__target}: _SUBDIRUSE
diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk
index 67de9673ecc..32816502445 100644
--- a/mk/bsd.pkg.use.mk
+++ b/mk/bsd.pkg.use.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.use.mk,v 1.1.2.8 2005/02/11 15:27:57 tv Exp $
+#	$NetBSD: bsd.pkg.use.mk,v 1.1.2.9 2005/02/25 14:46:51 tv Exp $
 #
 # Turn USE_* macros into proper depedency logic.  Included near the top of
 # bsd.pkg.mk, after bsd.prefs.mk.
@@ -162,36 +162,17 @@ ${_PERL5_DEPMETHOD}+=	${_PERL5_DEPENDS}:${PERL5_PKGSRCDIR}
 
 .if defined(USE_PERL5) && (${USE_PERL5} == "run")
 CONFIGURE_ENV+=		PERL=${PERL5:Q}
-.  if !defined(PERL5_SITELIB) || !defined(PERL5_SITEARCH) || !defined(PERL5_ARCHLIB)
-.    if exists(${PERL5})
-PERL5_SITELIB!=		eval `${PERL5} -V:installsitelib 2>/dev/null`; \
-			${ECHO} $${installsitelib}
-PERL5_SITEARCH!=	eval `${PERL5} -V:installsitearch 2>/dev/null`; \
-			${ECHO} $${installsitearch}
-PERL5_ARCHLIB!=		eval `${PERL5} -V:installarchlib 2>/dev/null`; \
-			${ECHO} $${installarchlib}
-.      if ${PKG_INSTALLATION_TYPE} == "overwrite"
-_PERL5_PREFIX!=		eval `${PERL5} -V:prefix 2>/dev/null`; \
-			${ECHO} $${prefix}
-PERL5_SITELIB:=		${PERL5_SITELIB:S/^${_PERL5_PREFIX}/${LOCALBASE}/}
-PERL5_SITEARCH:=	${PERL5_SITEARCH:S/^${_PERL5_PREFIX}/${LOCALBASE}/}
-PERL5_ARCHLIB:=		${PERL5_ARCHLIB:S/^${_PERL5_PREFIX}/${LOCALBASE}/}
-MAKEFLAGS+=		PERL5_SITELIB=${PERL5_SITELIB:Q}
-MAKEFLAGS+=		PERL5_SITEARCH=${PERL5_SITEARCH:Q}
-MAKEFLAGS+=		PERL5_ARCHLIB=${PERL5_ARCHLIB:Q}
-.      endif # PKG_INSTALLATION_TYPE == "overwrite"
-.    endif   # exists($PERL5)
-.  endif     # !defined(PERL5_*)
+.  include "../../lang/perl5/vars.mk"
 .endif       # USE_PERL5 == run
 
-.if defined(PERL5_SITELIB)
-PLIST_SUBST+=	PERL5_SITELIB=${PERL5_SITELIB:S/^${LOCALBASE}\///}
+.if defined(PERL5_SUB_INSTALLSITELIB)
+PLIST_SUBST+=	PERL5_SITELIB=${PERL5_SUB_INSTALLSITELIB}
 .endif
-.if defined(PERL5_SITEARCH)
-PLIST_SUBST+=	PERL5_SITEARCH=${PERL5_SITEARCH:S/^${LOCALBASE}\///}
+.if defined(PERL5_SUB_INSTALLSITEARCH)
+PLIST_SUBST+=	PERL5_SITEARCH=${PERL5_SUB_INSTALLSITEARCH}
 .endif
-.if defined(PERL5_ARCHLIB)
-PLIST_SUBST+=	PERL5_ARCHLIB=${PERL5_ARCHLIB:S/^${LOCALBASE}\///}
+.if defined(PERL5_SUB_INSTALLARCHLIB)
+PLIST_SUBST+=	PERL5_ARCHLIB=${PERL5_SUB_INSTALLARCHLIB}
 .endif
 
 ### USE_RMAN
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index e18702208cd..f4d2ec6be13 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.177.2.5 2005/02/11 15:27:57 tv Exp $
+# $NetBSD: bsd.prefs.mk,v 1.177.2.6 2005/02/25 14:46:51 tv Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -72,6 +72,7 @@ GNU_ARCH.mipseb?=	mipseb
 GNU_ARCH.mipsel?=	mipsel
 GNU_ARCH.ns32k?=	ns32k
 GNU_ARCH.powerpc?=	powerpc
+GNU_ARCH.rs6000?=	rs6000
 GNU_ARCH.sh3eb?=	sh
 GNU_ARCH.sh3el?=	shle
 GNU_ARCH.sparc?=	sparc
@@ -172,6 +173,25 @@ OS_VERSION!=		echo ${OS_VERSION} | sed -e 's/^V//'
 LOWER_OPSYS?=		osf${OS_VERSION}
 LOWER_VENDOR?=		dec
 
+.elif ${OPSYS} == "AIX"
+LOWER_ARCH!=		_cpuid=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $$1 }'`; \
+			if /usr/sbin/lsattr -El $$_cpuid | grep ' POWER' >/dev/null 2>&1; then \
+				echo rs6000; \
+			else \
+				echo powerpc; \
+			fi
+MACHINE_ARCH?=		${LOWER_ARCH}
+.  if exists(/usr/bin/oslevel)
+_OS_VERSION!=		/usr/bin/oslevel
+.  else
+_OS_VERSION!=		echo `${UNAME} -v`.`${UNAME} -r`
+.  endif
+OS_VERSION!=		echo ${_OS_VERSION} | sed -e 's,\([0-9]*\.[0-9]*\).*,\1,'
+LOWER_OS_VERSION=	${OS_VERSION}
+LOWER_OPSYS_VERSUFFIX=	${_OS_VERSION}
+LOWER_OPSYS?=		aix
+LOWER_VENDOR?=		ibm
+
 .elif !defined(LOWER_OPSYS)
 LOWER_OPSYS!=		echo ${OPSYS} | tr A-Z a-z
 .endif
@@ -227,10 +247,10 @@ OBJECT_FMT?=	ELF
 .  else
 OBJECT_FMT?=	a.out
 .  endif
-.endif
-
-.if ${OPSYS} == "DragonFly"
-OBJECT_FMT=		ELF
+.elif ${OPSYS} == "DragonFly"
+OBJECT_FMT=	ELF
+.elif ${OPSYS} == "AIX"
+OBJECT_FMT=	XCOFF
 .endif
 
 # Calculate depth
diff --git a/mk/bsd.sites.mk b/mk/bsd.sites.mk
index 752a00c771e..7c5dacde510 100644
--- a/mk/bsd.sites.mk
+++ b/mk/bsd.sites.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sites.mk,v 1.20.2.5 2004/12/20 20:46:00 tv Exp $
+# $NetBSD: bsd.sites.mk,v 1.20.2.6 2005/02/25 14:46:51 tv Exp $
 #
 # Default MASTER_SITES
 
@@ -6,14 +6,9 @@
 BSD_SITES_MK=	1
 
 MASTER_SITE_XCONTRIB+=  \
-	ftp://uiarchive.uiuc.edu/pub/ftp/ftp.x.org/contrib/ \
-	ftp://sunsite.doc.ic.ac.uk/packages/X11/contrib/ \
 	ftp://ftp.gwdg.de/pub/x11/x.org/contrib/ \
-	ftp://ftp.sunet.se/pub/X11/contrib/ \
 	ftp://sunsite.sut.ac.jp/pub/archives/X11/contrib/ \
 	ftp://sunsite.icm.edu.pl/pub/X11/contrib/ \
-	ftp://ftp.task.gda.pl/mirror/ftp.x.org/contrib/ \
-	ftp://ftp.ntua.gr/pub/X11/contrib/ \
 	ftp://sunsite.cnlab-switch.ch/mirror/X11/contrib/ \
 	ftp://ftp.cica.es/pub/X/contrib/ \
 	ftp://ftp.unicamp.br/pub/X11/contrib/ \
@@ -22,19 +17,13 @@ MASTER_SITE_XCONTRIB+=  \
 MASTER_SITE_GNU+=       \
 	ftp://ftp.gnu.org/pub/gnu/ \
 	http://public.planetmirror.com.au/pub/gnu/ \
-	ftp://gatekeeper.dec.com/pub/GNU/ \
-	ftp://ftp.uu.net/archive/systems/gnu/ \
-	ftp://ftp.de.uu.net/pub/gnu/ \
 	ftp://ftp.funet.fi/pub/gnu/prep/ \
-	ftp://ftp.leo.org/pub/comp/os/unix/gnu/ \
-	ftp://ftp.digex.net/pub/gnu/ \
 	ftp://ftp.wustl.edu/mirrors/gnu/ \
-	ftp://ftp.kddlabs.co.jp/pub/gnu/ \
+	ftp://ftp.kddlabs.co.jp/pub/gnu/gnu/ \
 	ftp://ftp.dti.ad.jp/pub/GNU/ \
 	ftp://ftp.mirror.ac.uk/sites/ftp.gnu.org/gnu/ \
-	ftp://sunsite.org.uk/Mirrors/ftp.gnu.org/pub/gnu/ \
 	ftp://ftp.informatik.hu-berlin.de/pub/gnu/ \
-	ftp://ftp.rediris.es/mirror/gnu/ \
+	ftp://ftp.rediris.es/mirror/GNU/gnu/ \
 	ftp://ftp.lip6.fr/pub/gnu/ \
 	ftp://ftp.tuwien.ac.at/linux/gnu/gnusrc/ \
 	ftp://ftp.chg.ru/pub/gnu/
@@ -82,24 +71,16 @@ MASTER_SITE_TEX_CTAN+= \
 
 MASTER_SITE_SUNSITE+=   \
 	ftp://sunsite.unc.edu/pub/Linux/ \
-	ftp://ftp.infomagic.com/pub/mirrors/linux/sunsite/ \
 	ftp://ftp.chg.ru/pub/Linux/sunsite/ \
-	ftp://ftp.is.co.za/linux/sunsite/ \
 	ftp://ftp.kddlabs.co.jp/Linux/metalab.unc.edu/ \
-	ftp://ftp.kobe-u.ac.jp/pub/Linux/metalab.unc.edu/ \
-	ftp://ftp.cse.cuhk.edu.hk/pub4/Linux/ \
 	ftp://ftp.icm.edu.pl/pub/Linux/sunsite/ \
 	ftp://ftp.nvg.ntnu.no/pub/mirrors/metalab.unc.edu/ \
 	ftp://ftp.uvsq.fr/pub5/linux/sunsite/ \
 	ftp://ftp.lip6.fr/pub/linux/sunsite/ \
 	ftp://ftp.uni-stuttgart.de/pub/mirror/sunsite.unc.edu/pub/Linux/ \
-	ftp://ftp.uni-magdeburg.de/pub/mirror/linux/ftp.metalab.unc.edu/ \
-	ftp://ftp.uni-jena.de/pub/linux/MIRROR.sunsite/ \
-	ftp://ftp.fu-berlin.de/unix/linux/mirrors/sunsite.unc.edu/ \
 	ftp://ftp.cs.tu-berlin.de/pub/linux/Mirrors/sunsite.unc.edu/ \
 	ftp://sunsite.cnlab-switch.ch/mirror/linux/sunsite/ \
-	ftp://ftp.tuwien.ac.at/pub/linux/ibiblio/ \
-	ftp://ftp.unicamp.br/pub/systems/Linux/
+	ftp://ftp.tuwien.ac.at/pub/linux/ibiblio/
 
 MASTER_SITE_GNOME+=     \
 	ftp://ftp.gnome.org/pub/GNOME/ \
diff --git a/mk/compiler.mk b/mk/compiler.mk
index 05bd4de4948..f51f2d02fd5 100644
--- a/mk/compiler.mk
+++ b/mk/compiler.mk
@@ -1,4 +1,4 @@
-# $NetBSD: compiler.mk,v 1.38.2.6 2005/02/15 16:25:22 tv Exp $
+# $NetBSD: compiler.mk,v 1.38.2.7 2005/02/25 14:46:51 tv Exp $
 #
 # This Makefile fragment implements handling for supported C/C++/Fortran
 # compilers.
@@ -20,7 +20,7 @@
 #		mipspro-ucode	Silicon Graphics, Inc. MIPSpro (o32)
 #		sunpro		Sun Microsystems, Inc. WorkShip/Forte/Sun
 #				ONE Studio
-#		xlc		IBM's XL C/C++ compiler suite
+#		xlc		IBM's XL C/C++ compiler suite (Darwin/MacOSX)
 #
 #	The default is "gcc".  You can use ccache and/or distcc with
 #	an appropriate PKGSRC_COMPILER setting, e.g. "ccache distcc
diff --git a/mk/compiler/icc.mk b/mk/compiler/icc.mk
index 380bfc85873..fe57be24522 100644
--- a/mk/compiler/icc.mk
+++ b/mk/compiler/icc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: icc.mk,v 1.1.2.2 2005/02/15 16:25:23 tv Exp $
+# $NetBSD: icc.mk,v 1.1.2.3 2005/02/25 14:46:51 tv Exp $
 
 .if !defined(COMPILER_ICC_MK)
 COMPILER_ICC_MK=	defined
@@ -58,6 +58,15 @@ _LANGUAGES.icc+=	${LANGUAGES.icc:M${_lang_}}
 PREPEND_PATH+=	${_ICC_DIR}/bin
 .endif
 
+# icc supports __attribute__, but the GNU configure test uses a nested
+# function, which icc does not support. #undef'ing __attribute__ has the
+# unfortunate side-effect of breaking many of the Linux header files, which
+# cannot be compiled properly without __attribute__. The test must be
+# overridden so that __attribute__ is assumed supported by the compiler.
+.if defined(GNU_CONFIGURE)
+CONFIGURE_ENV+=		ac_cv___attribute__=yes
+.endif
+
 # Create compiler driver scripts in ${WRKDIR}.
 .for _var_ in ${_ICC_VARS}
 .  if !target(${_ICC_${_var_}})
diff --git a/mk/platform/AIX.mk b/mk/platform/AIX.mk
index a6fd755b8bd..9572dc4c147 100644
--- a/mk/platform/AIX.mk
+++ b/mk/platform/AIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: AIX.mk,v 1.4.2.3 2005/02/15 16:25:23 tv Exp $
+# $NetBSD: AIX.mk,v 1.4.2.4 2005/02/25 14:46:51 tv Exp $
 #
 # Variable definitions for the AIX operating system.
 
@@ -10,7 +10,7 @@ CHOWN?=		/usr/bin/chown
 CHGRP?=		/usr/bin/chgrp
 CMP?=		/usr/bin/cmp
 CP?=		/bin/cp
-CPP?=       ${LOCALBASE}/bin/cpp
+CPP?=		${LOCALBASE}/bin/cpp
 CUT?=		/usr/bin/cut
 DATE?=		/bin/date
 DIRNAME?=	/usr/bin/dirname
@@ -19,7 +19,7 @@ ECHO_N?=	${ECHO} -n
 .if exists(${LOCALBASE}/bin/egrep)
 EGREP?=		${LOCALBASE}/bin/egrep
 .else
-EGREP?=     /usr/bin/grep -E
+EGREP?=		/usr/bin/grep -E
 .endif
 EXPR?=		/bin/expr
 FALSE?=		false				# Shell builtin
@@ -27,7 +27,7 @@ FETCH_CMD?= ${LOCALBASE}/bin/ftp
 .if exists(${LOCALBASE}/bin/fgrep)
 FGREP?=		${LOCALBASE}/bin/fgrep
 .else
-FGREP?=     /usr/bin/grep -F
+FGREP?=		/usr/bin/grep -F
 .endif
 FILE_CMD?=	/usr/bin/file
 FIND?=		/usr/bin/find
@@ -50,7 +50,7 @@ HEAD?=		/usr/bin/head
 HOSTNAME_CMD?=	/bin/hostname
 ID?=		/usr/bin/id
 #.if ${INSTALL} == "install"
-INSTALL=   ${LOCALBASE}/bin/install-sh
+INSTALL=	${LOCALBASE}/bin/install-sh
 #.endif
 LDCONFIG?=	/sbin/ldconfig
 LN?=		/bin/ln
@@ -63,7 +63,7 @@ MV?=		/bin/mv
 NICE?=		/usr/bin/nice
 PATCH?=		${LOCALBASE}/bin/gpatch
 .if exists(${LOCALBASE}/bin/pax)
-PAX?=       ${LOCALBASE}/bin/pax
+PAX?=		${LOCALBASE}/bin/pax
 .else
 PAX?=		/bin/pax
 .endif
@@ -114,7 +114,7 @@ NOLOGIN?=		/sbin/nologin
 PKG_TOOLS_BIN?=		${LOCALBASE}/sbin
 ROOT_CMD?=		${SU} - root -c
 ROOT_USER?=		root
-ROOT_GROUP?=	system
+ROOT_GROUP?=		system
 ULIMIT_CMD_datasize?=	ulimit -d `ulimit -H -d`
 ULIMIT_CMD_stacksize?=	ulimit -s `ulimit -H -s`
 ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
diff --git a/mk/platform/Linux.mk b/mk/platform/Linux.mk
index 38864133f48..d6f53649451 100644
--- a/mk/platform/Linux.mk
+++ b/mk/platform/Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Linux.mk,v 1.5.2.2 2005/02/11 15:27:57 tv Exp $
+# $NetBSD: Linux.mk,v 1.5.2.3 2005/02/25 14:46:51 tv Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -67,7 +67,11 @@ HEAD?=		/bin/head
 HEAD?=		/usr/bin/head
 .endif
 HOSTNAME_CMD?=	/bin/hostname
+.if exists(/bin/id)
+ID?=		/bin/id
+.else
 ID?=		/usr/bin/id
+.endif
 IMAKE?=		${X11BASE}/bin/imake ${IMAKEOPTS}
 IMAKEOPTS+=	-DBuildHtmlManPages=NO
 LDCONFIG?=	/sbin/ldconfig
diff --git a/mk/plist.mk b/mk/plist.mk
index 55e48be2d14..08256e94123 100644
--- a/mk/plist.mk
+++ b/mk/plist.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: plist.mk,v 1.1.2.2 2004/12/31 20:25:30 tv Exp $
+#	$NetBSD: plist.mk,v 1.1.2.3 2005/02/25 14:46:51 tv Exp $
 #
 # PLIST generation logic, invoked from the "install" target in bsd.pkg.mk.
 # This file should only be ".include"d from bsd.pkg.mk.
@@ -231,12 +231,12 @@ _DYLIB_AWK= \
 			}			\
 	}
 
-# Turn lib*.so.*, lib*.so into lib*.a.  Drop duplicates.
+# Turn lib*.so.*, lib*.so into lib*.so.  Drop duplicates.
 _AIXLIB_AWK= \
 	/^@/ { lines[NR] = $$0; next }		\
 	/.*\/lib[^\/]+\.so(\.[0-9]+)*$$/ {	\
 		sub("(\\.[0-9]+)*$$", "");	\
-		sub("\\.so$$", ".a");       	\
+		sub("\\.so$$", ".so");       	\
 		lines[NR] = $$0;     		\
 		next				\
 	}					\
diff --git a/mk/wrapper/bsd.wrapper.mk b/mk/wrapper/bsd.wrapper.mk
index 0ae5a2f772c..20023aee746 100644
--- a/mk/wrapper/bsd.wrapper.mk
+++ b/mk/wrapper/bsd.wrapper.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.wrapper.mk,v 1.12.2.9 2005/02/15 16:25:23 tv Exp $
+# $NetBSD: bsd.wrapper.mk,v 1.12.2.10 2005/02/25 14:46:51 tv Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -231,8 +231,13 @@ _WRAP_CMD_SINK.LD=	${_WRAP_CMD_SINK.CC}
 .endif
 
 .if !empty(PKGSRC_COMPILER:Micc)
+.  if !empty(CC_VERSION:M8.1)
+_WRAP_CMD_SINK.CC=	${WRAPPER_TMPDIR}/cmd-sink-icc81-cc
+_WRAP_CMD_SINK.CXX=	${_WRAP_CMD_SINK.CC}
+.  else
 _WRAP_CMD_SINK.CC=	${WRAPPER_TMPDIR}/cmd-sink-icc-cc
 _WRAP_CMD_SINK.CXX=	${_WRAP_CMD_SINK.CC}
+.  endif
 _WRAP_CACHE_BODY.CC=	${WRAPPER_TMPDIR}/cache-body-icc-cc
 _WRAP_CACHE_BODY.CXX=	${_WRAP_CACHE_BODY.CC}
 _WRAP_TRANSFORM.CC=	${WRAPPER_TMPDIR}/transform-icc-cc
@@ -303,6 +308,14 @@ _WRAP_CMD_SINK.LD=	${_WRAP_CMD_SINK.CC}
 _WRAP_CMD_SINK.CC=	${WRAPPER_TMPDIR}/cmd-sink-osf1-cc
 _WRAP_CMD_SINK.CXX=	${_WRAP_CMD_SINK.CC}
 _WRAP_CMD_SINK.LD=	${WRAPPER_TMPDIR}/cmd-sink-osf1-ld
+.elif ${OPSYS} == "AIX"
+_WRAP_CMD_SINK.CC=	${WRAPPER_TMPDIR}/cmd-sink-aix-cc
+_WRAP_CMD_SINK.CXX=	${_WRAP_CMD_SINK.CC}
+_WRAP_CMD_SINK.LD=	${WRAPPER_TMPDIR}/cmd-sink-aix-ld
+_WRAP_CACHE_BODY.CC=	${WRAPPER_TMPDIR}/cache-body-aix-cc
+_WRAP_TRANSFORM.CC=	${WRAPPER_TMPDIR}/transform-aix-cc
+_WRAP_CACHE_BODY.CXX=	${_WRAP_CACHE_BODY.CC}
+_WRAP_TRANSFORM.CXX=	${_WRAP_TRANSFORM.CC}
 .endif
 
 # Filter to scrunch shell scripts by removing comments and empty lines.
@@ -448,6 +461,18 @@ ${WRAPPER_TMPDIR}/cmd-sink-aix-xlc:					\
 	${_PKG_SILENT}${_PKG_DEBUG}${CAT} ${.ALLSRC}			\
 		| ${_WRAP_SH_CRUNCH_FILTER} > ${.TARGET}
 
+${WRAPPER_TMPDIR}/cmd-sink-aix-cc:					\
+		${WRAPPER_SRCDIR}/cmd-sink-aix-cc
+	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
+	${_PKG_SILENT}${_PKG_DEBUG}${CAT} ${.ALLSRC}			\
+		| ${_WRAP_SH_CRUNCH_FILTER} > ${.TARGET}
+
+${WRAPPER_TMPDIR}/cmd-sink-aix-ld:					\
+		${WRAPPER_SRCDIR}/cmd-sink-aix-ld
+	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
+	${_PKG_SILENT}${_PKG_DEBUG}${CAT} ${.ALLSRC}			\
+		| ${_WRAP_SH_CRUNCH_FILTER} > ${.TARGET}
+
 ${WRAPPER_TMPDIR}/cmd-sink-darwin-xlc:					\
 		${WRAPPER_SRCDIR}/cmd-sink-darwin-xlc
 	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
@@ -496,6 +521,18 @@ ${WRAPPER_TMPDIR}/cmd-sink-icc-cc:					\
 	${_PKG_SILENT}${_PKG_DEBUG}${CAT} ${.ALLSRC}			\
 		| ${_WRAP_SH_CRUNCH_FILTER} > ${.TARGET}
 
+${WRAPPER_TMPDIR}/cmd-sink-icc81-cc:					\
+		${WRAPPER_SRCDIR}/cmd-sink-icc81-cc
+	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
+	${_PKG_SILENT}${_PKG_DEBUG}${CAT} ${.ALLSRC}			\
+		| ${_WRAP_SH_CRUNCH_FILTER} > ${.TARGET}
+
+${WRAPPER_TMPDIR}/transform-aix-cc:					\
+		${WRAPPER_SRCDIR}/transform-aix-cc
+	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
+	${_PKG_SILENT}${_PKG_DEBUG}${CAT} ${.ALLSRC}			\
+		| ${_WRAP_SH_CRUNCH_FILTER} > ${.TARGET}
+
 ${WRAPPER_TMPDIR}/transform-icc-cc:					\
 		${WRAPPER_SRCDIR}/transform-icc-cc
 	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
diff --git a/mk/wrapper/cmd-sink-aix-cc b/mk/wrapper/cmd-sink-aix-cc
new file mode 100644
index 00000000000..1a629edac8e
--- /dev/null
+++ b/mk/wrapper/cmd-sink-aix-cc
@@ -0,0 +1,87 @@
+# $NetBSD: cmd-sink-aix-cc,v 1.1.2.2 2005/02/25 14:46:51 tv Exp $
+#
+# Copyright (c) 2005 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Grant Beattie.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#        This product includes software developed by the NetBSD
+#        Foundation, Inc. and its contributors.
+# 4. Neither the name of The NetBSD Foundation nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+# Empty out the command buffer and build up the command line in $cmd.
+blibpath=
+dynamic=
+
+while ! queue_is_empty cmdbuf; do
+	pop_queue cmdbuf arg
+	$debug_log $wrapperlog "    (cmd-sink-aix-cc) pop:  $arg"
+	case $arg in
+	##############################################################
+	# AIX ld(1) doesn't support -Wl,-rpath,* but accumulate them
+	# into a path collection we can later append to command line
+	# using -blibpath.
+	##############################################################
+	-R*|-Wl,-R*|-Wl,-rpath,*|-Wl,-rpath-link,*|-Wl,--rpath,*)
+		case $arg in
+		-R*)			R="-R" ;;
+		-Wl,-R*)		R="-Wl,-R" ;;
+		-Wl,-rpath,*)		R="-Wl,-rpath," ;;
+		-Wl,-rpath-link,*)	R="-Wl,-rpath-link," ;;
+		-Wl,--rpath,*)		R="-Wl,--rpath," ;;
+		esac
+		dir="${arg#$R}"
+		case "$blibpath" in
+		"")	blibpath="$dir" ;;
+		*)	blibpath="$blibpath:$dir" ;;
+		esac
+		$debug_log "    (cmd-sink-aix-cc) drop: $dir [adding to blibpath]"
+		dynamic=yes
+		;;
+	*)
+		. $buildcmd
+		;;
+	esac
+done
+
+# AIX ld(1) uses -blibpath to set the runtime library search path.
+if $test -n "$blibpath"; then
+	arg="-Wl,-blibpath:/lib:/usr/lib:$blibpath"
+	$debug_log "    (cmd-sink-aix-cc) pop: $arg"
+	. $buildcmd
+fi
+
+# If we are dynamically linking, make sure the runtime linker is used.
+if $test -n "$dynamic"; then
+	arg=-Wl,-brtl
+	$debug_log "    (cmd-sink-aix-cc) pop: $arg"
+	. $buildcmd
+	arg=-Wl,-bdynamic
+	$debug_log "    (cmd-sink-aix-cc) pop: $arg"
+	. $buildcmd
+fi
diff --git a/mk/wrapper/cmd-sink-aix-ld b/mk/wrapper/cmd-sink-aix-ld
new file mode 100644
index 00000000000..7b25d9b0085
--- /dev/null
+++ b/mk/wrapper/cmd-sink-aix-ld
@@ -0,0 +1,87 @@
+# $NetBSD: cmd-sink-aix-ld,v 1.1.2.2 2005/02/25 14:46:51 tv Exp $
+#
+# Copyright (c) 2004 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Johnny C. Lam.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#        This product includes software developed by the NetBSD
+#        Foundation, Inc. and its contributors.
+# 4. Neither the name of The NetBSD Foundation nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+# Empty out the command buffer and build up the command line in $cmd.
+blibpath=
+dynamic=
+
+while ! queue_is_empty cmdbuf; do
+	pop_queue cmdbuf arg
+	$debug_log $wrapperlog "    (cmd-sink-aix-ld) pop:  $arg"
+	case $arg in
+	##############################################################
+	# AIX ld(1) doesn't support -Wl,-rpath,* but accumulate them
+	# into a path collection we can later append to command line
+	# using -blibpath.
+	##############################################################
+	-R*|-Wl,-R*|-Wl,-rpath,*|-Wl,-rpath-link,*|-Wl,--rpath,*)
+		case $arg in
+		-R*)			R="-R" ;;
+		-Wl,-R*)		R="-Wl,-R" ;;
+		-Wl,-rpath,*)		R="-Wl,-rpath," ;;
+		-Wl,-rpath-link,*)	R="-Wl,-rpath-link," ;;
+		-Wl,--rpath,*)		R="-Wl,--rpath," ;;
+		esac
+		dir="${arg#$R}"
+		case $blibpath in
+		"")	blibpath="$dir" ;;
+		*)	blibpath="$blibpath:$dir" ;;
+		esac
+		$debug_log "    (cmd-sink-aix-ld) drop: $dir [adding to blibpath]"
+		dynamic=yes
+		;;
+	*)
+		. $buildcmd
+		;;
+	esac
+done
+
+# AIX ld(1) uses -blibpath to set the runtime library search path.
+if $test -n "$blibpath"; then
+        arg="-blibpath:/lib:/usr/lib:$blibpath"
+        $debug_log "    (cmd-sink-aix-ld) pop: $arg"
+        . $buildcmd
+fi
+
+# If we are dynamically linking, make sure the runtime linker is used.
+if $test -n "$dynamic"; then
+        arg=-brtl
+        $debug_log "    (cmd-sink-aix-ld) pop: $arg"
+        . $buildcmd
+        arg=-bdynamic
+        $debug_log "    (cmd-sink-aix-ld) pop: $arg"
+        . $buildcmd
+fi
diff --git a/mk/wrapper/cmd-sink-icc81-cc b/mk/wrapper/cmd-sink-icc81-cc
new file mode 100644
index 00000000000..7c66ddd156c
--- /dev/null
+++ b/mk/wrapper/cmd-sink-icc81-cc
@@ -0,0 +1,64 @@
+# $NetBSD: cmd-sink-icc81-cc,v 1.2.2.2 2005/02/25 14:46:51 tv Exp $
+#
+# Copyright (c) 2005 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Grant Beattie.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#        This product includes software developed by the NetBSD
+#        Foundation, Inc. and its contributors.
+# 4. Neither the name of The NetBSD Foundation nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+# all icc built dynamic libraries and executables need to be linked
+# with ${ICCBASE}/lib in the rpath, or statically linked against the
+# icc provided libraries. use the static linking method so binary
+# packages can be used on systems that do not have these libraries
+# available.
+arg=-i-static
+$debug_log $wrapperlog "    (cmd-sink-icc81-cc) pop:  $arg"
+. $buildcmd
+
+# Always link against the Intel provided C++ runtime library.
+arg=-cxxlib-icc
+$debug_log $wrapperlog "    (cmd-sink-icc81-cc) pop:  $arg"
+. $buildcmd
+
+while ! queue_is_empty cmdbuf; do
+	pop_queue cmdbuf arg
+	case "$arg" in
+	-MT)
+		pop_queue cmdbuf arg2
+		$debug_log $wrapperlog "    (cmd-sink-icc81-cc) pop:  $arg $arg2 [drop]"
+		;;
+
+	*)
+		$debug_log $wrapperlog "    (cmd-sink-icc81-cc) pop:  $arg"
+		. $buildcmd
+		;;
+	esac
+done
diff --git a/mk/wrapper/transform-aix-cc b/mk/wrapper/transform-aix-cc
new file mode 100644
index 00000000000..8de02fa38f6
--- /dev/null
+++ b/mk/wrapper/transform-aix-cc
@@ -0,0 +1,52 @@
+# $NetBSD: transform-aix-cc,v 1.1.2.2 2005/02/25 14:46:51 tv Exp $
+#
+# Copyright (c) 2005 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Grant Beattie.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#        This product includes software developed by the NetBSD
+#        Foundation, Inc. and its contributors.
+# 4. Neither the name of The NetBSD Foundation nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+# prepend -Wl, to linker arguments commonly passed to the compiler.
+case $arg in
+-H[0-9]*|-T[0-9]*|-b*)
+	arg=-Wl,$arg
+	msg_log $wrapperlog "   (transform-aix-cc) to: $arg"
+	addtocache=yes
+	;;
+# AIX ld(1) uses -G to create shared libraries, and we must make sure
+# the runtime linker is used.
+-shared)
+        arg="-Wl,-G -Wl,-brtl"
+        msg_log $wrapperlog "   (transform-aix-cc) to: $arg"
+        addtocache=yes
+        split_arg=yes
+        ;;
+esac
diff --git a/mk/wrapper/transform-icc-cc b/mk/wrapper/transform-icc-cc
index 7ed375a89ef..72817732193 100644
--- a/mk/wrapper/transform-icc-cc
+++ b/mk/wrapper/transform-icc-cc
@@ -1,4 +1,4 @@
-# $NetBSD: transform-icc-cc,v 1.2.2.2 2005/02/15 16:25:23 tv Exp $
+# $NetBSD: transform-icc-cc,v 1.2.2.3 2005/02/25 14:46:51 tv Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -38,7 +38,7 @@ case $arg in
 ######################################################################
 # ignore flags that icc doesn't understand.
 ######################################################################
--ffast-math|-fomit-frame-pointer|-pedantic|-pipe|-s|-MP|-OPT:*)
+-fexceptions|-ffast-math|-fomit-frame-pointer|-pedantic|-pipe|-s|-MP|-OPT:*)
 	arg=
 	msg_log $wrapperlog "   (transform-icc-cc) to: $arg"
 	addtocache=yes