diff options
| -rw-r--r-- | Mk/bsd.gnome.mk | 8 | ||||
| -rw-r--r-- | x11/libgnomekbd/Makefile | 4 | ||||
| -rw-r--r-- | x11/libgnomekbd3/Makefile | 4 |
3 files changed, 11 insertions, 5 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index bfbd2b82f..caac3165d 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.538 2011/03/30 19:23:02 kwm Exp $ +# $MCom: ports/Mk/bsd.gnome.mk,v 1.539 2011/04/09 02:44:27 mezz Exp $ # # Please view me with 4 column tabs! @@ -92,8 +92,8 @@ _USE_GNOME_ALL+= atk atspi desktopfileutils eel2 evolutiondataserver gal2 \ # GNOME 3 components _USE_GNOME_ALL+= dconf evolutiondataserver3 gnomecontrolcenter3 gnomedesktop3 \ - gnomepanel3 gtk30 gtkhtml4 gtksourceview3 libgda5 libgda5-ui libgnomekbd3 librsvg3 \ - libwnck3 nautilus3 vte3 + gnomepanel3 gtk30 gtkhtml4 gtksourceview3 libgda5 libgda5-ui \ + libgnomekbd3 librsvg3 libwnck3 nautilus3 vte3 GNOME_MAKEFILEIN?= Makefile.in SCROLLKEEPER_DIR= /var/db/rarian @@ -593,10 +593,12 @@ gnomesharp20_USE_GNOME_IMPL= gnomepanel gtkhtml3 gtksharp20 librsvg2 vte libgnomekbd_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnomekbd.pc libgnomekbd_LIB_DEPENDS= gnomekbd.4:${PORTSDIR}/x11/libgnomekbd libgnomekbd_USE_GNOME_IMPL= gconf2 +libgnomekbd_GNOME_DESKTOP_VERSION=2 libgnomekbd3_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnomekbd.pc libgnomekbd3_LIB_DEPENDS= gnomekbd.7:${PORTSDIR}/x11/libgnomekbd3 libgnomekbd3_USE_GNOME_IMPL= gtk30 +libgnomekbd3_GNOME_DESKTOP_VERSION=3 pygtksourceview_DETECT= ${LOCALBASE}/libdata/pkgconfig/pygtksourceview-2.0.pc pygtksourceview_BUILD_DEPENDS= ${pygtksourceview_DETECT}:${PORTSDIR}/x11-toolkits/py-gtksourceview diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile index e0d337e39..ac09fb73b 100644 --- a/x11/libgnomekbd/Makefile +++ b/x11/libgnomekbd/Makefile @@ -3,7 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD: ports/x11/libgnomekbd/Makefile,v 1.23 2010/12/04 07:34:05 ade Exp $ -# $MCom: ports/x11/libgnomekbd/Makefile,v 1.48 2010/09/28 08:01:11 kwm Exp $ +# $MCom: ports/x11/libgnomekbd/Makefile,v 1.52 2011/04/09 19:55:18 mezz Exp $ # PORTNAME= libgnomekbd @@ -17,6 +17,8 @@ COMMENT= GNOME keyboard shared library LIB_DEPENDS= xklavier.12:${PORTSDIR}/x11/libxklavier +CONFLICTS= libgnomekbd-3.[0-9]* + USE_BZIP2= yes USE_GNOME= gnomeprefix gnomehack ltverhack gconf2 USE_AUTOTOOLS= libtool diff --git a/x11/libgnomekbd3/Makefile b/x11/libgnomekbd3/Makefile index 9b3b6f611..1a9070fe2 100644 --- a/x11/libgnomekbd3/Makefile +++ b/x11/libgnomekbd3/Makefile @@ -3,7 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/libgnomekbd3/Makefile,v 1.6 2011/04/05 17:53:25 kwm Exp $ +# $MCom: ports/x11/libgnomekbd3/Makefile,v 1.7 2011/04/06 06:30:58 kwm Exp $ # PORTNAME= libgnomekbd @@ -20,6 +20,8 @@ LIB_DEPENDS= xklavier.12:${PORTSDIR}/x11/libxklavier LATEST_LINK= libgnomekbd3 +CONFLICTS= libgnomekbd-2.[0-9]* + USE_BZIP2= yes USE_GNOME= gnomeprefix gnomehack ltverhack intltool gtk30 USE_AUTOTOOLS= libtool |