 @@ -1,14 +1,14 @@
-# $NetBSD: bsd.prefs.mk,v 1.384 2016/04/10 15:10:12 joerg Exp $
+# $NetBSD: bsd.prefs.mk,v 1.385 2016/04/10 15:58:02 joerg Exp $
+#
 # This file includes the mk.conf file, which contains the user settings.
+#
 # Packages should include this file before any of the .if directives, as
 # well as before modifying variables like CFLAGS, LDFLAGS, and so on.
 # Otherwise the behavior may be unexpected.
+#
 # When mk.conf is included by this file, the following variables are
 # defined:
+#
 # ACCEPTABLE_LICENSES
 #	This variable is set to the list of Open Source licenses. See
 #	mk/license.mk for details.
 @@ -395,57 +395,50 @@ NO_CONFIGURE=		yes
 NO_BUILD=		yes
 DISTFILES=		# none
 PLIST_SRC=		# none
 CHECK_PERMS=		no
 USE_LANGUAGES=		# empty
 WRKSRC=			${WRKDIR}
 do-patch:
 	@${DO_NADA}
 do-install:
 	@${DO_NADA}
 .endif
 # After 2011Q1, the default is to use DESTDIR.
 USE_DESTDIR?=		yes
 # PKG_DESTDIR_SUPPORT can only be one of "destdir", or "user-destdir".
 PKG_DESTDIR_SUPPORT?=	user-destdir
 .if ${PKG_DESTDIR_SUPPORT} == "user-destdir"
 _USE_DESTDIR=		user-destdir
 .elif ${PKG_DESTDIR_SUPPORT} == "destdir"
 _USE_DESTDIR=		destdir
 .else
 PKG_FAIL_REASON+=	"PKG_DESTDIR_SUPPORT must be \`\`destdir'' or \`\`user-destdir''."
 .endif
 # When using staged installation, everything gets installed into
 # ${DESTDIR}${PREFIX} instead of ${PREFIX} directly.
+#
 .if ${_USE_DESTDIR} != "no"
 DESTDIR=		${WRKDIR}/.destdir
-.  if ${_USE_DESTDIR} == "destdir"
+.if ${_USE_DESTDIR} == "destdir"
 _MAKE_PACKAGE_AS_ROOT=	yes
 _MAKE_CLEAN_AS_ROOT=	yes
 _MAKE_INSTALL_AS_ROOT=	yes
-.  elif ${_USE_DESTDIR} == "user-destdir"
+.else
 _MAKE_PACKAGE_AS_ROOT=	no
 _MAKE_CLEAN_AS_ROOT=	no
 _MAKE_INSTALL_AS_ROOT=	no
 .  endif
 .else
 PKG_FAIL_REASON+=	"USE_DESTDIR=no is no longer supported."
 DESTDIR=
 .endif
 # controls whether binary packages are preserved in pkgsrc/packages/All
 # default is no (to preserve settings since 2013/05/23, prior to that it
 # was yes)
 _KEEP_BIN_PKGS?= no
 .if !empty(PKGSRC_KEEP_BIN_PKGS:U:M[Yy][Ee][Ss])
 _KEEP_BIN_PKGS=	yes
 .endif
 _MAKE_CLEAN_AS_ROOT?=	no
 # Whether to run the clean target as root.
 _MAKE_INSTALL_AS_ROOT?=	yes
 # Whether to run the install target as root.

 @@ -1,14 +1,14 @@
-# $NetBSD: haskell.mk,v 1.3 2015/02/17 13:57:47 joerg Exp $
+# $NetBSD: haskell.mk,v 1.4 2016/04/10 15:58:02 joerg Exp $
+#
 # This Makefile fragment handles Haskell Cabal packages.
 # See: http://www.haskell.org/cabal/
+#
 # Note to users:
+#
 #   * Users choose one favourite Haskell compiler. Though the only
 #     compiler currently supported is GHC.
+#
 #   * You can't install a cabal package for more than one compilers
 #     simultaneously. In the future, this limitation can possibly be
 #     eliminated using the method used by
 #     "../../lang/python/pyversion.mk".
 @@ -238,37 +238,30 @@ do-build:
 		./Setup build
 .if ${HASKELL_ENABLE_HADDOCK_DOCUMENTATION} == "yes"
 	${RUN} cd ${WRKSRC} && \
 		./Setup haddock
 .endif
 # Define install target. We need installed-pkg-config to be installed
 # for package registration (if any).
 _HASKELL_PKG_DESCR_FILE=	${PREFIX}/lib/${DISTNAME}/${_HASKELL_VERSION}/package-description
 do-install:
 	${RUN} cd ${WRKSRC} && \
 		./Setup register --gen-pkg-config=dist/package-description && \
-		if [ "${_USE_DESTDIR}" = "no" ]; then \
+		./Setup copy --destdir=${DESTDIR} && \
-			./Setup copy && \
+		if [ -f dist/package-description ]; then \
-			if [ -f dist/package-description ]; then \
+			${INSTALL_DATA} dist/package-description ${DESTDIR}${_HASKELL_PKG_DESCR_FILE}; \
-				${INSTALL_DATA} dist/package-description ${_HASKELL_PKG_DESCR_FILE}; \
+		fi \
 			fi \
 		else \
 			./Setup copy --destdir=${DESTDIR} && \
 			if [ -f dist/package-description ]; then \
 				${INSTALL_DATA} dist/package-description ${DESTDIR}${_HASKELL_PKG_DESCR_FILE}; \
 			fi \
 		fi
 # Define test target.
 do-test:
 	${RUN} cd ${WRKSRC} && \
 		./Setup test
 # Substitutions for INSTALL and DEINSTALL.
 FILES_SUBST+=	DISTNAME=${DISTNAME}
 FILES_SUBST+=	HASKELL_PKG_BIN=${_HASKELL_PKG_BIN}
 FILES_SUBST+=	HASKELL_PKG_DESCR_FILE=${_HASKELL_PKG_DESCR_FILE}
 INSTALL_TEMPLATES+=	../../mk/haskell/INSTALL.in
 DEINSTALL_TEMPLATES+=	../../mk/haskell/DEINSTALL.in

 @@ -1,14 +1,14 @@
-# $NetBSD: check-shlibs.mk,v 1.28 2015/11/24 09:41:20 jperkin Exp $
+# $NetBSD: check-shlibs.mk,v 1.29 2016/04/10 15:58:02 joerg Exp $
+#
 # This file verifies that all libraries used by the package can be found
 # at run-time.
+#
 # User-settable variables:
+#
 # CHECK_SHLIBS
 #	Whether the check should be enabled or not.
+#
 #	Default value: "yes" for PKG_DEVELOPERs, "no" otherwise.
+#
 # Package-settable variables:
+#
 @@ -53,73 +53,39 @@ privileged-install-hook: _check-shlibs
 .if ${_USE_CHECK_SHLIBS_NATIVE} == "yes"
 CHECK_SHLIBS_NATIVE_ENV=
 .  if ${OBJECT_FMT} == "ELF"
 USE_TOOLS+=			readelf
 CHECK_SHLIBS_NATIVE=		${PKGSRCDIR}/mk/check/check-shlibs-elf.awk
 CHECK_SHLIBS_NATIVE_ENV+=	PLATFORM_RPATH=${_OPSYS_SYSTEM_RPATH:Q}
 CHECK_SHLIBS_NATIVE_ENV+=	READELF=${TOOLS_PATH.readelf:Q}
 .  elif ${OBJECT_FMT} == "Mach-O"
 CHECK_SHLIBS_NATIVE=		${PKGSRCDIR}/mk/check/check-shlibs-macho.awk
 .  endif
 CHECK_SHLIBS_NATIVE_ENV+=	CROSS_DESTDIR=${_CROSS_DESTDIR:Q}
 CHECK_SHLIBS_NATIVE_ENV+=	PKG_INFO_CMD=${PKG_INFO:Q}
 CHECK_SHLIBS_NATIVE_ENV+=	DEPENDS_FILE=${_RRDEPENDS_FILE:Q}
 .  if ${_USE_DESTDIR} != "no"
 CHECK_SHLIBS_NATIVE_ENV+=	DESTDIR=${DESTDIR:Q}
 .  endif
 CHECK_SHLIBS_NATIVE_ENV+=	WRKDIR=${WRKDIR:Q}
 .  if defined(CHECK_WRKREF) && !empty(CHECK_WRKREF:Mextra)
 CHECK_SHLIBS_NATIVE_ENV+=	CHECK_WRKREF_EXTRA_DIRS=${CHECK_WRKREF_EXTRA_DIRS:Q}
 .  endif
 _check-shlibs: error-check .PHONY
 	@${STEP_MSG} "Checking for missing run-time search paths in ${PKGNAME}"
 	${RUN} rm -f ${ERROR_DIR}/${.TARGET}
 	${RUN}					\
 	cd ${DESTDIR:Q}${PREFIX:Q};					\
 	${_CHECK_SHLIBS_FILELIST_CMD} |					\
 	${EGREP} -h ${_CHECK_SHLIBS_ERE:Q} |				\
 	while read file; do						\
 		case "$$file" in					\
 		${CHECK_SHLIBS_SKIP:@p@${p}) continue ;;@}		\
 		*) ;;							\
 		esac;							\
 		${ECHO} $$file;						\
 	done |								\
 	${PKGSRC_SETENV} ${CHECK_SHLIBS_NATIVE_ENV} ${AWK} -f ${CHECK_SHLIBS_NATIVE} > ${ERROR_DIR}/${.TARGET}
 .else
 .  if ${_USE_DESTDIR} != "no"
 _check-shlibs: error-check .PHONY
 	@${WARNING_MSG} "Skipping missing run-time search-path check in DESTDIR mode."
 .  else
 _check-shlibs: error-check .PHONY
 	@${STEP_MSG} "Checking for missing run-time search paths in ${PKGNAME}"
 	${RUN} rm -f ${ERROR_DIR}/${.TARGET}
 	${RUN}					\
 	exec 1>${ERROR_DIR}/${.TARGET};					\
 	case ${LDD:Q}"" in						\
 	"")	ldd=`${TYPE} ldd 2>/dev/null | ${AWK} '{ print $$NF }'` ;; \
 	*)	ldd=${LDD:Q} ;;						\
 	esac;								\
 	${TEST} -x "$$ldd" || exit 0;					\
 	cd ${DESTDIR}${PREFIX};						\
 	${_CHECK_SHLIBS_FILELIST_CMD} |					\
 	${EGREP} -h ${_CHECK_SHLIBS_ERE:Q} |				\
 	while read file; do						\
 		case "$$file" in					\
 		${CHECK_SHLIBS_SKIP:@p@${p}) continue ;;@}		\
 		*) ;;							\
 		esac;							\
 		err=`$$ldd $$file 2>&1 | ${GREP} "not found" || ${TRUE}`; \
 		${TEST} -z "$$err" || ${ECHO} "${DESTDIR}${PREFIX}/$$file: $$err"; \
 	done
 	${RUN}					\
 	exec 1>>${ERROR_DIR}/${.TARGET};				\
 	if ${_NONZERO_FILESIZE_P} ${ERROR_DIR}/${.TARGET}; then		\
 		${ECHO} "*** The programs/libs shown above will not find the listed"; \
 		${ECHO} "    shared libraries at runtime."; \
 		${ECHO} "    Please fix the package (add -Wl,-R.../lib in the right places)!"; \
 		${SHCOMMENT} Might not error-out for non-pkg-developers; \
 	fi
 .  endif
 .endif

 @@ -1,51 +1,48 @@
-# $NetBSD: bsd.install.mk,v 1.15 2014/12/06 23:28:18 agc Exp $
+# $NetBSD: bsd.install.mk,v 1.16 2016/04/10 15:58:02 joerg Exp $
+#
 # This Makefile fragment is included by bsd.pkg.mk and provides all
 # variables and targets related to installing packages.
+#
 # The following are the "public" targets provided this module:
+#
 #    install, stage-install, deinstall, reinstall, replace, undo-replace
+#
 # The following targets may be overridden in a package Makefile:
+#
 #    pre-install, do-install, post-install
+#
 _COOKIE.install=	${WRKDIR}/.install_done
 ######################################################################
 ### install (PUBLIC)
 ######################################################################
-### install is a public target to install the package either by
+### install is a public target to install the package by depending
-### depending on stage-install (_USE_DESTDIR=no) or package-install
+### on stage-package-install or package-install. The difference is
-### (_USE_DESTDIR!=no).
+### a package is created in the public PACKAGES directory.
 ###
 .PHONY: install
-.if ${_USE_DESTDIR} == "no"
+.if ${_KEEP_BIN_PKGS} == "no"
 install: stage-install
 .elif ${_KEEP_BIN_PKGS} == "no"
 install: stage-package-install
 .else
 install: package-install
 .endif
 ######################################################################
 ### stage-install (PUBLIC)
 ######################################################################
 ### stage-install is a public target to install the package to
-### ${PREFIX} (_USE_DESTDIR=no) or to ${DESTDIR}${PREFIX}
+### to ${DESTDIR}${PREFIX}.
 ### (_USE_DESTDIR!=no)
 ###
 .PHONY: stage-install
 .if !defined(NO_INSTALL)
 .  include "install.mk"
 .else
 .  if exists(${_COOKIE.install})
 stage-install:
 	@${DO_NADA}
 .  elif defined(_PKGSRC_BARRIER)
 stage-install: ${_PKGSRC_BUILD_TARGETS} install-cookie
 .  else
 stage-install: barrier
 .  endif

 @@ -1,14 +1,14 @@
-# $NetBSD: deinstall.mk,v 1.11 2011/10/15 00:23:09 reed Exp $
+# $NetBSD: deinstall.mk,v 1.12 2016/04/10 15:58:02 joerg Exp $
 # DEINSTALLDEPENDS controls whether dependencies and dependents are also
 # removed when a package is de-installed.  The valid values are:
+#
 #    no		only the package is removed (if dependencies allow it)
 #    yes	dependent packages are also removed
 #    all	dependent packages and unused dependencies are also removed
+#
 DEINSTALLDEPENDS?=	no
 ######################################################################
 ### deinstall, su-deinstall (PUBLIC)
 ######################################################################
 @@ -21,29 +21,26 @@ DEINSTALLDEPENDS?=	no
 deinstall: su-deinstall
 	@${PHASE_MSG} "Deinstalling for ${PKGNAME}"
 .  endif
 .else
 .  if !target(deinstall)
 deinstall: su-target
 	@${PHASE_MSG} "Deinstalling for ${PKGNAME}"
 .  endif
 .endif
 _SU_DEINSTALL_TARGETS=	acquire-deinstall-lock
 _SU_DEINSTALL_TARGETS+=	_pkgformat-deinstall
 _SU_DEINSTALL_TARGETS+=	release-deinstall-lock
 .if ${_USE_DESTDIR} == "no"
 _SU_DEINSTALL_TARGETS+=	install-clean
 .endif
 su-deinstall: ${_SU_DEINSTALL_TARGETS}
 .PHONY: acquire-deinstall-lock release-deinstall-lock
 acquire-deinstall-lock: acquire-localbase-lock
 release-deinstall-lock: release-localbase-lock
 MAKEFLAGS.su-deinstall+=	DEINSTALLDEPENDS=${DEINSTALLDEPENDS}
 ######################################################################
 ### reinstall (PUBLIC)
 ######################################################################
 ### reinstall is a special target to re-run the install target.
 ### It will acquire elevated privileges just-in-time.

 @@ -1,14 +1,14 @@
-# $NetBSD: install.mk,v 1.67 2015/10/12 09:08:22 jperkin Exp $
+# $NetBSD: install.mk,v 1.68 2016/04/10 15:58:02 joerg Exp $
+#
 # This file provides the code for the "install" phase.
+#
 # Public targets:
+#
 # stage-install:
 #	Installs the package files into LOCALBASE or ${DESTDIR}${LOCALBASE}.
+#
 # Interface for other infrastructure components:
+#
 # Hooks for use by the infrastructure:
+#
 @@ -144,85 +144,57 @@ install-check-version: ${_COOKIE.extract
 	extractname=`${CAT} ${_COOKIE.extract}`;			\
 	pkgname=${PKGNAME};						\
 	case "$$extractname" in						\
 	"")	${WARNING_MSG} "${WRKDIR} may contain an older version of ${PKGBASE}" ;; \
 	"$$pkgname")	;;						\
 	*)	${WARNING_MSG} "Package version $$extractname in ${WRKDIR}"; \
 		${WARNING_MSG} "Current version $$pkgname in ${PKGPATH}"; \
 		${WARNING_MSG} "Cleaning and rebuilding $$pkgname...";	\
 		${RECURSIVE_MAKE} ${MAKEFLAGS} clean;			\
 		${RECURSIVE_MAKE} ${MAKEFLAGS} build ;;			\
 	esac
 ######################################################################
 ### The targets below are run with elevated privileges.
 ######################################################################
 .PHONY: acquire-install-localbase-lock release-install-localbase-lock
 acquire-install-localbase-lock: acquire-localbase-lock
 release-install-localbase-lock: release-localbase-lock
 ######################################################################
 ### install-all, su-install-all (PRIVATE)
 ######################################################################
 ### install-all is a helper target to run the install target of
 ### the built software, register the software installation, and run
 ### some sanity checks.
 ###
 .if ${_USE_DESTDIR} != "user-destdir"
 _INSTALL_ALL_TARGETS+=		acquire-install-localbase-lock
 .endif
 .if ${_USE_DESTDIR} == "no"
 _INSTALL_ALL_TARGETS+=		_pkgformat-check-conflicts
 _INSTALL_ALL_TARGETS+=		_pkgformat-check-installed
 .endif
 _INSTALL_ALL_TARGETS+=		install-check-umask
 .if empty(CHECK_FILES:M[nN][oO]) && !empty(CHECK_FILES_SUPPORTED:M[Yy][Ee][Ss])
 _INSTALL_ALL_TARGETS+=		check-files-pre
 .endif
 _INSTALL_ALL_TARGETS+=		install-makedirs
 .if defined(INSTALLATION_DIRS_FROM_PLIST) && \
 	!empty(INSTALLATION_DIRS_FROM_PLIST:M[Yy][Ee][Ss])
 _INSTALL_ALL_TARGETS+=		install-dirs-from-PLIST
 .elif defined(AUTO_MKDIRS) && !empty(AUTO_MKDIRS:M[Yy][Ee][Ss])
 _INSTALL_ALL_TARGETS+=		install-dirs-from-PLIST
 .endif
 .if ${_USE_DESTDIR} == "no"
 _INSTALL_ALL_TARGETS+=		pre-install-script
 .endif
 _INSTALL_ALL_TARGETS+=		pre-install
 _INSTALL_ALL_TARGETS+=		do-install
 _INSTALL_ALL_TARGETS+=		post-install
 _INSTALL_ALL_TARGETS+=		plist
 .if !empty(STRIP_DEBUG:M[Yy][Ee][Ss])
 _INSTALL_ALL_TARGETS+=		install-strip-debug
 .endif
 _INSTALL_ALL_TARGETS+=		install-doc-handling
 _INSTALL_ALL_TARGETS+=		install-script-data
 .if empty(CHECK_FILES:M[nN][oO]) && !empty(CHECK_FILES_SUPPORTED:M[Yy][Ee][Ss])
 _INSTALL_ALL_TARGETS+=		check-files-post
 .endif
 .if ${_USE_DESTDIR} == "no"
 _INSTALL_ALL_TARGETS+=		post-install-script
 .endif
 .if ${_USE_DESTDIR} == "no"
 _INSTALL_ALL_TARGETS+=		_pkgformat-register
 .else
 _INSTALL_ALL_TARGETS+=		_pkgformat-generate-metadata
 .endif
 _INSTALL_ALL_TARGETS+=		privileged-install-hook
 .if ${_USE_DESTDIR} != "user-destdir"
 _INSTALL_ALL_TARGETS+=		release-install-localbase-lock
 .endif
 _INSTALL_ALL_TARGETS+=		error-check
 .PHONY: install-all su-install-all
 .  if !empty(_MAKE_INSTALL_AS_ROOT:M[Yy][Ee][Ss])
 install-all: su-target
 .  else
 install-all: su-install-all
 .  endif
 su-install-all: ${_INSTALL_ALL_TARGETS}
 ######################################################################
 ### install-check-umask (PRIVATE)
 ######################################################################
 @@ -305,27 +277,27 @@ install-dirs-from-PLIST:
 ######################################################################
 ### pre-install, do-install, post-install (PUBLIC, override)
 ######################################################################
 ### {pre,do,post}-install are the heart of the package-customizable
 ### install targets, and may be overridden within a package Makefile.
 ###
 .PHONY: pre-install do-install post-install
 INSTALL_DIRS?=		${BUILD_DIRS}
 INSTALL_MAKE_FLAGS?=	# none
 INSTALL_TARGET?=	install ${USE_IMAKE:D${NO_INSTALL_MANPAGES:D:Uinstall.man}}
 DESTDIR_VARNAME?=	DESTDIR
-.if ${_USE_DESTDIR} != "no" && !empty(DESTDIR_VARNAME)
+.if !empty(DESTDIR_VARNAME)
 INSTALL_ENV+=		${DESTDIR_VARNAME}=${DESTDIR:Q}
 INSTALL_MAKE_FLAGS+=	${DESTDIR_VARNAME}=${DESTDIR:Q}
 .endif
 .if !target(do-install)
 do-install:
 .  for _dir_ in ${INSTALL_DIRS}
 	${RUN} ${_ULIMIT_CMD}						\
 	cd ${WRKSRC} && cd ${_dir_} &&					\
 	${PKGSRC_SETENV} ${INSTALL_ENV} ${MAKE_ENV} 			\
 		${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_MAKE_FLAGS}	\
 			-f ${MAKE_FILE} ${INSTALL_TARGET}
 .  endfor

 @@ -1,75 +1,62 @@
-# $NetBSD: replace.mk,v 1.17 2015/09/07 19:23:47 gdt Exp $
+# $NetBSD: replace.mk,v 1.18 2016/04/10 15:58:02 joerg Exp $
+#
 # Public targets:
+#
 # replace:
 #	Updates a package in-place on the system.
 #	It will acquire elevated privileges just-in-time.
+#
 # undo-replace:
 #	Undoes the effects of a previous "make replace".
 #	It will acquire elevated privileges just-in-time.
+#
+#
 # Private targets that must be defined by the package system format:
+#
 # _pkgformat-replace:
 #	Updates a package in-place on the system (USE_DESTDIR=no).
 # _pkgformat-destdir-replace:
-#	Updates a package in-place on the system (USE_DESTDIR=yes).
+#	Updates a package in-place on the system.
+#
 # _pkgformat-undo-replace:
 #	Undoes a previous "make _pkgformat-replace".
 # _pkgformat-destdir-undo-replace:
 #	Undoes a previous "make _pkgformat-destdir-replace".
-.if ${_USE_DESTDIR} == "no"
+.if ${_KEEP_BIN_PKGS} == "no"
 _REPLACE_TARGETS+=	${_PKGSRC_BUILD_TARGETS}
 .elif ${_KEEP_BIN_PKGS} == "no"
 _REPLACE_TARGETS+=	stage-package-create
 .else
 _REPLACE_TARGETS+=	package
 .endif
 _REPLACE_TARGETS+=	replace-message
 _REPLACE_TARGETS+=	unprivileged-install-hook
+#
 # replace
+#
 .PHONY: replace
 .if defined(_PKGSRC_BARRIER)
 replace: ${_REPLACE_TARGETS} su-target
 .else
 replace: barrier
 .endif
 replace-message: .PHONY
 	@${PHASE_MSG} "Replacing for ${PKGNAME}"
 .if ${_USE_DESTDIR} == "no"
 su-replace: .PHONY _pkgformat-replace
 .else
 su-replace: .PHONY _pkgformat-destdir-replace
 .endif
 MAKEFLAGS.su-replace=	_UPDATE_RUNNING=yes
 MAKEFLAGS.su-replace+=	PKGNAME_REQD=${PKGNAME_REQD:Q}
+#
 # undo-replace
+#
 undo-replace: .PHONY undo-replace-message su-target
 undo-replace-message: .PHONY
 	@${PHASE_MSG} "Undoing replacement for ${PKGNAME}"
 	@${WARNING_MSG} "experimental target - DATA LOSS MAY OCCUR."
 .if ${_USE_DESTDIR} == "no"
 su-undo-replace: .PHONY _pkgformat-undo-replace
 .else
 su-undo-replace: .PHONY _pkgformat-destdir-undo-replace
 .endif
 MAKEFLAGS.su-undo-replace=	_UPDATE_RUNNING=yes

 @@ -1,34 +1,30 @@
-# $NetBSD: package.mk,v 1.24 2013/05/23 13:18:56 obache Exp $
+# $NetBSD: package.mk,v 1.25 2016/04/10 15:58:02 joerg Exp $
+#
 # This file provides the code for the "package" phase.
+#
 # Public targets:
+#
 # package:
 #	Generates a binary package.
 #	It will acquire elevated privileges just-in-time.
+#
 #	XXX: From which files is the binary package generated? The
 #	installed files in LOCALBASE, or some files in WRKDIR/.destdir?
+#
 _PACKAGE_TARGETS+=	check-vulnerable
 .if make(replace) && ${_USE_DESTDIR} == "no"
 _PACKAGE_TARGETS+=	replace
 .else
 _PACKAGE_TARGETS+=	stage-install
 _PACKAGE_TARGETS+=	stage-package-create
 .endif
 _PACKAGE_TARGETS+=	acquire-package-lock
 _PACKAGE_TARGETS+=	${_COOKIE.package}
 _PACKAGE_TARGETS+=	release-package-lock
 .PHONY: package
 .if !target(package)
 .  if exists(${_COOKIE.package})
 package:
 	@${DO_NADA}
 .  elif defined(_PKGSRC_BARRIER)
 package: ${_PACKAGE_TARGETS}
 .  else
 package: barrier
 @@ -74,54 +70,39 @@ package-cookie:
 	${RUN} ${MKDIR} ${_COOKIE.package:H}
 	${RUN} ${ECHO} ${PKGNAME} > ${_COOKIE.package}
 ######################################################################
 ### The targets below are run with elevated privileges.
 ######################################################################
 ######################################################################
 ### package-all, su-package-all (PRIVATE)
 ######################################################################
 ### package-all is a helper target to create the binary package and
 ### generate any necessary warnings.
 ###
 .if ${_USE_DESTDIR} == "no"
 _PACKAGE_ALL_TARGETS+=	package-check-installed
 .endif
 _PACKAGE_ALL_TARGETS+=	package-create
 _PACKAGE_ALL_TARGETS+=	_package-warnings
 _PACKAGE_ALL_TARGETS+=	error-check
 .PHONY: package-all su-package-all
 .if !empty(_MAKE_PACKAGE_AS_ROOT:M[Yy][Ee][Ss])
 package-all: su-target
 .else
 package-all: su-package-all
 .endif
 su-package-all: ${_PACKAGE_ALL_TARGETS}
 ######################################################################
 ### package-check-installed (PRIVATE, override)
 ######################################################################
 ### package-check-installed verifies that the package is installed on
 ### the system.  This should be overridden per package system format.
 ###
 .if !target(package-check-installed)
 .PHONY: package-check-installed
 package-check-installed:
 	@${DO_NADA}
 .endif
 ######################################################################
 ### package-create (PRIVATE, override)
 ######################################################################
 ### package-create creates the binary package.  This should be overridden
 ### per package system format.
 ###
 .if !target(package-create)
 .PHONY: package-create
 package-create:
 	@${DO_NADA}
 .endif
 # Displays warnings about the binary package.
+#

 @@ -1,14 +1,14 @@
-$NetBSD: README,v 1.2 2014/12/30 15:13:19 wiz Exp $
+$NetBSD: README,v 1.3 2016/04/10 15:58:03 joerg Exp $
 = Introduction =
 A package format is a packaging system that is supported by pkgsrc.
 Currently, there is only one (the native pkgsrc tools), but maybe we can
 support RPM, dpkg or the Solaris native packages someday. It can also be
 used to test new variants of the packaging tools.
 NOTE: The Google Summer of Code 2011 project includes rpm and debian
 http://addpackageforma.sourceforge.net/
 The PKG_FORMAT variable is used to select the format. The default
 format is ``pkg''.
 @@ -47,22 +47,21 @@ shell commands. They may contain referen
 * PKG_FILELIST_CMD
 XXX: Why isn't this variable in the previous list?
 == Make targets ==
 The following make targets must be implemented:
 * _pkgformat-check-vulnerable
 * _pkgformat-deinstall
 * _pkgformat-show-depends
 * _pkgformat-install-dependencies
 * bootstrap-depends
 * _pkgformat-register
 * tarup (XXX: This doesn't sound like a target that should be defined
   here.)
 * tarup-pkg
 * package-install
 * _pkgformat-replace
 * _pkgformat-destdir-replace
 * _pkgformat-undo-replace

 @@ -1,75 +1,7 @@
-# $NetBSD: install.mk,v 1.1 2011/10/15 00:23:09 reed Exp $
+# $NetBSD: install.mk,v 1.2 2016/04/10 15:58:03 joerg Exp $
 # _pkgformat-check-conflicts:
 #	Checks for conflicts between the package and installed packages.
 #	XXX: Needs WRKDIR.
 # _pkgformat-check-installed:
 #	Checks if the package (or an older version of it) is already
 #	installed on the system.
 #	XXX: Needs WRKDIR.
 # _pkgformat-register:
 #	Populates the package database with the appropriate entries to
 #	register the package as being installed on the system.
+#
 # _pkgformat-install-clean:
 #	Removes the state files from the run of an ``install'' target.
+#
 _pkgformat-check-conflicts: .PHONY error-check
 	${RUN}${RM} -f ${WRKDIR}/.CONFLICTS
 .for _conflict_ in ${CONFLICTS}
 	${RUN}								\
 	found="`${_PKG_BEST_EXISTS} ${_conflict_:Q} || ${TRUE}`";	\
 	case "$$found" in						\
 	"")	;;							\
 	*)	${ECHO} "$$found" >> ${WRKDIR}/.CONFLICTS ;;		\
 	esac
 .endfor
 	${RUN}								\
 	${TEST} -f ${WRKDIR}/.CONFLICTS || exit 0;			\
 	exec 1>${ERROR_DIR}/${.TARGET};					\
 	${ECHO} "${PKGNAME} conflicts with installed package(s):";	\
 	${CAT} ${WRKDIR}/.CONFLICTS | ${SED} -e "s|^|    |";		\
 	${ECHO} "They install the same files into the same place.";	\
 	${ECHO} "Please remove conflicts first with pkg_delete(1).";	\
 	${RM} -f ${WRKDIR}/.CONFLICTS
 _pkgformat-check-installed: .PHONY error-check
 	${RUN}								\
 	found="`${_PKG_BEST_EXISTS} ${PKGWILDCARD:Q} || ${TRUE}`";	\
 	${TEST} -n "$$found" || exit 0;					\
 	exec 1>${ERROR_DIR}/${.TARGET};					\
 	${ECHO} "$$found is already installed - perhaps an older version?"; \
 	${ECHO} "If so, you may use either of:";			\
 	${ECHO} "    - \"pkg_delete $$found\" and \"${MAKE} reinstall\""; \
 	${ECHO} "      to upgrade properly";				\
 	${ECHO} "    - \"${MAKE} update\" to rebuild the package and all"; \
 	${ECHO} "      of its dependencies";				\
 	${ECHO} "    - \"${MAKE} replace\" to replace only the package without"; \
 	${ECHO} "      re-linking dependencies, risking various problems."
 _REGISTER_DEPENDENCIES=							\
 	${PKGSRC_SETENV} PKG_DBDIR=${_PKG_DBDIR:Q}			\
 		AWK=${TOOLS_AWK:Q}					\
 	${SH} ${PKGSRCDIR}/mk/pkgformat/pkg/register-dependencies
 _pkgformat-register: .PHONY _pkgformat-generate-metadata ${_RDEPENDS_FILE}
 	@${STEP_MSG} "Registering installation for ${PKGNAME}"
 	${RUN}${RM} -fr ${_PKG_DBDIR}/${PKGNAME}
 	${RUN}${MKDIR} ${_PKG_DBDIR}/${PKGNAME}
 	${RUN}${CP} ${PKG_DB_TMPDIR}/* ${_PKG_DBDIR}/${PKGNAME}
 	${RUN}${PKG_ADMIN} add ${PKGNAME}
 	${RUN}								\
 	case ${_AUTOMATIC:Q}"" in					\
 	[yY][eE][sS])	${PKG_ADMIN} set automatic=yes ${PKGNAME} ;;	\
 	esac
 	${RUN}${_FULL_DEPENDS_CMD} |					\
 		${SORT} -u | ${_REGISTER_DEPENDENCIES} ${PKGNAME}
 	${RUN}${GREP} '^@pkgdir ' < ${_PKG_DBDIR}/${PKGNAME}/+CONTENTS | \
 	    while read tag dir; do ${MKDIR} ${PREFIX}/$$dir; done
 _pkgformat-install-clean: .PHONY _pkgformat-clean-metadata

 @@ -1,14 +1,14 @@
-# $NetBSD: metadata.mk,v 1.12 2015/07/04 16:18:38 joerg Exp $
+# $NetBSD: metadata.mk,v 1.13 2016/04/10 15:58:03 joerg Exp $
 ######################################################################
 ### The targets below are all PRIVATE.
 ######################################################################
 ######################################################################
 ###
 ### Temporary package meta-data directory.  The contents of this directory
 ### are copied directly into the real package meta-data directory.
 ###
 PKG_DB_TMPDIR=	${WRKDIR}/.pkgdb
 unprivileged-install-hook: ${PKG_DB_TMPDIR}
 @@ -237,47 +237,26 @@ MESSAGE_SUBST+=	PKGNAME=${PKGNAME}					\
 		EMULSUBDIR=${EMULSUBDIR}				\
 		LOCALBASE=${LOCALBASE}					\
 		X11BASE=${X11BASE}					\
 		PKG_SYSCONFDIR=${PKG_SYSCONFDIR}			\
 		ROOT_GROUP=${REAL_ROOT_GROUP}				\
 		ROOT_USER=${REAL_ROOT_USER}
 _MESSAGE_SUBST_SED=	${MESSAGE_SUBST:S/=/}!/:S/$/!g/:S/^/ -e s!\\\${/}
 ${_MESSAGE_FILE}: ${MESSAGE_SRC}
 	${RUN}${MKDIR} ${.TARGET:H}
 	${RUN}${CAT} ${.ALLSRC} |			\
 		${SED} ${_MESSAGE_SUBST_SED} > ${.TARGET}
 # Display MESSAGE file and optionally mail the contents to
 # PKGSRC_MESSAGE_RECIPIENTS.
 .PHONY: install-display-message
 _pkgformat-register: install-display-message
 install-display-message: ${_MESSAGE_FILE}
 	@${STEP_MSG} "Please note the following:"
 	@${ECHO_MSG} ""
 	@${CAT} ${_MESSAGE_FILE}
 	@${ECHO_MSG} ""
 .  if !empty(PKGSRC_MESSAGE_RECIPIENTS)
 	${RUN}								\
 	(${ECHO} "The ${PKGNAME} package was installed on `${HOSTNAME_CMD}` at `date`"; \
 	${ECHO} "";							\
 	${ECHO} "Please note the following:";				\
 	${ECHO} "";							\
 	${CAT} ${_MESSAGE_FILE};					\
 	${ECHO} "") |							\
 	${MAIL_CMD} -s"Package ${PKGNAME} installed on `${HOSTNAME_CMD}`" ${PKGSRC_MESSAGE_RECIPIENTS}
 .  endif
 .endif	# MESSAGE_SRC
 ######################################################################
 ###
 ### +PRESERVE - Package preserve file
 ###
 ### The existence of this file prevents pkg_delete from removing this
 ### package unless one "force-deletes" the package.
 ###
 .if defined(PKG_PRESERVE)
 _PRESERVE_FILE=		${PKG_DB_TMPDIR}/+PRESERVE
 _METADATA_TARGETS+=	${_PRESERVE_FILE}
 @@ -354,31 +333,27 @@ _PKG_CREATE_ARGS+=				-B ${_BUILD_INFO_F
 _PKG_CREATE_ARGS+=				-b ${_BUILD_VERSION_FILE}
 _PKG_CREATE_ARGS+=				-c ${_COMMENT_FILE}
 _PKG_CREATE_ARGS+=	${_MESSAGE_FILE:D	-D ${_MESSAGE_FILE}}
 _PKG_CREATE_ARGS+=				-d ${_DESCR_FILE}
 _PKG_CREATE_ARGS+=				-f ${_DEPENDS_PLIST}
 _PKG_CREATE_ARGS+=	${PKG_PRESERVE:D	-n ${_PRESERVE_FILE}}
 _PKG_CREATE_ARGS+=				-S ${_SIZE_ALL_FILE}
 _PKG_CREATE_ARGS+=				-s ${_SIZE_PKG_FILE}
 _PKG_CREATE_ARGS+=	${CONFLICTS:D		-C ${CONFLICTS:Q}}
 _PKG_CREATE_ARGS+=	${INSTALL_FILE:D	${_INSTALL_ARG_cmd:sh}}
 _PKG_CREATE_ARGS+=	${DEINSTALL_FILE:D	${_DEINSTALL_ARG_cmd:sh}}
 _PKG_ARGS_INSTALL+=	${_PKG_CREATE_ARGS}
 .if ${_USE_DESTDIR} == "no"
 _PKG_ARGS_INSTALL+=	-p ${PREFIX}
 .else
 _PKG_ARGS_INSTALL+=	-I ${PREFIX} -p ${DESTDIR}${PREFIX}
 .endif
 _DEINSTALL_ARG_cmd=	if ${TEST} -f ${DEINSTALL_FILE}; then		\
 				${ECHO} "-k "${DEINSTALL_FILE:Q};	\
 			else						\
 				${ECHO};				\
 			fi
 _INSTALL_ARG_cmd=	if ${TEST} -f ${INSTALL_FILE}; then		\
 				${ECHO} "-i "${INSTALL_FILE:Q};		\
 			else						\
 				${ECHO};				\
 			fi
 _CONTENTS_TARGETS+=	${_BUILD_INFO_FILE}

 @@ -1,82 +1,53 @@
-# $NetBSD: package.mk,v 1.13 2016/02/02 08:15:07 rillig Exp $
+# $NetBSD: package.mk,v 1.14 2016/04/10 15:58:03 joerg Exp $
 .if defined(PKG_SUFX)
 WARNINGS+=		"PKG_SUFX is deprecated, please use PKG_COMPRESSION"
 .  if ${PKG_SUFX} == ".tgz"
 PKG_COMPRESSION=	gzip
 .  elif ${PKG_SUFX} == ".tbz"
 PKG_COMPRESSION=	bzip2
 .  else
 WARNINGS+=		"Unsupported value for PKG_SUFX"
 .  endif
 .endif
 PKG_SUFX?=		.tgz
 FILEBASE?=		${PKGBASE}
 PKGFILE?=		${PKGREPOSITORY}/${FILEBASE}-${PKGVERSION}${PKG_SUFX}
 .if ${_USE_DESTDIR} == "no"
 . if !empty(SIGN_PACKAGES:Mgpg)
 STAGE_PKGFILE?=		${WRKDIR}/.packages/${FILEBASE}-${PKGVERSION}${PKG_SUFX}
 . elif !empty(SIGN_PACKAGES:Mx509)
 STAGE_PKGFILE?=		${WRKDIR}/.packages/${FILEBASE}-${PKGVERSION}${PKG_SUFX}
 . else
 STAGE_PKGFILE?=		${PKGFILE}
 . endif
 .else
 STAGE_PKGFILE?=		${WRKDIR}/.packages/${FILEBASE}-${PKGVERSION}${PKG_SUFX}
 .endif
 PKGREPOSITORY?=		${PACKAGES}/${PKGREPOSITORYSUBDIR}
 PKGREPOSITORYSUBDIR?=	All
 ######################################################################
 ### package-check-installed (PRIVATE, pkgsrc/mk/package/package.mk)
 ######################################################################
 ### package-check-installed verifies that the package is installed on
 ### the system.
 ###
 .PHONY: package-check-installed
 package-check-installed:
 	${RUN} ${PKG_INFO} -qe ${PKGNAME} \
 	|| ${FAIL_MSG} "${PKGNAME} is not installed."
 ######################################################################
 ### package-create (PRIVATE, pkgsrc/mk/package/package.mk)
 ######################################################################
 ### package-create creates the binary package.
 ###
 .PHONY: package-create
 package-create: ${PKGFILE} package-links
 ######################################################################
 ### stage-package-create (PRIVATE, pkgsrc/mk/package/package.mk)
 ######################################################################
 ### stage-package-create creates the binary package for stage install.
 ###
 .PHONY: stage-package-create
 .if ${_USE_DESTDIR} == "no"
 stage-package-create:	package-create
 .else
 stage-package-create:	stage-install ${STAGE_PKGFILE}
 .endif
 _PKG_ARGS_PACKAGE+=	${_PKG_CREATE_ARGS}
 _PKG_ARGS_PACKAGE+=	-F ${PKG_COMPRESSION}
 .if ${_USE_DESTDIR} == "no"
 _PKG_ARGS_PACKAGE+=	-p ${PREFIX}
 .else
 _PKG_ARGS_PACKAGE+=	-I ${PREFIX} -p ${DESTDIR}${PREFIX}
-.  if ${_USE_DESTDIR} == "user-destdir"
+.if ${_USE_DESTDIR} == "user-destdir"
 _PKG_ARGS_PACKAGE+=	-u ${REAL_ROOT_USER} -g ${REAL_ROOT_GROUP}
 .  endif
 .endif
 ${STAGE_PKGFILE}: ${_CONTENTS_TARGETS}
 	@${STEP_MSG} "Creating binary package ${.TARGET}"
 	${RUN} ${MKDIR} ${.TARGET:H}; ${_ULIMIT_CMD}			\
 	tmpname=${.TARGET:S,${PKG_SUFX}$,.tmp${PKG_SUFX},};		\
 	if ! ${PKG_CREATE} ${_PKG_ARGS_PACKAGE} "$$tmpname"; then	\
 		exitcode=$$?; ${RM} -f "$$tmpname"; exit $$exitcode;	\
 	fi
 .if !empty(SIGN_PACKAGES:U:Mgpg)
 	@${STEP_MSG} "Signing binary package ${.TARGET} (GPG)"
 	${RUN} tmpname=${.TARGET:S,${PKG_SUFX}$,.tmp${PKG_SUFX},};	\
 	${PKG_ADMIN} gpg-sign-package "$$tmpname" ${.TARGET}
 @@ -177,35 +148,30 @@ tarup-pkg:
 .if defined(_PKGSRC_BARRIER)
 package-install: package real-package-install
 .else
 package-install: barrier
 .endif
 .PHONY: stage-package-install
 .if defined(_PKGSRC_BARRIER)
 stage-package-install: stage-package-create real-package-install
 .else
 stage-package-install: barrier
 .endif
-.if ${_USE_DESTDIR} != "no"
+.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
 .  if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
 real-package-install: su-real-package-install
 .  else
 real-package-install: su-target
 .  endif
 .else
-real-package-install:
+real-package-install: su-target
 	@${DO_NADA}
 .endif
 MAKEFLAGS.su-real-package-install=	PKGNAME_REQD=${PKGNAME_REQD:Q}
 su-real-package-install:
 	@${PHASE_MSG} "Installing binary package of "${PKGNAME:Q}
 .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
 	@${MKDIR} ${_CROSS_DESTDIR}${PREFIX}
 	${PKG_ADD} -m ${MACHINE_ARCH} -I -p ${_CROSS_DESTDIR}${PREFIX} ${STAGE_PKGFILE}
 	@${ECHO} "Fixing recorded cwd..."
 	@${SED} -e 's|@cwd ${_CROSS_DESTDIR}|@cwd |' ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS > ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS.tmp
 	@${MV} ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS.tmp ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS
 .else
 	${RUN} case ${_AUTOMATIC:Q}"" in					\

 @@ -1,14 +1,14 @@
-# $NetBSD: bsd.pkginstall.mk,v 1.65 2016/04/10 15:33:42 joerg Exp $
+# $NetBSD: bsd.pkginstall.mk,v 1.66 2016/04/10 15:58:03 joerg Exp $
+#
 # This Makefile fragment is included by bsd.pkg.mk and implements the
 # common INSTALL/DEINSTALL scripts framework.  To use the pkginstall
 # framework, simply set the relevant variables to customize the install
 # scripts to the package.
+#
 # User-settable variables:
+#
 # FONTS_VERBOSE indicates whether the +FONTS scriptlet will output a message
 #	noting the actions taken if PKG_UPDATE_FONTS_DB is YES.  It is either
 #	YES or NO and defaults to YES for PKG_DEVELOPERs, otherwise NO.
+#
 # INFO_FILES_VERBOSE indicates whether the +INFO_FILES scriptlet will output
 @@ -363,29 +363,28 @@ su-create-usergroup: ${_INSTALL_USERGROU
 	exit $$exitcode
 # SPECIAL_PERMS are lists that look like:
 #		file user group mode
 #	At post-install time, <file> (it may be a directory) is changed
 #	to be owned by <user>:<group> with <mode> permissions.  If a file
 #	pathname is relative, then it is taken to be relative to ${PREFIX}.
+#
 #	SPECIAL_PERMS should be used primarily to change permissions of
 #	files or directories listed in the PLIST.  This may be used to
 #	make certain files set-uid or to change the ownership or a
 #	directory.
+#
-#	Note that when USE_DESTDIR is in effect, the special permissions
+#	The special permissions may not directly recorded (as file
-#	are not directly recorded (as file attributes) in the binary
+#	attributes) in the binary package file.
 #	package file.
+#
 # SETUID_ROOT_PERMS is a convenience definition to note an executable is
 # meant to be setuid-root, and should be used as follows:
+#
 #	SPECIAL_PERMS+=	/path/to/suidroot ${SETUID_ROOT_PERMS}
+#
 # SETGID_GAMES_PERMS is a convenience definition to note an executable is
 # meant to be setgid games, and should be used as follows:
+#
 #	SPECIAL_PERMS+=	/path/to/sgidgame ${SETGID_GAMES_PERMS}
+#
 # GAMEDATA_PERMS and GAMEDIR_PERMS are convenience definitions for files
 # that are meant to be accessed by things that are setgid games. Because
 @@ -1049,28 +1048,26 @@ FILES_SUBST+=		TOUCH=${TOUCH:Q}
 FILES_SUBST+=		TR=${TR:Q}
 FILES_SUBST+=		TRUE=${TRUE:Q}
 FILES_SUBST+=		USERADD=${USERADD:Q}
 FILES_SUBST+=		XARGS=${XARGS:Q}
 FILES_SUBST_SED=	${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/}
 PKG_REFCOUNT_DBDIR?=	${PKG_DBDIR}.refcount
 INSTALL_SCRIPTS_ENV=	PKG_PREFIX=${PREFIX}
 INSTALL_SCRIPTS_ENV+=	PKG_METADATA_DIR=${_PKG_DBDIR}/${PKGNAME}
 INSTALL_SCRIPTS_ENV+=	PKG_REFCOUNT_DBDIR=${PKG_REFCOUNT_DBDIR}
 .PHONY: pre-install-script post-install-script
 DEINSTALL_FILE=		${PKG_DB_TMPDIR}/+DEINSTALL
 INSTALL_FILE=		${PKG_DB_TMPDIR}/+INSTALL
 _DEINSTALL_FILE=	${_PKGINSTALL_DIR}/DEINSTALL
 _INSTALL_FILE=		${_PKGINSTALL_DIR}/INSTALL
 _DEINSTALL_FILE_DFLT=	${_PKGINSTALL_DIR}/DEINSTALL.default
 _INSTALL_FILE_DFLT=	${_PKGINSTALL_DIR}/INSTALL.default
 .PHONY: generate-install-scripts
 generate-install-scripts:						\
 		${_DEINSTALL_FILE} ${_INSTALL_FILE}			\
 		${_DEINSTALL_FILE_DFLT} ${_INSTALL_FILE_DFLT}
 .if !exists(${DEINSTALL_FILE}) || !exists(${INSTALL_FILE})
 	${RUN}${MKDIR} ${INSTALL_FILE:H}
 @@ -1112,44 +1109,26 @@ ${_DEINSTALL_FILE}: ${DEINSTALL_SRC}
 	${RUN}${CHMOD} +x ${.TARGET}
 ${_INSTALL_FILE}: ${INSTALL_SRC}
 	${RUN}${MKDIR} ${.TARGET:H}
 	${RUN}								\
 	exec 1>>${.TARGET};						\
 	case ${.ALLSRC:Q}"" in						\
 	"")	${ECHO} "#!${SH}" ;					\
 		${ECHO} "exit 0" ;;					\
 	*)	${CAT} ${.ALLSRC} | ${SED} ${FILES_SUBST_SED} ;;	\
 	esac
 	${RUN}${CHMOD} +x ${.TARGET}
 pre-install-script:
 	${RUN}								\
 	if ${TEST} -x ${INSTALL_FILE}; then				\
 		${STEP_MSG} "Running PRE-INSTALL script actions";	\
 		cd ${PKG_DB_TMPDIR} && ${PKGSRC_SETENV} ${INSTALL_SCRIPTS_ENV} \
 		${_PKG_DEBUG_SCRIPT} ${INSTALL_FILE} ${PKGNAME}		\
 			PRE-INSTALL;					\
 	fi
 post-install-script:
 	${RUN}								\
 	if ${TEST} -x ${INSTALL_FILE}; then				\
 		${STEP_MSG} "Running POST-INSTALL script actions";	\
 		cd ${PKG_DB_TMPDIR} && ${PKGSRC_SETENV} ${INSTALL_SCRIPTS_ENV} \
 		${_PKG_DEBUG_SCRIPT} ${INSTALL_FILE} ${PKGNAME}		\
 			POST-INSTALL;					\
 	fi
 # rc.d scripts are automatically generated and installed into the rc.d
 # scripts example directory at the post-install step.  The following
 # variables are relevant to this process:
+#
 # RCD_SCRIPTS			lists the basenames of the rc.d scripts
+#
 # RCD_SCRIPT_SRC.<script>	the source file for <script>; this will
 #				be run through FILES_SUBST to generate
 #				the rc.d script (defaults to
 #				${FILESDIR}/<script>.sh)
+#
 # If the source rc.d script is not present, then the automatic handling
 # doesn't occur.

 @@ -1,14 +1,14 @@
-# $NetBSD: print-plist.mk,v 1.27 2015/06/07 03:39:08 joerg Exp $
+# $NetBSD: print-plist.mk,v 1.28 2016/04/10 15:58:03 joerg Exp $
 ###
 ### Automatic PLIST generation
 ###  - files & symlinks first
 ###  - empty directories are handled properly
 ###  - dirs from mtree files are excluded
 ###  - substitute for platform or package specifics substrings
 ###
 ### Usage:
 ###  - make install
 ###  - make print-PLIST | brain >PLIST
 ###
 @@ -43,42 +43,32 @@ _PRINT_PLIST_AWK_IGNORE+=	|| ($$0 ~ /^([
 _PRINT_PLIST_AWK_IGNORE+=	|| ($$0 ~ /^.*\/encodings\.dir/)
 _PRINT_PLIST_AWK_IGNORE+=	|| ($$0 ~ /^.*\/fonts\.dir/)
 .endif
 .if (defined(FONTS_DIRS.ttf) && !empty(FONTS_DIRS.ttf:M*)) || \
     (defined(FONTS_DIRS.type1) && !empty(FONTS_DIRS.type1:M*))
 _PRINT_PLIST_AWK_IGNORE+=	|| ($$0 ~ /^.*\/fonts\.scale/)
 .endif
 .if (defined(FONTS_DIRS.ttf) && !empty(FONTS_DIRS.ttf:M*)) || \
     (defined(FONTS_DIRS.type1) && !empty(FONTS_DIRS.type1:M*)) || \
     (defined(FONTS_DIRS.x11) && !empty(FONTS_DIRS.x11:M*))
 _PRINT_PLIST_AWK_IGNORE+=	|| ($$0 ~ /^.*\/fonts\.cache-1/)
 .endif
-# scan $PREFIX for any files/dirs modified since the package was extracted
+# List the content of $PREFIX and emit "@pkgdir " statements for
-# will emit "@exec mkdir"-statements for empty directories
+# empty directories.
 # XXX will fail for data files that were copied using tar (e.g. emacs)!
 # XXX should check $LOCALBASE and $X11BASE, and add @cwd statements
 .if ${_USE_DESTDIR} == "no"
 _PRINT_PLIST_FILES_CMD=	\
 	${FIND} ${DESTDIR}${PREFIX}/. -xdev -newer ${_COOKIE.extract} \! -type d -print
 _PRINT_PLIST_DIRS_CMD=	\
 	${FIND} ${DESTDIR}${PREFIX}/. -xdev -newer ${_COOKIE.extract} -type d -print
 .else
 _PRINT_PLIST_FILES_CMD=	\
 	${FIND} ${DESTDIR}${PREFIX}/. \! -type d -print
 _PRINT_PLIST_DIRS_CMD=	\
 	${FIND} ${DESTDIR}${PREFIX}/. -type d -print
 .endif
 .if !empty(LIBTOOLIZE_PLIST:M[yY][eE][sS])
 _PRINT_PLIST_LIBTOOLIZE_FILTER?=					\
 	(								\
 	  if ${TEST} -d ${WRKDIR}; then					\
 	  	tmpdir="${WRKDIR}";					\
 	  else								\
 	  	tmpdir="$${TMPDIR-/tmp}";				\
 	  fi;								\
 	  fileslist="$$tmpdir/print.plist.files.$$$$";			\
 	  libslist="$$tmpdir/print.plist.libs.$$$$";			\
 	  while read file; do						\
 		case $$file in						\

 @@ -1,26 +1,20 @@
-# $NetBSD: pkgformat.mk,v 1.2 2014/12/30 15:13:20 wiz Exp $
+# $NetBSD: pkgformat.mk,v 1.3 2016/04/10 15:58:03 joerg Exp $
+#
 # This Makefile fragment provides variable and target overrides that are
 # specific to the pkgsrc native package format.
+#
-# PKG_FILELIST_CMD outputs the list of files owned by ${PKGNAME} as
+# PKG_FILELIST_CMD outputs the list of files in the package based on
-# registered on the system.
+# _DEPENDS_PLIST.
+#
 # For DESTDIR support, just use _DEPENDS_PLIST instead.
 .if ${_USE_DESTDIR} == "no"
 PKG_FILELIST_CMD=	${PKG_INFO} -qL ${PKGNAME:Q}
 .else
 PKG_FILELIST_CMD=	${SED} -e "/^@/d" -e "s|^|${PREFIX}/|" ${_DEPENDS_PLIST}
 .endif
 .include "depends.mk"
 .include "check.mk"
 .include "metadata.mk"
 .include "install.mk"
 .include "deinstall.mk"
 .include "replace.mk"
 .include "package.mk"
 .include "utility.mk"

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	# $NetBSD: bsd.build-vars.mk,v 1.10 2016/03/10 16:58:19 jperkin Exp $	1	# $NetBSD: bsd.build-vars.mk,v 1.11 2016/04/10 15:58:02 joerg Exp $
2	#	2	#
3	# Package-settable variables:	3	# Package-settable variables:
4	#	4	#
5	# BUILD_DIRS is the list of directories in which to perform the build	5	# BUILD_DIRS is the list of directories in which to perform the build
6	# process. If the directories are relative paths, then they	6	# process. If the directories are relative paths, then they
7	# are assumed to be relative to ${WRKSRC}.	7	# are assumed to be relative to ${WRKSRC}.
8	#	8	#
9	# MAKE_ENV is the shell environment that is exported to the make	9	# MAKE_ENV is the shell environment that is exported to the make
10	# process.	10	# process.
11	#	11	#
12	# MAKE_FLAGS is a list of arguments that is pass to the make process.	12	# MAKE_FLAGS is a list of arguments that is pass to the make process.
13	#	13	#
14	# MAKE_FILE is the path to the makefile that is processed by the make	14	# MAKE_FILE is the path to the makefile that is processed by the make
	@@ -40,14 +40,13 @@ MAKE_ENV+= PKGINFODIR=${PKGINFODIR:Q}		@@ -40,14 +40,13 @@ MAKE_ENV+= PKGINFODIR=${PKGINFODIR:Q}
40	MAKE_ENV+= PKGGNUDIR=${PKGGNUDIR:Q}	40	MAKE_ENV+= PKGGNUDIR=${PKGGNUDIR:Q}
41		41
42	# Provide a consistent environment for packages using (Net)BSD-style	42	# Provide a consistent environment for packages using (Net)BSD-style
43	# Makefiles.	43	# Makefiles.
44	#	44	#
45	MAKE_ENV+= MAKECONF=${PKGMAKECONF:U/dev/null}	45	MAKE_ENV+= MAKECONF=${PKGMAKECONF:U/dev/null}
46	MAKE_ENV+= OBJECT_FMT=${OBJECT_FMT:Q}	46	MAKE_ENV+= OBJECT_FMT=${OBJECT_FMT:Q}
47	MAKE_ENV+= ${USETOOLS:DUSETOOLS=${USETOOLS:Q}}	47	MAKE_ENV+= ${USETOOLS:DUSETOOLS=${USETOOLS:Q}}
48		48
49	# Add these bits to the environment used when invoking the recursive make	49	# Add these bits to the environment used when invoking the recursive make
50	# processes for build-related phases.	50	# processes for build-related phases.
51	#	51	#
52	PKGSRC_MAKE_ENV+= PATH=${PATH:Q}	52	PKGSRC_MAKE_ENV+= PATH=${PATH:Q}
53	PKGSRC_MAKE_ENV+= USE_DESTDIR=${USE_DESTDIR:Q}

 @@ -1,29 +1,24 @@
-# $NetBSD: replace.mk,v 1.2 2013/05/23 13:18:56 obache Exp $
+# $NetBSD: replace.mk,v 1.3 2016/04/10 15:58:03 joerg Exp $
+#
 # _pkgformat-replace:
 #	Updates a package in-place on the system (USE_DESTDIR=no).
 # _pkgformat-destdir-replace:
-#	Updates a package in-place on the system (USE_DESTDIR=yes).
+#	Updates a package in-place on the system.
+#
 # See also:
 #	replace
+#
 # XXX: The whole replacement, from deinstalling the old package up
-# to installing the new package, should be one transaction. It
+# to installing the new package, should be one transaction.
 # currently isn't, and the check-files target for other packages
 # can be confused when a +REQUIRED_BY files suddenly disappears.
+#
 _pkgformat-replace: \
 	replace-names \
 	replace-tarup \
 	replace-preserve-installed-info \
 	replace-preserve-required-by \
 	deinstall \
 	install-clean \
 	install \
 	replace-fixup-required-by \
 	replace-fixup-installed-info \
 	.PHONY