[pacman-dev] [PATCH] makepkg: Clarify usage instructions for --allsource/--source

[Allan McRae]

Dan McGee wrote:
> Signed-off-by: Dan McGee <dan at archlinux.org>
> ---
>
> A release is never perfect. Just a documentation issue here though. Allan, you
> wrote the final patch so feel free to chime in on the descriptions I made.
>
>   

Wow, that was a fast release to "bug" turn around...


>  doc/makepkg.8.txt     |   14 +++++++++++---
>  scripts/makepkg.sh.in |    3 ++-
>  2 files changed, 13 insertions(+), 4 deletions(-)
>
> diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt
> index 068cbcb..c2c10ca 100644
> --- a/doc/makepkg.8.txt
> +++ b/doc/makepkg.8.txt
> @@ -128,10 +128,18 @@ Options
>  	dependencies are not found, pacman will try to resolve them. If
>  	successful, the missing packages will be downloaded and installed.
>  
> +*\--allsource*::
> +	Do not actually build the package, but build a source-only tarball that
> +	includes all sources, including those that are normally download via
> +	makepkg. This is useful for passing a single tarball to another program
> +	such as a chroot or remote builder. It will also satisfy requirements of
> +	the GPL when distributing binary packages.
> +
>  *\--source*::
> -	Do not actually build the package, but build a source-only tarball. This
> -	is useful for passing a single tarball to another program such as a
> -	chroot, remote builder, or an AUR upload.
> +	Do not actually build the package, but build a source-only tarball that
> +	does not include sources that can be fetched via a download URL. This is
> +	useful for passing a single tarball to another program such as a chroot,
> +	remote builder, or an AUR upload.
>   

I know it is carried over but mentioning AUR here is Arch specific.  
Perhaps that could be killed at the same time.

>  
>  *\--noconfirm*::
>  	(Passed to pacman) Prevent pacman from waiting for user input before
> diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
> index 041b460..22af7fd 100644
> --- a/scripts/makepkg.sh.in
> +++ b/scripts/makepkg.sh.in
> @@ -1086,9 +1086,10 @@ usage() {
>  	# fix flyspray feature request #2978
>  	echo "$(gettext "  -R, --repackage  Repackage contents of pkg/ without building")"
>  	echo "$(gettext "  -s, --syncdeps   Install missing dependencies with pacman")"
> +	echo "$(gettext "      --allsource  Generate a source-only tarball including downloaded sources")"
>  	echo "$(gettext "      --asroot     Allow makepkg to run as root user")"
>  	echo "$(gettext "      --holdver    Prevent automatic version bumping for development PKGBUILDs")"
> -	echo "$(gettext "      --source     Do not build package; generate a source-only tarball")"
> +	echo "$(gettext "      --source     Generate a source-only tarball without downloaded sources")"
>  	echo
>  	echo "$(gettext "These options can be passed to pacman:")"
>  	echo
>