diff options
| author | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-04-10 23:14:12 +0800 |
|---|---|---|
| committer | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-04-10 23:14:12 +0800 |
| commit | 4fef254f4218a94c371b8443dd8eab1086291634 (patch) | |
| tree | 81e66d10fef78e9c58f5bceaabdd22472e934e2d /x11 | |
| parent | 91e8d13d30095b10bc1148ce00c259b9a57c4934 (diff) | |
| download | marcuscom-ports-4fef254f4218a94c371b8443dd8eab1086291634.tar marcuscom-ports-4fef254f4218a94c371b8443dd8eab1086291634.tar.gz marcuscom-ports-4fef254f4218a94c371b8443dd8eab1086291634.tar.bz2 marcuscom-ports-4fef254f4218a94c371b8443dd8eab1086291634.tar.lz marcuscom-ports-4fef254f4218a94c371b8443dd8eab1086291634.tar.xz marcuscom-ports-4fef254f4218a94c371b8443dd8eab1086291634.tar.zst marcuscom-ports-4fef254f4218a94c371b8443dd8eab1086291634.zip | |
-Add CONFLICTS with the each others.
-Add GNOME_DESKTOP_VERSION.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15784 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/libgnomekbd/Makefile | 4 | ||||
| -rw-r--r-- | x11/libgnomekbd3/Makefile | 4 |
2 files changed, 6 insertions, 2 deletions
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 |