diff --git a/misc/ossp-uuid/Makefile b/misc/ossp-uuid/Makefile index 137cb5a5792d..23cd2fd653b0 100644 --- a/misc/ossp-uuid/Makefile +++ b/misc/ossp-uuid/Makefile @@ -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@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 --enable-static --with-cxx \ --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 diff --git a/misc/ossp-uuid/pkg-plist b/misc/ossp-uuid/pkg-plist index f6c8757a901e..25da3e628c16 100644 --- a/misc/ossp-uuid/pkg-plist +++ b/misc/ossp-uuid/pkg-plist @@ -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