sync with HEAD

33 files changed, 237 insertions, 157 deletions

diff --git a/mk/AIX.pkg.dist b/mk/AIX.pkg.dist
index 254150dbf83..171d9447e9a 100644
--- a/mk/AIX.pkg.dist
+++ b/mk/AIX.pkg.dist
@@ -1,5 +1,5 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp 
-#	$NetBSD: AIX.pkg.dist,v 1.25 2004/10/09 09:17:12 jmmv Exp $
+#	$NetBSD: AIX.pkg.dist,v 1.25.2.1 2004/12/31 20:25:30 tv Exp $
 #
 
 /set type=dir uname=root gname=system mode=0755
@@ -428,6 +428,10 @@
                 LC_MESSAGES
                 ..
             ..
+            as
+                LC_MESSAGES
+                ..
+            ..
             az
                 LC_MESSAGES
                 ..
@@ -756,6 +760,10 @@
                 LC_MESSAGES
                 ..
             ..
+            rw
+                LC_MESSAGES
+                ..
+            ..
             se
                 LC_MESSAGES
                 ..
diff --git a/mk/BSDOS.pkg.dist b/mk/BSDOS.pkg.dist
index 561b7361db6..e59a85e1fef 100644
--- a/mk/BSDOS.pkg.dist
+++ b/mk/BSDOS.pkg.dist
@@ -1,5 +1,5 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp 
-#	$NetBSD: BSDOS.pkg.dist,v 1.25 2004/10/09 09:17:12 jmmv Exp $
+#	$NetBSD: BSDOS.pkg.dist,v 1.25.2.1 2004/12/31 20:25:30 tv Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
@@ -428,6 +428,10 @@
                 LC_MESSAGES
                 ..
             ..
+            as
+                LC_MESSAGES
+                ..
+            ..
             az
                 LC_MESSAGES
                 ..
@@ -756,6 +760,10 @@
                 LC_MESSAGES
                 ..
             ..
+            rw
+                LC_MESSAGES
+                ..
+            ..
             se
                 LC_MESSAGES
                 ..
diff --git a/mk/Darwin.pkg.dist b/mk/Darwin.pkg.dist
index d2afa45d54a..d7333a424ab 100644
--- a/mk/Darwin.pkg.dist
+++ b/mk/Darwin.pkg.dist
@@ -1,5 +1,5 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp 
-#	$NetBSD: Darwin.pkg.dist,v 1.60 2004/10/09 09:17:12 jmmv Exp $
+#	$NetBSD: Darwin.pkg.dist,v 1.60.2.1 2004/12/31 20:25:30 tv Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
@@ -474,6 +474,10 @@
                 LC_MESSAGES
                 ..
             ..
+            as
+                LC_MESSAGES
+                ..
+            ..
             az
                 LC_MESSAGES
                 ..
@@ -806,6 +810,10 @@
                 LC_MESSAGES
                 ..
             ..
+            rw
+                LC_MESSAGES
+                ..
+            ..
             se
                 LC_MESSAGES
                 ..
diff --git a/mk/DragonFly.pkg.dist b/mk/DragonFly.pkg.dist
index a1739589212..2728a962058 100644
--- a/mk/DragonFly.pkg.dist
+++ b/mk/DragonFly.pkg.dist
@@ -1,4 +1,4 @@
-#	$NetBSD: DragonFly.pkg.dist,v 1.1 2004/10/31 22:05:02 wiz Exp $
+#	$NetBSD: DragonFly.pkg.dist,v 1.1.2.1 2004/12/31 20:25:30 tv Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
@@ -473,6 +473,10 @@
                 LC_MESSAGES
                 ..
             ..
+            as
+                LC_MESSAGES
+                ..
+            ..
             az
                 LC_MESSAGES
                 ..
@@ -805,6 +809,10 @@
                 LC_MESSAGES
                 ..
             ..
+            rw
+                LC_MESSAGES
+                ..
+            ..
             se
                 LC_MESSAGES
                 ..
diff --git a/mk/FreeBSD.pkg.dist b/mk/FreeBSD.pkg.dist
index ddce229788b..c9da899b41b 100644
--- a/mk/FreeBSD.pkg.dist
+++ b/mk/FreeBSD.pkg.dist
@@ -1,4 +1,4 @@
-#	$NetBSD: FreeBSD.pkg.dist,v 1.51 2004/10/09 09:17:12 jmmv Exp $
+#	$NetBSD: FreeBSD.pkg.dist,v 1.51.2.1 2004/12/31 20:25:30 tv Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
@@ -473,6 +473,10 @@
                 LC_MESSAGES
                 ..
             ..
+            as
+                LC_MESSAGES
+                ..
+            ..
             az
                 LC_MESSAGES
                 ..
@@ -805,6 +809,10 @@
                 LC_MESSAGES
                 ..
             ..
+            rw
+                LC_MESSAGES
+                ..
+            ..
             se
                 LC_MESSAGES
                 ..
diff --git a/mk/IRIX.pkg.dist b/mk/IRIX.pkg.dist
index e33be6e3d2b..029245884a2 100644
--- a/mk/IRIX.pkg.dist
+++ b/mk/IRIX.pkg.dist
@@ -1,4 +1,4 @@
-# $NetBSD: IRIX.pkg.dist,v 1.50 2004/10/09 09:17:12 jmmv Exp $
+# $NetBSD: IRIX.pkg.dist,v 1.50.2.1 2004/12/31 20:25:30 tv Exp $
 #
 
 /set type=dir uname=root gname=sys mode=0755
@@ -473,6 +473,10 @@
                 LC_MESSAGES
                 ..
             ..
+            as
+                LC_MESSAGES
+                ..
+            ..
             az
                 LC_MESSAGES
                 ..
@@ -805,6 +809,10 @@
                 LC_MESSAGES
                 ..
             ..
+            rw
+                LC_MESSAGES
+                ..
+            ..
             se
                 LC_MESSAGES
                 ..
diff --git a/mk/Interix.pkg.dist b/mk/Interix.pkg.dist
index 872d45e9b27..2ac1e3a493b 100644
--- a/mk/Interix.pkg.dist
+++ b/mk/Interix.pkg.dist
@@ -1,5 +1,5 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp 
-#	$NetBSD: Interix.pkg.dist,v 1.15 2004/10/09 09:17:12 jmmv Exp $
+#	$NetBSD: Interix.pkg.dist,v 1.15.2.1 2004/12/31 20:25:30 tv Exp $
 #
 
 /set type=dir uid=197108 gid=131616 mode=0775
@@ -474,6 +474,10 @@
                 LC_MESSAGES
                 ..
             ..
+            as
+                LC_MESSAGES
+                ..
+            ..
             az
                 LC_MESSAGES
                 ..
@@ -802,6 +806,10 @@
                 LC_MESSAGES
                 ..
             ..
+            rw
+                LC_MESSAGES
+                ..
+            ..
             se
                 LC_MESSAGES
                 ..
diff --git a/mk/Linux.pkg.dist b/mk/Linux.pkg.dist
index 3f0b4225fe4..67654cd0cef 100644
--- a/mk/Linux.pkg.dist
+++ b/mk/Linux.pkg.dist
@@ -1,5 +1,5 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp 
-#	$NetBSD: Linux.pkg.dist,v 1.67 2004/10/09 09:17:12 jmmv Exp $
+#	$NetBSD: Linux.pkg.dist,v 1.67.2.1 2004/12/31 20:25:30 tv Exp $
 #
 
 /set type=dir uname=root gname=sys mode=0755
@@ -474,6 +474,10 @@
                 LC_MESSAGES
                 ..
             ..
+            as
+                LC_MESSAGES
+                ..
+            ..
             az
                 LC_MESSAGES
                 ..
@@ -806,6 +810,10 @@
                 LC_MESSAGES
                 ..
             ..
+            rw
+                LC_MESSAGES
+                ..
+            ..
             se
                 LC_MESSAGES
                 ..
diff --git a/mk/NetBSD.pkg.dist b/mk/NetBSD.pkg.dist
index 1cec281eb4e..747d0f49571 100644
--- a/mk/NetBSD.pkg.dist
+++ b/mk/NetBSD.pkg.dist
@@ -1,5 +1,5 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp 
-#	$NetBSD: NetBSD.pkg.dist,v 1.78 2004/10/09 09:17:13 jmmv Exp $
+#	$NetBSD: NetBSD.pkg.dist,v 1.78.2.1 2004/12/31 20:25:30 tv Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
@@ -474,6 +474,10 @@
                 LC_MESSAGES
                 ..
             ..
+            as
+                LC_MESSAGES
+                ..
+            ..
             az
                 LC_MESSAGES
                 ..
@@ -802,6 +806,10 @@
                 LC_MESSAGES
                 ..
             ..
+            rw
+                LC_MESSAGES
+                ..
+            ..
             se
                 LC_MESSAGES
                 ..
diff --git a/mk/OSF1.pkg.dist b/mk/OSF1.pkg.dist
index acda71b558b..37215f15800 100644
--- a/mk/OSF1.pkg.dist
+++ b/mk/OSF1.pkg.dist
@@ -1,4 +1,4 @@
-# $NetBSD: OSF1.pkg.dist,v 1.1 2004/11/20 23:30:22 grant Exp $
+# $NetBSD: OSF1.pkg.dist,v 1.1.2.1 2004/12/31 20:25:30 tv Exp $
 #
 
 /set type=dir uname=root gname=system mode=0755
@@ -473,6 +473,10 @@
                 LC_MESSAGES
                 ..
             ..
+            as
+                LC_MESSAGES
+                ..
+            ..
             az
                 LC_MESSAGES
                 ..
@@ -805,6 +809,10 @@
                 LC_MESSAGES
                 ..
             ..
+            rw
+                LC_MESSAGES
+                ..
+            ..
             se
                 LC_MESSAGES
                 ..
diff --git a/mk/OpenBSD.pkg.dist b/mk/OpenBSD.pkg.dist
index d2919715d0a..4b20d24498d 100644
--- a/mk/OpenBSD.pkg.dist
+++ b/mk/OpenBSD.pkg.dist
@@ -1,4 +1,4 @@
-#	$NetBSD: OpenBSD.pkg.dist,v 1.50 2004/10/09 09:17:13 jmmv Exp $
+#	$NetBSD: OpenBSD.pkg.dist,v 1.50.2.1 2004/12/31 20:25:30 tv Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
@@ -473,6 +473,10 @@
                 LC_MESSAGES
                 ..
             ..
+            as
+                LC_MESSAGES
+                ..
+            ..
             az
                 LC_MESSAGES
                 ..
@@ -805,6 +809,10 @@
                 LC_MESSAGES
                 ..
             ..
+            rw
+                LC_MESSAGES
+                ..
+            ..
             se
                 LC_MESSAGES
                 ..
diff --git a/mk/SunOS.pkg.dist b/mk/SunOS.pkg.dist
index ec6ffbf77d6..34987cf9de5 100644
--- a/mk/SunOS.pkg.dist
+++ b/mk/SunOS.pkg.dist
@@ -1,5 +1,5 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp 
-#	$NetBSD: SunOS.pkg.dist,v 1.72 2004/10/09 09:17:13 jmmv Exp $
+#	$NetBSD: SunOS.pkg.dist,v 1.72.2.1 2004/12/31 20:25:30 tv Exp $
 #
 
 /set type=dir uname=root gname=sys mode=0755
@@ -34,6 +34,10 @@
                 LC_MESSAGES
                 ..
             ..
+            as
+                LC_MESSAGES
+                ..
+            ..
             az
                 LC_MESSAGES
                 ..
@@ -366,6 +370,10 @@
                 LC_MESSAGES
                 ..
             ..
+            rw
+                LC_MESSAGES
+                ..
+            ..
             se
                 LC_MESSAGES
                 ..
diff --git a/mk/UnixWare.pkg.dist b/mk/UnixWare.pkg.dist
index 9c898dc0e8b..1a7df05f59c 100644
--- a/mk/UnixWare.pkg.dist
+++ b/mk/UnixWare.pkg.dist
@@ -1,6 +1,6 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp 
 #	NetBSD: SunOS.pkg.dist,v 1.64 2004/04/01 12:19:09 jmmv Exp
-#	$NetBSD: UnixWare.pkg.dist,v 1.9 2004/10/09 09:17:13 jmmv Exp $
+#	$NetBSD: UnixWare.pkg.dist,v 1.9.2.1 2004/12/31 20:25:30 tv Exp $
 #
 
 /set type=dir uname=root gname=sys mode=0755
@@ -35,6 +35,10 @@
                 LC_MESSAGES
                 ..
             ..
+            as
+                LC_MESSAGES
+                ..
+            ..
             az
                 LC_MESSAGES
                 ..
@@ -367,6 +371,10 @@
                 LC_MESSAGES
                 ..
             ..
+            rw
+                LC_MESSAGES
+                ..
+            ..
             se
                 LC_MESSAGES
                 ..
diff --git a/mk/bsd.pkg.data.mk b/mk/bsd.pkg.data.mk
index 9327d64030d..e26df3e8a5f 100644
--- a/mk/bsd.pkg.data.mk
+++ b/mk/bsd.pkg.data.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.data.mk,v 1.1.2.2 2004/11/23 20:39:19 tv Exp $
+#	$NetBSD: bsd.pkg.data.mk,v 1.1.2.3 2004/12/31 20:25:30 tv Exp $
 #
 # bsd.pkg.mk fragments for exporting data in human-readable or machine
 # parseable formats.
@@ -511,10 +511,10 @@ print-summary-data:
 	fi;
 	@${ECHO} "maintainer ${PKGPATH} ${MAINTAINER}"
 	@${ECHO} "categories ${PKGPATH} ${CATEGORIES}"
-	@if [ -f ${DESCR_SRC} ]; then						\
-		${ECHO}  "descr ${PKGPATH} ${DESCR_SRC:S;${PKGSRCDIR}/;;g}";	\
-	else									\
-		${ECHO}  "descr ${PKGPATH} /dev/null";				\
+	@if [ -f ${DESCR_SRC} ]; then					\
+		${ECHO}  "descr ${PKGPATH} ${DESCR_SRC:S;${PKGSRCDIR}/;;g}"; \
+	else								\
+		${ECHO}  "descr ${PKGPATH} /dev/null";			\
 	fi
 	@${ECHO} "prefix ${PKGPATH} ${PREFIX}"
 
diff --git a/mk/bsd.pkg.install.mk b/mk/bsd.pkg.install.mk
index d18a141bda7..e0989a1cd8b 100644
--- a/mk/bsd.pkg.install.mk
+++ b/mk/bsd.pkg.install.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.install.mk,v 1.65 2004/10/11 22:04:19 reed Exp $
+# $NetBSD: bsd.pkg.install.mk,v 1.65.2.1 2004/12/31 20:25:30 tv Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk to use the common
 # INSTALL/DEINSTALL scripts.  To use this Makefile fragment, simply:
@@ -118,11 +118,8 @@ BROKEN:=		"User and group '${user:C/:.*//}' cannot have the same name on Interix
 .  endfor
 .endif
 
-.if !empty(PKG_USERS)
-USE_USERADD=		YES
-.endif
-.if !empty(PKG_GROUPS)
-USE_GROUPADD=		YES
+.if !empty(PKG_USERS) || !empty(PKG_GROUPS)
+DEPENDS+=		${_USER_DEPENDS}
 .endif
 
 # SPECIAL_PERMS are lists that look like:
@@ -173,7 +170,7 @@ SUPPORT_FILES_MODE?=	0644
 SUPPORT_FILES_PERMS?=	# empty
 RCD_SCRIPTS?=		# empty
 RCD_SCRIPTS_MODE?=	0755
-RCD_SCRIPTS_EXAMPLEDIR?=	etc/rc.d
+RCD_SCRIPTS_EXAMPLEDIR?=	share/examples/rc.d
 .if !empty(RCD_SCRIPTS_EXAMPLEDIR:M/*)
 PKG_FAIL_REASON+= \
 	"bsd.pkg.install.mk: RCD_SCRIPTS_EXAMPLEDIR can't be an absolute path."
@@ -342,6 +339,7 @@ ${INSTALL_FILE}: ${INSTALL_SRC}
 #
 # RCD_SCRIPTS_EXAMPLEDIR	the directory relative to ${PREFIX} in
 #				which to install the example rc.d scripts
+#				(defaults to share/examples/rc.d)
 #
 # If the source rc.d script is not present, then the automatic handling
 # doesn't occur.
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 7f27542478f..08fc1a2749d 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1540.2.8 2004/12/05 03:42:35 tv Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1540.2.9 2004/12/31 20:25:30 tv Exp $
 #
 # This file is in the public domain.
 #
@@ -350,8 +350,6 @@ ${var}+=	${${var}.*}
 .  endfor
 
 CPPFLAGS+=	${CPP_PRECOMP_FLAGS}
-DEPENDS+=	${USE_USERADD:D${_USER_DEPENDS}}
-DEPENDS+=	${USE_GROUPADD:D${_USER_DEPENDS}}
 
 .if !empty(USE_BUILDLINK3:M[nN][oO])
 LDFLAGS+=	${COMPILER_RPATH_FLAG}${LOCALBASE}/lib
@@ -526,6 +524,9 @@ SCRIPTS_ENV+=		${_INSTALL_MACROS}
 .  if defined(USE_GNU_TOOLS) && !empty(USE_GNU_TOOLS:Mmake)
 MAKE_PROGRAM=		${GMAKE}
 .  elif defined(USE_IMAKE)
+.    if ${_IMAKE_MAKE} == ${GMAKE}
+USE_GNU_TOOLS+=		make
+.    endif
 MAKE_PROGRAM=		${_IMAKE_MAKE}
 .  endif
 MAKE_PROGRAM?=		${MAKE}
@@ -1047,12 +1048,12 @@ PATCH_DIST_CAT.${i:S/=/--/}?=	{ patchfile=${i}; ${PATCH_DIST_CAT}; }
 .  if !empty(PKGSRC_SHOW_PATCH_ERRORMSG:M[yY][eE][sS])
 PKGSRC_PATCH_FAIL=							\
 if [ -n "${PKG_OPTIONS}" ] || [ -n "${_LOCALPATCHFILES}" ]; then	\
-	${ECHO} "==========================================================================";								\
+	${ECHO} "=========================================================================="; \
 	${ECHO};							\
-	${ECHO} "Some of the selected build options and/or local patches may be incompatible.";								\
+	${ECHO} "Some of the selected build options and/or local patches may be incompatible."; \
 	${ECHO} "Please try building with fewer options or patches.";	\
 	${ECHO};							\
-	${ECHO} "==========================================================================";								\
+	${ECHO} "=========================================================================="; \
 fi; exit 1
 .  endif
 PKGSRC_PATCH_FAIL?=	exit 1
@@ -1396,7 +1397,7 @@ post-install-man:
 		for manpage in $$newmanpages; do			\
 			manpage=`${ECHO} $$manpage | ${SED} -e 's|\.gz$$||'`; \
 			if [ -h ${PREFIX}/$$manpage ]; then		\
-				set - `${LS} -l ${PREFIX}/$$manpage`; \
+				set - `${LS} -l ${PREFIX}/$$manpage`;	\
 				shift `expr $$# - 1`;			\
 				${RM} -f ${PREFIX}/$$manpage.gz; 	\
 				${LN} -s $${1}.gz ${PREFIX}/$$manpage.gz; \
@@ -1570,9 +1571,8 @@ tags: .OPTIONAL
 		update
 ${targ}:
 .    if !defined(SKIP_SILENT)
-	@for str in ${PKG_FAIL_REASON} ${PKG_SKIP_REASON} ; \
-	do \
-		${ECHO} "${_PKGSRC_IN}> $$str" ; \
+	@for str in ${PKG_FAIL_REASON} ${PKG_SKIP_REASON}; do		\
+		${ECHO} "${_PKGSRC_IN}> $$str";				\
 	done
 .    endif
 .    if defined(PKG_FAIL_REASON)
@@ -1854,11 +1854,11 @@ _RESUME_TRANSFER=							\
 	tsize=`${AWK} '/^Size/ && $$2 == '"\"($$file)\""' { print $$4 }' ${DISTINFO_FILE}` || ${TRUE}; \
 	if [ ! -f "${DISTDIR}/${DIST_SUBDIR}/$$bfile.temp" ]; then	\
 		${CP} ${DISTDIR}/${DIST_SUBDIR}/$$bfile ${DISTDIR}/${DIST_SUBDIR}/$$bfile.temp; \
-	fi;	\
+	fi;								\
 	dsize=`${WC} -c < ${DISTDIR}/${DIST_SUBDIR}/$$bfile.temp`;	\
-	if [ "$$dsize" -eq "$$tsize" -a -f "${DISTDIR}/${DIST_SUBDIR}/$$bfile.temp" ]; then	\
+	if [ "$$dsize" -eq "$$tsize" -a -f "${DISTDIR}/${DIST_SUBDIR}/$$bfile.temp" ]; then \
 		${MV} ${DISTDIR}/${DIST_SUBDIR}/$$bfile.temp ${DISTDIR}/${DIST_SUBDIR}/$$bfile;	\
-	fi;	\
+	fi;								\
 	case "$$tsize" in						\
 	"")	${ECHO_MSG} "No size in distinfo file (${DISTINFO_FILE})"; \
 		break ;;						\
@@ -1867,33 +1867,33 @@ _RESUME_TRANSFER=							\
 		${ECHO_MSG} "===> Resume is not supported by ftp(1) using http/ftp proxies.";	\
 		break;							\
 	else								\
-		if [ "$$dsize" -lt "$$tsize" ]; then		\
+		if [ "$$dsize" -lt "$$tsize" ]; then			\
 			if [ "${FETCH_CMD:T}" != "ftp" -a -z "${FETCH_RESUME_ARGS}" ]; then \
 				${ECHO_MSG} "=> Resume transfers are not supported, FETCH_RESUME_ARGS is empty."; \
 				break;					\
 			else						\
-				for res_site in $$sites; do			\
-					if [ -z "${FETCH_OUTPUT_ARGS}" ]; then	\
-						${ECHO_MSG} "=> FETCH_OUTPUT_ARGS has to be defined.";	\
+				for res_site in $$sites; do		\
+					if [ -z "${FETCH_OUTPUT_ARGS}" ]; then \
+						${ECHO_MSG} "=> FETCH_OUTPUT_ARGS has to be defined."; \
 						break;			\
 					fi;				\
-					${ECHO_MSG} "=> $$bfile not completed, resuming:";	\
-					${ECHO_MSG} "=> Downloaded: $$dsize Total: $$tsize.";	\
+					${ECHO_MSG} "=> $$bfile not completed, resuming:"; \
+					${ECHO_MSG} "=> Downloaded: $$dsize Total: $$tsize."; \
 					${ECHO_MSG};			\
 					cd ${_DISTDIR};			\
-					${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${FETCH_RESUME_ARGS}	\
+					${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${FETCH_RESUME_ARGS} \
 						${FETCH_OUTPUT_ARGS} $${bfile}.temp $${res_site}$${bfile}; \
 					if [ $$? -eq 0 ]; then		\
-						ndsize=`${WC} -c < ${DISTDIR}/${DIST_SUBDIR}/$$bfile.temp`;	\
-						if [ "$$tsize" -eq "$$ndsize" ]; then	\
-							${MV} ${DISTDIR}/${DIST_SUBDIR}/$$bfile.temp ${DISTDIR}/${DIST_SUBDIR}/$$bfile;						\
+						ndsize=`${WC} -c < ${DISTDIR}/${DIST_SUBDIR}/$$bfile.temp`; \
+						if [ "$$tsize" -eq "$$ndsize" ]; then \
+							${MV} ${DISTDIR}/${DIST_SUBDIR}/$$bfile.temp ${DISTDIR}/${DIST_SUBDIR}/$$bfile; \
 						fi;			\
 						break;			\
 					fi;				\
 				done;					\
 			fi;						\
 		elif [ "$$dsize" -gt "$$tsize" ]; then			\
-			${ECHO_MSG} "==> Downloaded file larger than the recorded size.";	\
+			${ECHO_MSG} "==> Downloaded file larger than the recorded size."; \
 			break;						\
 		fi;							\
 	fi
@@ -1933,7 +1933,7 @@ _FETCH_FILE=								\
 				fi;					\
 			fi						\
 		done;							\
-		if [ ! -f ${_DISTDIR}/$$bfile ]; then \
+		if [ ! -f ${_DISTDIR}/$$bfile ]; then			\
 			${ECHO_MSG} "=> Couldn't fetch $$bfile - please try to retrieve this";\
 			${ECHO_MSG} "=> file manually into ${_DISTDIR} and try again."; \
 			exit 1;						\
@@ -1942,7 +1942,7 @@ _FETCH_FILE=								\
 
 _CHECK_DIST_PATH=							\
 	if [ "X${DIST_PATH}" != "X" ]; then				\
-		for d in "" ${DIST_PATH:S/:/ /g}; do	\
+		for d in "" ${DIST_PATH:S/:/ /g}; do			\
 			if [ "X$$d" = "X" -o "X$$d" = "X${DISTDIR}" ]; then continue; fi; \
 			if [ -f $$d/${DIST_SUBDIR}/$$bfile ]; then	\
 				${ECHO} "Using $$d/${DIST_SUBDIR}/$$bfile"; \
@@ -2892,7 +2892,7 @@ ${DDIR}: ${DLIST}
 ${DLIST}: ${WRKDIR}
 	${_PKG_SILENT}${_PKG_DEBUG}					\
 	{ ${PKG_DELETE} -n "${PKGWILDCARD}" 2>&1 | 			\
-		${GREP} '^	' |						\
+		${GREP} '^	' |					\
 		${AWK} '{ l[NR]=$$0 } END { for (i=NR;i>0;--i) print l[i] }' \
 	|| ${TRUE}; } > ${DLIST}
 
@@ -2902,7 +2902,7 @@ tarup:
 .if ${PKG_INSTALLATION_TYPE} == "overwrite"
 	${_PKG_SILENT}${_PKG_DEBUG}					\
 	${RM} -f ${PACKAGES}/All/${PKGNAME}${PKG_SUFX};			\
-	${SETENV} PKG_DBDIR=${_PKG_DBDIR} PKG_SUFX=${PKG_SUFX}	\
+	${SETENV} PKG_DBDIR=${_PKG_DBDIR} PKG_SUFX=${PKG_SUFX}		\
 		PKGREPOSITORY=${PACKAGES}/All				\
 		${LOCALBASE}/bin/pkg_tarup ${PKGNAME};			\
 	for CATEGORY in ${CATEGORIES}; do				\
@@ -3077,7 +3077,7 @@ real-su-bin-install:
 bin-install:
 	@${ECHO_MSG} "${_PKGSRC_IN}> Binary install for ${PKGNAME}"
 	${_PKG_SILENT}${_PKG_DEBUG}					\
-	realtarget="real-su-bin-install";					\
+	realtarget="real-su-bin-install";				\
 	action="binary install";					\
 	${_SU_TARGET}
 
diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk
index f0a0c37c425..b0d4a975ece 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.3 2004/12/20 20:46:00 tv Exp $
+#	$NetBSD: bsd.pkg.use.mk,v 1.1.2.4 2004/12/31 20:25:30 tv Exp $
 #
 # Turn USE_* macros into proper depedency logic.  Included near the top of
 # bsd.pkg.mk, after bsd.prefs.mk.
@@ -194,6 +194,7 @@ ${_PERL5_DEPMETHOD}+=	${_PERL5_DEPENDS}:${PERL5_PKGSRCDIR}
 .endif
 
 .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`; \
diff --git a/mk/db1.builtin.mk b/mk/db1.builtin.mk
index c577c92088e..d61dbd42618 100644
--- a/mk/db1.builtin.mk
+++ b/mk/db1.builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: db1.builtin.mk,v 1.5.2.3 2004/12/20 20:46:00 tv Exp $
+# $NetBSD: db1.builtin.mk,v 1.5.2.4 2004/12/31 20:25:30 tv Exp $
 
 .for _lib_ in db db1
 .  if !defined(_BLNK_LIB_FOUND.${_lib_})
@@ -70,7 +70,6 @@ BUILDLINK_LDADD.db1=	-ldb1
 BUILDLINK_TRANSFORM+=	l:db:db1
 .    else
 BUILDLINK_LDADD.db1=	# empty
-BUILDLINK_TRANSFORM+=	rm:-ldb
 .    endif
 BUILDLINK_LIBS.db1=	${BUILDLINK_LDADD.db1}
 
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index 55a40a0cf20..47fdc5256e3 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.14.2.3 2004/12/20 20:46:00 tv Exp $
+# $NetBSD: mk.conf,v 1.14.2.4 2004/12/31 20:25:30 tv Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -201,6 +201,22 @@ X11BASE?=		${LOCALBASE}/${X11ROOT_PREFIX}
 # Possible: any path
 # Default: /usr/X11R6, /usr/openwin for Solaris
 
+MLDONKEY_GROUP?= mldonkey
+# System group to run mldonkey's core as.
+# Possible: any group name
+# Default: mldonkey
+
+MLDONKEY_HOME?= ${VARBASE}/mldonkey
+# Directory where mldonkey will keep all configuration files and downloads
+# when started with the rc.d script provided in the mldonkey package.
+# Possible: any path
+# Default: ${VARBASE}/mldonkey
+
+MLDONKEY_USER?= mldonkey
+# System user to run mldonkey's core as.
+# Possible: any user name
+# Default: mldonkey
+
 #MOTIFBASE?=	/usr/X11R6
 # Where Motif-2.0-compatible headers and libraries are installed
 # on the system.
@@ -680,12 +696,6 @@ APACHE_GROUP?=	www
 # Possible: any group name
 # Default: www
 
-#APACHE_SUEXEC=	YES
-# Used in apache, apache2, and apache6 to enable Switch User For Exec
-# support.  See http://www.apache.org/docs/suexec.html for more informations.
-# Possible: not defined, YES
-# Default: not defined
-
 #APACHE_SUEXEC_CONFIGURE_ARGS=	--suexec-uidmin=1000
 # Used in apache, apache2, and apache6 to specify additional suexec options
 # to be passed to the configure script.
@@ -698,17 +708,6 @@ APACHE_SUEXEC_DOCROOT?=	${LOCALBASE}/share/httpd/htdocs
 # Possible: Any valid directory
 # Default: ${LOCALBASE}/share/httpd/htdocs
 
-APR_USE_DB4?= NO
-# Used in apr to determine whether to use db4.  If this is YES while
-# building apr and subversion-base, the latter will build the db4
-# back-end in addition to the native filesystem back-back.
-# Default: YES
-
-APR_USE_OPENLDAP?=	NO
-# Used in apr to enable OpenLDAP support.
-# Possible: yes or no.
-# Default: no.
-
 ARLA_CACHE?=	${LOCALBASE}/cache
 # Used in arla to specify the location of the cache used by arla. Should
 # be on a local disk.
@@ -1766,12 +1765,6 @@ PKG_LANG?=english
 # 'german' or 'portuguese_br'.
 # Default: english
 
-#POP_WITH_DRAC=
-# Used in the following packages to enable the optional DRAC support:
-# teapop
-# Possible: defined, not defined
-# Default: not defined
-
 #POPTOP_USE_MPPE=
 # Used in poptop package to specify the use of the mppe-ppp package
 # in preference to the standard ppp
@@ -1831,6 +1824,11 @@ QMAILDIR?= /var/qmail
 # Possible: any valid location
 # Default: /var/qmail (intentionally not ${VARBASE}/qmail)
 
+QMAIL_QFILTER_TMPDIR?= ${VARBASE}/tmp/qmail-qfilter
+# The temporary directory for qmail-qfilter.
+# Possible: a directory writable only by qmail-qfilter's UID
+# Default: ${VARBASE}/tmp/qmail-qfilter
+
 QMAIL_QUEUE_DIR?= ${VARBASE}/spool/qmail
 # The directory for qmail's queue.
 # Possible: any location on an appropriate filesystem, except that it
@@ -1974,21 +1972,6 @@ TIN_USE_INN_SPOOL?= NO
 # Possible: YES, or NO.
 # Default: NO
 
-#TEAPOP_WITHOUT_VPOP=
-# Compile teapop without virtual domain support
-# Possible: defined, not defined
-# Default: not defined
-
-#TEAPOP_WITHOUT_APOP=
-# Compile teapop without apop support
-# Possible: defined, not defined
-# Default: not defined
-
-#TEAPOP_WITH_MYSQL=	yes
-# Compile teapop with MySQL support.
-# Possible: defined, not defined
-# Default: not defined
-
 #TEXMFSITE=
 # Used in TeXfamily package which depends on teTeX package to specify
 # site-local texmf configuration.
diff --git a/mk/dirs.mk b/mk/dirs.mk
index 9b1fdb54c25..900a8f9a0d8 100644
--- a/mk/dirs.mk
+++ b/mk/dirs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.5 2004/08/07 14:44:05 xtraeme Exp $
+# $NetBSD: dirs.mk,v 1.5.4.1 2004/12/31 20:25:30 tv Exp $
 #
 
 .if !defined(DIRS_MK)
@@ -6,6 +6,7 @@ DIRS_MK=		# defined
 
 _USE_GNOME1_DIRS=	# empty
 _USE_GNOME2_DIRS=	# empty
+_USE_THEME_DIRS=	# empty
 _USE_XDG_DIRS=		# empty
 _USE_XDG_X11_DIRS=	# empty
 _USE_XFREE86_DIRS=	# empty
@@ -19,6 +20,8 @@ ver:=			${dir:C/^.*-//}
 _USE_GNOME1_DIRS:=	${ver}
 .  elif ${pkg} == "gnome2" && ${_USE_GNOME2_DIRS} < ${ver}
 _USE_GNOME2_DIRS:=	${ver}
+.  elif ${pkg} == "theme" && ${_USE_THEME_DIRS} < ${ver}
+_USE_THEME_DIRS:=	${ver}
 .  elif ${pkg} == "xdg" && ${_USE_XDG_DIRS} < ${ver} && !defined(USE_X11BASE)
 _USE_XDG_DIRS:=		${ver}
 .  elif ${pkg} == "xdg-x11" && ${_USE_XDG_X11_DIRS} < ${ver} && \
@@ -43,6 +46,10 @@ _USE_XORG_DIRS:=	${ver}
 .  include "../../misc/gnome2-dirs/dirs.mk"
 .endif
 
+.if !empty(_USE_THEME_DIRS)
+.  include "../../misc/theme-dirs/dirs.mk"
+.endif
+
 .if !empty(_USE_XDG_DIRS)
 .  include "../../misc/xdg-dirs/dirs.mk"
 .endif
diff --git a/mk/dlopen.builtin.mk b/mk/dlopen.builtin.mk
index f9d397862f4..ff963f2df2e 100644
--- a/mk/dlopen.builtin.mk
+++ b/mk/dlopen.builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dlopen.builtin.mk,v 1.6.2.3 2004/12/03 19:15:00 tv Exp $
+# $NetBSD: dlopen.builtin.mk,v 1.6.2.4 2004/12/31 20:25:30 tv Exp $
 
 .for _lib_ in dl
 .  if !defined(_BLNK_LIB_FOUND.${_lib_})
@@ -71,8 +71,6 @@ BUILDLINK_PREFIX.dl=	/usr
 # scripts already check for -ldl themselves.
 #
 BUILDLINK_LDADD.dl=	-ldl
-.    else
-BUILDLINK_TRANSFORM+=	rm:-ldl
 .    endif
 .    if !empty(_DLOPEN_REQUIRE_PTHREADS:M[yY][eE][sS])
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
diff --git a/mk/fonts.mk b/mk/fonts.mk
index ac8f90bb068..2f91651f7fe 100644
--- a/mk/fonts.mk
+++ b/mk/fonts.mk
@@ -1,4 +1,4 @@
-# $NetBSD: fonts.mk,v 1.5 2004/03/29 22:13:47 recht Exp $
+# $NetBSD: fonts.mk,v 1.5.6.1 2004/12/31 20:25:30 tv Exp $
 #
 # This Makefile fragment is intended to be included by packages that install
 # fonts (most of them in the fonts category).  It takes care of updating the
@@ -34,6 +34,8 @@ FILES_SUBST+=		FONTS_TTF="YES"
 FILES_SUBST+=		FONTS_TTF_DIRS="${FONTS_TTF_DIRS}"
 FILES_SUBST+=		TTMKFDIR="${TTMKFDIR_PREFIX}/bin/ttmkfdir"
 DEPENDS+=		ttmkfdir2>=20021109:../../fonts/ttmkfdir2
+# also need to run mkfontdir there
+FONTS_X11_DIRS+=	${FONTS_TTF_DIRS}
 .endif
 
 .if !empty(FONTS_TYPE1_DIRS)
@@ -43,6 +45,8 @@ FILES_SUBST+=		FONTS_TYPE1="YES"
 FILES_SUBST+=		FONTS_TYPE1_DIRS="${FONTS_TYPE1_DIRS}"
 FILES_SUBST+=		TYPE1INST="${TYPE1INST_PREFIX}/bin/type1inst"
 DEPENDS+=		type1inst>=0.6.1:../../fonts/type1inst
+# also need to run mkfontdir there
+FONTS_X11_DIRS+=	${FONTS_TYPE1_DIRS}
 .endif
 
 .if !empty(FONTS_X11_DIRS)
diff --git a/mk/install/fonts b/mk/install/fonts
index 649cc0ae0fe..77fadea14d9 100644
--- a/mk/install/fonts
+++ b/mk/install/fonts
@@ -1,4 +1,4 @@
-# $NetBSD: fonts,v 1.5 2004/03/30 11:55:02 recht Exp $
+# $NetBSD: fonts,v 1.5.6.1 2004/12/31 20:25:30 tv Exp $
 #
 # Handle font databases; used by fonts.mk.
 #
@@ -21,7 +21,7 @@ POST-INSTALL|POST-DEINSTALL)
 			if [ -z "`cd $d ; ${LS} | ${GREP} -v .pkgsrc | ${GREP} -v ^fonts | ${GREP} -v ^Fontmap`" ]; then
 				${RM} -f $d/fonts* $d/Fontmap*
 			else
-				( cd $d && ${TTMKFDIR} -o fonts.dir >/dev/null 2>&1 )
+				( cd $d && ${TTMKFDIR} >/dev/null 2>&1 )
 			fi
 		done
 	fi
@@ -39,7 +39,7 @@ POST-INSTALL|POST-DEINSTALL)
 			if [ -z "`cd $d ; ${LS} | ${GREP} -v .pkgsrc | ${GREP} -v ^fonts | ${GREP} -v ^Fontmap`" ]; then
 				${RM} -f $d/fonts* $d/Fontmap*
 			else
-				( cd $d && ${MKFONTDIR} >/dev/null 2>&1 )
+				${MKFONTDIR} $d >/dev/null 2>&1
 			fi
 		done
 	fi
diff --git a/mk/install/header b/mk/install/header
index a81d0cad664..58d0b6fc9d1 100644
--- a/mk/install/header
+++ b/mk/install/header
@@ -2,7 +2,7 @@
 #
 # start of header
 #
-# $NetBSD: header,v 1.26 2004/04/27 18:31:08 tv Exp $
+# $NetBSD: header,v 1.26.6.1 2004/12/31 20:25:30 tv Exp $
 
 PKGNAME=$1
 STAGE=$2
@@ -112,6 +112,9 @@ case "${PKG_CREATE_USERGROUP:-@PKG_CREATE_USERGROUP@}" in
 	_PKG_CREATE_USERGROUP=NO
 	;;
 esac
+if [ -z "${USERADD}" -o -z "${GROUPADD}" ]; then
+	_PKG_CREATE_USERGROUP=NO
+fi
 
 case "${PKG_CONFIG:-@PKG_CONFIG@}" in
 [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
diff --git a/mk/platform/AIX.mk b/mk/platform/AIX.mk
index 62a4638c35e..114ea36a87d 100644
--- a/mk/platform/AIX.mk
+++ b/mk/platform/AIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: AIX.mk,v 1.4 2004/11/16 18:04:00 tv Exp $
+# $NetBSD: AIX.mk,v 1.4.2.1 2004/12/31 20:25:30 tv Exp $
 #
 # Variable definitions for the AIX operating system.
 
@@ -107,15 +107,6 @@ TYPE?=		type				# Shell builtin
 WC?=		/usr/bin/wc
 XARGS?=		/usr/bin/xargs
 
-.if exists(/usr/sbin/user)
-USERADD?=	/usr/sbin/useradd
-GROUPADD?=	/usr/sbin/groupadd
-.else
-USERADD?=	${LOCALBASE}/sbin/useradd
-GROUPADD?=	${LOCALBASE}/sbin/groupadd
-_USER_DEPENDS=	user>=20000313:../../sysutils/user
-.endif
-
 CPP_PRECOMP_FLAGS?=	# unset
 DEF_UMASK?=		0022
 EXPORT_SYMBOLS_LDFLAGS?=-Wl,-E	# add symbols to the dynamic symbol table
diff --git a/mk/platform/BSDOS.mk b/mk/platform/BSDOS.mk
index 3cb893ad497..6cb5009c273 100644
--- a/mk/platform/BSDOS.mk
+++ b/mk/platform/BSDOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: BSDOS.mk,v 1.4 2004/11/16 18:04:00 tv Exp $
+# $NetBSD: BSDOS.mk,v 1.4.2.1 2004/12/31 20:25:30 tv Exp $
 #
 # Variable definitions for the BSD/OS operating system.
 
@@ -95,9 +95,6 @@ TYPE?=		which
 WC?=		/usr/bin/wc
 XARGS?=		/usr/bin/xargs
 
-USERADD?=	/usr/sbin/adduser
-GROUPADD?=	/usr/sbin/addgroup
-
 CPP_PRECOMP_FLAGS?=	# unset
 DEF_UMASK?=		0022
 .if ${OBJECT_FMT} == "ELF"
diff --git a/mk/platform/DragonFly.mk b/mk/platform/DragonFly.mk
index 789117e608f..726be82815b 100644
--- a/mk/platform/DragonFly.mk
+++ b/mk/platform/DragonFly.mk
@@ -1,4 +1,4 @@
-# $NetBSD: DragonFly.mk,v 1.4 2004/11/16 18:04:00 tv Exp $
+# $NetBSD: DragonFly.mk,v 1.4.2.1 2004/12/31 20:25:30 tv Exp $
 #
 # Variable definitions for the DragonFly operating system.
 
@@ -87,15 +87,6 @@ TYPE?=		type				# Shell builtin
 WC?=		/usr/bin/wc
 XARGS?=		/usr/bin/xargs
 
-.if exists(/usr/sbin/user)
-USERADD?=	/usr/sbin/useradd
-GROUPADD?=	/usr/sbin/groupadd
-.else
-USERADD?=	${LOCALBASE}/sbin/useradd
-GROUPADD?=	${LOCALBASE}/sbin/groupadd
-_USER_DEPENDS=	user>=20000313:../../sysutils/user
-.endif
-
 CPP_PRECOMP_FLAGS?=	# unset
 DEF_UMASK?=		0022
 .if ${OBJECT_FMT} == "ELF"
@@ -138,6 +129,7 @@ _OPSYS_HAS_JAVA=	no	# Java is not standard
 _OPSYS_HAS_MANZ=	yes	# MANZ controls gzipping of man pages
 _OPSYS_HAS_OSSAUDIO=	yes	# libossaudio is available
 _OPSYS_PERL_REQD=		# no base version of perl required
+_OPSYS_LIBTOOL_REQD=	1.5.10nb9
 _OPSYS_PTHREAD_AUTO=	no	# -lpthread needed for pthreads
 _OPSYS_SHLIB_TYPE=	ELF/a.out	# shared lib type
 _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
diff --git a/mk/platform/FreeBSD.mk b/mk/platform/FreeBSD.mk
index a3370cf7ab1..d8c034fcc98 100644
--- a/mk/platform/FreeBSD.mk
+++ b/mk/platform/FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: FreeBSD.mk,v 1.4 2004/11/16 18:04:00 tv Exp $
+# $NetBSD: FreeBSD.mk,v 1.4.2.1 2004/12/31 20:25:30 tv Exp $
 #
 # Variable definitions for the FreeBSD operating system.
 
@@ -87,15 +87,6 @@ TYPE?=		type				# Shell builtin
 WC?=		/usr/bin/wc
 XARGS?=		/usr/bin/xargs
 
-.if exists(/usr/sbin/user)
-USERADD?=	/usr/sbin/useradd
-GROUPADD?=	/usr/sbin/groupadd
-.else
-USERADD?=	${LOCALBASE}/sbin/useradd
-GROUPADD?=	${LOCALBASE}/sbin/groupadd
-_USER_DEPENDS=	user>=20000313:../../sysutils/user
-.endif
-
 CPP_PRECOMP_FLAGS?=	# unset
 DEF_UMASK?=		0022
 .if ${OBJECT_FMT} == "ELF"
diff --git a/mk/platform/IRIX.mk b/mk/platform/IRIX.mk
index 8db8bd16731..a0d0c925576 100644
--- a/mk/platform/IRIX.mk
+++ b/mk/platform/IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: IRIX.mk,v 1.6 2004/11/16 18:04:00 tv Exp $
+# $NetBSD: IRIX.mk,v 1.6.2.1 2004/12/31 20:25:30 tv Exp $
 #
 # Variable definitions for the IRIX operating system.
 
@@ -96,7 +96,6 @@ CPP_PRECOMP_FLAGS?=	# unset
 DEF_UMASK?=		022
 DEFAULT_SERIAL_DEVICE?=	/dev/null
 EXPORT_SYMBOLS_LDFLAGS?=	# Don't add symbols to the dynamic symbol table
-GROUPADD?=		${FALSE}
 MOTIF_TYPE_DEFAULT?=	dt		# default 2.0 compatible libs type
 NOLOGIN?=		${FALSE}
 ROOT_CMD?=		${SU} - root -c
@@ -106,7 +105,6 @@ SERIAL_DEVICES?=	/dev/null
 ULIMIT_CMD_datasize?=	ulimit -d `ulimit -H -d`
 ULIMIT_CMD_stacksize?=	ulimit -s `ulimit -H -s`
 ULIMIT_CMD_memorysize?=	ulimit -v `ulimit -H -v`
-USERADD?=		${FALSE}
 
 # imake installs manpages in weird places
 IMAKE_MAN_SOURCE_PATH=	catman/u_man/cat
diff --git a/mk/platform/Linux.mk b/mk/platform/Linux.mk
index 7287a15baad..c950c89d756 100644
--- a/mk/platform/Linux.mk
+++ b/mk/platform/Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Linux.mk,v 1.5 2004/11/16 18:04:00 tv Exp $
+# $NetBSD: Linux.mk,v 1.5.2.1 2004/12/31 20:25:30 tv Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -162,7 +162,7 @@ IMAKE_MISCMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}7
 IMAKE_MANNEWSUFFIX=	${IMAKE_MAN_SUFFIX}
 
 _DO_SHLIB_CHECKS=	no	# on installation, fixup PLIST for shared libs
-_IMAKE_MAKE=		${MAKE}	# program which gets invoked by imake
+_IMAKE_MAKE=		${GMAKE}	# program which gets invoked by imake
 .if exists(/usr/include/netinet6) || exists(/usr/include/linux/in6.h)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
 .else
diff --git a/mk/platform/OpenBSD.mk b/mk/platform/OpenBSD.mk
index 1957aa5816f..e1d941af9ca 100644
--- a/mk/platform/OpenBSD.mk
+++ b/mk/platform/OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: OpenBSD.mk,v 1.7 2004/11/20 04:38:09 grant Exp $
+# $NetBSD: OpenBSD.mk,v 1.7.2.1 2004/12/31 20:25:30 tv Exp $
 #
 # Variable definitions for the OpenBSD operating system.
 
@@ -81,10 +81,6 @@ XARGS?=		/usr/bin/xargs
 .if exists(/usr/sbin/user)
 USERADD?=	/usr/sbin/useradd
 GROUPADD?=	/usr/sbin/groupadd
-.else
-USERADD?=	${LOCALBASE}/sbin/useradd
-GROUPADD?=	${LOCALBASE}/sbin/groupadd
-_USER_DEPENDS=	user>=20000313:../../sysutils/user
 .endif
 
 CPP_PRECOMP_FLAGS?=	# unset
diff --git a/mk/plist.mk b/mk/plist.mk
index 0d54e958de0..55e48be2d14 100644
--- a/mk/plist.mk
+++ b/mk/plist.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: plist.mk,v 1.1.2.1 2004/11/23 17:15:22 tv Exp $
+#	$NetBSD: plist.mk,v 1.1.2.2 2004/12/31 20:25:30 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.
@@ -513,15 +513,15 @@ _PLIST_AWK_MANINSTALL=							\
 
 # plist awk pattern-action statement to strip '.gz' from man
 # entries
-_PLIST_AWK_STRIP_MANZ=						              \
+_PLIST_AWK_STRIP_MANZ=							\
 /^([^\/]*\/)*man\/([^\/]*\/)?(man[1-9ln]\/.*[1-9ln]|cat[1-9ln]\/.*0)\.gz$$/ { \
-	$$0 = substr($$0, 1, length($$0) - 3);				      \
+	$$0 = substr($$0, 1, length($$0) - 3);				\
 }
 
 # plist awk pattern-action statement to add '.gz' to man entries
-_PLIST_AWK_ADD_MANZ=							  \
+_PLIST_AWK_ADD_MANZ=							\
 /^([^\/]*\/)*man\/([^\/]*\/)?(man[1-9ln]\/.*[1-9ln]|cat[1-9ln]\/.*0)$$/ { \
-	$$0 = $$0 ".gz";						  \
+	$$0 = $$0 ".gz";						\
 }
 
 # plist awk pattern-action statement to handle PLIST_SUBST substitutions
diff --git a/mk/tools.mk b/mk/tools.mk
index 547654acdbc..d7cad091927 100644
--- a/mk/tools.mk
+++ b/mk/tools.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.mk,v 1.46.2.2 2004/12/20 20:46:00 tv Exp $
+# $NetBSD: tools.mk,v 1.46.2.3 2004/12/31 20:25:30 tv Exp $
 #
 # This Makefile creates a ${TOOLS_DIR} directory and populates the bin
 # subdir with tools that hide the ones outside of ${TOOLS_DIR}.
@@ -385,11 +385,29 @@ ${TOOLS_DIR}/bin/make:
 	fi
 .endif
 
+# Create a symlink from ${TOOLS_DIR}/bin/perl to ${PERL5} when USE_PERL5
+# is defined.
+.if defined(USE_PERL5)
+override-tools: ${TOOLS_DIR}/bin/perl
+.  if !target(${TOOLS_DIR}/bin/perl)
+${TOOLS_DIR}/bin/perl:
+	${_PKG_SILENT}${_PKG_DEBUG}					\
+	src="${PERL5}";							\
+	if [ -x $$src -a ! -f ${.TARGET} ]; then			\
+		${MKDIR} ${.TARGET:H};					\
+		${LN} -sf $$src ${.TARGET};				\
+	fi
+.  endif
+.endif
+
 # Always create a ${TOOLS_DIR}/bin/rpcgen to wrap the real rpcgen.
 # The wrapper will correctly set the CPP environment variable to a
 # stat((2)able path to a C preprocessor, then rely on the PATH to
 # find and invoke the real rpcgen.
 #
+RPCGEN?=		rpcgen
+RPCGEN_ARGS.NetBSD=	-b
+RPCGEN_ARGS?=		${RPCGEN_ARGS.${OPSYS}}
 override-tools: ${TOOLS_DIR}/bin/rpcgen
 .if !target(${TOOLS_DIR}/bin/rpcgen)
 ${TOOLS_DIR}/bin/rpcgen:
@@ -400,8 +418,8 @@ ${TOOLS_DIR}/bin/rpcgen:
 	  ${ECHO} 'CPP="${WRAPPER_BINDIR}/cpp"; export CPP';		\
 	  PATH=`${ECHO} "${PATH}" | ${SED} -e "s,.*${.TARGET:H}:,,"`;	\
 	  ${ECHO} "PATH=\"$$PATH\"; export PATH";			\
-	  ${ECHO} '${ECHO} "<.> rpcgen $$*" >> $$wrapperlog';		\
-	  ${ECHO} 'rpcgen "$$@"';					\
+	  ${ECHO} '${ECHO} "<.> ${RPCGEN} ${RPCGEN_ARGS} $$*" >> $$wrapperlog'; \
+	  ${ECHO} '${RPCGEN} ${RPCGEN_ARGS} "$$@"';			\
 	) > ${.TARGET}
 	${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET}
 .endif