pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel CONFLICTS between libtai and libowfat



details:   https://anonhg.NetBSD.org/pkgsrc/rev/093506de677f
branches:  trunk
changeset: 610216:093506de677f
user:      cheusov <cheusov%pkgsrc.org@localhost>
date:      Sun Oct 21 11:26:50 2012 +0000

description:
CONFLICTS between libtai and libowfat

diffstat:

 devel/libowfat/Makefile |  5 ++++-
 devel/libtai/Makefile   |  6 ++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diffs (45 lines):

diff -r 8c82c6ac9b8f -r 093506de677f devel/libowfat/Makefile
--- a/devel/libowfat/Makefile   Sun Oct 21 11:20:20 2012 +0000
+++ b/devel/libowfat/Makefile   Sun Oct 21 11:26:50 2012 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2009/05/19 08:59:10 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2012/10/21 11:28:25 cheusov Exp $
 #
 
 DISTNAME=      libowfat-0.28
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  http://dl.fefe.de/
 EXTRACT_SUFX=  .tar.bz2
@@ -11,6 +12,8 @@
 COMMENT=       Library of general purpose APIs
 LICENSE=       gnu-gpl-v2
 
+CONFLICTS=     libtai-[0-9]*
+
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 MAKE_FILE=     GNUmakefile
diff -r 8c82c6ac9b8f -r 093506de677f devel/libtai/Makefile
--- a/devel/libtai/Makefile     Sun Oct 21 11:20:20 2012 +0000
+++ b/devel/libtai/Makefile     Sun Oct 21 11:26:50 2012 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2012/10/21 11:20:20 cheusov Exp $
+# $NetBSD: Makefile,v 1.8 2012/10/21 11:26:50 cheusov Exp $
 #
 
 DISTNAME=      libtai-0.60
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    devel
 MASTER_SITES=  ${HOMEPAGE:Q}
 
@@ -10,6 +10,8 @@
 HOMEPAGE=      http://cr.yp.to/libtai/
 COMMENT=       Library for storing and manipulating dates and times
 
+CONFLICTS=     libowfat-[0-9]*
+
 DJB_RESTRICTED=        NO
 
 PKG_DESTDIR_SUPPORT=   user-destdir



Home | Main Index | Thread Index | Old Index