ports/188848: [patch] x11-servers/xorg-nestserver: options don't stick

[Lawrence The Dreamer Chen]

>Number:         188848
>Category:       ports
>Synopsis:       [patch] x11-servers/xorg-nestserver: options don't stick
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 21 14:10:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Lawrence "The Dreamer" Chen
>Release:        FreeBSD 9.2-RELEASE-p4 amd64
>Organization:
>Environment:
System: FreeBSD zen.lhaven.homeip.net 9.2-RELEASE-p4 FreeBSD 9.2-RELEASE-p4 #0: Tue Apr 8 18:08:22 UTC 2014 root at amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64


	
>Description:
	
	During portmaster update of this port, it kept prompting for options,
	with nothing preselected, over and over again.
>How-To-Repeat:
	
>Fix:

	
	The include of 'bsd.port.options.mk' before including the master port's
	Makefile is breaking options handling.

--- patch begins here ---
--- Makefile.orig	2014-04-16 13:28:47.000000000 -0500
+++ Makefile	2014-04-21 08:43:39.793929398 -0500
@@ -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)
--- patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: