Tue May 22 12:21:32 2018 UTC ()
Allow vte and vte3 to coexist by setting PKGNAME to vte3.


(youri)
diff -r1.10 -r1.11 pkgsrc/x11/vte3/Makefile
diff -r1.6 -r1.7 pkgsrc/x11/vte3/buildlink3.mk
cvs diff -r1.10 -r1.11 pkgsrc/x11/vte3/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/vte3/Makefile 2018/05/15 09:50:49 1.10
+++ pkgsrc/x11/vte3/Makefile 2018/05/22 12:21:32 1.11
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.10 2018/05/15 09:50:49 jperkin Exp $ 1# $NetBSD: Makefile,v 1.11 2018/05/22 12:21:32 youri Exp $
2# 2#
3 3
4DISTNAME= vte-0.50.3 4DISTNAME= vte-0.50.3
 5PKGNAME= vte3-${PKGVERSION}
5CATEGORIES= x11 6CATEGORIES= x11
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/vte/0.50/} 7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/vte/0.50/}
7EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.gnome.org/ 11HOMEPAGE= https://www.gnome.org/
11COMMENT= Terminal widget with improved accessibility and I18N support 12COMMENT= Terminal widget with improved accessibility and I18N support
12LICENSE= gnu-lgpl-v2 13LICENSE= gnu-lgpl-v2
13 14
14PKGCONFIG_OVERRIDE+= vte.pc.in 15PKGCONFIG_OVERRIDE+= vte.pc.in
15 16
16USE_LIBTOOL= yes 17USE_LIBTOOL= yes
17GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
cvs diff -r1.6 -r1.7 pkgsrc/x11/vte3/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/vte3/buildlink3.mk 2018/05/14 12:09:22 1.6
+++ pkgsrc/x11/vte3/buildlink3.mk 2018/05/22 12:21:32 1.7
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: buildlink3.mk,v 1.6 2018/05/14 12:09:22 youri Exp $ 1# $NetBSD: buildlink3.mk,v 1.7 2018/05/22 12:21:32 youri Exp $
2 2
3BUILDLINK_TREE+= vte 3BUILDLINK_TREE+= vte
4 4
5.if !defined(VTE_BUILDLINK3_MK) 5.if !defined(VTE_BUILDLINK3_MK)
6VTE_BUILDLINK3_MK:= 6VTE_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.vte+= vte>=0.48.3 8BUILDLINK_API_DEPENDS.vte+= vte3>=0.48.3
9BUILDLINK_ABI_DEPENDS.vte+= vte>=0.48.3 9BUILDLINK_ABI_DEPENDS.vte+= vte3>=0.48.3
10BUILDLINK_PKGSRCDIR.vte?= ../../x11/vte3 10BUILDLINK_PKGSRCDIR.vte?= ../../x11/vte3
11 11
12.include "../../devel/pcre2/buildlink3.mk" 12.include "../../devel/pcre2/buildlink3.mk"
13.include "../../security/gnutls/buildlink3.mk" 13.include "../../security/gnutls/buildlink3.mk"
14.include "../../x11/gtk3/buildlink3.mk" 14.include "../../x11/gtk3/buildlink3.mk"
15.include "../../mk/termcap.buildlink3.mk" 15.include "../../mk/termcap.buildlink3.mk"
16.endif # VTE_BUILDLINK3_MK 16.endif # VTE_BUILDLINK3_MK
17 17
18BUILDLINK_TREE+= -vte 18BUILDLINK_TREE+= -vte