Radish alpha
H
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Remove pkg2ng and conversion from the old, pkg is there for long enough now
Baptiste Daroussin committed 9 years ago
commit 47a84f18c6cf34bac36555cec43988789b48d357
parent 25e91ba
50 files changed +35 -600
modified README.md
@@ -26,7 +26,6 @@ Table of Contents:
* [pkg bootstrap](#pkgbootstrap)
* [pkg in Ports](#pkgports)
* [Building pkg using sources from Git](#pkggit)
-
* [Converting an old-style pkg database](#pkg2ng)
* [A quick usage introduction to pkg](#usageintro)
* [Getting help on the commands usage](#pkghelp)
* [Querying the local package database](#pkginfo)
@@ -321,27 +320,6 @@ get on.
	make
	sudo make install

-
<a name="pkg2ng"></a>
-
### Converting an old-style pkg database
-

-
If you're on a 9.x system or earlier and did not have a release version
-
of pkg(8) installed previously, you will need to run the pkg2ng
-
script.  This is only necessary when converting your system from the
-
old pkg_tools style packages.
-

-
In order to register your installed packages to pkg, execute the
-
commands below:
-

-
	# cd pkg/ports
-
	# sh pkg2ng
-

-
Otherwise, running any pkg(8) command that will attempt to write to
-
the local package database will automatically apply any schema
-
updates.  Be aware that these may not be backwards compatible --
-
although usually you should see no more than a warning message if you
-
try and run an older version of pkg(8) against a newer database
-
schema.
-

<a name="usageintro"></a>
## A quick usage introduction to pkg

modified configure.ac
@@ -517,7 +517,6 @@ AC_CONFIG_FILES(Makefile \
		scripts/periodic/411.pkg-backup
		scripts/periodic/460.pkg-checksum
		scripts/periodic/490.status-pkg-changes
-
		scripts/sbin/pkg2ng
		scripts/completion/_pkg.bash
		scripts/completion/_pkg)
AC_CONFIG_FILES(m4_expand([repos_makefiles]))
modified docs/Makefile.am
@@ -7,7 +7,6 @@ dist_man_MANS= pkg-add.8 \
		pkg-check.8 \
		pkg-clean.8 \
		pkg-config.8 \
-
		pkg-convert.8 \
		pkg-create.8 \
		pkg-delete.8 \
		pkg-fetch.8 \
modified docs/fix-xrefs
@@ -1,4 +1,4 @@
-
#!/usr/bin/perl
+
#!/usr/bin/env perl

use strict;
use warnings;
modified docs/pkg-add.8
@@ -120,6 +120,7 @@ See
.Xr pkg-repository 5 ,
.Xr pkg.conf 5 ,
.Xr pkg 8 ,
+
.Xr pkg-alias 8 ,
.Xr pkg-annotate 8 ,
.Xr pkg-audit 8 ,
.Xr pkg-autoremove 8 ,
@@ -127,7 +128,6 @@ See
.Xr pkg-check 8 ,
.Xr pkg-clean 8 ,
.Xr pkg-config 8 ,
-
.Xr pkg-convert 8 ,
.Xr pkg-create 8 ,
.Xr pkg-delete 8 ,
.Xr pkg-fetch 8 ,
modified docs/pkg-alias.8
@@ -66,7 +66,7 @@ for alias 'size'
.Xr pkg-backup 8 ,
.Xr pkg-check 8 ,
.Xr pkg-clean 8 ,
-
.Xr pkg-convert 8 ,
+
.Xr pkg-config 8 ,
.Xr pkg-create 8 ,
.Xr pkg-delete 8 ,
.Xr pkg-fetch 8 ,
modified docs/pkg-annotate.8
@@ -187,13 +187,13 @@ Show all packages with the foo annotation:
.Xr pkg.conf 5 ,
.Xr pkg 8 ,
.Xr pkg-add 8 ,
+
.Xr pkg-alias 8 ,
.Xr pkg-audit 8 ,
.Xr pkg-autoremove 8 ,
.Xr pkg-backup 8 ,
.Xr pkg-check 8 ,
.Xr pkg-clean 8 ,
.Xr pkg-config 8 ,
-
.Xr pkg-convert 8 ,
.Xr pkg-create 8 ,
.Xr pkg-delete 8 ,
.Xr pkg-fetch 8 ,
modified docs/pkg-audit.8
@@ -98,13 +98,13 @@ See
.Xr pkg.conf 5 ,
.Xr pkg 8 ,
.Xr pkg-add 8 ,
+
.Xr pkg-alias 8 ,
.Xr pkg-annotate 8 ,
.Xr pkg-autoremove 8 ,
.Xr pkg-backup 8 ,
.Xr pkg-check 8 ,
.Xr pkg-clean 8 ,
.Xr pkg-config 8 ,
-
.Xr pkg-convert 8 ,
.Xr pkg-create 8 ,
.Xr pkg-delete 8 ,
.Xr pkg-fetch 8 ,
modified docs/pkg-autoremove.8
@@ -65,13 +65,13 @@ See
.Xr pkg.conf 5 ,
.Xr pkg 8 ,
.Xr pkg-add 8 ,
+
.Xr pkg-alias 8 ,
.Xr pkg-annotate 8 ,
.Xr pkg-audit 8 ,
.Xr pkg-backup 8 ,
.Xr pkg-check 8 ,
.Xr pkg-clean 8 ,
.Xr pkg-config 8 ,
-
.Xr pkg-convert 8 ,
.Xr pkg-create 8 ,
.Xr pkg-delete 8 ,
.Xr pkg-fetch 8 ,
modified docs/pkg-backup.8
@@ -72,13 +72,13 @@ See
.Xr pkg.conf 5 ,
.Xr pkg 8 ,
.Xr pkg-add 8 ,
+
.Xr pkg-alias 8 ,
.Xr pkg-annotate 8 ,
.Xr pkg-audit 8 ,
.Xr pkg-autoremove 8 ,
.Xr pkg-check 8 ,
.Xr pkg-clean 8 ,
.Xr pkg-config 8 ,
-
.Xr pkg-convert 8 ,
.Xr pkg-create 8 ,
.Xr pkg-delete 8 ,
.Xr pkg-fetch 8 ,
modified docs/pkg-check.8
@@ -143,13 +143,13 @@ pkg check -sa
.Xr pkg.conf 5 ,
.Xr pkg 8 ,
.Xr pkg-add 8 ,
+
.Xr pkg-alias 8 ,
.Xr pkg-annotate 8 ,
.Xr pkg-audit 8 ,
.Xr pkg-autoremove 8 ,
.Xr pkg-backup 8 ,
.Xr pkg-clean 8 ,
.Xr pkg-config 8 ,
-
.Xr pkg-convert 8 ,
.Xr pkg-create 8 ,
.Xr pkg-delete 8 ,
.Xr pkg-fetch 8 ,
modified docs/pkg-clean.8
@@ -78,13 +78,13 @@ See
.Xr pkg.conf 5 ,
.Xr pkg 8 ,
.Xr pkg-add 8 ,
+
.Xr pkg-alias 8 ,
.Xr pkg-annotate 8 ,
.Xr pkg-audit 8 ,
.Xr pkg-autoremove 8 ,
.Xr pkg-backup 8 ,
.Xr pkg-check 8 ,
.Xr pkg-config 8 ,
-
.Xr pkg-convert 8 ,
.Xr pkg-create 8 ,
.Xr pkg-delete 8 ,
.Xr pkg-fetch 8 ,
modified docs/pkg-config.8
@@ -44,13 +44,13 @@ Getting the directories where the repositories configuration are read:
.Xr pkg.conf 5 ,
.Xr pkg 8 ,
.Xr pkg-add 8 ,
+
.Xr pkg-alias 8 ,
.Xr pkg-annotate 8 ,
.Xr pkg-audit 8 ,
.Xr pkg-autoremove 8 ,
.Xr pkg-backup 8 ,
.Xr pkg-check 8 ,
.Xr pkg-clean 8 ,
-
.Xr pkg-convert 8 ,
.Xr pkg-create 8 ,
.Xr pkg-delete 8 ,
.Xr pkg-fetch 8 ,
deleted docs/pkg-convert.8
@@ -1,88 +0,0 @@
-
.\"
-
.\" FreeBSD pkg - a next generation 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.
-
.\"
-
.\"
-
.\"     @(#)pkg.8
-
.\"
-
.Dd November 02, 2014
-
.Dt PKG-CONVERT 8
-
.Os
-
.Sh NAME
-
.Nm "pkg convert"
-
.Nd convert from/to pkgng database format
-
.Sh SYNOPSIS
-
.Nm
-
.Op Fl d Ar pkg_dbdir
-
.Op Fl n
-
.Pp
-
.Nm
-
.Op Cm --pkg-dbdir Ar pkg_dbdir
-
.Op Cm --dry-run
-
.Sh DESCRIPTION
-
.Nm
-
is used to convert from/to
-
.Xr pkg 8
-
local database to legacy pkg_install tools format.
-
.Sh OPTIONS
-
The following options are supported by
-
.Nm :
-
.Bl -tag -width revert
-
.It Fl d Ar pkg_dbdir , Cm --pkg-dbdir Ar pkg_dbdir
-
The location of the
-
.Xr pkg_add 1
-
dbdir.
-
Defaults to
-
.Fa /var/db/pkg .
-
.It Fl n , Cm --dry-run
-
Dry-run mode.
-
Do not actually convert anything.
-
Just show what would be done.
-
.El
-
.Sh FILES
-
See
-
.Xr pkg.conf 5 .
-
.Sh SEE ALSO
-
.Xr pkg_printf 3 ,
-
.Xr pkg_repos 3 ,
-
.Xr pkg-repository 5 ,
-
.Xr pkg.conf 5 ,
-
.Xr pkg 8 ,
-
.Xr pkg-add 8 ,
-
.Xr pkg-annotate 8 ,
-
.Xr pkg-audit 8 ,
-
.Xr pkg-autoremove 8 ,
-
.Xr pkg-backup 8 ,
-
.Xr pkg-check 8 ,
-
.Xr pkg-clean 8 ,
-
.Xr pkg-config 8 ,
-
.Xr pkg-create 8 ,
-
.Xr pkg-delete 8 ,
-
.Xr pkg-fetch 8 ,
-
.Xr pkg-info 8 ,
-
.Xr pkg-install 8 ,
-
.Xr pkg-lock 8 ,
-
.Xr pkg-query 8 ,
-
.Xr pkg-register 8 ,
-
.Xr pkg-repo 8 ,
-
.Xr pkg-rquery 8 ,
-
.Xr pkg-search 8 ,
-
.Xr pkg-set 8 ,
-
.Xr pkg-shell 8 ,
-
.Xr pkg-shlib 8 ,
-
.Xr pkg-ssh 8 ,
-
.Xr pkg-stats 8 ,
-
.Xr pkg-update 8 ,
-
.Xr pkg-updating 8 ,
-
.Xr pkg-upgrade 8 ,
-
.Xr pkg-version 8 ,
-
.Xr pkg-which 8
modified docs/pkg-create.8
@@ -498,6 +498,7 @@ Create package file for pkg:
.Xr pkg.conf 5 ,
.Xr pkg 8 ,
.Xr pkg-add 8 ,
+
.Xr pkg-alias 8 ,
.Xr pkg-annotate 8 ,
.Xr pkg-audit 8 ,
.Xr pkg-autoremove 8 ,
@@ -505,7 +506,6 @@ Create package file for pkg:
.Xr pkg-check 8 ,
.Xr pkg-clean 8 ,
.Xr pkg-config 8 ,
-
.Xr pkg-convert 8 ,
.Xr pkg-delete 8 ,
.Xr pkg-fetch 8 ,
.Xr pkg-info 8 ,
modified docs/pkg-delete.8
@@ -148,6 +148,7 @@ See
.Xr pkg.conf 5 ,
.Xr pkg 8 ,
.Xr pkg-add 8 ,
+
.Xr pkg-alias 8 ,
.Xr pkg-annotate 8 ,
.Xr pkg-audit 8 ,
.Xr pkg-autoremove 8 ,
@@ -155,7 +156,6 @@ See
.Xr pkg-check 8 ,
.Xr pkg-clean 8 ,
.Xr pkg-config 8 ,
-
.Xr pkg-convert 8 ,
.Xr pkg-create 8 ,
.Xr pkg-fetch 8 ,
.Xr pkg-info 8 ,
modified docs/pkg-fetch.8
@@ -142,13 +142,13 @@ for additional environment variables that control behaviour.
See
.Xr pkg.conf 5 .
.Sh SEE ALSO
-
.Xr fetch 3 ,
.Xr pkg_printf 3 ,
.Xr pkg_repos 3 ,
.Xr pkg-repository 5 ,
.Xr pkg.conf 5 ,
.Xr pkg 8 ,
.Xr pkg-add 8 ,
+
.Xr pkg-alias 8 ,
.Xr pkg-annotate 8 ,
.Xr pkg-audit 8 ,
.Xr pkg-autoremove 8 ,
@@ -156,7 +156,6 @@ See
.Xr pkg-check 8 ,
.Xr pkg-clean 8 ,
.Xr pkg-config 8 ,
-
.Xr pkg-convert 8 ,
.Xr pkg-create 8 ,
.Xr pkg-delete 8 ,
.Xr pkg-info 8 ,
modified docs/pkg-info.8
@@ -182,6 +182,7 @@ See
.Xr pkg.conf 5 ,
.Xr pkg 8 ,
.Xr pkg-add 8 ,
+
.Xr pkg-alias 8 ,
.Xr pkg-annotate 8 ,
.Xr pkg-audit 8 ,
.Xr pkg-autoremove 8 ,
@@ -189,7 +190,6 @@ See
.Xr pkg-check 8 ,
.Xr pkg-clean 8 ,
.Xr pkg-config 8 ,
-
.Xr pkg-convert 8 ,
.Xr pkg-create 8 ,
.Xr pkg-delete 8 ,
.Xr pkg-fetch 8 ,
modified docs/pkg-install.8
@@ -206,6 +206,7 @@ See
.Xr pkg.conf 5 ,
.Xr pkg 8 ,
.Xr pkg-add 8 ,
+
.Xr pkg-alias 8 ,
.Xr pkg-annotate 8 ,
.Xr pkg-audit 8 ,
.Xr pkg-autoremove 8 ,
@@ -213,7 +214,6 @@ See
.Xr pkg-check 8 ,
.Xr pkg-clean 8 ,
.Xr pkg-config 8 ,
-
.Xr pkg-convert 8 ,
.Xr pkg-create 8 ,
.Xr pkg-delete 8 ,
.Xr pkg-fetch 8 ,
modified docs/pkg-lock.8
@@ -150,6 +150,7 @@ See
.Xr pkg.conf 5 ,
.Xr pkg 8 ,
.Xr pkg-add 8 ,
+
.Xr pkg-alias 8 ,
.Xr pkg-annotate 8 ,
.Xr pkg-audit 8 ,
.Xr pkg-autoremove 8 ,
@@ -157,7 +158,6 @@ See
.Xr pkg-check 8 ,
.Xr pkg-clean 8 ,
.Xr pkg-config 8 ,
-
.Xr pkg-convert 8 ,
.Xr pkg-create 8 ,
.Xr pkg-delete 8 ,
.Xr pkg-fetch 8 ,
modified docs/pkg-query.8
@@ -390,6 +390,7 @@ List unmaintained packages:
.Xr pkg.conf 5 ,
.Xr pkg 8 ,
.Xr pkg-add 8 ,
+
.Xr pkg-alias 8 ,
.Xr pkg-annotate 8 ,
.Xr pkg-audit 8 ,
.Xr pkg-autoremove 8 ,
@@ -397,7 +398,6 @@ List unmaintained packages:
.Xr pkg-check 8 ,
.Xr pkg-clean 8 ,
.Xr pkg-config 8 ,
-
.Xr pkg-convert 8 ,
.Xr pkg-create 8 ,
.Xr pkg-delete 8 ,
.Xr pkg-fetch 8 ,
modified docs/pkg-register.8
@@ -184,6 +184,7 @@ See
.Xr pkg.conf 5 ,
.Xr pkg 8 ,
.Xr pkg-add 8 ,
+
.Xr pkg-alias 8 ,
.Xr pkg-annotate 8 ,
.Xr pkg-audit 8 ,
.Xr pkg-autoremove 8 ,
@@ -191,7 +192,6 @@ See
.Xr pkg-check 8 ,
.Xr pkg-clean 8 ,
.Xr pkg-config 8 ,
-
.Xr pkg-convert 8 ,
.Xr pkg-create 8 ,
.Xr pkg-delete 8 ,
.Xr pkg-fetch 8 ,
modified docs/pkg-repo.8
@@ -207,6 +207,7 @@ See
.Xr pkg.conf 5 ,
.Xr pkg 8 ,
.Xr pkg-add 8 ,
+
.Xr pkg-alias 8 ,
.Xr pkg-annotate 8 ,
.Xr pkg-audit 8 ,
.Xr pkg-autoremove 8 ,
@@ -214,7 +215,6 @@ See
.Xr pkg-check 8 ,
.Xr pkg-clean 8 ,
.Xr pkg-config 8 ,
-
.Xr pkg-convert 8 ,
.Xr pkg-create 8 ,
.Xr pkg-delete 8 ,
.Xr pkg-fetch 8 ,
modified docs/pkg-repository.5
@@ -269,12 +269,12 @@ in
.Pa pkg.conf .
.Pp
.Sh SEE ALSO
-
.Xr fetch 3 ,
.Xr pkg_printf 3 ,
.Xr pkg_repos 3 ,
.Xr pkg.conf 5 ,
.Xr pkg 8 ,
.Xr pkg-add 8 ,
+
.Xr pkg-alias 8 ,
.Xr pkg-annotate 8 ,
.Xr pkg-audit 8 ,
.Xr pkg-autoremove 8 ,
@@ -282,7 +282,6 @@ in
.Xr pkg-check 8 ,
.Xr pkg-clean 8 ,
.Xr pkg-config 8 ,
-
.Xr pkg-convert 8 ,
.Xr pkg-create 8 ,
.Xr pkg-delete 8 ,
.Xr pkg-fetch 8 ,
modified docs/pkg-rquery.8
@@ -349,6 +349,7 @@ for example usage.
.Xr pkg.conf 5 ,
.Xr pkg 8 ,
.Xr pkg-add 8 ,
+
.Xr pkg-alias 8 ,
.Xr pkg-annotate 8 ,
.Xr pkg-audit 8 ,
.Xr pkg-autoremove 8 ,
@@ -356,7 +357,6 @@ for example usage.
.Xr pkg-check 8 ,
.Xr pkg-clean 8 ,
.Xr pkg-config 8 ,
-
.Xr pkg-convert 8 ,
.Xr pkg-create 8 ,
.Xr pkg-delete 8 ,
.Xr pkg-fetch 8 ,
modified docs/pkg-search.8
@@ -469,6 +469,7 @@ See
.Xr pkg.conf 5 ,
.Xr pkg 8 ,
.Xr pkg-add 8 ,
+
.Xr pkg-alias 8 ,
.Xr pkg-annotate 8 ,
.Xr pkg-audit 8 ,
.Xr pkg-autoremove 8 ,
@@ -476,7 +477,6 @@ See
.Xr pkg-check 8 ,
.Xr pkg-clean 8 ,
.Xr pkg-config 8 ,
-
.Xr pkg-convert 8 ,
.Xr pkg-create 8 ,
.Xr pkg-delete 8 ,
.Xr pkg-fetch 8 ,
modified docs/pkg-set.8
@@ -148,6 +148,7 @@ for further description.
.Xr pkg.conf 5 ,
.Xr pkg 8 ,
.Xr pkg-add 8 ,
+
.Xr pkg-alias 8 ,
.Xr pkg-annotate 8 ,
.Xr pkg-audit 8 ,
.Xr pkg-autoremove 8 ,
@@ -155,7 +156,6 @@ for further description.
.Xr pkg-check 8 ,
.Xr pkg-clean 8 ,
.Xr pkg-config 8 ,
-
.Xr pkg-convert 8 ,
.Xr pkg-create 8 ,
.Xr pkg-delete 8 ,
.Xr pkg-fetch 8 ,
modified docs/pkg-shell.8
@@ -56,6 +56,7 @@ See
.Xr pkg.conf 5 ,
.Xr pkg 8 ,
.Xr pkg-add 8 ,
+
.Xr pkg-alias 8 ,
.Xr pkg-annotate 8 ,
.Xr pkg-audit 8 ,
.Xr pkg-autoremove 8 ,
@@ -63,7 +64,6 @@ See
.Xr pkg-check 8 ,
.Xr pkg-clean 8 ,
.Xr pkg-config 8 ,
-
.Xr pkg-convert 8 ,
.Xr pkg-create 8 ,
.Xr pkg-delete 8 ,
.Xr pkg-fetch 8 ,
modified docs/pkg-shlib.8
@@ -75,6 +75,7 @@ See
.Xr pkg.conf 5 ,
.Xr pkg 8 ,
.Xr pkg-add 8 ,
+
.Xr pkg-alias 8 ,
.Xr pkg-annotate 8 ,
.Xr pkg-audit 8 ,
.Xr pkg-autoremove 8 ,
@@ -82,7 +83,6 @@ See
.Xr pkg-check 8 ,
.Xr pkg-clean 8 ,
.Xr pkg-config 8 ,
-
.Xr pkg-convert 8 ,
.Xr pkg-create 8 ,
.Xr pkg-delete 8 ,
.Xr pkg-fetch 8 ,
modified docs/pkg-ssh.8
@@ -54,6 +54,7 @@ See
.Xr pkg.conf 5 ,
.Xr pkg 8 ,
.Xr pkg-add 8 ,
+
.Xr pkg-alias 8 ,
.Xr pkg-annotate 8 ,
.Xr pkg-audit 8 ,
.Xr pkg-autoremove 8 ,
@@ -61,7 +62,6 @@ See
.Xr pkg-check 8 ,
.Xr pkg-clean 8 ,
.Xr pkg-config 8 ,
-
.Xr pkg-convert 8 ,
.Xr pkg-create 8 ,
.Xr pkg-delete 8 ,
.Xr pkg-fetch 8 ,
modified docs/pkg-stats.8
@@ -59,6 +59,7 @@ See
.Xr pkg.conf 5 ,
.Xr pkg 8 ,
.Xr pkg-add 8 ,
+
.Xr pkg-alias 8 ,
.Xr pkg-annotate 8 ,
.Xr pkg-audit 8 ,
.Xr pkg-autoremove 8 ,
@@ -66,7 +67,6 @@ See
.Xr pkg-check 8 ,
.Xr pkg-clean 8 ,
.Xr pkg-config 8 ,
-
.Xr pkg-convert 8 ,
.Xr pkg-create 8 ,
.Xr pkg-delete 8 ,
.Xr pkg-fetch 8 ,
modified docs/pkg-update.8
@@ -104,6 +104,7 @@ See
.Xr pkg.conf 5 ,
.Xr pkg 8 ,
.Xr pkg-add 8 ,
+
.Xr pkg-alias 8 ,
.Xr pkg-annotate 8 ,
.Xr pkg-audit 8 ,
.Xr pkg-autoremove 8 ,
@@ -111,7 +112,6 @@ See
.Xr pkg-check 8 ,
.Xr pkg-clean 8 ,
.Xr pkg-config 8 ,
-
.Xr pkg-convert 8 ,
.Xr pkg-create 8 ,
.Xr pkg-delete 8 ,
.Xr pkg-fetch 8 ,
modified docs/pkg-updating.8
@@ -88,6 +88,7 @@ installed ports:
.Xr pkg.conf 5 ,
.Xr pkg 8 ,
.Xr pkg-add 8 ,
+
.Xr pkg-alias 8 ,
.Xr pkg-annotate 8 ,
.Xr pkg-audit 8 ,
.Xr pkg-autoremove 8 ,
@@ -95,7 +96,6 @@ installed ports:
.Xr pkg-check 8 ,
.Xr pkg-clean 8 ,
.Xr pkg-config 8 ,
-
.Xr pkg-convert 8 ,
.Xr pkg-create 8 ,
.Xr pkg-delete 8 ,
.Xr pkg-fetch 8 ,
modified docs/pkg-upgrade.8
@@ -200,6 +200,7 @@ See
.Xr pkg.conf 5 ,
.Xr pkg 8 ,
.Xr pkg-add 8 ,
+
.Xr pkg-alias 8 ,
.Xr pkg-annotate 8 ,
.Xr pkg-audit 8 ,
.Xr pkg-autoremove 8 ,
@@ -207,7 +208,6 @@ See
.Xr pkg-check 8 ,
.Xr pkg-clean 8 ,
.Xr pkg-config 8 ,
-
.Xr pkg-convert 8 ,
.Xr pkg-create 8 ,
.Xr pkg-delete 8 ,
.Xr pkg-fetch 8 ,
modified docs/pkg-version.8
@@ -299,6 +299,7 @@ The following command compares two package version strings:
.Xr pkg.conf 5 ,
.Xr pkg 8 ,
.Xr pkg-add 8 ,
+
.Xr pkg-alias 8 ,
.Xr pkg-annotate 8 ,
.Xr pkg-audit 8 ,
.Xr pkg-autoremove 8 ,
@@ -306,7 +307,6 @@ The following command compares two package version strings:
.Xr pkg-check 8 ,
.Xr pkg-clean 8 ,
.Xr pkg-config 8 ,
-
.Xr pkg-convert 8 ,
.Xr pkg-create 8 ,
.Xr pkg-delete 8 ,
.Xr pkg-fetch 8 ,
modified docs/pkg-which.8
@@ -67,6 +67,7 @@ See
.Xr pkg.conf 5 ,
.Xr pkg 8 ,
.Xr pkg-add 8 ,
+
.Xr pkg-alias 8 ,
.Xr pkg-annotate 8 ,
.Xr pkg-audit 8 ,
.Xr pkg-autoremove 8 ,
@@ -74,7 +75,6 @@ See
.Xr pkg-check 8 ,
.Xr pkg-clean 8 ,
.Xr pkg-config 8 ,
-
.Xr pkg-convert 8 ,
.Xr pkg-create 8 ,
.Xr pkg-delete 8 ,
.Xr pkg-fetch 8 ,
modified docs/pkg.8
@@ -362,15 +362,12 @@ Check for missing dependencies:
.Dl # pkg check -d -a
.\" ---------------------------------------------------------------------------
.Sh SEE ALSO
-
.Xr SBUF 9 ,
-
.Xr elf 3 ,
-
.Xr fetch 3 ,
-
.Xr libarchive 3 ,
.Xr pkg_printf 3 ,
.Xr pkg_repos 3 ,
.Xr pkg-repository 5 ,
.Xr pkg.conf 5 ,
.Xr pkg-add 8 ,
+
.Xr pkg-alias 8 ,
.Xr pkg-annotate 8 ,
.Xr pkg-audit 8 ,
.Xr pkg-autoremove 8 ,
@@ -378,7 +375,6 @@ Check for missing dependencies:
.Xr pkg-check 8 ,
.Xr pkg-clean 8 ,
.Xr pkg-config 8 ,
-
.Xr pkg-convert 8 ,
.Xr pkg-create 8 ,
.Xr pkg-delete 8 ,
.Xr pkg-fetch 8 ,
modified docs/pkg.conf.5
@@ -573,12 +573,12 @@ from, and subsequently passes it in the environment to
which ignores it (possibly with a deprecation warning that should be
ignored), and reads the configuration files instead.
.Sh SEE ALSO
-
.Xr fetch 3 ,
.Xr pkg_printf 3 ,
.Xr pkg_repos 3 ,
.Xr pkg-repository 5 ,
.Xr pkg 8 ,
.Xr pkg-add 8 ,
+
.Xr pkg-alias 8 ,
.Xr pkg-annotate 8 ,
.Xr pkg-audit 8 ,
.Xr pkg-autoremove 8 ,
@@ -586,7 +586,6 @@ ignored), and reads the configuration files instead.
.Xr pkg-check 8 ,
.Xr pkg-clean 8 ,
.Xr pkg-config 8 ,
-
.Xr pkg-convert 8 ,
.Xr pkg-create 8 ,
.Xr pkg-delete 8 ,
.Xr pkg-fetch 8 ,
modified docs/pkg_printf.3
@@ -926,15 +926,12 @@ An invalid wide character code was encountered.
Insufficient storage space is available.
.El
.Sh SEE ALSO
-
.Xr printf 1 ,
-
.Xr printf 3 ,
-
.Xr strftime 3 ,
-
.Xr setlocale 3
.Xr pkg_repos 3 ,
.Xr pkg-repository 5 ,
.Xr pkg.conf 5 ,
.Xr pkg 8 ,
.Xr pkg-add 8 ,
+
.Xr pkg-alias 8 ,
.Xr pkg-annotate 8 ,
.Xr pkg-audit 8 ,
.Xr pkg-autoremove 8 ,
@@ -942,7 +939,6 @@ Insufficient storage space is available.
.Xr pkg-check 8 ,
.Xr pkg-clean 8 ,
.Xr pkg-config 8 ,
-
.Xr pkg-convert 8 ,
.Xr pkg-create 8 ,
.Xr pkg-delete 8 ,
.Xr pkg-fetch 8 ,
modified libpkg/Makefile.am
@@ -61,7 +61,6 @@ libpkg_la_SOURCES= pkg.c \
			scripts.c \
			utils.c \
			plugins.c \
-
			pkg_old.c \
			merge3.c \
			diff.c \
			sha256.c
modified libpkg/pkg.h.in
@@ -1484,8 +1484,6 @@ int pkg_get_myarch(char *pkgarch, size_t sz);
int pkg_get_myarch_legacy(char *pkgarch, size_t sz);

void pkgdb_cmd(int argc, char **argv);
-
int pkg_old_load_from_path(struct pkg *pkg, const char *path);
-
int pkg_from_old(struct pkg *pkg);
int pkg_sshserve(int fd);

int pkg_repos_total_count(void);
deleted libpkg/pkg_old.c
@@ -1,123 +0,0 @@
-
/*-
-
 * Copyright (c) 2012-2013 Baptiste Daroussin <bapt@FreeBSD.org>
-
 * Copyright (c) 2013 Bryan Drewery <bdrewery@FreeBSD.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
-
 *    in this position and unchanged.
-
 * 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.
-
 * 
-
 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``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 AUTHOR(S) 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.
-
 */
-

-
#include <regex.h>
-

-
#include <pkg.h>
-
#include <private/pkg.h>
-

-
static const char * const scripts[] = {
-
	"+INSTALL",
-
	"+PRE_INSTALL",
-
	"+POST_INSTALL",
-
	"+POST_INSTALL",
-
	"+DEINSTALL",
-
	"+PRE_DEINSTALL",
-
	"+POST_DEINSTALL",
-
	"+UPGRADE",
-
	"+PRE_UPGRADE",
-
	"+POST_UPGRADE",
-
	"pkg-install",
-
	"pkg-pre-install",
-
	"pkg-post-install",
-
	"pkg-deinstall",
-
	"pkg-pre-deinstall",
-
	"pkg-post-deinstall",
-
	"pkg-upgrade",
-
	"pkg-pre-upgrade",
-
	"pkg-post-upgrade",
-
	NULL
-
};
-

-
int
-
pkg_old_load_from_path(struct pkg *pkg, const char *path)
-
{
-
	char fpath[MAXPATHLEN];
-
	regex_t preg;
-
	regmatch_t pmatch[2];
-
	int i;
-
	size_t size;
-
	char myarch[BUFSIZ];
-

-
	if (!is_dir(path))
-
		return (EPKG_FATAL);
-

-
	snprintf(fpath, sizeof(fpath), "%s/+CONTENTS", path);
-
	if (ports_parse_plist(pkg, fpath, NULL) != EPKG_OK)
-
		return (EPKG_FATAL);
-

-
	snprintf(fpath, sizeof(fpath), "%s/+COMMENT", path);
-
	if (access(fpath, F_OK) == 0)
-
		pkg_set_from_file(pkg, PKG_COMMENT, fpath, true);
-

-
	snprintf(fpath, sizeof(fpath), "%s/+DESC", path);
-
	if (access(fpath, F_OK) == 0)
-
		pkg_set_from_file(pkg, PKG_DESC, fpath, false);
-

-
	snprintf(fpath, sizeof(fpath), "%s/+DISPLAY", path);
-
	if (access(fpath, F_OK) == 0)
-
		pkg_set_from_file(pkg, PKG_MESSAGE, fpath, false);
-

-
	snprintf(fpath, sizeof(fpath), "%s/+MTREE_DIRS", path);
-
	if (access(fpath, F_OK) == 0)
-
		pkg_set_from_file(pkg, PKG_MTREE, fpath, false);
-

-
	for (i = 0; scripts[i] != NULL; i++) {
-
		snprintf(fpath, sizeof(fpath), "%s/%s", path, scripts[i]);
-
		if (access(fpath, F_OK) == 0)
-
			pkg_addscript_file(pkg, fpath);
-
	}
-

-
	pkg_get_myarch(myarch, BUFSIZ);
-
	pkg->arch = xstrdup(myarch);
-
	pkg->maintainer = xstrdup("unknown");
-
	regcomp(&preg, "^WWW:[[:space:]]*(.*)$", REG_EXTENDED|REG_ICASE|REG_NEWLINE);
-
	if (regexec(&preg, pkg->desc, 2, pmatch, 0) == 0) {
-
		size = pmatch[1].rm_eo - pmatch[1].rm_so;
-
		pkg->www = xstrndup(&pkg->desc[pmatch[1].rm_so], size);
-
	} else {
-
		pkg->www = xstrdup("UNKNOWN");
-
	}
-
	regfree(&preg);
-

-
	return (EPKG_OK);
-
}
-

-
int
-
pkg_from_old(struct pkg *p)
-
{
-
	struct pkg_file *f = NULL;
-

-
	p->type = PKG_INSTALLED;
-
	while (pkg_files(p, &f) == EPKG_OK) {
-
		if (f->sum == NULL)
-
			continue;
-
		f->sum = pkg_checksum_generate_file(f->path, PKG_HASH_TYPE_SHA256_HEX);
-
	}
-

-
	return (EPKG_OK);
-
}
modified scripts/Makefile.am
@@ -4,7 +4,6 @@ pweeklydir= ${sysconfdir}/periodic/weekly
bashcompdir=		${sysconfdir}/bash_completion.d
zshcompdir=		${prefix}/share/zsh/site-functions

-
dist_sbin_SCRIPTS=	sbin/pkg2ng
dist_pdaily_SCRIPTS=	periodic/411.pkg-backup \
			periodic/490.status-pkg-changes
dist_psecurity_SCRIPTS=	periodic/410.pkg-audit \
modified scripts/completion/_pkg.bash.in
@@ -125,16 +125,6 @@ _pkgng_clean () {
    large_info=""
}

-
_pkgng_convert () {
-
    local cur prev opts lopts
-
    COMPREPLY=()
-

-
    opts=()
-
    lopts=()
-
    small_info="Convert database from/to pkgng"
-
    large_info=""
-
}
-

_pkgng_create () {
    local cur prev opts lopts
    COMPREPLY=()
modified scripts/completion/_pkg.in
@@ -104,7 +104,6 @@ _pkg() {
		'check[check for missing dependencies and database consistency]'
		'clean[clean old packages from the cache]'
		'config[display value of a configuration option]'
-
		'convert[convert database from/to pkgng]'
		'create[create software package distributions]'
		'delete[delete packages from the database and the system]'
		'fetch[fetch packages from a remote repository]'
@@ -232,12 +231,6 @@ _pkg() {
				'(-y --yes)'{-y,--yes}'[assume yes for confirmations]'
			return
			;;
-
		(convert)
-
			_arguments -s \
-
				'(-d --pkg-dbdir)'{-d,--pkg-dbdir}'[specify the location of the pkg_add(1) dbdir]: : _files -/' \
-
				'(-n --dry-run)'{-n,--dry-run}'[dry run mode]'
-
			return
-
			;;
		(create)
			_arguments -A '-*' -s \
				'(-q --quiet)'{-q,--quiet}'[force quiet output]' \
deleted scripts/sbin/pkg2ng.in
@@ -1,133 +0,0 @@
-
#!/bin/sh
-

-
: "${PORTSDIR:=/usr/ports}"
-
: "${PKG_DBDIR:=/var/db/pkg}"
-

-
periodic_conf='/etc/periodic.conf'
-
periodic_defaults='/etc/defaults/periodic.conf'
-

-
args=$(getopt p $*)
-

-
while getopts p arg; do
-
    case ${arg} in
-
	p)
-
	    periodic_update="yes"
-
	    ;;
-
	?)
-
	    cat <<EOF
-
$(basename $0): Usage
-
    $(basename $0) [-p]
-

-
Options:
-
    -p   Update /etc/periodic.conf to disable scripts depending on
-
         pkg_tools and modify weekly_status_pkg_enable to use pkg(8)
-

-
EOF
-
	    exit 1
-
	    ;;
-
    esac
-
done
-
shift $(( ${OPTIND} -1 ))
-

-
if [ -f ${PORTSDIR}/Mk/bsd.pkgng.mk ]; then
-
	FORCE_POST=$(make _POSTMKINCLUDED=1 UID=$(id -u) -f ${PORTSDIR}/Mk/bsd.pkgng.mk -V _FORCE_POST_PATTERNS)
-
else
-
	FORCE_POST="rmdir kldxref mkfontscale mkfontdir fc-cache fonts.dir fonts.scale gtk-update-icon-cache gio-querymodules gtk-query-immodules ldconfig load-octave-pkg update-desktop-database update-mime-database gdk-pixbuf-query-loaders catalog.ports glib-compile-schemas ccache-update-links"
-
fi
-

-
FORCE_PORT=$FORCE_POST @prefix@/sbin/pkg convert
-

-
# Delete the portupgrade pkgdb to avoid discrepencies. It will be auto
-
# recreated.
-

-
rm -f ${PKG_DBDIR}/pkgdb.db > /dev/null 2>&1
-

-
# Build the shlibs_{provided,required} tables in the pkg database
-

-
echo "Analysing shared libraries, this will take a while... "
-
@prefix@/sbin/pkg check -Ba
-

-
# Fix up /etc/periodic.conf if requested.  Pull in the current
-
# periodic settings, and update /etc/periodic.conf to disable any
-
# active periodic scripts that depend on pkg_tools(8). Make a 1-to-1
-
# correspondance between existing pkg_tools periodic jobs, and pkgng
-
# periodic jobs, and enable the equivalent set.
-
#
-
# Update the 'pkg_version' variable used by weekly_status_pkg_enable
-
# if it still references pkg_version(1)
-

-
if [ "${periodic_update}" = "yes" ]; then
-
    if [ -r $period_defaults ]; then
-
	. $periodic_defaults
-
	source_periodic_confs
-
    fi
-

-
    TMPFILE=$(mktemp -t $(basename $0)) || exit 1
-
    cleanup() {
-
	rm -f $TMPFILE
-
    }
-
    trap cleanup EXIT HUP INT KILL
-

-
    if [ -f $periodic_conf ]; then
-
	cp -p $periodic_conf $TMPFILE
-
    fi
-

-
    exec >> ${TMPFILE}
-

-
    echo
-
    echo "### Added by $(basename $0) on $(date +%Y-%m-%d)"
-

-
    # weekly_status_pkg_enable -- use 'pkg version'.  This will use
-
    # the ports tree or the ports INDEX if they exist in preference to
-
    # the pkg repository catalogue.
-

-
    if [ "$pkg_version" = 'pkg_version' ]; then
-
	echo "pkg_version='@prefix@/sbin/pkg version'"
-
    fi
-

-
    # weekly/400.status-pkg
-
    echo "weekly_status_pkgng_enable=\"$weekly_status_pkg_enable\""
-
    case "$weekly_status_pkg_enable" in
-
	[Yy][Ee][Ss])
-
	    echo "weekly_status_pkg_enable=\"NO\""
-
	    ;;
-
    esac
-

-
    # daily/411.pkg-backup <=> daily/220.backup-pkgdb
-
    echo "daily_backup_pkgng_enable=\"$daily_backup_pkgdb_enable\""
-
    case "$daily_backup_pkgdb_enable" in
-
	[Yy][Ee][Ss])
-
	    echo "daily_backup_pkgdb_enable=\"NO\"" \
-
	    ;;
-
    esac
-

-
    # daily/490.status-pkg-changes
-
    echo "daily_status_pkgng_changes_enable=\"$daily_status_pkg_changes_enable\""
-
    case "$daily_status_pkg_changes_enable" in
-
	[Yy][Ee][Ss])
-
	    echo "daily_status_pkg_changes_enable=\"NO\"" \
-
	    ;;
-
    esac
-

-
    # security/410.pkg-audit <=> security/410.portaudit
-
    echo "daily_status_security_pkgaudit_enable=\"${daily_status_security_portaudit_enable:-YES}\""
-
    case "${daily_status_security_portaudit_enable:-YES}" in
-
	[Yy][Ee][Ss])
-
	    echo "daily_status_security_portaudit_enable=\"NO\""
-
	    ;;
-
    esac
-

-
    # security/460.pkg-checksum <=> security/460.chkportsum
-
    echo "daily_status_security_pkg_checksum_enable=\"$daily_status_security_chkportsum_enable\""
-
    case "$daily_status_security_chkportsum_enable" in
-
	[Yy][Ee][Ss])
-
	    echo "daily_status_security_chkportsum_enable=\"NO\""
-
	    ;;
-
    esac
-

-
    echo "### End of additions by $(basename $0)"
-

-
    cp -p $periodic_conf ${periodic_conf}.bak
-
    cp -p $TMPFILE $periodic_conf
-
fi
-

modified src/Makefile.am
@@ -14,7 +14,6 @@ pkg_SOURCES= add.c \
			check.c \
			clean.c \
			config.c \
-
			convert.c \
			create.c \
			delete.c \
			event.c \
deleted src/convert.c
@@ -1,159 +0,0 @@
-
/*-
-
 * Copyright (c) 2012-2013 Baptiste Daroussin <bapt@FreeBSD.org>
-
 * Copyright (c) 2013 Bryan Drewery <bdrewery@FreeBSD.org>
-
 * Copyright (c) 2014 Matthew Seaman <matthew@FreeBSD.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
-
 *    in this position and unchanged.
-
 * 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.
-
 * 
-
 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``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 AUTHOR(S) 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.
-
 */
-

-
#include <sys/param.h>
-
#include <sys/stat.h>
-

-
#include <err.h>
-
#include <errno.h>
-
#include <getopt.h>
-
#include <string.h>
-
#include <sysexits.h>
-
#include <dirent.h>
-
#include <unistd.h>
-

-
#include <pkg.h>
-

-
#include <bsd_compat.h>
-

-
#include "pkgcli.h"
-

-
void
-
usage_convert(void)
-
{
-
	fprintf(stderr, "Usage: pkg convert [-d dir] [-n]\n\n");
-
	fprintf(stderr, "For more information see 'pkg help convert'.\n");
-
}
-

-
static int
-
convert_from_old(const char *pkg_add_dbdir, bool dry_run)
-
{
-
	DIR		*d;
-
	struct dirent	*dp;
-
	struct pkg	*p = NULL;
-
	char		 path[MAXPATHLEN];
-
	struct pkgdb	*db = NULL;
-
	struct stat	 sb;
-
	int		lock_type = PKGDB_LOCK_EXCLUSIVE;
-
	int		ret;
-

-
	if (dry_run)
-
		ret = pkgdb_access(PKGDB_MODE_READ, PKGDB_DB_LOCAL);
-
	else
-
		ret = pkgdb_access(PKGDB_MODE_READ|PKGDB_MODE_WRITE|
-
		    PKGDB_MODE_CREATE, PKGDB_DB_LOCAL);
-

-
	if (ret == EPKG_ENOACCESS) {
-
		warnx("Insufficient privileges to convert packages");
-
		return (EX_NOPERM);
-
	} else if (ret != EPKG_OK && ret != EPKG_ENODB) {
-
		warnx("Error accessing the package database");
-
		return (EX_SOFTWARE);
-
	}
-

-
	if ((d = opendir(pkg_add_dbdir)) == NULL)
-
		err(EX_NOINPUT, "%s", pkg_add_dbdir);
-

-
	if (pkgdb_open(&db, PKGDB_DEFAULT) != EPKG_OK) {
-
		closedir(d);
-
		return (EX_IOERR);
-
	}
-
	if (dry_run)
-
		lock_type = PKGDB_LOCK_READONLY;
-
	if (pkgdb_obtain_lock(db, lock_type) != EPKG_OK) {
-
		pkgdb_close(db);
-
		warnx("Cannot get an advisory lock on a database, it is locked"
-
		    " by another process");
-
		return (EX_TEMPFAIL);
-
	}
-
	while ((dp = readdir(d)) != NULL) {
-
		if (fstatat(dirfd(d), dp->d_name, &sb, 0) == 0 &&
-
		    S_ISDIR(sb.st_mode)) {
-
			if (strcmp(dp->d_name, ".") == 0 ||
-
			    strcmp(dp->d_name, "..") == 0)
-
				continue;
-
			pkg_free(p);
-
			if (pkg_new(&p, PKG_OLD_FILE) != EPKG_OK)
-
				err(EX_OSERR, "malloc");
-
			printf("Converting %s...\n", dp->d_name);
-
			snprintf(path, sizeof(path), "%s/%s", pkg_add_dbdir, dp->d_name);
-
			if (pkg_old_load_from_path(p, path) != EPKG_OK) {
-
				fprintf(stderr, "Skipping invalid package: %s\n", path);
-
				continue;
-
			}
-
			pkg_from_old(p);
-
			if (!dry_run)
-
				pkgdb_register_ports(db, p);
-
		}
-
	}
-

-
	pkg_free(p);
-
	pkgdb_release_lock(db, lock_type);
-
	pkgdb_close(db);
-
	closedir(d);
-
	return (EX_OK);
-
}
-

-
int
-
exec_convert(__unused int argc, __unused char **argv)
-
{
-
	int		 ch;
-
	bool		 dry_run = false;
-
	const char	*pkg_add_dbdir = "/var/db/pkg";
-

-
	struct option longopts[] = {
-
		{ "pkg-dbdir",	required_argument,	NULL,	'd' },
-
		{ "dry-run",	no_argument,		NULL,	'n' },
-
		{ NULL,		0,			NULL,	0   },
-
	};
-

-
	while ((ch = getopt_long(argc, argv, "+d:n", longopts, NULL)) != -1) {
-
		switch (ch) {
-
		case 'd':
-
			pkg_add_dbdir = optarg;
-
			break;
-
		case 'n':
-
			dry_run = true;
-
			break;
-
		default:
-
			usage_convert();
-
			return (EX_USAGE);
-
		}
-
	}
-
	argc -= optind;
-
	argv += optind;
-

-
	if (argc > 1) {
-
		usage_convert();
-
		return (EX_USAGE);
-
	}
-

-
	printf("Converting packages from %s\n", pkg_add_dbdir);
-

-
	return (convert_from_old(pkg_add_dbdir, dry_run));
-
}
modified src/main.c
@@ -94,7 +94,6 @@ static struct commands {
	{ "check", "Checks for missing dependencies and database consistency", exec_check, usage_check},
	{ "clean", "Cleans old packages from the cache", exec_clean, usage_clean},
	{ "config", "Display the value of the configuration options", exec_config, usage_config},
-
	{ "convert", "Convert database from/to pkgng", exec_convert, usage_convert},
	{ "create", "Creates software package distributions", exec_create, usage_create},
	{ "delete", "Deletes packages from the database and the system", exec_delete, usage_delete},
	{ "fetch", "Fetches packages from a remote repository", exec_fetch, usage_fetch},
modified src/pkgcli.h
@@ -184,10 +184,6 @@ void usage_version(void);
int exec_which(int, char **);
void usage_which(void);

-
/* pkg convert */
-
int exec_convert(int, char **);
-
void usage_convert(void);
-

/* pkg ssh */
int exec_ssh(int, char **);
void usage_ssh(void);