svn commit: r338291 - in head/x11-servers: xorg-nestserver xorg-vfbserver

[Koop Mast]

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)