Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 25 Jan 2014 22:05:26 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r341122 - head/x11-servers/xorg-vfbserver
Message-ID:  <201401252205.s0PM5Qr2033466@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401252205.s0PM5Qr2033466>