svn commit: r347563 - head/misc/ossp-uuid

[Andrej Zverev]

In original patch pkg-plist was correct. You now trying to remove directories which belong to lang/perl but not to your port.

> On 09 марта 2014 г., at 15:26, Vasil Dimov <vd at FreeBSD.org> wrote:
> 
> Author: vd
> Date: Sun Mar  9 11:26:18 2014
> New Revision: 347563
> URL: http://svnweb.freebsd.org/changeset/ports/347563
> QAT: https://qat.redports.org/buildarchive/r347563/
> 
> Log:
>  misc/ossp-uuid: fix perl binding, patch based on [1]
> 
>  PR:        ports/187387 [1]
>  Submitted by:    culot@
> 
> Modified:
>  head/misc/ossp-uuid/Makefile
>  head/misc/ossp-uuid/pkg-plist
> 
> Modified: head/misc/ossp-uuid/Makefile
> ==============================================================================
> --- head/misc/ossp-uuid/Makefile    Sun Mar  9 10:23:40 2014    (r347562)
> +++ head/misc/ossp-uuid/Makefile    Sun Mar  9 11:26:18 2014    (r347563)
> @@ -3,7 +3,7 @@
> 
> PORTNAME=    uuid
> PORTVERSION=    1.6.2
> -PORTREVISION=    2
> +PORTREVISION=    3
> CATEGORIES=    misc devel
> MASTER_SITES=    ${MASTER_SITE_OSSP}
> MASTER_SITE_SUBDIR=    lib/${PORTNAME}
> @@ -12,7 +12,7 @@ PKGNAMEPREFIX=    ossp-
> MAINTAINER=    vd at FreeBSD.org
> COMMENT=    ISO-C & Perl API and CLI for generating Universally Unique Identifiers
> 
> -CONFLICTS=    e2fsprogs-libuuid-[0-9]*
> +#CONFLICTS=    e2fsprogs-libuuid-[0-9]*
> 
> GNU_CONFIGURE=    yes
> USE_LDCONFIG=    yes
> @@ -20,12 +20,15 @@ CONFIGURE_ARGS=    --disable-shared --enabl
>        --includedir=${PREFIX}/include/ossp
> 
> .if defined(WITH_PERL)
> +MAKE_JOBS_UNSAFE=    yes
> USES+=        perl5
> CONFIGURE_ENV+=    PERL=${PERL5}
> -CONFIGURE_ARGS+=    --with-perl
> +CONFIGURE_ARGS+=--with-perl
> +# Without WITH_PERL=yes in uuid's make args it could pick WITH_PERL=1 if
> +# somebody has run "make WITH_PERL=1" in the port's directory, then its check
> +# whether WITH_PERL is set to "yes" would fail.
> +MAKE_ARGS+=    WITH_PERL=yes
> PLIST_SUB+=    WITH_PERL=''
> -MAN3=        OSSP::uuid.3
> -MAN3PREFIX=    ${PREFIX}/lib/perl5/${PERL_VER}
> .else
> PLIST_SUB+=    WITH_PERL='@comment '
> .endif
> @@ -36,6 +39,10 @@ PLIST_SUB+=    WITH_PERL='@comment '
> CFLAGS+=    -fPIC -DPIC
> .endif
> 
> +post-patch:
> +    ${REINPLACE_CMD} -e 's/\(libuuid\\*\.\)la/\1a/g' \
> +        ${WRKSRC}/perl/Makefile.PL
> +
> regression-test: test
> 
> test: build
> 
> Modified: head/misc/ossp-uuid/pkg-plist
> ==============================================================================
> --- head/misc/ossp-uuid/pkg-plist    Sun Mar  9 10:23:40 2014    (r347562)
> +++ head/misc/ossp-uuid/pkg-plist    Sun Mar  9 11:26:18 2014    (r347563)
> @@ -5,7 +5,9 @@ include/ossp/uuid++.hh
> lib/libuuid.a
> lib/libuuid++.a
> lib/libuuid++.la
> +%%WITH_PERL%%lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/perllocal.pod.gz
> libdata/pkgconfig/uuid.pc
> +%%WITH_PERL%%%%PERL5_MAN3%%/OSSP::uuid.3.gz
> %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/OSSP/uuid.pm
> %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/OSSP/uuid.pod
> %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/OSSP/uuid/.packlist
> @@ -14,4 +16,17 @@ libdata/pkgconfig/uuid.pc
> %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/OSSP/uuid
> %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/OSSP
> %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OSSP
> +%%WITH_PERL%%@dirrmtry %%PERL5_MAN3%%
> +%%WITH_PERL%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
> +%%WITH_PERL%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
> +%%WITH_PERL%%@dirrmtry %%SITE_PERL%%
> +%%WITH_PERL%%@dirrmtry lib/perl5/%%PERL_VER%%/man
> +%%WITH_PERL%%@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%
> +%%WITH_PERL%%@dirrmtry lib/perl5/%%PERL_VER%%
> +%%WITH_PERL%%@dirrmtry lib/perl5/site_perl
> +%%WITH_PERL%%@dirrmtry lib/perl5
> +man/man1/uuid-config.1.gz
> +man/man1/uuid.1.gz
> +man/man3/uuid++.3.gz
> +man/man3/uuid.3.gz
> @dirrmtry include/ossp
>