From owner-svn-ports-all@FreeBSD.ORG  Tue Dec 31 12:58:51 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])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id F2505A57;
 Tue, 31 Dec 2013 12:58:50 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id DE7071F6B;
 Tue, 31 Dec 2013 12:58:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBVCwoPB093088;
 Tue, 31 Dec 2013 12:58:50 GMT (envelope-from kwm@svn.freebsd.org)
Received: (from kwm@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBVCwo00093086;
 Tue, 31 Dec 2013 12:58:50 GMT (envelope-from kwm@svn.freebsd.org)
Message-Id: <201312311258.rBVCwo00093086@svn.freebsd.org>
From: Koop Mast <kwm@FreeBSD.org>
Date: Tue, 31 Dec 2013 12:58:50 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r338291 - in head/x11-servers: xorg-nestserver
 xorg-vfbserver
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.17
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, 31 Dec 2013 12:58:51 -0000

Author: kwm
Date: Tue Dec 31 12:58:50 2013
New Revision: 338291
URL: http://svnweb.freebsd.org/changeset/ports/338291

Log:
  Remove extra bsd.port.options.mk, it already defined in the master port.
  Fix typo in vfbserver port.
  
  Obtained from:	xorg-dev repo

Modified:
  head/x11-servers/xorg-nestserver/Makefile
  head/x11-servers/xorg-vfbserver/Makefile

Modified: head/x11-servers/xorg-nestserver/Makefile
==============================================================================
--- head/x11-servers/xorg-nestserver/Makefile	Tue Dec 31 12:56:33 2013	(r338290)
+++ head/x11-servers/xorg-nestserver/Makefile	Tue Dec 31 12:58:50 2013	(r338291)
@@ -22,8 +22,6 @@ CONFIGURE_ARGS=	--disable-dmx --disable-
 SLAVE_PORT=	yes
 PLIST_FILES=	bin/Xnest man/man1/Xnest.1.gz
 
-.include <bsd.port.options.mk>
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hw/xnest/Xnest ${STAGEDIR}${PREFIX}/bin/
 .if defined(WITH_NEW_XORG)

Modified: head/x11-servers/xorg-vfbserver/Makefile
==============================================================================
--- head/x11-servers/xorg-vfbserver/Makefile	Tue Dec 31 12:56:33 2013	(r338290)
+++ head/x11-servers/xorg-vfbserver/Makefile	Tue Dec 31 12:58:50 2013	(r338291)
@@ -16,14 +16,12 @@ USE_XORG=	x11 xf86driproto glproto randr
 		xkbui xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans
 
 CONFIGURE_ARGS=	--disable-dmx --disable-xnest \
-		--without-xmlto --disable-docs --disable-devel1-docs \
+		--without-xmlto --disable-docs --disable-devel-docs \
 		--localstatedir=/var --without-dtrace
 
 SLAVE_PORT=	yes
 PLIST_FILES=	bin/Xvfb man/man1/Xvfb.1.gz
 
-.include <bsd.port.options.mk>
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hw/vfb/Xvfb ${STAGEDIR}${PREFIX}/bin/
 .if defined(WITH_NEW_XORG)