summaryrefslogtreecommitdiffstats
path: root/Mk
diff options
context:
space:
mode:
authormezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059>2011-04-11 04:46:10 +0800
committermezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059>2011-04-11 04:46:10 +0800
commit485d31558761607d20f2d67f4c06a946e0fcb5d5 (patch)
treeaa41603be0251d36d3fa2aa0b0baabef4420a3a1 /Mk
parent1aa60032bbe3f6bbe545e17d3de25c5309a2e18d (diff)
downloadmarcuscom-ports-485d31558761607d20f2d67f4c06a946e0fcb5d5.tar
marcuscom-ports-485d31558761607d20f2d67f4c06a946e0fcb5d5.tar.gz
marcuscom-ports-485d31558761607d20f2d67f4c06a946e0fcb5d5.tar.bz2
marcuscom-ports-485d31558761607d20f2d67f4c06a946e0fcb5d5.tar.lz
marcuscom-ports-485d31558761607d20f2d67f4c06a946e0fcb5d5.tar.xz
marcuscom-ports-485d31558761607d20f2d67f4c06a946e0fcb5d5.tar.zst
marcuscom-ports-485d31558761607d20f2d67f4c06a946e0fcb5d5.zip
-Add CONFLICTS with the each others.
-Add GNOME_DESKTOP_VERSION. Maybe it can be resolved the conflict by rename libexec/gnome-pty-helper. It's only a binary that is conflict. Need to research it to see if it can be renamed git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15790 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.gnome.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index 3fb1a1f0a..8fe40c6b6 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -3,7 +3,7 @@
#
# $FreeBSD$
# $NetBSD: $
-# $MCom: ports/Mk/bsd.gnome.mk,v 1.540 2011/04/10 15:14:12 mezz Exp $
+# $MCom: ports/Mk/bsd.gnome.mk,v 1.541 2011/04/10 19:28:34 mezz Exp $
#
# Please view me with 4 column tabs!
@@ -398,10 +398,12 @@ libwnck3_GNOME_DESKTOP_VERSION=3
vte_LIB_DEPENDS= vte.9:${PORTSDIR}/x11-toolkits/vte
vte_DETECT= ${LOCALBASE}/libdata/pkgconfig/vte.pc
vte_USE_GNOME_IMPL= gtk20
+vte_GNOME_DESKTOP_VERSION=2
vte3_LIB_DEPENDS= vte2_90.9:${PORTSDIR}/x11-toolkits/vte3
vte3_DETECT= ${LOCALBASE}/libdata/pkgconfig/vte-2.90.pc
vte3_USE_GNOME_IMPL= gtk30
+vte3_GNOME_DESKTOP_VERSION=3
libzvt_LIB_DEPENDS= zvt-2.0.0:${PORTSDIR}/x11-toolkits/libzvt
libzvt_DETECT= ${LOCALBASE}/libdata/pkgconfig/libzvt-2.0.pc