From owner-svn-ports-head@FreeBSD.ORG  Sat Aug 16 16:15:20 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 887AAF04;
 Sat, 16 Aug 2014 16:15:20 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 73DDC2B6F;
 Sat, 16 Aug 2014 16:15:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7GGFKS1027049;
 Sat, 16 Aug 2014 16:15:20 GMT (envelope-from adamw@FreeBSD.org)
Received: (from adamw@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7GGFK7L027048;
 Sat, 16 Aug 2014 16:15:20 GMT (envelope-from adamw@FreeBSD.org)
Message-Id: <201408161615.s7GGFK7L027048@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: adamw set sender to
 adamw@FreeBSD.org using -f
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Sat, 16 Aug 2014 16:15:20 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r365098 - head/x11-servers/xephyr
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 16 Aug 2014 16:15:20 -0000

Author: adamw
Date: Sat Aug 16 16:15:19 2014
New Revision: 365098
URL: http://svnweb.freebsd.org/changeset/ports/365098
QAT: https://qat.redports.org/buildarchive/r365098/

Log:
  Because this is a slave port, it cannot load bsd.port.pre.mk before defining
  the do-install target. This means that the test for .if defined(WITH_NEW_XORG)
  will always be false unless it's actually set in make.conf. WITH_NEW_XORG is
  automatically set for OSVERSION > 100704, but the port can't access that.
  
  Apply a really inelegant kludge that simply tries to install the manpage
  from both possible places. One will fail, and one will succeed.

Modified:
  head/x11-servers/xephyr/Makefile

Modified: head/x11-servers/xephyr/Makefile
==============================================================================
--- head/x11-servers/xephyr/Makefile	Sat Aug 16 16:13:22 2014	(r365097)
+++ head/x11-servers/xephyr/Makefile	Sat Aug 16 16:15:19 2014	(r365098)
@@ -23,10 +23,10 @@ PLIST_FILES=	bin/Xephyr man/man1/Xephyr.
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hw/kdrive/ephyr/Xephyr ${STAGEDIR}${PREFIX}/bin/
-.if defined(WITH_NEW_XORG)
-	${INSTALL_MAN} ${WRKSRC}/hw/kdrive/ephyr/man/Xephyr.1 ${STAGEDIR}${PREFIX}/man/man1/
-.else
-	${INSTALL_MAN} ${WRKSRC}/hw/kdrive/ephyr/Xephyr.1 ${STAGEDIR}${PREFIX}/man/man1/
-.endif
+#.if defined(WITH_NEW_XORG)
+	-${INSTALL_MAN} ${WRKSRC}/hw/kdrive/ephyr/man/Xephyr.1 ${STAGEDIR}${PREFIX}/man/man1/
+#.else
+	-${INSTALL_MAN} ${WRKSRC}/hw/kdrive/ephyr/Xephyr.1 ${STAGEDIR}${PREFIX}/man/man1/
+#.endif
 
 .include "${MASTERDIR}/Makefile"