Import of pkgsrc-2015Q1

This commit is contained in:
2015-04-22 14:34:26 +02:00
committed by Lionel Sambuc
parent 9a8c06dafb
commit 4af1cdf7a9
25114 changed files with 870550 additions and 795435 deletions

View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile.in,v 1.24 2013/09/12 11:03:10 jperkin Exp $
# $NetBSD: Makefile.in,v 1.25 2015/01/22 09:19:47 jperkin Exp $
srcdir= @srcdir@
@@ -26,7 +26,7 @@ PROG= pkg_create
SSL_SUPPORT= @ssl_support@
.if empty(BOOTSTRAP)
LIBS= -linstall -lfetch @LIBS@
LIBS= -linstall -larchive -lfetch @LIBS@
.if !empty(SSL_SUPPORT)
LIBS+= -lssl -lcrypto
.endif

View File

@@ -1,4 +1,4 @@
/* $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"
@@ -7,7 +7,7 @@
#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>.
@@ -93,7 +93,6 @@ 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)
@@ -292,8 +291,6 @@ make_dist(const char *pkg, const char *suffix, const package_t *plist)
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);
@@ -407,8 +404,6 @@ pkg_build(const char *pkg, const char *full_pkg, const char *suffix,
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);

View File

@@ -1,4 +1,4 @@
/* $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 */
@@ -58,7 +58,6 @@ 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 *);

View File

@@ -1,4 +1,4 @@
/* $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"
@@ -7,7 +7,7 @@
#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
@@ -26,7 +26,7 @@ __RCSID("$NetBSD: main.c,v 1.19 2010/01/22 13:30:41 joerg Exp $");
#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;
@@ -48,7 +48,6 @@ 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;
@@ -57,7 +56,7 @@ 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"
@@ -81,10 +80,6 @@ main(int argc, char **argv)
Verbose = TRUE;
break;
case 'E':
create_views = 1;
break;
case 'F':
CompressionType = optarg;
break;

View File

@@ -1,4 +1,4 @@
.\" $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.
@@ -24,7 +24,7 @@
.\" [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
@@ -32,70 +32,28 @@
.Nd a utility for creating software package distributions
.Sh SYNOPSIS
.Nm
.Op Fl ElOUVv
.Bk -words
.Op Fl lOUVv
.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
.Bk -words
.Op Fl T Ar buildpkgs
.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
@@ -158,8 +116,6 @@ Fetch long description for package from file
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

View File

@@ -1,14 +1,14 @@
PKG_CREATE(1) NetBSD General Commands Manual PKG_CREATE(1)
PKG_CREATE(1) General Commands Manual PKG_CREATE(1)
NNAAMMEE
ppkkgg__ccrreeaattee -- a utility for creating software package distributions
SSYYNNOOPPSSIISS
ppkkgg__ccrreeaattee [--EEllOOUUVVvv] [--BB _b_u_i_l_d_-_i_n_f_o_-_f_i_l_e] [--bb _b_u_i_l_d_-_v_e_r_s_i_o_n_-_f_i_l_e]
ppkkgg__ccrreeaattee [--llOOUUVVvv] [--BB _b_u_i_l_d_-_i_n_f_o_-_f_i_l_e] [--bb _b_u_i_l_d_-_v_e_r_s_i_o_n_-_f_i_l_e]
[--CC _c_p_k_g_s] [--DD _d_i_s_p_l_a_y_f_i_l_e] [--FF _c_o_m_p_r_e_s_s_i_o_n] [--gg _g_r_o_u_p]
[--II _r_e_a_l_p_r_e_f_i_x] [--ii _i_s_c_r_i_p_t] [--KK _p_k_g___d_b_d_i_r] [--kk _d_s_c_r_i_p_t]
[--nn _p_r_e_s_e_r_v_e_-_f_i_l_e] [--PP _d_p_k_g_s] [--TT _b_u_i_l_d_p_k_g_s] [--pp _p_r_e_f_i_x]
[--SS _s_i_z_e_-_a_l_l_-_f_i_l_e] [--ss _s_i_z_e_-_p_k_g_-_f_i_l_e] [--tt _t_e_m_p_l_a_t_e] [--uu _o_w_n_e_r]
[--nn _p_r_e_s_e_r_v_e_-_f_i_l_e] [--PP _d_p_k_g_s] [--pp _p_r_e_f_i_x] [--SS _s_i_z_e_-_a_l_l_-_f_i_l_e]
[--ss _s_i_z_e_-_p_k_g_-_f_i_l_e] [--TT _b_u_i_l_d_p_k_g_s] [--tt _t_e_m_p_l_a_t_e] [--uu _o_w_n_e_r]
--cc _c_o_m_m_e_n_t --dd _d_e_s_c_r_i_p_t_i_o_n --ff _p_a_c_k_l_i_s_t _p_k_g_-_n_a_m_e
DDEESSCCRRIIPPTTIIOONN
@@ -17,8 +17,8 @@ DDEESSCCRRIIPPTTIIOONN
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 descrip-
tion of the input syntax is included in this document.
rather than muddling through it yourself. Nonetheless, a short
description of the input syntax is included in this document.
OOPPTTIIOONNSS
The following command line options are supported:
@@ -26,28 +26,28 @@ OOPPTTIIOONNSS
--BB _b_u_i_l_d_-_i_n_f_o_-_f_i_l_e
Install the file _b_u_i_l_d_-_i_n_f_o_-_f_i_l_e so that users of binary packages
can see what make(1) definitions were used to control the build
when creating the binary package. This allows various build def-
initions to be retained in a binary package and viewed wherever
it is installed, using pkg_info(1).
when creating the binary package. This allows various build
definitions to be retained in a binary package and viewed
wherever it is installed, using pkg_info(1).
--bb _b_u_i_l_d_-_v_e_r_s_i_o_n_-_f_i_l_e
Install the file _b_u_i_l_d_-_v_e_r_s_i_o_n_-_f_i_l_e so that users of binary pack-
ages can see what versions of the files used to control the build
were used when creating the binary package. This allows some
fine-grained version control information to be retained in a
Install the file _b_u_i_l_d_-_v_e_r_s_i_o_n_-_f_i_l_e so that users of binary
packages can see what versions of the files used to control the
build were used when creating the binary package. This allows
some fine-grained version control information to be retained in a
binary package and viewed wherever it is installed, using
pkg_info(1).
--CC _c_p_k_g_s
Set the initial package conflict list to _c_p_k_g_s. This is assumed
to be a whitespace separated list of package names and is meant
as a convenient shorthand for specifying multiple @@ppkkggccffll direc-
tives in the packing list (see PACKING LIST DETAILS section
as a convenient shorthand for specifying multiple @@ppkkggccffll
directives in the packing list (see PACKING LIST DETAILS section
below).
--cc _[_-_]_d_e_s_c
Fetch package (one line description) from file _d_e_s_c or, if pre-
ceded by --, the argument itself. This string should also give
Fetch package (one line description) from file _d_e_s_c or, if
preceded by --, the argument itself. This string should also give
some idea of which version of the product (if any) the package
represents.
@@ -59,8 +59,6 @@ OOPPTTIIOONNSS
Fetch long description for package from file _d_e_s_c or, if preceded
by --, the argument itself.
--EE Add an empty views file to the package.
--FF _c_o_m_p_r_e_s_s_i_o_n
Use _c_o_m_p_r_e_s_s_i_o_n as compression algorithm. This overrides the
heuristic to guess the compression type from the output name.
@@ -93,8 +91,8 @@ OOPPTTIIOONNSS
invoked automatically when the package is later (if ever) de-
installed.
--ll Check that any symbolic links which are to be placed in the pack-
age are relative to the current prefix. This means using
--ll Check that any symbolic links which are to be placed in the
package are relative to the current prefix. This means using
unlink(2) and symlink(2) to remove and re-link any symbolic links
which are targeted at full path names.
@@ -137,8 +135,8 @@ OOPPTTIIOONNSS
--ss _s_i_z_e_-_p_k_g_-_f_i_l_e
Store the given file for later querying with the pkg_info(1) --ss
flag. The file is expected to contain the size (in bytes) of all
files of this package added up and stored as a ASCII string, ter-
minated by a newline.
files of this package added up and stored as a ASCII string,
terminated by a newline.
--tt _t_e_m_p_l_a_t_e
Use _t_e_m_p_l_a_t_e as the input to mktemp(3). By default, this is the
@@ -147,8 +145,8 @@ OOPPTTIIOONNSS
Be sure to leave some number of `X' characters for mktemp(3) to
fill in with a unique ID.
--UU Do not update the package file database with any file informa-
tion.
--UU Do not update the package file database with any file
information.
--uu _o_w_n_e_r
Make _o_w_n_e_r the default owner instead of extracting it from the
@@ -162,18 +160,18 @@ PPAACCKKIINNGG LLIISSTT DDEETTAAIILLSS
The (packing list) format (see --ff) is fairly simple, being nothing more
than a single column of filenames to include in the package. However,
since absolute pathnames are generally a bad idea for a package that
could be installed potentially anywhere, there is another method of spec-
ifying where things are supposed to go and, optionally, what ownership
and mode information they should be installed with. This is done by
embedding specialized command sequences in the packing list. Briefly
described, these sequences are:
could be installed potentially anywhere, there is another method of
specifying where things are supposed to go and, optionally, what
ownership and mode information they should be installed with. This is
done by embedding specialized command sequences in the packing list.
Briefly described, these sequences are:
@@ccwwdd _d_i_r_e_c_t_o_r_y
Set the internal directory pointer to point to _d_i_r_e_c_t_o_r_y. All
subsequent filenames will be assumed relative to this directory.
Note: @@ccdd is also an alias for this command.
@@ssrrcc _d_i_r_e_c_t_o_r_y
This command is supported for compatibility only. It was for-
merly used to override @@ccwwdd during package creation.
This command is supported for compatibility only. It was
formerly used to override @@ccwwdd during package creation.
@@eexxeecc _c_o_m_m_a_n_d
Execute _c_o_m_m_a_n_d as part of the unpacking process. If _c_o_m_m_a_n_d
contains any of the following sequences somewhere in it, they
@@ -185,9 +183,9 @@ PPAACCKKIINNGG LLIISSTT DDEETTAAIILLSS
%%DD Expand to the current directory prefix, as set with @@ccwwdd,
in the example case _/_u_s_r_/_l_o_c_a_l.
%%BB Expand to the (basename) of the fully qualified filename,
that is the current directory prefix, plus the last file-
spec, minus the trailing filename. In the example case,
that would be _/_u_s_r_/_l_o_c_a_l_/_b_i_n.
that is the current directory prefix, plus the last
filespec, minus the trailing filename. In the example
case, that would be _/_u_s_r_/_l_o_c_a_l_/_b_i_n.
%%ff Expand to the (filename) part of the fully qualified
name, or the converse of %%BB, being in the example case,
_e_m_a_c_s.
@@ -197,17 +195,17 @@ PPAACCKKIINNGG LLIISSTT DDEETTAAIILLSS
not executed during the package add, as @@eexxeecc is, but rather when
the package is deleted. This is useful for deleting links and
other ancillary files that were created as a result of adding the
package, but not directly known to the package's table of con-
tents (and hence not automatically removable). The advantage of
using @@uunneexxeecc over a deinstallation script is that you can use
package, but not directly known to the package's table of
contents (and hence not automatically removable). The advantage
of using @@uunneexxeecc over a deinstallation script is that you can use
the (special sequence expansion) to get at files regardless of
where they've been potentially redirected (see --pp).
@@mmooddee _m_o_d_e
Set default permission for all subsequently extracted files to
_m_o_d_e. Format is the same as that used by the cchhmmoodd command
(well, considering that it's later handed off to it, that's no
surprise). Use without an arg to set back to default (extrac-
tion) permissions.
surprise). Use without an arg to set back to default
(extraction) permissions.
@@ooppttiioonn _o_p_t_i_o_n
Set internal package options, the only currently supported one
being _p_r_e_s_e_r_v_e, which tells pkg_add to move any existing files
@@ -222,9 +220,9 @@ PPAACCKKIINNGG LLIISSTT DDEETTAAIILLSS
to _g_r_o_u_p. Use without an arg to set back to default (extraction)
group ownership.
@@ccoommmmeenntt _s_t_r_i_n_g
Embed a comment in the packing list. Useful in trying to docu-
ment some particularly hairy sequence that may trip someone up
later.
Embed a comment in the packing list. Useful in trying to
document some particularly hairy sequence that may trip someone
up later.
@@iiggnnoorree
Used internally to tell extraction to ignore the next file (don't
copy it anywhere), as it's used for some special purpose.
@@ -249,17 +247,17 @@ PPAACCKKIINNGG LLIISSTT DDEETTAAIILLSS
@@ppkkggddeepp _p_k_g_n_a_m_e
Declare a dependency on the _p_k_g_n_a_m_e package. The _p_k_g_n_a_m_e package
must be installed before this package may be installed, and this
package must be deinstalled before the _p_k_g_n_a_m_e package is dein-
stalled. Multiple @@ppkkggddeepp directives may be used if the package
depends on multiple other packages.
package must be deinstalled before the _p_k_g_n_a_m_e package is
deinstalled. Multiple @@ppkkggddeepp directives may be used if the
package depends on multiple other packages.
@@bbllddddeepp _p_k_g_n_a_m_e
Declare that this package was built with the exact version of
_p_k_g_n_a_m_e (since the @@ppkkggddeepp directive may contain wildcards or
relational package version information).
@@ppkkggccffll _p_k_g_c_f_l_n_a_m_e
Declare a conflict with the _p_k_g_c_f_l_n_a_m_e package, as the two pack-
ages contain references to the same files, and so cannot co-exist
on the same system.
Declare a conflict with the _p_k_g_c_f_l_n_a_m_e package, as the two
packages contain references to the same files, and so cannot co-
exist on the same system.
EENNVVIIRROONNMMEENNTT
See pkg_install.conf(5) for options, that can also be specified using the
@@ -281,4 +279,4 @@ AAUUTTHHOORRSS
NetBSD wildcard dependency processing, pkgdb, pkg size recording
etc.
NetBSD 5.0 January 20, 2010 NetBSD 5.0
pkgsrc December 27, 2014 pkgsrc