Date: Sun, 9 Mar 2014 17:25:03 +0400 From: Andrej Zverev <andrej.zverev@gmail.com> To: Vasil Dimov <vd@FreeBSD.org> Cc: "svn-ports-head@freebsd.org" <svn-ports-head@freebsd.org>, "svn-ports-all@freebsd.org" <svn-ports-all@freebsd.org>, "ports-committers@freebsd.org" <ports-committers@freebsd.org> Subject: Re: svn commit: r347563 - head/misc/ossp-uuid Message-ID: <78A893C4-2C20-4009-925A-E44AE397B2BD@gmail.com> In-Reply-To: <201403091126.s29BQJm6010911@svn.freebsd.org> References: <201403091126.s29BQJm6010911@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
In original patch pkg-plist was correct. You now trying to remove directorie= s which belong to lang/perl but not to your port. > On 09 =CD=C1=D2=D4=C1 2014 =C7., at 15:26, Vasil Dimov <vd@FreeBSD.org> wr= ote: >=20 > 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/ >=20 > Log: > misc/ossp-uuid: fix perl binding, patch based on [1] >=20 > PR: ports/187387 [1] > Submitted by: culot@ >=20 > Modified: > head/misc/ossp-uuid/Makefile > head/misc/ossp-uuid/pkg-plist >=20 > Modified: head/misc/ossp-uuid/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- 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 @@ >=20 > PORTNAME=3D uuid > PORTVERSION=3D 1.6.2 > -PORTREVISION=3D 2 > +PORTREVISION=3D 3 > CATEGORIES=3D misc devel > MASTER_SITES=3D ${MASTER_SITE_OSSP} > MASTER_SITE_SUBDIR=3D lib/${PORTNAME} > @@ -12,7 +12,7 @@ PKGNAMEPREFIX=3D ossp- > MAINTAINER=3D vd@FreeBSD.org > COMMENT=3D ISO-C & Perl API and CLI for generating Universally Unique I= dentifiers >=20 > -CONFLICTS=3D e2fsprogs-libuuid-[0-9]* > +#CONFLICTS=3D e2fsprogs-libuuid-[0-9]* >=20 > GNU_CONFIGURE=3D yes > USE_LDCONFIG=3D yes > @@ -20,12 +20,15 @@ CONFIGURE_ARGS=3D --disable-shared --enabl > --includedir=3D${PREFIX}/include/ossp >=20 > .if defined(WITH_PERL) > +MAKE_JOBS_UNSAFE=3D yes > USES+=3D perl5 > CONFIGURE_ENV+=3D PERL=3D${PERL5} > -CONFIGURE_ARGS+=3D --with-perl > +CONFIGURE_ARGS+=3D--with-perl > +# Without WITH_PERL=3Dyes in uuid's make args it could pick WITH_PERL=3D1= if > +# somebody has run "make WITH_PERL=3D1" in the port's directory, then its= check > +# whether WITH_PERL is set to "yes" would fail. > +MAKE_ARGS+=3D WITH_PERL=3Dyes > PLIST_SUB+=3D WITH_PERL=3D'' > -MAN3=3D OSSP::uuid.3 > -MAN3PREFIX=3D ${PREFIX}/lib/perl5/${PERL_VER} > .else > PLIST_SUB+=3D WITH_PERL=3D'@comment ' > .endif > @@ -36,6 +39,10 @@ PLIST_SUB+=3D WITH_PERL=3D'@comment ' > CFLAGS+=3D -fPIC -DPIC > .endif >=20 > +post-patch: > + ${REINPLACE_CMD} -e 's/\(libuuid\\*\.\)la/\1a/g' \ > + ${WRKSRC}/perl/Makefile.PL > + > regression-test: test >=20 > test: build >=20 > Modified: head/misc/ossp-uuid/pkg-plist > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- 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 >=20
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?78A893C4-2C20-4009-925A-E44AE397B2BD>