diff options
| author | dholland <dholland@pkgsrc.org> | 2014-12-29 04:37:44 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2014-12-29 04:37:44 +0000 |
| commit | d1e40e115c8752dc416ed263a8e16400480e18b9 (patch) | |
| tree | a4ee54b336f8240bd79c2fcc9664d20fa3998c97 /editors | |
| parent | ae6513859dde4c22506516a0b305bf964c494f38 (diff) | |
| download | pkgsrc-d1e40e115c8752dc416ed263a8e16400480e18b9.tar.gz | |
Add explicit CONFLICTS between gedit 2 and gedit 3, per PR 49494.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/gedit/Makefile | 3 | ||||
| -rw-r--r-- | editors/gedit3/Makefile | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile index 7208f4e233f..70dcbe193ec 100644 --- a/editors/gedit/Makefile +++ b/editors/gedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.130 2014/05/29 23:36:31 wiz Exp $ +# $NetBSD: Makefile,v 1.131 2014/12/29 04:37:44 dholland Exp $ # DISTNAME= gedit-2.30.4 @@ -12,6 +12,7 @@ HOMEPAGE= http://www.gnome.org/projects/gedit/ COMMENT= Lightweight GNOME2 text editor LICENSE= gnu-gpl-v2 +CONFLICTS+= gedit>=3 USE_PKGLOCALEDIR= YES USE_TOOLS+= gmake intltool msgfmt perl pkg-config USE_LIBTOOL= YES diff --git a/editors/gedit3/Makefile b/editors/gedit3/Makefile index 8baf05fe0ae..8329ce20a06 100644 --- a/editors/gedit3/Makefile +++ b/editors/gedit3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2014/12/28 22:07:26 prlw1 Exp $ +# $NetBSD: Makefile,v 1.19 2014/12/29 04:37:44 dholland Exp $ DISTNAME= gedit-3.14.2 PKGREVISION= 1 @@ -11,6 +11,7 @@ HOMEPAGE= http://www.gedit.org/ COMMENT= Lightweight GNOME UTF-8 text editor LICENSE= gnu-gpl-v2 +CONFLICTS+= gedit>=2.0<3.0 GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= gmake intltool msgfmt perl pkg-config |