ports/189002: [patch] x11-servers/xorg-nestserver prompts for options multiple times

[Don Lewis]

>Number:         189002
>Category:       ports
>Synopsis:       [patch] x11-servers/xorg-nestserver prompts for options multiple times
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Apr 25 22:10:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Don Lewis
>Release:        FreeBSD 8.4-STABLE i386
>Organization:
FreeBSD project
>Environment:
System: FreeBSD mousie.catspoiler.org 8.4-STABLE FreeBSD 8.4-STABLE #82 r256570: Sun Oct 20 22:45:33 PDT 2013 dl at mousie.catspoiler.org:/usr/obj/usr/src/sys/GENERICDDB i386


	Ports tree revision r351627

	xorg-nestserver-1.7.7_12,1


>Description:
	
	Revision r351411 to x11-servers/xorg-nestserver/Makefile
	undid the removal of the extra bsd.port.options.mk that
	was done in r338291.  When installing or upgrading the ports
	with portupgrade, this port now prompts for options multiple
	times.  This problem does not occur with xorg-vfbserver, which
	does not have the extra bsd.port.options.mk.

>How-To-Repeat:

	Attempt to build and install the port, either manually, or with
	portupgrade.

>Fix:


Index: Makefile
===================================================================
--- Makefile	(revision 351627)
+++ Makefile	(working copy)
@@ -22,8 +22,6 @@
 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)
>Release-Note:
>Audit-Trail:
>Unformatted: