cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

the conflict is gone. remove the markers and bump

Browse Source 
ok kevlo@, "go ahead" robert@
This commit is contained in:
simon 2007-06-11 11:01:27 +00:00
parent 0c2e36ef7c
commit 0590c5e568
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devel/p5-Data-UUID/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.5 2006/11/17 17:01:51 espie Exp $ # $OpenBSD: Makefile,v 1.6 2007/06/11 11:01:27 simon Exp $
SHARED_ONLY= Yes SHARED_ONLY= Yes
COMMENT= "extension for generating GUIDs/UUIDs" COMMENT= "extension for generating GUIDs/UUIDs"
MODULES= cpan MODULES= cpan
DISTNAME= Data-UUID-0.145 DISTNAME= Data-UUID-0.145
PKGNAME= ${DISTNAME}p0
CATEGORIES= devel CATEGORIES= devel
MAINTAINER= Kevin Lo <kevlo@openbsd.org> MAINTAINER= Kevin Lo <kevlo@openbsd.org>

3
devel/p5-Data-UUID/pkg/PLIST
View File

@ -1,5 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2006/01/28 09:51:45 alek Exp $ @comment $OpenBSD: PLIST,v 1.3 2007/06/11 11:01:27 simon Exp $
@conflict uuid-perl-*
${P5ARCH}/ ${P5ARCH}/
${P5ARCH}/Data/ ${P5ARCH}/Data/
${P5ARCH}/Data/UUID.pm ${P5ARCH}/Data/UUID.pm

4
devel/uuid/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.25 2007/05/31 05:21:25 robert Exp $ # $OpenBSD: Makefile,v 1.26 2007/06/11 11:01:27 simon Exp $
SHARED_ONLY= Yes SHARED_ONLY= Yes
@ -8,7 +8,7 @@ COMMENT-perl= "UUID modules for Perl"
VERSION= 1.6.0 VERSION= 1.6.0
DISTNAME= uuid-${VERSION} DISTNAME= uuid-${VERSION}
FULLPKGNAME-main= uuid-${VERSION} FULLPKGNAME-main= uuid-${VERSION}
FULLPKGNAME-perl= p5-UUID-${VERSION} FULLPKGNAME-perl= p5-UUID-${VERSION}p0
CATEGORIES= devel CATEGORIES= devel
SHARED_LIBS= uuid 13.22 \ SHARED_LIBS= uuid 13.22 \
uuid++ 14.21 uuid++ 14.21

3
devel/uuid/pkg/PLIST-perl
View File

@ -1,5 +1,4 @@
@comment $OpenBSD: PLIST-perl,v 1.5 2006/03/12 23:11:31 robert Exp $ @comment $OpenBSD: PLIST-perl,v 1.6 2007/06/11 11:01:27 simon Exp $
@conflict p5-Data-UUID-*
@comment libdata/perl5/${MACHINE_ARCH}-openbsd/ @comment libdata/perl5/${MACHINE_ARCH}-openbsd/
@comment libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.6/ @comment libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.6/
@comment libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.6/perllocal.pod @comment libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.6/perllocal.pod