svn commit: r309353 - in head/ports-mgmt/pkg: . files

[Chris Rees]

On 21 Dec 2012 12:21, "Baptiste Daroussin" <bapt at freebsd.org> wrote:
>
> Author: bapt
> Date: Fri Dec 21 12:21:03 2012
> New Revision: 309353
> URL: http://svnweb.freebsd.org/changeset/ports/309353
>
> Log:
>   - update to 1.0.4
>   - changes:
>     * zsh completion for the help subcomment [1]
>     * Make unlocking an already unlocked database a no-op,
>     * Create the PKG_DBDIR if it doesn't exists
>     * Fix download size calculation
>     * When analysing shlibs, interpret the special token $ORIGIN in RPATH
correctly
>     * For shared libraries installed by a package, don't require dynamic
library dependencies to resolve
>     * Do not warn twice about unknown keywords
>     * New PERMISSIVE option please do not use !!!
>     * Add a seat belt in the ports Makefile to avoid automatic switching
to pkgng [2]
>
>   Submitted by:         ume [1]
>   Requested by:         stas [2]
>   Bad english by:               bapt [2]
>   Good english by:      bdrewery, gjb [2]
>
> Deleted:
>   head/ports-mgmt/pkg/files/
> Modified:
>   head/ports-mgmt/pkg/Makefile
>   head/ports-mgmt/pkg/distinfo
>
> Modified: head/ports-mgmt/pkg/Makefile
>
==============================================================================
> --- head/ports-mgmt/pkg/Makefile        Fri Dec 21 11:47:14 2012
 (r309352)
> +++ head/ports-mgmt/pkg/Makefile        Fri Dec 21 12:21:03 2012
 (r309353)
> @@ -1,8 +1,7 @@
>  # $FreeBSD$
>
>  PORTNAME=      pkg
> -DISTVERSION=   1.0.3
> -PORTREVISION=  1
> +DISTVERSION=   1.0.4
>  CATEGORIES=    ports-mgmt
>  MASTER_SITES=  LOCAL/portmgr \
>                 http://files.etoilebsd.net/pkg/
> @@ -56,6 +55,32 @@ MLINKS=      pkg-delete.8 pkg-remove.8 \
>
>  .include <bsd.port.pre.mk>
>
> +.if defined(WITH_PKGNG)
> +.if exists(${LOCALBASE}/sbin/pkg_info) || exists(/usr/sbin/pkg_info)
> +NB_OLDPKGS!=   pkg_info 2>/dev/null | wc -l
> +.if ${NB_OLDPKGS} > 0
> +
> +pre-everything::
> +       @${ECHO_CMD} "You are about to convert your system to pkgng while
you have ports/packages"; \

I would have used shell if here, so make index and friends wouldn't have to
stat pkg_info.  It would also have the advantage that you wouldn't have to
check both locations of for pkg_info.

Chris