Date: Mon, 17 Mar 2014 09:01:44 +0000 (UTC) From: Frederic Culot <culot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348451 - in head: . misc misc/ossp-uuid misc/ossp-uuid-perl misc/p5-OSSP-uuid misc/p5-OSSP-uuid/files Message-ID: <201403170901.s2H91iU0058264@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: culot Date: Mon Mar 17 09:01:44 2014 New Revision: 348451 URL: http://svnweb.freebsd.org/changeset/ports/348451 QAT: https://qat.redports.org/buildarchive/r348451/ Log: - Add misc/p5-OSSP-uuid as a replacement for misc/ossp-uuid-perl. p5-OSSP-uuid only installs the Perl API, hence avoiding to have two conflicting ports as was the case with ossp-uuid and ossp-uuid-perl. Suggested by: mat@ Approved by: vd@ (ossp-uuid maintainer, via email) Added: head/misc/p5-OSSP-uuid/ head/misc/p5-OSSP-uuid/Makefile (contents, props changed) head/misc/p5-OSSP-uuid/files/ head/misc/p5-OSSP-uuid/files/patch-perl__Makefile.PL (contents, props changed) head/misc/p5-OSSP-uuid/pkg-descr (contents, props changed) head/misc/p5-OSSP-uuid/pkg-plist (contents, props changed) Deleted: head/misc/ossp-uuid-perl/ Modified: head/UPDATING head/misc/Makefile head/misc/ossp-uuid/Makefile head/misc/ossp-uuid/pkg-plist Modified: head/UPDATING ============================================================================== --- head/UPDATING Mon Mar 17 09:00:17 2014 (r348450) +++ head/UPDATING Mon Mar 17 09:01:44 2014 (r348451) @@ -5,6 +5,19 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20140317: + AFFECTS: users of misc/ossp-uuid-perl + AUTHOR: culot@FreeBSD.org + + misc/ossp-uuid-perl was replaced by misc/p5-OSSP-uuid. Please do the + following according to package manager used. + + # portmaster -o misc/p5-OSSP-uuid misc/ossp-uuid-perl + or + # portupgrade -fo misc/p5-OSSP-uuid misc/ossp-uuid-perl + or + # pkg set -o misc/p5-OSSP-uuid:misc/ossp-uuid-perl + 20140312: AFFECTS: users of net/openistgt AUTHOR: jpaetzel@FreeBSD.org Modified: head/misc/Makefile ============================================================================== --- head/misc/Makefile Mon Mar 17 09:00:17 2014 (r348450) +++ head/misc/Makefile Mon Mar 17 09:01:44 2014 (r348451) @@ -287,7 +287,6 @@ SUBDIR += openr2 SUBDIR += orville-write SUBDIR += ossp-uuid - SUBDIR += ossp-uuid-perl SUBDIR += otter SUBDIR += p5-Acme-ButFirst SUBDIR += p5-Array-Compare @@ -344,6 +343,7 @@ SUBDIR += p5-Locale-US SUBDIR += p5-Net-vCard SUBDIR += p5-Norge + SUBDIR += p5-OSSP-uuid SUBDIR += p5-Software-License SUBDIR += p5-Test-Dir SUBDIR += p5-Text-FIGlet Modified: head/misc/ossp-uuid/Makefile ============================================================================== --- head/misc/ossp-uuid/Makefile Mon Mar 17 09:00:17 2014 (r348450) +++ head/misc/ossp-uuid/Makefile Mon Mar 17 09:01:44 2014 (r348451) @@ -3,14 +3,14 @@ PORTNAME= uuid PORTVERSION= 1.6.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= misc devel MASTER_SITES= ${MASTER_SITE_OSSP} MASTER_SITE_SUBDIR= lib/${PORTNAME} PKGNAMEPREFIX= ossp- MAINTAINER= vd@FreeBSD.org -COMMENT= ISO-C & Perl API and CLI for generating Universally Unique Identifiers +COMMENT= ISO-C API and CLI for generating Universally Unique Identifiers #CONFLICTS= e2fsprogs-libuuid-[0-9]* @@ -19,21 +19,8 @@ USE_LDCONFIG= yes CONFIGURE_ARGS= --disable-shared --enable-static --with-cxx \ --includedir=${PREFIX}/include/ossp -.if defined(WITH_PERL) -PKGNAMESUFFIX= -perl -CONFLICTS= ossp-uuid-[0-9]* -MAKE_JOBS_UNSAFE= yes -USES+= perl5 -CONFIGURE_ENV+= PERL=${PERL5} -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='' -.else -CONFLICTS= ossp-uuid-perl-[0-9]* -PLIST_SUB+= WITH_PERL='@comment ' +.if defined(SLAVEPORT) && ${SLAVEPORT}=="perl" +PKGNAMEPREFIX= p5-OSSP- .endif .include <bsd.port.pre.mk> @@ -42,10 +29,6 @@ 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 Mon Mar 17 09:00:17 2014 (r348450) +++ head/misc/ossp-uuid/pkg-plist Mon Mar 17 09:01:44 2014 (r348451) @@ -6,15 +6,6 @@ lib/libuuid.a lib/libuuid++.a lib/libuuid++.la 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 -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/OSSP/uuid/uuid.bs -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/OSSP/uuid/uuid.so -%%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 man/man1/uuid-config.1.gz man/man1/uuid.1.gz man/man3/uuid++.3.gz Added: head/misc/p5-OSSP-uuid/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/p5-OSSP-uuid/Makefile Mon Mar 17 09:01:44 2014 (r348451) @@ -0,0 +1,22 @@ +# Created by: Frederic Culot <culot@FreeBSD.org> +# $FreeBSD$ + +COMMENT= Perl bindings for ossp-uuid + +BUILD_DEPENDS= ${LOCALBASE}/lib/libuuid.a:${PORTSDIR}/misc/ossp-uuid + +SLAVEPORT= perl +USES= perl5 +USE_PERL5= configure + +MASTERDIR= ${.CURDIR}/../../misc/ossp-uuid +WRKSRC= ${WRKDIR}/${DISTNAME}/perl +PLIST= ${.CURDIR}/pkg-plist +DESCR= ${.CURDIR}/pkg-descr +PATCHDIR= ${.CURDIR}/files + +post-patch: + @${REINPLACE_CMD} -e \ + 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/Makefile.PL + +.include "${MASTERDIR}/Makefile" Added: head/misc/p5-OSSP-uuid/files/patch-perl__Makefile.PL ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/p5-OSSP-uuid/files/patch-perl__Makefile.PL Mon Mar 17 09:01:44 2014 (r348451) @@ -0,0 +1,26 @@ +--- Makefile.PL.orig 2014-03-11 16:59:58.443768044 +0100 ++++ Makefile.PL 2014-03-11 17:00:36.554952157 +0100 +@@ -32,11 +32,6 @@ + use Config; + use ExtUtils::MakeMaker; + +-# determine source directory +-my ($srcdir) = map { my $d = $_; $d =~ s/\/libuuid\.la$//; $d } +- grep { -f $_ } ("../libuuid.la", glob("../*/libuuid.la")) +- or die "no source directory found (where libuuid.la is located)"; +- + # determine extra build options + my $compat = 0; + @ARGV = grep { $_ =~ m/^COMPAT=(\d+)$/i ? ($compat = $1, 0) : 1 } @ARGV; +@@ -47,9 +42,9 @@ + VERSION_FROM => 'uuid.pm', + ABSTRACT_FROM => 'uuid.pod', + PREREQ_PM => {}, +- LIBS => [ "-L$srcdir/.libs -L$srcdir -luuid" ], ++ LIBS => [ "-L%%LOCALBASE%%/lib -luuid" ], + DEFINE => '', +- INC => "-I. -I$srcdir", ++ INC => "-I. -I%%LOCALBASE%%/include/ossp", + PM => { 'uuid.pm' => '$(INST_LIBDIR)/uuid.pm', + 'uuid.pod' => '$(INST_LIBDIR)/uuid.pod', + ($compat ? ('uuid_compat.pm' => '$(INST_LIBDIR)/../Data/UUID.pm') : ()), Added: head/misc/p5-OSSP-uuid/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/p5-OSSP-uuid/pkg-descr Mon Mar 17 09:01:44 2014 (r348451) @@ -0,0 +1,7 @@ +OSSP::uuid is the Perl API to the ossp-uuid library which is used to +generate DCE 1.1 and ISO/IEC 11578:1996 compliant Universally Unique +Identifiers (UUID). It supports DCE 1.1 variant UUIDs of version 1 +(time and node based), version 3 (name based, MD5), version 4 +(random number based) and version 5 (name based, SHA-1). + +WWW: http://www.ossp.org/pkg/lib/uuid/ Added: head/misc/p5-OSSP-uuid/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/p5-OSSP-uuid/pkg-plist Mon Mar 17 09:01:44 2014 (r348451) @@ -0,0 +1,9 @@ +%%PERL5_MAN3%%/OSSP::uuid.3.gz +%%SITE_PERL%%/%%PERL_ARCH%%/OSSP/uuid.pm +%%SITE_PERL%%/%%PERL_ARCH%%/OSSP/uuid.pod +%%SITE_PERL%%/%%PERL_ARCH%%/auto/OSSP/uuid/.packlist +%%SITE_PERL%%/%%PERL_ARCH%%/auto/OSSP/uuid/uuid.bs +%%SITE_PERL%%/%%PERL_ARCH%%/auto/OSSP/uuid/uuid.so +@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/OSSP/uuid +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OSSP +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/OSSP
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403170901.s2H91iU0058264>