From d2404a0f10dfe813eace605e13f3eed21f0a6b41 Mon Sep 17 00:00:00 2001
From: Sofian Brabez <sbz@FreeBSD.org>
Date: Tue, 5 Feb 2013 11:45:02 +0100
Subject: [PATCH] add pkg-convert(8) man page and update zsh completion

---
 pkg/Makefile      |  1 +
 pkg/pkg-convert.8 | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 scripts/zsh/_pkg  |  9 ++++++++
 3 files changed, 78 insertions(+)
 create mode 100644 pkg/pkg-convert.8

diff --git a/pkg/Makefile b/pkg/Makefile
index 68fe2d9..7396e06 100644
--- a/pkg/Makefile
+++ b/pkg/Makefile
@@ -72,6 +72,7 @@ MAN=	pkg.8 \
 	pkg-autoremove.8 \
 	pkg-backup.8 \
 	pkg-check.8 \
+	pkg-convert.8 \
 	pkg-clean.8 \
 	pkg-create.8 \
 	pkg-delete.8 \
diff --git a/pkg/pkg-convert.8 b/pkg/pkg-convert.8
new file mode 100644
index 0000000..11d23af
--- /dev/null
+++ b/pkg/pkg-convert.8
@@ -0,0 +1,68 @@
+.\"
+.\" 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
+.\" $FreeBSD$
+.\"
+.Dd February 05, 2013
+.Dt PKG-CONVERT 8
+.Os
+.Sh NAME
+.Nm "pkg convert"
+.Nd convert from/to pkgng database format
+.Sh SYNOPSIS
+.Nm
+.Op Fl r
+.Sh DESCRIPTION
+.Nm
+is used to convert from/to pkgng local database to legacy pkg_install tools
+format.
+.Sh OPTIONS
+The following options are supported by
+.Nm :
+.Bl -tag -width F1
+.It Fl r
+Revert conversion
+.El
+.Sh FILES
+See
+.Xr pkg.conf 5 .
+.Sh SEE ALSO
+.Xr pkg.conf 5 ,
+.Xr pkg 8 ,
+.Xr pkg-add 8 ,
+.Xr pkg-audit 8 ,
+.Xr pkg-autoremove 8 ,
+.Xr pkg-backup 8 ,
+.Xr pkg-check 8 ,
+.Xr pkg-clean 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-shlib 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
diff --git a/scripts/zsh/_pkg b/scripts/zsh/_pkg
index 15856a8..d1e9593 100644
--- a/scripts/zsh/_pkg
+++ b/scripts/zsh/_pkg
@@ -19,7 +19,10 @@ _pkg() {
 	'-d[Increment debug level]'
 	'-j[Execute pkg(1) inside a jail(8)]:jail:'
 	'-c[Execute pkg(1) inside a chroot(8)]:chroot:_files -/'
+	'-C[Use the specified configuration file]'
+	'-l[List available command and exit'
 	'-v[Display pkg(1) version]'
+	'-N[Test if pkg(1) is activated and avoid auto-activation]'
 	)
 
 	subcmd=(
@@ -29,6 +32,7 @@ _pkg() {
 		'backup[Backs-up and restores the local package database]'
 		'check[Checks for missing dependencies and database consistency]'
 		'clean[Cleans old packages from the cache]'
+		'convert[Convert database from/to pkgng]'
 		'create[Creates software package distributions]'
 		'delete[Deletes packages from the database and the system]'
 		'fetch[Fetches packages from a remote repository]'
@@ -106,6 +110,11 @@ _pkg() {
 		(clean)
 			return 0
 			;;
+		(convert)
+			_arguments -s \
+				'-r[Revert conversion]' \
+				&& return 0
+			;;
 		(create)
 			_arguments -s \
 				'-r[Root directory]:rootdir:_files -/' \
-- 
1.8.1.1