From owner-svn-ports-all@FreeBSD.ORG  Tue Jul  2 13:20:09 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id AABE7A91;
 Tue,  2 Jul 2013 13:20:09 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9D6FF1D0B;
 Tue,  2 Jul 2013 13:20:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r62DK9AL043190;
 Tue, 2 Jul 2013 13:20:09 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r62DK9cx043189;
 Tue, 2 Jul 2013 13:20:09 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201307021320.r62DK9cx043189@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Tue, 2 Jul 2013 13:20:09 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r322169 - head/x11-wm/compiz
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Jul 2013 13:20:09 -0000

Author: rene
Date: Tue Jul  2 13:20:09 2013
New Revision: 322169
URL: http://svnweb.freebsd.org/changeset/ports/322169

Log:
  Remove support for the non-default KDE3 option.
  
  Leave KDE3 in pkg-plist (which is now just a comment) to ease any update
  to KDE4.

Modified:
  head/x11-wm/compiz/Makefile

Modified: head/x11-wm/compiz/Makefile
==============================================================================
--- head/x11-wm/compiz/Makefile	Tue Jul  2 13:12:23 2013	(r322168)
+++ head/x11-wm/compiz/Makefile	Tue Jul  2 13:20:09 2013	(r322169)
@@ -64,7 +64,7 @@ GCONF_SCHEMAS=	gwd.schemas \
 CONFIGURE_ARGS=	--disable-kde4
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
-OPTIONS_DEFINE=	SVG GTK2 METACITY GNOME DBUS FUSE KDE3
+OPTIONS_DEFINE=	SVG GTK2 METACITY GNOME DBUS FUSE
 OPTIONS_DEFAULT=	SVG GTK2 METACITY GNOME DBUS
 
 METACITY_DESC=	Enable Metacity support
@@ -151,15 +151,7 @@ CONFIGURE_ARGS+=	--disable-fuse
 PLIST_SUB+=		FUSE="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MKDE3}
-USE_KDEBASE_VER=	3
-CONFIGURE_ARGS+=	--enable-kde
-PLIST_SUB+=	KDE3=""
-# allow bsd.kde.mk to be included after bsd.port.mk
-.include "${PORTSDIR}/Mk/bsd.kde.mk"
-.else
 CONFIGURE_ARGS+=	--disable-kde
 PLIST_SUB+=	KDE3="@comment "
-.endif
 
 .include <bsd.port.post.mk>