From 29d9727b83a85a73bec429b7d25a8468bbd8f41d Mon Sep 17 00:00:00 2001 From: sthen Date: Mon, 3 May 2010 14:21:00 +0000 Subject: [PATCH] kili's fix to handle the two different libuuid's merged two packages (e2fsprogs, e2fs-uuid) into one; everything works ok for updates provided that one has a package depending on e2fs-uuid installed, but if not, the old e2fs-uuid is left lying around which could cause problems with devel/uuid later (unless someone manually does a 'pkg_add -r'). Add a quirk so that the standard pkg_add -u can handle this situation. "oh well... okay" espie@ --- devel/quirks/Makefile | 4 ++-- devel/quirks/files/Quirks.pm | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/devel/quirks/Makefile b/devel/quirks/Makefile index a0dbf566232..06000ffa56f 100644 --- a/devel/quirks/Makefile +++ b/devel/quirks/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.12 2010/03/23 21:37:54 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.13 2010/05/03 14:21:00 sthen Exp $ COMMENT = exceptions to pkg_add rules CATEGORIES = devel databases DISTFILES = # API.rev -PKGNAME = quirks-1.10 +PKGNAME = quirks-1.11 PKG_ARCH = * MAINTAINER = Marc Espie diff --git a/devel/quirks/files/Quirks.pm b/devel/quirks/files/Quirks.pm index 4f6eed48df3..380d4680896 100644 --- a/devel/quirks/files/Quirks.pm +++ b/devel/quirks/files/Quirks.pm @@ -1,7 +1,7 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: Quirks.pm,v 1.16 2010/03/23 21:37:54 ajacoutot Exp $ +# $OpenBSD: Quirks.pm,v 1.17 2010/05/03 14:21:00 sthen Exp $ # # Copyright (c) 2009 Marc Espie # @@ -137,6 +137,7 @@ my $stem_extensions = { # 4.7 'openh323' => 'h323plus', 'pwlib' => 'ptlib', + 'e2fs-uuid' => 'e2fsprogs', }; # ->is_base_system($handle, $state):