Fri Apr 24 14:13:06 2009 UTC ()
Regen.


(joerg)
diff -r1.16 -r1.17 pkgsrc/pkgtools/pkg_install/files/create/pkg_create.cat1
diff -r1.20 -r1.21 pkgsrc/pkgtools/pkg_install/files/delete/pkg_delete.cat1

cvs diff -r1.16 -r1.17 pkgsrc/pkgtools/pkg_install/files/create/Attic/pkg_create.cat1 (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg_install/files/create/Attic/pkg_create.cat1 2009/02/08 23:14:14 1.16
+++ pkgsrc/pkgtools/pkg_install/files/create/Attic/pkg_create.cat1 2009/04/24 14:13:06 1.17
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1PKG_CREATE(1) NetBSD General Commands Manual PKG_CREATE(1) 1PKG_CREATE(1) NetBSD General Commands Manual PKG_CREATE(1)
2 2
3NNAAMMEE 3NNAAMMEE
4 ppkkgg__ccrreeaattee -- a utility for creating software package distributions 4 ppkkgg__ccrreeaattee -- a utility for creating software package distributions
5 5
6SSYYNNOOPPSSIISS 6SSYYNNOOPPSSIISS
7 ppkkgg__ccrreeaattee [--EEllOORRUUVVvv] [--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] 7 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]
8 [--CC _c_p_k_g_s] [--DD _d_i_s_p_l_a_y_f_i_l_e] [--gg _g_r_o_u_p] [--II _r_e_a_l_p_r_e_f_i_x] 8 [--CC _c_p_k_g_s] [--DD _d_i_s_p_l_a_y_f_i_l_e] [--gg _g_r_o_u_p] [--II _r_e_a_l_p_r_e_f_i_x]
9 [--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] [--LL _S_r_c_D_i_r] 9 [--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] [--LL _S_r_c_D_i_r]
10 [--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] 10 [--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]
11 [--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] 11 [--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]
12 --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 12 --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
13 13
14DDEESSCCRRIIPPTTIIOONN 14DDEESSCCRRIIPPTTIIOONN
15 The ppkkgg__ccrreeaattee command is used to create packages that will subsequently 15 The ppkkgg__ccrreeaattee command is used to create packages that will subsequently
16 be fed to one of the package extraction/info utilities. The input 16 be fed to one of the package extraction/info utilities. The input
17 description and command line arguments for the creation of a package are 17 description and command line arguments for the creation of a package are
18 not really meant to be human-generated, though it is easy enough to do 18 not really meant to be human-generated, though it is easy enough to do
19 so. It is more expected that you will use a front-end tool for the job 19 so. It is more expected that you will use a front-end tool for the job
20 rather than muddling through it yourself. Nonetheless, a short descrip- 20 rather than muddling through it yourself. Nonetheless, a short descrip-
@@ -119,30 +119,26 @@ OOPPTTIIOONNSS @@ -119,30 +119,26 @@ OOPPTTIIOONNSS
119 form of @@bbllddddeepp directives. 119 form of @@bbllddddeepp directives.
120 120
121 --TT _b_u_i_l_d_p_k_g_s 121 --TT _b_u_i_l_d_p_k_g_s
122 The exact versions of the packages referred to in the _b_u_i_l_d_p_k_g_s 122 The exact versions of the packages referred to in the _b_u_i_l_d_p_k_g_s
123 list will be added to the packing list in the form of @@bbllddddeepp 123 list will be added to the packing list in the form of @@bbllddddeepp
124 directives. This directives are stored after those created by 124 directives. This directives are stored after those created by
125 the --PP option. _b_u_i_l_d_p_k_g_s is assumed to be a whitespace separated 125 the --PP option. _b_u_i_l_d_p_k_g_s is assumed to be a whitespace separated
126 list of package names. 126 list of package names.
127 127
128 --pp _p_r_e_f_i_x 128 --pp _p_r_e_f_i_x
129 Set _p_r_e_f_i_x as the initial directory (base) to start from in 129 Set _p_r_e_f_i_x as the initial directory (base) to start from in
130 selecting files for the package. 130 selecting files for the package.
131 131
132 --RR Re-order any directories in the PLIST file into reverse alpha- 
133 betic order, so that child directories will automatically be 
134 removed before parent directories. 
135 
136 --SS _s_i_z_e_-_a_l_l_-_f_i_l_e 132 --SS _s_i_z_e_-_a_l_l_-_f_i_l_e
137 Store the given file for later querying with the pkg_info(1) --SS 133 Store the given file for later querying with the pkg_info(1) --SS
138 flag. The file is expected to contain the size (in bytes) of all 134 flag. The file is expected to contain the size (in bytes) of all
139 files of this package plus any required packages added up and 135 files of this package plus any required packages added up and
140 stored as a ASCII string, terminated by a newline. 136 stored as a ASCII string, terminated by a newline.
141 137
142 --ss _s_i_z_e_-_p_k_g_-_f_i_l_e 138 --ss _s_i_z_e_-_p_k_g_-_f_i_l_e
143 Store the given file for later querying with the pkg_info(1) --ss 139 Store the given file for later querying with the pkg_info(1) --ss
144 flag. The file is expected to contain the size (in bytes) of all 140 flag. The file is expected to contain the size (in bytes) of all
145 files of this package added up and stored as a ASCII string, ter- 141 files of this package added up and stored as a ASCII string, ter-
146 minated by a newline. 142 minated by a newline.
147 143
148 --tt _t_e_m_p_l_a_t_e 144 --tt _t_e_m_p_l_a_t_e
@@ -224,47 +220,41 @@ PPAACCKKIINNGG LLIISSTT DDE @@ -224,47 +220,41 @@ PPAACCKKIINNGG LLIISSTT DDE
224 _u_s_e_r. Use without an arg to set back to default (extraction) 220 _u_s_e_r. Use without an arg to set back to default (extraction)
225 ownership. 221 ownership.
226 @@ggrroouupp _g_r_o_u_p 222 @@ggrroouupp _g_r_o_u_p
227 Set default group ownership for all subsequently extracted files 223 Set default group ownership for all subsequently extracted files
228 to _g_r_o_u_p. Use without an arg to set back to default (extraction) 224 to _g_r_o_u_p. Use without an arg to set back to default (extraction)
229 group ownership. 225 group ownership.
230 @@ccoommmmeenntt _s_t_r_i_n_g 226 @@ccoommmmeenntt _s_t_r_i_n_g
231 Embed a comment in the packing list. Useful in trying to docu- 227 Embed a comment in the packing list. Useful in trying to docu-
232 ment some particularly hairy sequence that may trip someone up 228 ment some particularly hairy sequence that may trip someone up
233 later. 229 later.
234 @@iiggnnoorree 230 @@iiggnnoorree
235 Used internally to tell extraction to ignore the next file (don't 231 Used internally to tell extraction to ignore the next file (don't
236 copy it anywhere), as it's used for some special purpose. 232 copy it anywhere), as it's used for some special purpose.
237 @@iiggnnoorree__iinnsstt 
238 Similar to @@iiggnnoorree, but the ignoring of the next file is delayed 
239 one evaluation cycle. This makes it possible to use this direc- 
240 tive in the _p_a_c_k_i_n_g_l_i_s_t file, so you can pack a specialized 
241 datafile in with a distribution for your install script (or some- 
242 thing) yet have the installer ignore it. 
243 @@nnaammee _n_a_m_e 233 @@nnaammee _n_a_m_e
244 Set the name of the package. This is mandatory and is usually 234 Set the name of the package. This is mandatory and is usually
245 put at the top. This name is potentially different than the name 235 put at the top. This name is potentially different than the name
246 of the file it came in, and is used when keeping track of the 236 of the file it came in, and is used when keeping track of the
247 package for later deinstallation. Note that ppkkgg__ccrreeaattee will 237 package for later deinstallation. Note that ppkkgg__ccrreeaattee will
248 derive this field from the _p_k_g_-_n_a_m_e and add it automatically if 238 derive this field from the _p_k_g_-_n_a_m_e and add it automatically if
249 none is given. 239 none is given.
 240 @@ppkkggddiirr _n_a_m_e
 241 Declare directory _n_a_m_e as managed. If it does not exist at
 242 installation time, it is created. If this directory is no longer
 243 referenced by packages and the last file or directory in it is
 244 deleted, the directory is removed as well.
250 @@ddiirrrrmm _n_a_m_e 245 @@ddiirrrrmm _n_a_m_e
251 Declare directory _n_a_m_e to be deleted at deinstall time. By 246 This command is supported for compatibility only. If directory
252 default, directories created by a package installation are not 247 _n_a_m_e exists, it will be deleted at deinstall time.
253 deleted when the package is deinstalled; this provides an 
254 explicit directory cleanup method. This directive should appear 
255 at the end of the package list. If more than one @@ddiirrrrmm direc- 
256 tives are used, the directories are removed in the order speci- 
257 fied. The _n_a_m_e directory will not be removed unless it is empty. 
258 @@ddiissppllaayy _n_a_m_e 248 @@ddiissppllaayy _n_a_m_e
259 Declare _n_a_m_e as the file to be displayed at install time (see --DD 249 Declare _n_a_m_e as the file to be displayed at install time (see --DD
260 above). 250 above).
261 @@ppkkggddeepp _p_k_g_n_a_m_e 251 @@ppkkggddeepp _p_k_g_n_a_m_e
262 Declare a dependency on the _p_k_g_n_a_m_e package. The _p_k_g_n_a_m_e package 252 Declare a dependency on the _p_k_g_n_a_m_e package. The _p_k_g_n_a_m_e package
263 must be installed before this package may be installed, and this 253 must be installed before this package may be installed, and this
264 package must be deinstalled before the _p_k_g_n_a_m_e package is dein- 254 package must be deinstalled before the _p_k_g_n_a_m_e package is dein-
265 stalled. Multiple @@ppkkggddeepp directives may be used if the package 255 stalled. Multiple @@ppkkggddeepp directives may be used if the package
266 depends on multiple other packages. 256 depends on multiple other packages.
267 @@bbllddddeepp _p_k_g_n_a_m_e 257 @@bbllddddeepp _p_k_g_n_a_m_e
268 Declare that this package was built with the exact version of 258 Declare that this package was built with the exact version of
269 _p_k_g_n_a_m_e (since the @@ppkkggddeepp directive may contain wildcards or 259 _p_k_g_n_a_m_e (since the @@ppkkggddeepp directive may contain wildcards or
270 relational package version information). 260 relational package version information).
@@ -279,14 +269,14 @@ SSEEEE AALLSSOO @@ -279,14 +269,14 @@ SSEEEE AALLSSOO
279 269
280HHIISSTTOORRYY 270HHIISSTTOORRYY
281 The ppkkgg__ccrreeaattee command first appeared in FreeBSD. 271 The ppkkgg__ccrreeaattee command first appeared in FreeBSD.
282 272
283AAUUTTHHOORRSS 273AAUUTTHHOORRSS
284 Jordan Hubbard 274 Jordan Hubbard
285 most of the work 275 most of the work
286 John Kohl 276 John Kohl
287 refined it for NetBSD 277 refined it for NetBSD
288 Hubert Feyrer 278 Hubert Feyrer
289 NetBSD wildcard dependency processing, pkgdb, pkg size recording 279 NetBSD wildcard dependency processing, pkgdb, pkg size recording
290 etc. 280 etc.
291 281
292NetBSD 5.0 July 28, 2008 NetBSD 5.0 282NetBSD 5.0 April 24, 2009 NetBSD 5.0

cvs diff -r1.20 -r1.21 pkgsrc/pkgtools/pkg_install/files/delete/Attic/pkg_delete.cat1 (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg_install/files/delete/Attic/pkg_delete.cat1 2009/02/25 16:57:51 1.20
+++ pkgsrc/pkgtools/pkg_install/files/delete/Attic/pkg_delete.cat1 2009/04/24 14:13:06 1.21
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1PKG_DELETE(1) NetBSD General Commands Manual PKG_DELETE(1) 1PKG_DELETE(1) NetBSD General Commands Manual PKG_DELETE(1)
2 2
3NNAAMMEE 3NNAAMMEE
4 ppkkgg__ddeelleettee -- a utility for deleting previously installed software pack- 4 ppkkgg__ddeelleettee -- a utility for deleting previously installed software pack-
5 age distributions 5 age distributions
6 6
7SSYYNNOOPPSSIISS 7SSYYNNOOPPSSIISS
8 ppkkgg__ddeelleettee [--AADDddFFffNNnnOORRrrVVvv] [--KK _p_k_g___d_b_d_i_r] [--PP _d_e_s_t_d_i_r] [--pp _p_r_e_f_i_x] 8 ppkkgg__ddeelleettee [--AADDFFffNNnnOORRrrVVvv] [--KK _p_k_g___d_b_d_i_r] [--PP _d_e_s_t_d_i_r] [--pp _p_r_e_f_i_x]
9 _p_k_g_-_n_a_m_e _._._. 9 _p_k_g_-_n_a_m_e _._._.
10 10
11DDEESSCCRRIIPPTTIIOONN 11DDEESSCCRRIIPPTTIIOONN
12 The ppkkgg__ddeelleettee command is used to delete packages that have been previ- 12 The ppkkgg__ddeelleettee command is used to delete packages that have been previ-
13 ously installed with the pkg_add(1) command. The given packages are 13 ously installed with the pkg_add(1) command. The given packages are
14 sorted, so that the dependencies of a package are deleted after the pack- 14 sorted, so that the dependencies of a package are deleted after the pack-
15 age. Before any action is executed, ppkkgg__ddeelleettee checks for packages that 15 age. Before any action is executed, ppkkgg__ddeelleettee checks for packages that
16 are marked as pprreesseerrvveedd or have depending packages left. Unless the --ff 16 are marked as pprreesseerrvveedd or have depending packages left. Unless the --ff
17 flag is given, ppkkgg__ddeelleettee stops on the first error. 17 flag is given, ppkkgg__ddeelleettee stops on the first error.
18 18
19WWAARRNNIINNGG 19WWAARRNNIINNGG
20 _S_i_n_c_e _t_h_e ppkkgg__ddeelleettee _c_o_m_m_a_n_d _m_a_y _e_x_e_c_u_t_e _s_c_r_i_p_t_s _o_r _p_r_o_g_r_a_m_s _p_r_o_v_i_d_e_d _b_y 20 _S_i_n_c_e _t_h_e ppkkgg__ddeelleettee _c_o_m_m_a_n_d _m_a_y _e_x_e_c_u_t_e _s_c_r_i_p_t_s _o_r _p_r_o_g_r_a_m_s _p_r_o_v_i_d_e_d _b_y
21 _a _p_a_c_k_a_g_e _f_i_l_e_, _y_o_u_r _s_y_s_t_e_m _m_a_y _b_e _s_u_s_c_e_p_t_i_b_l_e _t_o _`_`_T_r_o_j_a_n _h_o_r_s_e_s_'_' _o_r 21 _a _p_a_c_k_a_g_e _f_i_l_e_, _y_o_u_r _s_y_s_t_e_m _m_a_y _b_e _s_u_s_c_e_p_t_i_b_l_e _t_o _`_`_T_r_o_j_a_n _h_o_r_s_e_s_'_' _o_r
@@ -37,33 +37,26 @@ OOPPTTIIOONNSS @@ -37,33 +37,26 @@ OOPPTTIIOONNSS
37 pkg_info(1). If no version is given, the one currently installed 37 pkg_info(1). If no version is given, the one currently installed
38 will be removed. If the --FF flag is given, one or more (absolute) 38 will be removed. If the --FF flag is given, one or more (absolute)
39 filenames may be specified and the Package Database will be con- 39 filenames may be specified and the Package Database will be con-
40 sulted for the package to which the given file belongs. These 40 sulted for the package to which the given file belongs. These
41 packages are then deinstalled. 41 packages are then deinstalled.
42 42
43 --AA Recursively remove all automatically installed packages that were 43 --AA Recursively remove all automatically installed packages that were
44 needed by the given packages and are no longer required. See 44 needed by the given packages and are no longer required. See
45 also the --RR flag. 45 also the --RR flag.
46 46
47 --DD If a deinstallation script exists for a given package, do not 47 --DD If a deinstallation script exists for a given package, do not
48 execute it. 48 execute it.
49 49
50 --dd Remove empty directories created by file cleanup. By default, 
51 only files/directories explicitly listed in a package's contents 
52 (either as normal files/directories or with the @@ddiirrrrmm directive) 
53 will be removed at deinstallation time. This option tells 
54 ppkkgg__ddeelleettee to also remove any directories that were emptied as a 
55 result of removing the package. 
56 
57 --FF Any pkg-name given will be interpreted as pathname which is sub- 50 --FF Any pkg-name given will be interpreted as pathname which is sub-
58 sequently transformed in a (real) package name via the Package 51 sequently transformed in a (real) package name via the Package
59 Database. That way, packages can be deleted by giving a filename 52 Database. That way, packages can be deleted by giving a filename
60 instead of the package-name. 53 instead of the package-name.
61 54
62 --ff Force removal of the package, even if a dependency is recorded or 55 --ff Force removal of the package, even if a dependency is recorded or
63 the deinstall script fails. 56 the deinstall script fails.
64 57
65 --ffff Force removal of the package, even if the package is marked as a 58 --ffff Force removal of the package, even if the package is marked as a
66 pprreesseerrvveedd package. Note that this is a dangerous operation. 59 pprreesseerrvveedd package. Note that this is a dangerous operation.
67 60
68 --KK _p_k_g___d_b_d_i_r 61 --KK _p_k_g___d_b_d_i_r
69 Set _p_k_g___d_b_d_i_r as the package database directory. If this option 62 Set _p_k_g___d_b_d_i_r as the package database directory. If this option
@@ -164,14 +157,14 @@ SSEEEE AALLSSOO @@ -164,14 +157,14 @@ SSEEEE AALLSSOO
164 157
165AAUUTTHHOORRSS 158AAUUTTHHOORRSS
166 Jordan Hubbard 159 Jordan Hubbard
167 most of the work 160 most of the work
168 John Kohl 161 John Kohl
169 refined it for NetBSD 162 refined it for NetBSD
170 Hubert Feyrer 163 Hubert Feyrer
171 NetBSD wildcard dependency processing, pkgdb, recursive "down" 164 NetBSD wildcard dependency processing, pkgdb, recursive "down"
172 delete, etc. 165 delete, etc.
173 Joerg Sonnenberger 166 Joerg Sonnenberger
174 Rewrote most of the code to compute correct order of deinstalla- 167 Rewrote most of the code to compute correct order of deinstalla-
175 tion and to improve error handling. 168 tion and to improve error handling.
176 169
177NetBSD 5.0 February 25, 2009 NetBSD 5.0 170NetBSD 5.0 April 24, 2009 NetBSD 5.0