From owner-svn-ports-all@FreeBSD.ORG  Sat Jan 25 22:05:26 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 623C3CD7;
 Sat, 25 Jan 2014 22:05:26 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4CF1C1B38;
 Sat, 25 Jan 2014 22:05:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0PM5Qer033467;
 Sat, 25 Jan 2014 22:05:26 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PM5Qr2033466;
 Sat, 25 Jan 2014 22:05:26 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201401252205.s0PM5Qr2033466@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sat, 25 Jan 2014 22:05:26 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r341122 - head/x11-servers/xorg-vfbserver
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Jan 2014 22:05:26 -0000

Author: bapt
Date: Sat Jan 25 22:05:25 2014
New Revision: 341122
URL: http://svnweb.freebsd.org/changeset/ports/341122
QAT: https://qat.redports.org/buildarchive/r341122/

Log:
  Fix packaging on FreeBSD 11 when WITH_NEW_XORG is defined by bsd.port.mk

Modified:
  head/x11-servers/xorg-vfbserver/Makefile

Modified: head/x11-servers/xorg-vfbserver/Makefile
==============================================================================
--- head/x11-servers/xorg-vfbserver/Makefile	Sat Jan 25 22:04:30 2014	(r341121)
+++ head/x11-servers/xorg-vfbserver/Makefile	Sat Jan 25 22:05:25 2014	(r341122)
@@ -24,10 +24,10 @@ PLIST_FILES=	bin/Xvfb man/man1/Xvfb.1.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hw/vfb/Xvfb ${STAGEDIR}${PREFIX}/bin/
-.if defined(WITH_NEW_XORG)
-	${INSTALL_MAN} ${WRKSRC}/hw/vfb/man/Xvfb.1 ${STAGEDIR}${PREFIX}/man/man1/
-.else
-	${INSTALL_MAN} ${WRKSRC}/hw/vfb/Xvfb.1 ${STAGEDIR}${PREFIX}/man/man1/
-.endif
+	if [ -f ${WRKSRC}/hw/vfb/man/Xvfb.1 ] ; then \
+		${INSTALL_MAN} ${WRKSRC}/hw/vfb/man/Xvfb.1 ${STAGEDIR}${PREFIX}/man/man1/ ; \
+	else \
+		${INSTALL_MAN} ${WRKSRC}/hw/vfb/Xvfb.1 ${STAGEDIR}${PREFIX}/man/man1/ ; \
+	fi
 
 .include "${MASTERDIR}/Makefile"