pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Fix weird CONFLICTS line.
details: https://anonhg.NetBSD.org/pkgsrc/rev/07bc0b040beb
branches: trunk
changeset: 355427:07bc0b040beb
user: wiz <wiz%pkgsrc.org@localhost>
date: Thu Dec 01 14:48:02 2016 +0000
description:
Fix weird CONFLICTS line.
diffstat:
audio/timidity/Makefile | 4 ++--
mail/imp/Makefile | 4 ++--
net/irrtoolset5/Makefile | 5 ++---
net/isc-dhcp4/Makefile.common | 4 ++--
security/libassuan2/Makefile | 5 +++--
textproc/texi2html/Makefile | 4 ++--
www/horde/Makefile | 4 ++--
www/p5-URI/Makefile | 4 ++--
x11/lablgtk1/Makefile | 4 ++--
9 files changed, 19 insertions(+), 19 deletions(-)
diffs (169 lines):
diff -r 2bca3ee6afed -r 07bc0b040beb audio/timidity/Makefile
--- a/audio/timidity/Makefile Thu Dec 01 14:27:21 2016 +0000
+++ b/audio/timidity/Makefile Thu Dec 01 14:48:02 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.100 2016/08/03 10:22:32 adam Exp $
+# $NetBSD: Makefile,v 1.101 2016/12/01 14:48:02 wiz Exp $
DISTNAME= TiMidity++-2.14.0
PKGNAME= ${DISTNAME:S/TiMidity++/timidity/}
@@ -12,7 +12,7 @@
COMMENT= MIDI to WAV renderer and player
LICENSE= gnu-gpl-v2
-CONFLICTS= kdemultimedia-2.*{,nb*}
+CONFLICTS= kdemultimedia-2.*
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-vt100
diff -r 2bca3ee6afed -r 07bc0b040beb mail/imp/Makefile
--- a/mail/imp/Makefile Thu Dec 01 14:27:21 2016 +0000
+++ b/mail/imp/Makefile Thu Dec 01 14:48:02 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2016/09/11 17:03:26 taca Exp $
+# $NetBSD: Makefile,v 1.63 2016/12/01 14:48:02 wiz Exp $
DISTNAME= imp-h3-${IMPVER}
PKGNAME= imp-${IMPVER}
@@ -12,7 +12,7 @@
COMMENT= Internet Messaging Program
LICENSE= gnu-gpl-v2
-CONFLICTS+= imp-3.*{,nb*}
+CONFLICTS+= imp-3.*
DEPENDS+= horde>=3.2:../../www/horde
DEPENDS+= ${PHP_PKG_PREFIX}-imap>4.3.3:../../mail/php-imap
diff -r 2bca3ee6afed -r 07bc0b040beb net/irrtoolset5/Makefile
--- a/net/irrtoolset5/Makefile Thu Dec 01 14:27:21 2016 +0000
+++ b/net/irrtoolset5/Makefile Thu Dec 01 14:48:02 2016 +0000
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2013/07/15 02:02:27 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.9 2016/12/01 14:48:02 wiz Exp $
VERSION= 5.0.1
DISTNAME= irrtoolset-${VERSION}
@@ -11,7 +10,7 @@
COMMENT= The Internet Routing Registry Toolset - client to IRRd
LICENSE= gnu-gpl-v2 AND mit AND modified-bsd
-CONFLICTS= IRRToolSet-4.*{,nb*}
+CONFLICTS= IRRToolSet-4.*
.include "../../mk/bsd.prefs.mk"
diff -r 2bca3ee6afed -r 07bc0b040beb net/isc-dhcp4/Makefile.common
--- a/net/isc-dhcp4/Makefile.common Thu Dec 01 14:27:21 2016 +0000
+++ b/net/isc-dhcp4/Makefile.common Thu Dec 01 14:48:02 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.31 2016/03/30 15:55:44 taca Exp $
+# $NetBSD: Makefile.common,v 1.32 2016/12/01 14:48:02 wiz Exp $
#
# used by net/isc-dhcp4/Makefile
# used by net/isc-dhcpd4/Makefile
@@ -15,7 +15,7 @@
HOMEPAGE= https://www.isc.org/sw/dhcp
LICENSE= isc
-CONFLICTS+= isc-dhcp-base-3.*{,nb*}
+CONFLICTS+= isc-dhcp-base-3.*
VERSION= 4.3.4
diff -r 2bca3ee6afed -r 07bc0b040beb security/libassuan2/Makefile
--- a/security/libassuan2/Makefile Thu Dec 01 14:27:21 2016 +0000
+++ b/security/libassuan2/Makefile Thu Dec 01 14:48:02 2016 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2016/07/16 08:27:47 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2016/12/01 14:48:02 wiz Exp $
DISTNAME= libassuan-2.4.3
CATEGORIES= security
MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/libassuan/
EXTRACT_SUFX= .tar.bz2
-CONFLICTS= libassuan-1.*{,nb*}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://gnupg.org/related_software/libassuan/index.en.html
@@ -17,6 +16,8 @@
INFO_FILES= yes
TEST_TARGET= check
+CONFLICTS= libassuan-1.*
+
BUILDLINK_ABI_DEPENDS.libgpg-error+= libgpg-error>=1.17
.include "../../security/libgpg-error/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 2bca3ee6afed -r 07bc0b040beb textproc/texi2html/Makefile
--- a/textproc/texi2html/Makefile Thu Dec 01 14:27:21 2016 +0000
+++ b/textproc/texi2html/Makefile Thu Dec 01 14:48:02 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2016/07/09 06:39:08 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2016/12/01 14:48:02 wiz Exp $
DISTNAME= texi2html-5.0
PKGREVISION= 6
@@ -13,7 +13,7 @@
DEPENDS+= p5-Locale-libintl-[0-9]*:../../misc/p5-Locale-libintl
-CONFLICTS= teTeX-bin-1.*{,nb*}
+CONFLICTS= teTeX-bin-1.*
USE_TOOLS+= gmake perl:run
GNU_CONFIGURE= yes
diff -r 2bca3ee6afed -r 07bc0b040beb www/horde/Makefile
--- a/www/horde/Makefile Thu Dec 01 14:27:21 2016 +0000
+++ b/www/horde/Makefile Thu Dec 01 14:48:02 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2016/05/17 10:32:09 fhajny Exp $
+# $NetBSD: Makefile,v 1.78 2016/12/01 14:48:02 wiz Exp $
DISTNAME= horde-3.3.13
PKGREVISION= 2
@@ -11,7 +11,7 @@
COMMENT= PHP application framework
LICENSE= gnu-lgpl-v2
-CONFLICTS+= horde-2.*{,nb*}
+CONFLICTS+= horde-2.*
.include "../../lang/php/phpversion.mk"
diff -r 2bca3ee6afed -r 07bc0b040beb www/p5-URI/Makefile
--- a/www/p5-URI/Makefile Thu Dec 01 14:27:21 2016 +0000
+++ b/www/p5-URI/Makefile Thu Dec 01 14:48:02 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2016/06/08 19:25:17 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2016/12/01 14:48:02 wiz Exp $
DISTNAME= URI-1.71
PKGNAME= p5-${DISTNAME}
@@ -15,7 +15,7 @@
# recommended
DEPENDS+= p5-Business-ISBN-[0-9]*:../../misc/p5-Business-ISBN
-CONFLICTS+= p5-libwww-5.36{,nb*} # URI used to be part of that package
+CONFLICTS+= p5-libwww>=5.36<5.37 # URI used to be part of that package
USE_LANGUAGES= # empty
PERL5_PACKLIST= auto/URI/.packlist
diff -r 2bca3ee6afed -r 07bc0b040beb x11/lablgtk1/Makefile
--- a/x11/lablgtk1/Makefile Thu Dec 01 14:27:21 2016 +0000
+++ b/x11/lablgtk1/Makefile Thu Dec 01 14:48:02 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2016/05/05 11:45:37 jaapb Exp $
+# $NetBSD: Makefile,v 1.15 2016/12/01 14:48:02 wiz Exp $
DISTNAME= lablgtk-1.2.7
PKGNAME= lablgtk1-1.2.7
@@ -18,7 +18,7 @@
BUILDLINK_DEPMETHOD.ocaml= full
BUILDLINK_API_DEPENDS.ocaml+= ocaml>=3.0.5
-CONFLICTS+= lablgtk-1.*{,nb*}
+CONFLICTS+= lablgtk-1.*
.include "../../mk/bsd.prefs.mk"
Home |
Main Index |
Thread Index |
Old Index