summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2010-07-26 21:07:43 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2010-07-26 21:07:43 +0800
commit2383ee6b1e124a33492a78a265a61fe3861518df (patch)
tree071d571c190404466185b3cbab1bbeaf2f8e836c
parent21c6146a3ae36f711d1d5b8c06db3a91f17566f6 (diff)
downloadmarcuscom-ports-2383ee6b1e124a33492a78a265a61fe3861518df.tar
marcuscom-ports-2383ee6b1e124a33492a78a265a61fe3861518df.tar.gz
marcuscom-ports-2383ee6b1e124a33492a78a265a61fe3861518df.tar.bz2
marcuscom-ports-2383ee6b1e124a33492a78a265a61fe3861518df.tar.lz
marcuscom-ports-2383ee6b1e124a33492a78a265a61fe3861518df.tar.xz
marcuscom-ports-2383ee6b1e124a33492a78a265a61fe3861518df.tar.zst
marcuscom-ports-2383ee6b1e124a33492a78a265a61fe3861518df.zip
Do the evil thing and make gnome-desktop and gnome-desktop3 installable
at the same time. They will overwrite files from each other but this way I can continue with gnome3. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14366 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--x11/gnome-desktop/Makefile4
-rw-r--r--x11/gnome-desktop3/Makefile4
2 files changed, 4 insertions, 4 deletions
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 69e2f65c4..8176f8260 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD: ports/x11/gnome-desktop/Makefile,v 1.87 2010/05/10 21:18:51 kwm Exp $
-# $MCom: ports/x11/gnome-desktop/Makefile,v 1.180 2010/04/01 12:13:55 kwm Exp $
+# $MCom: ports/x11/gnome-desktop/Makefile,v 1.183 2010/07/13 17:04:25 kwm Exp $
#
PORTNAME= gnome-desktop
@@ -25,7 +25,7 @@ LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification
USE_XORG= xpm
USE_GNOME= gnomeprefix gnomehack intlhack gnomedocutils gconf2 pygtk2 \
ltverhack referencehack
-GNOME_DESKTOP_VERSION=2
+#GNOME_DESKTOP_VERSION=2
USE_GETTEXT= yes
USE_GMAKE= yes
USE_BISON= build
diff --git a/x11/gnome-desktop3/Makefile b/x11/gnome-desktop3/Makefile
index 53548c6d7..22ff218f5 100644
--- a/x11/gnome-desktop3/Makefile
+++ b/x11/gnome-desktop3/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom$
+# $MCom: ports/x11/gnome-desktop3/Makefile,v 1.1 2010/07/13 17:04:25 kwm Exp $
#
PORTNAME= gnome-desktop
@@ -25,7 +25,7 @@ LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification
USE_XORG= x11 xrandr
USE_GNOME= gnomeprefix gnomehack intlhack gnomedocutils gtk30 gconf2 \
pygtk2 ltverhack referencehack
-GNOME_DESKTOP_VERSION=3
+#GNOME_DESKTOP_VERSION=3
USE_GETTEXT= yes
USE_GMAKE= yes
USE_BISON= build