 @@ -1,14 +1,14 @@
-<!-- $NetBSD: submit.xml,v 1.19 2007/08/15 06:33:46 rillig Exp $ -->
+<!-- $NetBSD: submit.xml,v 1.20 2009/05/02 16:14:37 reed Exp $ -->
 <chapter id="submit"> <?dbhtml filename="submit.html"?>
 <title>Submitting and Committing</title>
 <sect1 id="submitting-binary-packages">
 <title>Submitting binary packages</title>
 	<para>Our policy is that we accept binaries only from pkgsrc
 	developers to guarantee that the packages don't contain any
 	trojan horses etc. This is not to annoy anyone but rather to
 	protect our users! You're still free to put up your home-made
 	binary packages and tell the world where to get them. NetBSD
 	developers doing bulk builds and wanting to upload them please
 @@ -139,43 +139,84 @@
   the package.</para>
 </listitem>
 </itemizedlist>
 <para>Please also recognize that, just because a new version of a package
   has been released, it should not automatically be upgraded in the CVS
   repository.  We prefer to be conservative in the packages that are
   included in pkgsrc - development or beta packages are not really the
   best thing for most places in which pkgsrc is used. Please use your
   judgement about what should go into pkgsrc, and bear in mind that
   stability is to be preferred above new and possibly untested features.</para>
 </sect1>
 <sect1 id="renaming-package">
 <title>Renaming a package in pkgsrc</title>
 <para>Renaming packages is not recommended.</para>
 <para>When renaming packages, be sure to fix any references to old name
   in other Makefiles, options, buildlink files, etc.</para>
 <para>Also When renaming a package, please define
   <varname>SUPERSEDES</varname> to the package name and dewey version
   pattern(s) of the previous package name.
   This may be repeated for multiple renames.
   The new package would be an exact replacement.
 </para>
 <para>Note that <quote>successor</quote> in the
   CHANGES-<replaceable>YYYY</replaceable> file doesn't necessarily
   mean that it <emphasis>supersedes</emphasis>, as that successor may
   not be an exact replacement but is a suggestion for the replaced
   functionality.</para>
 </sect1>
 <sect1 id="moving-package">
 <title>Moving a package in pkgsrc</title>
 <para>It is preferred that packages are not renamed or moved, but if needed
   please follow these steps.
 </para>
 <orderedlist>
 <listitem><para>Make a copy of the directory somewhere else.</para></listitem>
 <listitem><para>Remove all CVS dirs.</para>
 <para>Alternatively to the first two steps you can also do:</para>
 <screen>&cprompt; <userinput>cvs -d user@cvs.NetBSD.org:/cvsroot export -D today pkgsrc/category/package</userinput></screen>
 <para>and use that for further work.</para>
 </listitem>
 <listitem><para>Fix <varname>CATEGORIES</varname> and any
 <varname>DEPENDS</varname> paths that just did <quote>../package</quote>
 instead of <quote>../../category/package</quote>.</para>
 </listitem>
 <listitem><para>In the modified package's Makefile, consider setting
 <varname>PREV_PKGPATH</varname> to the previous category/package
 pathname.  The <varname>PREV_PKGPATH</varname> can be used by tools
 for doing an update using pkgsrc building; for example, it can
 search the &man.pkg.summary.5; database for <varname>PREV_PKGPATH</varname>
 (if no <varname>SUPERSEDES</varname>) and then use the corresponding
 new <varname>PKGPATH</varname> for that moved package.  Note that
 it may have multiple matches, so the tool should also check on the
 <varname>PKGBASE</varname> too.  The <varname>PREV_PKGPATH</varname>
 probably has no value unless <varname>SUPERSEDES</varname> is not
 set, i.e.  <varname>PKGBASE</varname> stays the same.  </para>
 </listitem>
 <listitem><para><command>cvs import</command> the modified package in the new
 place.</para></listitem>
 <listitem><para>Check if any package depends on it:
 <screen>&cprompt; <userinput>cd /usr/pkgsrc</userinput>
 &cprompt; <userinput>grep /package */*/Makefile* */*/buildlink*</userinput></screen></para>
 </listitem>
 <listitem><para>Fix paths in packages from step 5 to point to new location.</para></listitem>
 <listitem><para><command>cvs rm (-f)</command> the package at the old location.</para></listitem>
 <listitem><para>Remove from <filename>oldcategory/Makefile</filename>.</para></listitem>

 @@ -1,14 +1,14 @@
-# $NetBSD: metadata.mk,v 1.30 2008/05/21 20:39:52 abs Exp $
+# $NetBSD: metadata.mk,v 1.31 2009/05/02 16:14:37 reed Exp $
 ######################################################################
 ### The targets below are all PRIVATE.
 ######################################################################
 ######################################################################
 ###
 ### Temporary package meta-data directory.  The contents of this directory
 ### are copied directly into the real package meta-data directory.
 ###
 PKG_DB_TMPDIR=	${WRKDIR}/.pkgdb
 unprivileged-install-hook: ${PKG_DB_TMPDIR}
 @@ -37,26 +37,32 @@ ${_BUILD_INFO_FILE}: plist
 .endif
 .if !empty(USE_TOOLS:Mgmake)
 	${RUN}${ECHO} "GMAKE=`${GMAKE} --version | ${GREP} Make`" >> ${.TARGET}.tmp
 .endif
 	${RUN}${ECHO} "PKGTOOLS_VERSION=${PKGTOOLS_VERSION}" >> ${.TARGET}.tmp
 .if defined(HOMEPAGE)
 	${RUN}${ECHO} "HOMEPAGE=${HOMEPAGE}" >> ${.TARGET}.tmp
 .endif
 	${RUN}${ECHO} "CATEGORIES=${CATEGORIES}" >> ${.TARGET}.tmp
 	${RUN}${ECHO} "MAINTAINER=${MAINTAINER}" >> ${.TARGET}.tmp
 .if defined(OWNER)
 	${RUN}${ECHO} "OWNER=${OWNER}" >> ${.TARGET}.tmp
 .endif
 .if defined(PREV_PKGPATH)
 	${RUN}${ECHO} "PREV_PKGPATH=${PREV_PKGPATH}" >> ${.TARGET}.tmp
 .endif
 .if defined(SUPERSEDES)
 	${RUN}${ECHO} "SUPERSEDES=${SUPERSEDES}" >> ${.TARGET}.tmp
 .endif
 	${RUN}${ECHO} "BUILD_DATE=${_BUILD_DATE_cmd:sh}" >> ${.TARGET}.tmp
 	${RUN}${ECHO} "BUILD_HOST=${_BUILD_HOST_cmd:sh}" >> ${.TARGET}.tmp
 .if !empty(CHECK_SHLIBS_SUPPORTED:M[yY][eE][sS])
 	${RUN}								\
 	case ${LDD:Q}"" in						\
 	"")	ldd=`${TYPE} ldd 2>/dev/null | ${AWK} '{ print $$NF }'` ;; \
 	*)	ldd=${LDD:Q} ;;						\
 	esac;								\
 	bins=`${AWK} '/(^|\/)(bin|sbin|libexec)\// { print "${DESTDIR}${PREFIX}/" $$0 } END { exit 0 }' ${_PLIST_NOKEYWORDS}`; \
 	case ${OBJECT_FMT:Q}"" in					\
 	ELF)								\
 		libs=`${AWK} '/(^|\/)lib\/lib.*\.so\.[0-9]+$$/ { print "${DESTDIR}${PREFIX}/" $$0 } END { exit 0 }' ${_PLIST_NOKEYWORDS}`; \
 		if ${TEST} -n "$$bins" -o -n "$$libs"; then		\

 @@ -1,23 +1,23 @@
-/*	$NetBSD: show.c,v 1.28 2009/04/24 14:00:25 joerg Exp $	*/
+/*	$NetBSD: show.c,v 1.29 2009/05/02 16:14:37 reed Exp $	*/
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: show.c,v 1.28 2009/04/24 14:00:25 joerg Exp $");
+__RCSID("$NetBSD: show.c,v 1.29 2009/05/02 16:14:37 reed 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
  *    documentation and/or other materials provided with the distribution.
 @@ -324,26 +324,28 @@ show_summary(struct pkg_meta *meta, pack
 	static const char *bi_vars[] = {
 		"PKGPATH",
 		"CATEGORIES",
 		"PROVIDES",
 		"REQUIRES",
 		"PKG_OPTIONS",
 		"OPSYS",
 		"OS_VERSION",
 		"MACHINE_ARCH",
 		"LICENSE",
 		"HOMEPAGE",
 		"PKGTOOLS_VERSION",
 		"BUILD_DATE",
 		"PREV_PKGPATH",
 		"SUPERSEDES",
 		NULL
 	};
 	plist_t *p;
 	struct stat st;
 	for (p = plist->head; p; p = p->next) {
 		switch (p->type) {
 		case PLIST_NAME:
 			printf("PKGNAME=%s\n", p->name);
 			break;
 		case PLIST_PKGDEP:
 			printf("DEPENDS=%s\n", p->name);

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: pkg_summary.5,v 1.8 2009/02/08 23:12:05 wiz Exp $
+.\"	$NetBSD: pkg_summary.5,v 1.9 2009/05/02 16:14:37 reed Exp $
 .\"
 .\" Copyright (c) 2006 The NetBSD Foundation
 .\"
 .\" 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.
 .\" 3. Neither the name of the NetBSD Foundation nor the names of its
 .\"    contributors may be used to endorse or promote products derived from
 @@ -17,27 +17,27 @@
 .\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION AND ITS 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 REGENTS 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 August 29, 2007
+.Dd April 11, 2009
 .Dt PKG_SUMMARY 5
 .Os
 .Sh NAME
 .Nm pkg_summary
 .Nd summary of binary package repository
 .Sh DESCRIPTION
 The file
 .Nm
 contains information about each package in a binary package
 repository as a list of variable-value pairs.
 The variables describing different packages are separated by one empty
 line.
 Each line has the format
 @@ -84,36 +84,46 @@ If empty or missing, it is OSI-approved.
 (required) The operating system on which the package was compiled.
 .It Ev OS_VERSION
 (required) The version of the operating system on which the package
 was compiled.
 .It Ev PKG_OPTIONS
 (optional) Any options selected to compile this package.
 If missing, the package does not support options.
 .It Ev PKGNAME
 (required) The name of the package.
 .It Ev PKGPATH
 (required) The path of the package directory within pkgsrc.
 .It Ev PKGTOOLS_VERSION
 (required) The version of the package tools used to create the package.
 .It Ev PREV_PKGPATH
 (optional) The previous path of the package directory within pkgsrc when
 a package was moved.
 (See
 .Ev SUPERSEDES
 below for a renamed package.)
 .It Ev PROVIDES
 (optional) A list of shared libraries provided by the package,
 including major version number, one per line.
 If missing, this package does not provide shared libraries.
 .It Ev REQUIRES
 (optional) A list of shared libraries needed by the package, including
 major version number, one per line.
 If missing, this package does not require shared libraries.
 .It Ev SIZE_PKG
 (required) The size of the package when installed, in bytes.
 .It Ev SUPERSEDES
 (optional) A list of dewey patterns of previous packages this
 package replaces, one per line.
 This is used for package renaming.
 .El
 .Pp
 The
 .Nm pkg_summary
 file can be generated using the
 .Xr pkg_info 1
 .Fl X
 option.
 For example, the following will list this data for all installed packages:
 .Pp
 .Dl "pkg_info -X -a"
 .Sh SEE ALSO
 .Xr pkg_info 1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: version.h,v 1.125 2009/04/25 21:31:14 joerg Exp $	*/
+/*	$NetBSD: version.h,v 1.126 2009/05/02 16:14:37 reed 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 "20090425"
+#define PKGTOOLS_VERSION "20090502"
 #endif /* _INST_LIB_VERSION_H_ */