diff --git a/infrastructure/mk/bsd.port.mk b/infrastructure/mk/bsd.port.mk
index 9925b969bde..eaed6c41d95 100644
--- a/infrastructure/mk/bsd.port.mk
+++ b/infrastructure/mk/bsd.port.mk
@@ -1,6 +1,6 @@
 #-*- mode: Makefile; tab-width: 4; -*-
 # ex:ts=4 sw=4 filetype=make:
-#	$OpenBSD: bsd.port.mk,v 1.957 2008/10/25 15:06:26 bernd Exp $
+#	$OpenBSD: bsd.port.mk,v 1.958 2008/11/18 11:45:41 espie Exp $
 #	$FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp Exp $
 #	$NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $
 #
@@ -866,7 +866,7 @@ PKG_ARGS${_S} += -U ${UNMESSAGE${_S}}
 .  endif
 PKG_ARGS${_S} += -A'${PKG_ARCH${_S}}'
 .  if !defined(_COMMENT${_S})
-ERRORS += "Fatal: Missing comment for ${_S}."
+ERRORS += "Fatal: Missing comment for ${_S:S/^-$/main package/}."
 .  endif
 .endfor
 
@@ -1067,7 +1067,10 @@ _badcat = No
 .  endfor
 
 .  if ${_badcat} == "Yes"
-ERRORS += "Fatal: no category to match pkgpath"
+ERRORS += "Fatal: one category in ${CATEGORIES} should match PKGPATH=${PKGPATH}"
+.    if ${PKGPATH:N*/*}
+ERRORS += "Fatal: bogus PKGPATH=${PKGPATH} (no subdirectory)"
+.    endif
 .  endif
 .endif
 
@@ -2167,7 +2170,7 @@ ${_CONFIGURE_COOKIE}: ${_PATCH_COOKIE}
 ${_BUILD_COOKIE}: ${_CONFIGURE_COOKIE}
 .if ${NO_BUILD:L} == "no"
 	@${ECHO_MSG} "===>  Building for ${FULLPKGNAME}${_MASTER}"
-.if ${VMEM_WARNING:L} == "yes"
+.  if ${VMEM_WARNING:L} == "yes"
 	@echo ""; \
 	echo "*** WARNING: you may see an error such as"; \
 	echo "***       virtual memory exhausted"; \
@@ -2179,7 +2182,7 @@ ${_BUILD_COOKIE}: ${_CONFIGURE_COOKIE}
 	echo "*** 	csh(1) and tcsh(1): limit datasize <kbytes of memory>"; \
 	echo "***	ksh(1), zsh(1) and bash(1): ulimit -d <kbytes of memory>"; \
 	echo ""
-.endif
+.  endif
 .  if target(pre-build)
 	@cd ${.CURDIR} && exec ${_SYSTRACE_CMD} ${MAKE} pre-build
 .  endif
diff --git a/infrastructure/mk/getpkgpath b/infrastructure/mk/getpkgpath
index 2147e8ca5cf..e9ca99dbc32 100644
--- a/infrastructure/mk/getpkgpath
+++ b/infrastructure/mk/getpkgpath
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 
-# $OpenBSD: getpkgpath,v 1.4 2007/10/29 21:50:40 sturm Exp $
+# $OpenBSD: getpkgpath,v 1.5 2008/11/18 11:45:42 espie Exp $
 #
 # Copyright (c) 2006 Marc Espie <espie@openbsd.org>
 #
@@ -37,7 +37,12 @@ for my $d (split ':', $path) {
 if (defined $pkgpath) { 
 	print $pkgpath, "\n";
 } else {
-	print STDERR "Can't parse $dir ($real_dir) through PORTSDIR_PATH=$path\n";
+	print STDERR "Can't find $dir ";
+	if ($real_dir ne $dir) {
+		print STDERR "($real_dir) ";
+	}
+	print STDERR "under PORTSDIR_PATH=$path\n";
 }
-
+# XXX no error code because this is too verbose from the Makefile
 exit 0;
+