ports/187022: [patch] x11-servers/xorg-nestserver fails to install

[Don Lewis]

>Number:         187022
>Category:       ports
>Synopsis:       [patch] x11-servers/xorg-nestserver fails to install
>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:   Tue Feb 25 06:30:01 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Don Lewis
>Release:        FreeBSD 11.0-CURRENT i386
>Organization:
FreeBSD project
>Environment:
System: FreeBSD scratch.catspoiler.org 11.0-CURRENT FreeBSD 11.0-CURRENT #70 r262340M: Sat Feb 22 15:58:39 PST 2014     dl at scratch.catspoiler.org:/usr/obj/usr/src/sys/GENERICSMB  i386

Ports revision r345674

>Description:
	The x11-servers/xorg-server fails to install properly because it
	is looking in the wrong location for the man page.

===>   Generating temporary packing list
install  -s -o root -g wheel -m 555 /usr/ports/x11-servers/xorg-nestserver/work/xorg-server-1.12.4/hw/xnest/Xnest /usr/ports/x11-servers/xorg-nestserver/work/stage/usr/local/bin/
install  -o root -g wheel -m 444 /usr/ports/x11-servers/xorg-nestserver/work/xorg-server-1.12.4/hw/xnest/Xnest.1 /usr/ports/x11-servers/xorg-nestserver/work/stage/usr/local/man/man1/
install: /usr/ports/x11-servers/xorg-nestserver/work/xorg-server-1.12.4/hw/xnest/Xnest.1: No such file or directory
*** Error code 71

Stop.
make[2]: stopped in /usr/ports/x11-servers/xorg-nestserver
*** Error code 1

Stop.

>How-To-Repeat:

Attempt to install xorg-servers/xorg-nestserver.

>Fix:

After looking at the work directories for both the old and new versions of
XORG, I came to the conclusion that the conditional code for installing
the man page is reversed.  This patch fixes the problem for me:

Index: Makefile
===================================================================
--- Makefile	(revision 345674)
+++ Makefile	(working copy)
@@ -25,9 +25,9 @@
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hw/xnest/Xnest ${STAGEDIR}${PREFIX}/bin/
 .if defined(WITH_NEW_XORG)
+	${INSTALL_MAN} ${WRKSRC}/hw/xnest/Xnest.1 ${STAGEDIR}${PREFIX}/man/man1/
+.else
 	${INSTALL_MAN} ${WRKSRC}/hw/xnest/man/Xnest.1 ${STAGEDIR}${PREFIX}/man/man1/
-.else
-	${INSTALL_MAN} ${WRKSRC}/hw/xnest/Xnest.1 ${STAGEDIR}${PREFIX}/man/man1/
 .endif
 
 .include "${MASTERDIR}/Makefile"


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