 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.85 2009/05/16 07:21:05 rillig Exp $
+# $NetBSD: Makefile,v 1.86 2014/06/02 10:24:05 wiz Exp $
+#
 # This is the top-level Makefile of pkgsrc. It contains a list of the
 # categories of packages, as well as some targets that operate on the
 # whole pkgsrc system.
+#
 # User-settable variables:
+#
 # SPECIFIC_PKGS
 #	(See mk/defaults/mk.conf)
+#
 # SITE_SPECIFIC_PKGS
 # HOST_SPECIFIC_PKGS
 # GROUP_SPECIFIC_PKGS
 @@ -22,29 +22,26 @@
 # See also:
 #	mk/misc/toplevel.mk
+#
 # Note: The tools definitions must come before bsd.prefs.mk is included.
 # tools used by this Makefile
 USE_TOOLS+=	[ awk cat cmp echo env expr false fgrep grep mv	rm sed	\
 		sort wc
 # additional tools used by bsd.pkg.subdir.mk
 USE_TOOLS+=	basename touch
 # additional tools used by bsd.bulk-pkg.mk
 USE_TOOLS+=	egrep find ls sh tee true tsort
 PKGSRCTOP=	yes
 .include "mk/bsd.prefs.mk"
 .if defined(SPECIFIC_PKGS)
 SUBDIR+=	${SITE_SPECIFIC_PKGS}
 SUBDIR+=	${HOST_SPECIFIC_PKGS}
 SUBDIR+=	${GROUP_SPECIFIC_PKGS}
 SUBDIR+=	${USER_SPECIFIC_PKGS}
 .else
 # Packages in the x11 category tend to require a lot more parse time
 # than the rest of the packages. Reorder it to the beginning to avoid
 # stalling parallel scans near the end of a run.

 @@ -1,14 +1,14 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1999 2014/05/06 14:48:06 jperkin Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.2000 2014/06/02 10:24:05 wiz Exp $
+#
 # This file is in the public domain.
+#
 # Please see the pkgsrc/doc/guide manual for details on the
 # variables used in this make file template.
+#
 # Default sequence for "all" is:
+#
 #    bootstrap-depends
 #    fetch
 #    checksum
 #    depends
 #    tools
 @@ -376,31 +376,26 @@ _BUILD_DEFS+=		PKG_SYSCONFBASEDIR PKG_SY
 # These are all of the tools use by pkgsrc Makefiles.  This should
 # eventually be split up into lists of tools required by different
 # phases of a pkgsrc build.
+#
 USE_TOOLS+=								\
 	[ awk basename cat chgrp chmod chown cmp cp cut dirname echo	\
 	egrep env false find grep head hostname id install ln ls	\
 	mkdir mv printf pwd rm rmdir sed sh sort			\
 	tail test touch tr true wc xargs
 # bsd.wrapper.mk
 USE_TOOLS+=	expr
 # bsd.bulk-pkg.mk uses certain tools
 .if defined(BATCH)
 USE_TOOLS+=	tee tsort
 .endif
 # scripts/shlib-type
 .if ${_OPSYS_SHLIB_TYPE} == "ELF/a.out"
 USE_TOOLS+=	file
 .endif
 # INSTALL/DEINSTALL script framework
 .include "pkginstall/bsd.pkginstall.mk"
 # Locking
 .include "internal/locking.mk"
 # Tools
 .include "tools/bsd.tools.mk"
 @@ -737,34 +732,26 @@ depend:
 # Same goes for tags
 .PHONY: tags
 .if !target(tags)
 tags:
 .endif
 .include "plist/bsd.plist.mk"
 .include "bsd.utils.mk"
 .include "subst.mk"
 # For bulk build targets (bulk-install, bulk-package), the
 # BATCH variable must be set in /etc/mk.conf:
 .if defined(BATCH)
 .  include "bulk/bsd.bulk-pkg.mk"
 .endif
 # README generation code.
 .include "bsd.pkg.readme.mk"
 # Create a PKG_ERROR_HANDLER shell command for each class listed in
 # PKG_ERROR_CLASSES.  The error handler is meant to be invoked within
 # a make target.
+#
 .for _class_ in ${PKG_ERROR_CLASSES}
 PKG_ERROR_HANDLER.${_class_}?=	{					\
 		ec=$$?;							\
 		for str in ${PKG_ERROR_MSG.${_class_}}; do		\
 			${PHASE_MSG} "$$str";				\
 		done;							\

 @@ -1,14 +1,14 @@
-# $NetBSD: toplevel.mk,v 1.5 2011/09/08 20:17:16 abs Exp $
+# $NetBSD: toplevel.mk,v 1.6 2014/06/02 10:24:05 wiz Exp $
+#
 # This file contains the make targets that can be used from the
 # top-level Makefile. They are in this separate file to keep the
 # top-level file short and clean.
+#
+#
 # If PACKAGES is set to the default (${PKGSRCDIR}/packages), the current
 # ${MACHINE_ARCH} and "release" (uname -r) will be used. Otherwise a directory
 # structure of ...pkgsrc/packages/`uname -r`/${MACHINE_ARCH} is assumed.
 # The PKG_URL is set from FTP_PKG_URL_* or CDROM_PKG_URL_*, depending on
 # the target used to generate the README.html file.
 .PHONY: README.html
 @@ -19,33 +19,26 @@ README.html: .PRECIOUS
 		BMAKE=${MAKE}						\
 		./mk/scripts/mkreadme --pkgsrc ${.CURDIR} 		\
 		--packages ${PACKAGES} ${_README_TYPE_FLAG}		\
 		--prune
 .else
 	@${ECHO} "ERROR:  please do not use the README.html target directly."
 	@${ECHO} "        Instead use either the \"readme\" or \"cdrom-readme\""
 	@${ECHO} "        target."
 	@${FALSE}
 .endif
 .include "../bsd.pkg.subdir.mk"
 # the bulk-cache and clean-bulk-cache targets are a global-pkgsrc
 # thing and thus it makes sense to run it from the top level pkgsrc
 # directory.
 .if make(bulk-cache) || make(clean-bulk-cache)
 .include "../bulk/bsd.bulk-pkg.mk"
 .endif
 .PHONY: ${.CURDIR}/PKGDB
 ${.CURDIR}/PKGDB:
 	@${RM} -f ${.CURDIR}/PKGDB
 	@${ECHO_MSG} "Extracting complete dependency database.  This may take a while..."
 	@DB=${.CURDIR}/PKGDB ; \
 	PKGSRCDIR=${.CURDIR} ; \
 	npkg=1; \
 	list=`${GREP} '^[[:space:]]*'SUBDIR */Makefile | ${SED} 's,/Makefile.*=[[:space:]]*,/,'` ; \
 	for pkgdir in $$list ; do \
 		if [ ! -d $$pkgdir ]; then  \
 			echo " " ; \
 			echo "WARNING:  the package directory $$pkgdir is listed in" > /dev/stderr ; \
 			echo $$pkgdir | ${SED} 's;/.*;/Makefile;g' > /dev/stderr ; \