pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc
Module Name: pkgsrc
Committed By: wiz
Date: Thu Dec 1 14:48:02 UTC 2016
Modified Files:
pkgsrc/audio/timidity: Makefile
pkgsrc/mail/imp: Makefile
pkgsrc/net/irrtoolset5: Makefile
pkgsrc/net/isc-dhcp4: Makefile.common
pkgsrc/security/libassuan2: Makefile
pkgsrc/textproc/texi2html: Makefile
pkgsrc/www/horde: Makefile
pkgsrc/www/p5-URI: Makefile
pkgsrc/x11/lablgtk1: Makefile
Log Message:
Fix weird CONFLICTS line.
To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 pkgsrc/audio/timidity/Makefile
cvs rdiff -u -r1.62 -r1.63 pkgsrc/mail/imp/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/irrtoolset5/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/net/isc-dhcp4/Makefile.common
cvs rdiff -u -r1.12 -r1.13 pkgsrc/security/libassuan2/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/textproc/texi2html/Makefile
cvs rdiff -u -r1.77 -r1.78 pkgsrc/www/horde/Makefile
cvs rdiff -u -r1.63 -r1.64 pkgsrc/www/p5-URI/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/x11/lablgtk1/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/audio/timidity/Makefile
diff -u pkgsrc/audio/timidity/Makefile:1.100 pkgsrc/audio/timidity/Makefile:1.101
--- pkgsrc/audio/timidity/Makefile:1.100 Wed Aug 3 10:22:32 2016
+++ pkgsrc/audio/timidity/Makefile Thu Dec 1 14:48:02 2016
@@ -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 @@ HOMEPAGE= http://timidity.sourceforge.ne
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
Index: pkgsrc/mail/imp/Makefile
diff -u pkgsrc/mail/imp/Makefile:1.62 pkgsrc/mail/imp/Makefile:1.63
--- pkgsrc/mail/imp/Makefile:1.62 Sun Sep 11 17:03:26 2016
+++ pkgsrc/mail/imp/Makefile Thu Dec 1 14:48:02 2016
@@ -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 @@ HOMEPAGE= http://www.horde.org/imp/
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
Index: pkgsrc/net/irrtoolset5/Makefile
diff -u pkgsrc/net/irrtoolset5/Makefile:1.8 pkgsrc/net/irrtoolset5/Makefile:1.9
--- pkgsrc/net/irrtoolset5/Makefile:1.8 Mon Jul 15 02:02:27 2013
+++ pkgsrc/net/irrtoolset5/Makefile Thu Dec 1 14:48:02 2016
@@ -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 @@ HOMEPAGE= http://irrtoolset.isc.org/
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"
Index: pkgsrc/net/isc-dhcp4/Makefile.common
diff -u pkgsrc/net/isc-dhcp4/Makefile.common:1.31 pkgsrc/net/isc-dhcp4/Makefile.common:1.32
--- pkgsrc/net/isc-dhcp4/Makefile.common:1.31 Wed Mar 30 15:55:44 2016
+++ pkgsrc/net/isc-dhcp4/Makefile.common Thu Dec 1 14:48:02 2016
@@ -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 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://www.isc.org/sw/dhcp
LICENSE= isc
-CONFLICTS+= isc-dhcp-base-3.*{,nb*}
+CONFLICTS+= isc-dhcp-base-3.*
VERSION= 4.3.4
Index: pkgsrc/security/libassuan2/Makefile
diff -u pkgsrc/security/libassuan2/Makefile:1.12 pkgsrc/security/libassuan2/Makefile:1.13
--- pkgsrc/security/libassuan2/Makefile:1.12 Sat Jul 16 08:27:47 2016
+++ pkgsrc/security/libassuan2/Makefile Thu Dec 1 14:48:02 2016
@@ -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 @@ CONFIGURE_ARGS+= --infodir=${PREFIX}/inf
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"
Index: pkgsrc/textproc/texi2html/Makefile
diff -u pkgsrc/textproc/texi2html/Makefile:1.41 pkgsrc/textproc/texi2html/Makefile:1.42
--- pkgsrc/textproc/texi2html/Makefile:1.41 Sat Jul 9 06:39:08 2016
+++ pkgsrc/textproc/texi2html/Makefile Thu Dec 1 14:48:02 2016
@@ -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 @@ LICENSE= gnu-gpl-v2
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
Index: pkgsrc/www/horde/Makefile
diff -u pkgsrc/www/horde/Makefile:1.77 pkgsrc/www/horde/Makefile:1.78
--- pkgsrc/www/horde/Makefile:1.77 Tue May 17 10:32:09 2016
+++ pkgsrc/www/horde/Makefile Thu Dec 1 14:48:02 2016
@@ -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 @@ HOMEPAGE= http://www.horde.org/
COMMENT= PHP application framework
LICENSE= gnu-lgpl-v2
-CONFLICTS+= horde-2.*{,nb*}
+CONFLICTS+= horde-2.*
.include "../../lang/php/phpversion.mk"
Index: pkgsrc/www/p5-URI/Makefile
diff -u pkgsrc/www/p5-URI/Makefile:1.63 pkgsrc/www/p5-URI/Makefile:1.64
--- pkgsrc/www/p5-URI/Makefile:1.63 Wed Jun 8 19:25:17 2016
+++ pkgsrc/www/p5-URI/Makefile Thu Dec 1 14:48:02 2016
@@ -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 @@ LICENSE= ${PERL5_LICENSE}
# 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
Index: pkgsrc/x11/lablgtk1/Makefile
diff -u pkgsrc/x11/lablgtk1/Makefile:1.14 pkgsrc/x11/lablgtk1/Makefile:1.15
--- pkgsrc/x11/lablgtk1/Makefile:1.14 Thu May 5 11:45:37 2016
+++ pkgsrc/x11/lablgtk1/Makefile Thu Dec 1 14:48:02 2016
@@ -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 @@ USE_TOOLS+= gmake
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