Tue Dec 30 15:13:21 2014 UTC ()

Remove pkg_views support, second part: infrastructure.


(wiz)

--- pkgsrc/doc/RESPONSIBLE 2014/05/06 04:13:53 1.23
+++ pkgsrc/doc/RESPONSIBLE 2014/12/30 15:13:19 1.24

 @@ -1,36 +1,35 @@
-$NetBSD: RESPONSIBLE,v 1.23 2014/05/06 04:13:53 rodent Exp $
+$NetBSD: RESPONSIBLE,v 1.24 2014/12/30 15:13:19 wiz Exp $
 List of sections of the system, and who is responsible for them (or
 at least considered an expert on them).
 Warning: this list is not considered definitive, and is necessarily
 incomplete!
 pkgsrc Infrastructure:
 Part of the infrastructure	People
 ---------------------------------------------------------------------------
 README.html generation		dmcmahill
 bootstrap			joerg
 bsd.options.mk			dillo
 buildlink3			-
 bulk build			hubertf, dmcmahill, rillig
 destdir				joerg
 mk/check			rillig
 mk/wrapper			rillig
 pkg_install			agc
 pkgviews			-
 unprivileged builds		rillig
 pkgsrc platforms:
 MACHINE_PLATFORM		People
 ---------------------------------------------------------------------------
 AIX				-
 BSD/OS				reed
 Cygwin				-
 Darwin/Mac OS X/OS X		schmonz
 DragonFly			-
 FreeBSD				-
 FreeMiNT			ryoon

--- pkgsrc/doc/guide/files/buildlink.xml 2013/07/30 07:14:09 1.36
+++ pkgsrc/doc/guide/files/buildlink.xml 2014/12/30 15:13:19 1.37

 @@ -1,14 +1,14 @@
-<!-- $NetBSD: buildlink.xml,v 1.36 2013/07/30 07:14:09 wiz Exp $ -->
+<!-- $NetBSD: buildlink.xml,v 1.37 2014/12/30 15:13:19 wiz Exp $ -->
 <chapter id="buildlink">
   <title>Buildlink methodology</title>
   <para>Buildlink is a framework in pkgsrc that controls what headers and libraries
   are seen by a package's configure and build processes.  This is implemented
   in a two step process:</para>
   <orderedlist>
     <listitem>
       <para>Symlink headers and libraries for dependencies into
       <varname>BUILDLINK_DIR</varname>, which by default is a subdirectory
       of <varname>WRKDIR</varname>.</para>
 @@ -307,33 +307,31 @@ BUILDLINK_TREE+=	-tiff
 	    The resulting files are to be symlinked
 	    into <filename>${BUILDLINK_DIR}</filename>.  By default,
 	    this takes the <filename>+CONTENTS</filename> of a
 	    <replaceable>pkg</replaceable> and filters it through
 	    <varname>${BUILDLINK_CONTENTS_FILTER.<replaceable>pkg</replaceable>}</varname>.</para>
 	</listitem>
 	<listitem>
 	  <para><varname>BUILDLINK_CONTENTS_FILTER.<replaceable>pkg</replaceable></varname>
 	    (not shown above) is a filter command that filters
 	    <filename>+CONTENTS</filename> input into a list of files
 	    relative to
 	    <filename>${BUILDLINK_PREFIX.<replaceable>pkg</replaceable>}</filename>
-	    on stdout.  By default for overwrite packages,
+	    on stdout.  By default,
 	    <varname>BUILDLINK_CONTENTS_FILTER.<replaceable>pkg</replaceable></varname>
 	    outputs the contents of the <filename>include</filename>
 	    and <filename>lib</filename> directories in the package
-	    <filename>+CONTENTS</filename>, and for pkgviews packages,
+	    <filename>+CONTENTS</filename>.
 	    it outputs any libtool archives in
 	    <filename>lib</filename> directories.</para>
 	</listitem>
 	<listitem>
 	  <para><varname>BUILDLINK_FNAME_TRANSFORM.<replaceable>pkg</replaceable></varname>
 	    (not shown above) is a list of sed arguments used to
 	    transform the name of the source filename into a
 	    destination filename, e.g. <command>-e
 	    "s|/curses.h|/ncurses.h|g"</command>.</para>
 	</listitem>
       </itemizedlist>
       <para>This section can additionally include any
       <filename>buildlink3.mk</filename> needed for

--- pkgsrc/doc/guide/files/faq.xml 2014/02/03 16:09:34 1.50
+++ pkgsrc/doc/guide/files/faq.xml 2014/12/30 15:13:19 1.51

 @@ -1,14 +1,14 @@
-<!-- $NetBSD: faq.xml,v 1.50 2014/02/03 16:09:34 wiz Exp $ -->
+<!-- $NetBSD: faq.xml,v 1.51 2014/12/30 15:13:19 wiz Exp $ -->
 <chapter id="faq"> <?dbhtml filename="faq.html"?>
 <title>Frequently Asked Questions</title>
 <para>This section contains hints, tips &amp; tricks on special things in
 pkgsrc that we didn't find a better place for in the previous chapters, and
 it contains items for both pkgsrc users and developers.</para>
 <!-- ================================================================== -->
   <sect1 id="mailing-list-pointers">
     <title>Are there any mailing lists for pkg-related discussion?</title>
 @@ -51,37 +51,26 @@ it contains items for both pkgsrc users
 <para>To subscribe, do:</para>
 <programlisting>
 &cprompt; echo subscribe <replaceable>listname</replaceable> | mail majordomo@NetBSD.org
 </programlisting>
 <para>Archives for all these mailing lists are available from
 <ulink url="http://mail-index.NetBSD.org/"/>.</para>
 </sect1>
 <!-- ================================================================== -->
 <sect1 id="pkgviews-docs">
 <title>Where's the pkgviews documentation?</title>
 <para>Pkgviews is tightly integrated with buildlink.  You can find a
 pkgviews User's guide in
 <filename>pkgsrc/mk/buildlink3/PKGVIEWS_UG</filename>.</para>
 </sect1>
 <!-- ================================================================== -->
 <sect1 id="faq-pkgtools">
 <title>Utilities for package management (pkgtools)</title>
 <para>The directory <filename>pkgsrc/pkgtools</filename> contains
 a number of useful utilities for both users and developers of pkgsrc.  This
 section attempts only to make the reader aware of the utilities and when
 they might be useful, and not to duplicate the documentation that comes
 with each package.</para>
 <para>Utilities used by pkgsrc (automatically installed when needed):</para>
 <itemizedlist>

--- pkgsrc/lang/perl5/buildlink3.mk 2014/05/29 07:57:07 1.54
+++ pkgsrc/lang/perl5/buildlink3.mk 2014/12/30 15:13:19 1.55

 @@ -1,14 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.54 2014/05/29 07:57:07 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.55 2014/12/30 15:13:19 wiz Exp $
 BUILDLINK_TREE+=	perl
 .if !defined(PERL_BUILDLINK3_MK)
 PERL_BUILDLINK3_MK:=
 .include "../../mk/bsd.fast.prefs.mk"
 PERL5_REQD+=			5.20.0
 .for _perl5_ver_ in ${PERL5_REQD}
 BUILDLINK_API_DEPENDS.perl+=	perl>=${_perl5_ver_}
 .endfor
 # Prevent p5-* etc. packages built for 5.20.0 to be used
 # with the next incompatible version of perl:
 @@ -24,25 +24,23 @@ PERL5=		${PERLDIR}/bin/perl
 pkgbase := perl
 .include "../../mk/pkg-build-options.mk"
 .if !empty(PKG_BUILD_OPTIONS.perl:Mthreads)
 .  include "../../mk/pthread.buildlink3.mk"
 .endif
 PERL5_OPTIONS?=		# empty
 .if !empty(PERL5_OPTIONS:Mthreads)
 INSTALL_TEMPLATES+=	${.CURDIR}/../../lang/perl5/files/install_threads.tmpl
 .endif
 .if ${PKG_INSTALLATION_TYPE} == "overwrite"
+#
 # Perl keeps headers and odd libraries in an odd path not caught by the
 # default BUILDLINK_FILES_CMD, so name them to be symlinked into
 # ${BUILDLINK_DIR}.
+#
 .include "../../lang/perl5/vars.mk"
 BUILDLINK_FILES.perl=	${PERL5_SUB_INSTALLARCHLIB}/CORE/*
 .endif
 .endif # PERL_BUILDLINK3_MK
 BUILDLINK_TREE+=	-perl

--- pkgsrc/mail/mutt/Makefile 2014/10/09 14:06:39 1.168
+++ pkgsrc/mail/mutt/Makefile 2014/12/30 15:13:19 1.169

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.168 2014/10/09 14:06:39 wiz Exp $
+# $NetBSD: Makefile,v 1.169 2014/12/30 15:13:19 wiz Exp $
 DISTNAME=		mutt-1.4.2.3
 PKGREVISION=		7
 CATEGORIES=		mail
 MASTER_SITES=		ftp://ftp.mutt.org/mutt/ \
 			ftp://gd.tuwien.ac.at/infosys/mail/mutt/ \
 			ftp://ftp.fu-berlin.de/unix/mail/mutt/
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.mutt.org/
 COMMENT=		Text-based MIME mail client with PGP support
 LICENSE=		gnu-gpl-v2
 @@ -90,19 +90,14 @@ INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} syscon
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 # Pre-create some directories and symlinks used during the installation
 # process.
+#
 pre-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
 	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
 	${RM} -f ${DESTDIR}${DOCDIR}/samples
 	${LN} -sf ${DESTDIR}${EGDIR} ${DESTDIR}${DOCDIR}/samples
 post-install:
 .if (${PKG_INSTALLATION_TYPE} == "pkgviews")
 	${MV} ${PREFIX}/${PKGMANDIR}/man5/mutt-mbox.5 ${PREFIX}/${PKGMANDIR}/man5/mbox.5
 .endif
 .include "../../mk/bsd.pkg.mk"

--- pkgsrc/mail/qmail/Makefile 2014/11/23 19:08:22 1.72
+++ pkgsrc/mail/qmail/Makefile 2014/12/30 15:13:19 1.73

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.72 2014/11/23 19:08:22 schmonz Exp $
+# $NetBSD: Makefile,v 1.73 2014/12/30 15:13:19 wiz Exp $
+#
 DISTNAME=		${PKGNAME_NOREV}
 PKGNAME=		qmail-1.03
 PKGREVISION=		19
 CATEGORIES=		mail
 MASTER_SITES=		http://qmail.org/
 MAINTAINER=		schmonz@NetBSD.org
 HOMEPAGE=		http://cr.yp.to/qmail.html
 COMMENT=		Secure, reliable, efficient, simple, and fast MTA
 LICENSE=		public-domain
 @@ -159,37 +159,35 @@ pre-install:
 	  ${LN} -s ${DESTDIR}${DOCDIR}		${DESTDIR}${QMAILDIR}/doc
 	  ${LN} -s ${DESTDIR}${PREFIX}/${PKGMANDIR} ${DESTDIR}${QMAILDIR}/man
 	  ${LN} -s ${DESTDIR}${QMAIL_QUEUE_DIR}	${DESTDIR}${QMAILDIR}/queue
 	  ${LN} -s ${DESTDIR}${EGDIR}/users	${DESTDIR}${QMAILDIR}/users
 .	endif
 post-install: post-install-viruscan
 	# allow packaging as non-root, fix at install time with SPECIAL_PERMS
 	${CHMOD} 0755 ${DESTDIR}${PREFIX}/bin/qmail-queue
 .	for f in ${QMAIL_ROOT_ONLY_READABLES} ${QMAIL_ROOT_ONLY_EVERYTHINGS}
 	  ${CHMOD} 0755 ${DESTDIR}${PREFIX}/bin/${f}
 .	endfor
 	# qmail's installer sets strange permissions, set them back
-.	if (${PKG_INSTALLATION_TYPE} == "overwrite")
+.	for i in bin boot
-.	  for i in bin boot
+	  ${CHGRP} ${BINGRP} ${DESTDIR}${QMAILDIR}/${i}
-	    ${CHGRP} ${BINGRP} ${DESTDIR}${QMAILDIR}/${i}
+.	endfor
-.	  endfor
+.	for i in doc
-.	  for i in doc
+	  ${CHGRP} ${SHAREGRP} ${DESTDIR}${QMAILDIR}/${i}
-	    ${CHGRP} ${SHAREGRP} ${DESTDIR}${QMAILDIR}/${i}
+.	endfor
-.	  endfor
+.	for i in ${MANDIRS}
-.	  for i in ${MANDIRS}
+	  ${CHGRP} ${MANGRP} ${DESTDIR}${QMAILDIR}/${i}
-	    ${CHGRP} ${MANGRP} ${DESTDIR}${QMAILDIR}/${i}
+.	endfor
 .	  endfor
 .	endif
 	${INSTALL_DATA} ${WRKSRC}/README.pkgsrc ${DESTDIR}${DOCDIR}
 	${INSTALL_PROGRAM_DIR} ${DESTDIR}${SHAREDIR}/setup
 	for i in ${SETUP_PROGRAMS}; do					\
 		${INSTALL_PROGRAM} ${WRKSRC}/$$i			\
 			${DESTDIR}${SHAREDIR}/setup;			\
 	done
 	for i in ${SETUP_SCRIPTS}; do					\
 		${INSTALL_SCRIPT} ${WRKSRC}/$$i				\
 			${DESTDIR}${SHAREDIR}/setup;			\
 	done

--- pkgsrc/mk/bsd.pkg.mk 2014/11/25 18:27:17 1.2006
+++ pkgsrc/mk/bsd.pkg.mk 2014/12/30 15:13:19 1.2007

 @@ -1,14 +1,14 @@
-#	$NetBSD: bsd.pkg.mk,v 1.2006 2014/11/25 18:27:17 joerg Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.2007 2014/12/30 15:13:19 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
 @@ -111,37 +111,26 @@ _INSTALL_UNSTRIPPED=	# set (flag used by
 ##### Transform USE_* into dependencies
 .include "bsd.pkg.use.mk"
 ############################################################################
 # Sanity checks
 ############################################################################
 .if defined(BUILDLINK_DEPTH) || defined(BUILDLINK_PACKAGES) || \
     defined(BUILDLINK_DEPENDS) || defined(BUILDLINK_ORDER)
 PKG_FAIL_REASON+=	"Out-dated buildlink3.mk detected, please update"
 .endif
 # PKG_INSTALLATION_TYPE can only be one of two values: "pkgviews" or
 # "overwrite".
 .if (${PKG_INSTALLATION_TYPE} != "pkgviews") && \
     (${PKG_INSTALLATION_TYPE} != "overwrite")
 PKG_FAIL_REASON+=	"PKG_INSTALLATION_TYPE must be \`\`pkgviews'' or \`\`overwrite''."
 .endif
 .if empty(PKG_INSTALLATION_TYPES:M${PKG_INSTALLATION_TYPE})
 PKG_FAIL_REASON+=	"This package doesn't support PKG_INSTALLATION_TYPE=${PKG_INSTALLATION_TYPE}."
 .endif
 .if !defined(CATEGORIES)
 PKG_FAIL_REASON+='CATEGORIES are mandatory.'
 .endif
 .if !defined(PKGNAME) && !defined(DISTNAME)
 PKG_FAIL_REASON+='PKGNAME and/or DISTNAME are mandatory.'
 .endif
 .if defined(PKG_PATH)
 PKG_FAIL_REASON+='Please unset PKG_PATH before doing pkgsrc work!'
 .endif
 # Allow variables to be set on a per-OS basis
 @@ -206,30 +195,26 @@ _BUILD_DEFS=		${BUILD_DEFS}
 _BUILD_DEFS+=		LOCALBASE
 _BUILD_DEFS+=		PKGGNUDIR
 _BUILD_DEFS+=		PKGINFODIR
 _BUILD_DEFS+=		PKGMANDIR
 _BUILD_DEFS+=		_USE_DESTDIR
 # Store the result in the +BUILD_INFO file so we can query for the build
 # options using "pkg_info -Q PKG_OPTIONS <pkg>".
+#
 .if defined(PKG_SUPPORTED_OPTIONS) && defined(PKG_OPTIONS)
 _BUILD_DEFS+=            PKG_OPTIONS
 .endif
 .if empty(DEPOT_SUBDIR)
 PKG_FAIL_REASON+=	"DEPOT_SUBDIR may not be empty."
 .endif
 # Store the build options for multi-packages, i.e. packages that can
 # be built with multiple versions of Apache, Python, Ruby, PHP etc.
+#
 .if defined(MULTI)
 _BUILD_DEFS+=            MULTI
 .endif
 # ZERO_FILESIZE_P exits with a successful return code if the given file
 #	has zero length.
 # NONZERO_FILESIZE_P exits with a successful return code if the given file
 #	has nonzero length.
+#
 _ZERO_FILESIZE_P=	${AWK} 'END { exit (NR > 0) ? 1 : 0; }'
 @@ -339,49 +324,36 @@ ERROR_CAT?=		${SED} -e "s|^|ERROR: |" 1>
 # How to do nothing.  Override if you, for some strange reason, would rather
 # do something.
 DO_NADA?=		${TRUE}
 # the FAIL command executes its arguments and then exits with a non-zero
 # status.
 FAIL?=			${SH} ${PKGSRCDIR}/mk/scripts/fail
+#
 # Config file related settings - see doc/pkgsrc.txt
+#
 PKG_SYSCONFVAR?=	${PKGBASE}
 PKG_SYSCONFSUBDIR?=	# empty
 .if ${PKG_INSTALLATION_TYPE} == "overwrite"
 PKG_SYSCONFDEPOTBASE=	# empty
 PKG_SYSCONFBASEDIR=	${PKG_SYSCONFBASE}
 .else
 .  if !empty(PKG_SYSCONFBASE:M${PREFIX}) || \
       !empty(PKG_SYSCONFBASE:M${PREFIX}/*)
 PKG_SYSCONFDEPOTBASE=	# empty
 PKG_SYSCONFBASEDIR=	${PKG_SYSCONFBASE}
 .  else
 PKG_SYSCONFDEPOTBASE=	${PKG_SYSCONFBASE}/${DEPOT_SUBDIR}
 PKG_SYSCONFBASEDIR=	${PKG_SYSCONFDEPOTBASE}/${PKGNAME}
 .  endif
 .endif
 .if empty(PKG_SYSCONFSUBDIR)
 DFLT_PKG_SYSCONFDIR:=	${PKG_SYSCONFBASEDIR}
 .else
 DFLT_PKG_SYSCONFDIR:=	${PKG_SYSCONFBASEDIR}/${PKG_SYSCONFSUBDIR}
 .endif
 PKG_SYSCONFDIR=		${DFLT_PKG_SYSCONFDIR}
 .if defined(PKG_SYSCONFDIR.${PKG_SYSCONFVAR})
 PKG_SYSCONFDIR=		${PKG_SYSCONFDIR.${PKG_SYSCONFVAR}}
 PKG_SYSCONFBASEDIR=	${PKG_SYSCONFDIR.${PKG_SYSCONFVAR}}
 PKG_SYSCONFDEPOTBASE=	# empty
 .endif
 PKG_SYSCONFDIR_PERMS?=	${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
 ALL_ENV+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
 _BUILD_DEFS+=		PKG_SYSCONFBASEDIR PKG_SYSCONFDIR
 # 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	\
 @@ -652,29 +624,26 @@ su-target: .USE
 ################################################################
 # Some more targets supplied for users' convenience
 ################################################################
 # Run pkglint:
 .PHONY: lint
 lint:
 	${RUN} ${LOCALBASE}/bin/pkglint
 # List of flags to pass to pkg_add(1) for bin-install:
 BIN_INSTALL_FLAGS?= 	# -v
 .if ${PKG_INSTALLATION_TYPE} == "pkgviews"
 PKG_ARGS_ADD=		-W ${LOCALBASE} -w ${DEFAULT_VIEW}
 .endif
 _BIN_INSTALL_FLAGS=	${BIN_INSTALL_FLAGS}
 .if defined(_AUTOMATIC) && !empty(_AUTOMATIC:M[Yy][Ee][Ss])
 _BIN_INSTALL_FLAGS+=	-A
 .endif
 _BIN_INSTALL_FLAGS+=	${PKG_ARGS_ADD}
 _SHORT_UNAME_R=	${:!${UNAME} -r!:C@\.([0-9]*)[_.-].*@.\1@} # n.n[_.]anything => n.n
 .include "install/bin-install.mk"
 .PHONY: show-pkgtools-version
 .if !target(show-pkgtools-version)
 show-pkgtools-version:

--- pkgsrc/mk/bsd.pkg.use.mk 2014/10/01 19:14:21 1.57
+++ pkgsrc/mk/bsd.pkg.use.mk 2014/12/30 15:13:19 1.58

 @@ -1,14 +1,14 @@
-#	$NetBSD: bsd.pkg.use.mk,v 1.57 2014/10/01 19:14:21 joerg Exp $
+#	$NetBSD: bsd.pkg.use.mk,v 1.58 2014/12/30 15:13:19 wiz Exp $
+#
 # Turn USE_* macros into proper depedency logic.  Included near the top of
 # bsd.pkg.mk, after bsd.prefs.mk.
+#
 # Package-settable variables:
+#
 # USE_BSD_MAKEFILE
 #	Should be set to "yes" whenever a package uses a BSD-style
 #	Makefile. These Makefiles typically end with a line including
 #	<bsd.prog.mk>.
 # USE_IMAKE
 #	When set to "yes", means that the package uses imake as the
 @@ -45,42 +45,34 @@ PLIST_SUBST+=		IMAKE_GAMEMAN_SUFFIX=${IM
 PLIST_SUBST+=		IMAKE_MISCMAN_SUFFIX=${IMAKE_MISCMAN_SUFFIX:Q}
 PLIST_SUBST+=		IMAKE_MANNEWSUFFIX=${IMAKE_MANNEWSUFFIX:Q}
 .endif
 .if defined(USE_IMAKE)
 USE_X11BASE?=		implied
 MAKE_FLAGS+=		CC=${CC:Q} CXX=${CXX:Q}
 .endif
 .if defined(USE_X11BASE) && ${X11_TYPE} != "modular"
 .  include "x11.buildlink3.mk"
 .endif
-.if ${PKG_INSTALLATION_TYPE} == "pkgviews"
+.if defined(INSTALLATION_PREFIX)
 PREFIX=			${DEPOTBASE}/${PKGNAME}
 .elif ${PKG_INSTALLATION_TYPE} == "overwrite"
 .  if defined(INSTALLATION_PREFIX)
 PREFIX=			${INSTALLATION_PREFIX}
-.  elif defined(USE_X11BASE)
+.elif defined(USE_X11BASE)
 PREFIX=			${X11PREFIX}
-.  elif defined(USE_CROSSBASE)
+.elif defined(USE_CROSSBASE)
 PREFIX=			${CROSSBASE}
-.  else
+.else
 PREFIX=			${LOCALBASE}
 .  endif
 .endif
 .if (${PKG_INSTALLATION_TYPE} == "pkgviews") && defined(INSTALLATION_PREFIX)
 PKG_FAIL_REASON=	"INSTALLATION_PREFIX can't be used in a pkgviews package"
 .endif
 ############################################################################
 # General settings
 ############################################################################
 ### PKG_USE_KERBEROS
 .if defined(PKG_USE_KERBEROS)
 CRYPTO?=		uses Kerberos encryption code
 BUILD_DEFS+=		KERBEROS
 .endif

--- pkgsrc/mk/bsd.prefs.mk 2014/12/07 06:22:52 1.352
+++ pkgsrc/mk/bsd.prefs.mk 2014/12/30 15:13:19 1.353

 @@ -1,14 +1,14 @@
-# $NetBSD: bsd.prefs.mk,v 1.352 2014/12/07 06:22:52 obache Exp $
+# $NetBSD: bsd.prefs.mk,v 1.353 2014/12/30 15:13:19 wiz 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.
 @@ -567,47 +567,26 @@ _CROSS_DESTDIR=	${CROSS_DESTDIR}
 .  if ${OBJECT_FMT} == "ELF" && \
    (${MACHINE_GNU_ARCH} == "arm" || \
     ${MACHINE_ARCH} == "i386" || \
     ${MACHINE_ARCH} == "m68k" || \
     ${MACHINE_ARCH} == "m68000" || \
     ${MACHINE_GNU_ARCH} == "sh" || \
     ${MACHINE_GNU_ARCH} == "shle" || \
     ${MACHINE_ARCH} == "sparc" || \
     ${MACHINE_ARCH} == "vax")
 APPEND_ELF=		elf
 .  endif
 .endif
 PKG_INSTALLATION_TYPES?= overwrite
 # This is a whitespace-separated list of installation types supported
 # by the package.
 # *NOTE*: This variable *must* be set in the package Makefile *before*
 #         the inclusion of bsd.prefs.mk.
 # Possible: any of: overwrite, pkgviews
 # Default: overwrite
 # Set the style of installation to be performed for the package.  The
 # funky make variable modifiers just select the first word of the value
 # stored in the referenced variable.
 .for _pref_ in ${PKG_INSTALLATION_PREFS}
 .  if !empty(PKG_INSTALLATION_TYPES:M${_pref_})
 PKG_INSTALLATION_TYPE?=	${PKG_INSTALLATION_TYPES:M${_pref_}:S/^/_pkginsttype_/1:M_pkginsttype_*:S/^_pkginsttype_//}
 .  endif
 .endfor
 PKG_INSTALLATION_TYPE?=	none
 # if the system is IPv6-ready, compile with IPv6 support turned on.
 .if empty(_OPSYS_HAS_INET6:M[nN][oO])
 IPV6_READY=		YES
 .else
 IPV6_READY=		NO
 .endif
 LOCALBASE?=		/usr/pkg
 X11_TYPE?=		modular
 .if !empty(X11_TYPE:Mnative)
 .  if ${OPSYS} == "SunOS"
 # On Solaris, we default to using OpenWindows for X11.
 X11BASE?=	/usr/openwin
 @@ -658,29 +637,26 @@ IMAKE_LIBMAN_SUFFIX=	3
 IMAKE_KERNMAN_SUFFIX=	4
 IMAKE_FILEMAN_SUFFIX=	5
 IMAKE_GAMEMAN_SUFFIX=	6
 IMAKE_MISCMAN_SUFFIX=	7
 IMAKE_MAN_DIR=		${IMAKE_MAN_SOURCE_PATH}1
 IMAKE_LIBMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}3
 IMAKE_KERNMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}4
 IMAKE_FILEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}5
 IMAKE_GAMEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}6
 IMAKE_MISCMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}7
 IMAKE_MANNEWSUFFIX=	${IMAKE_MAN_SUFFIX}
 IMAKE_MANINSTALL?=	maninstall
 DEPOT_SUBDIR?=		packages
 DEPOTBASE=		${LOCALBASE}/${DEPOT_SUBDIR}
 # LINK_RPATH_FLAG publicly exports the linker flag used to set the
 # run-time library search path.
+#
 .if defined(_OPSYS_LINKER_RPATH_FLAG)
 LINKER_RPATH_FLAG=	${_OPSYS_LINKER_RPATH_FLAG}
 .else
 LINKER_RPATH_FLAG?=	${_LINKER_RPATH_FLAG}
 .endif
 # COMPILER_RPATH_FLAG publicly exports the compiler flag used to pass
 # run-time library search path directives to the linker.
+#
 .if defined(_OPSYS_COMPILER_RPATH_FLAG)

--- pkgsrc/mk/buildlink3/BUILDLINK3_DG 2005/03/24 17:46:01 1.7
+++ pkgsrc/mk/buildlink3/BUILDLINK3_DG 2014/12/30 15:13:19 1.8

 @@ -1,14 +1,14 @@
-$NetBSD: BUILDLINK3_DG,v 1.7 2005/03/24 17:46:01 tv Exp $
+$NetBSD: BUILDLINK3_DG,v 1.8 2014/12/30 15:13:19 wiz Exp $
 Developer's guide to buildlink3
  =================================
 This is a tutorial for pkgsrc developers to understand and to use the
 buildlink3 framework in pkgsrc.
 Changes between buildlink2 and buildlink3
  ===========================================
 The buildlink3 framework is a evolutionary descendant of the
 buildlink2 framework that does a better job of adhering to the
 @@ -33,39 +33,26 @@ used instead of the system libraries if
 buildlink3.mk files have two major differences over buildlink2.mk
 files.  The first, most noticeable difference is that buildlink3.mk
 generally don't contain a BUILDLINK_FILES definition.  This is
 because buildlink3 automatically determines which files to symlink
 into ${BUILDLINK_DIR} by examining the PLIST of the installed package.
 The second difference is that buildlink3.mk files keep track of how
 "deep" we are in including buildlink3.mk files, and only creates
 dependencies on packages encountered at depth 1.  This means that
 packages that want to add a dependency must directly include the
 buildlink3.mk file for that dependency.
 .3 Support for pkgviews
  ========================
 When building pkgviews packages, buildlink3 doesn't symlink files
 into ${BUILDLINK_DIR} since it can safely refer to only a specific
 package's files by passing the appropriate -I<dir> and -L<dir> flags
 to the compiler, where <dir> points to a location in the package's
 depot directory.  When building "overwrite" packages, buildlink3 will
 act and feel very much like buildlink2 but with more advanced wrapper
 scripts, and there are provisions for allowing an "overwrite" package
 to build against the viewed instance of a depoted package.
 Troubleshooting
  =================
 Q1: Where can I see the actual command executed by the wrapper
     scripts?
 A1: You should examine the contents of the ${WRKDIR}/.work.log file.
     The lines preceded with [*] are the commands that are intercepted
     by the wrapper scripts, and the lines preceded with <.> are the
     commands that are executed by the wrapper scripts.
 Q2: Why can't I check the values of variables set by the buildlink3

--- pkgsrc/mk/buildlink3/bsd.buildlink3.mk 2014/11/25 19:01:02 1.231
+++ pkgsrc/mk/buildlink3/bsd.buildlink3.mk 2014/12/30 15:13:19 1.232

 @@ -1,14 +1,14 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.231 2014/11/25 19:01:02 joerg Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.232 2014/12/30 15:13:19 wiz 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
 @@ -195,27 +195,27 @@ MAKEFLAGS+=		IGNORE_PKG.${_pkg_}=${IGNOR
+#
 _BLNK_PACKAGES=		# empty
 .for _pkg_ in ${BUILDLINK_TREE:N-*:Mx11-links} ${BUILDLINK_TREE:N-*:Nx11-links}
 .  if empty(_BLNK_PACKAGES:M${_pkg_}) && !defined(IGNORE_PKG.${_pkg_})
 _BLNK_PACKAGES+=	${_pkg_}
 .  endif
 .endfor
 _VARGROUPS+=		bl3
 .for v in BINDIR CFLAGS CPPFLAGS DEPENDS LDFLAGS LIBS
 _SYS_VARS.bl3+=		BUILDLINK_${v}
 .endfor
 .for p in ${_BUILDLINK_TREE}
-.  for v in AUTO_VARS BUILTIN_MK CONTENTS_FILTER CPPFLAGS DEPMETHOD FILES_CMD INCDIRS IS_DEPOT LDFLAGS LIBDIRS PKGNAME PREFIX RPATHDIRS
+.  for v in AUTO_VARS BUILTIN_MK CONTENTS_FILTER CPPFLAGS DEPMETHOD FILES_CMD INCDIRS LDFLAGS LIBDIRS PKGNAME PREFIX RPATHDIRS
 _SYS_VARS.bl3+=		BUILDLINK_${v}.${p}
 .  endfor
 .  for v in IGNORE_PKG USE_BUILTIN
 _SYS_VARS.bl3+=		${v}.${p}
 .  endfor
 .endfor
 # By default, every package receives a full dependency.
 .for _pkg_ in ${_BLNK_PACKAGES}
 BUILDLINK_DEPMETHOD.${_pkg_}?=	full
 .endfor
 # _BLNK_DEPENDS contains all of the elements of _BLNK_PACKAGES for which
 @@ -280,29 +280,26 @@ ${_depmethod_}+=	${_BLNK_ADD_TO.${_depme
 ###
 .if defined(_PKGSRC_BARRIER)
 # Generate default values for:
+#
 # _BLNK_PKG_DBDIR.<pkg>		contains all of the package metadata
 #				files for <pkg>
+#
 # _BLNK_PKG_INFO.<pkg>		pkg_info(1) with correct dbdir to get
 #				information for <pkg>
+#
 # BUILDLINK_PKGNAME.<pkg>	the name of the package
+#
 # BUILDLINK_IS_DEPOT.<pkg>	"yes" or "no" for whether <pkg> is a
 #				depoted package.
 # BUILDLINK_PREFIX.<pkg>	contains all of the installed files
 #				for <pkg>
+#
 # BUILDLINK_CFLAGS.<pkg>,
 # BUILDLINK_CPPFLAGS.<pkg>,
 # BUILDLINK_LDFLAGS.<pkg>	contain extra compiler options, -D..., -I...
 #				and -L.../-Wl,-R options to be passed to the
 #				compiler/linker so that building against
 #				<pkg> will work.
+#
 # BUILDLINK_LIBS.<pkg>		contain -l... (library) options that can be
 #				automatically appended to the LIBS
 #				variable when building against <pkg>.
 @@ -325,27 +322,26 @@ ${_depmethod_}+=	${_BLNK_ADD_TO.${_depme
 #				LIBDIRS,RPATHDIRS}.<pkg> should automatically
 #				be added to the compiler/linker search paths.
 #				Defaults to "yes".
+#
 .for _pkg_ in ${_BLNK_PACKAGES}
+#
 # If we're using the built-in package, then provide sensible defaults.
+#
 USE_BUILTIN.${_pkg_}?=		no
 .  if !empty(USE_BUILTIN.${_pkg_}:M[yY][eE][sS])
 _BLNK_PKG_DBDIR.${_pkg_}?=	_BLNK_PKG_DBDIR.${_pkg_}_not_found
 _BLNK_PKG_INFO.${_pkg_}?=	${TRUE}
 BUILDLINK_PKGNAME.${_pkg_}?=	${_pkg_}
 BUILDLINK_IS_DEPOT.${_pkg_}?=	no
 # Usual systems has builtin packages in /usr
 .    if exists(/usr)
 BUILDLINK_PREFIX.${_pkg_}?=	/usr
 # Haiku OS has posix packages in /boot/sytem/develop (or /boot/common)
 .    elif exists(/boot/system/develop)
 BUILDLINK_PREFIX.${_pkg_}?=	/boot/system/develop
 .    elif exists(/boot/common)
 BUILDLINK_PREFIX.${_pkg_}?=	/boot/common
 .    else
 # XXX: elsewhere?
 BUILDLINK_PREFIX.${_pkg_}?=	# empty
 .    endif
 .    if !empty(LIBABISUFFIX)
 @@ -355,65 +351,53 @@ BUILDLINK_LIBDIRS.${_pkg_}?=	lib${LIBABI
+#
 # Set a default for _BLNK_PKG_DBDIR.<pkg>, which is the directory
 # containing the package metadata.
+#
 .  if !defined(_BLNK_PKG_DBDIR.${_pkg_})
 _BLNK_PKG_DBDIR.${_pkg_}?=	# empty
 .    for _depend_ in ${BUILDLINK_API_DEPENDS.${_pkg_}}
 .      if empty(_BLNK_PKG_DBDIR.${_pkg_}:M*not_found)
 _BLNK_PKG_DBDIR.${_pkg_}!=	\
 	pkg=`${PKG_INFO} -E "${_depend_}" || ${TRUE}`;			\
 	case "$$pkg" in							\
 	"")	dir="_BLNK_PKG_DBDIR.${_pkg_}_not_found" ;;		\
 	*)	dir="${_PKG_DBDIR}/$$pkg";				\
 		if [ -f $$dir/+DEPOT ]; then				\
 			dir=`${HEAD} -1 $$dir/+DEPOT`;			\
 		fi ;;							\
 	esac;								\
 	${ECHO} $$dir
 .      endif
 .    endfor
 .  endif
 .  if empty(_BLNK_PKG_DBDIR.${_pkg_}:M*not_found)
 MAKEVARS+=	_BLNK_PKG_DBDIR.${_pkg_}
 .  endif
 .  if empty(_BLNK_PKG_DBDIR.${_pkg_}:M*not_found)
 _BLNK_PKG_INFO.${_pkg_}?=	${PKG_INFO_CMD} -K ${_BLNK_PKG_DBDIR.${_pkg_}:H}
 .  else
 _BLNK_PKG_INFO.${_pkg_}?=	${PKG_INFO_CMD} -K ${_PKG_DBDIR}
 .  endif
 BUILDLINK_PKGNAME.${_pkg_}?=	${_BLNK_PKG_DBDIR.${_pkg_}:T}
 .  if exists(${_BLNK_PKG_DBDIR.${_pkg_}}/+VIEWS)
 BUILDLINK_IS_DEPOT.${_pkg_}?=	yes
 .  else
 BUILDLINK_IS_DEPOT.${_pkg_}?=	no
 .  endif
+#
 # Set BUILDLINK_PREFIX.<pkg> to the "PREFIX" value for the package.
+#
 .  if !defined(BUILDLINK_PREFIX.${_pkg_})
-.    if !empty(BUILDLINK_IS_DEPOT.${_pkg_}:M[yY][eE][sS])
+.    if empty(BUILDLINK_PKGNAME.${_pkg_}:M*not_found)
 BUILDLINK_PREFIX.${_pkg_}=	${_BLNK_PKG_DBDIR.${_pkg_}}
 .    else
 .      if empty(BUILDLINK_PKGNAME.${_pkg_}:M*not_found)
 BUILDLINK_PREFIX.${_pkg_}!=						\
 	${TRUE} Computing BUILDLINK_PREFIX.${_pkg_:Q};			\
 	${_BLNK_PKG_INFO.${_pkg_}} -qp ${BUILDLINK_PKGNAME.${_pkg_}} |	\
 	${SED}  -e "s,^[^/]*,,;q"
-.      else
+.    else
 BUILDLINK_PREFIX.${_pkg_}=	BUILDLINK_PREFIX.${_pkg_}_not_found
 .      endif
 .    endif
 .  endif
 .  if empty(BUILDLINK_PREFIX.${_pkg_}:M*not_found)
 MAKEVARS+=	BUILDLINK_PREFIX.${_pkg_}
 .  endif
 .  if empty(BUILDLINK_PREFIX.${_pkg_}:N/usr:N/boot/common:N/)
 BUILDLINK_DIR.${_pkg_}=	${BUILDLINK_PREFIX.${_pkg_}}
 .  else
 BUILDLINK_DIR.${_pkg_}= ${BUILDLINK_DIR}
 .  endif
 BUILDLINK_AUTO_VARS.${_pkg_}?=	yes
 @@ -487,35 +471,26 @@ BUILDLINK_LDFLAGS+=	-L${_dir_}
 .  endif
 .  if !empty(BUILDLINK_RPATHDIRS.${_pkg_})
 .    for _dir_ in ${BUILDLINK_RPATHDIRS.${_pkg_}:S/^/${BUILDLINK_PREFIX.${_pkg_}}\//}
 .      if exists(${_dir_})
 .        if empty(BUILDLINK_LDFLAGS:M${COMPILER_RPATH_FLAG}${_dir_})
 BUILDLINK_LDFLAGS+=	${COMPILER_RPATH_FLAG}${_dir_}
 .        endif
 .      endif
 .    endfor
 .  endif
 . endif
 .endfor
+#
 # Add the depot directory library directory for this package to the
 # runtime library search path.
 .if ${PKG_INSTALLATION_TYPE} == "pkgviews"
 .  if empty(BUILDLINK_LDFLAGS:M${COMPILER_RPATH_FLAG}${PREFIX}/lib)
 BUILDLINK_LDFLAGS+=	${COMPILER_RPATH_FLAG}${PREFIX}/lib
 .  endif
 .endif
 # Add the default view library directories to the runtime library search
 # path so that wildcard dependencies on library packages can always be
 # fulfilled through the default view.
+#
 .for _pkg_ in ${_BLNK_PACKAGES}
 .  if !empty(BUILDLINK_RPATHDIRS.${_pkg_})
 .    for _dir_ in ${BUILDLINK_RPATHDIRS.${_pkg_}:S/^/${LOCALBASE}\//}
 .      if exists(${_dir_})
 .        if empty(BUILDLINK_LDFLAGS:M${COMPILER_RPATH_FLAG}${_dir_})
 BUILDLINK_LDFLAGS+=	${COMPILER_RPATH_FLAG}${_dir_}
 .        endif
 .      endif
 .    endfor
 @@ -605,65 +580,57 @@ buildlink-directories:
 # BUILDLINK_FILES.<pkg>
 #	shell glob pattern relative to ${BUILDLINK_PREFIX.<pkg>} to be
 #	symlinked into ${BUILDLINK_DIR}, e.g. include/*.h
+#
 # BUILDLINK_FILES_CMD.<pkg>
 #	shell pipeline that outputs to stdout a list of files relative
 #	to ${BUILDLINK_PREFIX.<pkg>}.  The resulting files are to be
 #	symlinked into ${BUILDLINK_DIR}.  By default, this takes the
 #	+CONTENTS of a <pkg> and filters it through
 #	${BUILDLINK_CONTENTS_FILTER.<pkg>}.
+#
 # BUILDLINK_CONTENTS_FILTER.<pkg>
 #	filter command that filters +CONTENTS input into a list of files
-#	relative to ${BUILDLINK_PREFIX.<pkg>} on stdout.  By default for
+#	relative to ${BUILDLINK_PREFIX.<pkg>} on stdout.  By default,
-#	overwrite packages, BUILDLINK_CONTENTS_FILTER.<pkg> outputs the
+#	BUILDLINK_CONTENTS_FILTER.<pkg> outputs the contents of the include
-#	contents of the include and lib directories in the package
+#	and lib directories in the package +CONTENTS.
 #	+CONTENTS, and for pkgviews packages, it outputs any libtool
 #	archives in lib directories.
+#
 # BUILDLINK_FNAME_TRANSFORM.<pkg>
 #	sed arguments used to transform the name of the source filename
 #	into a destination filename, e.g. -e "s|/curses.h|/ncurses.h|g"
+#
 .for _pkg_ in ${_BLNK_PACKAGES}
 _BLNK_COOKIE.${_pkg_}=		${BUILDLINK_DIR}/.buildlink_${_pkg_}_done
 _BLNK_TARGETS+=			buildlink-${_pkg_}
 _BLNK_TARGETS.${_pkg_}=		buildlink-${_pkg_}-message
 _BLNK_TARGETS.${_pkg_}+=	${_BLNK_COOKIE.${_pkg_}}
 _BLNK_TARGETS.${_pkg_}+=	buildlink-${_pkg_}-cookie
 .PHONY: buildlink-${_pkg_}
 buildlink-${_pkg_}: ${_BLNK_TARGETS.${_pkg_}}
 .PHONY: buildlink-${_pkg_}-message
 buildlink-${_pkg_}-message:
 	${RUN}					\
 	${ECHO_BUILDLINK_MSG} "=> Linking ${_pkg_} files into ${BUILDLINK_DIR}."
 .PHONY: buildlink-${_pkg_}-cookie
 buildlink-${_pkg_}-cookie:
 	${RUN}					\
 	${TOUCH} ${TOUCH_FLAGS} ${_BLNK_COOKIE.${_pkg_}}
 .  if (${PKG_INSTALLATION_TYPE} == "pkgviews") &&			\
       !empty(BUILDLINK_IS_DEPOT.${_pkg_}:M[yY][eE][sS])
 BUILDLINK_CONTENTS_FILTER.${_pkg_}?=					\
 	${EGREP} 'lib(/pkgconfig/.*\.pc$$|.*/lib[^/]*\.la$$)'
 .  else
 BUILDLINK_CONTENTS_FILTER.${_pkg_}?=					\
 	${EGREP} '(include.*/|\.h$$|\.idl$$|\.pc$$|/lib[^/]*\.[^/]*$$)'
 .  endif
 # XXX: Why not pkg_info -qL?
 BUILDLINK_FILES_CMD.${_pkg_}?=						\
 	${_BLNK_PKG_INFO.${_pkg_}} -f ${BUILDLINK_PKGNAME.${_pkg_}} |	\
 	${SED} -n '/File:/s/^[ 	]*File:[ 	]*//p' |		\
 	${BUILDLINK_CONTENTS_FILTER.${_pkg_}} | ${CAT}
 # _BLNK_FILES_CMD.<pkg> combines BUILDLINK_FILES_CMD.<pkg> and
 # BUILDLINK_FILES.<pkg> into one command that outputs all of the files
 # for <pkg> relative to ${BUILDLINK_PREFIX.<pkg>}.
+#
 _BLNK_FILES_CMD.${_pkg_}=	(
 _BLNK_FILES_CMD.${_pkg_}+=	${BUILDLINK_FILES_CMD.${_pkg_}};
 .for _filepattern_ in ${BUILDLINK_FILES.${_pkg_}}
 @@ -732,29 +699,27 @@ ${_BLNK_COOKIE.${_pkg_}}:
 # linking against the libraries pointed to by symlinks in ${BUILDLINK_DIR}.
+#
 _BLNK_LT_ARCHIVE_FILTER.${_pkg_}=	\
 	${SED} ${_BLNK_LT_ARCHIVE_FILTER_SED_SCRIPT.${_pkg_}}
 _BLNK_SEP=	\ \`\"':;,
 _BLNK_LT_ARCHIVE_FILTER_SED_SCRIPT.${_pkg_}=	# empty
+#
 # Modify the dependency_libs line by changing all full paths to other *.la
 # files into the canonical ${BUILDLINK_DIR} path.
+#
 _BLNK_LT_ARCHIVE_FILTER_SED_SCRIPT.${_pkg_}+=				\
 	-e "/^dependency_libs=/s,\([${_BLNK_SEP}]\)/usr\(/lib${LIBABISUFFIX}/[^${_BLNK_SEP}]*lib[^/${_BLNK_SEP}]*\.la[${_BLNK_SEP}]\),\\1${_BLNK_MANGLE_DIR.${BUILDLINK_DIR}}\\2,g" \
-	-e "/^dependency_libs=/s,\([${_BLNK_SEP}]\)/usr\(/lib${LIBABISUFFIX}/[^${_BLNK_SEP}]*lib[^/${_BLNK_SEP}]*\.la[${_BLNK_SEP}]\),\\1${_BLNK_MANGLE_DIR.${BUILDLINK_DIR}}\\2,g" \
+	-e "/^dependency_libs=/s,\([${_BLNK_SEP}]\)/usr\(/lib${LIBABISUFFIX}/[^${_BLNK_SEP}]*lib[^/${_BLNK_SEP}]*\.la[${_BLNK_SEP}]\),\\1${_BLNK_MANGLE_DIR.${BUILDLINK_DIR}}\\2,g"
 	-e "/^dependency_libs=/s,\([${_BLNK_SEP}]\)${DEPOTBASE}/[^/${_BLNK_SEP}]*\(/[^${_BLNK_SEP}]*lib[^/${_BLNK_SEP}]*\.la[${_BLNK_SEP}]\),\\1${_BLNK_MANGLE_DIR.${BUILDLINK_DIR}}\\2,g" \
 	-e "/^dependency_libs=/s,\([${_BLNK_SEP}]\)${DEPOTBASE}/[^/${_BLNK_SEP}]*\(/[^${_BLNK_SEP}]*lib[^/${_BLNK_SEP}]*\.la[${_BLNK_SEP}]\),\\1${_BLNK_MANGLE_DIR.${BUILDLINK_DIR}}\\2,g"
 .if ${X11_TYPE} != "modular" && ${X11BASE} != "/usr"
 _BLNK_LT_ARCHIVE_FILTER_SED_SCRIPT.${_pkg_}+=				\
 	-e "/^dependency_libs=/s,\([${_BLNK_SEP}]\)${X11BASE}\(/[^${_BLNK_SEP}]*lib[^/${_BLNK_SEP}]*\.la[${_BLNK_SEP}]\),\\1${_BLNK_MANGLE_DIR.${BUILDLINK_X11_DIR}}\\2,g" \
 	-e "/^dependency_libs=/s,\([${_BLNK_SEP}]\)${X11BASE}\(/[^${_BLNK_SEP}]*lib[^/${_BLNK_SEP}]*\.la[${_BLNK_SEP}]\),\\1${_BLNK_MANGLE_DIR.${BUILDLINK_X11_DIR}}\\2,g"
 .endif
 _BLNK_LT_ARCHIVE_FILTER_SED_SCRIPT.${_pkg_}+=				\
 	-e "/^dependency_libs=/s,\([${_BLNK_SEP}]\)${LOCALBASE}\(/[^${_BLNK_SEP}]*lib[^/${_BLNK_SEP}]*\.la[${_BLNK_SEP}]\),\\1${_BLNK_MANGLE_DIR.${BUILDLINK_DIR}}\\2,g" \
 	-e "/^dependency_libs=/s,\([${_BLNK_SEP}]\)${LOCALBASE}\(/[^${_BLNK_SEP}]*lib[^/${_BLNK_SEP}]*\.la[${_BLNK_SEP}]\),\\1${_BLNK_MANGLE_DIR.${BUILDLINK_DIR}}\\2,g"
+#
 # Modify the dependency_libs line by removing -L/usr/lib, which is implied.
 @@ -788,39 +753,35 @@ _BLNK_LT_ARCHIVE_FILTER_SED_SCRIPT.${_pk
 .endif
+#
 # Modify the dependency_libs line by cleaning up any leading and trailing
 # whitespace.
+#
 _BLNK_LT_ARCHIVE_FILTER_SED_SCRIPT.${_pkg_}+=				\
 	-e "/^dependency_libs=/s,^\(dependency_libs='\) *,\\1,g"	\
 	-e "/^dependency_libs=/s, *'$$,',g"
+#
 # Modify the libdir line to point to within ${BUILDLINK_DIR}.
 # This prevents libtool from looking into the original directory
 # for other *.la files.
+#
 .  if (${PKG_INSTALLATION_TYPE} == "overwrite") ||			\
       !empty(BUILDLINK_IS_DEPOT.${_pkg_}:M[nN][oO])
 _BLNK_LT_ARCHIVE_FILTER_SED_SCRIPT.${_pkg_}+=				\
-	-e "/^libdir=/s,/usr\(/lib${LIBABISUFFIX}/[^${_BLNK_SEP}]*\),${BUILDLINK_DIR}\\1,g" \
+	-e "/^libdir=/s,/usr\(/lib${LIBABISUFFIX}/[^${_BLNK_SEP}]*\),${BUILDLINK_DIR}\\1,g"
 	-e "/^libdir=/s,${DEPOTBASE}/[^/${_BLNK_SEP}]*\(/[^${_BLNK_SEP}]*\),${BUILDLINK_DIR}\\1,g"
 _BLNK_LT_ARCHIVE_FILTER_SED_SCRIPT.${_pkg_}+=				\
 	-e "/^libdir=/s,${LOCALBASE}\(/[^${_BLNK_SEP}]*\),${BUILDLINK_DIR}\\1,g"
-.    if ${X11_TYPE} != "modular" && ${X11BASE} != "/usr"
+.  if ${X11_TYPE} != "modular" && ${X11BASE} != "/usr"
 _BLNK_LT_ARCHIVE_FILTER_SED_SCRIPT.${_pkg_}+=				\
 	-e "/^libdir=/s,${X11BASE}\(/[^${_BLNK_SEP}]*\),${BUILDLINK_X11_DIR}\\1,g"
 .    endif
 .  endif
 .endfor
 # Include any BUILDLINK_TARGETS provided in buildlink3.mk files in
 # _BLNK_TARGETS.
+#
 _BLNK_TARGETS+=	${BUILDLINK_TARGETS}
 # Add each of the targets in _BLNK_TARGETS as a prerequisite for the
 # do-buildlink target.  This ensures that all the buildlink magic happens
 # before any configure or build commands are called.
+#
 .for _target_ in ${_BLNK_TARGETS}
 @@ -830,65 +791,48 @@ do-buildlink: ${_target_}
 # _BLNK_PASSTHRU_DIRS contains the list of directories which we allow in
 #	preprocessor's header, linker's library, or the runtime library
 #	search paths.  The values of this list represent entire directory
 #	trees under each named directory.  Package makefiles may add to
 #	its value through ${BUILDLINK_PASSTHRU_DIRS}.
+#
 # _BLNK_PASSTHRU_RPATHDIRS contains an extra list of directories which we
 #	allow in the runtime library search paths.  Package makefiles may
 #	add to its value through ${BUILDLINK_PASSTHRU_RPATHDIRS}.
+#
 _BLNK_PASSTHRU_DIRS=		# empty
 _BLNK_PASSTHRU_RPATHDIRS=	# empty
+#
 # Allow all of the depot directories for packages whose headers and
 # libraries we use.
 .for _pkg_ in ${_BLNK_PACKAGES}
 .  if !empty(BUILDLINK_IS_DEPOT.${_pkg_}:M[yY][eE][sS])
 _BLNK_PASSTHRU_DIRS+=	${BUILDLINK_PREFIX.${_pkg_}}
 .  endif
 .endfor
 # Allow the depot directory for the package we're building.
 .if ${PKG_INSTALLATION_TYPE} == "pkgviews"
 _BLNK_PASSTHRU_DIRS+=	${PREFIX}
 .endif
 # Allow any directories specified by the package or user.
+#
 _BLNK_PASSTHRU_DIRS+=	${BUILDLINK_PASSTHRU_DIRS}
+#
 # Strip out ${COMPILER_LIB_DIRS}, and ${COMPILER_INCLUDE_DIRS} as they're always
 # automatically added to all of the search paths.  Also strip out
 # ${LOCALBASE} and ${X11BASE} to prevent silly mistakes.
+#
 .for _dir_ in ${COMPILER_LIB_DIRS} ${COMPILER_INCLUDE_DIRS} ${LOCALBASE} ${X11BASE}
 _BLNK_PASSTHRU_DIRS:=	${_BLNK_PASSTHRU_DIRS:N${_dir_}}
 .endfor
+#
 # Allow all directories in the library subdirectories listed for each
 # package to be in the runtime library search path.
+#
 .for _pkg_ in ${_BLNK_PACKAGES}
-.  if !empty(BUILDLINK_IS_DEPOT.${_pkg_}:M[nN][oO])
+.  if !empty(BUILDLINK_LIBDIRS.${_pkg_})
-.    if !empty(BUILDLINK_LIBDIRS.${_pkg_})
+.    for _dir_ in ${BUILDLINK_LIBDIRS.${_pkg_}}
-.      for _dir_ in ${BUILDLINK_LIBDIRS.${_pkg_}}
+.      if exists(${BUILDLINK_PREFIX.${_pkg_}}/${_dir_})
 .        if exists(${BUILDLINK_PREFIX.${_pkg_}}/${_dir_})
 _BLNK_PASSTHRU_RPATHDIRS+=	${BUILDLINK_PREFIX.${_pkg_}}/${_dir_}
-.        endif
+.      endif
-.      endfor
+.    endfor
 .    endif
 .  endif
 .endfor
+#
 # Always allow ${LOCALBASE}/lib in the runtime library search path so
 # that wildcard dependencies work correctly when installing from binary
 # packages.
+#
 _BLNK_PASSTHRU_RPATHDIRS+=	${LOCALBASE}/lib
+#
 # Allow ${X11BASE}/lib in the runtime library search path for USE_X11
 # packages so that X11 libraries can be found.
+#
 .if defined(USE_X11) && ${X11_TYPE} != "modular"
 @@ -906,58 +850,52 @@ _BLNK_PASSTHRU_RPATHDIRS+=	${BUILDLINK_P
 _BLNK_PASSTHRU_RPATHDIRS:=	${_BLNK_PASSTHRU_RPATHDIRS:N${_dir_}}
 .endfor
 _BLNK_MANGLE_DIRS=	# empty
 _BLNK_MANGLE_DIRS+=	${BUILDLINK_DIR}
 .if ${X11_TYPE} != "modular"
 _BLNK_MANGLE_DIRS+=	${BUILDLINK_X11_DIR}
 .endif
 _BLNK_MANGLE_DIRS+=	${WRKDIR}
 _BLNK_MANGLE_DIRS+=	${_BLNK_PASSTHRU_DIRS}
 _BLNK_MANGLE_DIRS+=	${_BLNK_PASSTHRU_RPATHDIRS}
 _BLNK_MANGLE_DIRS+=	${COMPILER_INCLUDE_DIRS}
 _BLNK_MANGLE_DIRS+=	${COMPILER_LIB_DIRS}
 .if ${PKG_INSTALLATION_TYPE} == "pkgviews"
 _BLNK_MANGLE_DIRS+=	${PREFIX}
 .endif
 _BLNK_MANGLE_DIRS+=	${LOCALBASE}
 .if defined(USE_X11) && ${X11_TYPE} != "modular"
 _BLNK_MANGLE_DIRS+=	${X11BASE}
 .endif
 _BLNK_MANGLE_START=	_bUiLdLiNk_
 _BLNK_MANGLE_END=	\#
 .for _dir_ in ${_BLNK_MANGLE_DIRS}
 _BLNK_MANGLE_DIR.${_dir_}=	\
 	${_BLNK_MANGLE_START}${_dir_:S/\//_/g}${_BLNK_MANGLE_END}
 .endfor
 _BLNK_MANGLE_SED_PATTERN=	\
 	${_BLNK_MANGLE_START}[^/ 	${_BLNK_MANGLE_END}]*${_BLNK_MANGLE_END}
 _BLNK_PROTECT_DIRS=	# empty
 _BLNK_UNPROTECT_DIRS=	# empty
 _BLNK_PROTECT_DIRS+=	${BUILDLINK_DIR}
 .if ${X11_TYPE} != "modular"
 _BLNK_PROTECT_DIRS+=	${BUILDLINK_X11_DIR}
 .endif
 _BLNK_PROTECT_DIRS+=	${WRKDIR}
 _BLNK_PROTECT_DIRS+=	${_BLNK_PASSTHRU_DIRS}
 _BLNK_UNPROTECT_DIRS+=	${COMPILER_INCLUDE_DIRS}
 _BLNK_UNPROTECT_DIRS+=	${COMPILER_LIB_DIRS}
 .if ${PKG_INSTALLATION_TYPE} == "pkgviews"
 _BLNK_UNPROTECT_DIRS+=	${PREFIX}
 .endif
 _BLNK_UNPROTECT_DIRS+=	${LOCALBASE}
 .if defined(USE_X11) && ${X11_TYPE} != "modular"
 _BLNK_UNPROTECT_DIRS+=	${X11BASE}
 .endif
 _BLNK_UNPROTECT_DIRS+=	${_BLNK_PASSTHRU_DIRS}
 _BLNK_UNPROTECT_DIRS+=	${WRKDIR}
 .if ${X11_TYPE} != "modular"
 _BLNK_UNPROTECT_DIRS+=	${BUILDLINK_X11_DIR}
 .endif
 _BLNK_UNPROTECT_DIRS+=	${BUILDLINK_DIR}
 # Resolve some important directories to their phyiscal paths as symlinks
 # tend to confuse buildlink3.
 @@ -1045,82 +983,67 @@ _CWRAPPERS_TRANSFORM+=	R:${BUILDLINK_X11
 .for _dir_ in ${_BLNK_PASSTHRU_DIRS} ${_BLNK_PASSTHRU_RPATHDIRS}
 _BLNK_TRANSFORM+=	rpath:${_dir_}:${_BLNK_MANGLE_DIR.${_dir_}}
 _CWRAPPERS_TRANSFORM+=	R:${_dir_}:${_dir_}
 .endfor
+#
 # Protect /usr/lib/* as they're all allowed to be specified for the
 # runtime library search path.
+#
 .for _dir_ in ${SYSTEM_DEFAULT_RPATH:S/:/ /g}
 _BLNK_TRANSFORM+=	sub-rpath:${_dir_}:${_BLNK_MANGLE_DIR.${_dir}}
 _CWRAPPERS_TRANSFORM+=	R:/usr/lib:/usr/lib
 .endfor
+#
 # Change references to ${DEPOTBASE}/<pkg> into ${LOCALBASE} so that
 # "overwrite" packages think headers and libraries for "pkgviews" packages
 # are just found in the default view.
 .if ${PKG_INSTALLATION_TYPE} == "overwrite"
 _BLNK_TRANSFORM+=	depot:${DEPOTBASE}:${LOCALBASE}
 .endif
 # Convert direct paths to static libraries and libtool archives in
 # ${LOCALBASE} or ${X11BASE} into references into ${BUILDLINK_DIR}.
+#
 .if ${PKG_INSTALLATION_TYPE} == "overwrite"
 _BLNK_TRANSFORM+=	P:${LOCALBASE}:${_BLNK_MANGLE_DIR.${BUILDLINK_DIR}}
 _CWRAPPERS_TRANSFORM+=	P:${X11BASE}:${BUILDLINK_X11_DIR}
-.  if defined(USE_X11) && ${X11_TYPE} != "modular"
+.if defined(USE_X11) && ${X11_TYPE} != "modular"
 _BLNK_TRANSFORM+=	P:${X11BASE}:${_BLNK_MANGLE_DIR.${BUILDLINK_X11_DIR}}
 _CWRAPPERS_TRANSFORM+=	P:${LOCALBASE}:${BUILDLINK_DIR}
 .  endif
 .endif
+#
 # Transform references to ${X11BASE} into ${BUILDLINK_X11_DIR}.
 # (do so before transforming references to ${LOCALBASE} unless the
 # ${X11BASE} path is contained in ${LOCALBASE}'s path)
+#
 .if defined(USE_X11) && empty(LOCALBASE:M${X11BASE}*) && ${X11_TYPE} != "modular"
 _BLNK_TRANSFORM+=       I:${X11BASE}:${_BLNK_MANGLE_DIR.${BUILDLINK_X11_DIR}}
 _BLNK_TRANSFORM+=       L:${X11BASE}:${_BLNK_MANGLE_DIR.${BUILDLINK_X11_DIR}}
 _CWRAPPERS_TRANSFORM+=       I:${X11BASE}:${BUILDLINK_X11_DIR}
 _CWRAPPERS_TRANSFORM+=       L:${X11BASE}:${BUILDLINK_X11_DIR}
 .endif
+#
 # Transform references to ${LOCALBASE} into ${BUILDLINK_DIR}.
+#
 .if ${PKG_INSTALLATION_TYPE} == "overwrite"
 _BLNK_TRANSFORM+=	I:${LOCALBASE}:${_BLNK_MANGLE_DIR.${BUILDLINK_DIR}}
 _BLNK_TRANSFORM+=	L:${LOCALBASE}:${_BLNK_MANGLE_DIR.${BUILDLINK_DIR}}
 _CWRAPPERS_TRANSFORM+=	I:${LOCALBASE}:${BUILDLINK_DIR}
 _CWRAPPERS_TRANSFORM+=	L:${LOCALBASE}:${BUILDLINK_DIR}
 .endif
+#
 # Transform references to ${X11BASE} into ${BUILDLINK_X11_DIR}.
 # (do so only after transforming references to ${LOCALBASE} if the
 # ${X11BASE} path is contained in ${LOCALBASE}'s path)
+#
 .if defined(USE_X11) && !empty(LOCALBASE:M${X11BASE}*) && ${X11_TYPE} != "modular"
 _BLNK_TRANSFORM+=	I:${X11BASE}:${_BLNK_MANGLE_DIR.${BUILDLINK_X11_DIR}}
 _BLNK_TRANSFORM+=	L:${X11BASE}:${_BLNK_MANGLE_DIR.${BUILDLINK_X11_DIR}}
 _CWRAPPERS_TRANSFORM+=	I:${X11BASE}:${BUILDLINK_X11_DIR}
 _CWRAPPERS_TRANSFORM+=	L:${X11BASE}:${BUILDLINK_X11_DIR}
 .endif
+#
-# Protect any remaining references to ${PREFIX}, ${LOCALBASE}, or ${X11BASE}.
+# Protect any remaining references to ${LOCALBASE}, or ${X11BASE}.
+#
 .if ${PKG_INSTALLATION_TYPE} == "pkgviews"
 _BLNK_TRANSFORM+=	untransform:sub-mangle:${PREFIX}:${_BLNK_MANGLE_DIR.${PREFIX}}
 .endif
 _BLNK_TRANSFORM+=	untransform:sub-mangle:${LOCALBASE}:${_BLNK_MANGLE_DIR.${LOCALBASE}}
 .if defined(USE_X11) && ${X11_TYPE} != "modular"
 _BLNK_TRANSFORM+=	untransform:sub-mangle:${X11BASE}:${_BLNK_MANGLE_DIR.${X11BASE}}
 .endif
+#
 # Explicitly remove everything else that's an absolute path, since we've
 # already protected the ones we care about.
+#
 _BLNK_TRANSFORM+=       no-abspath
+#
 # Undo the protection for the directories that we allow to be specified
 # for the runtime library search path.
+#
 @@ -1193,27 +1116,26 @@ _BLNK_LDFLAGS=			-L${BUILDLINK_DIR}/lib
 _WRAP_EXTRA_ARGS.CC+=		${_BLNK_CPPFLAGS} ${_BLNK_LDFLAGS}
 _WRAP_EXTRA_ARGS.CXX+=		${_BLNK_CPPFLAGS} ${_BLNK_LDFLAGS}
 _WRAP_EXTRA_ARGS.CPP+=		${_BLNK_CPPFLAGS}
 _WRAP_EXTRA_ARGS.FC+=		${_BLNK_CPPFLAGS} ${_BLNK_LDFLAGS}
 _WRAP_EXTRA_ARGS.LD+=		${_BLNK_LDFLAGS}
 _WRAP_EXTRA_ARGS.LIBTOOL+=	${_BLNK_LDFLAGS}
 _WRAP_EXTRA_ARGS.SHLIBTOOL+=	${_BLNK_LDFLAGS}
 ${WRAPPER_TMPDIR}/libtool-fix-la: ${BUILDLINK_SRCDIR}/libtool-fix-la
 	${RUN}${MKDIR} ${.TARGET:H}
 	${RUN}${CAT} ${.ALLSRC}			\
 		| ${SED} -e "s|@_BLNK_WRAP_LT_UNTRANSFORM_SED@|"${_BLNK_WRAP_LT_UNTRANSFORM_SED:Q}"|g" \
 			 -e "s|@BUILDLINK_DIR@|${BUILDLINK_DIR}|g"	\
 			 -e "s|@DEPOTBASE@|${DEPOTBASE}|g"		\
 			 -e "s|@LOCALBASE@|${LOCALBASE}|g"		\
 			 -e "s|@WRKSRC@|${WRKSRC}|g"			\
 			 -e "s|@BASENAME@|"${BASENAME:Q}"|g"		\
 			 -e "s|@DIRNAME@|"${DIRNAME:Q}"|g"		\
 			 -e "s|@EGREP@|"${EGREP:Q}"|g"			\
 			 -e "s|@MV@|"${MV:Q}"|g"			\
 			 -e "s|@PWD@|"${PWD_CMD:Q}"|g"			\
 			 -e "s|@RM@|"${RM:Q}"|g"			\
 		| ${_WRAP_SH_CRUNCH_FILTER} > ${.TARGET}
 ${WRAPPER_TMPDIR}/buildcmd-libtool: ${BUILDLINK_SRCDIR}/buildcmd-libtool
 	${RUN}${MKDIR} ${.TARGET:H}
 	${RUN}${CAT} ${.ALLSRC}			\

--- pkgsrc/mk/buildlink3/libtool-fix-la 2006/11/09 02:07:59 1.8
+++ pkgsrc/mk/buildlink3/libtool-fix-la 2014/12/30 15:13:19 1.9

 @@ -1,14 +1,14 @@
-# $NetBSD: libtool-fix-la,v 1.8 2006/11/09 02:07:59 rillig Exp $
+# $NetBSD: libtool-fix-la,v 1.9 2014/12/30 15:13:19 wiz 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
 @@ -36,33 +36,29 @@
 # For *.la files, in the "relink_command" line, we make the following
 # replacements:
+#
 #       "libfoo.la" -> "-L./.libs libfoo.la"
 #	"dirpath/libfoo.la" -> "-Ldirpath/.libs libfoo.la"
+#
 # This allows the libraries to be found within ${WRKSRC} during
 # relinking.  We rely on the proper rpath settings to be set by libtool.
+#
 # For the *.lai files, in the "dependency_libs" line, we remove
 # redundant -Ldir and -llib options.  We also make sure that we don't
 # ever reference other .la files, only referring to other libraries
-# via the usual "-L/path -llib" and making sure that /path is always
+# via the usual "-L/path -llib".
 # somewhere under the default view.  This makes wildcard dependencies
 # work for "overwrite" packages by letting libtool find libraries in
 # the default view.
 BUILDLINK_DIR="@BUILDLINK_DIR@"
 DEPOTBASE="@DEPOTBASE@"
 LOCALBASE="@LOCALBASE@"
 WRKSRC="@WRKSRC@"
 basename="@BASENAME@"
 dirname="@DIRNAME@"
 egrep="@EGREP@"
 mv="@MV@"
 pwd="@PWD@"
 rm="@RM@"
 wrksrc_physical=`cd ${WRKSRC}; $pwd`
 labase=`$basename $lafile .la`
 ladir=`$dirname $lafile`
 @@ -247,79 +243,60 @@ if $test -f $lafile; then
 				# "-lm -lm" becomes just "-lm".
 				######################################
 				$prev)
 					;;
 				######################################
 				# Skip all -R* options... rpath info
 				# shouldn't go into the dependency_libs
 				# line.
 				######################################
 				-R*)
 					;;
 				######################################
 				# Skip directories that should never
-				# appear in the -L<dir> flags.  Also
+				# appear in the -L<dir> flags.
 				# modify directories in ${DEPOTBASE} to
 				# point to somewhere in the default view
 				# ${LOCALBASE}, since we want "overwrite"
 				# packages to think the libraries really
 				# do just exist through the default view.
 				######################################
 				-L*)
 					case $i in
 					-L${BUILDLINK_DIR}/*)
 						;;
 					-L${WRKSRC}|-L${WRKSRC}/*)
 						;;
 					-L${DEPOTBASE}/*)
 						i=`$echo "$i" | $sed -e "s,-L${DEPOTBASE}/[^/]*/,-L${LOCALBASE}/,"`
 						case $L in
 						*"$i "*) ;;
 						*"$i") ;;
 						*) L="$L $i" ;;
 						esac
 						;;
 					*)
 						case $L in
 						*"$i "*) ;;
 						*"$i") ;;
 						*) L="$L $i" ;;
 						esac
 						;;
 					esac
 					;;
 				######################################
 				# Libraries really do exist, so we want
 				# to keep any -L<dir> flags we've seen
 				# in the generated dependency_libs line.
 				######################################
 				-l*)
 					lexist=1
 					l="$l $i"
 					;;
 				######################################
 				# Libtool archives should be changed from
 				# "/path/libfoo.la" to "-L/path -lfoo",
-				# where /path is appropriately modified
+				# This works correctly with wildcard
 				# so that the depot directory is changed
 				# to the views directory.  This allows
 				# the .la files to be used by either
 				# "overwrite" or "pkgviews" packages and
 				# works correctly with wildcard
 				# dependencies.
 				######################################
 				*.la)
-					dirbase=`$dirname $i`
+					dir=`$dirname $i`
 					dir=`$echo "X$dirbase" | $Xsed -e "s,^${DEPOTBASE}/[^/]*/,${LOCALBASE}/,"`
 					case $L in
 					*"-L$dir "*) ;;
 					*"-L$dir") ;;
 					*) L="$L -L$dir" ;;
 					esac
 					libbase=`$basename $i .la`
 					lib="${libbase#lib}"
 					lexist=1
 					l="$l -l$lib"
 					deps_ok=no
 					;;
 				######################################
 				# Everything else Just Belongs.

--- pkgsrc/mk/defaults/mk.conf 2014/12/10 12:28:49 1.251
+++ pkgsrc/mk/defaults/mk.conf 2014/12/30 15:13:19 1.252

 @@ -1,14 +1,14 @@
-# $NetBSD: mk.conf,v 1.251 2014/12/10 12:28:49 wiz Exp $
+# $NetBSD: mk.conf,v 1.252 2014/12/30 15:13:19 wiz Exp $
+#
 # This file provides default values for variables that may be overridden
 # in the MAKECONF file, which is /etc/mk.conf by default.
+#
 # Note: This file is included after the MAKECONF file, so you cannot query
 # these default values in the MAKECONF using the ".if" and ".for"
 # preprocessing directives.
 # ************************************************************************
 # NOTE TO PEOPLE EDITING THIS FILE - USE LEADING SPACES, NOT LEADING TABS.
 # ************************************************************************
 @@ -388,32 +388,26 @@ FETCH_USING?=	auto
 #FIX_SYSTEM_HEADERS=
 # Make pkgtools/posix_headers an automatic build dependency for all
 # packages except those in the pkgtools category.
 # Possible: "yes", not defined
 # Default: not defined
 LIBTOOLIZE_PLIST?=	yes
 # This determines whether to expand libtool archives (.la files) in PLISTs
 # into the represented library names.
 # Possible: yes, no
 # Default: yes
 PKG_INSTALLATION_PREFS?= overwrite pkgviews
 # This is a whitespace-separated list of installation types to try when
 # building a package, in order of preference.
 # Possible: any of: overwrite, pkgviews
 # Default: overwrite pkgviews
 PKG_RESUME_TRANSFERS?=	NO
 # Used in pkgsrc to resume transfers, if enabled the whole file won't be
 # downloaded from scratch again.
 # Possible: yes or no.
 # Default: no.
 PKG_SYSCONFBASE?= ${PREFIX}/etc
 # This is the main config directory under which all package configuration
 # files should be found.
 # Possible: any path you like
 # Default: ${PREFIX}/etc
 #INIT_SYSTEM=

--- pkgsrc/mk/help/directories.help 2008/01/19 22:41:48 1.1
+++ pkgsrc/mk/help/directories.help 2014/12/30 15:13:19 1.2

	@@ -1,31 +1,30 @@		@@ -1,31 +1,30 @@
1	# $NetBSD: directories.help,v 1.1 2008/01/19 22:41:48 rillig Exp $	1	# $NetBSD: directories.help,v 1.2 2014/12/30 15:13:19 wiz Exp $
2	#	2	#
3	# This file contains some short documentation on the directories that	3	# This file contains some short documentation on the directories that
4	# are used within pkgsrc.	4	# are used within pkgsrc.
5		5
6	# PREFIX	6	# PREFIX
7	# This is the directory where the package should install its	7	# This is the directory where the package should install its
8	# files. The actual value depends on the variables	8	# files. The actual value depends on the variables
9	# PKG_INSTALLATION_TYPE, USE_X11BASE and USE_CROSSBASE.	9	# USE_X11BASE and USE_CROSSBASE.
10	#	10	#
11	# Tags: read-only, system-defined, non-overridable, etc.	11	# Tags: read-only, system-defined, non-overridable, etc.
12	#	12	#
13	# See also:	13	# See also:
14	# CROSSBASE,	14	# CROSSBASE,
15	# INSTALLATION_PREFIX,	15	# INSTALLATION_PREFIX,
16	# LOCALBASE,	16	# LOCALBASE,
17	# X11PREFIX,	17	# X11PREFIX.
18	# PKG_INSTALLATION_TYPE.
19	#	18	#
20		19
21	# LOCALBASE	20	# LOCALBASE
22	# This is the directory where all packages are usually installed.	21	# This is the directory where all packages are usually installed.
23	# It is set by the user, and packages must not modify it.	22	# It is set by the user, and packages must not modify it.
24	#	23	#
25		24
26	# PKG_SYSCONFBASE	25	# PKG_SYSCONFBASE
27	# PKG_SYSCONFDIR.*	26	# PKG_SYSCONFDIR.*
28	# These variables may be set in mk.conf to control where the	27	# These variables may be set in mk.conf to control where the
29	# configuration files are put.	28	# configuration files are put.
30	#	29	#
31	# See also: guide:faq.html#faq.conf	30	# See also: guide:faq.html#faq.conf
	@@ -35,27 +34,26 @@		@@ -35,27 +34,26 @@
35	# This variable can be set by packages to select the variable	34	# This variable can be set by packages to select the variable
36	# which can then be overridden in mk.conf to change the directory	35	# which can then be overridden in mk.conf to change the directory
37	# where the configuration files go.	36	# where the configuration files go.
38	#	37	#
39	# Default value: ${PKGBASE}	38	# Default value: ${PKGBASE}
40	#	39	#
41		40
42	# PKG_SYSCONFDIR	41	# PKG_SYSCONFDIR
43	# This is the directory where the current package should install	42	# This is the directory where the current package should install
44	# its configuration files. It may be changed by the package to	43	# its configuration files. It may be changed by the package to
45	# point to a subdirectory of PKG_SYSCONFBASE.	44	# point to a subdirectory of PKG_SYSCONFBASE.
46	#	45	#
47		46
48	# TODO:PKG_SYSCONFDEPOTBASE
49	# TODO:PKG_SYSCONFBASEDIR	47	# TODO:PKG_SYSCONFBASEDIR
50	#	48	#
51		49
52	# PKGDIR	50	# PKGDIR
53	# The directory where the various files that define a package are	51	# The directory where the various files that define a package are
54	# read from. These are:	52	# read from. These are:
55	#	53	#
56	# * DESCR	54	# * DESCR
57	# * HEADER, HEADER_TEMPLATES	55	# * HEADER, HEADER_TEMPLATES
58	# * INSTALL, DEINSTALL	56	# * INSTALL, DEINSTALL
59	# * MESSAGE, MESSAGE.*	57	# * MESSAGE, MESSAGE.*
60	# * PLIST, PLIST.*	58	# * PLIST, PLIST.*
61	# * distinfo	59	# * distinfo

--- pkgsrc/mk/misc/can-be-built-here.mk 2008/11/05 08:24:23 1.6
+++ pkgsrc/mk/misc/can-be-built-here.mk 2014/12/30 15:13:19 1.7

 @@ -1,14 +1,14 @@
-# $NetBSD: can-be-built-here.mk,v 1.6 2008/11/05 08:24:23 rillig Exp $
+# $NetBSD: can-be-built-here.mk,v 1.7 2014/12/30 15:13:19 wiz Exp $
+#
 # This file checks whether a package can be built in the current pkgsrc
 # environment. It checks the following variables:
+#
 # * NOT_FOR_COMPILER, ONLY_FOR_COMPILER
 # * NOT_FOR_PLATFORM, ONLY_FOR_PLATFORM
 # * NOT_FOR_BULK_PLATFORM
 # * NOT_FOR_UNPRIVILEGED, ONLY_FOR_UNPRIVILEGED
 # * PKG_FAIL_REASON, PKG_SKIP_REASON
+#
 # It also depends on the following internal variables:
+#
 # NO_SKIP
 @@ -119,37 +119,26 @@ _CBBH.fail=		yes
 .if defined(PKG_FAIL_REASON) && !empty(PKG_FAIL_REASON)
 _CBBH.fail=		no
 .endif
 # Check PKG_SKIP_REASON
 _CBBH_CHECKS+=		skip
 _CBBH_MSGS.skip=	"This package has set PKG_SKIP_REASON:" ${PKG_SKIP_REASON}
 _CBBH.skip=		yes
 .if defined(PKG_SKIP_REASON) && !empty(PKG_SKIP_REASON)
 _CBBH.skip=		no
 .endif
 # Check PKG_INSTALLATION_TYPES
 _CBBH_CHECKS+=		pkgviews
 _CBBH_MSGS.pkgviews=	"This package is not available for pkgviews."
 _CBBH.pkgviews=		yes
 .if ${PKG_INSTALLATION_PREFS} == "pkgviews overwrite"
 .  if empty(PKG_INSTALLATION_TYPES:Mpkgviews)
 _CBBH.pkgviews=		no
 .  endif
 .endif
 # Collect and combine the results
 _CBBH=			yes
 _CBBH_MSGS=		# none
 .for c in ${_CBBH_CHECKS}
 .  if ${_CBBH.${c}} != "yes"
 _CBBH=			no
 _CBBH_MSGS+=		${_CBBH_MSGS.${c}}
 .  endif
 .endfor
 # In the first line, this target prints either "yes" or "no", saying
 # whether this package can be built. If the package can not be built,
 # the reasons are given in the following lines.

--- pkgsrc/mk/pkgformat/README 2011/10/15 00:23:09 1.1
+++ pkgsrc/mk/pkgformat/README 2014/12/30 15:13:19 1.2

 @@ -1,14 +1,14 @@
-$NetBSD: README,v 1.1 2011/10/15 00:23:09 reed Exp $
+$NetBSD: README,v 1.2 2014/12/30 15:13:19 wiz 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''.
 @@ -28,27 +28,26 @@ variables.)
 === Packaging commands ===
 The following variables all refer to shell commands, which must accept
 some command line options that are detailed in the respective man pages.
 (TODO: Find out which command line options are really used and which
 ones are useful. Document them.)
 * PKG_ADD
 * PKG_ADMIN
 * PKG_CREATE
 * PKG_DELETE
 * PKG_INFO
 * PKG_VIEW
 * LINKFARM
 * PKG_BEST_EXISTS
 The following variables must be defined so that they can be used in
 shell commands. They may contain references to all other variables.
 * PKG_FILELIST_CMD
 XXX: Why isn't this variable in the previous list?
 == Make targets ==
 The following make targets must be implemented:

--- pkgsrc/mk/pkgformat/pkg/package.mk 2014/12/07 05:09:02 1.6
+++ pkgsrc/mk/pkgformat/pkg/package.mk 2014/12/30 15:13:20 1.7

 @@ -1,14 +1,14 @@
-# $NetBSD: package.mk,v 1.6 2014/12/07 05:09:02 obache Exp $
+# $NetBSD: package.mk,v 1.7 2014/12/30 15:13:20 wiz 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}
 @@ -58,29 +58,26 @@ stage-package-create:	package-create
 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"
 _PKG_ARGS_PACKAGE+=	-u ${REAL_ROOT_USER} -g ${REAL_ROOT_GROUP}
 .  endif
 .endif
 .if ${PKG_INSTALLATION_TYPE} == "pkgviews"
 _PKG_ARGS_PACKAGE+=	-E
 .endif
 ${STAGE_PKGFILE}: ${_CONTENTS_TARGETS}
 	${RUN} ${MKDIR} ${.TARGET:H}
 	@${STEP_MSG} "Creating binary package ${.TARGET}"
 	${RUN} tmpname=${.TARGET:S,${PKG_SUFX}$,.tmp${PKG_SUFX},};	\
 	if ${PKG_CREATE} ${_PKG_ARGS_PACKAGE} "$$tmpname"; then		\
 		${MV} -f "$$tmpname" ${.TARGET};			\
 	else								\
 		exitcode=$$?; ${RM} -f "$$tmpname"; exit $$exitcode;	\
 	fi
 .if ${PKGFILE} != ${STAGE_PKGFILE}
 ${PKGFILE}: ${STAGE_PKGFILE}

--- pkgsrc/mk/pkgformat/pkg/pkgformat-vars.mk 2014/12/08 02:43:25 1.4
+++ pkgsrc/mk/pkgformat/pkg/pkgformat-vars.mk 2014/12/30 15:13:20 1.5

 @@ -1,50 +1,44 @@
-# $NetBSD: pkgformat-vars.mk,v 1.4 2014/12/08 02:43:25 agc Exp $
+# $NetBSD: pkgformat-vars.mk,v 1.5 2014/12/30 15:13:20 wiz Exp $
+#
 # This Makefile fragment is included indirectly by bsd.prefs.mk and
 # defines some variables which must be defined earlier than where
 # pkgformat.mk is included.
+#
 PKGSRC_MESSAGE_RECIPIENTS?=	# empty
 .if !empty(PKGSRC_MESSAGE_RECIPIENTS)
 USE_TOOLS+=	mail
 .endif
 .if defined(PKG_PRESERVE)
 USE_TOOLS+=	date
 .endif
 # This is the package database directory for the default view.
 PKG_DBDIR?=		/var/db/pkg
 # _PKG_DBDIR is the actual packages database directory where we register
 # packages.
+#
 .if ${PKG_INSTALLATION_TYPE} == "overwrite"
 _PKG_DBDIR=		${_CROSS_DESTDIR}${PKG_DBDIR}
 _HOST_PKG_DBDIR=	${HOST_PKG_DBDIR:U${PKG_DBDIR}}
 .elif ${PKG_INSTALLATION_TYPE} == "pkgviews"
 _PKG_DBDIR=		${_CROSS_DESTDIR}${DEPOTBASE}
 _HOST_PKG_DBDIR=	${HOST_DEPOTBASE:U${DEPOTBASE}}
 .endif
 PKG_ADD_CMD?=		${PKG_TOOLS_BIN}/pkg_add
 PKG_ADMIN_CMD?=		${PKG_TOOLS_BIN}/pkg_admin
 PKG_CREATE_CMD?=	${PKG_TOOLS_BIN}/pkg_create
 PKG_DELETE_CMD?=	${PKG_TOOLS_BIN}/pkg_delete
 PKG_INFO_CMD?=		${PKG_TOOLS_BIN}/pkg_info
 PKG_VIEW_CMD?=		${PKG_TOOLS_BIN}/pkg_view
 LINKFARM_CMD?=		${PKG_TOOLS_BIN}/linkfarm
 # Latest versions of tools required for correct pkgsrc operation.
 .if make(replace) && ${_USE_DESTDIR} != "no"
 PKGTOOLS_REQD=		20100914
 .else
 PKGTOOLS_REQD=		20090528
 .endif
 # Latest version of pkg_install required to extract packages
 PKGTOOLS_VERSION_REQD=	20091115
 .if !defined(PKGTOOLS_VERSION)
 @@ -61,47 +55,38 @@ _PKG_INSTALL_DEPENDS=	yes
 AUDIT_PACKAGES?=	${PKG_ADMIN}
 _AUDIT_PACKAGES_CMD?=	audit-pkg
 _EXTRACT_PKGVULNDIR=	${PKG_ADMIN} config-var PKGVULNDIR
 DOWNLOAD_VULN_LIST?=	${PKG_ADMIN} fetch-pkg-vulnerabilities
 _AUDIT_CONFIG_FILE=	pkg_install.conf
 _AUDIT_CONFIG_OPTION=	IGNORE_URL
 # The binary pkg_install tools all need to consistently to refer to the
 # correct package database directory.
+#
 PKGTOOLS_ARGS?=		-K ${_PKG_DBDIR}
 HOST_PKGTOOLS_ARGS?=	-K ${_HOST_PKG_DBDIR}
 # Views are rooted in ${LOCALBASE}, all packages are depoted in
 # ${DEPOTBASE}, and the package database directory for the default view
 # is in ${PKG_DBDIR}.
 PKG_VIEW_ARGS?=		-W ${LOCALBASE} -d ${DEPOTBASE} -k ${_CROSS_DESTDIR}${PKG_DBDIR}
 HOST_PKG_VIEW_ARGS?=	-W ${LOCALBASE} -d ${DEPOTBASE} -k ${PKG_DBDIR}
 PKG_ADD?=	${PKG_ADD_CMD} ${PKGTOOLS_ARGS}
 PKG_ADMIN?=	${PKG_ADMIN_CMD} ${PKGTOOLS_ARGS}
 PKG_CREATE?=	${PKG_CREATE_CMD} ${PKGTOOLS_ARGS}
 PKG_DELETE?=	${PKG_DELETE_CMD} ${PKGTOOLS_ARGS}
 PKG_INFO?=	${PKG_INFO_CMD} ${PKGTOOLS_ARGS}
 PKG_VIEW?=	${PKG_VIEW_CMD} ${PKG_VIEW_ARGS}
 LINKFARM?=	${LINKFARM_CMD}
 HOST_PKG_ADD?=		${PKG_ADD_CMD} ${HOST_PKGTOOLS_ARGS}
 HOST_PKG_ADMIN?=	${PKG_ADMIN_CMD} ${HOST_PKGTOOLS_ARGS}
 HOST_PKG_CREATE?=	${PKG_CREATE_CMD} ${HOST_PKGTOOLS_ARGS}
 HOST_PKG_DELETE?=	${PKG_DELETE_CMD} ${HOST_PKGTOOLS_ARGS}
 HOST_PKG_INFO?=		${PKG_INFO_CMD} ${HOST_PKGTOOLS_ARGS}
 HOST_PKG_VIEW?=		${PKG_VIEW_CMD} ${HOST_PKG_VIEW_ARGS}
 HOST_LINKFARM?=		${LINKFARM_CMD}
 # "${_PKG_BEST_EXISTS} pkgpattern" prints out the name of the installed
 # package that best matches pkgpattern.  Use this instead of
 # "${PKG_INFO} -e pkgpattern" if the latter would return more than one
 # package name.
+#
 _PKG_BEST_EXISTS?=	${PKG_INFO} -E
 _HOST_PKG_BEST_EXISTS?=	${HOST_PKG_INFO} -E
 # XXX Leave this here until all uses of this have been purged from the
 # XXX public parts of pkgsrc.
 # XXX

--- pkgsrc/mk/pkgformat/pkg/pkgformat.mk 2011/10/15 00:23:09 1.1
+++ pkgsrc/mk/pkgformat/pkg/pkgformat.mk 2014/12/30 15:13:20 1.2

 @@ -1,27 +1,26 @@
-# $NetBSD: pkgformat.mk,v 1.1 2011/10/15 00:23:09 reed Exp $
+# $NetBSD: pkgformat.mk,v 1.2 2014/12/30 15:13:20 wiz 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
 # registered on the system.
+#
 # 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 "views.mk"
 .include "utility.mk"

--- pkgsrc/mk/pkginstall/bsd.pkginstall.mk 2014/10/12 23:44:32 1.60
+++ pkgsrc/mk/pkginstall/bsd.pkginstall.mk 2014/12/30 15:13:20 1.61

 @@ -1,14 +1,14 @@
-# $NetBSD: bsd.pkginstall.mk,v 1.60 2014/10/12 23:44:32 joerg Exp $
+# $NetBSD: bsd.pkginstall.mk,v 1.61 2014/12/30 15:13:20 wiz 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
 @@ -76,94 +76,85 @@ PKG_DB_TMPDIR?=		${WRKDIR}/.pkgdb
 # These are the template scripts for the INSTALL/DEINSTALL scripts.
 # Packages may do additional work in the INSTALL/DEINSTALL scripts by
 # overriding the variables DEINSTALL_TEMPLATES and INSTALL_TEMPLATES to
 # point to additional script fragments.  These bits are included after
 # the main install/deinstall script fragments.
+#
 _HEADER_TMPL?=		${.CURDIR}/../../mk/pkginstall/header
 HEADER_TEMPLATES?=	# empty
 .if exists(${PKGDIR}/HEADER) && \
     empty(HEADER_TEMPLATES:M${PKGDIR}/HEADER)
 HEADER_TEMPLATES+=	${PKGDIR}/HEADER
 .endif
 _DEINSTALL_PRE_TMPL?=	${.CURDIR}/../../mk/pkginstall/deinstall-pre
 DEINSTALL_TEMPLATES?=	# empty
 .if exists(${PKGDIR}/DEINSTALL) && \
     empty(DEINSTALL_TEMPLATES:M${PKGDIR}/DEINSTALL)
 DEINSTALL_TEMPLATES+=	${PKGDIR}/DEINSTALL
 .endif
 _DEINSTALL_TMPL?=	${.CURDIR}/../../mk/pkginstall/deinstall
 _INSTALL_UNPACK_TMPL?=	# empty
 _INSTALL_TMPL?=		${.CURDIR}/../../mk/pkginstall/install
 INSTALL_TEMPLATES?=	# empty
 .if exists(${PKGDIR}/INSTALL) && \
     empty(INSTALL_TEMPLATES:M${PKGDIR}/INSTALL)
 INSTALL_TEMPLATES+=	${PKGDIR}/INSTALL
 .endif
 _INSTALL_POST_TMPL?=	${.CURDIR}/../../mk/pkginstall/install-post
 _INSTALL_DATA_TMPL?=	# empty
 _FOOTER_TMPL?=		${.CURDIR}/../../mk/pkginstall/footer
 # _DEINSTALL_TEMPLATES and _INSTALL_TEMPLATES are the list of source
 #	files that are concatenated to form the DEINSTALL/INSTALL
 #	scripts.
+#
 # _DEINSTALL_TEMPLATES_DFLT and _INSTALL_TEMPLATES_DFLT are the list of
 #	template files minus any user-supplied templates.
+#
 _DEINSTALL_TEMPLATES=	${_HEADER_TMPL} ${HEADER_TEMPLATES}		\
 			${_DEINSTALL_PRE_TMPL}				\
 			${DEINSTALL_TEMPLATES}				\
 			${_DEINSTALL_TMPL}				\
 			${_FOOTER_TMPL}
 _INSTALL_TEMPLATES=	${_HEADER_TMPL} ${HEADER_TEMPLATES}		\
 			${_INSTALL_UNPACK_TMPL}				\
 			${_INSTALL_TMPL}				\
 			${INSTALL_TEMPLATES}				\
 			${_INSTALL_POST_TMPL}				\
 			${_FOOTER_TMPL}					\
 			${_INSTALL_DATA_TMPL}				\
 _DEINSTALL_TEMPLATES_DFLT=	${_HEADER_TMPL}				\
 				${_DEINSTALL_PRE_TMPL}			\
 				${_DEINSTALL_TMPL}			\
 				${_FOOTER_TMPL}
 _INSTALL_TEMPLATES_DFLT=	${_HEADER_TMPL}				\
 				${_INSTALL_TMPL}			\
 				${_INSTALL_POST_TMPL}			\
 				${_FOOTER_TMPL}
 # These are the list of source files that are concatenated to form the
 # INSTALL/DEINSTALL scripts.
+#
 DEINSTALL_SRC?=		${_DEINSTALL_TEMPLATES}
 INSTALL_SRC?=		${_INSTALL_TEMPLATES}
 # FILES_SUBST lists what to substitute in DEINSTALL/INSTALL scripts and in
 # rc.d scripts.
+#
 FILES_SUBST+=		PREFIX=${PREFIX:Q}
 FILES_SUBST+=		LOCALBASE=${LOCALBASE:Q}
 FILES_SUBST+=		X11BASE=${X11BASE:Q}
 FILES_SUBST+=		DEPOTBASE=${DEPOTBASE:Q}
 FILES_SUBST+=		VARBASE=${VARBASE:Q}
 FILES_SUBST+=		PKG_SYSCONFBASE=${PKG_SYSCONFBASE:Q}
 FILES_SUBST+=		PKG_SYSCONFDEPOTBASE=${PKG_SYSCONFDEPOTBASE:Q}
 FILES_SUBST+=		PKG_SYSCONFBASEDIR=${PKG_SYSCONFBASEDIR:Q}
 FILES_SUBST+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
 FILES_SUBST+=		CONF_DEPENDS=${CONF_DEPENDS:C/:.*//:Q}
 FILES_SUBST+=		PKGBASE=${PKGBASE:Q}
 FILES_SUBST+=		PKG_INSTALLATION_TYPE=${PKG_INSTALLATION_TYPE:Q}
 # PKG_USERS represents the users to create for the package.  It is a
 #	space-separated list of elements of the form
+#
 #		user:group
+#
 # The following variables are optional and specify further details of
 # the user accounts listed in PKG_USERS:
+#
 # PKG_UID.<user> is the hardcoded numeric UID for <user>.
 # PKG_GECOS.<user> is <user>'s description, as well as contact info.
 # PKG_HOME.<user> is the home directory for <user>.
 # PKG_SHELL.<user> is the login shell for <user>.

--- pkgsrc/mk/pkginstall/deinstall 2007/07/18 18:01:03 1.2
+++ pkgsrc/mk/pkginstall/deinstall 2014/12/30 15:13:20 1.3

 @@ -1,62 +1,38 @@
-# $NetBSD: deinstall,v 1.2 2007/07/18 18:01:03 jlam Exp $
+# $NetBSD: deinstall,v 1.3 2014/12/30 15:13:20 wiz Exp $
 case ${STAGE} in
-VIEW-DEINSTALL)
+DEINSTALL)
 	case ${_PKG_CONFIG} in
 	yes)
 		case ${PKG_SYSCONFDEPOTBASE} in
 		"")
 			${TEST} ! -x ./+FILES ||
 				./+FILES VIEW-REMOVE ${PREFIX} ${PKG_PREFIX}
 			;;
 		*)
 			${SETENV} PLIST_IGNORE_FILES="${CONF_IGNORE_FILES}" \
 				${LINKFARM} -D -t ${PKG_SYSCONFVIEWBASE} -d ${PKG_SYSCONFDEPOTBASE} ${PKGNAME}
 			${RMDIR} -p ${PKG_SYSCONFVIEWBASE} 2>/dev/null || ${TRUE}
 			;;
 		esac
 		;;
 	esac
+	#
 	# Unregister info files.
+	#
 	${TEST} ! -x ./+INFO_FILES ||
 		./+INFO_FILES REMOVE ${PKG_METADATA_DIR}
+	#
 	# Remove shells from /etc/shells.
+	#
 	${TEST} ! -x ./+SHELL ||
 		./+SHELL REMOVE ${PKG_METADATA_DIR}
 	${TEST} ! -x ./+SHELL ||
 		./+SHELL CHECK-REMOVE ${PKG_METADATA_DIR}
 	;;
 DEINSTALL)
 	# Remove configuration files if they don't differ from the default
 	# config file.
+	#
 	${TEST} ! -x ./+FILES ||
 		./+FILES REMOVE ${PKG_METADATA_DIR}
 	;;
 POST-DEINSTALL)
 	if [ "${PKG_INSTALLATION_TYPE}" = "pkgviews" -a			\
 	     "${_PKG_CONFIG}" = "yes" -a -n "${CONF_DEPENDS}" ]; then
 		if [ -h ${PKG_SYSCONFDIR} ]; then
 			${RM} -f ${PKG_SYSCONFDIR}
 		fi
 		${RMDIR} -p `${DIRNAME} ${PKG_SYSCONFDIR}` 2>/dev/null || ${TRUE}
 	fi
+	#
 	# Update any fonts databases.
+	#
 	${TEST} ! -x ./+FONTS ||
 		./+FONTS ${PKG_METADATA_DIR}
+	#
 	# Rebuild the system run-time library search path database.
+	#
 	${TEST} ! -x ./+SHLIBS ||
 		./+SHLIBS REMOVE ${PKG_METADATA_DIR}
+	#
 	# Remove empty directories and unused users/groups.
+	#

--- pkgsrc/mk/pkginstall/header 2006/07/19 22:26:26 1.2
+++ pkgsrc/mk/pkginstall/header 2014/12/30 15:13:20 1.3

 @@ -1,16 +1,16 @@
 #!@SH@
+#
-# $NetBSD: header,v 1.2 2006/07/19 22:26:26 jlam Exp $
+# $NetBSD: header,v 1.3 2014/12/30 15:13:20 wiz Exp $
 SELF="$0"
 PKGNAME="$1"
 STAGE="$2"
 shift 2
 AWK="@AWK@"
 BASENAME="@BASENAME@"
 CAT="@CAT@"
 CHGRP="@CHGRP@"
 CHMOD="@CHMOD@"
 CHOWN="@CHOWN@"
 CMP="@CMP@"
 @@ -44,44 +44,31 @@ SORT="@SORT@"
 SU="@SU@"
 TEST="@TEST@"
 TOUCH="@TOUCH@"
 TR="@TR@"
 TRUE="@TRUE@"
 XARGS="@XARGS@"
 CURDIR=`${PWD_CMD}`
 : ${PKG_METADATA_DIR=${CURDIR}}
 PKGBASE="@PKGBASE@"
 LOCALBASE="@LOCALBASE@"
 X11BASE="@X11BASE@"
 DEPOTBASE="@DEPOTBASE@"
 PREFIX="@PREFIX@"
 case ${PKG_PREFIX} in
 ${LOCALBASE}/*)	VIEW="${PKG_PREFIX#${LOCALBASE}/}" ;;
 *)		VIEW="" ;;
 esac
 PKG_SYSCONFBASE="@PKG_SYSCONFBASE@"
 PKG_SYSCONFDEPOTBASE="@PKG_SYSCONFDEPOTBASE@"
 PKG_SYSCONFBASEDIR="@PKG_SYSCONFBASEDIR@"
 PKG_SYSCONFDIR="@PKG_SYSCONFDIR@"
 CONF_DEPENDS="@CONF_DEPENDS@"
 case ${VIEW} in
 "")	PKG_SYSCONFVIEWBASE="${PKG_SYSCONFBASE}" ;;
 *)	PKG_SYSCONFVIEWBASE="${PKG_SYSCONFBASE}/${VIEW}" ;;
 esac
 CONF_IGNORE_FILES="*[~#] *.OLD *.orig *,v .pkgsrc */.pkgsrc"
 PKG_INSTALLATION_TYPE="@PKG_INSTALLATION_TYPE@"
 case "${PKG_CONFIG:-@PKG_CONFIG@}" in
 [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
 	_PKG_CONFIG=yes
 	;;
 [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
 	_PKG_CONFIG=yes
 	;;
 esac

--- pkgsrc/mk/pkginstall/install 2007/07/18 18:01:03 1.2
+++ pkgsrc/mk/pkginstall/install 2014/12/30 15:13:20 1.3

 @@ -1,49 +1,32 @@
-# $NetBSD: install,v 1.2 2007/07/18 18:01:03 jlam Exp $
+# $NetBSD: install,v 1.3 2014/12/30 15:13:20 wiz Exp $
 case ${STAGE} in
 PRE-INSTALL)
+	#
 	# Unpack the helper scriptlets.
+	#
 	${SH} ${SELF} ${PKGNAME} UNPACK
+	#
 	# Require that necessary users and groups exist or else fail the
 	# installation of the package.
+	#
 	${TEST} ! -x ./+USERGROUP ||
 		{ ./+USERGROUP ADD ${PKG_METADATA_DIR}
 		  if ./+USERGROUP CHECK-ADD ${PKG_METADATA_DIR}; then
+			:
 		  else
 			exit 1
 		  fi; }
 	# Create package directories at pre-install time.
 	if [ "${PKG_INSTALLATION_TYPE}" = "pkgviews" -a			\
 	     "${_PKG_CONFIG}" = "yes" -a -n "${CONF_DEPENDS}" ]; then
 		pkg=`${PKG_ADMIN} -b -d ${DEPOTBASE} -s "" lsbest "${CONF_DEPENDS}"`
 		sysconfdir=`${PKG_INFO} -B -K ${DEPOTBASE} $pkg |	\
 			${AWK} '/^PKG_SYSCONFDIR=/ {			\
 				gsub("^PKG_SYSCONFDIR=[ 	]*", ""); \
 				print;					\
 			}'						\
 		if [ -d $sysconfdir -a ! -d ${PKG_SYSCONFDIR} ]; then
 			${MKDIR} -p `${DIRNAME} ${PKG_SYSCONFDIR}`
 			${LN} -sf $sysconfdir ${PKG_SYSCONFDIR}
 		fi
 	fi
 	${TEST} ! -x ./+DIRS ||
 		./+DIRS ADD ${PKG_METADATA_DIR}
 	${TEST} ! -x ./+DIRS ||
 		./+DIRS PERMS ${PKG_METADATA_DIR}
         ;;
 POST-INSTALL)
+	#
 	# Rebuild the system run-time library search path database.
+	#
 	${TEST} ! -x ./+SHLIBS ||
 		./+SHLIBS ADD ${PKG_METADATA_DIR}
+	#
 @@ -64,39 +47,29 @@ POST-INSTALL)
 	${TEST} ! -x ./+FONTS ||
 		./+FONTS ${PKG_METADATA_DIR}
 	# Check for any missing bits after we're finished installing.
+	#
 	${TEST} ! -x ./+DIRS ||
 		./+DIRS CHECK-ADD ${PKG_METADATA_DIR}
 	${TEST} ! -x ./+DIRS ||
 		./+DIRS CHECK-PERMS ${PKG_METADATA_DIR}
 	${TEST} ! -x ./+FILES ||
 		./+FILES CHECK-ADD ${PKG_METADATA_DIR}
 	${TEST} ! -x ./+FILES ||
 		./+FILES CHECK-PERMS ${PKG_METADATA_DIR}
 	;;
 VIEW-INSTALL)
+	#
 	# Register shells in /etc/shells.
+	#
 	${TEST} ! -x ./+SHELL ||
 		./+SHELL ADD ${PKG_METADATA_DIR}
 	${TEST} ! -x ./+SHELL ||
 		./+SHELL CHECK-ADD ${PKG_METADATA_DIR}
+	#
 	# Register info files.
+	#
 	${TEST} ! -x ./+INFO_FILES ||
 		./+INFO_FILES ADD ${PKG_METADATA_DIR}
 	# If ${PKG_SYSCONFBASE} points outside of ${PREFIX}, then add the
 	# package config files to the proper view.
 	if [ "${_PKG_CONFIG}" = "yes" -a -n "${PKG_SYSCONFDEPOTBASE}" ]; then
 		${SETENV} PLIST_IGNORE_FILES="${CONF_IGNORE_FILES}" \
 			${LINKFARM} -t ${PKG_SYSCONFVIEWBASE} -d ${PKG_SYSCONFDEPOTBASE} ${PKGNAME}
 	fi
 	;;
 esac

--- pkgsrc/mk/pkginstall/files 2012/04/21 10:22:32 1.8
+++ pkgsrc/mk/pkginstall/files 2014/12/30 15:13:20 1.9

 @@ -1,39 +1,37 @@
-# $NetBSD: files,v 1.8 2012/04/21 10:22:32 wiz Exp $
+# $NetBSD: files,v 1.9 2014/12/30 15:13:20 wiz Exp $
+#
 # Generate a +FILES script that reference counts config files that are
 # required for the proper functioning of the package.
+#
 case "${STAGE},$1" in
 UNPACK,|UNPACK,+FILES)
 	${CAT} > ./+FILES << 'EOF'
 #!@SH@
+#
 # +FILES - reference-counted configuration file management script
+#
 # Usage: ./+FILES ADD|REMOVE|PERMS [metadatadir]
 #        ./+FILES VIEW-REMOVE depotdir viewdir
 #        ./+FILES CHECK-ADD|CHECK-REMOVE|CHECK-PERMS [metadatadir]
+#
 # This script supports two actions, ADD and REMOVE, that will add or
 # remove the configuration files needed by the package associated with
 # <metadatadir>.  The CHECK-ADD action will check whether any files
 # needed by the package are missing, and print an informative message
 # noting those files.  The CHECK-REMOVE action will check whether
 # any files needed by the package still exist, and print an informative
 # message noting those files.  The CHECK-ADD and CHECK-REMOVE actions
 # return non-zero if they detect either missing or existing files,
-# respectively.  The VIEW-REMOVE action will remove from <viewdir> the
+# respectively.  The PERMS action
 # links to the configuration files in <depotdir>.  The PERMS action
 # will correct any ownership or permission discrepancies between the
 # existing files and the data in this script, and the CHECK-PERMS
 # action will check whether any files have the wrong ownership or
 # permission and print an informative message noting those files.  The
 # CHECK-PERMS action will return non-zero if it detects files with
 # wrong ownership or permissions.
+#
 # Lines starting with "# FILE: " are data read by this script that
 # name the files that this package requires to exist to function
 # correctly, along with the locations of the example files, e.g.
+#
 #	# FILE: /etc/bar.conf c /example/bar.conf
 #	# FILE: /etc/baz/conf c /example/baz.conf 0600 foo-user foo-group
 @@ -88,41 +86,32 @@ case "${PKG_CONFIG_PERMS:-@PKG_CONFIG_PE
 [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
 	_PKG_CONFIG_PERMS=no
 	;;
 esac
 case "${PKG_RCD_SCRIPTS:-@PKG_RCD_SCRIPTS@}" in
 [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
 	_PKG_RCD_SCRIPTS=yes
 	;;
 [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
 	_PKG_RCD_SCRIPTS=no
 	;;
 esac
-case $ACTION in
+CURDIR=`${PWD_CMD}`
-VIEW-REMOVE)
+PKG_METADATA_DIR="${2-${CURDIR}}"
-	DEPOTDIR="$2"
+: ${PKGNAME=${PKG_METADATA_DIR##*/}}
-	VIEWDIR="$3"
+: ${PKG_DBDIR=${PKG_METADATA_DIR%/*}}
-	${TEST} -n "${DEPOTDIR}" -a -n "${VIEWDIR}" || exit 0
+: ${PKG_REFCOUNT_DBDIR=${PKG_DBDIR}.refcount}
-	;;
+PKG_REFCOUNT_FILES_DBDIR="${PKG_REFCOUNT_DBDIR}/files"
 *)
 	CURDIR=`${PWD_CMD}`
 	PKG_METADATA_DIR="${2-${CURDIR}}"
 	: ${PKGNAME=${PKG_METADATA_DIR##*/}}
 	: ${PKG_DBDIR=${PKG_METADATA_DIR%/*}}
 	: ${PKG_REFCOUNT_DBDIR=${PKG_DBDIR}.refcount}
 	PKG_REFCOUNT_FILES_DBDIR="${PKG_REFCOUNT_DBDIR}/files"
 	;;
 esac
 exitcode=0
 case $ACTION in
 ADD)
 	${SED} -n "/^\# FILE: /{s/^\# FILE: //;p;}" ${SELF} | ${SORT} -u |
 	while read file f_flags f_eg f_mode f_user f_group; do
 		case $file in
 		"")	continue ;;
 		[!/]*)	file="${PKG_PREFIX}/$file" ;;
 		esac
 		case $f_flags in
 		*c*)	;;
 		*)	continue ;;
 @@ -244,42 +233,26 @@ PERMS)
 		*)	${CHOWN} $f_user $file ;;
 		esac
 		case $f_group in
 		"")	;;
 		*)	${CHGRP} $f_group $file ;;
 		esac
 		case $f_mode in
 		"")	;;
 		*)	${CHMOD} $f_mode $file ;;
 		esac
 	done
 	;;
 VIEW-REMOVE)
 	${SED} -n "/^\# FILE: /{s/^\# FILE: //;p;}" ${SELF} | ${SORT} -ru |
 	while read file f_flags f_eg f_mode f_user f_group; do
 		case $file in
 		${DEPOTDIR}/*)	link="${VIEWDIR}/${file#${DEPOTDIR}/}" ;;
 		[!/]*)		link="${VIEWDIR}/$file" ;;
 		*)		continue ;;
 		esac
 		dir="${link%[^/]*}"
 		if ${TEST} -h "$link"; then
 			${RM} -f $link
 			${RMDIR} -p $dir 2>/dev/null || ${TRUE}
 		fi
 	done
 	;;
 CHECK-ADD)
 	${SED} -n "/^\# FILE: /{s/^\# FILE: //;p;}" ${SELF} | ${SORT} -ru |
 	{ while read file f_flags f_eg f_mode f_user f_group; do
 		case $file in
 		"")	continue ;;
 		[!/]*)	file="${PKG_PREFIX}/$file" ;;
 		esac
 		${TEST} ! -f "$file" || continue
 		case $f_flags in
 		*c*)	;;
 		*)	continue ;;
 		esac
 		case $f_eg in
 @@ -421,25 +394,24 @@ CHECK-PERMS)
 	done
 	case "$printed_header" in
 	yes)	${ECHO} ""
 		${ECHO} "==========================================================================="
 		exit 1
 		;;
 	esac; }
 	${TEST} $? -eq 0 || exitcode=1
 	${RM} -fr $tmpdir
 	;;
 *)
 	${ECHO} "Usage: ./+FILES ADD|REMOVE|PERMS [metadatadir]"
 	${ECHO} "       ./+FILES VIEW-REMOVE depotdir viewdir"
 	${ECHO} "       ./+FILES CHECK-ADD|CHECK-REMOVE|CHECK-PERMS [metadatadir]"
 	;;
 esac
 exit $exitcode
 EOF
 	${SED} -n "/^\# FILE: /p" ${SELF} >> ./+FILES
 	${CHMOD} +x ./+FILES
 	;;
 esac

--- pkgsrc/mk/plist/plist.mk 2014/10/09 13:44:51 1.47
+++ pkgsrc/mk/plist/plist.mk 2014/12/30 15:13:20 1.48

 @@ -1,14 +1,14 @@
-# $NetBSD: plist.mk,v 1.47 2014/10/09 13:44:51 wiz Exp $
+# $NetBSD: plist.mk,v 1.48 2014/12/30 15:13:20 wiz Exp $
+#
 # This Makefile fragment handles the creation of PLISTs for use by
 # pkg_create(8).
+#
 # The following variables affect the PLIST generation:
+#
 #    PLIST_TYPE specifies whether the generated PLIST is derived
 #	automatically from the installed files, or if the PLIST entries
 #	are listed in files.  Valid values are "dynamic" and "static",
 #	and the default value is "static".
+#
 #    PLIST_VARS is the list of names corresponding to automatic variables
 #	generated by plist.mk to simplify having conditionally-present
 @@ -40,29 +40,26 @@
 #    IGNORE_INFO_DIRS is a list of ${PREFIX}-relative paths that do
 #	*not* contain info files.
+#
 _VARGROUPS+=		plist
 _USER_VARS.plist=	# none
 _PKG_VARS.plist=	PLIST_SUBST PLIST_VARS PLIST_SRC GENERATE_PLIST
 _SYS_VARS.plist=	PLIST_TYPE PLIST
 PLIST_VARS?=		# empty
 PLIST_AWK?=		# empty
 PLIST_AWK_ENV?=		# empty
 .if ${PKG_INSTALLATION_TYPE} == "pkgviews"
 PLIST_TYPE?=	dynamic
 .endif
 PLIST_TYPE?=	static
 ######################################################################
 .if exists(${PKGDIR}/PLIST.common)
 PLIST_SRC_DFLT+=	${PKGDIR}/PLIST.common
 .endif
 .if exists(${PKGDIR}/PLIST.${OPSYS})
 PLIST_SRC_DFLT+=	${PKGDIR}/PLIST.${OPSYS}
 .endif
 .if exists(${PKGDIR}/PLIST.${MACHINE_ARCH:C/i[3-6]86/i386/g})
 PLIST_SRC_DFLT+=	${PKGDIR}/PLIST.${MACHINE_ARCH:C/i[3-6]86/i386/g}
 .endif
 @@ -217,42 +214,26 @@ _SHLIB_AWKFILE.none=	${.CURDIR}/../../mk
 ######################################################################
 # GENERATE_PLIST is a sequence of commands, terminating in a semicolon,
 #	that outputs contents for a PLIST to stdout and is appended to
 #	the contents of ${PLIST_SRC}.
+#
 .if empty(PLIST_SRC)
 GENERATE_PLIST?=	${ECHO} "@comment "${PKGNAME:Q}" has no files.";
 .else
 GENERATE_PLIST?=	${TRUE};
 .endif
 .if ${PKG_INSTALLATION_TYPE} == "pkgviews"
 # _PLIST_IGNORE_FILES basically mirrors the list of ignored files found
 # in pkg_views(1).  It's used by the dynamic PLIST generator to skip
 # adding the named files to the PLIST.
 _PLIST_IGNORE_FILES+=	+*			# package metadata files
 .  if defined(INFO_FILES)
 _PLIST_IGNORE_FILES+=	${PKGINFODIR}/dir
 .  endif
 _PLIST_IGNORE_FILES+=	*[~\#] *.OLD *.orig *,v	# scratch config files
 .  if !empty(CONF_DEPENDS)
 _PLIST_IGNORE_FILES+=	${PKG_SYSCONFDIR:S,^${PREFIX}/,,}
 .  endif
 _PLIST_IGNORE_FILES+=	${PLIST_IGNORE_FILES}
 .endif
 _BUILD_DEFS+=		_PLIST_IGNORE_FILES
 .if ${PLIST_TYPE} == "dynamic"
 _PLIST_IGNORE_CMD=							\
 	( while read i; do						\
 		ignore=no;						\
 		for p in ${_PLIST_IGNORE_FILES}; do			\
 	  		case "$$i" in					\
 			$$p)	ignore=yes; break ;;			\
 			esac;						\
 		done;							\
 		[ "$$ignore" = "yes" ] || ${ECHO} "$$i";		\
 	  done )

--- pkgsrc/mk/wrapper/gen-transform.sh 2014/09/02 14:23:00 1.9
+++ pkgsrc/mk/wrapper/gen-transform.sh 2014/12/30 15:13:20 1.10

 @@ -1,16 +1,16 @@
 #! @WRAPPER_SHELL@
+#
-# $NetBSD: gen-transform.sh,v 1.9 2014/09/02 14:23:00 jperkin Exp $
+# $NetBSD: gen-transform.sh,v 1.10 2014/12/30 15:13:20 wiz 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
 @@ -62,36 +62,26 @@ rpath_options="-Wl,--rpath, -Wl,-rpath-l
 ######################################################################
 gen()
+{
 	_sep=" 	\`\"':;,"
 	_action=$1; shift
 	save_IFS="${IFS}"; IFS=":"
 	set -- $1
 	IFS="${save_IFS}"
 	_cmd="$1"; shift
 	case $_cmd in
         ###############################################################
 	# depot:src:dst
 	#	Change "src/<dir>/*" into "dst/*", and the same in -I and
 	#	-L options.
         ###############################################################
 	depot)
 		gen $_action "opt-depot:$1:$2"
 		gen $_action "opt-depot:-I$1:-I$2"
 		gen $_action "opt-depot:-L$1:-L$2"
 		;;
         ###############################################################
         # I:src:dst
         #       Change "src" into "dst" and "src/*" into "dst/*" in -I
 	#	options for transform, and back for untransform.
         ###############################################################
 	I)
 		case $_action in
 		transform)
 			$debug_log $wrapperlog "   (gen-transform) $_cmd: $@"
 			gen $_action "opt:-I$1:-I$2"
 			gen $_action "opt-sub:-I$1:-I$2"
 			;;
 		untransform)
 			$debug_log $wrapperlog "   (gen-transform) $_cmd: $@"
 @@ -211,47 +201,26 @@ gen()
 			$echo "s|^$1\([$_sep]\)|$2\1|g"
 			$echo "s|^$1$|$2|g"
 			;;
 		untransform)
 			$debug_log $wrapperlog "   (gen-transform) $_cmd: $@"
 			$echo "s|\([$_sep]\)$1\([$_sep]\)|\1$2\2|g"
 			$echo "s|\([$_sep]\)$1\([$_sep]\)|\1$2\2|g"
 			$echo "s|\([$_sep]\)$1$|\1$2|g"
 			$echo "s|^$1\([$_sep]\)|$2\1|g"
 			$echo "s|^$1$|$2|g"
 			;;
 		esac
 		;;
         ###############################################################
 	# opt-depot:src:dst
 	#	Change "src/<dir>/*" into "dst/*".
         ###############################################################
 	opt-depot)
 		case $_action in
 		transform)
 			$debug_log $wrapperlog "   (gen-transform) $_cmd: $@"
 			$echo "s|^$1/[^/$_sep]*\(/[^$_sep]*[$_sep]\)|$2\1|g"
 			$echo "s|^$1/[^/$_sep]*\(/[^$_sep]*\)$|$2\1|g"
 			;;
 		untransform)
 			$debug_log $wrapperlog "   (gen-transform) $_cmd: $@"
 			$echo "s|\([$_sep]\)$1/[^/$_sep]*\(/[^$_sep]*[$_sep]\)|\1$2\2|g"
 			$echo "s|\([$_sep]\)$1/[^/$_sep]*\(/[^$_sep]*[$_sep]\)|\1$2\2|g"
 			$echo "s|\([$_sep]\)$1/[^/$_sep]*\(/[^$_sep]*\)$|\1$2\2|g"
 			$echo "s|^$1/[^/$_sep]*\(/[^$_sep]*[$_sep]\)|$2\1|g"
 			$echo "s|^$1/[^/$_sep]*\(/[^$_sep]*\)$|$2\1|g"
 			;;
 		esac
 		;;
 	##############################################################
 	# opt-sub:src:dst
 	#	Change "src/*" into "dst/*".
 	##############################################################
 	opt-sub)
 		$debug_log $wrapperlog "   (gen-transform) $_cmd: $@"
 		gen $_action "opt-sub-trailer:$1::$2:"
 		;;
 	##############################################################
 	# opt-sub-trailer:src:src_trailer:dst:dst_trailer
 	#	Change "src/*src_trailer" into "dst/*dst_trailer",
 	#	where "src/*" matches "src" plus subdirectories.
 	##############################################################

--- pkgsrc/net/openslp/Makefile 2014/10/09 14:06:46 1.44
+++ pkgsrc/net/openslp/Makefile 2014/12/30 15:13:20 1.45

 @@ -1,26 +1,24 @@
-# $NetBSD: Makefile,v 1.44 2014/10/09 14:06:46 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2014/12/30 15:13:20 wiz Exp $
 DISTNAME=	openslp-1.2.1
 PKGREVISION=	7
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=openslp/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.openslp.org/
 COMMENT=	Open-source implementation of the Service Location Protocol
 # Needs pkgviews-enabled automake
 USE_TOOLS+=		automake bison lex pax
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
 CONFIGURE_ARGS+=	--enable-slpv2-security
 INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} sysconfdir=${EGDIR} DOC_DIR=${DOCDIR}
 DOCDIR=			${PREFIX}/share/doc/${PKGBASE}
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
 CONFS=			slp.conf slp.reg slp.spi
 CONF_FILES=		# empty

--- pkgsrc/pkgtools/cwrappers/files/bin/fixup-libtool.c 2014/12/06 22:35:24 1.3
+++ pkgsrc/pkgtools/cwrappers/files/bin/fixup-libtool.c 2014/12/30 15:13:20 1.4

 @@ -1,14 +1,14 @@
-/* $NetBSD: fixup-libtool.c,v 1.3 2014/12/06 22:35:24 riz Exp $ */
+/* $NetBSD: fixup-libtool.c,v 1.4 2014/12/30 15:13:20 wiz Exp $ */
 /*-
  * Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>.
  * All rights reserved.
+ *
  * 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
 @@ -135,27 +135,26 @@ process_option(struct processing_option
 				    (int)len, (int)len, line);
 				process_option(opt, tmp, strlen(tmp),
 				    in_relink);
 				free(tmp);
 				return;
+			}
 			if (wrksrc) {
 				wlen = strlen(wrksrc);
 				if (wlen <= len - 2 &&
 				    strncmp(line + 2, wrksrc, wlen) == 0 &&
 				    (line[wlen + 2] == '/' || wlen + 2 == len))
 					return;
 				/* XXX Check for DEPOTBASE */
+			}
+		}
 		i = wrapper_hash2(line, len) & (LIBPATH_HASH - 1);
 		TAILQ_FOREACH(arg, opt->hashtab + i, link) {
 			if (strncmp(arg->val, line, len) == 0 &&
 			    arg->val[len] == '\0')
 				break;
+		}
 		if (arg != NULL)
 			return;
 		arg = argument_new(xstrndup(line, len));
 		TAILQ_INSERT_TAIL(opt->hashtab + i, arg, link);

--- pkgsrc/pkgtools/cwrappers/files/doc/unimplemented.txt 2014/09/17 12:40:56 1.1
+++ pkgsrc/pkgtools/cwrappers/files/doc/unimplemented.txt 2014/12/30 15:13:20 1.2

 @@ -30,15 +30,13 @@ Platform specific processing:
 - All platforms but Darwin have _USE_RPATH=yes.  Shouldn't Darwin just
   filter out the rpath rules in a platform specific transformation phase?
 Transform:
 - opt:foo:bar: Replace all options matching foo with bar. foo might be
   fnmatch expression. Earlier than other transformations. If bar is empty,
   option is dropped.
 Libtool:
 - Drop -L, -l, -Wl,* if not in link mode
   -> see first point
 - pkgviews support

--- pkgsrc/pkgtools/pkg_install/DESCR 2009/02/02 12:34:59 1.7
+++ pkgsrc/pkgtools/pkg_install/DESCR 2014/12/30 15:13:20 1.8

 @@ -1,19 +1,17 @@
 pkg_install contains the core package management and administration
 utilities for pkgsrc, a multi-platform source and binary package
 system developed and maintained by The NetBSD Project and volunteers
 from around the globe.
 The following tools are included:
 pkg_add		install and upgrade binary packages
 pkg_admin	perform various pkgsrc administrative tasks
 pkg_create	create software package distributions
 pkg_delete	delete installed packages
 pkg_info	display information about installed or binary packages
 pkg_view	manage package views
 linkfarm	manage symbolic links for package views
 For the following tools compatibility wrappers are included:
 audit-packages	audit installed packages for security vulnerabilities
 download-vulnerability-list	download the latest vulnerabilities list

--- pkgsrc/pkgtools/pkg_install/Makefile 2014/03/14 22:09:04 1.203
+++ pkgsrc/pkgtools/pkg_install/Makefile 2014/12/30 15:13:20 1.204

 @@ -1,23 +1,22 @@
-# $NetBSD: Makefile,v 1.203 2014/03/14 22:09:04 ryoon Exp $
+# $NetBSD: Makefile,v 1.204 2014/12/30 15:13:20 wiz Exp $
 # Notes to package maintainers:
+#
 # Updating this package does not automatically necessitate bumping
 # PKGTOOLS_REQD in bsd.pkg.mk. Do so if and only if there is a critical
 # change in the pkg_* tools that pkgsrc relies on for proper operation.
 PKGNAME=		pkg_install-${VERSION}
 PKGREVISION=		1
 CATEGORIES=		pkgtools
 MAINTAINER=		agc@NetBSD.org
 HOMEPAGE=		http://www.pkgsrc.org/
 COMMENT=		Package management and administration tools for pkgsrc
 LICENSE=		modified-bsd
 BOOTSTRAP_PKG=	yes
 SKIP_LICENSE_CHECK=	yes
 CONFLICTS+=		audit-packages-[0-9]*
 GNU_CONFIGURE=		yes

--- pkgsrc/pkgtools/pkg_install/files/add/main.c 2010/09/14 22:26:18 1.27
+++ pkgsrc/pkgtools/pkg_install/files/add/main.c 2014/12/30 15:13:20 1.28

 @@ -1,23 +1,23 @@
-/*	$NetBSD: main.c,v 1.27 2010/09/14 22:26:18 gdt Exp $	*/
+/*	$NetBSD: main.c,v 1.28 2014/12/30 15:13:20 wiz Exp $	*/
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: main.c,v 1.27 2010/09/14 22:26:18 gdt Exp $");
+__RCSID("$NetBSD: main.c,v 1.28 2014/12/30 15:13:20 wiz Exp $");
 /*
+ *
  * FreeBSD install - a package for the installation and maintainance
  * of non-core utilities.
+ *
  * 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
 @@ -29,56 +29,52 @@ __RCSID("$NetBSD: main.c,v 1.27 2010/09/
  * This is the add module.
+ *
  */
 #if HAVE_ERR_H
 #include <err.h>
 #endif
 #if HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
 #include "lib.h"
 #include "add.h"
-static char Options[] = "AC:DIK:LP:RVW:fhm:np:t:Uuvw:";
+static char Options[] = "AC:DIK:P:RVfhm:np:t:Uuv";
 char   *Destdir = NULL;
 char   *OverrideMachine = NULL;
 char   *Prefix = NULL;
 char   *View = NULL;
 char   *Viewbase = NULL;
 Boolean NoView = FALSE;
 Boolean NoInstall = FALSE;
 Boolean NoRecord = FALSE;
 Boolean Automatic = FALSE;
 Boolean ForceDepends = FALSE;
 /*
  * Normally, updating fails if the dependencies of a depending package
  * are not satisfied by the package to be updated.  ForceDepending
  * turns that failure into a warning.
  */
 Boolean ForceDepending = FALSE;
 int	LicenseCheck = 0;
 int     Replace = 0;
 int	ReplaceSame = 0;
 static void
 usage(void)
+{
 	(void) fprintf(stderr, "%s\n%s\n%s\n%s\n",
-	    "usage: pkg_add [-AfhILnRuVv] [-C config] [-P destdir] [-K pkg_dbdir]",
+	    "usage: pkg_add [-AfhInRuVv] [-C config] [-P destdir] [-K pkg_dbdir]",
-	    "               [-m machine] [-p prefix] [-s verification-type",
+	    "               [-m machine] [-p prefix] [-s verification-type]\n",
 	    "               [-W viewbase] [-w view]\n",
 	    "               [[ftp|http]://[user[:password]@]host[:port]][/path/]pkg-name ...");
 	exit(1);
+}
 int
 main(int argc, char **argv)
+{
 	int     ch, error=0;
 	lpkg_head_t pkgs;
 	setprogname(argv[0]);
 	while ((ch = getopt(argc, argv, Options)) != -1) {
 		switch (ch) {
 @@ -102,30 +98,26 @@ main(int argc, char **argv)
 			Force = TRUE;
 			ForceDepends = TRUE;
 			ForceDepending = TRUE;
 			break;
 		case 'I':
 			NoInstall = TRUE;
 			break;
 		case 'K':
 			pkgdb_set_dir(optarg, 3);
 			break;
 		case 'L':
 			NoView = TRUE;
 			break;
 		case 'R':
 			NoRecord = TRUE;
 			break;
 		case 'm':
 			OverrideMachine = optarg;
 			break;
 		case 'n':
 			Fake = TRUE;
 			Verbose = TRUE;
 			break;
 @@ -140,34 +132,26 @@ main(int argc, char **argv)
 		case 'u':
 			Replace = 1;
 			break;
 		case 'V':
 			show_version();
 			/* NOTREACHED */
 		case 'v':
 			Verbose = TRUE;
 			break;
 		case 'W':
 			Viewbase = optarg;
 			break;
 		case 'w':
 			View = optarg;
 			break;
 		case 'h':
 		case '?':
 		default:
 			usage();
 			break;
+		}
+	}
 	argc -= optind;
 	argv += optind;
 	pkg_install_config();
 	if (Destdir != NULL) {

--- pkgsrc/pkgtools/pkg_install/files/add/perform.c 2013/09/02 10:28:44 1.105
+++ pkgsrc/pkgtools/pkg_install/files/add/perform.c 2014/12/30 15:13:20 1.106

 @@ -1,22 +1,22 @@
-/*	$NetBSD: perform.c,v 1.105 2013/09/02 10:28:44 jperkin Exp $	*/
+/*	$NetBSD: perform.c,v 1.106 2014/12/30 15:13:20 wiz Exp $	*/
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: perform.c,v 1.105 2013/09/02 10:28:44 jperkin Exp $");
+__RCSID("$NetBSD: perform.c,v 1.106 2014/12/30 15:13:20 wiz Exp $");
 /*-
  * Copyright (c) 2003 Grant Beattie <grant@NetBSD.org>
  * Copyright (c) 2005 Dieter Baron <dillo@NetBSD.org>
  * Copyright (c) 2007 Roland Illig <rillig@NetBSD.org>
  * Copyright (c) 2008, 2009 Joerg Sonnenberger <joerg@NetBSD.org>
  * Copyright (c) 2010 Thomas Klausner <wiz@NetBSD.org>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
 @@ -65,27 +65,26 @@ struct pkg_meta {
 	char *meta_contents;
 	char *meta_comment;
 	char *meta_desc;
 	char *meta_mtree;
 	char *meta_build_version;
 	char *meta_build_info;
 	char *meta_size_pkg;
 	char *meta_size_all;
 	char *meta_required_by;
 	char *meta_display;
 	char *meta_install;
 	char *meta_deinstall;
 	char *meta_preserve;
 	char *meta_views;
 	char *meta_installed_info;
 };
 struct pkg_task {
 	char *pkgname;
 	const char *prefix;
 	char *install_prefix;
 	char *logdir;
 	char *install_logdir;
 	char *install_logdir_real;
 	char *other_version;
 @@ -111,27 +110,26 @@ static const struct pkg_meta_desc {
 } pkg_meta_descriptors[] = {
 	{ offsetof(struct pkg_meta, meta_contents), CONTENTS_FNAME, 1, 0644 },
 	{ offsetof(struct pkg_meta, meta_comment), COMMENT_FNAME, 1, 0444},
 	{ offsetof(struct pkg_meta, meta_desc), DESC_FNAME, 1, 0444},
 	{ offsetof(struct pkg_meta, meta_install), INSTALL_FNAME, 0, 0555 },
 	{ offsetof(struct pkg_meta, meta_deinstall), DEINSTALL_FNAME, 0, 0555 },
 	{ offsetof(struct pkg_meta, meta_display), DISPLAY_FNAME, 0, 0444 },
 	{ offsetof(struct pkg_meta, meta_mtree), MTREE_FNAME, 0, 0444 },
 	{ offsetof(struct pkg_meta, meta_build_version), BUILD_VERSION_FNAME, 0, 0444 },
 	{ offsetof(struct pkg_meta, meta_build_info), BUILD_INFO_FNAME, 0, 0444 },
 	{ offsetof(struct pkg_meta, meta_size_pkg), SIZE_PKG_FNAME, 0, 0444 },
 	{ offsetof(struct pkg_meta, meta_size_all), SIZE_ALL_FNAME, 0, 0444 },
 	{ offsetof(struct pkg_meta, meta_preserve), PRESERVE_FNAME, 0, 0444 },
 	{ offsetof(struct pkg_meta, meta_views), VIEWS_FNAME, 0, 0444 },
 	{ offsetof(struct pkg_meta, meta_required_by), REQUIRED_BY_FNAME, 0, 0644 },
 	{ offsetof(struct pkg_meta, meta_installed_info), INSTALLED_INFO_FNAME, 0, 0644 },
 	{ 0, NULL, 0, 0 },
 };
 static int pkg_do(const char *, int, int);
 static int
 end_of_version(const char *opsys, const char *version_end)
+{
     if (*version_end == '\0')
 	return 1;
 @@ -1169,50 +1167,26 @@ check_dependencies(struct pkg_task *pkg)
+		}
 		if (pkg->dep_length + 1 >= pkg->dep_allocated) {
 			char **tmp;
 			pkg->dep_allocated = 2 * pkg->dep_allocated + 1;
 			pkg->dependencies = xrealloc(pkg->dependencies,
 			    pkg->dep_allocated * sizeof(*tmp));
+		}
 		pkg->dependencies[pkg->dep_length++] = best_installed;
+	}
 	return status;
+}
 /*
  * If this package uses pkg_views, register it in the default view.
  */
 static void
 pkg_register_views(struct pkg_task *pkg)
 	if (Fake || NoView || pkg->meta_data.meta_views == NULL)
 		return;
 	if (Verbose) {
 		printf("%s/pkg_view -d %s %s%s %s%s %sadd %s\n",
 			BINDIR, pkgdb_get_dir(),
 			View ? "-w " : "", View ? View : "",
 			Viewbase ? "-W " : "", Viewbase ? Viewbase : "",
 			Verbose ? "-v " : "", pkg->pkgname);
 	fexec_skipempty(BINDIR "/pkg_view", "-d", pkgdb_get_dir(),
 			View ? "-w " : "", View ? View : "",
 			Viewbase ? "-W " : "", Viewbase ? Viewbase : "",
 			Verbose ? "-v " : "", "add", pkg->pkgname,
 			(void *)NULL);
 static int
 preserve_meta_data_file(struct pkg_task *pkg, const char *name)
+{
 	char *old_file, *new_file;
 	int rv;
 	if (Fake)
 		return 0;
 	old_file = pkgdb_pkg_file(pkg->other_version, name);
 	new_file = xasprintf("%s/%s", pkg->install_logdir, name);
 	rv = 0;
 	if (rename(old_file, new_file) == -1 && errno != ENOENT) {
 @@ -1423,32 +1397,27 @@ pkg_do(const char *pkgpath, int mark_aut
 	if (check_pkgtools_version(pkg))
 		goto clean_memory;
 	if (check_vulnerable(pkg))
 		goto clean_memory;
 	if (check_license(pkg))
 		goto clean_memory;
 	if (pkg->meta_data.meta_mtree != NULL)
 		warnx("mtree specification in pkg `%s' ignored", pkg->pkgname);
-	if (pkg->meta_data.meta_views != NULL) {
+	pkg->logdir = xasprintf("%s/%s", config_pkg_dbdir, pkg->pkgname);
 		pkg->logdir = xstrdup(pkg->prefix);
 		pkgdb_set_dir(dirname_of(pkg->logdir), 4);
 	} else {
 		pkg->logdir = xasprintf("%s/%s", config_pkg_dbdir, pkg->pkgname);
 	if (Destdir != NULL)
 		pkg->install_logdir = xasprintf("%s/%s", Destdir, pkg->logdir);
 	else
 		pkg->install_logdir = xstrdup(pkg->logdir);
 	if (NoRecord && !Fake) {
 		const char *tmpdir;
 		tmpdir = getenv("TMPDIR");
 		if (tmpdir == NULL)
 			tmpdir = "/tmp";
 @@ -1529,28 +1498,26 @@ pkg_do(const char *pkgpath, int mark_aut
 	/* XXX keep +INSTALL_INFO for updates? */
 	/* XXX keep +PRESERVE for updates? */
 	if (mark_automatic)
 		mark_as_automatic_installed(pkg->pkgname, 1);
 	pkg_register_depends(pkg);
 	if (Verbose)
 		printf("Package %s registered in %s\n", pkg->pkgname, pkg->install_logdir);
 	if (pkg->meta_data.meta_display != NULL)
 		fputs(pkg->meta_data.meta_display, stdout);
 	pkg_register_views(pkg);
 	status = 0;
 	goto clean_memory;
 nuke_pkg:
 	if (!Fake) {
 		if (pkg->other_version) {
 			warnx("Updating of %s to %s failed.",
 			    pkg->other_version, pkg->pkgname);
 			warnx("Remember to run pkg_admin rebuild-tree after fixing this.");
+		}
 		delete_package(FALSE, &pkg->plist, FALSE, Destdir);
+	}

--- pkgsrc/pkgtools/pkg_install/files/add/pkg_add.1 2010/09/14 22:26:18 1.45
+++ pkgsrc/pkgtools/pkg_install/files/add/pkg_add.1 2014/12/30 15:13:20 1.46

 @@ -1,48 +1,46 @@
-.\" $NetBSD: pkg_add.1,v 1.45 2010/09/14 22:26:18 gdt Exp $
+.\" $NetBSD: pkg_add.1,v 1.46 2014/12/30 15:13:20 wiz Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintenance
 .\" of non-core utilities.
 .\"
 .\" 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.
 .\"
 .\" Jordan K. Hubbard
 .\"
 .\"
 .\"     @(#)pkg_add.1
 .\"
-.Dd June 16, 2010
+.Dd December 27, 2014
 .Dt PKG_ADD 1
 .Os
 .Sh NAME
 .Nm pkg_add
 .Nd a utility for installing and upgrading software package distributions
 .Sh SYNOPSIS
 .Nm
-.Op Fl AfILnRUuVv
+.Op Fl AfInRUuVv
 .Op Fl C Ar config
 .Op Fl K Ar pkg_dbdir
 .Op Fl m Ar machine
 .Op Fl P Ar destdir
 .Op Fl p Ar prefix
 .Op Fl W Ar viewbase
 .Op Fl w Ar view
 .Ar Oo Oo Li ftp|http Oc Ns Li :// Ns Oo Ar user Oc Ns \
 Oo Li \&: Ns Ar password Oc \
 Ns Li @ Oc Ns Ar host Ns Oo Li \&: Ns Ar port Oc Ns \
 Oo Li / Ns Ar path/ Oc Ns Ar pkg-name ...
 .Sh DESCRIPTION
 The
 .Nm
 command is used to extract and upgrade packages that have been
 previously created with the
 .Xr pkg_create 1
 command.
 Packages are prepared collections of pre-built binaries, documentation,
 configurations, installation instructions and/or other files.
 @@ -132,28 +130,26 @@ This flag also overrides the fatal error
 architecture the package was built on differ from that of the host.
 .It Fl D
 Force updating even if the dependencies of depending packages are not
 satisfied by the new package.
 This is used by "make replace", after which one would typically
 replace the depending packages.
 .It Fl I
 If an installation script exists for a given package, do not execute it.
 .It Fl K Ar pkg_dbdir
 Override the value of the
 .Dv PKG_DBDIR
 configuration option with the value
 .Ar pkg_dbdir .
 .It Fl L
 Don't add the package to any views after installation.
 .It Fl m
 Override the machine architecture returned by uname with
 .Ar machine .
 .It Fl n
 Don't actually install a package, just report the steps that
 would be taken if it was.
 .It Fl P Ar destdir
 Prefix all file and directory names with
 .Ar destdir .
 For packages without install scripts this has the same behavior as
 using
 .Xr chroot 8 .
 .It Fl p Ar prefix
 @@ -169,34 +165,26 @@ you know what you are doing!
 Replace an already installed version from a package.
 Implies
 .Fl u .
 .It Fl u
 If the package that's being installed is already installed,
 an update is performed.
 Installed dependent packages are updated recursively, if they are too
 old to fulfill the dependencies of the to-be-installed version.
 See below for a more detailed description of the process.
 .It Fl V
 Print version number and exit.
 .It Fl v
 Turn on verbose output.
 .It Fl W Ar viewbase
 Passed down to
 .Xr pkg_view 1
 for managed views.
 .It Fl w Ar view
 Passed down to
 .Xr pkg_view 1
 for managed views.
 .El
 .Pp
 One or more
 .Ar pkg-name
 arguments may be specified, each being either a file containing the
 package (these usually ending with the
 .Dq .tgz
 suffix) or a
 URL pointing at a file available on an ftp or web site.
 Thus you may extract files directly from their anonymous ftp or WWW
 locations (e.g.,
 .Nm
 ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/i386/3.1_2007Q2/shells/bash-3.2.9.tgz
 @@ -327,31 +315,26 @@ Keyword denoting that the script is to p
 after the package has been installed.
 .El
 .It
 After installation is complete, a copy of the packing list,
 .Ar deinstall
 script, description, and display files are copied into
 .Pa \*[Lt]PKG_DBDIR\*[Gt]/\*[Lt]pkg-name\*[Gt]
 for subsequent possible use by
 .Xr pkg_delete 1 .
 Any package dependencies are recorded in the other packages'
 .Pa +REQUIRED_BY
 file.
 .It
 If the package is a depoted package, then add it to the registered
 by calling
 .Xr pkg_view 1
 accordingly.
 .It
 Finally, if we were upgrading a package, any
 .Pa +REQUIRED_BY
 file that was moved aside before upgrading was started is now moved
 back into place.
 .El
 .Pp
 The
 .Ar install
 script is called with the environment variable
 .Ev PKG_PREFIX
 set to the installation prefix (see the
 .Fl p
 option above).
 @@ -376,29 +359,26 @@ flag was given to
 .Ev PKG_DESTDIR
 will be set to
 .Ar destdir .
 Additionally,
 .Ev PKG_METADATA_DIR
 and
 .Ev PKG_REFCOUNT_DBDIR
 are prefixed with
 .Ar destdir .
 .Sh ENVIRONMENT
 See
 .Xr pkg_install.conf 5
 for options, that can also be specified using the environment.
 Packages using views are also affected by the environment variables
 documented for
 .Xr pkg_view 1 .
 .Sh EXAMPLES
 In all cases,
 .Nm
 will try to install binary packages listed in dependencies list.
 .Pp
 You can specify a compiled binary package explicitly on the command line.
 .Bd -literal
 # pkg_add /usr/pkgsrc/packages/All/tcsh-6.14.00.tgz
 .Ed
 .Pp
 If you omit the version number,
 .Nm
 will install the latest version available.

--- pkgsrc/pkgtools/pkg_install/files/admin/main.c 2013/08/03 11:45:14 1.62
+++ pkgsrc/pkgtools/pkg_install/files/admin/main.c 2014/12/30 15:13:20 1.63

 @@ -1,23 +1,23 @@
-/*	$NetBSD: main.c,v 1.62 2013/08/03 11:45:14 obache Exp $	*/
+/*	$NetBSD: main.c,v 1.63 2014/12/30 15:13:20 wiz Exp $	*/
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: main.c,v 1.62 2013/08/03 11:45:14 obache Exp $");
+__RCSID("$NetBSD: main.c,v 1.63 2014/12/30 15:13:20 wiz Exp $");
 /*-
  * Copyright (c) 1999-2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Hubert Feyrer <hubert@feyrer.de> and
  * by Joerg Sonnenberger <joerg@NetBSD.org>.
+ *
  * 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
 @@ -93,28 +93,26 @@ static const char Options[] = "C:K:SVbd:
 int	quiet, verbose;
 static void set_unset_variable(char **, Boolean);
 /* print usage message and exit */
 void
 usage(void)
+{
 	(void) fprintf(stderr, "usage: %s [-bqSVv] [-C config] [-d lsdir] [-K pkg_dbdir] [-s sfx] command [args ...]\n"
 	    "Where 'commands' and 'args' are:\n"
 	    " rebuild                     - rebuild pkgdb from +CONTENTS files\n"
 	    " rebuild-tree                - rebuild +REQUIRED_BY files from forward deps\n"
 	    " check [pkg ...]             - check md5 checksum of installed files\n"
 	    " add pkg ...                 - add pkg files to database\n"
 	    " delete pkg ...              - delete file entries for pkg in database\n"
 	    " set variable=value pkg ...  - set installation variable for package\n"
 	    " unset variable pkg ...      - unset installation variable for package\n"
 	    " lsall /path/to/pkgpattern   - list all pkgs matching the pattern\n"
 	    " lsbest /path/to/pkgpattern  - list pkgs matching the pattern best\n"
 	    " dump                        - dump database\n"
 	    " pmatch pattern pkg          - returns true if pkg matches pattern, otherwise false\n"
 	    " fetch-pkg-vulnerabilities [-s] - fetch new vulnerability file\n"
 	    " check-pkg-vulnerabilities [-s] <file> - check syntax and checksums of the vulnerability file\n"
 	    " audit [-es] [-t type] ...       - check installed packages for vulnerabilities\n"
 	    " audit-pkg [-es] [-t type] ...   - check listed packages for vulnerabilities\n"
 	    " audit-batch [-es] [-t type] ... - check packages in listed files for vulnerabilities\n"
 	    " audit-history [-t type] ...     - print all advisories for package names\n"
 	    " check-license <condition>       - check if condition is acceptable\n"
 @@ -210,35 +208,26 @@ add_pkg(const char *pkgdir, void *vp)
 		case PLIST_OPTION:
 		case PLIST_PKGCFL:
 		case PLIST_BLDDEP:
 			break;
+		}
+	}
 	free_plist(&Plist);
 	fclose(f);
 	pkgdb_close();
 	return 0;
+}
 static void
 delete1pkg(const char *pkgdir)
 	if (!pkgdb_open(ReadWrite))
 		err(EXIT_FAILURE, "cannot open pkgdb");
 	(void) pkgdb_remove_pkg(pkgdir);
 	pkgdb_close();
 static void
 rebuild(void)
+{
 	char *cachename;
 	struct pkgdb_count count;
 	count.files = 0;
 	count.directories = 0;
 	count.packages = 0;
 	cachename = pkgdb_get_database();
 	if (unlink(cachename) != 0 && errno != ENOENT)
 		err(EXIT_FAILURE, "unlink %s", cachename);
 @@ -506,41 +495,26 @@ main(int argc, char *argv[])
 					printf("%s\n", p);
 				else
 					printf("%s/%s\n", dir, p);
 				free(p);
+			}
 			argv++;
+		}
 	} else if (strcasecmp(argv[0], "list") == 0 ||
 	    strcasecmp(argv[0], "dump") == 0) {
 		pkgdb_dump();
 	} else if (strcasecmp(argv[0], "add") == 0) {
 		struct pkgdb_count count;
 		count.files = 0;
 		count.directories = 0;
 		count.packages = 0;
 		for (++argv; *argv != NULL; ++argv)
 			add_pkg(*argv, &count);
 	} else if (strcasecmp(argv[0], "delete") == 0) {
 		argv++;		/* "delete" */
 		while (*argv != NULL) {
 			delete1pkg(*argv);
 			argv++;
 	} else if (strcasecmp(argv[0], "set") == 0) {
 		argv++;		/* "set" */
 		set_unset_variable(argv, FALSE);
 	} else if (strcasecmp(argv[0], "unset") == 0) {
 		argv++;		/* "unset" */
 		set_unset_variable(argv, TRUE);
 	} else if (strcasecmp(argv[0], "config-var") == 0) {
 		argv++;
 		if (argv == NULL || argv[1] != NULL)
 			errx(EXIT_FAILURE, "config-var takes exactly one argument");
 		pkg_install_show_variable(argv[0]);
 	} else if (strcasecmp(argv[0], "check-license") == 0) {
 		if (argv[1] == NULL)

--- pkgsrc/pkgtools/pkg_install/files/admin/pkg_admin.1 2012/12/17 04:34:02 1.33
+++ pkgsrc/pkgtools/pkg_install/files/admin/pkg_admin.1 2014/12/30 15:13:20 1.34

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: pkg_admin.1,v 1.33 2012/12/17 04:34:02 agc Exp $
+.\"	$NetBSD: pkg_admin.1,v 1.34 2014/12/30 15:13:20 wiz Exp $
 .\"
 .\" Copyright (c) 1999-2010 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
 .\" This code is derived from software contributed to The NetBSD Foundation
 .\" by Hubert Feyrer <hubert@feyrer.de>.
 .\"
 .\" 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
 @@ -24,27 +24,27 @@
 .\"
 .\" 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.
 .\"
-.Dd December 14, 2012
+.Dd December 27, 2014
 .Dt PKG_ADMIN 1
 .Os
 .Sh NAME
 .Nm pkg_admin
 .Nd perform various administrative tasks to the pkg system
 .Sh SYNOPSIS
 .Nm
 .Op Fl bqSVv
 .Op Fl C Ar config
 .Op Fl d Ar lsdir
 .Op Fl K Ar pkg_dbdir
 .Op Fl s Ar sfx_pattern
 .Ar command Op args ...
 @@ -96,33 +96,26 @@ Set the shell glob pattern for package s
 names for
 .Cm lsall
 and
 .Cm lsbest .
 The default pattern is ".t[bg]z".
 .It Fl V
 Print version number and exit.
 .It Fl v
 Be more verbose.
 .El
 .Pp
 The following commands are supported:
 .Bl -tag -width indent
 .It Cm add Ar pkg ...
 For each listed package, write the absolute pathnames of the files listed in
 its
 .Pa +CONTENTS
 file together with the package they belong to into the package database.
 This should be used only by
 .Xr pkg_view 1 .
 .It Cm audit Oo Fl es Oc Oo Fl t Ar type Oc Oo Ar pkg Oc ...
 Check the listed installed packages for vulnerabilities.
 If no package is given, check all installed packages.
 If
 .Fl e
 is given, override the
 .Dv CHECK_END_OF_LIFE
 option from
 .Xr pkg_install.conf 5
 with
 .Qq Li yes .
 If
 .Fl s
 @@ -177,31 +170,26 @@ is given, also check the embedded signat
 Reports if
 .Ar file
 is a correctly signed package.
 .It Cm check-single-license Ar license
 Check if
 .Ar license
 is a valid license name and if it is in the set of acceptable licenses.
 Prints either yes or no to stdout if the condition can be parsed,
 otherwise it exits with error.
 .It Cm config-var Ar variable
 Print the current value of
 .Ar variable
 as used after parsing the configuration file.
 .It Cm delete Ar pkg ...
 For each listed package, remove all file entries in the package database that
 belong to the package.
 This should be used only by
 .Xr pkg_view 1 .
 .It Cm dump
 Dump the contents of the package database, similar to
 .Cm pkg_info -F .
 Columns are printed for the key field used in the pkgdb - the filename -,
 and the data field - the package the file belongs to.
 .It Cm fetch-pkg-vulnerabilities Oo Fl su Oc
 Fetch a new pkg-vulnerabilities file, check the format and if
 .Fl s
 is given the signature.
 If all checks are passed, write it to pkgdb.
 If
 .Fl u
 is given, the fetch is conditional and the file transfer is only done if
 @@ -300,25 +288,24 @@ Remove an installation variable.
 See
 .Xr pkg_install.conf 5
 for options, that can also be specified using the environment.
 .Sh FILES
 .Bl -tag -width /var/db/pkg/pkgdb.byfile.db -compact
 .It Pa /var/db/pkg/pkgdb.byfile.db
 .It Pa /var/db/pkg/\*[Lt]pkg\*[Gt]/+CONTENTS
 .El
 .Sh SEE ALSO
 .Xr pkg_add 1 ,
 .Xr pkg_create 1 ,
 .Xr pkg_delete 1 ,
 .Xr pkg_info 1 ,
 .Xr pkg_view 1 ,
 .Xr pkg_install.conf 5 ,
 .Xr pkgsrc 7
 .Sh HISTORY
 The
 .Nm
 command first appeared in
 .Nx 1.4 .
 .Sh AUTHORS
 The
 .Nm
 command was written by Hubert Feyrer.

--- pkgsrc/pkgtools/pkg_install/files/create/build.c 2010/04/20 00:39:13 1.15
+++ pkgsrc/pkgtools/pkg_install/files/create/build.c 2014/12/30 15:13:20 1.16

 @@ -1,23 +1,23 @@
-/*	$NetBSD: build.c,v 1.15 2010/04/20 00:39:13 joerg Exp $	*/
+/*	$NetBSD: build.c,v 1.16 2014/12/30 15:13:20 wiz Exp $	*/
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: build.c,v 1.15 2010/04/20 00:39:13 joerg Exp $");
+__RCSID("$NetBSD: build.c,v 1.16 2014/12/30 15:13:20 wiz Exp $");
 /*-
  * Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>.
  * All rights reserved.
+ *
  * This code was developed as part of Google's Summer of Code 2007 program.
+ *
  * 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.
 @@ -83,27 +83,26 @@ __RCSID("$NetBSD: build.c,v 1.15 2010/04
 #include <archive_entry.h>
 static struct memory_file *contents_file;
 static struct memory_file *comment_file;
 static struct memory_file *desc_file;
 static struct memory_file *install_file;
 static struct memory_file *deinstall_file;
 static struct memory_file *display_file;
 static struct memory_file *build_version_file;
 static struct memory_file *build_info_file;
 static struct memory_file *size_pkg_file;
 static struct memory_file *size_all_file;
 static struct memory_file *preserve_file;
 static struct memory_file *views_file;
 static void
 write_meta_file(struct memory_file *file, struct archive *archive)
+{
 	struct archive_entry *entry;
 	entry = archive_entry_new();
 	archive_entry_set_pathname(entry, file->name);
 	archive_entry_copy_stat(entry, &file->st);
 	archive_entry_set_uname(entry, file->owner);
 	archive_entry_set_gname(entry, file->group);
 @@ -282,28 +281,26 @@ make_dist(const char *pkg, const char *s
 		write_meta_file(deinstall_file, archive);
 	if (Display)
 		write_meta_file(display_file, archive);
 	if (BuildVersion)
 		write_meta_file(build_version_file, archive);
 	if (BuildInfo)
 		write_meta_file(build_info_file, archive);
 	if (SizePkg)
 		write_meta_file(size_pkg_file, archive);
 	if (SizeAll)
 		write_meta_file(size_all_file, archive);
 	if (Preserve)
 		write_meta_file(preserve_file, archive);
 	if (create_views)
 		write_meta_file(views_file, archive);
 	initial_cwd = getcwd(NULL, 0);
 	for (p = plist->head; p; p = p->next) {
 		if (p->type == PLIST_FILE) {
 			write_normal_file(p->name, archive, resolver, owner, group);
 		} else if (p->type == PLIST_CWD) {
 			chdir(p->name);
 		} else if (p->type == PLIST_IGNORE) {
 			p = p->next;
 		} else if (p->type == PLIST_CHOWN) {
 			if (p->name != NULL)
 				owner = p->name;
 @@ -397,26 +394,24 @@ pkg_build(const char *pkg, const char *f
+	}
 	if (SizePkg) {
 		size_pkg_file = load_and_add(plist, SizePkg,
 		    SIZE_PKG_FNAME, 0444);
+	}
 	if (SizeAll) {
 		size_all_file = load_and_add(plist, SizeAll,
 		    SIZE_ALL_FNAME, 0444);
+	}
 	if (Preserve) {
 		preserve_file = load_and_add(plist, Preserve,
 		    PRESERVE_FNAME, 0444);
+	}
 	if (create_views)
 		views_file = make_and_add(plist, VIEWS_FNAME, xstrdup(""), 0444);
 	/* Finally, write out the packing list */
 	stringify_plist(plist, &plist_buf, &plist_len, realprefix);
 	contents_file = make_memory_file(CONTENTS_FNAME, plist_buf, plist_len,
 	    DefaultOwner, DefaultGroup, 0644);
 	/* And stick it into a tar ball */
 	make_dist(pkg, suffix, plist);
 	return TRUE;		/* Success */
+}

--- pkgsrc/pkgtools/pkg_install/files/create/create.h 2009/11/05 16:22:32 1.14
+++ pkgsrc/pkgtools/pkg_install/files/create/create.h 2014/12/30 15:13:20 1.15

 @@ -1,14 +1,14 @@
-/* $NetBSD: create.h,v 1.14 2009/11/05 16:22:32 joerg Exp $ */
+/* $NetBSD: create.h,v 1.15 2014/12/30 15:13:20 wiz Exp $ */
 /* from FreeBSD Id: create.h,v 1.13 1997/10/08 07:46:19 charnier Exp */
 /*
  * FreeBSD install - a package for the installation and maintainance
  * of non-core utilities.
+ *
  * 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
 @@ -48,27 +48,26 @@ extern char *BuildPkgdeps;
 extern char *Pkgcfl;
 extern char *BuildVersion;
 extern char *BuildInfo;
 extern char *SizePkg;
 extern char *SizeAll;
 extern char *Preserve;
 extern char *realprefix;
 extern char *DefaultOwner;
 extern char *DefaultGroup;
 extern const char *CompressionType;
 extern int PlistOnly;
 extern int RelativeLinks;
 extern int update_pkgdb;
 extern int create_views;
 void    check_list(package_t *, const char *);
 void    copy_plist(char *, package_t *);
 struct memory_file
 	*load_memory_file(const char *, const char *,
 			  const char *, const char *, mode_t);
 struct memory_file
 	*make_memory_file(const char *, void *, size_t,
 			  const char *, const char *, mode_t);
 void	free_memory_file(struct memory_file *);
 int	pkg_perform(const char *);

--- pkgsrc/pkgtools/pkg_install/files/create/main.c 2010/01/22 13:30:41 1.19
+++ pkgsrc/pkgtools/pkg_install/files/create/main.c 2014/12/30 15:13:20 1.20

 @@ -1,100 +1,95 @@
-/*	$NetBSD: main.c,v 1.19 2010/01/22 13:30:41 joerg Exp $	*/
+/*	$NetBSD: main.c,v 1.20 2014/12/30 15:13:20 wiz Exp $	*/
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: main.c,v 1.19 2010/01/22 13:30:41 joerg Exp $");
+__RCSID("$NetBSD: main.c,v 1.20 2014/12/30 15:13:20 wiz Exp $");
 /*
  * FreeBSD install - a package for the installation and maintainance
  * of non-core utilities.
+ *
  * Jordan K. Hubbard
  * 18 July 1993
+ *
  * This is the create module.
+ *
  */
 #if HAVE_ERR_H
 #include <err.h>
 #endif
 #include "lib.h"
 #include "create.h"
-static const char Options[] = "B:C:D:EF:I:K:L:OP:S:T:UVb:c:d:f:g:i:k:ln:p:r:s:u:v";
+static const char Options[] = "B:C:D:F:I:K:L:OP:S:T:UVb:c:d:f:g:i:k:ln:p:r:s:u:v";
 char   *Prefix = NULL;
 char   *Comment = NULL;
 char   *Desc = NULL;
 char   *Display = NULL;
 char   *Install = NULL;
 char   *DeInstall = NULL;
 char   *Contents = NULL;
 char   *Pkgdeps = NULL;
 char   *BuildPkgdeps = NULL;
 char   *Pkgcfl = NULL;
 char   *BuildVersion = NULL;
 char   *BuildInfo = NULL;
 char   *SizePkg = NULL;
 char   *SizeAll = NULL;
 char   *Preserve = NULL;
 char   *DefaultOwner = NULL;
 char   *DefaultGroup = NULL;
 char   *realprefix = NULL;
 const char *CompressionType = NULL;
 int	update_pkgdb = 1;
 int	create_views = 0;
 int     PlistOnly = 0;
 int     RelativeLinks = 0;
 Boolean File2Pkg = FALSE;
 static void
 usage(void)
+{
 	fprintf(stderr,
-	    "usage: pkg_create [-ElOUVv] [-B build-info-file] [-b build-version-file]\n"
+	    "usage: pkg_create [-lOUVv] [-B build-info-file] [-b build-version-file]\n"
             "                  [-C cpkgs] [-D displayfile] [-F compression] \n"
 	    "                  [-I realprefix] [-i iscript]\n"
             "                  [-K pkg_dbdir] [-k dscript]\n"
             "                  [-n preserve-file] [-P dpkgs] [-p prefix] [-r rscript]\n"
             "                  [-S size-all-file] [-s size-pkg-file]\n"
 	    "                  [-T buildpkgs] [-u owner] [-g group]\n"
             "                  -c comment -d description -f packlist\n"
             "                  pkg-name\n");
 	exit(1);
+}
 int
 main(int argc, char **argv)
+{
 	int     ch;
 	setprogname(argv[0]);
 	while ((ch = getopt(argc, argv, Options)) != -1)
 		switch (ch) {
 		case 'v':
 			Verbose = TRUE;
 			break;
 		case 'E':
 			create_views = 1;
 			break;
 		case 'F':
 			CompressionType = optarg;
 			break;
 		case 'I':
 			realprefix = optarg;
 			break;
 		case 'O':
 			PlistOnly = 1;
 			break;
 		case 'U':

--- pkgsrc/pkgtools/pkg_install/files/create/pkg_create.1 2010/04/20 00:39:13 1.25
+++ pkgsrc/pkgtools/pkg_install/files/create/pkg_create.1 2014/12/30 15:13:20 1.26

 @@ -1,111 +1,69 @@
-.\" $NetBSD: pkg_create.1,v 1.25 2010/04/20 00:39:13 joerg Exp $
+.\" $NetBSD: pkg_create.1,v 1.26 2014/12/30 15:13:20 wiz Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintenance
 .\" of non-core utilities.
 .\"
 .\" 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.
 .\"
 .\" Jordan K. Hubbard
 .\"
 .\"
 .\"     @(#)pkg_create.1
 .\"	from FreeBSD Id: pkg_create.1,v 1.19 1997/05/02 22:00:05 max Exp
 .\"
 .\" hacked up by John Kohl for NetBSD--fixed a few bugs, extended keywords,
 .\" added dependency tracking, etc.
 .\"
 .\" [jkh] Took John's changes back and made some additional extensions for
 .\" better integration with FreeBSD's new ports collection.
 .\"
-.Dd January 20, 2010
+.Dd December 27, 2014
 .Dt PKG_CREATE 1
 .Os
 .Sh NAME
 .Nm pkg_create
 .Nd a utility for creating software package distributions
 .Sh SYNOPSIS
 .Nm
-.Op Fl ElOUVv
+.Op Fl lOUVv
 .Bk -words
 .Op Fl B Ar build-info-file
 .Ek
 .Bk -words
 .Op Fl b Ar build-version-file
 .Ek
 .Bk -words
 .Op Fl C Ar cpkgs
 .Ek
 .Bk -words
 .Op Fl D Ar displayfile
 .Ek
 .Bk -words
 .Op Fl F Ar compression
 .Ek
 .Bk -words
 .Op Fl g Ar group
 .Ek
 .Bk -words
 .Op Fl I Ar realprefix
 .Ek
 .Bk -words
 .Op Fl i Ar iscript
 .Ek
 .Bk -words
 .Op Fl K Ar pkg_dbdir
 .Ek
 .Bk -words
 .Op Fl k Ar dscript
 .Ek
 .Bk -words
 .Op Fl n Ar preserve-file
 .Ek
 .Bk -words
 .Op Fl P Ar dpkgs
 .Ek
 .Bk -words
 .Op Fl T Ar buildpkgs
 .Ek
 .Bk -words
 .Op Fl p Ar prefix
 .Ek
 .Bk -words
 .Op Fl S Ar size-all-file
 .Ek
 .Bk -words
 .Op Fl s Ar size-pkg-file
-.Ek
+.Op Fl T Ar buildpkgs
 .Bk -words
 .Op Fl t Ar template
 .Ek
 .Bk -words
 .Op Fl u Ar owner
 .Ek
 .Bk -words
 .Fl c Ar comment
 .Ek
 .Bk -words
 .Fl d Ar description
 .Ek
 .Bk -words
 .Fl f Ar packlist
 .Ek
 .Ar pkg-name
 .Sh DESCRIPTION
 The
 .Nm
 command is used to create packages that will subsequently be fed to
 one of the package extraction/info utilities.
 The input description and command line arguments for the creation of a
 package are not really meant to be human-generated, though it is easy
 enough to do so.
 It is more expected that you will use a front-end tool for
 the job rather than muddling through it yourself.
 Nonetheless, a short description of the input syntax is included in this
 document.
 @@ -148,28 +106,26 @@ or, if preceded by
 .Cm - ,
 the argument itself.
 This string should also give some idea of which version of the product
 (if any) the package represents.
 .It Fl D Ar displayfile
 Display the file after installing the package.
 Useful for things like legal notices on almost-free software, etc.
 .It Fl d Ar [-]desc
 Fetch long description for package from file
 .Ar desc
 or, if preceded by
 .Cm - ,
 the argument itself.
 .It Fl E
 Add an empty views file to the package.
 .It Fl F Ar compression
 Use
 .Ar compression
 as compression algorithm.
 This overrides the heuristic to guess the compression type from the
 output name.
 Currently supported values are bzip2, gzip, none and xz.
 .It Fl f Ar packlist
 Fetch
 .Pq packing list
 for package from the file
 .Ar packlist
 or

--- pkgsrc/pkgtools/pkg_install/files/delete/pkg_delete.1 2010/02/25 06:56:23 1.30
+++ pkgsrc/pkgtools/pkg_install/files/delete/pkg_delete.1 2014/12/30 15:13:20 1.31

 @@ -1,33 +1,33 @@
-.\" $NetBSD: pkg_delete.1,v 1.30 2010/02/25 06:56:23 wiz Exp $
+.\" $NetBSD: pkg_delete.1,v 1.31 2014/12/30 15:13:20 wiz Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintenance
 .\" of non-core utilities.
 .\"
 .\" 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.
 .\"
 .\" Jordan K. Hubbard
 .\"
 .\"
 .\"     from FreeBSD: @(#)pkg_delete.1
 .\"
-.Dd January 20, 2010
+.Dd December 27, 2014
 .Dt PKG_DELETE 1
 .Os
 .Sh NAME
 .Nm pkg_delete
 .Nd a utility for deleting previously installed software package distributions
 .Sh SYNOPSIS
 .Nm
 .Op Fl ADFfkNnORrVv
 .Op Fl K Ar pkg_dbdir
 .Op Fl P Ar destdir
 .Op Fl p Ar prefix
 .Ar pkg-name ...
 .Sh DESCRIPTION
 @@ -211,44 +211,37 @@ If a
 .Cm deinstall
 script exists for the package, it is executed before and after
 any files are removed.
 It is this script's responsibility to clean up any additional messy details
 around the package's installation, since all
 .Nm
 knows how to do is delete the files created in the original distribution.
 The
 .Ic deinstall
 script is called as:
 .Bd -filled -offset indent -compact
 .Cm deinstall
 .Aq Ar pkg-name
 .Ar VIEW-DEINSTALL
 .Ed
 before removing the package from a view, and as:
 .Bd -filled -offset indent -compact
 .Cm deinstall
 .Aq Ar pkg-name
 .Ar DEINSTALL
 .Ed
 before deleting all files and as:
 .Bd -filled -offset indent -compact
 .Cm deinstall
 .Aq Ar pkg-name
 .Ar POST-DEINSTALL
 .Ed
 after deleting them.
 Passing the keywords
-.Ar VIEW-DEINSTALL ,
+.Ar DEINSTALL
 .Ar DEINSTALL ,
 and
 .Ar POST-DEINSTALL
 lets you potentially write only one program/script that handles all
 aspects of installation and deletion.
 .Pp
 All scripts are called with the environment variable
 .Ev PKG_PREFIX
 set to the installation prefix (see the
 .Fl p
 option above).
 This allows a package author to write a script
 that reliably performs some action on the directory where the package
 is installed, even if the user might have changed it by specifying the

--- pkgsrc/pkgtools/pkg_install/files/delete/pkg_delete.c 2011/09/29 23:30:21 1.12
+++ pkgsrc/pkgtools/pkg_install/files/delete/pkg_delete.c 2014/12/30 15:13:20 1.13

 @@ -24,27 +24,27 @@
  * 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.
  */
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: pkg_delete.c,v 1.12 2011/09/29 23:30:21 wiz Exp $");
+__RCSID("$NetBSD: pkg_delete.c,v 1.13 2014/12/30 15:13:20 wiz Exp $");
 #if HAVE_ERR_H
 #include <err.h>
 #endif
 #include <stdio.h>
 #include <stdlib.h>
 #include "lib.h"
 static const char *pkgdb;
 static const char *destdir;
 static const char *prefix;
 @@ -388,103 +388,49 @@ find_preserve_pkgs(lpkg_head_t *pkgs)
 			    "for deletion:");
 		found_preserve = 1;
 		fprintf(stderr, "\t%s\n", lpp->lp_name);
+	}
 	if (!found_preserve)
 		return 0;
 	if (Force == 0 || (!unregister_only && Force == 1))
 		return 1;
 	fprintf(stderr, "...but will delete them anyway\n");
 	return 0;
+}
 /*
  * Remove package from view.  This is calling pkg_deinstall again.
  */
 static int
 remove_pkg_from_view(const char *pkg)
 	char line[MaxPathSize], *fname, *eol;
 	FILE *fp;
 	fname = pkgdb_pkg_file(pkg, VIEWS_FNAME);
 	if (isemptyfile(fname)) {
 		free(fname);
 		return 0;
 	if ((fp = fopen(fname, "r")) == NULL) {
 		warn("Unable to open `%s', aborting", fname);
 		free(fname);
 		return 1;
 	free(fname);
 	while (fgets(line, sizeof(line), fp) != NULL) {
 		if ((eol = strrchr(line, '\n')) != NULL)
 			*eol = '\0';
 		if (Verbose || Fake)
 			printf("Deleting package `%s' instance from `%s' view\n",
 			    pkg, line);
 		if (Fake)
 			continue;
 		if (fexec_skipempty(BINDIR "/pkg_delete", "-K", line,
 				    Fake ? "-n" : "",
 				    (Force > 1) ? "-f" : "",
 				    (Force > 0) ? "-f" : "",
 				    pkg, NULL) != 0) {
 			warnx("Unable to delete package `%s' from view `%s'",
 			    pkg, line);
 			fclose(fp);
 			return 1;
 	fclose(fp);
 	return 0;
 /*
  * Run the +DEINSTALL script. Depending on whether this is
- * a depoted package and whether this pre- or post-deinstall phase,
+ * pre- or post-deinstall phase, different arguments are passed down.
  * different arguments are passed down.
  */
 static int
 run_deinstall_script(const char *pkg, int do_postdeinstall)
+{
 	const char *target, *text;
-	char *fname, *fname2, *pkgdir;
+	char *fname, *pkgdir;
 	int rv;
 	fname = pkgdb_pkg_file(pkg, DEINSTALL_FNAME);
 	if (!fexists(fname)) {
 		free(fname);
 		return 0;
+	}
-	fname2 = pkgdb_pkg_file(pkg, DEPOT_FNAME);
+	if (do_postdeinstall) {
 	if (fexists(fname2)) {
 		if (do_postdeinstall) {
 			free(fname);
 			free(fname2);
 			return 0;
 		target = "VIEW-DEINSTALL";
 		text = "view deinstall";
 	} else if (do_postdeinstall) {
 		target = "POST-DEINSTALL";
 		text = "post-deinstall";
 	} else {
 		target = "DEINSTALL";
 		text = "deinstall";
+	}
 	free(fname2);
 	if (Fake) {
 		printf("Would execute %s script with argument %s now\n",
 		    text, target);
 		free(fname);
 		return 0;
+	}
 	pkgdir = pkgdb_pkg_dir(pkg);
 	if (chmod(fname, 0555))
 		warn("chmod of `%s' failed", fname);
 	rv = fcexec(pkgdir, fname, pkg, target, NULL);
 	if (rv)
 @@ -531,77 +477,26 @@ remove_line(const char *fname, const cha
+	}
 	if (rename(fname_tmp, fname) == -1) {
 		warn("Unable to rename `%s' to `%s'", fname_tmp, fname);
 		rv = 1;
 	} else
 		rv = 0;
 	remove(fname_tmp);
 	return rv;
+}
 /*
  * Unregister the package from the depot it is registered in.
  */
 static int
 remove_pkg_from_depot(const char *pkg)
 	FILE *fp;
 	char line[MaxPathSize], *eol;
 	char *fname, *fname2;
 	int rv;
 	fname = pkgdb_pkg_file(pkg, DEPOT_FNAME);
 	if (isemptyfile(fname)) {
 		free(fname);
 		return 0;
 	if (Verbose)
 		printf("Attempting to remove the `%s' registration "
 		    "on package `%s'\n", fname, pkg);
 	if (Fake) {
 		free(fname);
 		return 1;
 	if ((fp = fopen(fname, "r")) == NULL) {
 		warn("Unable to open `%s' file", fname);
 		free(fname);
 		return 1;
 	if (fgets(line, sizeof(line), fp) == NULL) {
 		fclose(fp);
 		warnx("Empty depot file `%s'", fname);
 		free(fname);
 		return 1;
 	if ((eol = strrchr(line, '\n')) != NULL)
 		*eol = '\0';
 	fclose(fp);
 	free(fname);
 	fname = pkgdb_pkg_file(pkg, VIEWS_FNAME);
 	fname2 = pkgdb_pkg_file(pkg, VIEWS_FNAME_TMP);
 	rv = remove_line(fname, fname2, line);
 	free(fname2);
 	free(fname);
 	return rv;
 /*
  * remove_depend is used as iterator function below.
  * The passed-in package name should be removed from the
  * +REQUIRED_BY list of the dependency.  Such an entry
  * can miss in a fully correct package database, if the pattern
  * matches more than one package.
  */
 static int
 remove_depend(const char *cur_pkg, void *cookie)
+{
 	const char *pkg = cookie;
 	char *fname, *fname2;
 	int rv;
 @@ -617,48 +512,39 @@ remove_depend(const char *cur_pkg, void
 	free(fname2);
 	free(fname);
 	return rv;
+}
 static int
 remove_pkg(const char *pkg)
+{
 	FILE *fp;
 	char *fname, *pkgdir;
 	package_t plist;
 	plist_t *p;
-	int is_depoted_pkg, rv, late_error;
+	int rv, late_error;
 	if (pkgdb_update_only)
 		return pkgdb_remove_pkg(pkg) ? 0 : 1;
 	fname = pkgdb_pkg_file(pkg, CONTENTS_FNAME);
 	if (!fexists(fname)) {
 		warnx("package `%s' is not installed, `%s' missing", pkg, fname);
 		free(fname);
 		return 1;
+	}
 	free(fname);
 	/* +REQUIRED_BY and +PRESERVE already checked */
 	if (remove_pkg_from_view(pkg))
 		return 1;
 	/*
 	 * The views related code has bad error handling, if e.g.
 	 * the deinstall script fails, the package remains unregistered.
 	 */
 	fname = pkgdb_pkg_file(pkg, CONTENTS_FNAME);
 	if ((fp = fopen(fname, "r")) == NULL) {
 		warnx("Failed to open `%s'", fname);
 		free(fname);
 		return 1;
+	}
 	read_plist(&plist, fp);
 	fclose(fp);
 	/*
 	 * If a prefix has been provided, remove the first @cwd and
 	 * prepend that prefix.  This allows removing packages without
 	 * @cwd if really necessary.  pkg_admin rebuild is likely needed
 @@ -702,71 +588,55 @@ remove_pkg(const char *pkg)
 		 * XXX but this is problematic for missing or changed files.
 		 * XXX At least the inability to remove files at all should
 		 * XXX be handled though.
 		 */
+	}
 	/*
 	 * Past the point of no return. Files are gone, all that is left
 	 * is cleaning up registered dependencies and removing the meta data.
 	 * Errors in the remaining part are counted, but don't stop the
 	 * processing.
 	 */
-	fname = pkgdb_pkg_file(pkg, DEPOT_FNAME);
+	for (p = plist.head; p; p = p->next) {
-	if (fexists(fname)) {
+	    if (p->type != PLIST_PKGDEP)
-		late_error |= remove_pkg_from_depot(pkg);
+		continue;
-		/* XXX error checking */
+	    if (Verbose)
-	} else {
+		printf("Attempting to remove dependency "
-		for (p = plist.head; p; p = p->next) {
+		       "on package `%s'\n", p->name);
-			if (p->type != PLIST_PKGDEP)
+	    if (Fake)
-				continue;
+		continue;
-			if (Verbose)
+	    match_installed_pkgs(p->name, remove_depend,
-				printf("Attempting to remove dependency "
+				 __UNCONST(pkg));
 				    "on package `%s'\n", p->name);
 			if (Fake)
 				continue;
 			match_installed_pkgs(p->name, remove_depend,
 			    __UNCONST(pkg));
+	}
 	free(fname);
 	free_plist(&plist);
 	if (!no_deinstall && !unregister_only)
 		late_error |= run_deinstall_script(pkg, 1);
 	fname = pkgdb_pkg_file(pkg, VIEWS_FNAME);
 	if (fexists(fname))
 		is_depoted_pkg = TRUE;
 	else
 		is_depoted_pkg = FALSE;
 	free(fname);
 	if (Fake)
 		return 0;
 	/*
 	 * Kill the pkgdb subdirectory. The files have been removed, so
 	 * this is way beyond the point of no return.
 	 */
 	pkgdir = pkgdb_pkg_dir(pkg);
 	(void) remove_files(pkgdir, "+*");
 	rv = 1;
 	if (isemptydir(pkgdir)&& rmdir(pkgdir) == 0)
 		rv = 0;
 	else if (is_depoted_pkg)
 		warnx("Depot directory `%s' is not empty", pkgdir);
 	else if (!Force)
 		warnx("Couldn't remove package directory in `%s'", pkgdir);
 	else if (recursive_remove(pkgdir, 1))
 		warn("Couldn't remove package directory `%s'", pkgdir);
 	else
 		warnx("Package directory `%s' forcefully removed", pkgdir);
 	free(pkgdir);
 	return rv | late_error;
+}
 int
 main(int argc, char *argv[])

--- pkgsrc/pkgtools/pkg_install/files/info/info.h 2009/09/11 18:00:13 1.21
+++ pkgsrc/pkgtools/pkg_install/files/info/info.h 2014/12/30 15:13:20 1.22

 @@ -1,14 +1,14 @@
-/* $NetBSD: info.h,v 1.21 2009/09/11 18:00:13 joerg Exp $ */
+/* $NetBSD: info.h,v 1.22 2014/12/30 15:13:20 wiz Exp $ */
 /* from FreeBSD Id: info.h,v 1.10 1997/02/22 16:09:40 peter Exp */
 /*-
  * Copyright (c) 2008 Joerg Sonnenberger <joerg@NetBSD.org>.
  * All rights reserved.
+ *
  * 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.
 @@ -58,27 +58,26 @@ struct pkg_meta {
 	char *meta_contents;
 	char *meta_comment;
 	char *meta_desc;
 	char *meta_mtree;
 	char *meta_build_version;
 	char *meta_build_info;
 	char *meta_size_pkg;
 	char *meta_size_all;
 	char *meta_required_by;
 	char *meta_display;
 	char *meta_install;
 	char *meta_deinstall;
 	char *meta_preserve;
 	char *meta_views;
 	char *meta_installed_info;
 	int is_installed;
 };
 #ifndef MAXINDEXSIZE
 #define MAXINDEXSIZE 60
 #endif
 #ifndef MAXNAMESIZE
 #define MAXNAMESIZE  20
 #endif
 #define SHOW_COMMENT		0x00001

--- pkgsrc/pkgtools/pkg_install/files/info/perform.c 2010/02/20 04:40:03 1.61
+++ pkgsrc/pkgtools/pkg_install/files/info/perform.c 2014/12/30 15:13:20 1.62

 @@ -1,29 +1,29 @@
-/*	$NetBSD: perform.c,v 1.61 2010/02/20 04:40:03 joerg Exp $	*/
+/*	$NetBSD: perform.c,v 1.62 2014/12/30 15:13:20 wiz Exp $	*/
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
 #if HAVE_SYS_QUEUE_H
 #include <sys/queue.h>
 #endif
 #if HAVE_SYS_WAIT_H
 #include <sys/wait.h>
 #endif
-__RCSID("$NetBSD: perform.c,v 1.61 2010/02/20 04:40:03 joerg Exp $");
+__RCSID("$NetBSD: perform.c,v 1.62 2014/12/30 15:13:20 wiz Exp $");
 /*-
  * Copyright (c) 2008 Joerg Sonnenberger <joerg@NetBSD.org>.
  * All rights reserved.
+ *
  * 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
 @@ -100,29 +100,28 @@ __RCSID("$NetBSD: perform.c,v 1.61 2010/
 #define	LOAD_CONTENTS		(1 << 0)
 #define	LOAD_COMMENT		(1 << 1)
 #define	LOAD_DESC		(1 << 2)
 #define	LOAD_INSTALL		(1 << 3)
 #define	LOAD_DEINSTALL		(1 << 4)
 #define	LOAD_DISPLAY		(1 << 5)
 #define	LOAD_MTREE		(1 << 6)
 #define	LOAD_BUILD_VERSION	(1 << 7)
 #define	LOAD_BUILD_INFO		(1 << 8)
 #define	LOAD_SIZE_PKG		(1 << 9)
 #define	LOAD_SIZE_ALL		(1 << 10)
 #define	LOAD_PRESERVE		(1 << 11)
-#define	LOAD_VIEWS		(1 << 12)
+#define	LOAD_REQUIRED_BY	(1 << 12)
-#define	LOAD_REQUIRED_BY	(1 << 13)
+#define	LOAD_INSTALLED_INFO	(1 << 13)
 #define	LOAD_INSTALLED_INFO	(1 << 14)
 static const struct pkg_meta_desc {
 	size_t entry_offset;
 	const char *entry_filename;
 	int entry_mask;
 	int required_file;
 } pkg_meta_descriptors[] = {
 	{ offsetof(struct pkg_meta, meta_contents), CONTENTS_FNAME,
 	    LOAD_CONTENTS, 1},
 	{ offsetof(struct pkg_meta, meta_comment), COMMENT_FNAME,
 	    LOAD_COMMENT, 1 },
 	{ offsetof(struct pkg_meta, meta_desc), DESC_FNAME,
 	    LOAD_DESC, 1 },
 @@ -134,28 +133,26 @@ static const struct pkg_meta_desc {
 	    LOAD_DISPLAY, 0 },
 	{ offsetof(struct pkg_meta, meta_mtree), MTREE_FNAME,
 	    LOAD_MTREE, 0 },
 	{ offsetof(struct pkg_meta, meta_build_version), BUILD_VERSION_FNAME,
 	    LOAD_BUILD_VERSION, 0 },
 	{ offsetof(struct pkg_meta, meta_build_info), BUILD_INFO_FNAME,
 	    LOAD_BUILD_INFO, 0 },
 	{ offsetof(struct pkg_meta, meta_size_pkg), SIZE_PKG_FNAME,
 	    LOAD_SIZE_PKG, 0 },
 	{ offsetof(struct pkg_meta, meta_size_all), SIZE_ALL_FNAME,
 	    LOAD_SIZE_ALL, 0 },
 	{ offsetof(struct pkg_meta, meta_preserve), PRESERVE_FNAME,
 	    LOAD_PRESERVE, 0 },
 	{ offsetof(struct pkg_meta, meta_views), VIEWS_FNAME,
 	    LOAD_VIEWS, 0 },
 	{ offsetof(struct pkg_meta, meta_required_by), REQUIRED_BY_FNAME,
 	    LOAD_REQUIRED_BY, 0 },
 	{ offsetof(struct pkg_meta, meta_installed_info), INSTALLED_INFO_FNAME,
 	    LOAD_INSTALLED_INFO, 0 },
 	{ 0, NULL, 0, 0 },
 };
 static int desired_meta_data;
 static void
 free_pkg_meta(struct pkg_meta *meta)
+{
 	const struct pkg_meta_desc *descr;

--- pkgsrc/pkgtools/pkg_install/files/lib/lib.h 2010/06/16 23:02:49 1.64
+++ pkgsrc/pkgtools/pkg_install/files/lib/lib.h 2014/12/30 15:13:21 1.65

 @@ -1,14 +1,14 @@
-/* $NetBSD: lib.h,v 1.64 2010/06/16 23:02:49 joerg Exp $ */
+/* $NetBSD: lib.h,v 1.65 2014/12/30 15:13:21 wiz Exp $ */
 /* from FreeBSD Id: lib.h,v 1.25 1997/10/08 07:48:03 charnier Exp */
 /*
  * FreeBSD install - a package for the installation and maintainance
  * of non-core utilities.
+ *
  * 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
 @@ -106,29 +106,26 @@ enum {
 #define DESC_FNAME		"+DESC"
 #define INSTALL_FNAME		"+INSTALL"
 #define DEINSTALL_FNAME		"+DEINSTALL"
 #define REQUIRED_BY_FNAME	"+REQUIRED_BY"
 #define REQUIRED_BY_FNAME_TMP	"+REQUIRED_BY.tmp"
 #define DISPLAY_FNAME		"+DISPLAY"
 #define MTREE_FNAME		"+MTREE_DIRS"
 #define BUILD_VERSION_FNAME	"+BUILD_VERSION"
 #define BUILD_INFO_FNAME	"+BUILD_INFO"
 #define INSTALLED_INFO_FNAME	"+INSTALLED_INFO"
 #define SIZE_PKG_FNAME		"+SIZE_PKG"
 #define SIZE_ALL_FNAME		"+SIZE_ALL"
 #define PRESERVE_FNAME		"+PRESERVE"
 #define VIEWS_FNAME		"+VIEWS"
 #define VIEWS_FNAME_TMP		"+VIEWS.tmp"
 #define DEPOT_FNAME		"+DEPOT"
 /* The names of special variables */
 #define AUTOMATIC_VARNAME	"automatic"
 /* Prefix for extended PLIST cmd */
 #define CMD_CHAR		'@'
 /* The name of the "prefix" environment variable given to scripts */
 #define PKG_PREFIX_VNAME	"PKG_PREFIX"
 /* The name of the "destdir" environment variable given to scripts */
 #define PKG_DESTDIR_VNAME	"PKG_DESTDIR"
 @@ -353,27 +350,26 @@ int     pkgdb_store(const char *, const
 char   *pkgdb_retrieve(const char *);
 int	pkgdb_dump(void);
 int     pkgdb_remove(const char *);
 int	pkgdb_remove_pkg(const char *);
 char   *pkgdb_refcount_dir(void);
 char   *pkgdb_get_database(void);
 const char   *pkgdb_get_dir(void);
 /*
  * Priorities:
  * 0 builtin default
  * 1 config file
  * 2 environment
  * 3 command line
  * 4 destdir/views reset
  */
 void	pkgdb_set_dir(const char *, int);
 char   *pkgdb_pkg_dir(const char *);
 char   *pkgdb_pkg_file(const char *, const char *);
 /* List of packages functions */
 lpkg_t *alloc_lpkg(const char *);
 lpkg_t *find_on_queue(lpkg_head_t *, const char *);
 void    free_lpkg(lpkg_t *);
 /* Read pkg_vulnerabilities from file */
 struct pkg_vulnerabilities *read_pkg_vulnerabilities_file(const char *, int, int);
 /* Read pkg_vulnerabilities from memory */

--- pkgsrc/pkgtools/pkg_install/files/lib/version.h 2013/09/02 10:28:44 1.166
+++ pkgsrc/pkgtools/pkg_install/files/lib/version.h 2014/12/30 15:13:21 1.167

 @@ -1,14 +1,14 @@
-/*	$NetBSD: version.h,v 1.166 2013/09/02 10:28:44 jperkin Exp $	*/
+/*	$NetBSD: version.h,v 1.167 2014/12/30 15:13:21 wiz Exp $	*/
 /*
  * Copyright (c) 2001 Thomas Klausner.  All rights reserved.
+ *
  * 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.
+ *
 @@ -17,16 +17,16 @@
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR 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.
  */
 #ifndef _INST_LIB_VERSION_H_
 #define _INST_LIB_VERSION_H_
-#define PKGTOOLS_VERSION 20130902
+#define PKGTOOLS_VERSION 20141227
 #endif /* _INST_LIB_VERSION_H_ */

--- pkgsrc/pkgtools/x11-links/buildlink3.mk 2014/06/14 21:06:52 1.58
+++ pkgsrc/pkgtools/x11-links/buildlink3.mk 2014/12/30 15:13:21 1.59

 @@ -1,31 +1,31 @@
-# $NetBSD: buildlink3.mk,v 1.58 2014/06/14 21:06:52 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.59 2014/12/30 15:13:21 wiz Exp $
+#
 # Don't include this file manually!  It will be included as necessary
 # by bsd.buildlink3.mk.
 # x11-links is sorted first in mk/buildlink3/bsd.buildlink3.mk,
 # so that symlinks created from it can be overriden by other packages.
+#
 BUILDLINK_TREE+=	x11-links
 .if !defined(X11_LINKS_BUILDLINK3_MK)
 X11_LINKS_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.x11-links+=	x11-links>=0.91
 BUILDLINK_PKGSRCDIR.x11-links?=	../../pkgtools/x11-links
 BUILDLINK_DEPMETHOD.x11-links?=	build
 # Force all of the helper programs, headers and libraries to be symlinked
-# into ${BUILDLINK_X11_DIR}, even in the "pkgviews" case.
+# into ${BUILDLINK_X11_DIR}.
+#
 BUILDLINK_CONTENTS_FILTER.x11-links=					\
 	${EGREP} '(bin/.*|include.*/|\.h$$|\.pc$$|/lib[^/]*$$)'
 # Rename the symlinks so that they appear in ${BUILDLINK_X11_DIR}/include
 # and ${BUILDLINK_X11_DIR}/lib.
+#
 BUILDLINK_FNAME_TRANSFORM.x11-links+=	-e "s|/share/x11-links/|/|"
 .endif # X11_LINKS_BUILDLINK3_MK
 BUILDLINK_TREE+=	-x11-links

--- pkgsrc/security/nikto/Makefile 2014/05/29 23:37:20 1.20
+++ pkgsrc/security/nikto/Makefile 2014/12/30 15:13:21 1.21

 @@ -1,34 +1,31 @@
-# $NetBSD: Makefile,v 1.20 2014/05/29 23:37:20 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2014/12/30 15:13:21 wiz Exp $
 DISTNAME=	nikto-1.36
 PKGREVISION=	3
 CATEGORIES=	security www
 MASTER_SITES=	http://www.cirt.net/nikto/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.cirt.net/code/nikto.shtml
 COMMENT=	URL scanner used to search for known vulnerable CGIs on websites
 DEPENDS+=	p5-Net-SSLeay>=1.20:../../security/p5-Net-SSLeay
 DEPENDS+=	nmap>=2.00:../../net/nmap
 USE_TOOLS+=	perl:run
 REPLACE_PERL=	nikto.pl
 NO_BUILD=	YES
 # NOTE: this package will not work with pkgviews due to a hardcoded
 # location for nmap.
 SUBST_CLASSES+=		conf
 SUBST_STAGE.conf=	post-patch
 SUBST_FILES.conf=	config.txt
 SUBST_SED.conf=		-e "s|@PREFIX@|${PREFIX}|g"
 SUBST_MESSAGE.conf=	Fixing PREFIX in files.
 CONF_FILES=	${PREFIX}/share/examples/nikto/config.txt \
 			 ${PREFIX}/share/nikto/config.txt
 INSTALLATION_DIRS=	bin libdata/nikto/docs libdata/nikto/plugins \
 			share/doc/nikto share/examples/nikto share/nikto
 do-install: